From 4e45d70c25e89035b94d6216d2ae9012cab277e5 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sat, 17 Jul 2010 20:25:56 +0000 Subject: [PATCH] Fix: include missing or with wrong path --- .../facture/class/facturestats.class.php | 2 +- .../facture/stats/facturestats.class.php | 166 ------------------ htdocs/compta/facture/stats/index.php | 4 +- htdocs/compta/facture/stats/month.php | 3 +- 4 files changed, 5 insertions(+), 170 deletions(-) delete mode 100644 htdocs/compta/facture/stats/facturestats.class.php diff --git a/htdocs/compta/facture/class/facturestats.class.php b/htdocs/compta/facture/class/facturestats.class.php index 4082978e764..9428b2104b5 100644 --- a/htdocs/compta/facture/class/facturestats.class.php +++ b/htdocs/compta/facture/class/facturestats.class.php @@ -19,7 +19,7 @@ */ /** - * \file htdocs/compta/facture/stats/facturestats.class.php + * \file htdocs/compta/facture/class/facturestats.class.php * \ingroup factures * \brief Fichier de la classe de gestion des stats des factures * \version $Id$ diff --git a/htdocs/compta/facture/stats/facturestats.class.php b/htdocs/compta/facture/stats/facturestats.class.php deleted file mode 100644 index 4082978e764..00000000000 --- a/htdocs/compta/facture/stats/facturestats.class.php +++ /dev/null @@ -1,166 +0,0 @@ - - * Copyright (c) 2005-2008 Laurent Destailleur - * Copyright (C) 2005-2009 Regis Houssin - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - */ - -/** - * \file htdocs/compta/facture/stats/facturestats.class.php - * \ingroup factures - * \brief Fichier de la classe de gestion des stats des factures - * \version $Id$ - */ -include_once DOL_DOCUMENT_ROOT . "/core/class/stats.class.php"; -include_once DOL_DOCUMENT_ROOT . "/compta/facture/class/facture.class.php"; -include_once DOL_DOCUMENT_ROOT . "/fourn/class/fournisseur.facture.class.php"; - -/** - * \class FactureStats - * \brief Classe permettant la gestion des stats des factures - */ -class FactureStats extends Stats -{ - var $db ; - - var $socid; - var $where; - - var $table_element; - var $field; - - /** - * Constructor - * - * @param $DB Database handler - * @param $socid Id third party - * @param $mode Option - * @return FactureStats - */ - function FactureStats($DB, $socid=0, $mode) - { - global $conf; - - $this->db = $DB; - if ($mode == 'customer') - { - $object=new Facture($this->db); - $this->from = MAIN_DB_PREFIX.$object->table_element; - $this->field='total'; - } - if ($mode == 'supplier') - { - $object=new FactureFournisseur($this->db); - $this->from = MAIN_DB_PREFIX.$object->table_element; - $this->field='total_ht'; - } - - $this->socid = $socid; - $this->where = " fk_statut > 0"; - $this->where.= " AND entity = ".$conf->entity; - if ($mode == 'customer') $this->where.=" AND (fk_statut != 3 OR close_code != 'replaced')"; // Exclude replaced invoices as they are duplicated (we count closed invoices for other reasons) - if ($this->socid) - { - $this->where.=" AND fk_soc = ".$this->socid; - } - - } - - - /** - * \brief Renvoie le nombre de facture par annee - * \return array Array of values - */ - function getNbByYear() - { - $sql = "SELECT YEAR(datef) as dm, count(*)"; - $sql.= " FROM ".$this->from; - $sql.= " GROUP BY dm DESC"; - $sql.= " WHERE ".$this->where; - - return $this->_getNbByYear($sql); - } - - - /** - * \brief Renvoie le nombre de facture par mois pour une annee donnee - * \param year Year to scan - * \return array Array of values - */ - function getNbByMonth($year) - { - $sql = "SELECT MONTH(datef) as dm, count(*)"; - $sql.= " FROM ".$this->from; - $sql.= " WHERE YEAR(datef) = ".$year; - $sql.= " AND ".$this->where; - $sql.= " GROUP BY dm DESC"; - - $res=$this->_getNbByMonth($year, $sql); - //var_dump($res);print '
'; - return $res; - } - - - /** - * \brief Renvoie le montant de facture par mois pour une annee donnee - * \param year Year to scan - * \return array Array of values - */ - function getAmountByMonth($year) - { - $sql = "SELECT date_format(datef,'%m') as dm, sum(".$this->field.")"; - $sql.= " FROM ".$this->from; - $sql.= " WHERE date_format(datef,'%Y') = ".$year; - $sql.= " AND ".$this->where; - $sql.= " GROUP BY dm DESC"; - - $res=$this->_getAmountByMonth($year, $sql); - //var_dump($res);print '
'; - return $res; - } - - /** - * \brief Return average amount - * \param year Year to scan - * \return array Array of values - */ - function getAverageByMonth($year) - { - $sql = "SELECT date_format(datef,'%m') as dm, avg(".$this->field.")"; - $sql.= " FROM ".$this->from; - $sql.= " WHERE date_format(datef,'%Y') = ".$year; - $sql.= " AND ".$this->where; - $sql.= " GROUP BY dm DESC"; - - return $this->_getAverageByMonth($year, $sql); - } - - /** - * \brief Return nb, total and average - * \return array Array of values - */ - function getAllByYear() - { - $sql = "SELECT date_format(datef,'%Y') as year, count(*) as nb, sum(".$this->field.") as total, avg(".$this->field.") as avg"; - $sql.= " FROM ".$this->from; - $sql.= " WHERE ".$this->where; - $sql.= " GROUP BY year DESC"; - - return $this->_getAllByYear($sql); - } -} - -?> diff --git a/htdocs/compta/facture/stats/index.php b/htdocs/compta/facture/stats/index.php index 3feaeb9a64c..8287d058ffe 100644 --- a/htdocs/compta/facture/stats/index.php +++ b/htdocs/compta/facture/stats/index.php @@ -1,6 +1,6 @@ - * Copyright (c) 2004-2008 Laurent Destailleur + * Copyright (c) 2004-2010 Laurent Destailleur * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -26,7 +26,7 @@ require("../../../main.inc.php"); require_once(DOL_DOCUMENT_ROOT."/core/class/dolgraph.class.php"); -require_once(DOL_DOCUMENT_ROOT."/compta/facture/stats/facturestats.class.php"); +require_once(DOL_DOCUMENT_ROOT."/compta/facture/class/facturestats.class.php"); $WIDTH=500; $HEIGHT=200; diff --git a/htdocs/compta/facture/stats/month.php b/htdocs/compta/facture/stats/month.php index 50f9cf0a83a..3fcdfdd3cf8 100644 --- a/htdocs/compta/facture/stats/month.php +++ b/htdocs/compta/facture/stats/month.php @@ -1,6 +1,6 @@ - * Copyright (c) 2004-2008 Laurent Destailleur + * Copyright (c) 2004-2010 Laurent Destailleur * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -26,6 +26,7 @@ require("../../../main.inc.php"); require_once(DOL_DOCUMENT_ROOT."/core/class/dolgraph.class.php"); +require_once(DOL_DOCUMENT_ROOT."/compta/facture/class/facturestats.class.php"); $GRAPHWIDTH=500; $GRAPHHEIGHT=200;