|
@@ -147,7 +147,7 @@ if ($action == 'presend') {
|
|
|
$formmail->trackid = $trackid;
|
|
|
$formmail->withfrom = 1;
|
|
|
|
|
|
- // Fill list of recipient with email inside <>.
|
|
|
+ // Define $liste, a list of recipients with email inside <>.
|
|
|
$liste = array();
|
|
|
if ($object->element == 'expensereport') {
|
|
|
$fuser = new User($db);
|
|
@@ -193,16 +193,6 @@ if ($action == 'presend') {
|
|
|
}
|
|
|
}
|
|
|
|
|
|
- $formmail->withto = $liste;
|
|
|
- $formmail->withtofree = (GETPOST('sendto', 'alphawithlgt') ? GETPOST('sendto', 'alphawithlgt') : '1');
|
|
|
- $formmail->withtocc = $liste;
|
|
|
- $formmail->withtoccc = getDolGlobalString('MAIN_EMAIL_USECCC');
|
|
|
- $formmail->withtopic = $topicmail;
|
|
|
- $formmail->withfile = 2;
|
|
|
- $formmail->withbody = 1;
|
|
|
- $formmail->withdeliveryreceipt = 1;
|
|
|
- $formmail->withcancel = 1;
|
|
|
-
|
|
|
//$arrayoffamiliestoexclude=array('system', 'mycompany', 'object', 'objectamount', 'date', 'user', ...);
|
|
|
if (!isset($arrayoffamiliestoexclude)) {
|
|
|
$arrayoffamiliestoexclude = null;
|
|
@@ -210,6 +200,7 @@ if ($action == 'presend') {
|
|
|
|
|
|
// Make substitution in email content
|
|
|
if ($object) {
|
|
|
+ // First we set ->substit (useless, it will be erased later) and ->substit_lines
|
|
|
$formmail->setSubstitFromObject($object, $langs);
|
|
|
}
|
|
|
$substitutionarray = getCommonSubstitutionArray($outputlangs, 0, $arrayoffamiliestoexclude, $object);
|
|
@@ -228,7 +219,7 @@ if ($action == 'presend') {
|
|
|
);
|
|
|
complete_substitutions_array($substitutionarray, $outputlangs, $object, $parameters);
|
|
|
|
|
|
- // Find the good contact address
|
|
|
+ // Find all external contact addresses
|
|
|
$tmpobject = $object;
|
|
|
if (($object->element == 'shipping' || $object->element == 'reception')) {
|
|
|
$origin = $object->origin;
|
|
@@ -280,17 +271,46 @@ if ($action == 'presend') {
|
|
|
|
|
|
if (is_array($contactarr) && count($contactarr) > 0) {
|
|
|
require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
|
|
|
+ require_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
|
|
|
$contactstatic = new Contact($db);
|
|
|
+ $tmpcompany = new Societe($db);
|
|
|
|
|
|
foreach ($contactarr as $contact) {
|
|
|
$contactstatic->fetch($contact['id']);
|
|
|
+ // Complete substitution array
|
|
|
$substitutionarray['__CONTACT_NAME_'.$contact['code'].'__'] = $contactstatic->getFullName($outputlangs, 1);
|
|
|
$substitutionarray['__CONTACT_LASTNAME_'.$contact['code'].'__'] = $contactstatic->lastname;
|
|
|
$substitutionarray['__CONTACT_FIRSTNAME_'.$contact['code'].'__'] = $contactstatic->firstname;
|
|
|
$substitutionarray['__CONTACT_TITLE_'.$contact['code'].'__'] = $contactstatic->getCivilityLabel();
|
|
|
+
|
|
|
+ // Complete $liste with the $contact
|
|
|
+ if (empty($liste[$contact['id']])) { // If this contact id not already into the $liste
|
|
|
+ $contacttoshow = '';
|
|
|
+ if (isset($object->thirdparty) && is_object($object->thirdparty)) {
|
|
|
+ if ($contactstatic->fk_soc != $object->thirdparty->id) {
|
|
|
+ $tmpcompany->fetch($contactstatic->fk_soc);
|
|
|
+ if ($tmpcompany->id > 0) {
|
|
|
+ $contacttoshow .= $tmpcompany->name.': ';
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+ $contacttoshow .= $contactstatic->getFullName($outputlangs, 1);
|
|
|
+ $contacttoshow .= " <".($contactstatic->email ? $contactstatic->email : $langs->transnoentitiesnoconv("NoEMail")) .">";
|
|
|
+ $liste[$contact['id']] = $contacttoshow;
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
|
|
|
+ $formmail->withto = $liste;
|
|
|
+ $formmail->withtofree = (GETPOST('sendto', 'alphawithlgt') ? GETPOST('sendto', 'alphawithlgt') : '1');
|
|
|
+ $formmail->withtocc = $liste;
|
|
|
+ $formmail->withtoccc = getDolGlobalString('MAIN_EMAIL_USECCC');
|
|
|
+ $formmail->withtopic = $topicmail;
|
|
|
+ $formmail->withfile = 2;
|
|
|
+ $formmail->withbody = 1;
|
|
|
+ $formmail->withdeliveryreceipt = 1;
|
|
|
+ $formmail->withcancel = 1;
|
|
|
+
|
|
|
// Array of substitutions
|
|
|
$formmail->substit = $substitutionarray;
|
|
|
|