Merge pull request #4944 from FHenry/develop_advtargetemailiing

NEW : Advance target emailing
This commit is contained in:
Laurent Destailleur
2016-05-05 23:18:27 +02:00
21 changed files with 3402 additions and 118 deletions

View File

@@ -38,7 +38,7 @@ function emailing_prepare_head(Mailing $object)
$head[$h][1] = $langs->trans("MailCard");
$head[$h][2] = 'card';
$h++;
if (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! $user->rights->mailing->mailing_advance->recipient) {
return $head;
}
@@ -48,11 +48,16 @@ function emailing_prepare_head(Mailing $object)
$head[$h][2] = 'targets';
$h++;
$head[$h][0] = DOL_URL_ROOT."/comm/mailing/advtargetemailing.php?id=".$object->id;
$head[$h][1] = $langs->trans("MailAdvTargetRecipients");
$head[$h][2] = 'advtargets';
$h++;
$head[$h][0] = DOL_URL_ROOT."/comm/mailing/info.php?id=".$object->id;
$head[$h][1] = $langs->trans("Info");
$head[$h][2] = 'info';
$h++;
complete_head_from_modules($conf,$langs,$object,$head,$h,'emailing');
complete_head_from_modules($conf,$langs,$object,$head,$h,'emailing','remove');