diff --git a/htdocs/comm/propal/stats/index.php b/htdocs/comm/propal/stats/index.php index f05575d331a..f9d9cc6da98 100644 --- a/htdocs/comm/propal/stats/index.php +++ b/htdocs/comm/propal/stats/index.php @@ -15,20 +15,18 @@ * 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. - * - * $Id$ */ /** \file htdocs/comm/propal/stats/index.php \ingroup propale \brief Page des stats propositions commerciales - \version $Revision$ + \version $Id$ */ require("./pre.inc.php"); require_once(DOL_DOCUMENT_ROOT."/comm/propal/stats/propalestats.class.php"); -require_once(DOL_DOCUMENT_ROOT."/dolgraph.class.php"); +require_once(DOL_DOCUMENT_ROOT."/core/dolgraph.class.php"); $WIDTH=500; $HEIGHT=200; diff --git a/htdocs/comm/propal/stats/month.php b/htdocs/comm/propal/stats/month.php index 7ee8a5d5076..e497330533e 100644 --- a/htdocs/comm/propal/stats/month.php +++ b/htdocs/comm/propal/stats/month.php @@ -15,21 +15,18 @@ * 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. - * - * $Id$ - * $Source$ */ /** \file htdocs/comm/propal/stats/month.php \ingroup propale \brief Page des stats propositions commerciales par mois - \version $Revision$ + \version $Id$ */ require("./pre.inc.php"); require_once(DOL_DOCUMENT_ROOT."/comm/propal/stats/propalestats.class.php"); -require_once(DOL_DOCUMENT_ROOT."/dolgraph.class.php"); +require_once(DOL_DOCUMENT_ROOT."/core/dolgraph.class.php"); llxHeader(); diff --git a/htdocs/commande/stats/index.php b/htdocs/commande/stats/index.php index 89fdb756117..3693f66f199 100644 --- a/htdocs/commande/stats/index.php +++ b/htdocs/commande/stats/index.php @@ -15,22 +15,19 @@ * 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. - * - * $Id$ - * $Source$ */ /** \file htdocs/commande/stats/index.php \ingroup commande \brief Page des stats commandes - \version $Revision$ + \version $Id$ */ require("./pre.inc.php"); require_once(DOL_DOCUMENT_ROOT."/commande/commande.class.php"); require_once(DOL_DOCUMENT_ROOT."/commande/stats/commandestats.class.php"); -require_once(DOL_DOCUMENT_ROOT."/dolgraph.class.php"); +require_once(DOL_DOCUMENT_ROOT."/core/dolgraph.class.php"); $WIDTH=500; $HEIGHT=200; diff --git a/htdocs/commande/stats/month.php b/htdocs/commande/stats/month.php index d3918811fbc..1d47197b393 100644 --- a/htdocs/commande/stats/month.php +++ b/htdocs/commande/stats/month.php @@ -15,22 +15,19 @@ * 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. - * - * $Id$ - * $Source$ */ /** \file htdocs/commande/stats/month.php \ingroup commande \brief Page des stats commandes par mois - \version $Revision$ + \version $Id$ */ require("./pre.inc.php"); require_once(DOL_DOCUMENT_ROOT."/commande/commande.class.php"); require_once(DOL_DOCUMENT_ROOT."/commande/stats/commandestats.class.php"); -require_once(DOL_DOCUMENT_ROOT."/dolgraph.class.php"); +require_once(DOL_DOCUMENT_ROOT."/core/dolgraph.class.php"); // Sécurité accés client if ($user->societe_id > 0) diff --git a/htdocs/compta/bank/graph.php b/htdocs/compta/bank/graph.php index e912f527b32..4a1eae6b1d7 100644 --- a/htdocs/compta/bank/graph.php +++ b/htdocs/compta/bank/graph.php @@ -15,20 +15,18 @@ * 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. - * - * $Id$ */ /** \file htdocs/compta/bank/graph.php \ingroup banque \brief Page graph des transactions bancaires - \version $Revision$ + \version $Id$ */ require("./pre.inc.php"); require_once(DOL_DOCUMENT_ROOT."/lib/bank.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/dolgraph.class.php"); +require_once(DOL_DOCUMENT_ROOT."/core/dolgraph.class.php"); $langs->load("banks"); diff --git a/htdocs/compta/facture/stats/index.php b/htdocs/compta/facture/stats/index.php index bd156e6f30f..d6a21fabed7 100644 --- a/htdocs/compta/facture/stats/index.php +++ b/htdocs/compta/facture/stats/index.php @@ -15,20 +15,17 @@ * 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. - * - * $Id$ - * $Source$ */ /** \file htdocs/compta/facture/stats/index.php \ingroup facture \brief Page des stats factures - \version $Revision$ + \version $Id$ */ require("./pre.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/dolgraph.class.php"); +require_once(DOL_DOCUMENT_ROOT."/core/dolgraph.class.php"); $WIDTH=500; $HEIGHT=200; diff --git a/htdocs/compta/facture/stats/month.php b/htdocs/compta/facture/stats/month.php index 76f2def34cd..69d9db820ba 100644 --- a/htdocs/compta/facture/stats/month.php +++ b/htdocs/compta/facture/stats/month.php @@ -15,20 +15,17 @@ * 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. - * - * $Id$ - * $Source$ */ /** \file htdocs/compta/facture/stats/month.php \ingroup facture \brief Page des stats factures par mois - \version $Revision$ + \version $Id$ */ require("./pre.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/dolgraph.class.php"); +require_once(DOL_DOCUMENT_ROOT."/core/dolgraph.class.php"); $GRAPHWIDTH=500; $GRAPHHEIGHT=200; diff --git a/htdocs/dolgraph.class.php b/htdocs/core/dolgraph.class.php similarity index 95% rename from htdocs/dolgraph.class.php rename to htdocs/core/dolgraph.class.php index cebcfa48c1a..c9ff63839bd 100644 --- a/htdocs/dolgraph.class.php +++ b/htdocs/core/dolgraph.class.php @@ -1,6 +1,6 @@ - * Copyright (c) 2004-2007 Laurent Destailleur + * Copyright (c) 2004-2008 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 @@ -15,33 +15,31 @@ * 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. - * - * $Id$ */ /** - \file htdocs/dolgraph.class.php - \brief Fichier de la classe mere de gestion des graph - \version $Revision$ - \remarks Usage: - $graph_data = array(array('labelA',yA),array('labelB',yB)); - array(array('labelA',yA1,...,yAn),array('labelB',yB1,...yBn)); - $px = new DolGraph(); - $px->SetData($graph_data); - $px->SetMaxValue($px->GetCeilMaxValue()); - $px->SetMinValue($px->GetFloorMinValue()); - $px->SetTitle("title"); - $px->SetLegend(array("Val1","Val2")); - $px->SetWidth(width); - $px->SetHeight(height); - $px->draw("file.png"); - */ + \file htdocs/dolgraph.class.php + \brief Fichier de la classe mere de gestion des graph + \version $Id$ + \remarks Usage: + $graph_data = array(array('labelA',yA),array('labelB',yB)); + array(array('labelA',yA1,...,yAn),array('labelB',yB1,...yBn)); + $px = new DolGraph(); + $px->SetData($graph_data); + $px->SetMaxValue($px->GetCeilMaxValue()); + $px->SetMinValue($px->GetFloorMinValue()); + $px->SetTitle("title"); + $px->SetLegend(array("Val1","Val2")); + $px->SetWidth(width); + $px->SetHeight(height); + $px->draw("file.png"); +*/ /** - \class Graph - \brief Classe mere permettant la gestion des graph - */ + \class Graph + \brief Classe mere permettant la gestion des graph +*/ class DolGraph { diff --git a/htdocs/expedition/stats/month.php b/htdocs/expedition/stats/month.php index 8d38337e4e3..f9f1bbdba2b 100644 --- a/htdocs/expedition/stats/month.php +++ b/htdocs/expedition/stats/month.php @@ -15,22 +15,19 @@ * 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. - * - * $Id$ - * $Source$ */ /** \file htdocs/expedition/stats/month.php \ingroup commande \brief Page des stats expeditions par mois - \version $Revision$ + \version $Id$ */ require("./pre.inc.php"); require_once(DOL_DOCUMENT_ROOT."/expedition/expedition.class.php"); require_once(DOL_DOCUMENT_ROOT."/expedition/stats/expeditionstats.class.php"); -require_once(DOL_DOCUMENT_ROOT."/dolgraph.class.php"); +require_once(DOL_DOCUMENT_ROOT."/core/dolgraph.class.php"); llxHeader(); diff --git a/htdocs/product/stats/fiche.php b/htdocs/product/stats/fiche.php index a2d8ae8ce48..c52ba319c82 100644 --- a/htdocs/product/stats/fiche.php +++ b/htdocs/product/stats/fiche.php @@ -17,22 +17,20 @@ * 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. - * - * $Id$ */ /** \file htdocs/product/stats/fiche.php \ingroup product \brief Page des stats produits - \version $Revision$ + \version $Id$ */ require("./pre.inc.php"); require_once(DOL_DOCUMENT_ROOT."/lib/product.lib.php"); require_once(DOL_DOCUMENT_ROOT."/propal.class.php"); require_once(DOL_DOCUMENT_ROOT."/product.class.php"); -require_once(DOL_DOCUMENT_ROOT."/dolgraph.class.php"); +require_once(DOL_DOCUMENT_ROOT."/core/dolgraph.class.php"); $langs->load("companies"); $langs->load("products"); diff --git a/htdocs/rapport/Atome.class.php b/htdocs/rapport/Atome.class.php index 94aa155e6c7..33b015dff65 100644 --- a/htdocs/rapport/Atome.class.php +++ b/htdocs/rapport/Atome.class.php @@ -15,17 +15,15 @@ * 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. - * - * $Id$ - * $Source$ */ /** \file htdocs/rapport/Atome.class.php \brief Fichier de la classe mère Atome de génération de rapports + \version $Id$ */ -include_once DOL_DOCUMENT_ROOT.'/dolgraph.class.php'; +include_once DOL_DOCUMENT_ROOT.'/core/dolgraph.class.php'; /** diff --git a/scripts/banque/graph-solde.php b/scripts/banque/graph-solde.php index 5cb8120d313..0210e87d5a4 100644 --- a/scripts/banque/graph-solde.php +++ b/scripts/banque/graph-solde.php @@ -39,7 +39,7 @@ if (substr($sapi_type, 0, 3) == 'cgi') { $path=eregi_replace('graph-solde.php','',$_SERVER["PHP_SELF"]); require_once($path."../../htdocs/master.inc.php"); -require_once($path."../../htdocs/dolgraph.class.php"); +require_once($path."../../htdocs/core/dolgraph.class.php"); $error = 0; diff --git a/scripts/cron/fournisseur-graph.php b/scripts/cron/fournisseur-graph.php index 78eacfc9ae9..793461598f5 100644 --- a/scripts/cron/fournisseur-graph.php +++ b/scripts/cron/fournisseur-graph.php @@ -15,15 +15,13 @@ * 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. - * - * $Id$ - * $Source$ */ /** \file scripts/cron/fournisseur-graph.php \ingroup fournisseur \brief Script de génération graph fournisseur + \version $Id$ */ // Test si mode CLI @@ -41,7 +39,7 @@ $version='$Revision$'; $path=eregi_replace($script_file,'',$_SERVER["PHP_SELF"]); require_once($path."../../htdocs/master.inc.php"); -require_once (DOL_DOCUMENT_ROOT."/dolgraph.class.php"); +require_once (DOL_DOCUMENT_ROOT."/core/dolgraph.class.php"); $error=0; diff --git a/scripts/cron/product-graph.php b/scripts/cron/product-graph.php index eba90652495..9ae93a2d3df 100644 --- a/scripts/cron/product-graph.php +++ b/scripts/cron/product-graph.php @@ -15,15 +15,13 @@ * 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. - * - * $Id$ - * $Source$ */ /** \file scripts/cron/product-graph.php \ingroup product \brief Crée les graphiques pour les produits + \version $Id$ */ // Test si mode CLI @@ -41,7 +39,7 @@ $version='$Revision$'; $path=eregi_replace($script_file,'',$_SERVER["PHP_SELF"]); require_once($path."../../htdocs/master.inc.php"); -require_once (DOL_DOCUMENT_ROOT."/dolgraph.class.php"); +require_once (DOL_DOCUMENT_ROOT."/core/dolgraph.class.php"); $error=0;