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

Fix: si aucun fournisseur les stats n'affichait rien

Browse Source 
nettoyage du code
This commit is contained in:
Regis Houssin 2007-10-10 21:48:05 +00:00
parent dea059ef71
commit 786ccfe6be
4 changed files with 1 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2291,9 +2291,6 @@ class Commande extends CommonObject
{ {
$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."categorie_product as cp ON cp.fk_product = co.rowid"; $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."categorie_product as cp ON cp.fk_product = co.rowid";
$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."categorie as c ON cp.fk_categorie = c.rowid"; $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."categorie as c ON cp.fk_categorie = c.rowid";
}
if ($conf->categorie->enabled && !$user->rights->categorie->voir)
{
$sql.= " WHERE IFNULL(c.visible,1)=1"; $sql.= " WHERE IFNULL(c.visible,1)=1";
} }
$resql=$this->db->query($sql); $resql=$this->db->query($sql);

3
htdocs/facture.class.php
View File

@ -2707,9 +2707,6 @@ class Facture extends CommonObject
{ {
$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."categorie_product as cp ON cp.fk_product = f.rowid"; $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.= " LEFT JOIN ".MAIN_DB_PREFIX."categorie as c ON cp.fk_categorie = c.rowid";
}
if ($conf->categorie->enabled && !$user->rights->categorie->voir)
{
$sql.= " WHERE IFNULL(c.visible,1)=1"; $sql.= " WHERE IFNULL(c.visible,1)=1";
} }
$resql=$this->db->query($sql); $resql=$this->db->query($sql);

3
htdocs/fourn/fournisseur.class.php
View File

@ -189,13 +189,12 @@ class Fournisseur extends Societe
$this->nb=array(); $this->nb=array();
$sql = "SELECT count(s.rowid) as nb, s.fournisseur"; $sql = "SELECT count(s.rowid) as nb";
if (!$user->rights->commercial->client->voir && !$user->societe_id) $sql .= ", sc.fk_soc, sc.fk_user"; if (!$user->rights->commercial->client->voir && !$user->societe_id) $sql .= ", sc.fk_soc, sc.fk_user";
$sql.= " FROM ".MAIN_DB_PREFIX."societe as s"; $sql.= " FROM ".MAIN_DB_PREFIX."societe as s";
if (!$user->rights->commercial->client->voir && !$user->societe_id) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; if (!$user->rights->commercial->client->voir && !$user->societe_id) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
$sql.= " WHERE s.fournisseur = 1"; $sql.= " WHERE s.fournisseur = 1";
if (!$user->rights->commercial->client->voir && !$user->societe_id) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id; if (!$user->rights->commercial->client->voir && !$user->societe_id) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
$sql.= " GROUP BY s.fournisseur";
$resql=$this->db->query($sql); $resql=$this->db->query($sql);
if ($resql) if ($resql)
{ {

3
htdocs/propal.class.php
View File

@ -2069,9 +2069,6 @@ class Propal extends CommonObject
{ {
$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."categorie_product as cp ON cp.fk_product = p.rowid"; $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.= " LEFT JOIN ".MAIN_DB_PREFIX."categorie as c ON cp.fk_categorie = c.rowid";
}
if ($conf->categorie->enabled && !$user->rights->categorie->voir)
{
$sql.= " WHERE IFNULL(c.visible,1)=1"; $sql.= " WHERE IFNULL(c.visible,1)=1";
} }
$resql=$this->db->query($sql); $resql=$this->db->query($sql);