From ba3a06758c8721fe595a66850d04ff903ec531b0 Mon Sep 17 00:00:00 2001 From: Philippe Grand Date: Sun, 25 Apr 2010 12:43:27 +0000 Subject: [PATCH] according to new tree directory --- htdocs/adherents/card_subscriptions.php | 2 +- htdocs/adherents/class/cotisation.class.php | 2 +- htdocs/adherents/cotisations.php | 2 +- htdocs/adherents/fiche.php | 2 +- htdocs/adherents/fiche_subscription.php | 2 +- htdocs/cashdesk/tpl/menu.tpl.php | 2 +- htdocs/cashdesk/validation_verif.php | 2 +- htdocs/compta/bank/annuel.php | 2 +- htdocs/compta/bank/{ => class}/account.class.php | 0 htdocs/compta/bank/graph.php | 2 +- htdocs/compta/bank/pre.inc.php | 2 +- htdocs/compta/bank/search.php | 2 +- htdocs/compta/bank/virement.php | 2 +- htdocs/compta/paiement.php | 2 +- 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/remisecheque.class.php | 2 +- htdocs/compta/paiement/fiche.php | 2 +- htdocs/compta/paiement/liste.php | 2 +- htdocs/compta/paiement_charge.php | 2 +- htdocs/compta/payment_sc/fiche.php | 2 +- htdocs/compta/tva/fiche.php | 2 +- htdocs/compta/tva/tva.class.php | 2 +- htdocs/fourn/facture/paiementfourn.class.php | 2 +- htdocs/includes/boxes/box_comptes.php | 2 +- htdocs/includes/modules/commande/modules_commande.php | 2 +- htdocs/includes/modules/facture/modules_facture.php | 2 +- htdocs/includes/modules/propale/modules_propale.php | 2 +- htdocs/index.php | 2 +- 30 files changed, 29 insertions(+), 29 deletions(-) rename htdocs/compta/bank/{ => class}/account.class.php (100%) diff --git a/htdocs/adherents/card_subscriptions.php b/htdocs/adherents/card_subscriptions.php index eda2bdc500c..85bb2ac1566 100644 --- a/htdocs/adherents/card_subscriptions.php +++ b/htdocs/adherents/card_subscriptions.php @@ -31,7 +31,7 @@ require_once(DOL_DOCUMENT_ROOT."/adherents/class/adherent.class.php"); require_once(DOL_DOCUMENT_ROOT."/adherents/class/adherent_type.class.php"); require_once(DOL_DOCUMENT_ROOT."/adherents/class/adherent_options.class.php"); require_once(DOL_DOCUMENT_ROOT."/adherents/class/cotisation.class.php"); -require_once(DOL_DOCUMENT_ROOT."/compta/bank/account.class.php"); +require_once(DOL_DOCUMENT_ROOT."/compta/bank/class/account.class.php"); $langs->load("companies"); $langs->load("bills"); diff --git a/htdocs/adherents/class/cotisation.class.php b/htdocs/adherents/class/cotisation.class.php index 656ee2aa335..84940bdb754 100644 --- a/htdocs/adherents/class/cotisation.class.php +++ b/htdocs/adherents/class/cotisation.class.php @@ -194,7 +194,7 @@ class Cotisation extends CommonObject // It subscription is linked to a bank transaction, we get it if ($this->fk_bank) { - require_once(DOL_DOCUMENT_ROOT."/compta/bank/account.class.php"); + require_once(DOL_DOCUMENT_ROOT."/compta/bank/class/account.class.php"); $accountline=new AccountLine($this->db); $result=$accountline->fetch($this->fk_bank); } diff --git a/htdocs/adherents/cotisations.php b/htdocs/adherents/cotisations.php index 2dbc4ebaed8..6d21f15ced0 100644 --- a/htdocs/adherents/cotisations.php +++ b/htdocs/adherents/cotisations.php @@ -28,7 +28,7 @@ require("../main.inc.php"); require_once(DOL_DOCUMENT_ROOT."/adherents/class/adherent.class.php"); require_once(DOL_DOCUMENT_ROOT."/adherents/class/cotisation.class.php"); -require_once(DOL_DOCUMENT_ROOT."/compta/bank/account.class.php"); +require_once(DOL_DOCUMENT_ROOT."/compta/bank/class/account.class.php"); $langs->load("members"); diff --git a/htdocs/adherents/fiche.php b/htdocs/adherents/fiche.php index e0b623dbf48..920a5e8c33c 100644 --- a/htdocs/adherents/fiche.php +++ b/htdocs/adherents/fiche.php @@ -34,7 +34,7 @@ require_once(DOL_DOCUMENT_ROOT."/adherents/class/adherent.class.php"); require_once(DOL_DOCUMENT_ROOT."/adherents/class/adherent_type.class.php"); require_once(DOL_DOCUMENT_ROOT."/adherents/class/adherent_options.class.php"); require_once(DOL_DOCUMENT_ROOT."/adherents/class/cotisation.class.php"); -require_once(DOL_DOCUMENT_ROOT."/compta/bank/account.class.php"); +require_once(DOL_DOCUMENT_ROOT."/compta/bank/class/account.class.php"); require_once(DOL_DOCUMENT_ROOT."/html.formcompany.class.php"); $langs->load("companies"); diff --git a/htdocs/adherents/fiche_subscription.php b/htdocs/adherents/fiche_subscription.php index b16c9570c19..8931d72a4e2 100644 --- a/htdocs/adherents/fiche_subscription.php +++ b/htdocs/adherents/fiche_subscription.php @@ -27,7 +27,7 @@ require("../main.inc.php"); require_once(DOL_DOCUMENT_ROOT."/lib/member.lib.php"); require_once(DOL_DOCUMENT_ROOT."/adherents/class/adherent.class.php"); require_once(DOL_DOCUMENT_ROOT."/adherents/class/cotisation.class.php"); -require_once(DOL_DOCUMENT_ROOT."/compta/bank/account.class.php"); +require_once(DOL_DOCUMENT_ROOT."/compta/bank/class/account.class.php"); $langs->load("companies"); $langs->load("bills"); diff --git a/htdocs/cashdesk/tpl/menu.tpl.php b/htdocs/cashdesk/tpl/menu.tpl.php index 9e5311d2a0d..356fb3870bb 100644 --- a/htdocs/cashdesk/tpl/menu.tpl.php +++ b/htdocs/cashdesk/tpl/menu.tpl.php @@ -19,7 +19,7 @@ */ include_once(DOL_DOCUMENT_ROOT.'/societe/societe.class.php'); -include_once(DOL_DOCUMENT_ROOT.'/compta/bank/account.class.php'); +include_once(DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php'); include_once(DOL_DOCUMENT_ROOT.'/product/stock/entrepot.class.php'); if (!empty($conf->global->CASHDESK_ID_THIRDPARTY)) diff --git a/htdocs/cashdesk/validation_verif.php b/htdocs/cashdesk/validation_verif.php index 62bea3ebede..874d832ea17 100644 --- a/htdocs/cashdesk/validation_verif.php +++ b/htdocs/cashdesk/validation_verif.php @@ -21,7 +21,7 @@ require ('../master.inc.php'); require (DOL_DOCUMENT_ROOT.'/cashdesk/include/environnement.php'); require (DOL_DOCUMENT_ROOT.'/cashdesk/classes/Facturation.class.php'); require (DOL_DOCUMENT_ROOT.'/compta/facture/facture.class.php'); -require (DOL_DOCUMENT_ROOT.'/compta/bank/account.class.php'); +require (DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php'); require (DOL_DOCUMENT_ROOT.'/compta/paiement/class/paiement.class.php'); $obj_facturation = unserialize ($_SESSION['serObjFacturation']); diff --git a/htdocs/compta/bank/annuel.php b/htdocs/compta/bank/annuel.php index b7a16c88321..99544fcedab 100644 --- a/htdocs/compta/bank/annuel.php +++ b/htdocs/compta/bank/annuel.php @@ -27,7 +27,7 @@ require("./pre.inc.php"); require_once(DOL_DOCUMENT_ROOT."/lib/bank.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/compta/bank/account.class.php"); +require_once(DOL_DOCUMENT_ROOT."/compta/bank/class/account.class.php"); // Security check if (isset($_GET["account"]) || isset($_GET["ref"])) diff --git a/htdocs/compta/bank/account.class.php b/htdocs/compta/bank/class/account.class.php similarity index 100% rename from htdocs/compta/bank/account.class.php rename to htdocs/compta/bank/class/account.class.php diff --git a/htdocs/compta/bank/graph.php b/htdocs/compta/bank/graph.php index c34fde7d34d..098c566e832 100644 --- a/htdocs/compta/bank/graph.php +++ b/htdocs/compta/bank/graph.php @@ -27,7 +27,7 @@ require("./pre.inc.php"); require_once(DOL_DOCUMENT_ROOT."/lib/bank.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/compta/bank/account.class.php"); +require_once(DOL_DOCUMENT_ROOT."/compta/bank/class/account.class.php"); require_once(DOL_DOCUMENT_ROOT."/core/dolgraph.class.php"); $langs->load("banks"); diff --git a/htdocs/compta/bank/pre.inc.php b/htdocs/compta/bank/pre.inc.php index 50820e8635e..0d58c0368a2 100644 --- a/htdocs/compta/bank/pre.inc.php +++ b/htdocs/compta/bank/pre.inc.php @@ -27,7 +27,7 @@ */ require_once("../../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/compta/bank/account.class.php"); +require_once(DOL_DOCUMENT_ROOT."/compta/bank/class/account.class.php"); $langs->load("banks"); diff --git a/htdocs/compta/bank/search.php b/htdocs/compta/bank/search.php index e7b60fee8da..de851a44775 100644 --- a/htdocs/compta/bank/search.php +++ b/htdocs/compta/bank/search.php @@ -28,7 +28,7 @@ require("./pre.inc.php"); require_once(DOL_DOCUMENT_ROOT."/lib/bank.lib.php"); require_once(DOL_DOCUMENT_ROOT."/societe/societe.class.php"); -require_once(DOL_DOCUMENT_ROOT."/compta/bank/account.class.php"); +require_once(DOL_DOCUMENT_ROOT."/compta/bank/class/account.class.php"); require_once(DOL_DOCUMENT_ROOT."/compta/bank/bankcateg.class.php"); // Security check diff --git a/htdocs/compta/bank/virement.php b/htdocs/compta/bank/virement.php index 69aa526b980..9dd871b2a58 100644 --- a/htdocs/compta/bank/virement.php +++ b/htdocs/compta/bank/virement.php @@ -68,7 +68,7 @@ if ($_POST["action"] == 'add') } if (! $error) { - require_once(DOL_DOCUMENT_ROOT.'/compta/bank/account.class.php'); + require_once(DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php'); $accountfrom=new Account($db); $accountfrom->fetch($_POST["account_from"]); diff --git a/htdocs/compta/paiement.php b/htdocs/compta/paiement.php index 738086d676d..702a65b6678 100644 --- a/htdocs/compta/paiement.php +++ b/htdocs/compta/paiement.php @@ -30,7 +30,7 @@ require('../main.inc.php'); require_once(DOL_DOCUMENT_ROOT.'/compta/paiement/class/paiement.class.php'); include_once(DOL_DOCUMENT_ROOT.'/compta/facture/facture.class.php'); -include_once(DOL_DOCUMENT_ROOT.'/compta/bank/account.class.php'); +include_once(DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php'); $langs->load('companies'); $langs->load('bills'); diff --git a/htdocs/compta/paiement/cheque/fiche.php b/htdocs/compta/paiement/cheque/fiche.php index 72f1043b013..8c67422043e 100644 --- a/htdocs/compta/paiement/cheque/fiche.php +++ b/htdocs/compta/paiement/cheque/fiche.php @@ -29,7 +29,7 @@ require("./pre.inc.php"); // We use pre.inc.php to have a dynamic menu require_once(DOL_DOCUMENT_ROOT."/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/bank/account.class.php'); +require_once(DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php'); $langs->load('bills'); $langs->load('banks'); diff --git a/htdocs/compta/paiement/cheque/index.php b/htdocs/compta/paiement/cheque/index.php index 195b90f89b5..8306ca39512 100644 --- a/htdocs/compta/paiement/cheque/index.php +++ b/htdocs/compta/paiement/cheque/index.php @@ -27,7 +27,7 @@ require("./pre.inc.php"); require_once(DOL_DOCUMENT_ROOT.'/compta/paiement/cheque/remisecheque.class.php'); -require_once(DOL_DOCUMENT_ROOT.'/compta/bank/account.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 7d832daee70..6c4846fec65 100644 --- a/htdocs/compta/paiement/cheque/liste.php +++ b/htdocs/compta/paiement/cheque/liste.php @@ -27,7 +27,7 @@ require("./pre.inc.php"); require_once(DOL_DOCUMENT_ROOT.'/compta/paiement/cheque/remisecheque.class.php'); -require_once(DOL_DOCUMENT_ROOT.'/compta/bank/account.class.php'); +require_once(DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php'); $langs->load("bills"); diff --git a/htdocs/compta/paiement/cheque/remisecheque.class.php b/htdocs/compta/paiement/cheque/remisecheque.class.php index 040ced6efcf..64925d24d2d 100644 --- a/htdocs/compta/paiement/cheque/remisecheque.class.php +++ b/htdocs/compta/paiement/cheque/remisecheque.class.php @@ -463,7 +463,7 @@ class RemiseCheque extends CommonObject $file = "pdf_".$model.".class.php"; if (file_exists($dir.$file)) { - require_once(DOL_DOCUMENT_ROOT ."/compta/bank/account.class.php"); + require_once(DOL_DOCUMENT_ROOT ."/compta/bank/class/account.class.php"); require_once($dir.$file); $classname='BordereauCheque'.ucfirst($model); diff --git a/htdocs/compta/paiement/fiche.php b/htdocs/compta/paiement/fiche.php index 1b50fa99e9d..095a1488814 100644 --- a/htdocs/compta/paiement/fiche.php +++ b/htdocs/compta/paiement/fiche.php @@ -31,7 +31,7 @@ require("../../main.inc.php"); require_once(DOL_DOCUMENT_ROOT.'/compta/paiement/class/paiement.class.php'); require_once(DOL_DOCUMENT_ROOT.'/compta/facture/facture.class.php'); require_once(DOL_DOCUMENT_ROOT ."/includes/modules/facture/modules_facture.php"); -if ($conf->banque->enabled) require_once(DOL_DOCUMENT_ROOT.'/compta/bank/account.class.php'); +if ($conf->banque->enabled) require_once(DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php'); $langs->load('bills'); $langs->load('banks'); diff --git a/htdocs/compta/paiement/liste.php b/htdocs/compta/paiement/liste.php index 96538169e3d..519d0a743f2 100644 --- a/htdocs/compta/paiement/liste.php +++ b/htdocs/compta/paiement/liste.php @@ -27,7 +27,7 @@ require("../../main.inc.php"); require_once(DOL_DOCUMENT_ROOT.'/compta/paiement/class/paiement.class.php'); -require_once(DOL_DOCUMENT_ROOT.'/compta/bank/account.class.php'); +require_once(DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php'); $langs->load("bills"); diff --git a/htdocs/compta/paiement_charge.php b/htdocs/compta/paiement_charge.php index fc91268936e..2f11b667db9 100755 --- a/htdocs/compta/paiement_charge.php +++ b/htdocs/compta/paiement_charge.php @@ -25,7 +25,7 @@ require('../main.inc.php'); include_once(DOL_DOCUMENT_ROOT."/compta/chargesociales.class.php"); -include_once(DOL_DOCUMENT_ROOT."/compta/bank/account.class.php"); +include_once(DOL_DOCUMENT_ROOT."/compta/bank/class/account.class.php"); $langs->load("bills"); diff --git a/htdocs/compta/payment_sc/fiche.php b/htdocs/compta/payment_sc/fiche.php index fb26b5759a1..cfa9f241596 100644 --- a/htdocs/compta/payment_sc/fiche.php +++ b/htdocs/compta/payment_sc/fiche.php @@ -31,7 +31,7 @@ require('../../main.inc.php'); include_once(DOL_DOCUMENT_ROOT."/compta/chargesociales.class.php"); require_once(DOL_DOCUMENT_ROOT.'/compta/facture/facture.class.php'); require_once(DOL_DOCUMENT_ROOT."/includes/modules/facture/modules_facture.php"); -if ($conf->banque->enabled) require_once(DOL_DOCUMENT_ROOT.'/compta/bank/account.class.php'); +if ($conf->banque->enabled) require_once(DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php'); $langs->load('bills'); $langs->load('banks'); diff --git a/htdocs/compta/tva/fiche.php b/htdocs/compta/tva/fiche.php index 65786e44ca5..7bf629b6c98 100644 --- a/htdocs/compta/tva/fiche.php +++ b/htdocs/compta/tva/fiche.php @@ -27,7 +27,7 @@ require('../../main.inc.php'); require_once(DOL_DOCUMENT_ROOT."/compta/tva/tva.class.php"); -require_once(DOL_DOCUMENT_ROOT."/compta/bank/account.class.php"); +require_once(DOL_DOCUMENT_ROOT."/compta/bank/class/account.class.php"); $langs->load("compta"); $langs->load("banks"); diff --git a/htdocs/compta/tva/tva.class.php b/htdocs/compta/tva/tva.class.php index 210380f6ac9..d162f6d3ea0 100644 --- a/htdocs/compta/tva/tva.class.php +++ b/htdocs/compta/tva/tva.class.php @@ -520,7 +520,7 @@ class Tva extends CommonObject if ($conf->banque->enabled) { // Insertion dans llx_bank - require_once(DOL_DOCUMENT_ROOT.'/compta/bank/account.class.php'); + require_once(DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php'); $acc = new Account($this->db); $result=$acc->fetch($this->accountid); diff --git a/htdocs/fourn/facture/paiementfourn.class.php b/htdocs/fourn/facture/paiementfourn.class.php index fa336cfbce9..08a035f08d6 100644 --- a/htdocs/fourn/facture/paiementfourn.class.php +++ b/htdocs/fourn/facture/paiementfourn.class.php @@ -27,7 +27,7 @@ \version $Id$ */ -require_once(DOL_DOCUMENT_ROOT.'/compta/bank/account.class.php'); +require_once(DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php'); /** \class PaiementFourn diff --git a/htdocs/includes/boxes/box_comptes.php b/htdocs/includes/boxes/box_comptes.php index 10b08619e67..14c92c18019 100644 --- a/htdocs/includes/boxes/box_comptes.php +++ b/htdocs/includes/boxes/box_comptes.php @@ -25,7 +25,7 @@ * \version $Id$ */ include_once(DOL_DOCUMENT_ROOT."/includes/boxes/modules_boxes.php"); -include_once(DOL_DOCUMENT_ROOT."/compta/bank/account.class.php"); +include_once(DOL_DOCUMENT_ROOT."/compta/bank/class/account.class.php"); class box_comptes extends ModeleBoxes { diff --git a/htdocs/includes/modules/commande/modules_commande.php b/htdocs/includes/modules/commande/modules_commande.php index 06684a3a409..30ae6db1e72 100644 --- a/htdocs/includes/modules/commande/modules_commande.php +++ b/htdocs/includes/modules/commande/modules_commande.php @@ -31,7 +31,7 @@ require_once(DOL_DOCUMENT_ROOT.'/lib/pdf.lib.php'); require_once(DOL_DOCUMENT_ROOT.'/includes/fpdf/fpdfi/fpdi_protection.php'); -require_once(DOL_DOCUMENT_ROOT."/compta/bank/account.class.php"); // requis car utilise par les classes qui heritent +require_once(DOL_DOCUMENT_ROOT."/compta/bank/class/account.class.php"); // requis car utilise par les classes qui heritent require_once(DOL_DOCUMENT_ROOT.'/core/discount.class.php'); diff --git a/htdocs/includes/modules/facture/modules_facture.php b/htdocs/includes/modules/facture/modules_facture.php index b69321b4a30..7344b276525 100644 --- a/htdocs/includes/modules/facture/modules_facture.php +++ b/htdocs/includes/modules/facture/modules_facture.php @@ -31,7 +31,7 @@ require_once(DOL_DOCUMENT_ROOT.'/lib/pdf.lib.php'); require_once(DOL_DOCUMENT_ROOT.'/includes/fpdf/fpdfi/fpdi_protection.php'); require_once(DOL_DOCUMENT_ROOT."/product/product.class.php"); -require_once(DOL_DOCUMENT_ROOT."/compta/bank/account.class.php"); // Requis car utilise dans les classes qui heritent +require_once(DOL_DOCUMENT_ROOT."/compta/bank/class/account.class.php"); // Requis car utilise dans les classes qui heritent /** diff --git a/htdocs/includes/modules/propale/modules_propale.php b/htdocs/includes/modules/propale/modules_propale.php index 89ccf7b51b2..8dcc901faa1 100644 --- a/htdocs/includes/modules/propale/modules_propale.php +++ b/htdocs/includes/modules/propale/modules_propale.php @@ -29,7 +29,7 @@ require_once(DOL_DOCUMENT_ROOT.'/lib/pdf.lib.php'); require_once(DOL_DOCUMENT_ROOT.'/includes/fpdf/fpdfi/fpdi_protection.php'); -require_once(DOL_DOCUMENT_ROOT."/compta/bank/account.class.php"); // Requis car utilise dans les classes qui heritent +require_once(DOL_DOCUMENT_ROOT."/compta/bank/class/account.class.php"); // Requis car utilise dans les classes qui heritent /** diff --git a/htdocs/index.php b/htdocs/index.php index 30f57f29a90..8084a2d51f3 100644 --- a/htdocs/index.php +++ b/htdocs/index.php @@ -476,7 +476,7 @@ if ($conf->banque->enabled && $user->rights->banque->lire && ! $user->societe_id { $langs->load("banks"); - include_once(DOL_DOCUMENT_ROOT."/compta/bank/account.class.php"); + include_once(DOL_DOCUMENT_ROOT."/compta/bank/class/account.class.php"); $board=new Account($db); $board->load_board($user);