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

NEW Can get template of email from its label

Browse Source
This commit is contained in:
Laurent Destailleur 2018-02-23 11:23:36 +01:00
parent 829de06bf6
commit 82ae65b18d
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/categories/class/categorie.class.php
View File

@ -716,7 +716,7 @@ class Categorie extends CommonObject
} }
// Call trigger // Call trigger
$this->linkto=$obj; // Deprecated. Save object we want to link category to into category instance to provide information to trigger $this->linkto=$obj; // Deprecated. Save object we want to link category to into category instance to provide information to trigger
$this->context=array('linkto'=>$obj); // Save object we want to link category to into category instance to provide information to trigger $this->context=array('linkto'=>$obj); // Save object we want to link category to into category instance to provide information to trigger

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

@ -984,9 +984,10 @@ class FormMail extends Form
* @param Translate $outputlangs Output lang object * @param Translate $outputlangs Output lang object
* @param int $id Id of template to find, or -1 for first found with lower position, or 0 for first found whatever is position * @param int $id Id of template to find, or -1 for first found with lower position, or 0 for first found whatever is position
* @param int $active 1=Only active template, 0=Only disabled, -1=All * @param int $active 1=Only active template, 0=Only disabled, -1=All
* @param string $label Label of template
* @return array array('topic'=>,'content'=>,..) * @return array array('topic'=>,'content'=>,..)
*/ */
public function getEMailTemplate($db, $type_template, $user, $outputlangs, $id=0, $active=1) public function getEMailTemplate($db, $type_template, $user, $outputlangs, $id=0, $active=1, $label='')
{ {
$ret=array(); $ret=array();
@ -996,6 +997,7 @@ class FormMail extends Form
$sql.= " AND entity IN (".getEntity('c_email_templates').")"; $sql.= " AND entity IN (".getEntity('c_email_templates').")";
$sql.= " AND (private = 0 OR fk_user = ".$user->id.")"; // Get all public or private owned $sql.= " AND (private = 0 OR fk_user = ".$user->id.")"; // Get all public or private owned
if ($active >= 0) $sql.=" AND active = ".$active; if ($active >= 0) $sql.=" AND active = ".$active;
if ($label) $sql.=" AND label ='".$this->db->escape($label)."'";
if (is_object($outputlangs)) $sql.= " AND (lang = '".$outputlangs->defaultlang."' OR lang IS NULL OR lang = '')"; if (is_object($outputlangs)) $sql.= " AND (lang = '".$outputlangs->defaultlang."' OR lang IS NULL OR lang = '')";
if ($id > 0) $sql.= " AND rowid=".$id; if ($id > 0) $sql.= " AND rowid=".$id;
if ($id == -1) $sql.= " AND position=0"; if ($id == -1) $sql.= " AND position=0";