lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix: remplacement de requetes hors sujet !!

Browse Source
This commit is contained in:
Regis Houssin 2007-10-10 22:16:28 +00:00
parent 3fcea0c160
commit f0b6a0b468
3 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
htdocs/commande/commande.class.php
View File

@ -2286,7 +2286,6 @@ class Commande extends CommonObject
$this->nb=array();
$sql = "SELECT count(co.rowid) as nb";
if (!$user->rights->commercial->client->voir && !$user->societe_id) $sql .= ", sc.fk_soc, sc.fk_user";
$sql.= " FROM ".MAIN_DB_PREFIX."commande as co";
if (!$user->rights->commercial->client->voir && !$user->societe_id)
{

8
htdocs/facture.class.php
View File

@ -2703,11 +2703,11 @@ class Facture extends CommonObject
$sql = "SELECT count(f.rowid) as nb";
$sql.= " FROM ".MAIN_DB_PREFIX."facture as f";
if ($conf->categorie->enabled && !$user->rights->categorie->voir)
if (!$user->rights->commercial->client->voir && !$user->societe_id)
{
$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."categorie_product as cp ON cp.fk_product = f.rowid";
$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."categorie as c ON cp.fk_categorie = c.rowid";
$sql.= " WHERE IFNULL(c.visible,1)=1";
$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON f.fk_soc = s.rowid";
$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON s.rowid = sc.fk_soc";
$sql.= " WHERE sc.fk_user = " .$user->id;
}
$resql=$this->db->query($sql);
if ($resql)

8
htdocs/propal.class.php
View File

@ -2065,11 +2065,11 @@ class Propal extends CommonObject
$sql = "SELECT count(p.rowid) as nb";
$sql.= " FROM ".MAIN_DB_PREFIX."propal as p";
if ($conf->categorie->enabled && !$user->rights->categorie->voir)
if (!$user->rights->commercial->client->voir && !$user->societe_id)
{
$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."categorie_product as cp ON cp.fk_product = p.rowid";
$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."categorie as c ON cp.fk_categorie = c.rowid";
$sql.= " WHERE IFNULL(c.visible,1)=1";
$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON p.fk_soc = s.rowid";
$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON s.rowid = sc.fk_soc";
$sql.= " WHERE sc.fk_user = " .$user->id;
}
$resql=$this->db->query($sql);
if ($resql)