From f5d76ac0c70cd0334a5d25d47bdc3bb0e6c82590 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 6 Nov 2016 17:20:21 +0100
Subject: [PATCH] Fix count of contact was not complete
---
htdocs/contact/class/contact.class.php | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/htdocs/contact/class/contact.class.php b/htdocs/contact/class/contact.class.php
index 6a9a7df7b5e..67039fb2bef 100644
--- a/htdocs/contact/class/contact.class.php
+++ b/htdocs/contact/class/contact.class.php
@@ -122,15 +122,16 @@ class Contact extends CommonObject
$sql = "SELECT count(sp.rowid) as nb";
$sql.= " FROM ".MAIN_DB_PREFIX."socpeople as sp";
- $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON (sp.fk_soc = s.rowid)";
if (!$user->rights->societe->client->voir && !$user->societe_id)
{
- $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON s.rowid = sc.fk_soc";
+ $sql.= " OUTER JOIN ".MAIN_DB_PREFIX."societe as s ON sp.fk_soc = s.rowid";
+ $sql.= " OUTER JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON s.rowid = sc.fk_soc";
$sql.= " WHERE sc.fk_user = " .$user->id;
$clause = "AND";
}
- $sql.= ' '.$clause.' s.entity IN ('.getEntity($this->element, 1).')';
-
+ $sql.= ' '.$clause.' sp.entity IN ('.getEntity($this->element, 1).')';
+ if ($user->societe_id > 0) $sql.=" AND sp.fk_soc = ".$user->societe_id;
+
$resql=$this->db->query($sql);
if ($resql)
{
--
GitLab