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

FIX #16420 #16423 #16488 #16477

Browse Source
This commit is contained in:
Laurent Destailleur 2021-02-28 12:47:24 +01:00
parent 753b1d1e11
commit 3a19cbb062
2 changed files with 86 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/admin/mails_templates.php
View File

@ -840,6 +840,7 @@ if ($resql)
print "</tr>\n"; print "</tr>\n";
} else { } else {
// If template is for a module, check module is enabled.
if ($obj->module) { if ($obj->module) {
$tempmodulekey = $obj->module; $tempmodulekey = $obj->module;
if (empty($conf->$tempmodulekey) || empty($conf->$tempmodulekey->enabled)) { if (empty($conf->$tempmodulekey) || empty($conf->$tempmodulekey->enabled)) {
@ -847,6 +848,7 @@ if ($resql)
continue; continue;
} }
} }
$keyforobj = 'type_template'; $keyforobj = 'type_template';
if (!in_array($obj->$keyforobj, array_keys($elementList))) if (!in_array($obj->$keyforobj, array_keys($elementList)))
{ {

137
htdocs/core/class/html.formmail.class.php
View File

@ -329,9 +329,8 @@ class FormMail extends Form
// Load translation files required by the page // Load translation files required by the page
$langs->loadLangs(array('other', 'mails')); $langs->loadLangs(array('other', 'mails'));
// Clear temp files. Must be done at beginning, before call of triggers // Clear temp files. Must be done before call of triggers, at beginning (mode = init), or when we select a new template
if (GETPOST('mode', 'alpha') == 'init' || (GETPOST('modelmailselected', 'alpha') && GETPOST('modelmailselected', 'alpha') != '-1')) if (GETPOST('mode', 'alpha') == 'init' || (GETPOST('modelselected') && GETPOST('modelmailselected', 'alpha') && GETPOST('modelmailselected', 'alpha') != '-1')) {
{
$this->clear_attached_files(); $this->clear_attached_files();
} }
@ -1201,6 +1200,8 @@ class FormMail extends Form
*/ */
public function getEMailTemplate($db, $type_template, $user, $outputlangs, $id = 0, $active = 1, $label = '') public function getEMailTemplate($db, $type_template, $user, $outputlangs, $id = 0, $active = 1, $label = '')
{ {
global $conf;
$ret = new ModelMail(); $ret = new ModelMail();
if ($id == -2 && empty($label)) { if ($id == -2 && empty($label)) {
@ -1214,7 +1215,7 @@ class FormMail extends Form
$languagetosearchmain = $tmparray[0].'_'.strtoupper($tmparray[0]); $languagetosearchmain = $tmparray[0].'_'.strtoupper($tmparray[0]);
if ($languagetosearchmain == $languagetosearch) $languagetosearchmain = ''; if ($languagetosearchmain == $languagetosearch) $languagetosearchmain = '';
$sql = "SELECT rowid, label, topic, joinfiles, content, content_lines, lang"; $sql = "SELECT rowid, module, label, type_template, topic, joinfiles, content, content_lines, lang";
$sql .= " FROM ".MAIN_DB_PREFIX.'c_email_templates'; $sql .= " FROM ".MAIN_DB_PREFIX.'c_email_templates';
$sql .= " WHERE (type_template='".$db->escape($type_template)."' OR type_template='all')"; $sql .= " WHERE (type_template='".$db->escape($type_template)."' OR type_template='all')";
$sql .= " AND entity IN (".getEntity('c_email_templates').")"; $sql .= " AND entity IN (".getEntity('c_email_templates').")";
@ -1226,72 +1227,92 @@ class FormMail extends Form
if ($id == -1) $sql .= " AND position=0"; if ($id == -1) $sql .= " AND position=0";
if ($languagetosearch) $sql .= $db->order("position,lang,label", "ASC,DESC,ASC"); // We want line with lang set first, then with lang null or '' if ($languagetosearch) $sql .= $db->order("position,lang,label", "ASC,DESC,ASC"); // We want line with lang set first, then with lang null or ''
else $sql .= $db->order("position,lang,label", "ASC,ASC,ASC"); // If no language provided, we give priority to lang not defined else $sql .= $db->order("position,lang,label", "ASC,ASC,ASC"); // If no language provided, we give priority to lang not defined
$sql .= $db->plimit(1); //$sql .= $db->plimit(1);
//print $sql; //print $sql;
$resql = $db->query($sql); $resql = $db->query($sql);
if ($resql) if (!$resql)
{ {
// Get first found dol_print_error($db);
return -1;
}
// Get first found
while (1) {
$obj = $db->fetch_object($resql); $obj = $db->fetch_object($resql);
if ($obj) { if ($obj) {
// If template is for a module, check module is enabled; if not, take next template
if ($obj->module) {
$tempmodulekey = $obj->module;
if (empty($conf->$tempmodulekey) || empty($conf->$tempmodulekey->enabled)) {
continue;
}
}
// If a record was found
$ret->id = $obj->rowid; $ret->id = $obj->rowid;
$ret->module = $obj->module;
$ret->label = $obj->label; $ret->label = $obj->label;
$ret->lang = $obj->lang; $ret->lang = $obj->lang;
$ret->topic = $obj->topic; $ret->topic = $obj->topic;
$ret->content = $obj->content; $ret->content = $obj->content;
$ret->content_lines = $obj->content_lines; $ret->content_lines = $obj->content_lines;
$ret->joinfiles = $obj->joinfiles; $ret->joinfiles = $obj->joinfiles;
} elseif ($id == -2) {
// Not found with the provided label
return -1;
} else { // If there is no template at all
$defaultmessage = '';
if ($type_template == 'body') { break;
// Special case to use this->withbody as content } else {
$defaultmessage = $this->withbody; // If no record found
} elseif ($type_template == 'facture_send') { if ($id == -2) {
$defaultmessage = $outputlangs->transnoentities("PredefinedMailContentSendInvoice"); // Not found with the provided label
} elseif ($type_template == 'facture_relance') { return -1;
$defaultmessage = $outputlangs->transnoentities("PredefinedMailContentSendInvoiceReminder"); } else {
} elseif ($type_template == 'propal_send') { // If there is no template at all
$defaultmessage = $outputlangs->transnoentities("PredefinedMailContentSendProposal"); $defaultmessage = '';
} elseif ($type_template == 'supplier_proposal_send') {
$defaultmessage = $outputlangs->transnoentities("PredefinedMailContentSendSupplierProposal"); if ($type_template == 'body') {
} elseif ($type_template == 'order_send') { // Special case to use this->withbody as content
$defaultmessage = $outputlangs->transnoentities("PredefinedMailContentSendOrder"); $defaultmessage = $this->withbody;
} elseif ($type_template == 'order_supplier_send') { } elseif ($type_template == 'facture_send') {
$defaultmessage = $outputlangs->transnoentities("PredefinedMailContentSendSupplierOrder"); $defaultmessage = $outputlangs->transnoentities("PredefinedMailContentSendInvoice");
} elseif ($type_template == 'invoice_supplier_send') { } elseif ($type_template == 'facture_relance') {
$defaultmessage = $outputlangs->transnoentities("PredefinedMailContentSendSupplierInvoice"); $defaultmessage = $outputlangs->transnoentities("PredefinedMailContentSendInvoiceReminder");
} elseif ($type_template == 'shipping_send') { } elseif ($type_template == 'propal_send') {
$defaultmessage = $outputlangs->transnoentities("PredefinedMailContentSendShipping"); $defaultmessage = $outputlangs->transnoentities("PredefinedMailContentSendProposal");
} elseif ($type_template == 'fichinter_send') { } elseif ($type_template == 'supplier_proposal_send') {
$defaultmessage = $outputlangs->transnoentities("PredefinedMailContentSendFichInter"); $defaultmessage = $outputlangs->transnoentities("PredefinedMailContentSendSupplierProposal");
} elseif ($type_template == 'actioncomm_send') { } elseif ($type_template == 'order_send') {
$defaultmessage = $outputlangs->transnoentities("PredefinedMailContentSendActionComm"); $defaultmessage = $outputlangs->transnoentities("PredefinedMailContentSendOrder");
} elseif ($type_template == 'thirdparty') { } elseif ($type_template == 'order_supplier_send') {
$defaultmessage = $outputlangs->transnoentities("PredefinedMailContentThirdparty"); $defaultmessage = $outputlangs->transnoentities("PredefinedMailContentSendSupplierOrder");
} elseif (!empty($type_template)) { } elseif ($type_template == 'invoice_supplier_send') {
$defaultmessage = $outputlangs->transnoentities("PredefinedMailContentGeneric"); $defaultmessage = $outputlangs->transnoentities("PredefinedMailContentSendSupplierInvoice");
} elseif ($type_template == 'shipping_send') {
$defaultmessage = $outputlangs->transnoentities("PredefinedMailContentSendShipping");
} elseif ($type_template == 'fichinter_send') {
$defaultmessage = $outputlangs->transnoentities("PredefinedMailContentSendFichInter");
} elseif ($type_template == 'actioncomm_send') {
$defaultmessage = $outputlangs->transnoentities("PredefinedMailContentSendActionComm");
} elseif ($type_template == 'thirdparty') {
$defaultmessage = $outputlangs->transnoentities("PredefinedMailContentThirdparty");
} elseif (!empty($type_template)) {
$defaultmessage = $outputlangs->transnoentities("PredefinedMailContentGeneric");
}
$ret->label = 'default';
$ret->lang = $outputlangs->defaultlang;
$ret->topic = '';
$ret->joinfiles = 1;
$ret->content = $defaultmessage;
$ret->content_lines = '';
break;
} }
$ret->label = 'default';
$ret->lang = $outputlangs->defaultlang;
$ret->topic = '';
$ret->joinfiles = 1;
$ret->content = $defaultmessage;
$ret->content_lines = '';
} }
$db->free($resql);
return $ret;
} else {
dol_print_error($db);
return -1;
} }
$db->free($resql);
return $ret;
} }
/** /**
@ -1338,7 +1359,9 @@ class FormMail extends Form
*/ */
public function fetchAllEMailTemplate($type_template, $user, $outputlangs, $active = 1) public function fetchAllEMailTemplate($type_template, $user, $outputlangs, $active = 1)
{ {
$sql = "SELECT rowid, label, topic, content, content_lines, lang, fk_user, private, position"; global $conf;
$sql = "SELECT rowid, module, label, topic, content, content_lines, lang, fk_user, private, position";
$sql .= " FROM ".MAIN_DB_PREFIX.'c_email_templates'; $sql .= " FROM ".MAIN_DB_PREFIX.'c_email_templates';
$sql .= " WHERE type_template IN ('".$this->db->escape($type_template)."', 'all')"; $sql .= " WHERE type_template IN ('".$this->db->escape($type_template)."', 'all')";
$sql .= " AND entity IN (".getEntity('c_email_templates').")"; $sql .= " AND entity IN (".getEntity('c_email_templates').")";
@ -1355,6 +1378,14 @@ class FormMail extends Form
$this->lines_model = array(); $this->lines_model = array();
while ($obj = $this->db->fetch_object($resql)) while ($obj = $this->db->fetch_object($resql))
{ {
// If template is for a module, check module is enabled.
if ($obj->module) {
$tempmodulekey = $obj->module;
if (empty($conf->$tempmodulekey) || empty($conf->$tempmodulekey->enabled)) {
continue;
}
}
$line = new ModelMail(); $line = new ModelMail();
$line->id = $obj->rowid; $line->id = $obj->rowid;
$line->label = $obj->label; $line->label = $obj->label;