Fix: problem with LEFT JOIN

This commit is contained in:
Regis Houssin 2009-09-22 10:15:34 +00:00
parent 30459de59b
commit e25b3da162

View File

@ -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";