Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2026-02-07 16:41:48 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix: pgql compatibility

Browse Source
This commit is contained in:
Laurent Destailleur
2011-07-04 10:30:00 +00:00
parent 573354f5d9
commit df8da8678b
13 changed files with 64 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
htdocs/commande/class/commandestats.class.php
View File

@@ -22,7 +22,7 @@
* \file htdocs/commande/class/commandestats.class.php
* \ingroup commandes
* \brief Fichier de la classe de gestion des stats des commandes
* \version $Id$
* \version $Id: commandestats.class.php,v 1.5 2011/07/04 10:30:01 eldy Exp $
*/
include_once DOL_DOCUMENT_ROOT . "/core/class/stats.class.php";
include_once DOL_DOCUMENT_ROOT . "/commande/class/commande.class.php";
@@ -102,7 +102,7 @@ class CommandeStats extends Stats
$sql = "SELECT date_format(c.date_valid,'%m') as dm, count(*) nb";
$sql.= " FROM ".$this->from;
if (!$user->rights->societe->client->voir && !$this->socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
$sql.= " WHERE date_format(c.date_valid,'%Y') = ".$year;
$sql.= " WHERE date_format(c.date_valid,'%Y') = '".$year."'";
$sql.= " AND ".$this->where;
$sql.= " GROUP BY dm";
$sql.= $this->db->order('dm','DESC');
@@ -141,7 +141,7 @@ class CommandeStats extends Stats
$sql = "SELECT date_format(c.date_valid,'%m') as dm, sum(c.".$this->field.")";
$sql.= " FROM ".$this->from;
if (!$user->rights->societe->client->voir && !$this->socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
$sql.= " WHERE date_format(c.date_valid,'%Y') = ".$year;
$sql.= " WHERE date_format(c.date_valid,'%Y') = '".$year."'";
$sql.= " AND ".$this->where;
$sql.= " GROUP BY dm";
$sql.= $this->db->order('dm','DESC');
@@ -161,7 +161,7 @@ class CommandeStats extends Stats
$sql = "SELECT date_format(c.date_valid,'%m') as dm, avg(c.".$this->field.")";
$sql.= " FROM ".$this->from;
if (!$user->rights->societe->client->voir && !$this->socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
$sql.= " WHERE date_format(c.date_valid,'%Y') = ".$year;
$sql.= " WHERE date_format(c.date_valid,'%Y') = '".$year."'";
$sql.= " AND ".$this->where;
$sql.= " GROUP BY dm";
$sql.= $this->db->order('dm','DESC');