From 3ce3c74ba79f6b403bf5ba3746d9aa4305aff1e5 Mon Sep 17 00:00:00 2001 From: Philippe Grand Date: Fri, 26 Mar 2010 15:45:01 +0000 Subject: [PATCH] Move facture class file to compta/facture directory --- dev/initdata/generate-commande.php | 2 +- dev/initdata/generate-facture.php | 2 +- dev/initdata/generate-produit.php | 2 +- dev/initdata/generate-propale.php | 2 +- dev/initdata/generate-societe.php | 2 +- htdocs/admin/bank.php | 2 +- htdocs/admin/facture.php | 2 +- htdocs/cashdesk/validation_verif.php | 2 +- htdocs/comm/fiche.php | 2 +- htdocs/comm/prospect/recap-prospect.php | 2 +- htdocs/comm/recap-client.php | 2 +- htdocs/comm/remx.php | 2 +- htdocs/compta/bank/treso.php | 2 +- htdocs/compta/facture.php | 2 +- htdocs/compta/facture/apercu.php | 2 +- htdocs/compta/facture/contact.php | 2 +- htdocs/compta/facture/document.php | 2 +- htdocs/compta/facture/facture-rec.class.php | 2 +- htdocs/{ => compta/facture}/facture.class.php | 2 +- htdocs/compta/facture/impayees.php | 2 +- htdocs/compta/facture/info.php | 2 +- htdocs/compta/facture/note.php | 2 +- htdocs/compta/facture/pre.inc.php | 2 +- htdocs/compta/facture/prelevement.php | 2 +- htdocs/compta/facture/stats/facturestats.class.php | 2 +- htdocs/compta/fiche.php | 2 +- htdocs/compta/index.php | 2 +- htdocs/compta/paiement.php | 2 +- htdocs/compta/paiement/fiche.php | 2 +- htdocs/compta/payment_sc/fiche.php | 2 +- htdocs/compta/prelevement/bon-prelevement.class.php | 4 ++-- htdocs/compta/prelevement/create.php | 4 ++-- htdocs/compta/prelevement/demandes.php | 2 +- htdocs/compta/prelevement/index.php | 4 ++-- htdocs/compta/propal.php | 2 +- htdocs/compta/recap-compta.php | 2 +- htdocs/compta/tva/quadri_detail.php | 2 +- htdocs/compta/ventilation/fiche.php | 2 +- htdocs/compta/ventilation/lignes.php | 2 +- htdocs/compta/ventilation/liste.php | 2 +- htdocs/fourn/fournisseur.facture.class.php | 2 +- htdocs/fourn/recap-fourn.php | 2 +- htdocs/includes/boxes/box_factures.php | 2 +- htdocs/includes/boxes/box_factures_imp.php | 4 ++-- htdocs/index.php | 4 ++-- htdocs/install/upgrade2.php | 2 +- htdocs/lib/company.lib.php | 2 +- htdocs/product/fiche.php | 2 +- htdocs/product/stats/facture.php | 2 +- htdocs/projet/element.php | 2 +- htdocs/public/paybox/newpayment.php | 2 +- htdocs/societe/agenda.php | 2 +- scripts/invoices/rebuild_merge_pdf.php | 2 +- scripts/withdrawals/prelevement-verif.php | 2 +- scripts/withdrawals/prelevement.php | 2 +- 55 files changed, 60 insertions(+), 60 deletions(-) rename htdocs/{ => compta/facture}/facture.class.php (99%) diff --git a/dev/initdata/generate-commande.php b/dev/initdata/generate-commande.php index 48f01c19964..6bda90c84b8 100644 --- a/dev/initdata/generate-commande.php +++ b/dev/initdata/generate-commande.php @@ -37,7 +37,7 @@ $path=preg_replace('/generate-commande.php/i','',$_SERVER["PHP_SELF"]); require ($path."../htdocs/master.inc.php"); include_once(DOL_DOCUMENT_ROOT."/societe.class.php"); include_once(DOL_DOCUMENT_ROOT."/contact/contact.class.php"); -include_once(DOL_DOCUMENT_ROOT."/facture.class.php"); +include_once(DOL_DOCUMENT_ROOT."/compta/facture/facture.class.php"); include_once(DOL_DOCUMENT_ROOT."/product/product.class.php"); include_once(DOL_DOCUMENT_ROOT."/paiement.class.php"); include_once(DOL_DOCUMENT_ROOT."/contrat/contrat.class.php"); diff --git a/dev/initdata/generate-facture.php b/dev/initdata/generate-facture.php index 72184d8bb5c..17e0994fa69 100644 --- a/dev/initdata/generate-facture.php +++ b/dev/initdata/generate-facture.php @@ -34,7 +34,7 @@ if (substr($sapi_type, 0, 3) == 'cgi') { // Recupere root dolibarr $path=preg_replace('/generate-facture.php/i','',$_SERVER["PHP_SELF"]); require ($path."../htdocs/master.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/facture.class.php"); +require_once(DOL_DOCUMENT_ROOT."/compta/facture/facture.class.php"); require_once(DOL_DOCUMENT_ROOT."/societe.class.php"); diff --git a/dev/initdata/generate-produit.php b/dev/initdata/generate-produit.php index 17b01e8e747..3b358c83404 100644 --- a/dev/initdata/generate-produit.php +++ b/dev/initdata/generate-produit.php @@ -37,7 +37,7 @@ $path=preg_replace('/generate-produit.php/i','',$_SERVER["PHP_SELF"]); require ($path."../htdocs/master.inc.php"); include_once(DOL_DOCUMENT_ROOT."/societe.class.php"); include_once(DOL_DOCUMENT_ROOT."/contact/contact.class.php"); -include_once(DOL_DOCUMENT_ROOT."/facture.class.php"); +include_once(DOL_DOCUMENT_ROOT."/compta/facture/facture.class.php"); include_once(DOL_DOCUMENT_ROOT."/product/product.class.php"); include_once(DOL_DOCUMENT_ROOT."/paiement.class.php"); include_once(DOL_DOCUMENT_ROOT."/contrat/contrat.class.php"); diff --git a/dev/initdata/generate-propale.php b/dev/initdata/generate-propale.php index b4fe62bcd10..3bb579818b5 100644 --- a/dev/initdata/generate-propale.php +++ b/dev/initdata/generate-propale.php @@ -35,7 +35,7 @@ if (substr($sapi_type, 0, 3) == 'cgi') { // Recupere root dolibarr $path=preg_replace('/generate-propale.php/i','',$_SERVER["PHP_SELF"]); require ($path."../htdocs/master.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/facture.class.php"); +require_once(DOL_DOCUMENT_ROOT."/compta/facture/facture.class.php"); require_once(DOL_DOCUMENT_ROOT."/comm/propal/propal.class.php"); require_once(DOL_DOCUMENT_ROOT."/commande/commande.class.php"); require_once(DOL_DOCUMENT_ROOT."/societe.class.php"); diff --git a/dev/initdata/generate-societe.php b/dev/initdata/generate-societe.php index dda3b628423..4d69aec1213 100644 --- a/dev/initdata/generate-societe.php +++ b/dev/initdata/generate-societe.php @@ -37,7 +37,7 @@ $path=preg_replace('/generate-societe.php/i','',$_SERVER["PHP_SELF"]); require ($path."../htdocs/master.inc.php"); include_once(DOL_DOCUMENT_ROOT."/societe.class.php"); include_once(DOL_DOCUMENT_ROOT."/contact/contact.class.php"); -include_once(DOL_DOCUMENT_ROOT."/facture.class.php"); +include_once(DOL_DOCUMENT_ROOT."/compta/facture/facture.class.php"); include_once(DOL_DOCUMENT_ROOT."/product/product.class.php"); include_once(DOL_DOCUMENT_ROOT."/paiement.class.php"); include_once(DOL_DOCUMENT_ROOT."/contrat/contrat.class.php"); diff --git a/htdocs/admin/bank.php b/htdocs/admin/bank.php index 282bff48a83..cb8e9f9dc27 100644 --- a/htdocs/admin/bank.php +++ b/htdocs/admin/bank.php @@ -26,7 +26,7 @@ require("../main.inc.php"); require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php"); -require_once(DOL_DOCUMENT_ROOT.'/facture.class.php'); +require_once(DOL_DOCUMENT_ROOT.'/compta/facture/facture.class.php'); $langs->load("admin"); $langs->load("companies"); diff --git a/htdocs/admin/facture.php b/htdocs/admin/facture.php index e8b4b164cec..94d58e6e238 100644 --- a/htdocs/admin/facture.php +++ b/htdocs/admin/facture.php @@ -29,7 +29,7 @@ require("../main.inc.php"); require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php"); -require_once(DOL_DOCUMENT_ROOT.'/facture.class.php'); +require_once(DOL_DOCUMENT_ROOT.'/compta/facture/facture.class.php'); $langs->load("admin"); $langs->load("companies"); diff --git a/htdocs/cashdesk/validation_verif.php b/htdocs/cashdesk/validation_verif.php index 5a07df57773..2efba0b354a 100644 --- a/htdocs/cashdesk/validation_verif.php +++ b/htdocs/cashdesk/validation_verif.php @@ -20,7 +20,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.'/facture.class.php'); +require (DOL_DOCUMENT_ROOT.'/compta/facture/facture.class.php'); require (DOL_DOCUMENT_ROOT.'/compta/bank/account.class.php'); require (DOL_DOCUMENT_ROOT.'/paiement.class.php'); diff --git a/htdocs/comm/fiche.php b/htdocs/comm/fiche.php index ed519d77a78..8bd346d6c21 100644 --- a/htdocs/comm/fiche.php +++ b/htdocs/comm/fiche.php @@ -32,7 +32,7 @@ require_once("./pre.inc.php"); require_once(DOL_DOCUMENT_ROOT."/lib/company.lib.php"); require_once(DOL_DOCUMENT_ROOT."/contact/contact.class.php"); -if ($conf->facture->enabled) require_once(DOL_DOCUMENT_ROOT."/facture.class.php"); +if ($conf->facture->enabled) require_once(DOL_DOCUMENT_ROOT."/compta/facture/facture.class.php"); if ($conf->propal->enabled) require_once(DOL_DOCUMENT_ROOT."/comm/propal/propal.class.php"); if ($conf->commande->enabled) require_once(DOL_DOCUMENT_ROOT."/commande/commande.class.php"); if ($conf->contrat->enabled) require_once(DOL_DOCUMENT_ROOT."/contrat/contrat.class.php"); diff --git a/htdocs/comm/prospect/recap-prospect.php b/htdocs/comm/prospect/recap-prospect.php index f36f9315361..c71eca76a54 100644 --- a/htdocs/comm/prospect/recap-prospect.php +++ b/htdocs/comm/prospect/recap-prospect.php @@ -26,7 +26,7 @@ require("../../main.inc.php"); require_once(DOL_DOCUMENT_ROOT."/lib/company.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/facture.class.php"); +require_once(DOL_DOCUMENT_ROOT."/compta/facture/facture.class.php"); $langs->load("companies"); if ($conf->facture->enabled) $langs->load("bills"); diff --git a/htdocs/comm/recap-client.php b/htdocs/comm/recap-client.php index d155158751e..2391c21c782 100644 --- a/htdocs/comm/recap-client.php +++ b/htdocs/comm/recap-client.php @@ -26,7 +26,7 @@ require("./pre.inc.php"); require_once(DOL_DOCUMENT_ROOT."/lib/company.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/facture.class.php"); +require_once(DOL_DOCUMENT_ROOT."/compta/facture/facture.class.php"); $langs->load("companies"); if ($conf->facture->enabled) $langs->load("bills"); diff --git a/htdocs/comm/remx.php b/htdocs/comm/remx.php index d02b542cd38..bb41973ed13 100644 --- a/htdocs/comm/remx.php +++ b/htdocs/comm/remx.php @@ -27,7 +27,7 @@ require_once("./pre.inc.php"); require_once(DOL_DOCUMENT_ROOT."/lib/company.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/facture.class.php"); +require_once(DOL_DOCUMENT_ROOT."/compta/facture/facture.class.php"); require_once(DOL_DOCUMENT_ROOT."/discount.class.php"); $langs->load("orders"); diff --git a/htdocs/compta/bank/treso.php b/htdocs/compta/bank/treso.php index 776671e3d8b..229e2554356 100644 --- a/htdocs/compta/bank/treso.php +++ b/htdocs/compta/bank/treso.php @@ -28,7 +28,7 @@ require("./pre.inc.php"); require_once(DOL_DOCUMENT_ROOT."/lib/bank.lib.php"); require_once(DOL_DOCUMENT_ROOT."/societe.class.php"); -require_once(DOL_DOCUMENT_ROOT.'/facture.class.php'); +require_once(DOL_DOCUMENT_ROOT.'/compta/facture/facture.class.php'); require_once(DOL_DOCUMENT_ROOT.'/fourn/fournisseur.facture.class.php'); require_once(DOL_DOCUMENT_ROOT.'/compta/chargesociales.class.php'); diff --git a/htdocs/compta/facture.php b/htdocs/compta/facture.php index f3870529923..deb1495c441 100644 --- a/htdocs/compta/facture.php +++ b/htdocs/compta/facture.php @@ -31,7 +31,7 @@ require('./pre.inc.php'); require_once(DOL_DOCUMENT_ROOT."/html.formfile.class.php"); require_once(DOL_DOCUMENT_ROOT.'/includes/modules/facture/modules_facture.php'); -require_once(DOL_DOCUMENT_ROOT.'/facture.class.php'); +require_once(DOL_DOCUMENT_ROOT.'/compta/facture/facture.class.php'); require_once(DOL_DOCUMENT_ROOT.'/discount.class.php'); require_once(DOL_DOCUMENT_ROOT.'/paiement.class.php'); require_once(DOL_DOCUMENT_ROOT."/lib/functions2.lib.php"); diff --git a/htdocs/compta/facture/apercu.php b/htdocs/compta/facture/apercu.php index 723538c7327..6bffea34759 100644 --- a/htdocs/compta/facture/apercu.php +++ b/htdocs/compta/facture/apercu.php @@ -28,7 +28,7 @@ */ require("./pre.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/facture.class.php"); +require_once(DOL_DOCUMENT_ROOT."/compta/facture/facture.class.php"); require_once(DOL_DOCUMENT_ROOT.'/lib/invoice.lib.php'); if ($conf->projet->enabled) require_once(DOL_DOCUMENT_ROOT."/projet/project.class.php"); diff --git a/htdocs/compta/facture/contact.php b/htdocs/compta/facture/contact.php index 7e47ea118af..c7a131fd345 100644 --- a/htdocs/compta/facture/contact.php +++ b/htdocs/compta/facture/contact.php @@ -25,7 +25,7 @@ */ require ("./pre.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/facture.class.php"); +require_once(DOL_DOCUMENT_ROOT."/compta/facture/facture.class.php"); require_once(DOL_DOCUMENT_ROOT."/contact/contact.class.php"); require_once(DOL_DOCUMENT_ROOT.'/discount.class.php'); require_once(DOL_DOCUMENT_ROOT.'/lib/invoice.lib.php'); diff --git a/htdocs/compta/facture/document.php b/htdocs/compta/facture/document.php index 60bdbf4d235..93a9de130aa 100644 --- a/htdocs/compta/facture/document.php +++ b/htdocs/compta/facture/document.php @@ -27,7 +27,7 @@ */ require('./pre.inc.php'); -require_once(DOL_DOCUMENT_ROOT."/facture.class.php"); +require_once(DOL_DOCUMENT_ROOT."/compta/facture/facture.class.php"); require_once(DOL_DOCUMENT_ROOT.'/discount.class.php'); require_once(DOL_DOCUMENT_ROOT."/lib/invoice.lib.php"); require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php"); diff --git a/htdocs/compta/facture/facture-rec.class.php b/htdocs/compta/facture/facture-rec.class.php index 9a9e64a98fa..e90544d52e2 100644 --- a/htdocs/compta/facture/facture-rec.class.php +++ b/htdocs/compta/facture/facture-rec.class.php @@ -27,7 +27,7 @@ require_once(DOL_DOCUMENT_ROOT."/notify.class.php"); require_once(DOL_DOCUMENT_ROOT."/product/product.class.php"); -require_once(DOL_DOCUMENT_ROOT."/facture.class.php"); +require_once(DOL_DOCUMENT_ROOT."/compta/facture/facture.class.php"); /** diff --git a/htdocs/facture.class.php b/htdocs/compta/facture/facture.class.php similarity index 99% rename from htdocs/facture.class.php rename to htdocs/compta/facture/facture.class.php index 2867eb20264..27e351300ae 100644 --- a/htdocs/facture.class.php +++ b/htdocs/compta/facture/facture.class.php @@ -24,7 +24,7 @@ */ /** - * \file htdocs/facture.class.php + * \file htdocs/compta/facture/facture.class.php * \ingroup facture * \brief Fichier de la classe des factures clients * \version $Id$ diff --git a/htdocs/compta/facture/impayees.php b/htdocs/compta/facture/impayees.php index f5bfdd723bc..2f0089e2446 100644 --- a/htdocs/compta/facture/impayees.php +++ b/htdocs/compta/facture/impayees.php @@ -28,7 +28,7 @@ require("./pre.inc.php"); require_once(DOL_DOCUMENT_ROOT."/html.formfile.class.php"); -require_once(DOL_DOCUMENT_ROOT."/facture.class.php"); +require_once(DOL_DOCUMENT_ROOT."/compta/facture/facture.class.php"); require_once(DOL_DOCUMENT_ROOT."/paiement.class.php"); require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php"); require_once(DOL_DOCUMENT_ROOT."/includes/fpdf/fpdfi/fpdi.php"); diff --git a/htdocs/compta/facture/info.php b/htdocs/compta/facture/info.php index a685940406f..2df9b32a2d0 100644 --- a/htdocs/compta/facture/info.php +++ b/htdocs/compta/facture/info.php @@ -25,7 +25,7 @@ */ require("./pre.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/facture.class.php"); +require_once(DOL_DOCUMENT_ROOT."/compta/facture/facture.class.php"); require_once(DOL_DOCUMENT_ROOT.'/discount.class.php'); require_once(DOL_DOCUMENT_ROOT."/lib/functions2.lib.php"); require_once(DOL_DOCUMENT_ROOT.'/lib/invoice.lib.php'); diff --git a/htdocs/compta/facture/note.php b/htdocs/compta/facture/note.php index dde5790b3f3..a807b11c3d9 100644 --- a/htdocs/compta/facture/note.php +++ b/htdocs/compta/facture/note.php @@ -25,7 +25,7 @@ */ require("./pre.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/facture.class.php"); +require_once(DOL_DOCUMENT_ROOT."/compta/facture/facture.class.php"); require_once(DOL_DOCUMENT_ROOT.'/discount.class.php'); require_once(DOL_DOCUMENT_ROOT.'/lib/invoice.lib.php'); diff --git a/htdocs/compta/facture/pre.inc.php b/htdocs/compta/facture/pre.inc.php index c5dba2529a0..ec6bc09ee31 100644 --- a/htdocs/compta/facture/pre.inc.php +++ b/htdocs/compta/facture/pre.inc.php @@ -29,7 +29,7 @@ */ require("../../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/facture.class.php"); +require_once(DOL_DOCUMENT_ROOT."/compta/facture/facture.class.php"); $langs->load('bills'); diff --git a/htdocs/compta/facture/prelevement.php b/htdocs/compta/facture/prelevement.php index a1d3c64b927..20a5cc0e6f3 100644 --- a/htdocs/compta/facture/prelevement.php +++ b/htdocs/compta/facture/prelevement.php @@ -27,7 +27,7 @@ require("./pre.inc.php"); require_once(DOL_DOCUMENT_ROOT.'/lib/invoice.lib.php'); -require_once(DOL_DOCUMENT_ROOT."/facture.class.php"); +require_once(DOL_DOCUMENT_ROOT."/compta/facture/facture.class.php"); if (!$user->rights->facture->lire) accessforbidden(); diff --git a/htdocs/compta/facture/stats/facturestats.class.php b/htdocs/compta/facture/stats/facturestats.class.php index a9baf25e3ec..7655f034a40 100644 --- a/htdocs/compta/facture/stats/facturestats.class.php +++ b/htdocs/compta/facture/stats/facturestats.class.php @@ -25,7 +25,7 @@ * \version $Id$ */ include_once DOL_DOCUMENT_ROOT . "/stats.class.php"; -include_once DOL_DOCUMENT_ROOT . "/facture.class.php"; +include_once DOL_DOCUMENT_ROOT . "/compta/facture/facture.class.php"; include_once DOL_DOCUMENT_ROOT . "/fourn/fournisseur.facture.class.php"; /** diff --git a/htdocs/compta/fiche.php b/htdocs/compta/fiche.php index 9cb00ef03f5..c59357d794a 100644 --- a/htdocs/compta/fiche.php +++ b/htdocs/compta/fiche.php @@ -29,7 +29,7 @@ require("./pre.inc.php"); require_once(DOL_DOCUMENT_ROOT."/lib/company.lib.php"); require_once(DOL_DOCUMENT_ROOT."/contact/contact.class.php"); -require_once(DOL_DOCUMENT_ROOT."/facture.class.php"); +require_once(DOL_DOCUMENT_ROOT."/compta/facture/facture.class.php"); $langs->load("companies"); if ($conf->facture->enabled) $langs->load("bills"); diff --git a/htdocs/compta/index.php b/htdocs/compta/index.php index c209ec78fcf..c139ad433a1 100644 --- a/htdocs/compta/index.php +++ b/htdocs/compta/index.php @@ -27,7 +27,7 @@ require("./pre.inc.php"); require_once(DOL_DOCUMENT_ROOT."/html.formfile.class.php"); -require_once(DOL_DOCUMENT_ROOT.'/facture.class.php'); +require_once(DOL_DOCUMENT_ROOT.'/compta/facture/facture.class.php'); require_once(DOL_DOCUMENT_ROOT.'/fourn/fournisseur.facture.class.php'); if ($conf->commande->enabled) require_once(DOL_DOCUMENT_ROOT.'/commande/commande.class.php'); if ($conf->commande->enabled) require_once(DOL_DOCUMENT_ROOT.'/fourn/fournisseur.commande.class.php'); diff --git a/htdocs/compta/paiement.php b/htdocs/compta/paiement.php index 48fd9371653..121b9f0acf5 100644 --- a/htdocs/compta/paiement.php +++ b/htdocs/compta/paiement.php @@ -28,7 +28,7 @@ include_once('./pre.inc.php'); require_once(DOL_DOCUMENT_ROOT.'/paiement.class.php'); -include_once(DOL_DOCUMENT_ROOT.'/facture.class.php'); +include_once(DOL_DOCUMENT_ROOT.'/compta/facture/facture.class.php'); include_once(DOL_DOCUMENT_ROOT.'/compta/bank/account.class.php'); $langs->load('companies'); diff --git a/htdocs/compta/paiement/fiche.php b/htdocs/compta/paiement/fiche.php index 0d1af024f36..24e3cd634b8 100644 --- a/htdocs/compta/paiement/fiche.php +++ b/htdocs/compta/paiement/fiche.php @@ -29,7 +29,7 @@ require('./pre.inc.php'); require_once(DOL_DOCUMENT_ROOT.'/paiement.class.php'); -require_once(DOL_DOCUMENT_ROOT.'/facture.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'); diff --git a/htdocs/compta/payment_sc/fiche.php b/htdocs/compta/payment_sc/fiche.php index 704c8a5bb25..c7f664feb2a 100644 --- a/htdocs/compta/payment_sc/fiche.php +++ b/htdocs/compta/payment_sc/fiche.php @@ -29,7 +29,7 @@ require('./pre.inc.php'); include_once(DOL_DOCUMENT_ROOT."/compta/chargesociales.class.php"); -require_once(DOL_DOCUMENT_ROOT.'/facture.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'); diff --git a/htdocs/compta/prelevement/bon-prelevement.class.php b/htdocs/compta/prelevement/bon-prelevement.class.php index 1a55e1771cc..8a53bfcfcb8 100644 --- a/htdocs/compta/prelevement/bon-prelevement.class.php +++ b/htdocs/compta/prelevement/bon-prelevement.class.php @@ -25,7 +25,7 @@ */ require_once(DOL_DOCUMENT_ROOT ."/commonobject.class.php"); -require_once(DOL_DOCUMENT_ROOT."/facture.class.php"); +require_once(DOL_DOCUMENT_ROOT."/compta/facture/facture.class.php"); require_once(DOL_DOCUMENT_ROOT."/societe.class.php"); @@ -682,7 +682,7 @@ class BonPrelevement extends CommonObject dol_syslog("BonPrelevement::Create banque=$banque guichet=$guichet"); require_once (DOL_DOCUMENT_ROOT."/compta/prelevement/bon-prelevement.class.php"); - require_once (DOL_DOCUMENT_ROOT."/facture.class.php"); + require_once (DOL_DOCUMENT_ROOT."/compta/facture/facture.class.php"); require_once (DOL_DOCUMENT_ROOT."/societe.class.php"); require_once (DOL_DOCUMENT_ROOT."/paiement.class.php"); diff --git a/htdocs/compta/prelevement/create.php b/htdocs/compta/prelevement/create.php index e44da0a24c9..b4e22a764e5 100644 --- a/htdocs/compta/prelevement/create.php +++ b/htdocs/compta/prelevement/create.php @@ -25,7 +25,7 @@ require("./pre.inc.php"); require_once(DOL_DOCUMENT_ROOT."/includes/modules/modPrelevement.class.php"); -require_once DOL_DOCUMENT_ROOT."/facture.class.php"; +require_once DOL_DOCUMENT_ROOT."/compta/facture/facture.class.php"; require_once DOL_DOCUMENT_ROOT."/societe.class.php"; $langs->load("widthdrawals"); @@ -179,7 +179,7 @@ else /* - * Factures en attente de prélèvement + * Factures en attente de pr�l�vement * */ $sql = "SELECT f.facnumber, f.rowid, s.nom, s.rowid as socid"; diff --git a/htdocs/compta/prelevement/demandes.php b/htdocs/compta/prelevement/demandes.php index 9a11086ae74..4eba108c3b0 100644 --- a/htdocs/compta/prelevement/demandes.php +++ b/htdocs/compta/prelevement/demandes.php @@ -26,7 +26,7 @@ require("./pre.inc.php"); require_once DOL_DOCUMENT_ROOT."/includes/modules/modPrelevement.class.php"; -require_once DOL_DOCUMENT_ROOT."/facture.class.php"; +require_once DOL_DOCUMENT_ROOT."/compta/facture/facture.class.php"; require_once DOL_DOCUMENT_ROOT."/societe.class.php"; $langs->load("widthdrawals"); diff --git a/htdocs/compta/prelevement/index.php b/htdocs/compta/prelevement/index.php index 893556d38df..d6e4e2e59c4 100644 --- a/htdocs/compta/prelevement/index.php +++ b/htdocs/compta/prelevement/index.php @@ -26,7 +26,7 @@ require("./pre.inc.php"); require_once DOL_DOCUMENT_ROOT."/includes/modules/modPrelevement.class.php"; -require_once DOL_DOCUMENT_ROOT."/facture.class.php"; +require_once DOL_DOCUMENT_ROOT."/compta/facture/facture.class.php"; require_once DOL_DOCUMENT_ROOT."/societe.class.php"; $langs->load("withdrawals"); @@ -130,7 +130,7 @@ else /* - * Bon de prélèvement + * Bon de pr�l�vement * */ $limit=5; diff --git a/htdocs/compta/propal.php b/htdocs/compta/propal.php index bb43d6afb33..cd81c5dcc74 100644 --- a/htdocs/compta/propal.php +++ b/htdocs/compta/propal.php @@ -560,7 +560,7 @@ if ($id > 0 || ! empty($ref)) print ''.$langs->trans("Status").''; print "\n"; - require_once(DOL_DOCUMENT_ROOT.'/facture.class.php'); + require_once(DOL_DOCUMENT_ROOT.'/compta/facture/facture.class.php'); $staticfacture=new Facture($db); $var=True; diff --git a/htdocs/compta/recap-compta.php b/htdocs/compta/recap-compta.php index 5ca6c49c1c2..5ea34eceab7 100644 --- a/htdocs/compta/recap-compta.php +++ b/htdocs/compta/recap-compta.php @@ -26,7 +26,7 @@ require("./pre.inc.php"); require_once(DOL_DOCUMENT_ROOT."/lib/company.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/facture.class.php"); +require_once(DOL_DOCUMENT_ROOT."/compta/facture/facture.class.php"); $langs->load("companies"); if ($conf->facture->enabled) $langs->load("bills"); diff --git a/htdocs/compta/tva/quadri_detail.php b/htdocs/compta/tva/quadri_detail.php index 7da2a95af18..3904b858cbe 100644 --- a/htdocs/compta/tva/quadri_detail.php +++ b/htdocs/compta/tva/quadri_detail.php @@ -32,7 +32,7 @@ require_once(DOL_DOCUMENT_ROOT."/lib/report.lib.php"); require_once(DOL_DOCUMENT_ROOT."/lib/tax.lib.php"); require_once(DOL_DOCUMENT_ROOT."/lib/date.lib.php"); require_once(DOL_DOCUMENT_ROOT."/compta/tva/tva.class.php"); -require_once(DOL_DOCUMENT_ROOT."/facture.class.php"); +require_once(DOL_DOCUMENT_ROOT."/compta/facture/facture.class.php"); require_once(DOL_DOCUMENT_ROOT."/product/product.class.php"); require_once(DOL_DOCUMENT_ROOT."/paiement.class.php"); require_once(DOL_DOCUMENT_ROOT."/fourn/fournisseur.facture.class.php"); diff --git a/htdocs/compta/ventilation/fiche.php b/htdocs/compta/ventilation/fiche.php index 92b45179d51..9c524c532ba 100644 --- a/htdocs/compta/ventilation/fiche.php +++ b/htdocs/compta/ventilation/fiche.php @@ -28,7 +28,7 @@ */ require("./pre.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/facture.class.php"); +require_once(DOL_DOCUMENT_ROOT."/compta/facture/facture.class.php"); $langs->load("bills"); diff --git a/htdocs/compta/ventilation/lignes.php b/htdocs/compta/ventilation/lignes.php index 83f2a56a3e5..c511f92a184 100644 --- a/htdocs/compta/ventilation/lignes.php +++ b/htdocs/compta/ventilation/lignes.php @@ -28,7 +28,7 @@ */ require("./pre.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/facture.class.php"); +require_once(DOL_DOCUMENT_ROOT."/compta/facture/facture.class.php"); require_once(DOL_DOCUMENT_ROOT."/product/product.class.php"); $langs->load("bills"); diff --git a/htdocs/compta/ventilation/liste.php b/htdocs/compta/ventilation/liste.php index afad85a002b..a6168d367e4 100644 --- a/htdocs/compta/ventilation/liste.php +++ b/htdocs/compta/ventilation/liste.php @@ -30,7 +30,7 @@ */ require("./pre.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/facture.class.php"); +require_once(DOL_DOCUMENT_ROOT."/compta/facture/facture.class.php"); require_once(DOL_DOCUMENT_ROOT."/product/product.class.php"); $langs->load("compta"); diff --git a/htdocs/fourn/fournisseur.facture.class.php b/htdocs/fourn/fournisseur.facture.class.php index bf8df957d79..70cc406cc5b 100644 --- a/htdocs/fourn/fournisseur.facture.class.php +++ b/htdocs/fourn/fournisseur.facture.class.php @@ -27,7 +27,7 @@ * \version $Id$ */ -include_once(DOL_DOCUMENT_ROOT."/facture.class.php"); +include_once(DOL_DOCUMENT_ROOT."/compta/facture/facture.class.php"); /** diff --git a/htdocs/fourn/recap-fourn.php b/htdocs/fourn/recap-fourn.php index a01134bf815..e766656da98 100644 --- a/htdocs/fourn/recap-fourn.php +++ b/htdocs/fourn/recap-fourn.php @@ -26,7 +26,7 @@ require("./pre.inc.php"); require_once(DOL_DOCUMENT_ROOT."/lib/company.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/facture.class.php"); +require_once(DOL_DOCUMENT_ROOT."/compta/facture/facture.class.php"); $langs->load("companies"); if ($conf->facture->enabled) $langs->load("bills"); diff --git a/htdocs/includes/boxes/box_factures.php b/htdocs/includes/boxes/box_factures.php index 384c5610607..ceea7ac0f1d 100644 --- a/htdocs/includes/boxes/box_factures.php +++ b/htdocs/includes/boxes/box_factures.php @@ -61,7 +61,7 @@ class box_factures extends ModeleBoxes { $this->max=$max; - include_once(DOL_DOCUMENT_ROOT."/facture.class.php"); + include_once(DOL_DOCUMENT_ROOT."/compta/facture/facture.class.php"); $facturestatic=new Facture($db); $text = $langs->trans("BoxTitleLastCustomerBills",$max); diff --git a/htdocs/includes/boxes/box_factures_imp.php b/htdocs/includes/boxes/box_factures_imp.php index 61ce184b5bc..801b44875a9 100644 --- a/htdocs/includes/boxes/box_factures_imp.php +++ b/htdocs/includes/boxes/box_factures_imp.php @@ -26,7 +26,7 @@ */ require_once(DOL_DOCUMENT_ROOT."/includes/boxes/modules_boxes.php"); -require_once(DOL_DOCUMENT_ROOT.'/facture.class.php'); +require_once(DOL_DOCUMENT_ROOT.'/compta/facture/facture.class.php'); class box_factures_imp extends ModeleBoxes { @@ -64,7 +64,7 @@ class box_factures_imp extends ModeleBoxes { $this->max=$max; - include_once(DOL_DOCUMENT_ROOT."/facture.class.php"); + include_once(DOL_DOCUMENT_ROOT."/compta/facture/facture.class.php"); $facturestatic=new Facture($db); $this->info_box_head = array('text' => $langs->trans("BoxTitleOldestUnpaidCustomerBills",$max)); diff --git a/htdocs/index.php b/htdocs/index.php index 6c3d80ac8ab..be5358c5ef8 100644 --- a/htdocs/index.php +++ b/htdocs/index.php @@ -135,7 +135,7 @@ if ($user->societe_id == 0) DOL_DOCUMENT_ROOT."/service.class.php", DOL_DOCUMENT_ROOT."/comm/propal/propal.class.php", DOL_DOCUMENT_ROOT."/commande/commande.class.php", - DOL_DOCUMENT_ROOT."/facture.class.php", + DOL_DOCUMENT_ROOT."/compta/facture/facture.class.php", DOL_DOCUMENT_ROOT."/telephonie/lignetel.class.php", DOL_DOCUMENT_ROOT."/contrat/contrat.class.php"); // Name class containing the method load_state_board for each line @@ -451,7 +451,7 @@ if ($conf->facture->enabled && $user->rights->facture->lire) { $langs->load("bills"); - include_once(DOL_DOCUMENT_ROOT."/facture.class.php"); + include_once(DOL_DOCUMENT_ROOT."/compta/facture/facture.class.php"); $board=new Facture($db); $board->load_board($user); diff --git a/htdocs/install/upgrade2.php b/htdocs/install/upgrade2.php index ecdc07aec0b..5bef3e4d9e8 100644 --- a/htdocs/install/upgrade2.php +++ b/htdocs/install/upgrade2.php @@ -31,7 +31,7 @@ if (! file_exists($conffile)) } require_once($conffile); if (! isset($dolibarr_main_db_type)) $dolibarr_main_db_type='mysql'; // For backward compatibility require_once($dolibarr_main_document_root . "/lib/databases/".$dolibarr_main_db_type.".lib.php"); -require_once($dolibarr_main_document_root . '/facture.class.php'); +require_once($dolibarr_main_document_root . '/compta/facture/facture.class.php'); require_once($dolibarr_main_document_root . '/comm/propal/propal.class.php'); require_once($dolibarr_main_document_root . '/contrat/contrat.class.php'); require_once($dolibarr_main_document_root . '/commande/commande.class.php'); diff --git a/htdocs/lib/company.lib.php b/htdocs/lib/company.lib.php index 6140cdf352f..3c4f620cef7 100644 --- a/htdocs/lib/company.lib.php +++ b/htdocs/lib/company.lib.php @@ -620,7 +620,7 @@ function show_actions_done($conf,$langs,$db,$objsoc,$objcon='') require_once(DOL_DOCUMENT_ROOT."/actioncomm.class.php"); require_once(DOL_DOCUMENT_ROOT."/comm/propal/propal.class.php"); require_once(DOL_DOCUMENT_ROOT."/commande/commande.class.php"); - require_once(DOL_DOCUMENT_ROOT."/facture.class.php"); + require_once(DOL_DOCUMENT_ROOT."/compta/facture/facture.class.php"); $actionstatic=new ActionComm($db); $userstatic=new User($db); $contactstatic = new Contact($db); diff --git a/htdocs/product/fiche.php b/htdocs/product/fiche.php index 0187d96117f..3390065e8d3 100644 --- a/htdocs/product/fiche.php +++ b/htdocs/product/fiche.php @@ -32,7 +32,7 @@ require("../main.inc.php"); require_once(DOL_DOCUMENT_ROOT."/html.formproduct.class.php"); require_once(DOL_DOCUMENT_ROOT."/lib/product.lib.php"); require_once(DOL_DOCUMENT_ROOT."/comm/propal/propal.class.php"); -require_once(DOL_DOCUMENT_ROOT."/facture.class.php"); +require_once(DOL_DOCUMENT_ROOT."/compta/facture/facture.class.php"); require_once(DOL_DOCUMENT_ROOT."/product/product.class.php"); require_once(DOL_DOCUMENT_ROOT."/commande/commande.class.php"); diff --git a/htdocs/product/stats/facture.php b/htdocs/product/stats/facture.php index cc9a08f1082..b7bae62fd7b 100644 --- a/htdocs/product/stats/facture.php +++ b/htdocs/product/stats/facture.php @@ -27,7 +27,7 @@ require("../../main.inc.php"); require_once(DOL_DOCUMENT_ROOT."/lib/product.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/facture.class.php"); +require_once(DOL_DOCUMENT_ROOT."/compta/facture/facture.class.php"); require_once(DOL_DOCUMENT_ROOT."/product/product.class.php"); $langs->load("companies"); diff --git a/htdocs/projet/element.php b/htdocs/projet/element.php index 9f2e8a39aa3..a8d33708327 100644 --- a/htdocs/projet/element.php +++ b/htdocs/projet/element.php @@ -29,7 +29,7 @@ require("../main.inc.php"); require_once(DOL_DOCUMENT_ROOT."/projet/project.class.php"); require_once(DOL_DOCUMENT_ROOT."/lib/project.lib.php"); if ($conf->propal->enabled) require_once(DOL_DOCUMENT_ROOT."/comm/propal/propal.class.php"); -if ($conf->facture->enabled) require_once(DOL_DOCUMENT_ROOT."/facture.class.php"); +if ($conf->facture->enabled) require_once(DOL_DOCUMENT_ROOT."/compta/facture/facture.class.php"); if ($conf->facture->enabled) require_once(DOL_DOCUMENT_ROOT."/compta/facture/facture-rec.class.php"); if ($conf->commande->enabled) require_once(DOL_DOCUMENT_ROOT."/commande/commande.class.php"); if ($conf->fournisseur->enabled) require_once(DOL_DOCUMENT_ROOT."/fourn/fournisseur.facture.class.php"); diff --git a/htdocs/public/paybox/newpayment.php b/htdocs/public/paybox/newpayment.php index e5a0c9c7bff..9096f6d4023 100644 --- a/htdocs/public/paybox/newpayment.php +++ b/htdocs/public/paybox/newpayment.php @@ -311,7 +311,7 @@ if ($_REQUEST["amount"] == 'invoice') $found=true; $langs->load("bills"); - require_once(DOL_DOCUMENT_ROOT."/facture.class.php"); + require_once(DOL_DOCUMENT_ROOT."/compta/facture/facture.class.php"); $invoice=new Facture($db); $result=$invoice->fetch('',$_REQUEST["ref"]); diff --git a/htdocs/societe/agenda.php b/htdocs/societe/agenda.php index ae3e26ed7e1..7e51b290738 100644 --- a/htdocs/societe/agenda.php +++ b/htdocs/societe/agenda.php @@ -29,7 +29,7 @@ require("../main.inc.php"); require_once(DOL_DOCUMENT_ROOT."/contact/contact.class.php"); -require_once(DOL_DOCUMENT_ROOT."/facture.class.php"); +require_once(DOL_DOCUMENT_ROOT."/compta/facture/facture.class.php"); $langs->load("companies"); diff --git a/scripts/invoices/rebuild_merge_pdf.php b/scripts/invoices/rebuild_merge_pdf.php index ed374f50259..1c74db6fed9 100644 --- a/scripts/invoices/rebuild_merge_pdf.php +++ b/scripts/invoices/rebuild_merge_pdf.php @@ -38,7 +38,7 @@ if (substr($sapi_type, 0, 3) == 'cgi') { require_once($path."../../htdocs/master.inc.php"); // After this $db is an opened handler to database. We close it at end of file. require_once(DOL_DOCUMENT_ROOT."/cron/functions_cron.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/facture.class.php"); +require_once(DOL_DOCUMENT_ROOT."/compta/facture/facture.class.php"); require_once(DOL_DOCUMENT_ROOT."/includes/modules/facture/modules_facture.php"); require_once(DOL_DOCUMENT_ROOT."/includes/fpdf/fpdfi/fpdi.php"); diff --git a/scripts/withdrawals/prelevement-verif.php b/scripts/withdrawals/prelevement-verif.php index ddea47b012a..93509275cdd 100644 --- a/scripts/withdrawals/prelevement-verif.php +++ b/scripts/withdrawals/prelevement-verif.php @@ -38,7 +38,7 @@ if (substr($sapi_type, 0, 3) == 'cgi') { $version='$Revision$'; require_once($path."../../htdocs/master.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/facture.class.php"); +require_once(DOL_DOCUMENT_ROOT."/compta/facture/facture.class.php"); require_once(DOL_DOCUMENT_ROOT."/societe.class.php"); $error = 0; diff --git a/scripts/withdrawals/prelevement.php b/scripts/withdrawals/prelevement.php index 59feea0e333..a15eb39dad5 100644 --- a/scripts/withdrawals/prelevement.php +++ b/scripts/withdrawals/prelevement.php @@ -39,7 +39,7 @@ $version='$Revision$'; require_once($path."../../htdocs/master.inc.php"); require_once(DOL_DOCUMENT_ROOT."/compta/prelevement/bon-prelevement.class.php"); -require_once(DOL_DOCUMENT_ROOT."/facture.class.php"); +require_once(DOL_DOCUMENT_ROOT."/compta/facture/facture.class.php"); require_once(DOL_DOCUMENT_ROOT."/societe.class.php"); require_once(DOL_DOCUMENT_ROOT."/paiement.class.php");