diff --git a/htdocs/comm/propal.php b/htdocs/comm/propal.php index 43d8e2b45f5..9bfeb55c074 100644 --- a/htdocs/comm/propal.php +++ b/htdocs/comm/propal.php @@ -809,7 +809,6 @@ if ($_GET["propalid"]) $formmail->fromname = $user->fullname; $formmail->frommail = $user->email; $formmail->withfrom=1; -// $formmail->withto=array_merge(array(" "),$soc->contact_email_array()); $formmail->withto=ucfirst(strtolower($obj->firstname)) . " " . ucfirst(strtolower($obj->name)) . " <$obj->email>"; $formmail->withcc=1; $formmail->withtopic=1; diff --git a/htdocs/compta/facture.php b/htdocs/compta/facture.php index 8c78948a63c..fad30448e5d 100644 --- a/htdocs/compta/facture.php +++ b/htdocs/compta/facture.php @@ -1385,13 +1385,18 @@ else print '
'; print_titre("Envoyer une relance par mail"); + $liste[0]=" "; + foreach ($soc->contact_email_array() as $key=>$value) { + $liste[$key]=$value; + } + // Créé l'objet formulaire mail include_once("../html.formmail.class.php"); $formmail = new FormMail($db); $formmail->fromname = $user->fullname; $formmail->frommail = $user->email; $formmail->withfrom=1; - $formmail->withto=array_merge(array(" "),$soc->contact_email_array()); + $formmail->withto=$liste; $formmail->withcc=1; $formmail->withtopic=1; $formmail->withfile=1; diff --git a/htdocs/langs/en_US/mails.lang b/htdocs/langs/en_US/mails.lang index fba621551ef..4076678a134 100644 --- a/htdocs/langs/en_US/mails.lang +++ b/htdocs/langs/en_US/mails.lang @@ -24,6 +24,6 @@ MailingStatusDraft=Draft MailingStatusValidated=Validated MailingStatusApproved=Approved MailingStatusSent=Sent -MailSuccessfulySent=Mail successfuly sent +MailSuccessfulySent=Mail successfuly sent (from %s to %s) ErrorMailRecipientIsEmpty=Mail recipient is empty diff --git a/htdocs/langs/fr_FR/mails.lang b/htdocs/langs/fr_FR/mails.lang index fc1905bb619..c39dacfc76f 100644 --- a/htdocs/langs/fr_FR/mails.lang +++ b/htdocs/langs/fr_FR/mails.lang @@ -24,5 +24,5 @@ MailingStatusDraft=Brouillon MailingStatusValidated=Validé MailingStatusApproved=Apprové MailingStatusSent=Envoyé -MailSuccessfulySent=Mail envoyé avec succès +MailSuccessfulySent=Mail envoyé avec succès (de la part de %s pour %s) ErrorMailRecipientIsEmpty=Le mail du destinataire est vide