From 77dd51602311aa429a050fd39d001ce33414e954 Mon Sep 17 00:00:00 2001 From: ptibogxiv Date: Sat, 22 Sep 2018 14:45:15 +0200 Subject: [PATCH 1/2] fix number mailing for a contact / multicompany --- htdocs/contact/class/contact.class.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/htdocs/contact/class/contact.class.php b/htdocs/contact/class/contact.class.php index 59ca7caaf99..7c27d172af1 100644 --- a/htdocs/contact/class/contact.class.php +++ b/htdocs/contact/class/contact.class.php @@ -1051,8 +1051,9 @@ class Contact extends CommonObject { $sql = "SELECT count(mc.email) as nb"; $sql.= " FROM ".MAIN_DB_PREFIX."mailing_cibles as mc"; - $sql.= " WHERE mc.email = '".$this->db->escape($this->email)."'"; - $sql.= " AND mc.statut NOT IN (-1,0)"; // -1 erreur, 0 non envoye, 1 envoye avec succes + $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."mailing as m on mc.fk_mailing=m.rowid"; + $sql.= " WHERE mc.email = '".$this->db->escape($this->email)."' "; + $sql.= " AND m.entity IN (".getEntity($this->element).") AND mc.statut NOT IN (-1,0)"; // -1 erreur, 0 non envoye, 1 envoye avec succes $resql=$this->db->query($sql); if ($resql) From 39e9029e4119c50250acb6312597fd20fe87d68b Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 23 Sep 2018 15:44:44 +0200 Subject: [PATCH 2/2] Update contact.class.php --- htdocs/contact/class/contact.class.php | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/htdocs/contact/class/contact.class.php b/htdocs/contact/class/contact.class.php index 7c27d172af1..fa31d91c6c4 100644 --- a/htdocs/contact/class/contact.class.php +++ b/htdocs/contact/class/contact.class.php @@ -1050,10 +1050,9 @@ class Contact extends CommonObject function getNbOfEMailings() { $sql = "SELECT count(mc.email) as nb"; - $sql.= " FROM ".MAIN_DB_PREFIX."mailing_cibles as mc"; - $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."mailing as m on mc.fk_mailing=m.rowid"; - $sql.= " WHERE mc.email = '".$this->db->escape($this->email)."' "; - $sql.= " AND m.entity IN (".getEntity($this->element).") AND mc.statut NOT IN (-1,0)"; // -1 erreur, 0 non envoye, 1 envoye avec succes + $sql.= " FROM ".MAIN_DB_PREFIX."mailing_cibles as mc, ".MAIN_DB_PREFIX."mailing as m"; + $sql.= " WHERE mc.fk_mailing=m.rowid AND mc.email = '".$this->db->escape($this->email)."' "; + $sql.= " AND m.entity IN (".getEntity($this->element).") AND mc.statut NOT IN (-1,0)"; // -1 error, 0 not sent, 1 sent with success $resql=$this->db->query($sql); if ($resql)