diff --git a/dev/initdata/generate-commande.php b/dev/initdata/generate-commande.php index 54769901b85..76ee63ab98d 100644 --- a/dev/initdata/generate-commande.php +++ b/dev/initdata/generate-commande.php @@ -39,7 +39,7 @@ include_once(DOL_DOCUMENT_ROOT."/societe/societe.class.php"); include_once(DOL_DOCUMENT_ROOT."/contact/contact.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."/compta/paiement/class/paiement.class.php"); include_once(DOL_DOCUMENT_ROOT."/contrat/contrat.class.php"); diff --git a/dev/initdata/generate-produit.php b/dev/initdata/generate-produit.php index 769943807c2..1bd57967e96 100644 --- a/dev/initdata/generate-produit.php +++ b/dev/initdata/generate-produit.php @@ -39,7 +39,7 @@ include_once(DOL_DOCUMENT_ROOT."/societe/societe.class.php"); include_once(DOL_DOCUMENT_ROOT."/contact/contact.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."/compta/paiement/class/paiement.class.php"); include_once(DOL_DOCUMENT_ROOT."/contrat/contrat.class.php"); diff --git a/dev/initdata/generate-societe.php b/dev/initdata/generate-societe.php index 8be4c387920..adf2bfa2cd8 100644 --- a/dev/initdata/generate-societe.php +++ b/dev/initdata/generate-societe.php @@ -39,7 +39,7 @@ include_once(DOL_DOCUMENT_ROOT."/societe/societe.class.php"); include_once(DOL_DOCUMENT_ROOT."/contact/contact.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."/compta/paiement/class/paiement.class.php"); include_once(DOL_DOCUMENT_ROOT."/contrat/contrat.class.php"); $villes = array("Auray","Baden","Vannes","Pirouville","Haguenau","Souffelweiersheim","Illkirch-Graffenstaden","Lauterbourg","Picauville","Sainte-Mère Eglise","Le Bono"); diff --git a/htdocs/cashdesk/validation_verif.php b/htdocs/cashdesk/validation_verif.php index 2efba0b354a..62bea3ebede 100644 --- a/htdocs/cashdesk/validation_verif.php +++ b/htdocs/cashdesk/validation_verif.php @@ -22,7 +22,7 @@ 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.'/paiement.class.php'); +require (DOL_DOCUMENT_ROOT.'/compta/paiement/class/paiement.class.php'); $obj_facturation = unserialize ($_SESSION['serObjFacturation']); unset ($_SESSION['serObjFacturation']); diff --git a/htdocs/compta/bank/account.php b/htdocs/compta/bank/account.php index 423092fa032..f6c0d84950d 100644 --- a/htdocs/compta/bank/account.php +++ b/htdocs/compta/bank/account.php @@ -32,7 +32,7 @@ require_once(DOL_DOCUMENT_ROOT."/lib/bank.lib.php"); require_once(DOL_DOCUMENT_ROOT."/societe/societe.class.php"); require_once(DOL_DOCUMENT_ROOT."/adherents/adherent.class.php"); require_once(DOL_DOCUMENT_ROOT."/compta/chargesociales.class.php"); -require_once(DOL_DOCUMENT_ROOT."/paiement.class.php"); +require_once(DOL_DOCUMENT_ROOT."/compta/paiement/class/paiement.class.php"); require_once(DOL_DOCUMENT_ROOT."/compta/tva/tva.class.php"); require_once(DOL_DOCUMENT_ROOT."/fourn/facture/paiementfourn.class.php"); diff --git a/htdocs/compta/bank/info.php b/htdocs/compta/bank/info.php index 30b772c8c0b..233fad40785 100644 --- a/htdocs/compta/bank/info.php +++ b/htdocs/compta/bank/info.php @@ -25,7 +25,7 @@ require("./pre.inc.php"); require_once(DOL_DOCUMENT_ROOT."/lib/functions2.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/paiement.class.php"); +require_once(DOL_DOCUMENT_ROOT."/compta/paiement/class/paiement.class.php"); $langs->load("banks"); $langs->load("companies"); diff --git a/htdocs/compta/bank/rappro.php b/htdocs/compta/bank/rappro.php index f57be022e95..1bcefde278b 100644 --- a/htdocs/compta/bank/rappro.php +++ b/htdocs/compta/bank/rappro.php @@ -29,7 +29,7 @@ require_once(DOL_DOCUMENT_ROOT."/lib/bank.lib.php"); require_once(DOL_DOCUMENT_ROOT."/societe/societe.class.php"); require_once(DOL_DOCUMENT_ROOT."/adherents/adherent.class.php"); require_once(DOL_DOCUMENT_ROOT."/compta/chargesociales.class.php"); -require_once(DOL_DOCUMENT_ROOT."/paiement.class.php"); +require_once(DOL_DOCUMENT_ROOT."/compta/paiement/class/paiement.class.php"); require_once(DOL_DOCUMENT_ROOT."/compta/tva/tva.class.php"); require_once(DOL_DOCUMENT_ROOT."/fourn/facture/paiementfourn.class.php"); diff --git a/htdocs/compta/dons/fiche.php b/htdocs/compta/dons/fiche.php index 996151ae219..12e4040ae7a 100644 --- a/htdocs/compta/dons/fiche.php +++ b/htdocs/compta/dons/fiche.php @@ -28,7 +28,7 @@ require("../../main.inc.php"); require_once(DOL_DOCUMENT_ROOT."/includes/modules/dons/modules_don.php"); require_once(DOL_DOCUMENT_ROOT."/html.formfile.class.php"); require_once(DOL_DOCUMENT_ROOT."/compta/dons/don.class.php"); -require_once(DOL_DOCUMENT_ROOT."/paiement.class.php"); +require_once(DOL_DOCUMENT_ROOT."/compta/paiement/class/paiement.class.php"); if ($conf->projet->enabled) require_once(DOL_DOCUMENT_ROOT.'/lib/project.lib.php'); $langs->load("companies"); diff --git a/htdocs/compta/facture.php b/htdocs/compta/facture.php index c4798cde04d..736049fd7db 100644 --- a/htdocs/compta/facture.php +++ b/htdocs/compta/facture.php @@ -34,7 +34,7 @@ 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.'/compta/facture/facture.class.php'); require_once(DOL_DOCUMENT_ROOT.'/core/discount.class.php'); -require_once(DOL_DOCUMENT_ROOT.'/paiement.class.php'); +require_once(DOL_DOCUMENT_ROOT.'/compta/paiement/class/paiement.class.php'); require_once(DOL_DOCUMENT_ROOT."/lib/functions2.lib.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/impayees.php b/htdocs/compta/facture/impayees.php index 4b5497be8af..40f3d31b03d 100644 --- a/htdocs/compta/facture/impayees.php +++ b/htdocs/compta/facture/impayees.php @@ -29,7 +29,7 @@ require("../../main.inc.php"); require_once(DOL_DOCUMENT_ROOT."/html.formfile.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."/compta/paiement/class/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/paiement.php b/htdocs/compta/paiement.php index 84d15dcf223..738086d676d 100644 --- a/htdocs/compta/paiement.php +++ b/htdocs/compta/paiement.php @@ -28,7 +28,7 @@ */ require('../main.inc.php'); -require_once(DOL_DOCUMENT_ROOT.'/paiement.class.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'); diff --git a/htdocs/compta/paiement/cheque/fiche.php b/htdocs/compta/paiement/cheque/fiche.php index b17bb9b5122..72f1043b013 100644 --- a/htdocs/compta/paiement/cheque/fiche.php +++ b/htdocs/compta/paiement/cheque/fiche.php @@ -27,7 +27,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.'/paiement.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'); diff --git a/htdocs/paiement.class.php b/htdocs/compta/paiement/class/paiement.class.php similarity index 100% rename from htdocs/paiement.class.php rename to htdocs/compta/paiement/class/paiement.class.php diff --git a/htdocs/compta/paiement/fiche.php b/htdocs/compta/paiement/fiche.php index 3e20e73f921..1b50fa99e9d 100644 --- a/htdocs/compta/paiement/fiche.php +++ b/htdocs/compta/paiement/fiche.php @@ -28,7 +28,7 @@ */ require("../../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT.'/paiement.class.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'); diff --git a/htdocs/compta/paiement/info.php b/htdocs/compta/paiement/info.php index 9d950e0dd93..e7e4ba18a51 100644 --- a/htdocs/compta/paiement/info.php +++ b/htdocs/compta/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."/paiement.class.php"); +require_once(DOL_DOCUMENT_ROOT."/compta/paiement/class/paiement.class.php"); $langs->load("bills"); $langs->load("companies"); diff --git a/htdocs/compta/paiement/liste.php b/htdocs/compta/paiement/liste.php index 04410dbc1fd..96538169e3d 100644 --- a/htdocs/compta/paiement/liste.php +++ b/htdocs/compta/paiement/liste.php @@ -26,7 +26,7 @@ */ require("../../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT.'/paiement.class.php'); +require_once(DOL_DOCUMENT_ROOT.'/compta/paiement/class/paiement.class.php'); require_once(DOL_DOCUMENT_ROOT.'/compta/bank/account.class.php'); $langs->load("bills"); diff --git a/htdocs/compta/prelevement/bon-prelevement.class.php b/htdocs/compta/prelevement/bon-prelevement.class.php index 37627713b0f..4e3410b4d49 100644 --- a/htdocs/compta/prelevement/bon-prelevement.class.php +++ b/htdocs/compta/prelevement/bon-prelevement.class.php @@ -684,7 +684,7 @@ class BonPrelevement extends CommonObject require_once (DOL_DOCUMENT_ROOT."/compta/prelevement/bon-prelevement.class.php"); require_once (DOL_DOCUMENT_ROOT."/compta/facture/facture.class.php"); require_once (DOL_DOCUMENT_ROOT."/societe/societe.class.php"); - require_once (DOL_DOCUMENT_ROOT."/paiement.class.php"); + require_once (DOL_DOCUMENT_ROOT."/compta/paiement/class/paiement.class.php"); $error = 0; diff --git a/htdocs/compta/prelevement/factures.php b/htdocs/compta/prelevement/factures.php index 369a766bbe0..b2fcf0e64db 100644 --- a/htdocs/compta/prelevement/factures.php +++ b/htdocs/compta/prelevement/factures.php @@ -27,11 +27,11 @@ require('../../main.inc.php'); require_once(DOL_DOCUMENT_ROOT."/compta/prelevement/rejet-prelevement.class.php"); -require_once(DOL_DOCUMENT_ROOT."/paiement.class.php"); +require_once(DOL_DOCUMENT_ROOT."/compta/paiement/class/paiement.class.php"); $langs->load("companies"); -// S�curit� acc�s client +// Securite acces client if ($user->societe_id > 0) accessforbidden(); llxHeader('',$langs->trans("WithdrawalReceipt")); diff --git a/htdocs/compta/prelevement/facturesrejets.php b/htdocs/compta/prelevement/facturesrejets.php index 48a25fc786a..2c64508bf10 100644 --- a/htdocs/compta/prelevement/facturesrejets.php +++ b/htdocs/compta/prelevement/facturesrejets.php @@ -22,7 +22,7 @@ require('../../main.inc.php'); require_once DOL_DOCUMENT_ROOT."/compta/prelevement/rejet-prelevement.class.php"; -require_once DOL_DOCUMENT_ROOT."/paiement.class.php"; +require_once DOL_DOCUMENT_ROOT."/compta/paiement/class/paiement.class.php"; /* diff --git a/htdocs/compta/prelevement/fiche-rejet.php b/htdocs/compta/prelevement/fiche-rejet.php index f425aa698d0..e8fa25f9537 100644 --- a/htdocs/compta/prelevement/fiche-rejet.php +++ b/htdocs/compta/prelevement/fiche-rejet.php @@ -24,7 +24,7 @@ require('../../main.inc.php'); require_once(DOL_DOCUMENT_ROOT."/compta/prelevement/rejet-prelevement.class.php"); -require_once(DOL_DOCUMENT_ROOT."/paiement.class.php"); +require_once(DOL_DOCUMENT_ROOT."/compta/paiement/class/paiement.class.php"); // Securite acces client if ($user->societe_id > 0) accessforbidden(); diff --git a/htdocs/compta/prelevement/ligne.php b/htdocs/compta/prelevement/ligne.php index a5111dcf981..6038e48b213 100644 --- a/htdocs/compta/prelevement/ligne.php +++ b/htdocs/compta/prelevement/ligne.php @@ -28,7 +28,7 @@ require('../../main.inc.php'); require_once(DOL_DOCUMENT_ROOT."/compta/prelevement/ligne-prelevement.class.php"); require_once(DOL_DOCUMENT_ROOT."/compta/prelevement/rejet-prelevement.class.php"); -require_once(DOL_DOCUMENT_ROOT."/paiement.class.php"); +require_once(DOL_DOCUMENT_ROOT."/compta/paiement/class/paiement.class.php"); // Security check if ($user->societe_id > 0) accessforbidden(); diff --git a/htdocs/compta/prelevement/lignes.php b/htdocs/compta/prelevement/lignes.php index 646ebbb0843..8358324cd31 100644 --- a/htdocs/compta/prelevement/lignes.php +++ b/htdocs/compta/prelevement/lignes.php @@ -24,7 +24,7 @@ require('../../main.inc.php'); require_once(DOL_DOCUMENT_ROOT."/compta/prelevement/rejet-prelevement.class.php"); -require_once(DOL_DOCUMENT_ROOT."/paiement.class.php"); +require_once(DOL_DOCUMENT_ROOT."/compta/paiement/class/paiement.class.php"); // Security check if ($user->societe_id > 0) accessforbidden(); diff --git a/htdocs/compta/prelevement/liste_factures.php b/htdocs/compta/prelevement/liste_factures.php index bf13520995f..2dfb4fda238 100644 --- a/htdocs/compta/prelevement/liste_factures.php +++ b/htdocs/compta/prelevement/liste_factures.php @@ -27,7 +27,7 @@ require('../../main.inc.php'); require_once(DOL_DOCUMENT_ROOT."/compta/prelevement/rejet-prelevement.class.php"); -require_once(DOL_DOCUMENT_ROOT."/paiement.class.php"); +require_once(DOL_DOCUMENT_ROOT."/compta/paiement/class/paiement.class.php"); $langs->load("withdrawals"); $langs->load("companies"); diff --git a/htdocs/compta/prelevement/rejets.php b/htdocs/compta/prelevement/rejets.php index 1a91176c145..fdec085ca55 100644 --- a/htdocs/compta/prelevement/rejets.php +++ b/htdocs/compta/prelevement/rejets.php @@ -23,7 +23,7 @@ require('../../main.inc.php'); require_once(DOL_DOCUMENT_ROOT."/compta/prelevement/rejet-prelevement.class.php"); -require_once(DOL_DOCUMENT_ROOT."/paiement.class.php"); +require_once(DOL_DOCUMENT_ROOT."/compta/paiement/class/paiement.class.php"); $langs->load("withdrawals"); $langs->load("companies"); diff --git a/htdocs/compta/tva/quadri_detail.php b/htdocs/compta/tva/quadri_detail.php index 8d2c95bdfee..74a5be58be5 100644 --- a/htdocs/compta/tva/quadri_detail.php +++ b/htdocs/compta/tva/quadri_detail.php @@ -34,7 +34,7 @@ require_once(DOL_DOCUMENT_ROOT."/lib/date.lib.php"); require_once(DOL_DOCUMENT_ROOT."/compta/tva/tva.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."/compta/paiement/class/paiement.class.php"); require_once(DOL_DOCUMENT_ROOT."/fourn/fournisseur.facture.class.php"); require_once(DOL_DOCUMENT_ROOT."/fourn/facture/paiementfourn.class.php"); diff --git a/htdocs/fourn/facture/impayees.php b/htdocs/fourn/facture/impayees.php index 797957a02d4..c120844c657 100644 --- a/htdocs/fourn/facture/impayees.php +++ b/htdocs/fourn/facture/impayees.php @@ -28,7 +28,7 @@ require("../../main.inc.php"); require_once(DOL_DOCUMENT_ROOT.'/fourn/fournisseur.class.php'); require_once(DOL_DOCUMENT_ROOT.'/fourn/fournisseur.facture.class.php'); -require_once(DOL_DOCUMENT_ROOT."/paiement.class.php"); +require_once(DOL_DOCUMENT_ROOT."/compta/paiement/class/paiement.class.php"); if (!$user->rights->facture->lire) accessforbidden(); diff --git a/scripts/withdrawals/prelevement.php b/scripts/withdrawals/prelevement.php index 5dff99b11e2..1e38733026f 100644 --- a/scripts/withdrawals/prelevement.php +++ b/scripts/withdrawals/prelevement.php @@ -41,7 +41,7 @@ require_once($path."../../htdocs/master.inc.php"); require_once(DOL_DOCUMENT_ROOT."/compta/prelevement/bon-prelevement.class.php"); require_once(DOL_DOCUMENT_ROOT."/compta/facture/facture.class.php"); require_once(DOL_DOCUMENT_ROOT."/societe/societe.class.php"); -require_once(DOL_DOCUMENT_ROOT."/paiement.class.php"); +require_once(DOL_DOCUMENT_ROOT."/compta/paiement/class/paiement.class.php"); $error = 0;