From 265a7b675b95d578eab330c707fb139fbce52977 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sat, 5 Jun 2010 15:45:53 +0000 Subject: [PATCH] Reorganize class files. --- htdocs/compta/bank/account.php | 2 +- htdocs/compta/bank/rappro.php | 2 +- .../deplacement/{stats => class}/deplacementstats.class.php | 2 +- htdocs/compta/deplacement/stats/index.php | 2 +- htdocs/compta/deplacement/stats/month.php | 2 +- .../compta/paiement/cheque/{ => class}/remisecheque.class.php | 3 +-- htdocs/compta/paiement/cheque/fiche.php | 2 +- htdocs/compta/paiement/cheque/index.php | 2 +- htdocs/compta/paiement/cheque/liste.php | 2 +- htdocs/compta/paiement/cheque/pre.inc.php | 2 +- htdocs/compta/tva/quadri_detail.php | 2 +- htdocs/fourn/{facture => class}/paiementfourn.class.php | 2 +- htdocs/fourn/facture/fiche.php | 2 +- htdocs/fourn/facture/paiement.php | 2 +- htdocs/fourn/paiement/fiche.php | 2 +- htdocs/fourn/paiement/info.php | 2 +- htdocs/index.php | 2 +- 17 files changed, 17 insertions(+), 18 deletions(-) rename htdocs/compta/deplacement/{stats => class}/deplacementstats.class.php (98%) mode change 100755 => 100644 rename htdocs/compta/paiement/cheque/{ => class}/remisecheque.class.php (99%) rename htdocs/fourn/{facture => class}/paiementfourn.class.php (99%) diff --git a/htdocs/compta/bank/account.php b/htdocs/compta/bank/account.php index 2e162a63193..d18794975e8 100644 --- a/htdocs/compta/bank/account.php +++ b/htdocs/compta/bank/account.php @@ -34,7 +34,7 @@ require_once(DOL_DOCUMENT_ROOT."/adherents/class/adherent.class.php"); require_once(DOL_DOCUMENT_ROOT."/compta/sociales/class/chargesociales.class.php"); require_once(DOL_DOCUMENT_ROOT."/compta/paiement/class/paiement.class.php"); require_once(DOL_DOCUMENT_ROOT."/compta/tva/class/tva.class.php"); -require_once(DOL_DOCUMENT_ROOT."/fourn/facture/paiementfourn.class.php"); +require_once(DOL_DOCUMENT_ROOT."/fourn/class/paiementfourn.class.php"); $langs->load("bills"); diff --git a/htdocs/compta/bank/rappro.php b/htdocs/compta/bank/rappro.php index a722734807d..0f61df3a150 100644 --- a/htdocs/compta/bank/rappro.php +++ b/htdocs/compta/bank/rappro.php @@ -31,7 +31,7 @@ require_once(DOL_DOCUMENT_ROOT."/adherents/class/adherent.class.php"); require_once(DOL_DOCUMENT_ROOT."/compta/sociales/class/chargesociales.class.php"); require_once(DOL_DOCUMENT_ROOT."/compta/paiement/class/paiement.class.php"); require_once(DOL_DOCUMENT_ROOT."/compta/tva/class/tva.class.php"); -require_once(DOL_DOCUMENT_ROOT."/fourn/facture/paiementfourn.class.php"); +require_once(DOL_DOCUMENT_ROOT."/fourn/class/paiementfourn.class.php"); $langs->load("banks"); $langs->load("bills"); diff --git a/htdocs/compta/deplacement/stats/deplacementstats.class.php b/htdocs/compta/deplacement/class/deplacementstats.class.php old mode 100755 new mode 100644 similarity index 98% rename from htdocs/compta/deplacement/stats/deplacementstats.class.php rename to htdocs/compta/deplacement/class/deplacementstats.class.php index 01b9c27d2dd..5836f777461 --- a/htdocs/compta/deplacement/stats/deplacementstats.class.php +++ b/htdocs/compta/deplacement/class/deplacementstats.class.php @@ -19,7 +19,7 @@ */ /** - * \file htdocs/compta/deplacement/stats/deplacementstats.class.php + * \file htdocs/compta/deplacement/class/deplacementstats.class.php * \ingroup factures * \brief Fichier de la classe de gestion des stats des deplacement et notes de frais * \version $Id$ diff --git a/htdocs/compta/deplacement/stats/index.php b/htdocs/compta/deplacement/stats/index.php index 1003891ddf4..8c39ed507a4 100755 --- a/htdocs/compta/deplacement/stats/index.php +++ b/htdocs/compta/deplacement/stats/index.php @@ -26,7 +26,7 @@ require("../../../main.inc.php"); require_once(DOL_DOCUMENT_ROOT."/core/class/dolgraph.class.php"); -require_once(DOL_DOCUMENT_ROOT."/compta/deplacement/stats/deplacementstats.class.php"); +require_once(DOL_DOCUMENT_ROOT."/compta/deplacement/class/deplacementstats.class.php"); $langs->load("trips"); diff --git a/htdocs/compta/deplacement/stats/month.php b/htdocs/compta/deplacement/stats/month.php index ebb97b75f45..572f13f6d51 100755 --- a/htdocs/compta/deplacement/stats/month.php +++ b/htdocs/compta/deplacement/stats/month.php @@ -26,7 +26,7 @@ require("../../../main.inc.php"); require_once(DOL_DOCUMENT_ROOT."/core/class/dolgraph.class.php"); -require_once(DOL_DOCUMENT_ROOT."/compta/deplacement/stats/deplacementstats.class.php"); +require_once(DOL_DOCUMENT_ROOT."/compta/deplacement/class/deplacementstats.class.php"); $langs->load("trips"); diff --git a/htdocs/compta/paiement/cheque/remisecheque.class.php b/htdocs/compta/paiement/cheque/class/remisecheque.class.php similarity index 99% rename from htdocs/compta/paiement/cheque/remisecheque.class.php rename to htdocs/compta/paiement/cheque/class/remisecheque.class.php index e0eb9914ed2..374a30befce 100644 --- a/htdocs/compta/paiement/cheque/remisecheque.class.php +++ b/htdocs/compta/paiement/cheque/class/remisecheque.class.php @@ -19,12 +19,11 @@ */ /** - * \file htdocs/compta/paiement/cheque/remisecheque.class.php + * \file htdocs/compta/paiement/cheque/class/remisecheque.class.php * \ingroup compta * \brief Fichier de la classe des bordereau de remise de cheque * \version $Id$ */ - require_once(DOL_DOCUMENT_ROOT ."/core/class/commonobject.class.php"); diff --git a/htdocs/compta/paiement/cheque/fiche.php b/htdocs/compta/paiement/cheque/fiche.php index d50d11d9f82..07b77b06cc2 100644 --- a/htdocs/compta/paiement/cheque/fiche.php +++ b/htdocs/compta/paiement/cheque/fiche.php @@ -28,7 +28,7 @@ require("./pre.inc.php"); // We use pre.inc.php to have a dynamic menu require_once(DOL_DOCUMENT_ROOT."/core/class/html.formfile.class.php"); require_once(DOL_DOCUMENT_ROOT.'/compta/paiement/class/paiement.class.php'); -require_once(DOL_DOCUMENT_ROOT.'/compta/paiement/cheque/remisecheque.class.php'); +require_once(DOL_DOCUMENT_ROOT.'/compta/paiement/cheque/class/remisecheque.class.php'); require_once(DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php'); $langs->load('bills'); diff --git a/htdocs/compta/paiement/cheque/index.php b/htdocs/compta/paiement/cheque/index.php index 9b56c592127..b13c48d4840 100644 --- a/htdocs/compta/paiement/cheque/index.php +++ b/htdocs/compta/paiement/cheque/index.php @@ -26,7 +26,7 @@ */ require("./pre.inc.php"); -require_once(DOL_DOCUMENT_ROOT.'/compta/paiement/cheque/remisecheque.class.php'); +require_once(DOL_DOCUMENT_ROOT.'/compta/paiement/cheque/class/remisecheque.class.php'); require_once(DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php'); $langs->load("banks"); diff --git a/htdocs/compta/paiement/cheque/liste.php b/htdocs/compta/paiement/cheque/liste.php index 2e9ffe3fd97..8ab21804061 100644 --- a/htdocs/compta/paiement/cheque/liste.php +++ b/htdocs/compta/paiement/cheque/liste.php @@ -26,7 +26,7 @@ */ require("./pre.inc.php"); -require_once(DOL_DOCUMENT_ROOT.'/compta/paiement/cheque/remisecheque.class.php'); +require_once(DOL_DOCUMENT_ROOT.'/compta/paiement/cheque/class/remisecheque.class.php'); require_once(DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php'); $langs->load("bills"); diff --git a/htdocs/compta/paiement/cheque/pre.inc.php b/htdocs/compta/paiement/cheque/pre.inc.php index d8aebb39e69..fe429f4845d 100644 --- a/htdocs/compta/paiement/cheque/pre.inc.php +++ b/htdocs/compta/paiement/cheque/pre.inc.php @@ -25,7 +25,7 @@ */ require("../../../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT.'/compta/paiement/cheque/remisecheque.class.php'); +require_once(DOL_DOCUMENT_ROOT.'/compta/paiement/cheque/class/remisecheque.class.php'); $langs->load("bills"); $langs->load("compta"); diff --git a/htdocs/compta/tva/quadri_detail.php b/htdocs/compta/tva/quadri_detail.php index 69309091142..056f1e2c54d 100644 --- a/htdocs/compta/tva/quadri_detail.php +++ b/htdocs/compta/tva/quadri_detail.php @@ -36,7 +36,7 @@ require_once(DOL_DOCUMENT_ROOT."/compta/facture/class/facture.class.php"); require_once(DOL_DOCUMENT_ROOT."/product/class/product.class.php"); require_once(DOL_DOCUMENT_ROOT."/compta/paiement/class/paiement.class.php"); require_once(DOL_DOCUMENT_ROOT."/fourn/class/fournisseur.facture.class.php"); -require_once(DOL_DOCUMENT_ROOT."/fourn/facture/paiementfourn.class.php"); +require_once(DOL_DOCUMENT_ROOT."/fourn/class/paiementfourn.class.php"); $langs->load("bills"); $langs->load("compta"); diff --git a/htdocs/fourn/facture/paiementfourn.class.php b/htdocs/fourn/class/paiementfourn.class.php similarity index 99% rename from htdocs/fourn/facture/paiementfourn.class.php rename to htdocs/fourn/class/paiementfourn.class.php index 33a381d56b5..0e40f751dce 100644 --- a/htdocs/fourn/facture/paiementfourn.class.php +++ b/htdocs/fourn/class/paiementfourn.class.php @@ -20,7 +20,7 @@ */ /** - \file htdocs/fourn/facture/paiementfourn.class.php + \file htdocs/fourn/class/paiementfourn.class.php \ingroup fournisseur, facture \brief Classe paiement fournisseur \remarks Cette classe est presque identique a paiement.class.php diff --git a/htdocs/fourn/facture/fiche.php b/htdocs/fourn/facture/fiche.php index 6059c31c746..960fa9935fe 100644 --- a/htdocs/fourn/facture/fiche.php +++ b/htdocs/fourn/facture/fiche.php @@ -32,7 +32,7 @@ require("../../main.inc.php"); require_once(DOL_DOCUMENT_ROOT."/core/class/html.formfile.class.php"); require_once(DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.class.php'); require_once(DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php'); -require_once(DOL_DOCUMENT_ROOT.'/fourn/facture/paiementfourn.class.php'); +require_once(DOL_DOCUMENT_ROOT.'/fourn/class/paiementfourn.class.php'); require_once(DOL_DOCUMENT_ROOT.'/lib/fourn.lib.php'); require_once(DOL_DOCUMENT_ROOT.'/product/class/product.class.php'); if ($conf->projet->enabled) require_once(DOL_DOCUMENT_ROOT.'/projet/class/project.class.php'); diff --git a/htdocs/fourn/facture/paiement.php b/htdocs/fourn/facture/paiement.php index 32b8b200547..72c89b20344 100644 --- a/htdocs/fourn/facture/paiement.php +++ b/htdocs/fourn/facture/paiement.php @@ -30,7 +30,7 @@ require("../../main.inc.php"); require(DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.class.php'); require(DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php'); -require(DOL_DOCUMENT_ROOT.'/fourn/facture/paiementfourn.class.php'); +require(DOL_DOCUMENT_ROOT.'/fourn/class/paiementfourn.class.php'); $langs->load('companies'); $langs->load('bills'); diff --git a/htdocs/fourn/paiement/fiche.php b/htdocs/fourn/paiement/fiche.php index 45002faeef6..8d640d1c006 100644 --- a/htdocs/fourn/paiement/fiche.php +++ b/htdocs/fourn/paiement/fiche.php @@ -27,7 +27,7 @@ */ require("../../main.inc.php"); -require(DOL_DOCUMENT_ROOT.'/fourn/facture/paiementfourn.class.php'); +require(DOL_DOCUMENT_ROOT.'/fourn/class/paiementfourn.class.php'); require(DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.class.php'); require(DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php'); diff --git a/htdocs/fourn/paiement/info.php b/htdocs/fourn/paiement/info.php index 4649e3ffb9f..d93d7d05c6d 100644 --- a/htdocs/fourn/paiement/info.php +++ b/htdocs/fourn/paiement/info.php @@ -26,7 +26,7 @@ require("../../main.inc.php"); require_once(DOL_DOCUMENT_ROOT."/lib/functions2.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/fourn/facture/paiementfourn.class.php"); +require_once(DOL_DOCUMENT_ROOT."/fourn/class/paiementfourn.class.php"); $langs->load("bills"); $langs->load("suppliers"); diff --git a/htdocs/index.php b/htdocs/index.php index fd5ad69e3e8..16a8c3db751 100644 --- a/htdocs/index.php +++ b/htdocs/index.php @@ -495,7 +495,7 @@ if ($conf->banque->enabled && $user->rights->banque->lire && ! $user->societe_id { $langs->load("banks"); - include_once(DOL_DOCUMENT_ROOT."/compta/paiement/cheque/remisecheque.class.php"); + include_once(DOL_DOCUMENT_ROOT."/compta/paiement/cheque/class/remisecheque.class.php"); $board=new RemiseCheque($db); $board->load_board($user);