diff --git a/htdocs/includes/modules/mailings/contacts2.modules.php b/htdocs/includes/modules/mailings/contacts2.modules.php index ed2117c233b515580a7c8b0c1279fbed82f6381c..2d60eb7a1fa51097ef8ad2b721bc84bb3e8d61b7 100755 --- a/htdocs/includes/modules/mailings/contacts2.modules.php +++ b/htdocs/includes/modules/mailings/contacts2.modules.php @@ -148,6 +148,9 @@ class mailing_contacts2 extends MailingTargets { global $conf; + // We must report here number of contacts when absolutely no filter selected (so all contacts). + // Number with a filter are show in the combo list for each filter. + // If we want a filter "function is defined", we must add it into formFilter $sql = "SELECT count(distinct(sp.email)) as nb"; $sql.= " FROM ".MAIN_DB_PREFIX."socpeople as sp,"; $sql.= " ".MAIN_DB_PREFIX."societe as s"; diff --git a/htdocs/includes/modules/mailings/contacts3.modules.php b/htdocs/includes/modules/mailings/contacts3.modules.php index 31d585aab035a6d527811f4bfc9d09f5712d74e9..4e507e2fabb69fb2066838d0a3a4d879923b5255 100755 --- a/htdocs/includes/modules/mailings/contacts3.modules.php +++ b/htdocs/includes/modules/mailings/contacts3.modules.php @@ -155,7 +155,18 @@ class mailing_contacts3 extends MailingTargets { global $conf; - $sql = "SELECT count(distinct(sp.email)) as nb"; + // We must report here number of contacts when absolutely no filter selected (so all contacts). + // Number with a filter are show in the combo list for each filter. + // If we want a filter "is inside at least one category", we must add it into formFilter + $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,"; @@ -166,6 +177,7 @@ class mailing_contacts3 extends MailingTargets $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);