Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity

correction bug sur le filtre des langues pour l'ajout aux liste d'emailing. Lorsque 'Activer la prise en charge multilingue pour la relation client ou fournisseur' était désactivé, le champ langue des contacts et des tiers est egal à NULL et ne correspond jamais au filtre de langue (le filtre de langue est donc maintenant désactivé dans le module thirdparties)

Browse Source
This commit is contained in:
Sébastien NASSIET
2023-01-04 17:04:54 +01:00
parent 566fb52fb8
commit 9d2fb85f59
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
htdocs/core/modules/mailings/contacts1.modules.php
View File

@@ -120,7 +120,7 @@ class mailing_contacts1 extends MailingTargets
*/ */
public function formFilter() public function formFilter()
{ {
global $langs; global $conf,$langs;
// Load translation files required by the page // Load translation files required by the page
$langs->loadLangs(array("commercial", "companies", "suppliers", "categories")); $langs->loadLangs(array("commercial", "companies", "suppliers", "categories"));
@@ -305,11 +305,13 @@ class mailing_contacts1 extends MailingTargets
$s .= ajax_combobox("filter_category_supplier_contact"); $s .= ajax_combobox("filter_category_supplier_contact");
// Choose language if (getDolGlobalInt('MAIN_MULTILANGS')) {
require_once DOL_DOCUMENT_ROOT.'/core/class/html.formadmin.class.php'; // Choose language
$formadmin = new FormAdmin($this->db); require_once DOL_DOCUMENT_ROOT.'/core/class/html.formadmin.class.php';
$s .= '<span class="opacitymedium">'.$langs->trans("DefaultLang").':</span> '; $formadmin = new FormAdmin($this->db);
$s .= $formadmin->select_language($langs->getDefaultLang(1), 'filter_lang', 0, 0, 1, 0, 0, '', 0, 0, 0, null, 1); $s .= '<span class="opacitymedium">'.$langs->trans("DefaultLang").':</span> ';
$s .= $formadmin->select_language($langs->getDefaultLang(1), 'filter_lang_thirdparties', 0, null, 1, 0, 0, '', 0, 0, 0, null, 1);
}
return $s; return $s;
} }