diff --git a/dev/initdata/generate-commande.php b/dev/initdata/generate-commande.php index 831eb88deda..3a59e261b83 100644 --- a/dev/initdata/generate-commande.php +++ b/dev/initdata/generate-commande.php @@ -40,7 +40,7 @@ include_once(DOL_DOCUMENT_ROOT."/contact/class/contact.class.php"); include_once(DOL_DOCUMENT_ROOT."/compta/facture/class/facture.class.php"); include_once(DOL_DOCUMENT_ROOT."/product/product.class.php"); include_once(DOL_DOCUMENT_ROOT."/compta/paiement/class/paiement.class.php"); -include_once(DOL_DOCUMENT_ROOT."/contrat/contrat.class.php"); +include_once(DOL_DOCUMENT_ROOT."/contrat/class/contrat.class.php"); /* diff --git a/dev/initdata/generate-produit.php b/dev/initdata/generate-produit.php index 25a31f24eed..79014cdd424 100644 --- a/dev/initdata/generate-produit.php +++ b/dev/initdata/generate-produit.php @@ -40,7 +40,7 @@ include_once(DOL_DOCUMENT_ROOT."/contact/class/contact.class.php"); include_once(DOL_DOCUMENT_ROOT."/compta/facture/class/facture.class.php"); include_once(DOL_DOCUMENT_ROOT."/product/product.class.php"); include_once(DOL_DOCUMENT_ROOT."/compta/paiement/class/paiement.class.php"); -include_once(DOL_DOCUMENT_ROOT."/contrat/contrat.class.php"); +include_once(DOL_DOCUMENT_ROOT."/contrat/class/contrat.class.php"); /* diff --git a/dev/initdata/generate-societe.php b/dev/initdata/generate-societe.php index 0ed09b0e60e..605c364ff1a 100644 --- a/dev/initdata/generate-societe.php +++ b/dev/initdata/generate-societe.php @@ -40,7 +40,7 @@ include_once(DOL_DOCUMENT_ROOT."/contact/class/contact.class.php"); include_once(DOL_DOCUMENT_ROOT."/compta/facture/class/facture.class.php"); include_once(DOL_DOCUMENT_ROOT."/product/product.class.php"); include_once(DOL_DOCUMENT_ROOT."/compta/paiement/class/paiement.class.php"); -include_once(DOL_DOCUMENT_ROOT."/contrat/contrat.class.php"); +include_once(DOL_DOCUMENT_ROOT."/contrat/class/contrat.class.php"); $villes = array("Auray","Baden","Vannes","Pirouville","Haguenau","Souffelweiersheim","Illkirch-Graffenstaden","Lauterbourg","Picauville","Sainte-Mère Eglise","Le Bono"); $prenoms = array("Joe","Marc","Steve","Laurent","Nico","Isabelle","Dorothee","Saby","Brigitte","Karine","Jose-Anne","Celine","Virginie"); diff --git a/htdocs/comm/fiche.php b/htdocs/comm/fiche.php index 19ca46de70f..a3dd3327eee 100644 --- a/htdocs/comm/fiche.php +++ b/htdocs/comm/fiche.php @@ -35,7 +35,7 @@ require_once(DOL_DOCUMENT_ROOT."/contact/class/contact.class.php"); if ($conf->facture->enabled) require_once(DOL_DOCUMENT_ROOT."/compta/facture/class/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/class/commande.class.php"); -if ($conf->contrat->enabled) require_once(DOL_DOCUMENT_ROOT."/contrat/contrat.class.php"); +if ($conf->contrat->enabled) require_once(DOL_DOCUMENT_ROOT."/contrat/class/contrat.class.php"); if (!empty($conf->global->MAIN_MODULE_CHRONODOCS)) require_once(DOL_DOCUMENT_ROOT."/chronodocs/chronodocs_entries.class.php"); $langs->load("companies"); diff --git a/htdocs/comm/index.php b/htdocs/comm/index.php index 11d8412fa46..5cb85950a2e 100644 --- a/htdocs/comm/index.php +++ b/htdocs/comm/index.php @@ -30,7 +30,7 @@ require_once(DOL_DOCUMENT_ROOT."/html.formfile.class.php"); require_once(DOL_DOCUMENT_ROOT."/societe/client.class.php"); require_once(DOL_DOCUMENT_ROOT."/comm/action/actioncomm.class.php"); require_once(DOL_DOCUMENT_ROOT."/lib/agenda.lib.php"); -if ($conf->contrat->enabled) require_once(DOL_DOCUMENT_ROOT."/contrat/contrat.class.php"); +if ($conf->contrat->enabled) require_once(DOL_DOCUMENT_ROOT."/contrat/class/contrat.class.php"); if ($conf->propal->enabled) require_once(DOL_DOCUMENT_ROOT."/comm/propal/propal.class.php"); if (!$user->rights->societe->lire) diff --git a/htdocs/compta/facture.php b/htdocs/compta/facture.php index e9dc9bcf622..e6ee24a02b7 100644 --- a/htdocs/compta/facture.php +++ b/htdocs/compta/facture.php @@ -40,7 +40,7 @@ require_once(DOL_DOCUMENT_ROOT.'/lib/invoice.lib.php'); if ($conf->projet->enabled) require_once(DOL_DOCUMENT_ROOT.'/projet/project.class.php'); if ($conf->projet->enabled) 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->contrat->enabled) require_once(DOL_DOCUMENT_ROOT.'/contrat/contrat.class.php'); +if ($conf->contrat->enabled) require_once(DOL_DOCUMENT_ROOT.'/contrat/class/contrat.class.php'); if ($conf->commande->enabled) require_once(DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php'); $langs->load('bills'); diff --git a/htdocs/contrat/contrat.class.php b/htdocs/contrat/class/contrat.class.php similarity index 100% rename from htdocs/contrat/contrat.class.php rename to htdocs/contrat/class/contrat.class.php diff --git a/htdocs/contrat/contact.php b/htdocs/contrat/contact.php index a472a7e2b10..ff31b2ca5b3 100644 --- a/htdocs/contrat/contact.php +++ b/htdocs/contrat/contact.php @@ -26,7 +26,7 @@ require ("../main.inc.php"); require_once(DOL_DOCUMENT_ROOT.'/lib/contract.lib.php'); -require_once(DOL_DOCUMENT_ROOT."/contrat/contrat.class.php"); +require_once(DOL_DOCUMENT_ROOT."/contrat/class/contrat.class.php"); require_once(DOL_DOCUMENT_ROOT."/contact/class/contact.class.php"); require_once(DOL_DOCUMENT_ROOT.'/html.formcompany.class.php'); diff --git a/htdocs/contrat/document.php b/htdocs/contrat/document.php index cb3912575fb..c98475add8d 100644 --- a/htdocs/contrat/document.php +++ b/htdocs/contrat/document.php @@ -29,7 +29,7 @@ require ("../main.inc.php"); require_once(DOL_DOCUMENT_ROOT."/lib/contract.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/contrat/contrat.class.php"); +require_once(DOL_DOCUMENT_ROOT."/contrat/class/contrat.class.php"); require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php"); require_once(DOL_DOCUMENT_ROOT."/html.formfile.class.php"); diff --git a/htdocs/contrat/fiche.php b/htdocs/contrat/fiche.php index a654d81874e..a3fc50bcd5e 100644 --- a/htdocs/contrat/fiche.php +++ b/htdocs/contrat/fiche.php @@ -30,7 +30,7 @@ require ("../main.inc.php"); require_once(DOL_DOCUMENT_ROOT.'/lib/contract.lib.php'); if ($conf->projet->enabled) require_once(DOL_DOCUMENT_ROOT."/projet/project.class.php"); if ($conf->propal->enabled) require_once(DOL_DOCUMENT_ROOT."/comm/propal/propal.class.php"); -if ($conf->contrat->enabled) require_once(DOL_DOCUMENT_ROOT."/contrat/contrat.class.php"); +if ($conf->contrat->enabled) require_once(DOL_DOCUMENT_ROOT."/contrat/class/contrat.class.php"); if ($conf->projet->enabled) require_once(DOL_DOCUMENT_ROOT."/lib/project.lib.php"); $langs->load("contracts"); diff --git a/htdocs/contrat/index.php b/htdocs/contrat/index.php index e40969c9182..0b43912027b 100644 --- a/htdocs/contrat/index.php +++ b/htdocs/contrat/index.php @@ -26,7 +26,7 @@ */ require ("../main.inc.php"); -require_once (DOL_DOCUMENT_ROOT."/contrat/contrat.class.php"); +require_once (DOL_DOCUMENT_ROOT."/contrat/class/contrat.class.php"); $langs->load("products"); $langs->load("companies"); diff --git a/htdocs/contrat/info.php b/htdocs/contrat/info.php index 2c2f60b7910..03fe7f38844 100644 --- a/htdocs/contrat/info.php +++ b/htdocs/contrat/info.php @@ -26,7 +26,7 @@ require ("../main.inc.php"); require_once(DOL_DOCUMENT_ROOT."/lib/functions2.lib.php"); require_once(DOL_DOCUMENT_ROOT.'/lib/contract.lib.php'); -require_once(DOL_DOCUMENT_ROOT."/contrat/contrat.class.php"); +require_once(DOL_DOCUMENT_ROOT."/contrat/class/contrat.class.php"); $langs->load("contracts"); diff --git a/htdocs/contrat/liste.php b/htdocs/contrat/liste.php index 13fdd46b2a1..799209dcc5d 100644 --- a/htdocs/contrat/liste.php +++ b/htdocs/contrat/liste.php @@ -26,7 +26,7 @@ */ require ("../main.inc.php"); -require_once (DOL_DOCUMENT_ROOT."/contrat/contrat.class.php"); +require_once (DOL_DOCUMENT_ROOT."/contrat/class/contrat.class.php"); $langs->load("contracts"); $langs->load("products"); diff --git a/htdocs/contrat/note.php b/htdocs/contrat/note.php index a59872be017..1f81b01a55b 100644 --- a/htdocs/contrat/note.php +++ b/htdocs/contrat/note.php @@ -26,7 +26,7 @@ require ("../main.inc.php"); require_once(DOL_DOCUMENT_ROOT.'/lib/contract.lib.php'); -if ($conf->contrat->enabled) require_once(DOL_DOCUMENT_ROOT."/contrat/contrat.class.php"); +if ($conf->contrat->enabled) require_once(DOL_DOCUMENT_ROOT."/contrat/class/contrat.class.php"); $socid=isset($_GET["socid"])?$_GET["socid"]:isset($_POST["socid"])?$_POST["socid"]:""; diff --git a/htdocs/contrat/services.php b/htdocs/contrat/services.php index b8623dcc2ee..506d026d562 100644 --- a/htdocs/contrat/services.php +++ b/htdocs/contrat/services.php @@ -26,7 +26,7 @@ */ require ("../main.inc.php"); -require_once (DOL_DOCUMENT_ROOT."/contrat/contrat.class.php"); +require_once (DOL_DOCUMENT_ROOT."/contrat/class/contrat.class.php"); require_once (DOL_DOCUMENT_ROOT."/product/product.class.php"); require_once (DOL_DOCUMENT_ROOT."/societe/societe.class.php"); diff --git a/htdocs/includes/boxes/box_contracts.php b/htdocs/includes/boxes/box_contracts.php index 1ebd8b20a06..59b0896edfd 100644 --- a/htdocs/includes/boxes/box_contracts.php +++ b/htdocs/includes/boxes/box_contracts.php @@ -62,7 +62,7 @@ class box_contracts extends ModeleBoxes { $this->max=$max; - include_once(DOL_DOCUMENT_ROOT."/contrat/contrat.class.php"); + include_once(DOL_DOCUMENT_ROOT."/contrat/class/contrat.class.php"); $contractstatic=new Contrat($db); $this->info_box_head = array('text' => $langs->trans("BoxTitleLastContracts",$max)); diff --git a/htdocs/includes/boxes/box_services_vendus.php b/htdocs/includes/boxes/box_services_vendus.php index 2add8d16db2..eefa339357a 100644 --- a/htdocs/includes/boxes/box_services_vendus.php +++ b/htdocs/includes/boxes/box_services_vendus.php @@ -62,7 +62,7 @@ class box_services_vendus extends ModeleBoxes { $this->max=$max; - include_once(DOL_DOCUMENT_ROOT."/contrat/contrat.class.php"); + include_once(DOL_DOCUMENT_ROOT."/contrat/class/contrat.class.php"); $contratlignestatic=new ContratLigne($db); $this->info_box_head = array('text' => $langs->trans("BoxLastProductsInContract",$max)); diff --git a/htdocs/index.php b/htdocs/index.php index f74fba907c0..a6a21d2b5ed 100644 --- a/htdocs/index.php +++ b/htdocs/index.php @@ -136,7 +136,7 @@ if ($user->societe_id == 0) DOL_DOCUMENT_ROOT."/commande/class/commande.class.php", DOL_DOCUMENT_ROOT."/compta/facture/class/facture.class.php", DOL_DOCUMENT_ROOT."/telephonie/lignetel.class.php", - DOL_DOCUMENT_ROOT."/contrat/contrat.class.php"); + DOL_DOCUMENT_ROOT."/contrat/class/contrat.class.php"); // Name class containing the method load_state_board for each line $classes=array('Client', 'Prospect', @@ -372,7 +372,7 @@ if ($conf->contrat->enabled && $user->rights->contrat->lire) { $langs->load("contracts"); - include_once(DOL_DOCUMENT_ROOT."/contrat/contrat.class.php"); + include_once(DOL_DOCUMENT_ROOT."/contrat/class/contrat.class.php"); $board=new Contrat($db); $board->load_board($user,"inactives"); @@ -398,7 +398,7 @@ if ($conf->contrat->enabled && $user->rights->contrat->lire) { $langs->load("contracts"); - include_once(DOL_DOCUMENT_ROOT."/contrat/contrat.class.php"); + include_once(DOL_DOCUMENT_ROOT."/contrat/class/contrat.class.php"); $board=new Contrat($db); $board->load_board($user,"expired"); diff --git a/htdocs/install/upgrade2.php b/htdocs/install/upgrade2.php index db94b5acc18..725b164fb5a 100644 --- a/htdocs/install/upgrade2.php +++ b/htdocs/install/upgrade2.php @@ -34,7 +34,7 @@ require_once($conffile); if (! isset($dolibarr_main_db_type)) $dolibarr_main_db_ require_once($dolibarr_main_document_root . "/lib/databases/".$dolibarr_main_db_type.".lib.php"); require_once($dolibarr_main_document_root . '/compta/facture/class/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 . '/contrat/class/contrat.class.php'); require_once($dolibarr_main_document_root . '/commande/class/commande.class.php'); require_once($dolibarr_main_document_root . '/fourn/fournisseur.commande.class.php'); require_once($dolibarr_main_document_root . '/lib/price.lib.php'); diff --git a/htdocs/product/stats/contrat.php b/htdocs/product/stats/contrat.php index 427db579d25..e810948af62 100644 --- a/htdocs/product/stats/contrat.php +++ b/htdocs/product/stats/contrat.php @@ -27,7 +27,7 @@ require("../../main.inc.php"); require_once(DOL_DOCUMENT_ROOT."/lib/product.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/contrat/contrat.class.php"); +require_once(DOL_DOCUMENT_ROOT."/contrat/class/contrat.class.php"); require_once(DOL_DOCUMENT_ROOT."/product/product.class.php"); $langs->load("contracts"); diff --git a/htdocs/projet/element.php b/htdocs/projet/element.php index 44d7d53e3ec..3603b184024 100644 --- a/htdocs/projet/element.php +++ b/htdocs/projet/element.php @@ -34,7 +34,7 @@ if ($conf->facture->enabled) require_once(DOL_DOCUMENT_ROOT."/compta/facture if ($conf->commande->enabled) require_once(DOL_DOCUMENT_ROOT."/commande/class/commande.class.php"); if ($conf->fournisseur->enabled) require_once(DOL_DOCUMENT_ROOT."/fourn/fournisseur.facture.class.php"); if ($conf->fournisseur->enabled) require_once(DOL_DOCUMENT_ROOT."/fourn/fournisseur.commande.class.php"); -if ($conf->contrat->enabled) require_once(DOL_DOCUMENT_ROOT."/contrat/contrat.class.php"); +if ($conf->contrat->enabled) require_once(DOL_DOCUMENT_ROOT."/contrat/class/contrat.class.php"); if ($conf->fichinter->enabled) require_once(DOL_DOCUMENT_ROOT."/fichinter/fichinter.class.php"); if ($conf->deplacement->enabled) require_once(DOL_DOCUMENT_ROOT."/compta/deplacement/class/deplacement.class.php"); if ($conf->agenda->enabled) require_once(DOL_DOCUMENT_ROOT."/comm/action/actioncomm.class.php"); diff --git a/htdocs/public/paybox/newpayment.php b/htdocs/public/paybox/newpayment.php index 64a7131ec90..0f1c4ef1129 100644 --- a/htdocs/public/paybox/newpayment.php +++ b/htdocs/public/paybox/newpayment.php @@ -384,7 +384,7 @@ if ($_REQUEST["amount"] == 'contractline') $found=true; $langs->load("contracts"); - require_once(DOL_DOCUMENT_ROOT."/contrat/contrat.class.php"); + require_once(DOL_DOCUMENT_ROOT."/contrat/class/contrat.class.php"); $contractline=new ContratLigne($db); $result=$contractline->fetch('',$_REQUEST["ref"]); diff --git a/test/ContratTest.php b/test/ContratTest.php index c165ee172c7..b58f9736894 100644 --- a/test/ContratTest.php +++ b/test/ContratTest.php @@ -28,7 +28,7 @@ global $conf,$user,$langs,$db; //define('TEST_DB_FORCE_TYPE','mysql'); // This is to force using mysql driver require_once 'PHPUnit/Framework.php'; require_once dirname(__FILE__).'/../htdocs/master.inc.php'; -require_once dirname(__FILE__).'/../htdocs/contrat/contrat.class.php'; +require_once dirname(__FILE__).'/../htdocs/contrat/class/contrat.class.php'; if (empty($user->id)) {