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

FIX #6270

Browse Source
This commit is contained in:
Laurent Destailleur 2017-01-16 13:06:26 +01:00
parent c1d6ad90b3
commit 7ebb5f7d92
1 changed files with 20 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
htdocs/core/actions_sendmails.inc.php
View File

@ -337,24 +337,27 @@ if (($action == 'send' || $action == 'relance') && ! $_POST['addfile'] && ! $_PO
} }
// Initialisation of datas // Initialisation of datas
$object->socid = $sendtosocid; // To link to a company if (is_object($object))
$object->sendtoid = $sendtoid; // To link to a contact/address {
$object->actiontypecode = $actiontypecode; $object->socid = $sendtosocid; // To link to a company
$object->actionmsg = $actionmsg; // Long text $object->sendtoid = $sendtoid; // To link to a contact/address
$object->actionmsg2 = $actionmsg2; // Short text $object->actiontypecode = $actiontypecode;
$object->trackid = $trackid; $object->actionmsg = $actionmsg; // Long text
$object->fk_element = $object->id; $object->actionmsg2 = $actionmsg2; // Short text
$object->elementtype = $object->element; $object->trackid = $trackid;
$object->fk_element = $object->id;
// Call of triggers $object->elementtype = $object->element;
include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
$interface=new Interfaces($db); // Call of triggers
$result=$interface->run_triggers($trigger_name,$object,$user,$langs,$conf); include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
if ($result < 0) { $interface=new Interfaces($db);
$error++; $errors=$interface->errors; $result=$interface->run_triggers($trigger_name,$object,$user,$langs,$conf);
if ($result < 0) {
$error++; $errors=$interface->errors;
}
// End call of triggers
} }
// End call of triggers
if ($error) if ($error)
{ {
dol_print_error($db); dol_print_error($db);