From e25b3da16270848fce8c992f8b6a1d9804b5e075 Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis@dolibarr.fr>
Date: Tue, 22 Sep 2009 10:15:34 +0000
Subject: [PATCH] Fix: problem with LEFT JOIN

---
 htdocs/includes/boxes/box_services_vendus.php | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/htdocs/includes/boxes/box_services_vendus.php b/htdocs/includes/boxes/box_services_vendus.php
index f714174a492..85f906db67d 100644
--- a/htdocs/includes/boxes/box_services_vendus.php
+++ b/htdocs/includes/boxes/box_services_vendus.php
@@ -73,11 +73,18 @@ class box_services_vendus extends ModeleBoxes {
 			$sql.= " c.rowid,";
 			$sql.= " cd.rowid as cdid, cd.tms as datem, cd.statut,";
 			$sql.= " p.rowid as pid, p.label, p.fk_product_type";
-			$sql.= " FROM ".MAIN_DB_PREFIX."societe as s";
+			$sql.= " FROM (".MAIN_DB_PREFIX."societe as s";
 			$sql.= ", ".MAIN_DB_PREFIX."contrat as c";
 			$sql.= ", ".MAIN_DB_PREFIX."contratdet as cd";
 			$sql.= ", ".MAIN_DB_PREFIX."product as p";
-			if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+			if (!$user->rights->societe->client->voir && !$user->societe_id)
+			{
+				$sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc)";
+			}
+			else
+			{
+				$sql.= ")";
+			}
 			if ($conf->categorie->enabled && !$user->rights->categorie->voir)
 			{
 				$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."categorie_product as cp ON cp.fk_product = p.rowid";