diff --git a/htdocs/commande/class/commandestats.class.php b/htdocs/commande/class/commandestats.class.php index 40714e988111a5e35ba6e5e78bad1ce03f3c1b4f..6de20836f35f6cae730e39af4741a82372b11149 100644 --- a/htdocs/commande/class/commandestats.class.php +++ b/htdocs/commande/class/commandestats.class.php @@ -95,7 +95,6 @@ class CommandeStats extends Stats */ function getNbByMonth($year) { - global $conf; global $user; $sql = "SELECT date_format(c.date_commande,'%m') as dm, count(*) nb"; @@ -117,7 +116,6 @@ class CommandeStats extends Stats */ function getNbByYear() { - global $conf; global $user; $sql = "SELECT date_format(c.date_commande,'%Y') as dm, count(*), sum(c.".$this->field.")"; @@ -138,7 +136,6 @@ class CommandeStats extends Stats */ function getAmountByMonth($year) { - global $conf; global $user; $sql = "SELECT date_format(c.date_commande,'%m') as dm, sum(c.".$this->field.")"; @@ -160,7 +157,6 @@ class CommandeStats extends Stats */ function getAverageByMonth($year) { - global $conf; global $user; $sql = "SELECT date_format(c.date_commande,'%m') as dm, avg(c.".$this->field.")"; diff --git a/htdocs/compta/facture/class/facturestats.class.php b/htdocs/compta/facture/class/facturestats.class.php index 0fe45fc6c66237ff830123acb3e7f2a1e7771883..c2e42addbb5e2c025d04959b59b1d29c013c6fec 100644 --- a/htdocs/compta/facture/class/facturestats.class.php +++ b/htdocs/compta/facture/class/facturestats.class.php @@ -92,6 +92,8 @@ class FactureStats extends Stats */ function getNbByMonth($year) { + global $user; + $sql = "SELECT MONTH(f.datef) as dm, COUNT(*)"; $sql.= " FROM ".$this->from; if (!$user->rights->societe->client->voir && !$this->socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; @@ -113,6 +115,8 @@ class FactureStats extends Stats */ function getNbByYear() { + global $user; + $sql = "SELECT YEAR(f.datef) as dm, COUNT(*)"; $sql.= " FROM ".$this->from; if (!$user->rights->societe->client->voir && !$this->socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; @@ -132,6 +136,8 @@ class FactureStats extends Stats */ function getAmountByMonth($year) { + global $user; + $sql = "SELECT date_format(datef,'%m') as dm, SUM(f.".$this->field.")"; $sql.= " FROM ".$this->from; if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; @@ -153,6 +159,8 @@ class FactureStats extends Stats */ function getAverageByMonth($year) { + global $user; + $sql = "SELECT date_format(datef,'%m') as dm, AVG(f.".$this->field.")"; $sql.= " FROM ".$this->from; if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; @@ -171,6 +179,8 @@ class FactureStats extends Stats */ function getAllByYear() { + global $user; + $sql = "SELECT date_format(datef,'%Y') as year, COUNT(*) as nb, SUM(f.".$this->field.") as total, AVG(f.".$this->field.") as avg"; $sql.= " FROM ".$this->from; if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";