diff --git a/htdocs/admin/mailing.php b/htdocs/admin/mailing.php
index bad34ac83b2..8808849b7ca 100644
--- a/htdocs/admin/mailing.php
+++ b/htdocs/admin/mailing.php
@@ -44,11 +44,14 @@ if ($action == 'setvalue' && $user->admin)
$mailfrom = GETPOST('MAILING_EMAIL_FROM','alpha');
$mailerror = GETPOST('MAILING_EMAIL_ERRORSTO','alpha');
+ $checkread = GETPOST('value','alpha');
$res=dolibarr_set_const($db, "MAILING_EMAIL_FROM",$mailfrom,'chaine',0,'',$conf->entity);
if (! $res > 0) $error++;
$res=dolibarr_set_const($db, "MAILING_EMAIL_ERRORSTO",$mailerror,'chaine',0,'',$conf->entity);
if (! $res > 0) $error++;
+ $res=dolibarr_set_const($db, "MAIN_SOCIETE_UNSUBSCRIBE",$checkread,'chaine',0,'',$conf->entity);
+ if (! $res > 0) $error++;
if (! $error)
{
@@ -101,6 +104,25 @@ print '';
+$var=!$var;
+print '
| ';
+print $langs->trans("ActivateCheckRead").' | ';
+if ($conf->global->MAIN_SOCIETE_UNSUBSCRIBE==1)
+{
+ print '';
+ print img_picto($langs->trans("Enabled"),'switch_on');
+ print '';
+}
+else
+{
+ print '';
+ print img_picto($langs->trans("Disabled"),'switch_off');
+ print '';
+}
+print ' |
';
+
+
+
print ' |
';
print '';
diff --git a/htdocs/comm/mailing/fiche.php b/htdocs/comm/mailing/fiche.php
index 5f02441159c..bf74bf0ad08 100644
--- a/htdocs/comm/mailing/fiche.php
+++ b/htdocs/comm/mailing/fiche.php
@@ -49,6 +49,7 @@ $substitutionarray=array(
'__EMAIL__' => 'EMail',
'__LASTNAME__' => 'Lastname',
'__FIRSTNAME__' => 'Firstname',
+ '__MAILTOEMAIL__' => 'MailtoEmail',
'__OTHER1__' => 'Other1',
'__OTHER2__' => 'Other2',
'__OTHER3__' => 'Other3',
@@ -73,6 +74,7 @@ $substitutionarrayfortest=array(
'__EMAIL__' => 'TESTEMail',
'__LASTNAME__' => 'TESTLastname',
'__FIRSTNAME__' => 'TESTFirstname',
+ '__MAILTOEMAIL__' => 'TESTMailtoEmail',
'__OTHER1__' => 'TESTOther1',
'__OTHER2__' => 'TESTOther2',
'__OTHER3__' => 'TESTOther3',
@@ -208,8 +210,9 @@ if ($action == 'sendallconfirmed' && $confirm == 'yes')
$substitutionarray=array(
'__ID__' => $obj->source_id,
'__EMAIL__' => $obj->email,
- '__CHECK_READ__' => '
',
+ '__CHECK_READ__' => '
',
'__UNSUSCRIBE__' => ''.$langs->trans("MailUnsubcribe").'',
+ '__MAILTOEMAIL__' => ''.$obj->email.'',
'__LASTNAME__' => $obj->nom,
'__FIRSTNAME__' => $obj->prenom,
'__OTHER1__' => $other1,
@@ -1048,6 +1051,7 @@ else
print '__CHECK_READ__ = '.$langs->trans("CheckRead").'
';
print '__UNSUSCRIBE__ = '.$langs->trans("MailUnsubcribe").'
';
}
+ print '__MAILTOEMAIL__ = '.$langs->trans("MailtoEMail").'
';
print '__LASTNAME__ = '.$langs->trans("Lastname").'
';
print '__FIRSTNAME__ = '.$langs->trans("Firstname").'
';
print '__OTHER1__ = '.$langs->trans("Other").'1
';
diff --git a/htdocs/langs/en_US/mails.lang b/htdocs/langs/en_US/mails.lang
index 9ada97fc97b..d5deed6ec64 100644
--- a/htdocs/langs/en_US/mails.lang
+++ b/htdocs/langs/en_US/mails.lang
@@ -75,6 +75,8 @@ SentTo=Sent to %s
MailingStatusRead=Read
CheckRead=Read Receipt
YourMailUnsubcribeOK=The email %s is correctly unsubcribe from mailing list
+MailtoEMail=Hyper link to email
+ActivateCheckRead=Activate Read receipt and unsubcribe tag
# Libelle des modules de liste de destinataires mailing
MailingModuleDescContactCompanies=Contacts of all third parties (customer, prospect, supplier, ...)
diff --git a/htdocs/langs/fr_FR/mails.lang b/htdocs/langs/fr_FR/mails.lang
index c80a79615aa..9e1b08b84d1 100644
--- a/htdocs/langs/fr_FR/mails.lang
+++ b/htdocs/langs/fr_FR/mails.lang
@@ -75,6 +75,8 @@ SentTo=Envoyés à %s
MailingStatusRead=Lu
CheckRead=Accusé de lecture
YourMailUnsubcribeOK=L'adresse e-mail %s est bien désincrite de la liste.
+MailtoEMail=Ecrire a e-mail (lien)
+ActivateCheckRead=Activer les tag d'accusé de lecture et de désincription
# Libelle des modules de liste de destinataires mailing
MailingModuleDescContactCompanies=Contacts de tiers (prospects, clients, fournisseurs...)
diff --git a/scripts/emailings/mailing-send.php b/scripts/emailings/mailing-send.php
index 3ccca19e5e8..98b4439ad5c 100644
--- a/scripts/emailings/mailing-send.php
+++ b/scripts/emailings/mailing-send.php
@@ -139,8 +139,9 @@ if ($resql)
$substitutionarray=array(
'__ID__' => $obj->source_id,
'__EMAIL__' => $obj->email,
- '__CHECK_READ__' => '
',
+ '__CHECK_READ__' => '
',
'__UNSUSCRIBE__' => ''.$langs->trans("MailUnsubcribe").'',
+ '__MAILTOEMAIL__' => ''.$obj->email.'',
'__LASTNAME__' => $obj->lastname,
'__FIRSTNAME__' => $obj->firstname,
'__OTHER1__' => $other1,