From b68a3592652488c72eadf0cb35b4df841c19e7a9 Mon Sep 17 00:00:00 2001 From: Philippe Grand Date: Wed, 28 Apr 2010 10:02:54 +0000 Subject: [PATCH] according to new tree directory --- dev/skeletons/skeleton_class.class.php | 2 +- htdocs/adherents/class/adherent.class.php | 2 +- htdocs/adherents/class/adherent_type.class.php | 2 +- htdocs/adherents/class/cotisation.class.php | 2 +- htdocs/admin/menus/edit.php | 2 +- htdocs/boutique/commande/class/boutiquecommande.class.php | 2 +- htdocs/comm/mailing/mailing.class.php | 2 +- htdocs/comm/propal/propal.class.php | 4 ++-- htdocs/comm/propal/stats/index.php | 2 +- htdocs/comm/propal/stats/month.php | 2 +- htdocs/comm/remx.php | 2 +- htdocs/commande/class/commande.class.php | 4 ++-- htdocs/commande/fiche.php | 2 +- htdocs/commande/stats/index.php | 2 +- htdocs/commande/stats/month.php | 2 +- htdocs/compta/bank/class/account.class.php | 2 +- htdocs/compta/bank/class/bankcateg.class.php | 2 +- htdocs/compta/bank/graph.php | 2 +- htdocs/compta/commande/fiche.php | 2 +- htdocs/compta/deplacement/class/deplacement.class.php | 2 +- htdocs/compta/deplacement/stats/index.php | 2 +- htdocs/compta/deplacement/stats/month.php | 2 +- htdocs/compta/dons/class/don.class.php | 2 +- htdocs/compta/facture.php | 2 +- htdocs/compta/facture/class/facture.class.php | 8 ++++---- htdocs/compta/facture/contact.php | 2 +- htdocs/compta/facture/document.php | 2 +- htdocs/compta/facture/info.php | 2 +- htdocs/compta/facture/note.php | 2 +- htdocs/compta/facture/stats/index.php | 2 +- htdocs/compta/facture/stats/month.php | 2 +- htdocs/compta/paiement/cheque/remisecheque.class.php | 2 +- htdocs/compta/prelevement/class/bon-prelevement.class.php | 2 +- htdocs/compta/sociales/class/chargesociales.class.php | 2 +- htdocs/compta/tva/class/tva.class.php | 2 +- htdocs/contact/class/contact.class.php | 2 +- htdocs/contrat/class/contrat.class.php | 2 +- htdocs/core/{ => class}/address.class.php | 0 htdocs/core/{ => class}/commonobject.class.php | 0 htdocs/core/{ => class}/commonobjectline.class.php | 2 +- htdocs/core/{ => class}/conf.class.php | 0 htdocs/core/{ => class}/cookie.class.php | 0 htdocs/core/{ => class}/discount.class.php | 0 htdocs/core/{ => class}/dolexception.class.php | 2 +- htdocs/core/{ => class}/dolgraph.class.php | 0 htdocs/core/{ => class}/events.class.php | 2 +- htdocs/core/{ => class}/menu.class.php | 2 +- htdocs/core/{ => class}/menubase.class.php | 0 htdocs/expedition/expedition.class.php | 2 +- htdocs/expedition/stats/month.php | 2 +- htdocs/fichinter/fichinter.class.php | 2 +- htdocs/includes/menus/barre_left/auguria.lib.php | 2 +- htdocs/includes/menus/barre_left/eldy.lib.php | 2 +- htdocs/includes/menus/barre_top/auguria.lib.php | 2 +- htdocs/includes/menus/barre_top/eldy.lib.php | 2 +- htdocs/includes/menus/barre_top/empty.php | 2 +- htdocs/includes/modules/DolibarrModules.class.php | 2 +- htdocs/includes/modules/commande/modules_commande.php | 2 +- .../includes/triggers/interface_all_Logevents.class.php | 2 +- htdocs/install/etape2.php | 2 +- htdocs/install/etape4.php | 2 +- htdocs/install/inc.php | 2 +- htdocs/install/upgrade2.php | 2 +- htdocs/lib/security.lib.php | 2 +- htdocs/livraison/livraison.class.php | 2 +- htdocs/main.inc.php | 4 ++-- htdocs/master.inc.php | 4 ++-- htdocs/product/product.class.php | 2 +- htdocs/product/service.class.php | 2 +- htdocs/product/stats/fiche.php | 2 +- htdocs/product/stock/entrepot.class.php | 2 +- htdocs/projet/project.class.php | 2 +- htdocs/projet/tasks/task.class.php | 2 +- htdocs/societe/societe.class.php | 6 +++--- htdocs/support/inc.php | 2 +- htdocs/user/group/usergroup.class.php | 2 +- htdocs/user/user.class.php | 2 +- scripts/banks/build-graph-sold-example.php | 2 +- 78 files changed, 80 insertions(+), 80 deletions(-) rename htdocs/core/{ => class}/address.class.php (100%) rename htdocs/core/{ => class}/commonobject.class.php (100%) rename htdocs/core/{ => class}/commonobjectline.class.php (94%) rename htdocs/core/{ => class}/conf.class.php (100%) rename htdocs/core/{ => class}/cookie.class.php (100%) rename htdocs/core/{ => class}/discount.class.php (100%) rename htdocs/core/{ => class}/dolexception.class.php (94%) rename htdocs/core/{ => class}/dolgraph.class.php (100%) rename htdocs/core/{ => class}/events.class.php (98%) rename htdocs/core/{ => class}/menu.class.php (98%) rename htdocs/core/{ => class}/menubase.class.php (100%) diff --git a/dev/skeletons/skeleton_class.class.php b/dev/skeletons/skeleton_class.class.php index 92471c55f84..e05252885eb 100644 --- a/dev/skeletons/skeleton_class.class.php +++ b/dev/skeletons/skeleton_class.class.php @@ -27,7 +27,7 @@ */ // Put here all includes required by your class file -//require_once(DOL_DOCUMENT_ROOT."/core/commonobject.class.php"); +//require_once(DOL_DOCUMENT_ROOT."/core/class/commonobject.class.php"); //require_once(DOL_DOCUMENT_ROOT."/societe/societe.class.php"); //require_once(DOL_DOCUMENT_ROOT."/product/product.class.php"); diff --git a/htdocs/adherents/class/adherent.class.php b/htdocs/adherents/class/adherent.class.php index 9a950b60dbf..bf0b3f06400 100644 --- a/htdocs/adherents/class/adherent.class.php +++ b/htdocs/adherents/class/adherent.class.php @@ -28,7 +28,7 @@ * \version $Id$ */ -require_once(DOL_DOCUMENT_ROOT."/core/commonobject.class.php"); +require_once(DOL_DOCUMENT_ROOT."/core/class/commonobject.class.php"); require_once(DOL_DOCUMENT_ROOT."/adherents/class/cotisation.class.php"); require_once(DOL_DOCUMENT_ROOT."/lib/functions2.lib.php"); diff --git a/htdocs/adherents/class/adherent_type.class.php b/htdocs/adherents/class/adherent_type.class.php index 3bef25fd58b..fa9eeac223f 100644 --- a/htdocs/adherents/class/adherent_type.class.php +++ b/htdocs/adherents/class/adherent_type.class.php @@ -26,7 +26,7 @@ * \version $Id$ */ -require_once(DOL_DOCUMENT_ROOT."/core/commonobject.class.php"); +require_once(DOL_DOCUMENT_ROOT."/core/class/commonobject.class.php"); /** diff --git a/htdocs/adherents/class/cotisation.class.php b/htdocs/adherents/class/cotisation.class.php index 84940bdb754..7372a64e498 100644 --- a/htdocs/adherents/class/cotisation.class.php +++ b/htdocs/adherents/class/cotisation.class.php @@ -24,7 +24,7 @@ * \version $Id$ */ -require_once(DOL_DOCUMENT_ROOT."/core/commonobject.class.php"); +require_once(DOL_DOCUMENT_ROOT."/core/class/commonobject.class.php"); /** diff --git a/htdocs/admin/menus/edit.php b/htdocs/admin/menus/edit.php index 78157531e59..4ae76fd178a 100644 --- a/htdocs/admin/menus/edit.php +++ b/htdocs/admin/menus/edit.php @@ -26,7 +26,7 @@ require("../../main.inc.php"); require_once(DOL_DOCUMENT_ROOT."/html.formadmin.class.php"); -require_once(DOL_DOCUMENT_ROOT."/core/menubase.class.php"); +require_once(DOL_DOCUMENT_ROOT."/core/class/menubase.class.php"); $langs->load("admin"); diff --git a/htdocs/boutique/commande/class/boutiquecommande.class.php b/htdocs/boutique/commande/class/boutiquecommande.class.php index a4accf0fc74..8ee6c1194ed 100644 --- a/htdocs/boutique/commande/class/boutiquecommande.class.php +++ b/htdocs/boutique/commande/class/boutiquecommande.class.php @@ -24,7 +24,7 @@ * \version $Id$ */ -require_once(DOL_DOCUMENT_ROOT ."/core/address.class.php"); +require_once(DOL_DOCUMENT_ROOT ."/core/class/address.class.php"); include_once(DOL_DOCUMENT_ROOT.'/boutique/commande/class/boutiquecommande.class.php'); diff --git a/htdocs/comm/mailing/mailing.class.php b/htdocs/comm/mailing/mailing.class.php index bf73e40765c..d923cd4f4b4 100644 --- a/htdocs/comm/mailing/mailing.class.php +++ b/htdocs/comm/mailing/mailing.class.php @@ -25,7 +25,7 @@ * \version $Id$ */ -require_once(DOL_DOCUMENT_ROOT ."/core/commonobject.class.php"); +require_once(DOL_DOCUMENT_ROOT ."/core/class/commonobject.class.php"); /** diff --git a/htdocs/comm/propal/propal.class.php b/htdocs/comm/propal/propal.class.php index 4c47bc69d9e..2654cb8038e 100644 --- a/htdocs/comm/propal/propal.class.php +++ b/htdocs/comm/propal/propal.class.php @@ -32,7 +32,7 @@ * \version $Id$ */ -require_once(DOL_DOCUMENT_ROOT ."/core/commonobject.class.php"); +require_once(DOL_DOCUMENT_ROOT ."/core/class/commonobject.class.php"); require_once(DOL_DOCUMENT_ROOT ."/product/product.class.php"); require_once(DOL_DOCUMENT_ROOT ."/contact/class/contact.class.php"); @@ -192,7 +192,7 @@ class Propal extends CommonObject global $langs; include_once(DOL_DOCUMENT_ROOT.'/lib/price.lib.php'); - include_once(DOL_DOCUMENT_ROOT.'/core/discount.class.php'); + include_once(DOL_DOCUMENT_ROOT.'/core/class/discount.class.php'); $this->db->begin(); diff --git a/htdocs/comm/propal/stats/index.php b/htdocs/comm/propal/stats/index.php index 743865c3452..e760137b34e 100644 --- a/htdocs/comm/propal/stats/index.php +++ b/htdocs/comm/propal/stats/index.php @@ -27,7 +27,7 @@ require("../../../main.inc.php"); require_once(DOL_DOCUMENT_ROOT."/comm/propal/stats/propalestats.class.php"); -require_once(DOL_DOCUMENT_ROOT."/core/dolgraph.class.php"); +require_once(DOL_DOCUMENT_ROOT."/core/class/dolgraph.class.php"); $WIDTH=500; $HEIGHT=200; diff --git a/htdocs/comm/propal/stats/month.php b/htdocs/comm/propal/stats/month.php index f569024cc7f..1e429f127e7 100644 --- a/htdocs/comm/propal/stats/month.php +++ b/htdocs/comm/propal/stats/month.php @@ -26,7 +26,7 @@ require("../../../main.inc.php"); require_once(DOL_DOCUMENT_ROOT."/comm/propal/stats/propalestats.class.php"); -require_once(DOL_DOCUMENT_ROOT."/core/dolgraph.class.php"); +require_once(DOL_DOCUMENT_ROOT."/core/class/dolgraph.class.php"); $GRAPHWIDTH=500; $GRAPHHEIGHT=200; diff --git a/htdocs/comm/remx.php b/htdocs/comm/remx.php index c19c8331505..8267289f558 100644 --- a/htdocs/comm/remx.php +++ b/htdocs/comm/remx.php @@ -28,7 +28,7 @@ require("../main.inc.php"); require_once(DOL_DOCUMENT_ROOT."/lib/company.lib.php"); require_once(DOL_DOCUMENT_ROOT."/compta/facture/class/facture.class.php"); -require_once(DOL_DOCUMENT_ROOT."/core/discount.class.php"); +require_once(DOL_DOCUMENT_ROOT."/core/class/discount.class.php"); $langs->load("orders"); $langs->load("bills"); diff --git a/htdocs/commande/class/commande.class.php b/htdocs/commande/class/commande.class.php index 63dd0ac443a..4579652bf79 100644 --- a/htdocs/commande/class/commande.class.php +++ b/htdocs/commande/class/commande.class.php @@ -27,7 +27,7 @@ * \version $Id$ */ -require_once(DOL_DOCUMENT_ROOT."/core/commonobject.class.php"); +require_once(DOL_DOCUMENT_ROOT."/core/class/commonobject.class.php"); require_once(DOL_DOCUMENT_ROOT."/product/product.class.php"); @@ -1108,7 +1108,7 @@ class Commande extends CommonObject global $langs; include_once(DOL_DOCUMENT_ROOT.'/lib/price.lib.php'); - include_once(DOL_DOCUMENT_ROOT.'/core/discount.class.php'); + include_once(DOL_DOCUMENT_ROOT.'/core/class/discount.class.php'); $this->db->begin(); diff --git a/htdocs/commande/fiche.php b/htdocs/commande/fiche.php index 125e4944e16..fe189c4bcf5 100644 --- a/htdocs/commande/fiche.php +++ b/htdocs/commande/fiche.php @@ -1777,7 +1777,7 @@ else { if ($objp->description == '(CREDIT_NOTE)') { - require_once(DOL_DOCUMENT_ROOT.'/core/discount.class.php'); + require_once(DOL_DOCUMENT_ROOT.'/core/class/discount.class.php'); $discount=new DiscountAbsolute($db); $discount->fetch($objp->fk_remise_except); print ' - '.$langs->transnoentities("DiscountFromCreditNote",$discount->getNomUrl(0)); diff --git a/htdocs/commande/stats/index.php b/htdocs/commande/stats/index.php index ea7fec53d28..5b05cc6bd3e 100644 --- a/htdocs/commande/stats/index.php +++ b/htdocs/commande/stats/index.php @@ -27,7 +27,7 @@ require("../../main.inc.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"); +require_once(DOL_DOCUMENT_ROOT."/core/class/dolgraph.class.php"); $WIDTH=500; $HEIGHT=200; diff --git a/htdocs/commande/stats/month.php b/htdocs/commande/stats/month.php index a3c516c9fe1..035cfa172e1 100644 --- a/htdocs/commande/stats/month.php +++ b/htdocs/commande/stats/month.php @@ -27,7 +27,7 @@ require("../../main.inc.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"); +require_once(DOL_DOCUMENT_ROOT."/core/class/dolgraph.class.php"); $GRAPHWIDTH=500; $GRAPHHEIGHT=200; diff --git a/htdocs/compta/bank/class/account.class.php b/htdocs/compta/bank/class/account.class.php index d9869ab1341..b56bb0e132c 100644 --- a/htdocs/compta/bank/class/account.class.php +++ b/htdocs/compta/bank/class/account.class.php @@ -27,7 +27,7 @@ * \version $Id$ */ -require_once(DOL_DOCUMENT_ROOT ."/core/commonobject.class.php"); +require_once(DOL_DOCUMENT_ROOT ."/core/class/commonobject.class.php"); /** diff --git a/htdocs/compta/bank/class/bankcateg.class.php b/htdocs/compta/bank/class/bankcateg.class.php index 93f902061d5..7c178185532 100644 --- a/htdocs/compta/bank/class/bankcateg.class.php +++ b/htdocs/compta/bank/class/bankcateg.class.php @@ -27,7 +27,7 @@ */ // Put here all includes required by your class file -//require_once(DOL_DOCUMENT_ROOT."/core/commonobject.class.php"); +//require_once(DOL_DOCUMENT_ROOT."/core/class/commonobject.class.php"); //require_once(DOL_DOCUMENT_ROOT."/societe/societe.class.php"); //require_once(DOL_DOCUMENT_ROOT."/product/product.class.php"); diff --git a/htdocs/compta/bank/graph.php b/htdocs/compta/bank/graph.php index 098c566e832..f2b78d24317 100644 --- a/htdocs/compta/bank/graph.php +++ b/htdocs/compta/bank/graph.php @@ -28,7 +28,7 @@ require("./pre.inc.php"); require_once(DOL_DOCUMENT_ROOT."/lib/bank.lib.php"); require_once(DOL_DOCUMENT_ROOT."/compta/bank/class/account.class.php"); -require_once(DOL_DOCUMENT_ROOT."/core/dolgraph.class.php"); +require_once(DOL_DOCUMENT_ROOT."/core/class/dolgraph.class.php"); $langs->load("banks"); diff --git a/htdocs/compta/commande/fiche.php b/htdocs/compta/commande/fiche.php index 816094b7e2c..69bf13e16fd 100644 --- a/htdocs/compta/commande/fiche.php +++ b/htdocs/compta/commande/fiche.php @@ -475,7 +475,7 @@ if ($id > 0 || ! empty($ref)) { if ($objp->description == '(CREDIT_NOTE)') { - require_once(DOL_DOCUMENT_ROOT.'/core/discount.class.php'); + require_once(DOL_DOCUMENT_ROOT.'/core/class/discount.class.php'); $discount=new DiscountAbsolute($db); $discount->fetch($objp->fk_remise_except); print ' - '.$langs->transnoentities("DiscountFromCreditNote",$discount->getNomUrl(0)); diff --git a/htdocs/compta/deplacement/class/deplacement.class.php b/htdocs/compta/deplacement/class/deplacement.class.php index 57a19a97c39..31241c68302 100644 --- a/htdocs/compta/deplacement/class/deplacement.class.php +++ b/htdocs/compta/deplacement/class/deplacement.class.php @@ -25,7 +25,7 @@ * \version $Id$ */ -require_once(DOL_DOCUMENT_ROOT ."/core/commonobject.class.php"); +require_once(DOL_DOCUMENT_ROOT ."/core/class/commonobject.class.php"); /** * \class Deplacement diff --git a/htdocs/compta/deplacement/stats/index.php b/htdocs/compta/deplacement/stats/index.php index 9d758e16e19..1003891ddf4 100755 --- a/htdocs/compta/deplacement/stats/index.php +++ b/htdocs/compta/deplacement/stats/index.php @@ -25,7 +25,7 @@ */ require("../../../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/core/dolgraph.class.php"); +require_once(DOL_DOCUMENT_ROOT."/core/class/dolgraph.class.php"); require_once(DOL_DOCUMENT_ROOT."/compta/deplacement/stats/deplacementstats.class.php"); $langs->load("trips"); diff --git a/htdocs/compta/deplacement/stats/month.php b/htdocs/compta/deplacement/stats/month.php index 3eb63f00b83..ebb97b75f45 100755 --- a/htdocs/compta/deplacement/stats/month.php +++ b/htdocs/compta/deplacement/stats/month.php @@ -25,7 +25,7 @@ */ require("../../../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/core/dolgraph.class.php"); +require_once(DOL_DOCUMENT_ROOT."/core/class/dolgraph.class.php"); require_once(DOL_DOCUMENT_ROOT."/compta/deplacement/stats/deplacementstats.class.php"); $langs->load("trips"); diff --git a/htdocs/compta/dons/class/don.class.php b/htdocs/compta/dons/class/don.class.php index 8b62dddb45d..60033f5fae1 100644 --- a/htdocs/compta/dons/class/don.class.php +++ b/htdocs/compta/dons/class/don.class.php @@ -25,7 +25,7 @@ * \version $Id$ */ -require_once(DOL_DOCUMENT_ROOT ."/core/commonobject.class.php"); +require_once(DOL_DOCUMENT_ROOT ."/core/class/commonobject.class.php"); /** diff --git a/htdocs/compta/facture.php b/htdocs/compta/facture.php index 2308f1a89b9..06b98a631ac 100644 --- a/htdocs/compta/facture.php +++ b/htdocs/compta/facture.php @@ -33,7 +33,7 @@ require('../main.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.'/compta/facture/class/facture.class.php'); -require_once(DOL_DOCUMENT_ROOT.'/core/discount.class.php'); +require_once(DOL_DOCUMENT_ROOT.'/core/class/discount.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'); diff --git a/htdocs/compta/facture/class/facture.class.php b/htdocs/compta/facture/class/facture.class.php index fd91bfb33ca..d155614ce63 100644 --- a/htdocs/compta/facture/class/facture.class.php +++ b/htdocs/compta/facture/class/facture.class.php @@ -31,7 +31,7 @@ * \version $Id$ */ -require_once(DOL_DOCUMENT_ROOT ."/core/commonobject.class.php"); +require_once(DOL_DOCUMENT_ROOT ."/core/class/commonobject.class.php"); require_once(DOL_DOCUMENT_ROOT ."/product/product.class.php"); require_once(DOL_DOCUMENT_ROOT ."/societe/client.class.php"); @@ -869,7 +869,7 @@ class Facture extends CommonObject global $langs; include_once(DOL_DOCUMENT_ROOT.'/lib/price.lib.php'); - include_once(DOL_DOCUMENT_ROOT.'/core/discount.class.php'); + include_once(DOL_DOCUMENT_ROOT.'/core/class/discount.class.php'); $this->db->begin(); @@ -1967,7 +1967,7 @@ class Facture extends CommonObject */ function getSumCreditNotesUsed() { - require_once(DOL_DOCUMENT_ROOT.'/core/discount.class.php'); + require_once(DOL_DOCUMENT_ROOT.'/core/class/discount.class.php'); $discountstatic=new DiscountAbsolute($this->db); $result=$discountstatic->getSumCreditNotesUsed($this); @@ -1988,7 +1988,7 @@ class Facture extends CommonObject */ function getSumDepositsUsed() { - require_once(DOL_DOCUMENT_ROOT.'/core/discount.class.php'); + require_once(DOL_DOCUMENT_ROOT.'/core/class/discount.class.php'); $discountstatic=new DiscountAbsolute($this->db); $result=$discountstatic->getSumDepositsUsed($this); diff --git a/htdocs/compta/facture/contact.php b/htdocs/compta/facture/contact.php index fc6f5b408e3..7ee62465e41 100644 --- a/htdocs/compta/facture/contact.php +++ b/htdocs/compta/facture/contact.php @@ -27,7 +27,7 @@ require("../../main.inc.php"); require_once(DOL_DOCUMENT_ROOT."/compta/facture/class/facture.class.php"); require_once(DOL_DOCUMENT_ROOT."/contact/class/contact.class.php"); -require_once(DOL_DOCUMENT_ROOT.'/core/discount.class.php'); +require_once(DOL_DOCUMENT_ROOT.'/core/class/discount.class.php'); require_once(DOL_DOCUMENT_ROOT.'/lib/invoice.lib.php'); require_once(DOL_DOCUMENT_ROOT.'/html.formcompany.class.php'); diff --git a/htdocs/compta/facture/document.php b/htdocs/compta/facture/document.php index f63eb8ed37f..1d75fc78ea0 100644 --- a/htdocs/compta/facture/document.php +++ b/htdocs/compta/facture/document.php @@ -28,7 +28,7 @@ require("../../main.inc.php"); require_once(DOL_DOCUMENT_ROOT."/compta/facture/class/facture.class.php"); -require_once(DOL_DOCUMENT_ROOT.'/core/discount.class.php'); +require_once(DOL_DOCUMENT_ROOT.'/core/class/discount.class.php'); require_once(DOL_DOCUMENT_ROOT."/lib/invoice.lib.php"); require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php"); require_once(DOL_DOCUMENT_ROOT."/html.formfile.class.php"); diff --git a/htdocs/compta/facture/info.php b/htdocs/compta/facture/info.php index ebd033bd950..282fdcf50ff 100644 --- a/htdocs/compta/facture/info.php +++ b/htdocs/compta/facture/info.php @@ -26,7 +26,7 @@ require("../../main.inc.php"); require_once(DOL_DOCUMENT_ROOT."/compta/facture/class/facture.class.php"); -require_once(DOL_DOCUMENT_ROOT.'/core/discount.class.php'); +require_once(DOL_DOCUMENT_ROOT.'/core/class/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 8d93ad3e95c..4a85f78703d 100644 --- a/htdocs/compta/facture/note.php +++ b/htdocs/compta/facture/note.php @@ -26,7 +26,7 @@ require("../../main.inc.php"); require_once(DOL_DOCUMENT_ROOT."/compta/facture/class/facture.class.php"); -require_once(DOL_DOCUMENT_ROOT.'/core/discount.class.php'); +require_once(DOL_DOCUMENT_ROOT.'/core/class/discount.class.php'); require_once(DOL_DOCUMENT_ROOT.'/lib/invoice.lib.php'); $socid=isset($_GET["socid"])?$_GET["socid"]:isset($_POST["socid"])?$_POST["socid"]:""; diff --git a/htdocs/compta/facture/stats/index.php b/htdocs/compta/facture/stats/index.php index 17131f587e3..3feaeb9a64c 100644 --- a/htdocs/compta/facture/stats/index.php +++ b/htdocs/compta/facture/stats/index.php @@ -25,7 +25,7 @@ */ require("../../../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/core/dolgraph.class.php"); +require_once(DOL_DOCUMENT_ROOT."/core/class/dolgraph.class.php"); require_once(DOL_DOCUMENT_ROOT."/compta/facture/stats/facturestats.class.php"); $WIDTH=500; diff --git a/htdocs/compta/facture/stats/month.php b/htdocs/compta/facture/stats/month.php index d46324ac3d6..50f9cf0a83a 100644 --- a/htdocs/compta/facture/stats/month.php +++ b/htdocs/compta/facture/stats/month.php @@ -25,7 +25,7 @@ */ require("../../../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/core/dolgraph.class.php"); +require_once(DOL_DOCUMENT_ROOT."/core/class/dolgraph.class.php"); $GRAPHWIDTH=500; $GRAPHHEIGHT=200; diff --git a/htdocs/compta/paiement/cheque/remisecheque.class.php b/htdocs/compta/paiement/cheque/remisecheque.class.php index 64925d24d2d..21e5940ce5a 100644 --- a/htdocs/compta/paiement/cheque/remisecheque.class.php +++ b/htdocs/compta/paiement/cheque/remisecheque.class.php @@ -25,7 +25,7 @@ * \version $Id$ */ -require_once(DOL_DOCUMENT_ROOT ."/core/commonobject.class.php"); +require_once(DOL_DOCUMENT_ROOT ."/core/class/commonobject.class.php"); /** diff --git a/htdocs/compta/prelevement/class/bon-prelevement.class.php b/htdocs/compta/prelevement/class/bon-prelevement.class.php index e5ee83a1135..31e1ed8923f 100644 --- a/htdocs/compta/prelevement/class/bon-prelevement.class.php +++ b/htdocs/compta/prelevement/class/bon-prelevement.class.php @@ -24,7 +24,7 @@ \version $Id$ */ -require_once(DOL_DOCUMENT_ROOT."/core/commonobject.class.php"); +require_once(DOL_DOCUMENT_ROOT."/core/class/commonobject.class.php"); require_once(DOL_DOCUMENT_ROOT."/compta/facture/class/facture.class.php"); require_once(DOL_DOCUMENT_ROOT."/societe/societe.class.php"); diff --git a/htdocs/compta/sociales/class/chargesociales.class.php b/htdocs/compta/sociales/class/chargesociales.class.php index e86a9733fe2..fc8a0bf0402 100644 --- a/htdocs/compta/sociales/class/chargesociales.class.php +++ b/htdocs/compta/sociales/class/chargesociales.class.php @@ -24,7 +24,7 @@ * \version $Id$ */ -require_once(DOL_DOCUMENT_ROOT."/core/commonobject.class.php"); +require_once(DOL_DOCUMENT_ROOT."/core/class/commonobject.class.php"); /** \class ChargeSociales diff --git a/htdocs/compta/tva/class/tva.class.php b/htdocs/compta/tva/class/tva.class.php index d162f6d3ea0..acfb5f25d96 100644 --- a/htdocs/compta/tva/class/tva.class.php +++ b/htdocs/compta/tva/class/tva.class.php @@ -25,7 +25,7 @@ */ // Put here all includes required by your class file -require_once(DOL_DOCUMENT_ROOT ."/core/commonobject.class.php"); +require_once(DOL_DOCUMENT_ROOT ."/core/class/commonobject.class.php"); /** diff --git a/htdocs/contact/class/contact.class.php b/htdocs/contact/class/contact.class.php index 823a09d5a46..3ab0c667e68 100644 --- a/htdocs/contact/class/contact.class.php +++ b/htdocs/contact/class/contact.class.php @@ -28,7 +28,7 @@ * \version $Id$ */ -require_once(DOL_DOCUMENT_ROOT ."/core/commonobject.class.php"); +require_once(DOL_DOCUMENT_ROOT ."/core/class/commonobject.class.php"); /** diff --git a/htdocs/contrat/class/contrat.class.php b/htdocs/contrat/class/contrat.class.php index c6d7a7f35d9..385af90c3c3 100644 --- a/htdocs/contrat/class/contrat.class.php +++ b/htdocs/contrat/class/contrat.class.php @@ -28,7 +28,7 @@ * \version $Id$ */ -require_once(DOL_DOCUMENT_ROOT."/core/commonobject.class.php"); +require_once(DOL_DOCUMENT_ROOT."/core/class/commonobject.class.php"); require_once(DOL_DOCUMENT_ROOT."/product/product.class.php"); require_once(DOL_DOCUMENT_ROOT."/lib/price.lib.php"); diff --git a/htdocs/core/address.class.php b/htdocs/core/class/address.class.php similarity index 100% rename from htdocs/core/address.class.php rename to htdocs/core/class/address.class.php diff --git a/htdocs/core/commonobject.class.php b/htdocs/core/class/commonobject.class.php similarity index 100% rename from htdocs/core/commonobject.class.php rename to htdocs/core/class/commonobject.class.php diff --git a/htdocs/core/commonobjectline.class.php b/htdocs/core/class/commonobjectline.class.php similarity index 94% rename from htdocs/core/commonobjectline.class.php rename to htdocs/core/class/commonobjectline.class.php index 3c7fe9c8acf..1ca8b33788b 100644 --- a/htdocs/core/commonobjectline.class.php +++ b/htdocs/core/class/commonobjectline.class.php @@ -17,7 +17,7 @@ */ /** - \file htdocs/core/commonobjectline.class.php + \file htdocs/core/class/commonobjectline.class.php \ingroup core \brief File of the superclass of classes of lines of business objects (invoice, contract, PROPAL, commands, etc. ...) \version $Id$ diff --git a/htdocs/core/conf.class.php b/htdocs/core/class/conf.class.php similarity index 100% rename from htdocs/core/conf.class.php rename to htdocs/core/class/conf.class.php diff --git a/htdocs/core/cookie.class.php b/htdocs/core/class/cookie.class.php similarity index 100% rename from htdocs/core/cookie.class.php rename to htdocs/core/class/cookie.class.php diff --git a/htdocs/core/discount.class.php b/htdocs/core/class/discount.class.php similarity index 100% rename from htdocs/core/discount.class.php rename to htdocs/core/class/discount.class.php diff --git a/htdocs/core/dolexception.class.php b/htdocs/core/class/dolexception.class.php similarity index 94% rename from htdocs/core/dolexception.class.php rename to htdocs/core/class/dolexception.class.php index a5547711ba6..b401d8e1f04 100644 --- a/htdocs/core/dolexception.class.php +++ b/htdocs/core/class/dolexception.class.php @@ -17,7 +17,7 @@ */ /** - * \file htdocs/core/DolException.class.php + * \file htdocs/core/class/DolException.class.php * \ingroup core * \brief File of class for exceptions * \version $Id$ diff --git a/htdocs/core/dolgraph.class.php b/htdocs/core/class/dolgraph.class.php similarity index 100% rename from htdocs/core/dolgraph.class.php rename to htdocs/core/class/dolgraph.class.php diff --git a/htdocs/core/events.class.php b/htdocs/core/class/events.class.php similarity index 98% rename from htdocs/core/events.class.php rename to htdocs/core/class/events.class.php index 0b95443c7f9..438b42d8e43 100644 --- a/htdocs/core/events.class.php +++ b/htdocs/core/class/events.class.php @@ -27,7 +27,7 @@ */ // Put here all includes required by your class file -//require_once(DOL_DOCUMENT_ROOT."/core/commonobject.class.php"); +//require_once(DOL_DOCUMENT_ROOT."/core/class/commonobject.class.php"); //require_once(DOL_DOCUMENT_ROOT."/societe/societe.class.php"); //require_once(DOL_DOCUMENT_ROOT."/product/product.class.php"); diff --git a/htdocs/core/menu.class.php b/htdocs/core/class/menu.class.php similarity index 98% rename from htdocs/core/menu.class.php rename to htdocs/core/class/menu.class.php index 49a8abb6ea4..00531ff0f1d 100644 --- a/htdocs/core/menu.class.php +++ b/htdocs/core/class/menu.class.php @@ -18,7 +18,7 @@ */ /** - * \file htdocs/core/menu.class.php + * \file htdocs/core/class/menu.class.php * \brief Fichier de la classe de gestion du menu gauche * \version $Id$ */ diff --git a/htdocs/core/menubase.class.php b/htdocs/core/class/menubase.class.php similarity index 100% rename from htdocs/core/menubase.class.php rename to htdocs/core/class/menubase.class.php diff --git a/htdocs/expedition/expedition.class.php b/htdocs/expedition/expedition.class.php index e68c49a3bcb..1684af01d90 100644 --- a/htdocs/expedition/expedition.class.php +++ b/htdocs/expedition/expedition.class.php @@ -25,7 +25,7 @@ * \version $Id$ */ -require_once(DOL_DOCUMENT_ROOT."/core/commonobject.class.php"); +require_once(DOL_DOCUMENT_ROOT."/core/class/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/class/commande.class.php"); diff --git a/htdocs/expedition/stats/month.php b/htdocs/expedition/stats/month.php index c81d4967c65..6360b59b8f8 100644 --- a/htdocs/expedition/stats/month.php +++ b/htdocs/expedition/stats/month.php @@ -27,7 +27,7 @@ require("../../main.inc.php"); require_once(DOL_DOCUMENT_ROOT."/expedition/expedition.class.php"); require_once(DOL_DOCUMENT_ROOT."/expedition/stats/expeditionstats.class.php"); -require_once(DOL_DOCUMENT_ROOT."/core/dolgraph.class.php"); +require_once(DOL_DOCUMENT_ROOT."/core/class/dolgraph.class.php"); llxHeader(); diff --git a/htdocs/fichinter/fichinter.class.php b/htdocs/fichinter/fichinter.class.php index 3b89ff5fcf7..6e5aca12a11 100644 --- a/htdocs/fichinter/fichinter.class.php +++ b/htdocs/fichinter/fichinter.class.php @@ -24,7 +24,7 @@ * \version $Id$ */ -require_once(DOL_DOCUMENT_ROOT ."/core/commonobject.class.php"); +require_once(DOL_DOCUMENT_ROOT ."/core/class/commonobject.class.php"); /** diff --git a/htdocs/includes/menus/barre_left/auguria.lib.php b/htdocs/includes/menus/barre_left/auguria.lib.php index 65fcf46c60b..7490b8ccec7 100644 --- a/htdocs/includes/menus/barre_left/auguria.lib.php +++ b/htdocs/includes/menus/barre_left/auguria.lib.php @@ -87,7 +87,7 @@ function print_left_auguria_menu($db,$menu_array) */ if ($mainmenu) { - require_once(DOL_DOCUMENT_ROOT."/core/menubase.class.php"); + require_once(DOL_DOCUMENT_ROOT."/core/class/menubase.class.php"); $menuArbo = new Menubase($db,'auguria','left'); $overwritemenufor = $menuArbo->listeMainmenu(); diff --git a/htdocs/includes/menus/barre_left/eldy.lib.php b/htdocs/includes/menus/barre_left/eldy.lib.php index 88bfc99d0d7..a1b803c8d39 100644 --- a/htdocs/includes/menus/barre_left/eldy.lib.php +++ b/htdocs/includes/menus/barre_left/eldy.lib.php @@ -829,7 +829,7 @@ function print_left_eldy_menu($db,$menu_array) } // Affichage des menus personnalises - require_once(DOL_DOCUMENT_ROOT."/core/menubase.class.php"); + require_once(DOL_DOCUMENT_ROOT."/core/class/menubase.class.php"); $menuArbo = new Menubase($db,'eldy','left'); $overwritemenufor = $menuArbo->listeMainmenu(); diff --git a/htdocs/includes/menus/barre_top/auguria.lib.php b/htdocs/includes/menus/barre_top/auguria.lib.php index bdac0139082..912ab341559 100644 --- a/htdocs/includes/menus/barre_top/auguria.lib.php +++ b/htdocs/includes/menus/barre_top/auguria.lib.php @@ -34,7 +34,7 @@ */ function print_auguria_menu($db,$atarget,$hideifnotallowed) { - require_once(DOL_DOCUMENT_ROOT."/core/menubase.class.php"); + require_once(DOL_DOCUMENT_ROOT."/core/class/menubase.class.php"); global $user,$conf,$langs,$dolibarr_main_db_name; diff --git a/htdocs/includes/menus/barre_top/eldy.lib.php b/htdocs/includes/menus/barre_top/eldy.lib.php index 51549ab288b..df36c97361a 100644 --- a/htdocs/includes/menus/barre_top/eldy.lib.php +++ b/htdocs/includes/menus/barre_top/eldy.lib.php @@ -361,7 +361,7 @@ function print_eldy_menu($db,$atarget,$hideifnotallowed) // Show personalized menus - require_once(DOL_DOCUMENT_ROOT."/core/menubase.class.php"); + require_once(DOL_DOCUMENT_ROOT."/core/class/menubase.class.php"); $menuArbo = new Menubase($db,'eldy','top'); diff --git a/htdocs/includes/menus/barre_top/empty.php b/htdocs/includes/menus/barre_top/empty.php index 4d72e9f7607..59ab275df31 100644 --- a/htdocs/includes/menus/barre_top/empty.php +++ b/htdocs/includes/menus/barre_top/empty.php @@ -73,7 +73,7 @@ class MenuTop { /* // Code to show personalized menus - require_once(DOL_DOCUMENT_ROOT."/core/menubase.class.php"); + require_once(DOL_DOCUMENT_ROOT."/core/class/menubase.class.php"); $menuArbo = new Menubase($this->db,'empty','top'); $tabMenu = $menuArbo->menuTopCharger(2,$_SESSION['mainmenu'],'empty'); diff --git a/htdocs/includes/modules/DolibarrModules.class.php b/htdocs/includes/modules/DolibarrModules.class.php index 76685a5958a..89b1fa420ac 100644 --- a/htdocs/includes/modules/DolibarrModules.class.php +++ b/htdocs/includes/modules/DolibarrModules.class.php @@ -961,7 +961,7 @@ class DolibarrModules { global $user; - require_once(DOL_DOCUMENT_ROOT."/core/menubase.class.php"); + require_once(DOL_DOCUMENT_ROOT."/core/class/menubase.class.php"); $err=0; diff --git a/htdocs/includes/modules/commande/modules_commande.php b/htdocs/includes/modules/commande/modules_commande.php index 30ae6db1e72..2f0f3aac02b 100644 --- a/htdocs/includes/modules/commande/modules_commande.php +++ b/htdocs/includes/modules/commande/modules_commande.php @@ -32,7 +32,7 @@ require_once(DOL_DOCUMENT_ROOT.'/lib/pdf.lib.php'); require_once(DOL_DOCUMENT_ROOT.'/includes/fpdf/fpdfi/fpdi_protection.php'); require_once(DOL_DOCUMENT_ROOT."/compta/bank/class/account.class.php"); // requis car utilise par les classes qui heritent -require_once(DOL_DOCUMENT_ROOT.'/core/discount.class.php'); +require_once(DOL_DOCUMENT_ROOT.'/core/class/discount.class.php'); /** diff --git a/htdocs/includes/triggers/interface_all_Logevents.class.php b/htdocs/includes/triggers/interface_all_Logevents.class.php index abffeb212f8..62b92f1e449 100644 --- a/htdocs/includes/triggers/interface_all_Logevents.class.php +++ b/htdocs/includes/triggers/interface_all_Logevents.class.php @@ -234,7 +234,7 @@ class InterfaceLogevents // Add entry in event table if ($this->date) { - include_once(DOL_DOCUMENT_ROOT.'/core/events.class.php'); + include_once(DOL_DOCUMENT_ROOT.'/core/class/events.class.php'); $event=new Events($this->db); $event->type=$action; diff --git a/htdocs/install/etape2.php b/htdocs/install/etape2.php index 0a8c662b0b8..83392bfe2cd 100644 --- a/htdocs/install/etape2.php +++ b/htdocs/install/etape2.php @@ -26,7 +26,7 @@ include("./inc.php"); require_once($dolibarr_main_document_root."/lib/databases/".$dolibarr_main_db_type.".lib.php"); -require_once($dolibarr_main_document_root."/core/conf.class.php"); +require_once($dolibarr_main_document_root."/core/class/conf.class.php"); require_once($dolibarr_main_document_root."/lib/admin.lib.php"); $etape = 2; diff --git a/htdocs/install/etape4.php b/htdocs/install/etape4.php index f78faa78ff8..3ea3f9bd33a 100644 --- a/htdocs/install/etape4.php +++ b/htdocs/install/etape4.php @@ -29,7 +29,7 @@ include_once("./inc.php"); require_once($dolibarr_main_document_root."/lib/databases/".$dolibarr_main_db_type.".lib.php"); -require_once($dolibarr_main_document_root."/core/conf.class.php"); +require_once($dolibarr_main_document_root."/core/class/conf.class.php"); require_once($dolibarr_main_document_root."/lib/admin.lib.php"); diff --git a/htdocs/install/inc.php b/htdocs/install/inc.php index 7d651ed1168..0bbceeb0cdb 100644 --- a/htdocs/install/inc.php +++ b/htdocs/install/inc.php @@ -209,7 +209,7 @@ function conf($dolibarr_main_document_root) global $dolibarr_main_db_pass; global $character_set_client; - $return=include_once($dolibarr_main_document_root."/core/conf.class.php"); + $return=include_once($dolibarr_main_document_root."/core/class/conf.class.php"); if (! $return) return -1; $conf=new Conf(); diff --git a/htdocs/install/upgrade2.php b/htdocs/install/upgrade2.php index 725b164fb5a..6a6838156d0 100644 --- a/htdocs/install/upgrade2.php +++ b/htdocs/install/upgrade2.php @@ -38,7 +38,7 @@ 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'); -require_once($dolibarr_main_document_root . '/core/menubase.class.php'); +require_once($dolibarr_main_document_root . '/core/class/menubase.class.php'); $grant_query=''; $etape = 2; diff --git a/htdocs/lib/security.lib.php b/htdocs/lib/security.lib.php index a36dd0e8e8f..e8fe1ea46a1 100644 --- a/htdocs/lib/security.lib.php +++ b/htdocs/lib/security.lib.php @@ -119,7 +119,7 @@ function dol_loginfunction($langs,$conf,$mysoc) $entityCookieName = 'DOLENTITYID_'.md5($_SERVER["SERVER_NAME"].$_SERVER["DOCUMENT_ROOT"]); if (isset($_COOKIE[$entityCookieName])) { - include_once(DOL_DOCUMENT_ROOT . "/core/cookie.class.php"); + include_once(DOL_DOCUMENT_ROOT . "/core/class/cookie.class.php"); $cryptkey = (! empty($conf->file->cookie_cryptkey) ? $conf->file->cookie_cryptkey : '' ); diff --git a/htdocs/livraison/livraison.class.php b/htdocs/livraison/livraison.class.php index 9c56944e110..71de192312e 100644 --- a/htdocs/livraison/livraison.class.php +++ b/htdocs/livraison/livraison.class.php @@ -26,7 +26,7 @@ * \version $Id$ */ -require_once(DOL_DOCUMENT_ROOT."/core/commonobject.class.php"); +require_once(DOL_DOCUMENT_ROOT."/core/class/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"); diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php index 3bee4e665fa..180e9f26c71 100644 --- a/htdocs/main.inc.php +++ b/htdocs/main.inc.php @@ -182,7 +182,7 @@ if ($conf->file->main_force_https) // Chargement des includes complementaires de presentation -if (! defined('NOREQUIREMENU')) require_once(DOL_DOCUMENT_ROOT ."/core/menu.class.php"); // Need 10ko memory (11ko in 2.2) +if (! defined('NOREQUIREMENU')) require_once(DOL_DOCUMENT_ROOT ."/core/class/menu.class.php"); // Need 10ko memory (11ko in 2.2) if (! defined('NOREQUIREHTML')) require_once(DOL_DOCUMENT_ROOT ."/html.form.class.php"); // Need 660ko memory (800ko in 2.2) if (! defined('NOREQUIREAJAX') && $conf->use_javascript_ajax) require_once(DOL_DOCUMENT_ROOT.'/lib/ajax.lib.php'); // Need 22ko memory //stopwithmem(); @@ -511,7 +511,7 @@ if (! defined('NOLOGIN')) // Create entity cookie, just used for login page if (!empty($conf->global->MAIN_MODULE_MULTICOMPANY) && !empty($conf->global->MAIN_MULTICOMPANY_COOKIE) && isset($_POST["entity"])) { - include_once(DOL_DOCUMENT_ROOT."/core/cookie.class.php"); + include_once(DOL_DOCUMENT_ROOT."/core/class/cookie.class.php"); $entity = $_SESSION["dol_login"].'|'.$_POST["entity"]; $entityCookieName = 'DOLENTITYID_'.md5($_SERVER["SERVER_NAME"].$_SERVER["DOCUMENT_ROOT"]); diff --git a/htdocs/master.inc.php b/htdocs/master.inc.php index fc4651cbf8a..3c22d88b1fe 100644 --- a/htdocs/master.inc.php +++ b/htdocs/master.inc.php @@ -138,7 +138,7 @@ if (preg_match('/crypted:/i',$dolibarr_main_db_pass) || ! empty($dolibarr_main_d * Create $conf object */ -require_once(DOL_DOCUMENT_ROOT."/core/conf.class.php"); +require_once(DOL_DOCUMENT_ROOT."/core/class/conf.class.php"); $conf = new Conf(); @@ -278,7 +278,7 @@ if (! defined('NOREQUIREDB')) $entityCookieName = 'DOLENTITYID_'.md5($_SERVER["SERVER_NAME"].$_SERVER["DOCUMENT_ROOT"]); if (! empty($_COOKIE[$entityCookieName]) && ! empty($conf->file->cookie_cryptkey)) // Just for view specific login page { - include_once(DOL_DOCUMENT_ROOT."/core/cookie.class.php"); + include_once(DOL_DOCUMENT_ROOT."/core/class/cookie.class.php"); $lastuser = ''; $lastentity = ''; diff --git a/htdocs/product/product.class.php b/htdocs/product/product.class.php index 5d58744c5b0..276ae689129 100644 --- a/htdocs/product/product.class.php +++ b/htdocs/product/product.class.php @@ -27,7 +27,7 @@ * \brief Fichier de la classe des produits predefinis * \version $Id$ */ -require_once(DOL_DOCUMENT_ROOT ."/core/commonobject.class.php"); +require_once(DOL_DOCUMENT_ROOT ."/core/class/commonobject.class.php"); /** diff --git a/htdocs/product/service.class.php b/htdocs/product/service.class.php index 8d208bdc069..8a7f52c2d41 100644 --- a/htdocs/product/service.class.php +++ b/htdocs/product/service.class.php @@ -23,7 +23,7 @@ * \brief Fichier de la classe des services predefinis * \version $Id$ */ -require_once(DOL_DOCUMENT_ROOT ."/core/commonobject.class.php"); +require_once(DOL_DOCUMENT_ROOT ."/core/class/commonobject.class.php"); /** diff --git a/htdocs/product/stats/fiche.php b/htdocs/product/stats/fiche.php index 2b5807fc46d..c74c5fc1a72 100644 --- a/htdocs/product/stats/fiche.php +++ b/htdocs/product/stats/fiche.php @@ -29,7 +29,7 @@ require("../../main.inc.php"); require_once(DOL_DOCUMENT_ROOT."/lib/product.lib.php"); require_once(DOL_DOCUMENT_ROOT."/product/product.class.php"); -require_once(DOL_DOCUMENT_ROOT."/core/dolgraph.class.php"); +require_once(DOL_DOCUMENT_ROOT."/core/class/dolgraph.class.php"); $langs->load("companies"); $langs->load("products"); diff --git a/htdocs/product/stock/entrepot.class.php b/htdocs/product/stock/entrepot.class.php index cafd660fab0..0d7281d6934 100644 --- a/htdocs/product/stock/entrepot.class.php +++ b/htdocs/product/stock/entrepot.class.php @@ -25,7 +25,7 @@ * \version $Id$ */ -require_once(DOL_DOCUMENT_ROOT."/core/commonobject.class.php"); +require_once(DOL_DOCUMENT_ROOT."/core/class/commonobject.class.php"); /** diff --git a/htdocs/projet/project.class.php b/htdocs/projet/project.class.php index b293cb3eb0c..da10f20c433 100644 --- a/htdocs/projet/project.class.php +++ b/htdocs/projet/project.class.php @@ -24,7 +24,7 @@ * \brief Fichier de la classe de gestion des projets * \version $Id$ */ -require_once(DOL_DOCUMENT_ROOT ."/core/commonobject.class.php"); +require_once(DOL_DOCUMENT_ROOT ."/core/class/commonobject.class.php"); /** * \class Project diff --git a/htdocs/projet/tasks/task.class.php b/htdocs/projet/tasks/task.class.php index d11c729d6e6..88aafd8c8d9 100644 --- a/htdocs/projet/tasks/task.class.php +++ b/htdocs/projet/tasks/task.class.php @@ -25,7 +25,7 @@ * \remarks Initialy built by build_class_from_table on 2008-09-10 12:41 */ -require_once(DOL_DOCUMENT_ROOT."/core/commonobject.class.php"); +require_once(DOL_DOCUMENT_ROOT."/core/class/commonobject.class.php"); /** diff --git a/htdocs/societe/societe.class.php b/htdocs/societe/societe.class.php index a2d4e19e30f..53098751bcd 100644 --- a/htdocs/societe/societe.class.php +++ b/htdocs/societe/societe.class.php @@ -29,7 +29,7 @@ * \brief File for third party class * \version $Id$ */ -require_once(DOL_DOCUMENT_ROOT."/core/commonobject.class.php"); +require_once(DOL_DOCUMENT_ROOT."/core/class/commonobject.class.php"); /** @@ -1162,7 +1162,7 @@ class Societe extends CommonObject if ($this->id) { - require_once(DOL_DOCUMENT_ROOT.'/core/discount.class.php'); + require_once(DOL_DOCUMENT_ROOT.'/core/class/discount.class.php'); $discount = new DiscountAbsolute($this->db); $discount->fk_soc=$this->id; @@ -1194,7 +1194,7 @@ class Societe extends CommonObject */ function getAvailableDiscounts($user='',$filter='',$maxvalue=0) { - require_once(DOL_DOCUMENT_ROOT.'/core/discount.class.php'); + require_once(DOL_DOCUMENT_ROOT.'/core/class/discount.class.php'); $discountstatic=new DiscountAbsolute($this->db); $result=$discountstatic->getAvailableDiscounts($this,$user,$filter,$maxvalue); diff --git a/htdocs/support/inc.php b/htdocs/support/inc.php index bcb45637655..0a8483b9e61 100644 --- a/htdocs/support/inc.php +++ b/htdocs/support/inc.php @@ -169,7 +169,7 @@ function conf($dolibarr_main_document_root) global $dolibarr_main_db_pass; global $character_set_client; - $return=include_once($dolibarr_main_document_root."/core/conf.class.php"); + $return=include_once($dolibarr_main_document_root."/core/class/conf.class.php"); if (! $return) return -1; $conf=new Conf(); diff --git a/htdocs/user/group/usergroup.class.php b/htdocs/user/group/usergroup.class.php index a58fe07e60f..222865d2bed 100644 --- a/htdocs/user/group/usergroup.class.php +++ b/htdocs/user/group/usergroup.class.php @@ -24,7 +24,7 @@ * \version $Id$ */ -require_once(DOL_DOCUMENT_ROOT."/core/commonobject.class.php"); +require_once(DOL_DOCUMENT_ROOT."/core/class/commonobject.class.php"); if ($conf->ldap->enabled) require_once (DOL_DOCUMENT_ROOT."/lib/ldap.class.php"); diff --git a/htdocs/user/user.class.php b/htdocs/user/user.class.php index 02bd7c32b35..eefa0587ea7 100644 --- a/htdocs/user/user.class.php +++ b/htdocs/user/user.class.php @@ -35,7 +35,7 @@ \version $Id$ */ -require_once(DOL_DOCUMENT_ROOT ."/core/commonobject.class.php"); +require_once(DOL_DOCUMENT_ROOT ."/core/class/commonobject.class.php"); /** diff --git a/scripts/banks/build-graph-sold-example.php b/scripts/banks/build-graph-sold-example.php index 635a77f1f5a..5796afd7b1e 100644 --- a/scripts/banks/build-graph-sold-example.php +++ b/scripts/banks/build-graph-sold-example.php @@ -38,7 +38,7 @@ if (substr($sapi_type, 0, 3) == 'cgi') { } require_once($path."../../htdocs/master.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/core/dolgraph.class.php"); +require_once(DOL_DOCUMENT_ROOT."/core/class/dolgraph.class.php"); if (! isset($argv[1]) || ! $argv[1]) {