From 009b251d5249493317385409407485c731de0e63 Mon Sep 17 00:00:00 2001 From: Philippe Grand Date: Tue, 27 Apr 2010 08:13:42 +0000 Subject: [PATCH] according to new tree directory --- dev/initdata/generate-commande.php | 2 +- dev/initdata/generate-propale.php | 2 +- dev/samples/create_order.php | 2 +- htdocs/admin/commande.php | 2 +- htdocs/bookmarks/{ => class}/bookmark.class.php | 0 htdocs/boutique/client/{ => class}/client.class.php | 0 htdocs/boutique/commande/{ => class}/commande.class.php | 0 htdocs/boutique/critiques/{ => class}/critique.class.php | 2 +- .../boutique/notification/{ => class}/notification.class.php | 0 htdocs/boutique/promotion/{ => class}/promotion.class.php | 0 htdocs/comm/fiche.php | 2 +- htdocs/comm/propal/propal.class.php | 4 ++-- htdocs/commande/apercu.php | 2 +- htdocs/commande/commande.class.php | 2 +- htdocs/commande/contact.php | 2 +- htdocs/commande/document.php | 2 +- htdocs/commande/fiche.php | 2 +- htdocs/commande/index.php | 2 +- htdocs/commande/info.php | 2 +- htdocs/commande/liste.php | 2 +- htdocs/commande/note.php | 2 +- htdocs/commande/stats/commandestats.class.php | 2 +- htdocs/commande/stats/index.php | 2 +- htdocs/commande/stats/month.php | 2 +- htdocs/compta/commande/fiche.php | 2 +- htdocs/compta/commande/liste.php | 2 +- htdocs/compta/facture.php | 2 +- htdocs/compta/index.php | 2 +- htdocs/compta/propal.php | 2 +- htdocs/expedition/expedition.class.php | 2 +- htdocs/expedition/fiche.php | 2 +- htdocs/expedition/index.php | 2 +- htdocs/expedition/shipment.php | 2 +- htdocs/fourn/fournisseur.commande.class.php | 2 +- htdocs/includes/boxes/box_commandes.php | 2 +- htdocs/index.php | 4 ++-- htdocs/install/upgrade2.php | 2 +- htdocs/lib/company.lib.php | 2 +- htdocs/livraison/livraison.class.php | 2 +- htdocs/product/fiche.php | 2 +- htdocs/product/stats/commande.php | 2 +- htdocs/product/stats/commande_fournisseur.php | 2 +- htdocs/projet/element.php | 2 +- htdocs/public/paybox/newpayment.php | 2 +- test/CommandeTest.php | 2 +- 45 files changed, 42 insertions(+), 42 deletions(-) rename htdocs/bookmarks/{ => class}/bookmark.class.php (100%) rename htdocs/boutique/client/{ => class}/client.class.php (100%) rename htdocs/boutique/commande/{ => class}/commande.class.php (100%) rename htdocs/boutique/critiques/{ => class}/critique.class.php (97%) rename htdocs/boutique/notification/{ => class}/notification.class.php (100%) rename htdocs/boutique/promotion/{ => class}/promotion.class.php (100%) diff --git a/dev/initdata/generate-commande.php b/dev/initdata/generate-commande.php index f1928fcc522..dc10b88a751 100644 --- a/dev/initdata/generate-commande.php +++ b/dev/initdata/generate-commande.php @@ -146,7 +146,7 @@ $dates = array (mktime(12,0,0,1,3,2003), mktime(12,0,0,12,13,2003), ); -require(DOL_DOCUMENT_ROOT."/commande/commande.class.php"); +require(DOL_DOCUMENT_ROOT."/commande/class/commande.class.php"); print "Build ".GEN_NUMBER_COMMANDE." orders\n"; diff --git a/dev/initdata/generate-propale.php b/dev/initdata/generate-propale.php index 548487cdabf..61f07cef94f 100644 --- a/dev/initdata/generate-propale.php +++ b/dev/initdata/generate-propale.php @@ -37,7 +37,7 @@ $path=preg_replace('/generate-propale.php/i','',$_SERVER["PHP_SELF"]); require ($path."../htdocs/master.inc.php"); require_once(DOL_DOCUMENT_ROOT."/compta/facture/class/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."/commande/class/commande.class.php"); require_once(DOL_DOCUMENT_ROOT."/societe/societe.class.php"); /* diff --git a/dev/samples/create_order.php b/dev/samples/create_order.php index a3faee41b54..1a16b4251c1 100644 --- a/dev/samples/create_order.php +++ b/dev/samples/create_order.php @@ -67,7 +67,7 @@ print 'Argument 2='.$argv[2]."\n"; // Start of transaction $db->begin(); -require_once(DOL_DOCUMENT_ROOT."/commande/commande.class.php"); +require_once(DOL_DOCUMENT_ROOT."/commande/class/commande.class.php"); // Create order object $com = new Commande($db); diff --git a/htdocs/admin/commande.php b/htdocs/admin/commande.php index fdc7423cbb0..d139b8c1bcc 100644 --- a/htdocs/admin/commande.php +++ b/htdocs/admin/commande.php @@ -31,7 +31,7 @@ require("../main.inc.php"); require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php"); -require_once(DOL_DOCUMENT_ROOT.'/commande/commande.class.php'); +require_once(DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php'); $langs->load("admin"); $langs->load("bills"); diff --git a/htdocs/bookmarks/bookmark.class.php b/htdocs/bookmarks/class/bookmark.class.php similarity index 100% rename from htdocs/bookmarks/bookmark.class.php rename to htdocs/bookmarks/class/bookmark.class.php diff --git a/htdocs/boutique/client/client.class.php b/htdocs/boutique/client/class/client.class.php similarity index 100% rename from htdocs/boutique/client/client.class.php rename to htdocs/boutique/client/class/client.class.php diff --git a/htdocs/boutique/commande/commande.class.php b/htdocs/boutique/commande/class/commande.class.php similarity index 100% rename from htdocs/boutique/commande/commande.class.php rename to htdocs/boutique/commande/class/commande.class.php diff --git a/htdocs/boutique/critiques/critique.class.php b/htdocs/boutique/critiques/class/critique.class.php similarity index 97% rename from htdocs/boutique/critiques/critique.class.php rename to htdocs/boutique/critiques/class/critique.class.php index 696df3624a8..e1af5c8e868 100644 --- a/htdocs/boutique/critiques/critique.class.php +++ b/htdocs/boutique/critiques/class/critique.class.php @@ -19,7 +19,7 @@ */ /* - \file htdocs/boutique/critiques/critique.class.php + \file htdocs/boutique/critiques/class/critique.class.php \ingroup prelevement \brief Fichier de la classe des critiques OSCommerce \version $Revision$ diff --git a/htdocs/boutique/notification/notification.class.php b/htdocs/boutique/notification/class/notification.class.php similarity index 100% rename from htdocs/boutique/notification/notification.class.php rename to htdocs/boutique/notification/class/notification.class.php diff --git a/htdocs/boutique/promotion/promotion.class.php b/htdocs/boutique/promotion/class/promotion.class.php similarity index 100% rename from htdocs/boutique/promotion/promotion.class.php rename to htdocs/boutique/promotion/class/promotion.class.php diff --git a/htdocs/comm/fiche.php b/htdocs/comm/fiche.php index f0f7b7864c0..c743daf0f30 100644 --- a/htdocs/comm/fiche.php +++ b/htdocs/comm/fiche.php @@ -34,7 +34,7 @@ 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."/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/commande.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 (!empty($conf->global->MAIN_MODULE_CHRONODOCS)) require_once(DOL_DOCUMENT_ROOT."/chronodocs/chronodocs_entries.class.php"); diff --git a/htdocs/comm/propal/propal.class.php b/htdocs/comm/propal/propal.class.php index 5ad0eddb35a..e8439e2ed77 100644 --- a/htdocs/comm/propal/propal.class.php +++ b/htdocs/comm/propal/propal.class.php @@ -1229,7 +1229,7 @@ class Propal extends CommonObject if ($statut == 2) { // Propale signee - include_once(DOL_DOCUMENT_ROOT."/commande/commande.class.php"); + include_once(DOL_DOCUMENT_ROOT."/commande/class/commande.class.php"); $result=$this->create_commande($user); @@ -1313,7 +1313,7 @@ class Propal extends CommonObject if ($this->statut == 2) { // Propale signee - include_once(DOL_DOCUMENT_ROOT."/commande/commande.class.php"); + include_once(DOL_DOCUMENT_ROOT."/commande/class/commande.class.php"); $commande = new Commande($this->db); $result=$commande->create_from_propale($user, $this->id); diff --git a/htdocs/commande/apercu.php b/htdocs/commande/apercu.php index fbe1781b2f1..137c0a5a06e 100644 --- a/htdocs/commande/apercu.php +++ b/htdocs/commande/apercu.php @@ -28,7 +28,7 @@ require("../main.inc.php"); require_once(DOL_DOCUMENT_ROOT."/lib/order.lib.php"); -require_once(DOL_DOCUMENT_ROOT.'/commande/commande.class.php'); +require_once(DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php'); if ($conf->propal->enabled) require_once(DOL_DOCUMENT_ROOT.'/comm/propal/propal.class.php'); if ($conf->projet->enabled) require_once(DOL_DOCUMENT_ROOT."/projet/project.class.php"); diff --git a/htdocs/commande/commande.class.php b/htdocs/commande/commande.class.php index 9e89a913a0c..a8a5a0f486e 100644 --- a/htdocs/commande/commande.class.php +++ b/htdocs/commande/commande.class.php @@ -21,7 +21,7 @@ */ /** - * \file htdocs/commande/commande.class.php + * \file htdocs/commande/class/commande.class.php * \ingroup commande * \brief Fichier des classes de commandes * \version $Id$ diff --git a/htdocs/commande/contact.php b/htdocs/commande/contact.php index f73c86c045c..46fe1e5852d 100644 --- a/htdocs/commande/contact.php +++ b/htdocs/commande/contact.php @@ -26,7 +26,7 @@ */ require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/commande/commande.class.php"); +require_once(DOL_DOCUMENT_ROOT."/commande/class/commande.class.php"); require_once(DOL_DOCUMENT_ROOT."/contact/contact.class.php"); require_once(DOL_DOCUMENT_ROOT."/lib/order.lib.php"); require_once(DOL_DOCUMENT_ROOT.'/html.formcompany.class.php'); diff --git a/htdocs/commande/document.php b/htdocs/commande/document.php index c097e403d5e..1d7f861c537 100644 --- a/htdocs/commande/document.php +++ b/htdocs/commande/document.php @@ -30,7 +30,7 @@ require("../main.inc.php"); require_once(DOL_DOCUMENT_ROOT.'/lib/order.lib.php'); require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php"); require_once(DOL_DOCUMENT_ROOT."/html.formfile.class.php"); -require_once(DOL_DOCUMENT_ROOT ."/commande/commande.class.php"); +require_once(DOL_DOCUMENT_ROOT ."/commande/class/commande.class.php"); if (!$user->rights->commande->lire) accessforbidden(); diff --git a/htdocs/commande/fiche.php b/htdocs/commande/fiche.php index c959ab15d27..125e4944e16 100644 --- a/htdocs/commande/fiche.php +++ b/htdocs/commande/fiche.php @@ -32,7 +32,7 @@ require("../main.inc.php"); require_once(DOL_DOCUMENT_ROOT."/html.formfile.class.php"); require_once(DOL_DOCUMENT_ROOT."/html.formorder.class.php"); require_once(DOL_DOCUMENT_ROOT."/includes/modules/commande/modules_commande.php"); -require_once(DOL_DOCUMENT_ROOT.'/commande/commande.class.php'); +require_once(DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php'); require_once(DOL_DOCUMENT_ROOT.'/comm/action/actioncomm.class.php'); require_once(DOL_DOCUMENT_ROOT."/lib/order.lib.php"); require_once(DOL_DOCUMENT_ROOT."/lib/functions2.lib.php"); diff --git a/htdocs/commande/index.php b/htdocs/commande/index.php index fa0e158d3ea..b2a913d24ba 100644 --- a/htdocs/commande/index.php +++ b/htdocs/commande/index.php @@ -28,7 +28,7 @@ require("../main.inc.php"); require_once(DOL_DOCUMENT_ROOT."/html.formfile.class.php"); require_once(DOL_DOCUMENT_ROOT ."/core/notify.class.php"); -require_once(DOL_DOCUMENT_ROOT ."/commande/commande.class.php"); +require_once(DOL_DOCUMENT_ROOT ."/commande/class/commande.class.php"); if (!$user->rights->commande->lire) accessforbidden(); diff --git a/htdocs/commande/info.php b/htdocs/commande/info.php index 5d398dcfd78..cc77ee2fed1 100644 --- a/htdocs/commande/info.php +++ b/htdocs/commande/info.php @@ -26,7 +26,7 @@ require("../main.inc.php"); require_once(DOL_DOCUMENT_ROOT."/lib/functions2.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/commande/commande.class.php"); +require_once(DOL_DOCUMENT_ROOT."/commande/class/commande.class.php"); require_once(DOL_DOCUMENT_ROOT."/lib/order.lib.php"); if (!$user->rights->commande->lire) accessforbidden(); diff --git a/htdocs/commande/liste.php b/htdocs/commande/liste.php index 66a4d2fc080..140ca60f902 100644 --- a/htdocs/commande/liste.php +++ b/htdocs/commande/liste.php @@ -29,7 +29,7 @@ require("../main.inc.php"); require_once(DOL_DOCUMENT_ROOT."/html.formfile.class.php"); -require_once(DOL_DOCUMENT_ROOT ."/commande/commande.class.php"); +require_once(DOL_DOCUMENT_ROOT ."/commande/class/commande.class.php"); $langs->load('orders'); $langs->load('companies'); diff --git a/htdocs/commande/note.php b/htdocs/commande/note.php index 06d076e6246..98043757c31 100644 --- a/htdocs/commande/note.php +++ b/htdocs/commande/note.php @@ -27,7 +27,7 @@ require("../main.inc.php"); require_once(DOL_DOCUMENT_ROOT.'/lib/order.lib.php'); -require_once(DOL_DOCUMENT_ROOT ."/commande/commande.class.php"); +require_once(DOL_DOCUMENT_ROOT ."/commande/class/commande.class.php"); $socid=isset($_GET["socid"])?$_GET["socid"]:isset($_POST["socid"])?$_POST["socid"]:""; diff --git a/htdocs/commande/stats/commandestats.class.php b/htdocs/commande/stats/commandestats.class.php index 1b2fafdfe23..7df443ab4ce 100644 --- a/htdocs/commande/stats/commandestats.class.php +++ b/htdocs/commande/stats/commandestats.class.php @@ -25,7 +25,7 @@ * \version $Id$ */ include_once DOL_DOCUMENT_ROOT . "/core/stats.class.php"; -include_once DOL_DOCUMENT_ROOT . "/commande/commande.class.php"; +include_once DOL_DOCUMENT_ROOT . "/commande/class/commande.class.php"; include_once DOL_DOCUMENT_ROOT . "/fourn/fournisseur.commande.class.php"; diff --git a/htdocs/commande/stats/index.php b/htdocs/commande/stats/index.php index f0ecad65f2e..ea7fec53d28 100644 --- a/htdocs/commande/stats/index.php +++ b/htdocs/commande/stats/index.php @@ -25,7 +25,7 @@ */ require("../../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/commande/commande.class.php"); +require_once(DOL_DOCUMENT_ROOT."/commande/class/commande.class.php"); require_once(DOL_DOCUMENT_ROOT."/commande/stats/commandestats.class.php"); require_once(DOL_DOCUMENT_ROOT."/core/dolgraph.class.php"); diff --git a/htdocs/commande/stats/month.php b/htdocs/commande/stats/month.php index 7e8e7301124..a3c516c9fe1 100644 --- a/htdocs/commande/stats/month.php +++ b/htdocs/commande/stats/month.php @@ -25,7 +25,7 @@ * \version $Id$ */ require("../../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/commande/commande.class.php"); +require_once(DOL_DOCUMENT_ROOT."/commande/class/commande.class.php"); require_once(DOL_DOCUMENT_ROOT."/commande/stats/commandestats.class.php"); require_once(DOL_DOCUMENT_ROOT."/core/dolgraph.class.php"); diff --git a/htdocs/compta/commande/fiche.php b/htdocs/compta/commande/fiche.php index bd8c346e8c7..816094b7e2c 100644 --- a/htdocs/compta/commande/fiche.php +++ b/htdocs/compta/commande/fiche.php @@ -30,7 +30,7 @@ require("../../main.inc.php"); require_once(DOL_DOCUMENT_ROOT."/html.formfile.class.php"); require_once(DOL_DOCUMENT_ROOT."/lib/order.lib.php"); require_once(DOL_DOCUMENT_ROOT."/lib/sendings.lib.php"); -require_once(DOL_DOCUMENT_ROOT ."/commande/commande.class.php"); +require_once(DOL_DOCUMENT_ROOT ."/commande/class/commande.class.php"); if ($conf->propal->enabled) require_once(DOL_DOCUMENT_ROOT."/comm/propal/propal.class.php"); if ($conf->projet->enabled) require_once(DOL_DOCUMENT_ROOT."/projet/project.class.php"); diff --git a/htdocs/compta/commande/liste.php b/htdocs/compta/commande/liste.php index a40451404e0..16aaf809d04 100644 --- a/htdocs/compta/commande/liste.php +++ b/htdocs/compta/commande/liste.php @@ -29,7 +29,7 @@ require("../../main.inc.php"); require_once(DOL_DOCUMENT_ROOT."/html.formfile.class.php"); -require_once(DOL_DOCUMENT_ROOT."/commande/commande.class.php"); +require_once(DOL_DOCUMENT_ROOT."/commande/class/commande.class.php"); $langs->load('companies'); diff --git a/htdocs/compta/facture.php b/htdocs/compta/facture.php index 35fabe7caee..e9dc9bcf622 100644 --- a/htdocs/compta/facture.php +++ b/htdocs/compta/facture.php @@ -41,7 +41,7 @@ if ($conf->projet->enabled) require_once(DOL_DOCUMENT_ROOT.'/projet/project.cl 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->commande->enabled) require_once(DOL_DOCUMENT_ROOT.'/commande/commande.class.php'); +if ($conf->commande->enabled) require_once(DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php'); $langs->load('bills'); $langs->load('companies'); diff --git a/htdocs/compta/index.php b/htdocs/compta/index.php index a6739a0ae1c..9e75aa273d8 100644 --- a/htdocs/compta/index.php +++ b/htdocs/compta/index.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/class/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.'/commande/class/commande.class.php'); if ($conf->commande->enabled) require_once(DOL_DOCUMENT_ROOT.'/fourn/fournisseur.commande.class.php'); if ($conf->tax->enabled) require_once(DOL_DOCUMENT_ROOT.'/compta/sociales/class/chargesociales.class.php'); diff --git a/htdocs/compta/propal.php b/htdocs/compta/propal.php index d31ad73fd85..a0785b4fdb9 100644 --- a/htdocs/compta/propal.php +++ b/htdocs/compta/propal.php @@ -33,7 +33,7 @@ require_once(DOL_DOCUMENT_ROOT."/html.formfile.class.php"); require_once(DOL_DOCUMENT_ROOT."/comm/propal/propal.class.php"); require_once(DOL_DOCUMENT_ROOT."/lib/propal.lib.php"); if ($conf->projet->enabled) require_once(DOL_DOCUMENT_ROOT.'/projet/project.class.php'); -if ($conf->commande->enabled) require_once(DOL_DOCUMENT_ROOT.'/commande/commande.class.php'); +if ($conf->commande->enabled) require_once(DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php'); $langs->load('companies'); $langs->load('compta'); diff --git a/htdocs/expedition/expedition.class.php b/htdocs/expedition/expedition.class.php index 146d8ee154b..e68c49a3bcb 100644 --- a/htdocs/expedition/expedition.class.php +++ b/htdocs/expedition/expedition.class.php @@ -27,7 +27,7 @@ require_once(DOL_DOCUMENT_ROOT."/core/commonobject.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->commande->enabled) require_once(DOL_DOCUMENT_ROOT."/commande/class/commande.class.php"); /** diff --git a/htdocs/expedition/fiche.php b/htdocs/expedition/fiche.php index fa1fe0872ed..a7a28cfaa38 100644 --- a/htdocs/expedition/fiche.php +++ b/htdocs/expedition/fiche.php @@ -36,7 +36,7 @@ require_once(DOL_DOCUMENT_ROOT."/lib/product.lib.php"); require_once(DOL_DOCUMENT_ROOT."/lib/sendings.lib.php"); if ($conf->produit->enabled || $conf->service->enabled) require_once(DOL_DOCUMENT_ROOT."/product/product.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->commande->enabled) require_once(DOL_DOCUMENT_ROOT."/commande/class/commande.class.php"); if ($conf->stock->enabled) require_once(DOL_DOCUMENT_ROOT."/product/stock/entrepot.class.php"); $langs->load("sendings"); diff --git a/htdocs/expedition/index.php b/htdocs/expedition/index.php index 312e87023e9..483c0c74a13 100644 --- a/htdocs/expedition/index.php +++ b/htdocs/expedition/index.php @@ -26,7 +26,7 @@ */ require("../main.inc.php"); -require(DOL_DOCUMENT_ROOT."/commande/commande.class.php"); +require(DOL_DOCUMENT_ROOT."/commande/class/commande.class.php"); $langs->load("orders"); $langs->load("sendings"); diff --git a/htdocs/expedition/shipment.php b/htdocs/expedition/shipment.php index e0e11505bdd..a8c40010559 100644 --- a/htdocs/expedition/shipment.php +++ b/htdocs/expedition/shipment.php @@ -34,7 +34,7 @@ require_once(DOL_DOCUMENT_ROOT."/lib/sendings.lib.php"); if ($conf->produit->enabled || $conf->service->enabled) require_once(DOL_DOCUMENT_ROOT."/product/product.class.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->commande->enabled) require_once(DOL_DOCUMENT_ROOT."/commande/commande.class.php"); +if ($conf->commande->enabled) require_once(DOL_DOCUMENT_ROOT."/commande/class/commande.class.php"); if ($conf->stock->enabled) require_once(DOL_DOCUMENT_ROOT."/product/stock/entrepot.class.php"); $langs->load('orders'); diff --git a/htdocs/fourn/fournisseur.commande.class.php b/htdocs/fourn/fournisseur.commande.class.php index 30a1a9110d9..fabb59e3bc8 100644 --- a/htdocs/fourn/fournisseur.commande.class.php +++ b/htdocs/fourn/fournisseur.commande.class.php @@ -28,7 +28,7 @@ */ require_once(DOL_DOCUMENT_ROOT."/product/product.class.php"); -require_once(DOL_DOCUMENT_ROOT."/commande/commande.class.php"); +require_once(DOL_DOCUMENT_ROOT."/commande/class/commande.class.php"); /** diff --git a/htdocs/includes/boxes/box_commandes.php b/htdocs/includes/boxes/box_commandes.php index cf2e759d74b..1f3c36f5064 100644 --- a/htdocs/includes/boxes/box_commandes.php +++ b/htdocs/includes/boxes/box_commandes.php @@ -62,7 +62,7 @@ class box_commandes extends ModeleBoxes { $this->max=$max; - include_once(DOL_DOCUMENT_ROOT."/commande/commande.class.php"); + include_once(DOL_DOCUMENT_ROOT."/commande/class/commande.class.php"); $commandestatic=new Commande($db); $this->info_box_head = array('text' => $langs->trans("BoxTitleLastCustomerOrders",$max)); diff --git a/htdocs/index.php b/htdocs/index.php index 7a8bc53d73f..f74fba907c0 100644 --- a/htdocs/index.php +++ b/htdocs/index.php @@ -133,7 +133,7 @@ if ($user->societe_id == 0) DOL_DOCUMENT_ROOT."/product/product.class.php", DOL_DOCUMENT_ROOT."/product/service.class.php", DOL_DOCUMENT_ROOT."/comm/propal/propal.class.php", - DOL_DOCUMENT_ROOT."/commande/commande.class.php", + 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"); @@ -295,7 +295,7 @@ if ($conf->agenda->enabled && $user->rights->agenda->myactions->read) // Number customer orders a deal if ($conf->commande->enabled && $user->rights->commande->lire) { - include_once(DOL_DOCUMENT_ROOT."/commande/commande.class.php"); + include_once(DOL_DOCUMENT_ROOT."/commande/class/commande.class.php"); $board=new Commande($db); $board->load_board($user); diff --git a/htdocs/install/upgrade2.php b/htdocs/install/upgrade2.php index 6e55e9e85f9..db94b5acc18 100644 --- a/htdocs/install/upgrade2.php +++ b/htdocs/install/upgrade2.php @@ -35,7 +35,7 @@ require_once($dolibarr_main_document_root . "/lib/databases/".$dolibarr_main_db_ 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 . '/commande/commande.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'); require_once($dolibarr_main_document_root . '/core/menubase.class.php'); diff --git a/htdocs/lib/company.lib.php b/htdocs/lib/company.lib.php index f373b6fcdd1..843559940be 100644 --- a/htdocs/lib/company.lib.php +++ b/htdocs/lib/company.lib.php @@ -621,7 +621,7 @@ function show_actions_done($conf,$langs,$db,$objsoc,$objcon='') { require_once(DOL_DOCUMENT_ROOT."/comm/action/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."/commande/class/commande.class.php"); require_once(DOL_DOCUMENT_ROOT."/compta/facture/class/facture.class.php"); $actionstatic=new ActionComm($db); $userstatic=new User($db); diff --git a/htdocs/livraison/livraison.class.php b/htdocs/livraison/livraison.class.php index a8984e4d59a..9c56944e110 100644 --- a/htdocs/livraison/livraison.class.php +++ b/htdocs/livraison/livraison.class.php @@ -30,7 +30,7 @@ require_once(DOL_DOCUMENT_ROOT."/core/commonobject.class.php"); require_once(DOL_DOCUMENT_ROOT."/expedition/expedition.class.php"); require_once(DOL_DOCUMENT_ROOT."/product/stock/mouvementstock.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->commande->enabled) require_once(DOL_DOCUMENT_ROOT."/commande/class/commande.class.php"); /** diff --git a/htdocs/product/fiche.php b/htdocs/product/fiche.php index cd733a4b8e1..5ad4480e1bd 100644 --- a/htdocs/product/fiche.php +++ b/htdocs/product/fiche.php @@ -35,7 +35,7 @@ require_once(DOL_DOCUMENT_ROOT."/lib/product.lib.php"); require_once(DOL_DOCUMENT_ROOT."/comm/propal/propal.class.php"); require_once(DOL_DOCUMENT_ROOT."/compta/facture/class/facture.class.php"); require_once(DOL_DOCUMENT_ROOT."/product/product.class.php"); -require_once(DOL_DOCUMENT_ROOT."/commande/commande.class.php"); +require_once(DOL_DOCUMENT_ROOT."/commande/class/commande.class.php"); $langs->load("bills"); $langs->load("other"); diff --git a/htdocs/product/stats/commande.php b/htdocs/product/stats/commande.php index 3e5779bdb26..8bbf4fcdbfe 100644 --- a/htdocs/product/stats/commande.php +++ b/htdocs/product/stats/commande.php @@ -27,7 +27,7 @@ require("../../main.inc.php"); require_once(DOL_DOCUMENT_ROOT."/lib/product.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/commande/commande.class.php"); +require_once(DOL_DOCUMENT_ROOT."/commande/class/commande.class.php"); require_once(DOL_DOCUMENT_ROOT."/product/product.class.php"); $langs->load("orders"); diff --git a/htdocs/product/stats/commande_fournisseur.php b/htdocs/product/stats/commande_fournisseur.php index 268b19e898e..34aea3c9d6a 100644 --- a/htdocs/product/stats/commande_fournisseur.php +++ b/htdocs/product/stats/commande_fournisseur.php @@ -27,7 +27,7 @@ require("../../main.inc.php"); require_once(DOL_DOCUMENT_ROOT."/lib/product.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/commande/commande.class.php"); +require_once(DOL_DOCUMENT_ROOT."/commande/class/commande.class.php"); require_once(DOL_DOCUMENT_ROOT."/product/product.class.php"); $langs->load("orders"); diff --git a/htdocs/projet/element.php b/htdocs/projet/element.php index bfd028b2b07..44d7d53e3ec 100644 --- a/htdocs/projet/element.php +++ b/htdocs/projet/element.php @@ -31,7 +31,7 @@ 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."/compta/facture/class/facture.class.php"); if ($conf->facture->enabled) require_once(DOL_DOCUMENT_ROOT."/compta/facture/class/facture-rec.class.php"); -if ($conf->commande->enabled) require_once(DOL_DOCUMENT_ROOT."/commande/commande.class.php"); +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"); diff --git a/htdocs/public/paybox/newpayment.php b/htdocs/public/paybox/newpayment.php index fcdecc46fe5..64a7131ec90 100644 --- a/htdocs/public/paybox/newpayment.php +++ b/htdocs/public/paybox/newpayment.php @@ -237,7 +237,7 @@ if ($_REQUEST["amount"] == 'order') $found=true; $langs->load("orders"); - require_once(DOL_DOCUMENT_ROOT."/commande/commande.class.php"); + require_once(DOL_DOCUMENT_ROOT."/commande/class/commande.class.php"); $order=new Commande($db); $result=$order->fetch('',$_REQUEST["ref"]); diff --git a/test/CommandeTest.php b/test/CommandeTest.php index 159363c40fb..5fd40db442d 100644 --- a/test/CommandeTest.php +++ b/test/CommandeTest.php @@ -27,7 +27,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/commande/commande.class.php'; +require_once dirname(__FILE__).'/../htdocs/commande/class/commande.class.php'; if (empty($user->id)) {