diff --git a/ChangeLog b/ChangeLog index dea1fe76b84..345db5fce40 100644 --- a/ChangeLog +++ b/ChangeLog @@ -4,7 +4,8 @@ English Dolibarr ChangeLog ***** ChangeLog for 2.8 compared to 2.7 ***** For users: -- New: Can filter on user on stock movement list +- New: Add a default errors-to email for emailing module. +- New: Can filter on user on stock movement list. - New: When creating a third party from a member, it is set as a new customer. - New: Can use {tttt} in numbering mask setup. It will be replaced diff --git a/htdocs/admin/mailing.php b/htdocs/admin/mailing.php index fdf249bea5b..850960d6e03 100644 --- a/htdocs/admin/mailing.php +++ b/htdocs/admin/mailing.php @@ -1,6 +1,6 @@ - * Copyright (C) 2005-2006 Laurent Destailleur + * Copyright (C) 2005-2009 Laurent Destailleur * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -16,13 +16,14 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ - + /** - \file htdocs/admin/mailing.php - \ingroup mailing - \brief Page to setup emailing module - \version $Id$ -*/ + * \file htdocs/admin/mailing.php + * \ingroup mailing + * \brief Page to setup emailing module + * \version $Id$ + */ + require("./pre.inc.php"); require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php"); @@ -38,8 +39,9 @@ if (!$user->admin) if ($_POST["action"] == 'setvalue' && $user->admin) { - $result=dolibarr_set_const($db, "MAILING_EMAIL_FROM",$_POST["email_from"],'chaine',0,'',$conf->entity); - if ($result >= 0) + $result1=dolibarr_set_const($db, "MAILING_EMAIL_FROM",$_POST["MAILING_EMAIL_FROM"],'chaine',0,'',$conf->entity); + $result2=dolibarr_set_const($db, "MAILING_EMAIL_ERRORSTO",$_POST["MAILING_EMAIL_ERRORSTO"],'chaine',0,'',$conf->entity); + if (($result1 + $result2) == 2) { $mesg='
'.$langs->trans("Success").'
'; } @@ -74,10 +76,17 @@ print ''; print ''.$langs->trans("Parameter").''; print ''.$langs->trans("Value").''; print "\n"; + $var=!$var; print ''; print $langs->trans("MailingEMailFrom").''; -print ''; +print ''; +print ''; + +$var=!$var; +print ''; +print $langs->trans("MailingEMailError").''; +print ''; print ''; print ''; diff --git a/htdocs/comm/mailing/fiche.php b/htdocs/comm/mailing/fiche.php index c359986b6ca..9b21d059591 100644 --- a/htdocs/comm/mailing/fiche.php +++ b/htdocs/comm/mailing/fiche.php @@ -497,7 +497,7 @@ if ($_GET["action"] == 'create') print ''.$langs->trans("MailFrom").''; print ''.$langs->trans("MailErrorsTo").''; print ''.$langs->trans("MailTopic").''; - print ''.$langs->trans("BackgroundColor").''; + print ''.$langs->trans("BackgroundColorByDefault").''; $htmlother->select_color($_POST['bgcolor'],'bgcolor','new_mailing'); print ''; print ''.$langs->trans("MailMessage").'
'; @@ -761,7 +761,7 @@ else print ''.$langs->trans("MailFrom").''; print ''.$langs->trans("MailErrorsTo").''; print ''.$langs->trans("MailTopic").''; - print ''.$langs->trans("BackgroundColor").''; + print ''.$langs->trans("BackgroundColorByDefault").''; $htmlother->select_color($mil->bgcolor,'bgcolor','edit_mailing'); print ''; print ''.$langs->trans("MailMessage").'
'; diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang index 804e31c3fbf..3e6814f671b 100644 --- a/htdocs/langs/en_US/admin.lang +++ b/htdocs/langs/en_US/admin.lang @@ -1013,6 +1013,7 @@ NewRSS=New RSS Feed ##### Mailing ##### MailingSetup=EMailing module setup MailingEMailFrom=Sender EMail (From) for emails sent by emailing module +MailingEMailError=Return EMail (Errors-to) for emails with errors ##### Notification ##### NotificationSetup=Notification bu email module setup NotificationEMailFrom=Sender EMail (From) for emails sent for notifications diff --git a/htdocs/langs/en_US/main.lang b/htdocs/langs/en_US/main.lang index 05e1450075f..c1e1d985964 100644 --- a/htdocs/langs/en_US/main.lang +++ b/htdocs/langs/en_US/main.lang @@ -46,6 +46,7 @@ ErrorNoSocialContributionForSellerCountry=Error, no social contribution type def ErrorFailedToSaveFile=Error, failed to save file. ErrorOnlyPngJpgSupported=Error, only .png and .jpg image format file are supported. ErrorImageFormatNotSupported=Your PHP does not support functions to convert images of this format. +BackgroundColorByDefault=Default background color GoToWikiHelpPage=Read online help (need Internet access) GoToHelpPage=Read help RecordSaved=Record saved diff --git a/htdocs/langs/fr_FR/admin.lang b/htdocs/langs/fr_FR/admin.lang index 33d4c55ba08..a14178036f9 100644 --- a/htdocs/langs/fr_FR/admin.lang +++ b/htdocs/langs/fr_FR/admin.lang @@ -1014,6 +1014,7 @@ NewRSS = Syndication d'un nouveau flux RSS ##### Mailing ##### = undefined MailingSetup = Configuration du module EMailing MailingEMailFrom = Email emetteur (From) des mails envoyés par EMailing +MailingEMailError = EMail retour (Errors-to) pour les réponses lors des envois par EMailing en erreur. ##### Notification ##### = undefined NotificationSetup = Configuration du module Notification NotificationEMailFrom = Email emetteur (From) des mails envoyés lors des notifications diff --git a/htdocs/langs/fr_FR/main.lang b/htdocs/langs/fr_FR/main.lang index 449842410ef..b726d0123fc 100644 --- a/htdocs/langs/fr_FR/main.lang +++ b/htdocs/langs/fr_FR/main.lang @@ -46,6 +46,7 @@ ErrorNoSocialContributionForSellerCountry=Erreur, aucun type de charges défini ErrorFailedToSaveFile=Erreur, l'enregistrement du fichier a échoué. ErrorOnlyPngJpgSupported=Erreur, seuls les formats images .jpg et .png sont supportés. ErrorImageFormatNotSupported=Votre PHP ne supporte pas les fonctions de conversion de ce format d'image. +BackgroundColorByDefault=Couleur de fond GoToWikiHelpPage=Consulter l'aide (nécessite un accès internet) GoToHelpPage=Consulter l'aide RecordSaved=Enregistrement sauvegardé