Fix: si aucun fournisseur les stats n'affichait rien
nettoyage du code
This commit is contained in:
parent
dea059ef71
commit
786ccfe6be
@ -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 as c ON cp.fk_categorie = c.rowid";
|
||||
}
|
||||
if ($conf->categorie->enabled && !$user->rights->categorie->voir)
|
||||
{
|
||||
$sql.= " WHERE IFNULL(c.visible,1)=1";
|
||||
}
|
||||
$resql=$this->db->query($sql);
|
||||
|
||||
@ -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 as c ON cp.fk_categorie = c.rowid";
|
||||
}
|
||||
if ($conf->categorie->enabled && !$user->rights->categorie->voir)
|
||||
{
|
||||
$sql.= " WHERE IFNULL(c.visible,1)=1";
|
||||
}
|
||||
$resql=$this->db->query($sql);
|
||||
|
||||
@ -189,13 +189,12 @@ class Fournisseur extends Societe
|
||||
|
||||
$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";
|
||||
$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";
|
||||
$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;
|
||||
$sql.= " GROUP BY s.fournisseur";
|
||||
$resql=$this->db->query($sql);
|
||||
if ($resql)
|
||||
{
|
||||
|
||||
@ -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 as c ON cp.fk_categorie = c.rowid";
|
||||
}
|
||||
if ($conf->categorie->enabled && !$user->rights->categorie->voir)
|
||||
{
|
||||
$sql.= " WHERE IFNULL(c.visible,1)=1";
|
||||
}
|
||||
$resql=$this->db->query($sql);
|
||||
|
||||
Loading…
Reference in New Issue
Block a user