From 6ec16c5ffc2c4cb5287359a836f3231aa577a421 Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis@dolibarr.fr>
Date: Thu, 9 Mar 2006 13:45:25 +0000
Subject: [PATCH] =?UTF-8?q?Ajout=20de=20la=20permission=20"consulter=20tou?=
 =?UTF-8?q?s=20les=20clients"=20dans=20le=20module=20commercial,=20afin=20?=
 =?UTF-8?q?=20qu'un=20commercial=20puisse=20voir=20que=20les=20clients=20q?=
 =?UTF-8?q?ui=20lui=20sont=20affect=E9s.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 htdocs/includes/boxes/box_propales.php | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/htdocs/includes/boxes/box_propales.php b/htdocs/includes/boxes/box_propales.php
index e97a1319e2b..e8f95764893 100644
--- a/htdocs/includes/boxes/box_propales.php
+++ b/htdocs/includes/boxes/box_propales.php
@@ -39,6 +39,12 @@ class box_propales extends ModeleBoxes {
 
     var $info_box_head = array();
     var $info_box_contents = array();
+    
+    if ($user->societe_id > 0) 
+    {
+      $action = '';
+      $socidp = $user->societe_id;
+    }
 
     /**
      *      \brief      Constructeur de la classe
@@ -67,10 +73,14 @@ class box_propales extends ModeleBoxes {
         {
 
             $sql = "SELECT s.nom,s.idp,p.ref,".$db->pdate("p.datep")." as dp,p.rowid";
-            $sql .= " FROM ".MAIN_DB_PREFIX."societe as s,".MAIN_DB_PREFIX."propal as p WHERE p.fk_soc = s.idp";
-            if($user->societe_id)
+            if (!$user->rights->commercial->client->voir && !$socidp) $sql .= ", sc.fk_soc, sc.fk_user";
+            $sql .= " FROM ".MAIN_DB_PREFIX."societe as s,".MAIN_DB_PREFIX."propal as p";
+            if (!$user->rights->commercial->client->voir && !$socidp) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+            $sql .= " WHERE p.fk_soc = s.idp";
+            if (!$user->rights->commercial->client->voir && !$socidp) $sql .= " AND s.idp = sc.fk_soc AND sc.fk_user = " .$user->id;
+            if($socidp)
             {
-                $sql .= " AND s.idp = $user->societe_id";
+                $sql .= " AND s.idp = $socidp";
             }
             $sql .= " ORDER BY p.datep DESC, p.ref DESC ";
             $sql .= $db->plimit($max, 0);