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

Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 16.0

Browse Source
This commit is contained in:
Laurent Destailleur 2022-12-26 15:28:11 +01:00
commit 6551b8afcc
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -408,7 +408,7 @@ class mailing_contacts1 extends MailingTargets
} }
// Filter on language // Filter on language
if ($filter_lang != '') { if (!empty($filter_lang)) {
$sql .= " AND sp.default_lang = '".$this->db->escape($filter_lang)."'"; $sql .= " AND sp.default_lang = '".$this->db->escape($filter_lang)."'";
} }
@ -439,7 +439,6 @@ class mailing_contacts1 extends MailingTargets
$sql .= " ORDER BY sp.email"; $sql .= " ORDER BY sp.email";
// print "wwwwwwx".$sql; // print "wwwwwwx".$sql;
// Stocke destinataires dans cibles // Stocke destinataires dans cibles
$result = $this->db->query($sql); $result = $this->db->query($sql);
if ($result) { if ($result) {

2
htdocs/core/tpl/card_presend.tpl.php
View File

@ -70,7 +70,7 @@ if ($action == 'presend') {
$outputlangs = new Translate('', $conf); $outputlangs = new Translate('', $conf);
$outputlangs->setDefaultLang($newlang); $outputlangs->setDefaultLang($newlang);
// Load traductions files required by page // Load traductions files required by page
$outputlangs->loadLangs(array('commercial', 'bills', 'orders', 'contracts', 'members', 'propal', 'products', 'supplier_proposal', 'interventions', 'receptions')); $outputlangs->loadLangs(array('commercial', 'bills', 'orders', 'contracts', 'members', 'propal', 'products', 'supplier_proposal', 'interventions', 'receptions', 'sendings'));
} }
$topicmail = ''; $topicmail = '';