From 2f7167e512d4b8e5dc6d0b1c62e8ef1c7dc4e5e2 Mon Sep 17 00:00:00 2001 From: Regis Houssin Date: Wed, 23 Mar 2011 16:40:42 +0000 Subject: [PATCH] Fix: bad number of recipients --- .../modules/mailings/contacts2.modules.php | 1 + .../modules/mailings/contacts3.modules.php | 19 +++++++++++-------- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/htdocs/includes/modules/mailings/contacts2.modules.php b/htdocs/includes/modules/mailings/contacts2.modules.php index bcf4a9b4167..e128417b39e 100755 --- a/htdocs/includes/modules/mailings/contacts2.modules.php +++ b/htdocs/includes/modules/mailings/contacts2.modules.php @@ -154,6 +154,7 @@ class mailing_contacts2 extends MailingTargets $sql.= " AND s.entity = ".$conf->entity; $sql.= " AND sp.entity = ".$conf->entity; $sql.= " AND sp.email != ''"; // Note that null != '' is false + $sql.= " AND sp.poste != ''"; // La requete doit retourner un champ "nb" pour etre comprise // par parent::getNbOfRecipients return parent::getNbOfRecipients($sql); diff --git a/htdocs/includes/modules/mailings/contacts3.modules.php b/htdocs/includes/modules/mailings/contacts3.modules.php index 5f0108b757f..31d585aab03 100755 --- a/htdocs/includes/modules/mailings/contacts3.modules.php +++ b/htdocs/includes/modules/mailings/contacts3.modules.php @@ -83,7 +83,6 @@ class mailing_contacts3 extends MailingTargets $sql.= " AND sp.entity = ".$conf->entity; $sql.= " AND cs.fk_categorie = c.rowid"; $sql.= " AND cs.fk_societe = sp.fk_soc"; -print $sql; if ($filtersarray[0] <> 'all') $sql.= " AND c.label = '".$filtersarray[0]."'"; $sql.= " ORDER BY sp.name, sp.firstname"; @@ -156,13 +155,17 @@ print $sql; { global $conf; - $sql = "SELECT count(distinct(c.email)) as nb"; - $sql .= " FROM ".MAIN_DB_PREFIX."socpeople as c,"; - $sql .= " ".MAIN_DB_PREFIX."societe as s"; - $sql .= " WHERE s.rowid = c.fk_soc"; - $sql .= " AND c.entity = ".$conf->entity; - $sql .= " AND s.entity = ".$conf->entity; - $sql .= " AND c.email != ''"; // Note that null != '' is false + $sql = "SELECT count(distinct(sp.email)) as nb"; + $sql.= " FROM ".MAIN_DB_PREFIX."socpeople as sp,"; + $sql.= " ".MAIN_DB_PREFIX."societe as s,"; + $sql.= " ".MAIN_DB_PREFIX."categorie as c,"; + $sql.= " ".MAIN_DB_PREFIX."categorie_societe as cs"; + $sql.= " WHERE s.rowid = sp.fk_soc"; + $sql.= " AND sp.entity = ".$conf->entity; + $sql.= " AND s.entity = ".$conf->entity; + $sql.= " AND sp.email != ''"; // Note that null != '' is false + $sql.= " AND cs.fk_categorie = c.rowid"; + $sql.= " AND cs.fk_societe = sp.fk_soc"; // La requete doit retourner un champ "nb" pour etre comprise // par parent::getNbOfRecipients return parent::getNbOfRecipients($sql);