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

Merge pull request #11084 from atm-florian/dev_MassSendEmailInvoiceToBillingContact

Browse Source 
NEW : mass email action on invoice list use billing contact if exists
This commit is contained in:
Laurent Destailleur 2019-10-20 21:45:37 +02:00 committed by GitHub
commit 6e9f3c3f9d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 35 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
htdocs/core/actions_massactions.inc.php
View File

@ -71,7 +71,9 @@ if (! $error && $massaction == 'confirm_presend')
$listofobjectid=array(); $listofobjectid=array();
$listofobjectthirdparties=array(); $listofobjectthirdparties=array();
$listofobjectcontacts = array();
$listofobjectref=array(); $listofobjectref=array();
$contactidtosend=array();
$attachedfilesThirdpartyObj=array(); $attachedfilesThirdpartyObj=array();
$oneemailperrecipient=(GETPOST('oneemailperrecipient')=='on'?1:0); $oneemailperrecipient=(GETPOST('oneemailperrecipient')=='on'?1:0);
@ -97,11 +99,21 @@ if (! $error && $massaction == 'confirm_presend')
if ($objecttmp->element == 'holiday') $thirdpartyid=$objecttmp->fk_user; if ($objecttmp->element == 'holiday') $thirdpartyid=$objecttmp->fk_user;
if (empty($thirdpartyid)) $thirdpartyid=0; if (empty($thirdpartyid)) $thirdpartyid=0;
$listofobjectthirdparties[$thirdpartyid]=$thirdpartyid; if ($objectclass == 'Facture') {
$listofobjectref[$thirdpartyid][$toselectid]=$objecttmp; $tmparraycontact = array();
} $tmparraycontact = $objecttmp->liste_contact(-1, 'external', 0, 'BILLING');
} if (is_array($tmparraycontact) && count($tmparraycontact) > 0) {
} foreach ($tmparraycontact as $data_email) {
$listofobjectcontacts[$toselectid][$data_email['id']] = $data_email['email'];
}
}
}
$listofobjectthirdparties[$thirdpartyid]=$thirdpartyid;
$listofobjectref[$thirdpartyid][$toselectid]=$objecttmp;
}
}
}
// Check mandatory parameters // Check mandatory parameters
if (GETPOST('fromtype', 'alpha') === 'user' && empty($user->email)) if (GETPOST('fromtype', 'alpha') === 'user' && empty($user->email))
@ -248,6 +260,22 @@ if (! $error && $massaction == 'confirm_presend')
$fuser->fetch($objectobj->fk_user); $fuser->fetch($objectobj->fk_user);
$sendto = $fuser->email; $sendto = $fuser->email;
} }
elseif ($objectobj->element == 'facture' && !empty($listofobjectcontacts[$objectid]))
{
$emails_to_sends = array();
$objectobj->fetch_thirdparty();
$contactidtosend=array();
foreach ($listofobjectcontacts[$objectid] as $contactemailid => $contactemailemail) {
$emails_to_sends[] = $objectobj->thirdparty->contact_get_property($contactemailid, 'email');
if (!in_array($contactemailid, $contactidtosend)) {
$contactidtosend[] = $contactemailid;
}
}
if (count($emails_to_sends) > 0) {
$sendto = implode(',', $emails_to_sends);
}
}
else else
{ {
$objectobj->fetch_thirdparty(); $objectobj->fetch_thirdparty();
@ -498,8 +526,8 @@ if (! $error && $massaction == 'confirm_presend')
} }
$actionmsg2=''; $actionmsg2='';
// Initialisation donnees // Initialisation donnees
$objectobj2->sendtoid = 0; $objectobj2->sendtoid = (empty($contactidtosend)?0:$contactidtosend);
$objectobj2->actionmsg = $actionmsg; // Long text $objectobj2->actionmsg = $actionmsg; // Long text
$objectobj2->actionmsg2 = $actionmsg2; // Short text $objectobj2->actionmsg2 = $actionmsg2; // Short text
$objectobj2->fk_element = $objid2; $objectobj2->fk_element = $objid2;