From a72fac7c3dfc25516f94a0c32bacc5891bb6ea52 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 30 Jul 2023 15:20:16 +0200 Subject: [PATCH] FIX pn in language selection on target for emailing --- htdocs/core/modules/mailings/contacts1.modules.php | 12 +++++++----- .../core/modules/mailings/thirdparties.modules.php | 14 ++++++++------ 2 files changed, 15 insertions(+), 11 deletions(-) diff --git a/htdocs/core/modules/mailings/contacts1.modules.php b/htdocs/core/modules/mailings/contacts1.modules.php index 13436761c3b..772c9900573 100644 --- a/htdocs/core/modules/mailings/contacts1.modules.php +++ b/htdocs/core/modules/mailings/contacts1.modules.php @@ -219,7 +219,8 @@ class mailing_contacts1 extends MailingTargets if ($level == $obj->code) { $level = $langs->trans($obj->label); } - $s .= ''; + $labeltoshow = $langs->trans("ThirdPartyProspects").' ('.$langs->trans("ProspectLevelShort").'='.$level.')'; + $s .= ''; $i++; } } else { @@ -311,7 +312,7 @@ class mailing_contacts1 extends MailingTargets require_once DOL_DOCUMENT_ROOT.'/core/class/html.formadmin.class.php'; $formadmin = new FormAdmin($this->db); $s .= img_picto($langs->trans("DefaultLang"), 'language', 'class="pictofixedwidth"'); - $s .= $formadmin->select_language($langs->getDefaultLang(1), 'filter_lang', 0, null, $langs->trans("DefaultLang"), 0, 0, '', 0, 0, 0, null, 1); + $s .= $formadmin->select_language(GETPOST('filter_lang', 'aZ09'), 'filter_lang', 0, null, $langs->trans("DefaultLang"), 0, 0, '', 0, 0, 0, null, 1); } return $s; @@ -412,7 +413,7 @@ class mailing_contacts1 extends MailingTargets } // Filter on language - if (!empty($filter_lang)) { + if (!empty($filter_lang) && $filter_lang != '-1') { $sql .= " AND sp.default_lang LIKE '".$this->db->escape($filter_lang)."%'"; } @@ -442,8 +443,9 @@ class mailing_contacts1 extends MailingTargets } $sql .= " ORDER BY sp.email"; - // print "wwwwwwx".$sql; - // Stocke destinataires dans cibles + //print "wwwwwwx".$sql; + + // Store recipients in target tables $result = $this->db->query($sql); if ($result) { $num = $this->db->num_rows($result); diff --git a/htdocs/core/modules/mailings/thirdparties.modules.php b/htdocs/core/modules/mailings/thirdparties.modules.php index bc9a763ab1f..e678dab33ed 100644 --- a/htdocs/core/modules/mailings/thirdparties.modules.php +++ b/htdocs/core/modules/mailings/thirdparties.modules.php @@ -126,11 +126,11 @@ class mailing_thirdparties extends MailingTargets $addDescription .= $langs->trans("Disabled"); } } - if (GETPOST('default_lang', 'alpha')) { + if (GETPOST('default_lang', 'alpha') && GETPOST('default_lang', 'alpha') != '-1') { $addFilter .= " AND s.default_lang LIKE '".$this->db->escape(GETPOST('default_lang', 'alpha'))."%'"; $addDescription = $langs->trans('DefaultLang')."="; } - if (GETPOST('filter_lang_thirdparties', 'alpha')) { + if (GETPOST('filter_lang_thirdparties', 'alpha') && GETPOST('filter_lang_thirdparties', 'alpha') != '-1') { $addFilter .= " AND s.default_lang LIKE '".$this->db->escape(GETPOST('filter_lang_thirdparties', 'alpha'))."%'"; $addDescription = $langs->trans('DefaultLang')."="; } @@ -280,7 +280,7 @@ class mailing_thirdparties extends MailingTargets $langs->load("companies"); // filter - $s = ''; // Show categories $sql = "SELECT rowid, label, type, visible"; @@ -316,10 +316,12 @@ class mailing_thirdparties extends MailingTargets if ($obj->type == 2) { $type = $langs->trans("Customer"); } - $s .= ''; $i++; } @@ -370,7 +372,7 @@ class mailing_thirdparties extends MailingTargets $formadmin = new FormAdmin($this->db); $s .= img_picto($langs->trans("DefaultLang"), 'language', 'class="pictofixedwidth"'); //$s .= ''.$langs->trans("DefaultLang").': '; - $s .= $formadmin->select_language($langs->getDefaultLang(1), 'filter_lang_thirdparties', 0, null, $langs->trans("DefaultLang"), 0, 0, '', 0, 0, 0, null, 1); + $s .= $formadmin->select_language(GETPOST('filter_lang_thirdparties', 'aZ09'), 'filter_lang_thirdparties', 0, null, $langs->trans("DefaultLang"), 0, 0, '', 0, 0, 0, null, 1); } return $s;