Merge pull request #7879 from ptibogxiv/patch-7

fix for multicompany in mailing
Dolibarr · Nov 28, 2017 · 430c72b · 430c72b
2 parents c1e6d35 + 10b0eaf
commit 430c72b
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/htdocs/core/modules/mailings/fraise.modules.php b/htdocs/core/modules/mailings/fraise.modules.php
@@ -43,7 +43,6 @@ class mailing_fraise extends MailingTargets
 
     var $db;
 
-
     /**
      *    Constructor
      *
@@ -65,15 +64,15 @@ function __construct($db)
      */
     function getSqlArrayForStats()
     {
-        global $langs;
+        global $conf,$langs;
 
         $langs->load("members");
 
         // Array for requests for statistics board
         $statssql=array();
 
         $statssql[0] ="SELECT '".$this->db->escape($langs->trans("FundationMembers"))."' as label, count(*) as nb";
-        $statssql[0].=" FROM ".MAIN_DB_PREFIX."adherent where statut = 1";
+        $statssql[0].=" FROM ".MAIN_DB_PREFIX."adherent where statut = 1 and entity IN (".getEntity('member').")";
 
         return $statssql;
     }
@@ -89,9 +88,10 @@ function getSqlArrayForStats()
      */
     function getNbOfRecipients($sql='')
     {
+	global $conf;    
         $sql  = "SELECT count(distinct(a.email)) as nb";
         $sql .= " FROM ".MAIN_DB_PREFIX."adherent as a";
-        $sql .= " WHERE (a.email IS NOT NULL AND a.email != '')";
+        $sql .= " WHERE (a.email IS NOT NULL AND a.email != '') AND a.entity IN (".getEntity('member').")";
 
         // La requete doit retourner un champ "nb" pour etre comprise
         // par parent::getNbOfRecipients