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

Fix: simplification requete sql

Browse Source
This commit is contained in:
Regis Houssin 2007-10-24 19:40:09 +00:00
parent 8c1f034d6c
commit 940896f53b
2 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
htdocs/client.class.php
View File

@ -92,13 +92,17 @@ class Client extends Societe
global $conf, $user; global $conf, $user;
$this->nb=array("customers" => 0,"prospects" => 0); $this->nb=array("customers" => 0,"prospects" => 0);
$clause = "WHERE";
$sql = "SELECT count(s.rowid) as nb, s.client"; $sql = "SELECT count(s.rowid) as nb, s.client";
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.= " WHERE s.client in (1,2)"; {
if (!$user->rights->commercial->client->voir && !$user->societe_id) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id; $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON s.rowid = sc.fk_soc";
$sql.= " WHERE sc.fk_user = " .$user->id;
$clause = "AND";
}
$sql.= " ".$clause." s.client in (1,2)";
$sql.= " GROUP BY s.client"; $sql.= " GROUP BY s.client";
$resql=$this->db->query($sql); $resql=$this->db->query($sql);
if ($resql) if ($resql)

12
htdocs/prospect.class.php
View File

@ -66,13 +66,17 @@ class Prospect extends Societe
global $conf, $user; global $conf, $user;
$this->nb=array("customers" => 0,"prospects" => 0); $this->nb=array("customers" => 0,"prospects" => 0);
$clause = "WHERE";
$sql = "SELECT count(s.rowid) as nb, s.client"; $sql = "SELECT count(s.rowid) as nb, s.client";
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.= " WHERE s.client in (1,2)"; {
if (!$user->rights->commercial->client->voir && !$user->societe_id) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id; $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON s.rowid = sc.fk_soc";
$sql.= " WHERE sc.fk_user = " .$user->id;
$clause = "AND";
}
$sql.= " ".$clause." s.client in (1,2)";
$sql.= " GROUP BY s.client"; $sql.= " GROUP BY s.client";
$resql=$this->db->query($sql); $resql=$this->db->query($sql);
if ($resql) if ($resql)