Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2026-02-13 11:15:21 +01:00
Code Issues Packages Projects Releases Wiki Activity

Debug v20

Browse Source
This commit is contained in:
Laurent Destailleur
2024-07-22 21:49:47 +02:00
parent 6442a0d30c
commit 403fcd234e
4 changed files with 98 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -499,7 +499,7 @@ class FormMail extends Form
$modelmail_array = array();
if ($this->param['models'] != 'none') {
$result = $this->fetchAllEMailTemplate($this->param["models"], $user, $outputlangs);
$result = $this->fetchAllEMailTemplate($this->param["models"], $user, $outputlangs); // Fill $this->lines_model
if ($result < 0) {
setEventMessages($this->error, $this->errors, 'errors');
}
@@ -1604,7 +1604,7 @@ class FormMail extends Form
$languagetosearchmain = '';
}
$sql = "SELECT rowid, module, label, type_template, topic, email_from, joinfiles, content, content_lines, lang, email_from, email_to, email_tocc, email_tobcc";
$sql = "SELECT rowid, entity, module, label, type_template, topic, email_from, joinfiles, content, content_lines, lang, email_from, email_to, email_tocc, email_tobcc";
$sql .= " FROM ".$dbs->prefix().'c_email_templates';
$sql .= " WHERE (type_template = '".$dbs->escape($type_template)."' OR type_template = 'all')";
$sql .= " AND entity IN (".getEntity('c_email_templates').")";
@@ -1627,6 +1627,7 @@ class FormMail extends Form
if ($id == -1) {
$sql .= " AND position = 0";
}
$sql .= " AND entity IN(".getEntity('c_email_templates', 1).")";
if ($languagetosearch) {
$sql .= $dbs->order("position,lang,label", "ASC,DESC,ASC"); // We want line with lang set first, then with lang null or ''
} else {
@@ -1753,7 +1754,7 @@ class FormMail extends Form
}
/**
* Find if template exists and are available for current user, then set them into $this->lines_module.
* Find if template exists and are available for current user, then set them into $this->lines_model.
* Search into table c_email_templates
*
* @param string $type_template Get message for key module