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

Merge pull request #12915 from gti-eu/11.0

Browse Source 
Fix reference check on emailcollector
This commit is contained in:
Laurent Destailleur 2020-01-26 22:29:15 +01:00 committed by GitHub
commit 7e98414e3e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
htdocs/emailcollector/class/emailcollector.class.php
View File

@ -1243,34 +1243,34 @@ class EmailCollector extends CommonObject
$objectid = 0; $objectid = 0;
$objectemail = null; $objectemail = null;
if ($reg[0] == 'inv') if ($reg[1] == 'inv')
{ {
$objectid = $reg[1]; $objectid = $reg[2];
$objectemail = new Facture($this->db); $objectemail = new Facture($this->db);
} }
if ($reg[0] == 'proj') if ($reg[1] == 'proj')
{ {
$objectid = $reg[1]; $objectid = $reg[2];
$objectemail = new Project($this->db); $objectemail = new Project($this->db);
} }
if ($reg[0] == 'con') if ($reg[1] == 'con')
{ {
$objectid = $reg[1]; $objectid = $reg[2];
$objectemail = new Contact($this->db); $objectemail = new Contact($this->db);
} }
if ($reg[0] == 'thi') if ($reg[1] == 'thi')
{ {
$objectid = $reg[1]; $objectid = $reg[2];
$objectemail = new Societe($this->db); $objectemail = new Societe($this->db);
} }
if ($reg[0] == 'use') if ($reg[1] == 'use')
{ {
$objectid = $reg[1]; $objectid = $reg[2];
$objectemail = new User($this->db); $objectemail = new User($this->db);
} }
if ($reg[0] == 'tic') if ($reg[1] == 'tic')
{ {
$objectid = $reg[1]; $objectid = $reg[2];
$objectemail = new Ticket($this->db); $objectemail = new Ticket($this->db);
} }

3
htdocs/ticket/class/ticket.class.php
View File

@ -2753,7 +2753,8 @@ class Ticket extends CommonObject
$conf->global->MAIN_MAIL_AUTOCOPY_TO = ''; $conf->global->MAIN_MAIL_AUTOCOPY_TO = '';
} }
include_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php'; include_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php';
$mailfile = new CMailFile($subject, $receiver, $from, $message_to_send, $filepath, $mimetype, $filename, $sendtocc, '', $deliveryreceipt, -1); $trackid = "tic".$this->id;
$mailfile = new CMailFile($subject, $receiver, $from, $message_to_send, $filepath, $mimetype, $filename, $sendtocc, '', $deliveryreceipt, -1, '', '', $trackid);
if ($mailfile->error) { if ($mailfile->error) {
setEventMessages($mailfile->error, null, 'errors'); setEventMessages($mailfile->error, null, 'errors');
} else { } else {