From 359571276c9b527e2501dc381bd83c277751b0dc Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 18 Sep 2005 18:20:42 +0000 Subject: [PATCH] =?UTF-8?q?Ajout=20de=20liens=20vers=20les=20=E9l=E9ments?= =?UTF-8?q?=20Dolibarr=20sur=20les=20pages=20de=20mailings?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- htdocs/comm/mailing/cibles.php | 18 ++++++++---------- htdocs/comm/mailing/fiche.php | 16 +++++++++++++--- .../modules/mailings/poire.modules.php | 4 ++-- 3 files changed, 23 insertions(+), 15 deletions(-) diff --git a/htdocs/comm/mailing/cibles.php b/htdocs/comm/mailing/cibles.php index 104152b5de0..ddbbd1bccda 100644 --- a/htdocs/comm/mailing/cibles.php +++ b/htdocs/comm/mailing/cibles.php @@ -167,19 +167,22 @@ if ($mil->fetch($_GET["id"]) == 0) if ($mesg) print "$mesg
\n"; + $var=!$var; + // Affiche les listes de sélection if ($mil->statut == 0) { + print '
'; + print_titre($langs->trans("ToClearAllRecipientsClickHere").':  
'); + print '
'; + + print_titre($langs->trans("ToAddRecipientsChooseHere").':'); print ''; print ''; print ''; print ''; print ''; - print ''; + print ''; print "\n"; clearstatcache(); @@ -256,11 +259,6 @@ if ($mil->fetch($_GET["id"]) == 0) } closedir($handle); - $var=!$var; - print ''; - print ''; - print ''; - print '
'.$langs->trans("RecipientSelectionModules").''.$langs->trans("NbOfUniqueEMails").''.$langs->trans("Parameters").''; - if ($mil->statut == 0) { - print $langs->trans("Actions"); - } - print ' 
   

'; } diff --git a/htdocs/comm/mailing/fiche.php b/htdocs/comm/mailing/fiche.php index 9f33588d684..c81fe94259e 100644 --- a/htdocs/comm/mailing/fiche.php +++ b/htdocs/comm/mailing/fiche.php @@ -239,10 +239,11 @@ if ($_GET["action"] == 'create') print ''.$langs->trans("MailTopic").''; print ''.$langs->trans("MailMessage").'
'; print '
'.$langs->trans("CommonSubstitutions").':
'; + print '__ID__ = '.$langs->trans("IdRecord").'
'; print '__EMAIL__ = '.$langs->trans("EMail").'
'; print '__LASTNAME__ = '.$langs->trans("Lastname").'
'; print '__FIRSTNAME__ = '.$langs->trans("Firstname").'
'; - print ''; + print ''; print ''; print ''; print ''; @@ -333,7 +334,9 @@ else // Contenu du mail print ''.$langs->trans("MailTopic").''.$mil->sujet.''; - print ''.$langs->trans("MailMessage").''; + print ''.$langs->trans("MailMessage").''; + + print ''; print nl2br($mil->body).''; print ''; @@ -420,7 +423,14 @@ else print ''.$langs->trans("MailTitle").''; print ''.$langs->trans("MailFrom").''; print ''.$langs->trans("MailTopic").''; - print ''.$langs->trans("MailMessage").''; print ''; diff --git a/htdocs/includes/modules/mailings/poire.modules.php b/htdocs/includes/modules/mailings/poire.modules.php index 0ffbb8075cd..5a0109a029d 100644 --- a/htdocs/includes/modules/mailings/poire.modules.php +++ b/htdocs/includes/modules/mailings/poire.modules.php @@ -54,7 +54,7 @@ include_once DOL_DOCUMENT_ROOT.'/includes/modules/mailings/modules_mailings.php' class mailing_poire extends MailingTargets { var $name='ContactCompanies'; // Identifiant du module mailing - var $desc='Contacts des sociétés'; // Libellé utilisé si aucune traduction pour MailingModuleDescXXX ou XXX=name trouvée + var $desc='Contacts avec emails des sociétés'; // Libellé utilisé si aucune traduction pour MailingModuleDescXXX ou XXX=name trouvée var $require_module=array("commercial"); // Module mailing actif si modules require_module actifs var $require_admin=0; // Module mailing actif pour user admin ou non var $picto='contact'; @@ -129,7 +129,7 @@ class mailing_poire extends MailingTargets function add_to_target($mailing_id,$filtersarray=array()) { // La requete doit retourner: id, email, fk_contact, name, firstname - $sql = "SELECT s.idp as id, c.email as email, c.idp as fk_contact, c.name as name, c.firstname as firstname"; + $sql = "SELECT c.idp as id, c.email as email, c.idp as fk_contact, c.name as name, c.firstname as firstname"; $sql .= " FROM ".MAIN_DB_PREFIX."socpeople as c"; $sql .= ", ".MAIN_DB_PREFIX."societe as s"; $sql .= " WHERE s.idp = c.fk_soc";