lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #23520 from comaiteseb/17.0

Browse Source 
correction bug selection contact dans emailing
This commit is contained in:
Laurent Destailleur 2023-01-13 21:19:13 +01:00 committed by GitHub
commit 6ce41ee7ab
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -122,7 +122,7 @@ class mailing_contacts1 extends MailingTargets
*/ */
public function formFilter() public function formFilter()
{ {
global $langs; global $langs,$conf;
// 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"));
@ -308,11 +308,12 @@ class mailing_contacts1 extends MailingTargets
$s .= ajax_combobox("filter_category_supplier_contact"); $s .= ajax_combobox("filter_category_supplier_contact");
// Choose language // Choose language
require_once DOL_DOCUMENT_ROOT.'/core/class/html.formadmin.class.php'; if (getDolGlobalInt('MAIN_MULTILANGS')) {
$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', 0, 0, 1, 0, 0, '', 0, 0, 0, null, 1);
}
return $s; return $s;
} }