diff --git a/htdocs/adherents/admin/adherent.php b/htdocs/adherents/admin/adherent.php index 8d2ac7a9d70..0d2da719ae8 100644 --- a/htdocs/adherents/admin/adherent.php +++ b/htdocs/adherents/admin/adherent.php @@ -28,7 +28,7 @@ */ require("../../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php"); require_once(DOL_DOCUMENT_ROOT."/lib/member.lib.php"); $langs->load("admin"); diff --git a/htdocs/adherents/admin/adherent_extrafields.php b/htdocs/adherents/admin/adherent_extrafields.php index 8615877fefb..6086021f0cd 100755 --- a/htdocs/adherents/admin/adherent_extrafields.php +++ b/htdocs/adherents/admin/adherent_extrafields.php @@ -52,7 +52,7 @@ if (!$user->admin) accessforbidden(); * Actions */ -require(DOL_DOCUMENT_ROOT."/lib/admin_extrafields.inc.php"); +require(DOL_DOCUMENT_ROOT."/core/admin_extrafields.inc.php"); diff --git a/htdocs/adherents/admin/public.php b/htdocs/adherents/admin/public.php index 69e038492c6..6f4bafd5139 100755 --- a/htdocs/adherents/admin/public.php +++ b/htdocs/adherents/admin/public.php @@ -25,8 +25,8 @@ */ require("../../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/company.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/company.lib.php"); require_once(DOL_DOCUMENT_ROOT."/lib/member.lib.php"); $langs->load("members"); diff --git a/htdocs/adherents/card_subscriptions.php b/htdocs/adherents/card_subscriptions.php index e9e065125b7..445c7d302c2 100644 --- a/htdocs/adherents/card_subscriptions.php +++ b/htdocs/adherents/card_subscriptions.php @@ -25,7 +25,7 @@ require("../main.inc.php"); require_once(DOL_DOCUMENT_ROOT."/lib/member.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/date.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/date.lib.php"); require_once(DOL_DOCUMENT_ROOT."/adherents/class/adherent.class.php"); require_once(DOL_DOCUMENT_ROOT."/adherents/class/adherent_type.class.php"); require_once(DOL_DOCUMENT_ROOT."/adherents/class/cotisation.class.php"); diff --git a/htdocs/adherents/class/adherent.class.php b/htdocs/adherents/class/adherent.class.php index abb0f0c2882..5f2bee45e27 100644 --- a/htdocs/adherents/class/adherent.class.php +++ b/htdocs/adherents/class/adherent.class.php @@ -29,7 +29,7 @@ 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."/core/lib/functions2.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/date.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/date.lib.php"); /** diff --git a/htdocs/adherents/fiche.php b/htdocs/adherents/fiche.php index 219a95d01a1..96adf248ab4 100644 --- a/htdocs/adherents/fiche.php +++ b/htdocs/adherents/fiche.php @@ -26,7 +26,7 @@ require("../main.inc.php"); require_once(DOL_DOCUMENT_ROOT."/lib/member.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/company.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/company.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/images.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/functions2.lib.php"); require_once(DOL_DOCUMENT_ROOT."/adherents/class/adherent.class.php"); diff --git a/htdocs/admin/accounting.php b/htdocs/admin/accounting.php index c860747533e..64c011622d6 100644 --- a/htdocs/admin/accounting.php +++ b/htdocs/admin/accounting.php @@ -23,7 +23,7 @@ */ require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php"); $langs->load('admin'); $langs->load('compta'); diff --git a/htdocs/admin/agenda.php b/htdocs/admin/agenda.php index 0a13ad70362..3d175a27d86 100644 --- a/htdocs/admin/agenda.php +++ b/htdocs/admin/agenda.php @@ -24,8 +24,8 @@ */ require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/agenda.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/agenda.lib.php"); if (!$user->admin) accessforbidden(); diff --git a/htdocs/admin/agenda_extsites.php b/htdocs/admin/agenda_extsites.php index 6426c4f6c7a..95c561e82af 100644 --- a/htdocs/admin/agenda_extsites.php +++ b/htdocs/admin/agenda_extsites.php @@ -23,11 +23,11 @@ */ require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php"); require_once(DOL_DOCUMENT_ROOT.'/core/class/html.formadmin.class.php'); require_once(DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php'); -require_once(DOL_DOCUMENT_ROOT."/lib/agenda.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/date.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/agenda.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/date.lib.php"); if (!$user->admin) accessforbidden(); diff --git a/htdocs/admin/agenda_xcal.php b/htdocs/admin/agenda_xcal.php index 06d52f46065..3d370927fe9 100644 --- a/htdocs/admin/agenda_xcal.php +++ b/htdocs/admin/agenda_xcal.php @@ -22,8 +22,8 @@ */ require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php"); -require_once(DOL_DOCUMENT_ROOT.'/lib/agenda.lib.php'); +require_once(DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php"); +require_once(DOL_DOCUMENT_ROOT.'/core/lib/agenda.lib.php'); if (!$user->admin) diff --git a/htdocs/admin/barcode.php b/htdocs/admin/barcode.php index 6db0f3bf8ad..db838c9b7f7 100644 --- a/htdocs/admin/barcode.php +++ b/htdocs/admin/barcode.php @@ -24,7 +24,7 @@ */ require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php"); require_once(DOL_DOCUMENT_ROOT."/includes/barcode/html.formbarcode.class.php"); $langs->load("admin"); diff --git a/htdocs/admin/boxes.php b/htdocs/admin/boxes.php index 83c6091e53b..3a6ad26b40c 100644 --- a/htdocs/admin/boxes.php +++ b/htdocs/admin/boxes.php @@ -24,7 +24,7 @@ require("../main.inc.php"); include_once(DOL_DOCUMENT_ROOT."/includes/boxes/modules_boxes.php"); -include_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php"); +include_once(DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php"); $langs->load("admin"); diff --git a/htdocs/admin/clicktodial.php b/htdocs/admin/clicktodial.php index 909a7978024..c2d5590413b 100644 --- a/htdocs/admin/clicktodial.php +++ b/htdocs/admin/clicktodial.php @@ -24,7 +24,7 @@ */ require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php"); $langs->load("admin"); diff --git a/htdocs/admin/commande.php b/htdocs/admin/commande.php index a4ba25d7d1a..2ad6ec754da 100644 --- a/htdocs/admin/commande.php +++ b/htdocs/admin/commande.php @@ -29,7 +29,7 @@ */ require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php"); require_once(DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php'); $langs->load("admin"); diff --git a/htdocs/admin/company.php b/htdocs/admin/company.php index 76dd1dd6780..e26f56e088b 100644 --- a/htdocs/admin/company.php +++ b/htdocs/admin/company.php @@ -25,9 +25,9 @@ */ require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/company.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/date.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/company.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/date.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/images.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/functions2.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/class/html.formother.class.php"); diff --git a/htdocs/admin/compta.php b/htdocs/admin/compta.php index af9f54ee7dc..ac4a620a9e6 100644 --- a/htdocs/admin/compta.php +++ b/htdocs/admin/compta.php @@ -25,7 +25,7 @@ */ require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php"); $langs->load('admin'); $langs->load('compta'); diff --git a/htdocs/admin/confexped.php b/htdocs/admin/confexped.php index 8920fee2885..ec3415f339f 100644 --- a/htdocs/admin/confexped.php +++ b/htdocs/admin/confexped.php @@ -25,7 +25,7 @@ */ require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php"); $langs->load("admin"); $langs->load("sendings"); diff --git a/htdocs/admin/const.php b/htdocs/admin/const.php index 38ed35e425b..86fc8eaa77c 100644 --- a/htdocs/admin/const.php +++ b/htdocs/admin/const.php @@ -24,7 +24,7 @@ */ require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php"); $langs->load("admin"); diff --git a/htdocs/admin/contract.php b/htdocs/admin/contract.php index 4d23e5bb371..285887d15ba 100644 --- a/htdocs/admin/contract.php +++ b/htdocs/admin/contract.php @@ -22,7 +22,7 @@ */ require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php"); require_once(DOL_DOCUMENT_ROOT.'/contrat/class/contrat.class.php'); $langs->load("admin"); diff --git a/htdocs/admin/delais.php b/htdocs/admin/delais.php index 01c1687d310..14b16f69f49 100644 --- a/htdocs/admin/delais.php +++ b/htdocs/admin/delais.php @@ -24,7 +24,7 @@ */ require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php"); $langs->load("admin"); $langs->load("orders"); diff --git a/htdocs/admin/dict.php b/htdocs/admin/dict.php index 71a4c7169ab..8999bfd13e9 100644 --- a/htdocs/admin/dict.php +++ b/htdocs/admin/dict.php @@ -30,7 +30,7 @@ require("../main.inc.php"); require_once(DOL_DOCUMENT_ROOT."/core/class/html.formadmin.class.php"); require_once(DOL_DOCUMENT_ROOT."/core/class/html.formcompany.class.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php"); $langs->load("other"); $langs->load("admin"); diff --git a/htdocs/admin/dons.php b/htdocs/admin/dons.php index 8daeb4cb2c2..632f4a9ac5b 100644 --- a/htdocs/admin/dons.php +++ b/htdocs/admin/dons.php @@ -21,7 +21,7 @@ * \brief Page d'administration/configuration du module Dons */ require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php"); require_once(DOL_DOCUMENT_ROOT."/compta/dons/class/don.class.php"); $langs->load("admin"); diff --git a/htdocs/admin/events.php b/htdocs/admin/events.php index de37e973886..df875865a85 100644 --- a/htdocs/admin/events.php +++ b/htdocs/admin/events.php @@ -22,8 +22,8 @@ */ require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/agenda.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/agenda.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/class/events.class.php"); diff --git a/htdocs/admin/expedition.php b/htdocs/admin/expedition.php index c6423d0832b..245a4ea1146 100644 --- a/htdocs/admin/expedition.php +++ b/htdocs/admin/expedition.php @@ -28,7 +28,7 @@ */ require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php"); require_once(DOL_DOCUMENT_ROOT.'/expedition/class/expedition.class.php'); $langs->load("admin"); diff --git a/htdocs/admin/external_rss.php b/htdocs/admin/external_rss.php index a7ee6e67a56..8869aee5e08 100644 --- a/htdocs/admin/external_rss.php +++ b/htdocs/admin/external_rss.php @@ -28,7 +28,7 @@ */ require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/class/rssparser.class.php"); $langs->load("admin"); diff --git a/htdocs/admin/facture.php b/htdocs/admin/facture.php index 11027a0ccda..4530485501a 100644 --- a/htdocs/admin/facture.php +++ b/htdocs/admin/facture.php @@ -26,7 +26,7 @@ */ require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php"); require_once(DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php'); $langs->load("admin"); diff --git a/htdocs/admin/fckeditor.php b/htdocs/admin/fckeditor.php index a062d686e15..4dda6f392dd 100644 --- a/htdocs/admin/fckeditor.php +++ b/htdocs/admin/fckeditor.php @@ -24,7 +24,7 @@ */ require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/class/doleditor.class.php"); $langs->load("admin"); diff --git a/htdocs/admin/fichinter.php b/htdocs/admin/fichinter.php index fad66ceae73..5b454bfcb0d 100644 --- a/htdocs/admin/fichinter.php +++ b/htdocs/admin/fichinter.php @@ -28,7 +28,7 @@ */ require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php"); require_once(DOL_DOCUMENT_ROOT.'/fichinter/class/fichinter.class.php'); $langs->load("admin"); diff --git a/htdocs/admin/fournisseur.php b/htdocs/admin/fournisseur.php index 9d3da300fa9..d62024293bc 100644 --- a/htdocs/admin/fournisseur.php +++ b/htdocs/admin/fournisseur.php @@ -28,7 +28,7 @@ */ require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php"); require_once(DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.class.php'); require_once(DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.commande.class.php'); require_once(DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php'); diff --git a/htdocs/admin/geoipmaxmind.php b/htdocs/admin/geoipmaxmind.php index 48a61111cde..f2a4e3c7fba 100644 --- a/htdocs/admin/geoipmaxmind.php +++ b/htdocs/admin/geoipmaxmind.php @@ -23,7 +23,7 @@ */ require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/class/dolgeoip.class.php"); // Security check diff --git a/htdocs/admin/ihm.php b/htdocs/admin/ihm.php index 214aa7cafe1..11b8261b2ee 100644 --- a/htdocs/admin/ihm.php +++ b/htdocs/admin/ihm.php @@ -24,7 +24,7 @@ require("../main.inc.php"); require_once(DOL_DOCUMENT_ROOT."/lib/usergroups.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/functions2.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/class/html.formother.class.php"); require_once(DOL_DOCUMENT_ROOT."/core/class/html.formadmin.class.php"); diff --git a/htdocs/admin/ldap.php b/htdocs/admin/ldap.php index e9346abc5d2..c770c432b2f 100644 --- a/htdocs/admin/ldap.php +++ b/htdocs/admin/ldap.php @@ -27,7 +27,7 @@ */ require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/class/ldap.class.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/ldap.lib.php"); diff --git a/htdocs/admin/ldap_contacts.php b/htdocs/admin/ldap_contacts.php index b051abbce02..5c1b747af73 100644 --- a/htdocs/admin/ldap_contacts.php +++ b/htdocs/admin/ldap_contacts.php @@ -27,7 +27,7 @@ */ require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/class/ldap.class.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/ldap.lib.php"); require_once(DOL_DOCUMENT_ROOT."/contact/class/contact.class.php"); diff --git a/htdocs/admin/ldap_groups.php b/htdocs/admin/ldap_groups.php index 615e172c80f..3120d780c36 100644 --- a/htdocs/admin/ldap_groups.php +++ b/htdocs/admin/ldap_groups.php @@ -27,7 +27,7 @@ */ require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php"); require_once(DOL_DOCUMENT_ROOT."/user/class/user.class.php"); require_once(DOL_DOCUMENT_ROOT."/user/class/usergroup.class.php"); require_once(DOL_DOCUMENT_ROOT."/core/class/ldap.class.php"); diff --git a/htdocs/admin/ldap_members.php b/htdocs/admin/ldap_members.php index 57688b35b91..1f70702df13 100644 --- a/htdocs/admin/ldap_members.php +++ b/htdocs/admin/ldap_members.php @@ -27,7 +27,7 @@ */ require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php"); require_once(DOL_DOCUMENT_ROOT."/adherents/class/adherent.class.php"); require_once(DOL_DOCUMENT_ROOT."/adherents/class/adherent_type.class.php"); require_once(DOL_DOCUMENT_ROOT."/core/class/ldap.class.php"); diff --git a/htdocs/admin/ldap_users.php b/htdocs/admin/ldap_users.php index c8b9946ba87..cef4be73072 100644 --- a/htdocs/admin/ldap_users.php +++ b/htdocs/admin/ldap_users.php @@ -27,7 +27,7 @@ */ require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php"); require_once(DOL_DOCUMENT_ROOT."/user/class/user.class.php"); require_once(DOL_DOCUMENT_ROOT."/user/class/usergroup.class.php"); require_once(DOL_DOCUMENT_ROOT."/core/class/ldap.class.php"); diff --git a/htdocs/admin/limits.php b/htdocs/admin/limits.php index b7a50ac0406..4244a56be9d 100644 --- a/htdocs/admin/limits.php +++ b/htdocs/admin/limits.php @@ -23,7 +23,7 @@ */ require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php"); require_once(DOL_DOCUMENT_ROOT."/lib/price.lib.php"); $langs->load("companies"); diff --git a/htdocs/admin/livraison.php b/htdocs/admin/livraison.php index 3d2d4ef62e9..6a5a6819bf0 100644 --- a/htdocs/admin/livraison.php +++ b/htdocs/admin/livraison.php @@ -27,7 +27,7 @@ * \brief Page d'administration/configuration du module Livraison */ require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php"); require_once(DOL_DOCUMENT_ROOT."/livraison/class/livraison.class.php"); $langs->load("admin"); diff --git a/htdocs/admin/mailing.php b/htdocs/admin/mailing.php index 9b5d6319e27..c86c5d1e02e 100644 --- a/htdocs/admin/mailing.php +++ b/htdocs/admin/mailing.php @@ -24,7 +24,7 @@ */ require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php"); $langs->load("admin"); $langs->load("mails"); diff --git a/htdocs/admin/mails.php b/htdocs/admin/mails.php index f1513907cda..5231c0c6235 100644 --- a/htdocs/admin/mails.php +++ b/htdocs/admin/mails.php @@ -22,7 +22,7 @@ */ require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php"); require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php"); $langs->load("companies"); diff --git a/htdocs/admin/menus.php b/htdocs/admin/menus.php index e4ff9c16906..54542b98095 100644 --- a/htdocs/admin/menus.php +++ b/htdocs/admin/menus.php @@ -24,9 +24,9 @@ */ require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/class/html.formadmin.class.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php"); $langs->load("companies"); diff --git a/htdocs/admin/menus/other.php b/htdocs/admin/menus/other.php index 1e54ee2f2fa..0d200a99f85 100644 --- a/htdocs/admin/menus/other.php +++ b/htdocs/admin/menus/other.php @@ -22,7 +22,7 @@ */ require("../../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php"); $langs->load("users"); $langs->load("admin"); diff --git a/htdocs/admin/modules.php b/htdocs/admin/modules.php index 82c110aecbe..c51b14859dc 100644 --- a/htdocs/admin/modules.php +++ b/htdocs/admin/modules.php @@ -26,7 +26,7 @@ */ require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php"); $langs->load("errors"); $langs->load("admin"); diff --git a/htdocs/admin/notification.php b/htdocs/admin/notification.php index 73db19d4d61..6f5eec72b5b 100644 --- a/htdocs/admin/notification.php +++ b/htdocs/admin/notification.php @@ -23,7 +23,7 @@ */ require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php"); require_once(DOL_DOCUMENT_ROOT."/includes/triggers/interface_modNotification_Notification.class.php"); $langs->load("admin"); diff --git a/htdocs/admin/pdf.php b/htdocs/admin/pdf.php index 2e5b758c109..7ec878ce5a7 100755 --- a/htdocs/admin/pdf.php +++ b/htdocs/admin/pdf.php @@ -24,7 +24,7 @@ require("../main.inc.php"); require_once(DOL_DOCUMENT_ROOT."/lib/usergroups.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/functions2.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/class/html.formother.class.php"); require_once(DOL_DOCUMENT_ROOT."/core/class/html.formadmin.class.php"); diff --git a/htdocs/admin/perms.php b/htdocs/admin/perms.php index c9ed93052fe..67a1792142e 100644 --- a/htdocs/admin/perms.php +++ b/htdocs/admin/perms.php @@ -25,7 +25,7 @@ */ require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php"); $langs->load("admin"); $langs->load("users"); diff --git a/htdocs/admin/prelevement.php b/htdocs/admin/prelevement.php index 5ef95680a74..aea33be39a3 100644 --- a/htdocs/admin/prelevement.php +++ b/htdocs/admin/prelevement.php @@ -26,7 +26,7 @@ require('../main.inc.php'); require_once(DOL_DOCUMENT_ROOT."/compta/prelevement/class/bon-prelevement.class.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php"); require_once(DOL_DOCUMENT_ROOT."/compta/bank/class/account.class.php"); $langs->load("admin"); diff --git a/htdocs/admin/project.php b/htdocs/admin/project.php index e837687884f..321bb024b42 100644 --- a/htdocs/admin/project.php +++ b/htdocs/admin/project.php @@ -24,7 +24,7 @@ */ require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php"); require_once(DOL_DOCUMENT_ROOT.'/projet/class/project.class.php'); require_once(DOL_DOCUMENT_ROOT.'/projet/class/task.class.php'); diff --git a/htdocs/admin/propale.php b/htdocs/admin/propale.php index ab2c42c46d3..63ba2e37ca7 100644 --- a/htdocs/admin/propale.php +++ b/htdocs/admin/propale.php @@ -29,7 +29,7 @@ */ require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php"); require_once(DOL_DOCUMENT_ROOT."/comm/propal/class/propal.class.php"); $langs->load("admin"); diff --git a/htdocs/admin/proxy.php b/htdocs/admin/proxy.php index 09a412cf082..e5d36d3e2fa 100755 --- a/htdocs/admin/proxy.php +++ b/htdocs/admin/proxy.php @@ -22,7 +22,7 @@ */ require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/class/html.formfile.class.php"); $langs->load("users"); diff --git a/htdocs/admin/security.php b/htdocs/admin/security.php index 01f1f7b714c..142bb63e919 100644 --- a/htdocs/admin/security.php +++ b/htdocs/admin/security.php @@ -23,7 +23,7 @@ */ require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php"); $langs->load("users"); $langs->load("admin"); diff --git a/htdocs/admin/security_other.php b/htdocs/admin/security_other.php index f79af4b7e06..7ec5d5ef5d8 100644 --- a/htdocs/admin/security_other.php +++ b/htdocs/admin/security_other.php @@ -23,7 +23,7 @@ */ require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/class/html.formfile.class.php"); $langs->load("users"); diff --git a/htdocs/admin/sms.php b/htdocs/admin/sms.php index 4d58e3f5756..efdcde116f6 100755 --- a/htdocs/admin/sms.php +++ b/htdocs/admin/sms.php @@ -22,7 +22,7 @@ */ require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php"); $langs->load("companies"); $langs->load("products"); diff --git a/htdocs/admin/stock.php b/htdocs/admin/stock.php index 079937d980d..3afe13683b8 100644 --- a/htdocs/admin/stock.php +++ b/htdocs/admin/stock.php @@ -23,7 +23,7 @@ * \brief Page d'administration/configuration du module gestion de stock */ require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php"); $langs->load("admin"); $langs->load("stocks"); diff --git a/htdocs/admin/syslog.php b/htdocs/admin/syslog.php index 04950a51eb0..41388960bea 100644 --- a/htdocs/admin/syslog.php +++ b/htdocs/admin/syslog.php @@ -24,7 +24,7 @@ */ require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php"); if (!$user->admin) accessforbidden(); diff --git a/htdocs/admin/system/dolibarr.php b/htdocs/admin/system/dolibarr.php index 31bdfcaf388..5b577d19a7d 100644 --- a/htdocs/admin/system/dolibarr.php +++ b/htdocs/admin/system/dolibarr.php @@ -23,7 +23,7 @@ require("../../main.inc.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/memory.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/date.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/date.lib.php"); $langs->load("admin"); $langs->load("install"); diff --git a/htdocs/admin/taxes.php b/htdocs/admin/taxes.php index 995186ce6a7..64faead5fc2 100644 --- a/htdocs/admin/taxes.php +++ b/htdocs/admin/taxes.php @@ -25,7 +25,7 @@ */ require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php"); $langs->load('admin'); diff --git a/htdocs/admin/tools/export.php b/htdocs/admin/tools/export.php index 23a0b436d81..aa3c0260424 100644 --- a/htdocs/admin/tools/export.php +++ b/htdocs/admin/tools/export.php @@ -21,7 +21,7 @@ */ require("../../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php"); require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/class/html.formfile.class.php"); diff --git a/htdocs/admin/tools/listsessions.php b/htdocs/admin/tools/listsessions.php index 4898e0ff578..9c61f6bc278 100644 --- a/htdocs/admin/tools/listsessions.php +++ b/htdocs/admin/tools/listsessions.php @@ -23,7 +23,7 @@ */ require("../../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT.'/lib/admin.lib.php'); +require_once(DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php'); $langs->load("install"); diff --git a/htdocs/admin/user.php b/htdocs/admin/user.php index 1985ae219a7..c23310571e9 100644 --- a/htdocs/admin/user.php +++ b/htdocs/admin/user.php @@ -27,7 +27,7 @@ */ require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php"); $langs->load("admin"); $langs->load("members"); diff --git a/htdocs/admin/workflow.php b/htdocs/admin/workflow.php index 0344c2c033c..2f9b43c57db 100755 --- a/htdocs/admin/workflow.php +++ b/htdocs/admin/workflow.php @@ -25,7 +25,7 @@ */ require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php"); $langs->load("admin"); $langs->load("workflow"); diff --git a/htdocs/bookmarks/admin/bookmark.php b/htdocs/bookmarks/admin/bookmark.php index e5ed939779a..acb7689d80b 100644 --- a/htdocs/bookmarks/admin/bookmark.php +++ b/htdocs/bookmarks/admin/bookmark.php @@ -23,7 +23,7 @@ */ require("../../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php"); $langs->load("admin"); diff --git a/htdocs/boutique/admin/boutique.php b/htdocs/boutique/admin/boutique.php index a02a1ca145f..ce5e070b402 100644 --- a/htdocs/boutique/admin/boutique.php +++ b/htdocs/boutique/admin/boutique.php @@ -26,7 +26,7 @@ */ require("../../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php"); $langs->load("admin"); $langs->load("oscommerce"); diff --git a/htdocs/cashdesk/admin/cashdesk.php b/htdocs/cashdesk/admin/cashdesk.php index 4580e01e959..c879523ec27 100644 --- a/htdocs/cashdesk/admin/cashdesk.php +++ b/htdocs/cashdesk/admin/cashdesk.php @@ -23,7 +23,7 @@ */ require("../../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php"); require_once(DOL_DOCUMENT_ROOT."/product/class/html.formproduct.class.php"); // If socid provided by ajax company selector diff --git a/htdocs/categories/categorie.php b/htdocs/categories/categorie.php index c5ead2e504d..9e822d2b465 100644 --- a/htdocs/categories/categorie.php +++ b/htdocs/categories/categorie.php @@ -175,7 +175,7 @@ $html = new Form($db); */ if ($socid) { - require_once(DOL_DOCUMENT_ROOT."/lib/company.lib.php"); + require_once(DOL_DOCUMENT_ROOT."/core/lib/company.lib.php"); require_once(DOL_DOCUMENT_ROOT."/societe/class/societe.class.php"); $langs->load("companies"); diff --git a/htdocs/categories/photos.php b/htdocs/categories/photos.php index 56d2d844204..82f7b742bb3 100644 --- a/htdocs/categories/photos.php +++ b/htdocs/categories/photos.php @@ -27,7 +27,7 @@ require("../main.inc.php"); require_once(DOL_DOCUMENT_ROOT."/categories/class/categorie.class.php"); require_once(DOL_DOCUMENT_ROOT."/core/class/html.formfile.class.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/categories.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/categories.lib.php"); $langs->load("categories"); $langs->load("bills"); diff --git a/htdocs/categories/viewcat.php b/htdocs/categories/viewcat.php index c1bb3b9739d..80c9cac9e06 100644 --- a/htdocs/categories/viewcat.php +++ b/htdocs/categories/viewcat.php @@ -26,7 +26,7 @@ require("../main.inc.php"); require_once(DOL_DOCUMENT_ROOT."/categories/class/categorie.class.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/categories.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/categories.lib.php"); $langs->load("categories"); diff --git a/htdocs/comm/action/class/actioncomm.class.php b/htdocs/comm/action/class/actioncomm.class.php index a6672adfa93..0b79eca3148 100644 --- a/htdocs/comm/action/class/actioncomm.class.php +++ b/htdocs/comm/action/class/actioncomm.class.php @@ -666,7 +666,7 @@ class ActionComm extends CommonObject global $conf,$langs,$dolibarr_main_url_root,$mysoc; require_once (DOL_DOCUMENT_ROOT ."/lib/xcal.lib.php"); - require_once (DOL_DOCUMENT_ROOT ."/lib/date.lib.php"); + require_once (DOL_DOCUMENT_ROOT ."/core/lib/date.lib.php"); dol_syslog(get_class($this)."::build_exportfile Build export file format=".$format.", type=".$type.", cachedelay=".$cachedelay.", filename=".$filename.", filters size=".count($filters), LOG_DEBUG); diff --git a/htdocs/comm/action/document.php b/htdocs/comm/action/document.php index 96185f80627..4e5ebb4003d 100755 --- a/htdocs/comm/action/document.php +++ b/htdocs/comm/action/document.php @@ -26,7 +26,7 @@ */ require("../../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/agenda.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/agenda.lib.php"); require_once(DOL_DOCUMENT_ROOT."/contact/class/contact.class.php"); require_once(DOL_DOCUMENT_ROOT."/comm/action/class/cactioncomm.class.php"); require_once(DOL_DOCUMENT_ROOT."/comm/action/class/actioncomm.class.php"); diff --git a/htdocs/comm/action/fiche.php b/htdocs/comm/action/fiche.php index a89e146499c..1b4ff95ec73 100644 --- a/htdocs/comm/action/fiche.php +++ b/htdocs/comm/action/fiche.php @@ -26,7 +26,7 @@ */ require("../../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/agenda.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/agenda.lib.php"); require_once(DOL_DOCUMENT_ROOT."/contact/class/contact.class.php"); require_once(DOL_DOCUMENT_ROOT."/user/class/user.class.php"); require_once(DOL_DOCUMENT_ROOT."/comm/action/class/cactioncomm.class.php"); diff --git a/htdocs/comm/action/index.php b/htdocs/comm/action/index.php index 700c5569916..b37f2d91ce6 100644 --- a/htdocs/comm/action/index.php +++ b/htdocs/comm/action/index.php @@ -29,8 +29,8 @@ require("../../main.inc.php"); require_once(DOL_DOCUMENT_ROOT."/societe/class/societe.class.php"); require_once(DOL_DOCUMENT_ROOT."/contact/class/contact.class.php"); require_once(DOL_DOCUMENT_ROOT."/comm/action/class/actioncomm.class.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/date.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/agenda.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/date.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/agenda.lib.php"); if ($conf->projet->enabled) require_once(DOL_DOCUMENT_ROOT."/lib/project.lib.php"); $filter=GETPOST("filter"); diff --git a/htdocs/comm/action/info.php b/htdocs/comm/action/info.php index 78fa56ac4aa..fe2781fcdf5 100644 --- a/htdocs/comm/action/info.php +++ b/htdocs/comm/action/info.php @@ -23,7 +23,7 @@ */ require("../../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/agenda.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/agenda.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/functions2.lib.php"); require_once(DOL_DOCUMENT_ROOT."/contact/class/contact.class.php"); require_once(DOL_DOCUMENT_ROOT."/comm/action/class/cactioncomm.class.php"); diff --git a/htdocs/comm/action/listactions.php b/htdocs/comm/action/listactions.php index 54aed0cbd15..adfa2577238 100644 --- a/htdocs/comm/action/listactions.php +++ b/htdocs/comm/action/listactions.php @@ -27,8 +27,8 @@ require("../../main.inc.php"); require_once(DOL_DOCUMENT_ROOT."/contact/class/contact.class.php"); require_once(DOL_DOCUMENT_ROOT."/comm/action/class/actioncomm.class.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/date.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/agenda.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/date.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/agenda.lib.php"); if ($conf->projet->enabled) require_once(DOL_DOCUMENT_ROOT."/lib/project.lib.php"); $langs->load("companies"); diff --git a/htdocs/comm/address.php b/htdocs/comm/address.php index 0ef8b32d49b..f3a04d23eb2 100644 --- a/htdocs/comm/address.php +++ b/htdocs/comm/address.php @@ -24,7 +24,7 @@ */ require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/company.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/company.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/class/html.formcompany.class.php"); require_once(DOL_DOCUMENT_ROOT."/societe/class/address.class.php"); diff --git a/htdocs/comm/fiche.php b/htdocs/comm/fiche.php index 67396ee432e..40314836c4b 100644 --- a/htdocs/comm/fiche.php +++ b/htdocs/comm/fiche.php @@ -28,8 +28,8 @@ */ require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/company.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/date.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/company.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/date.lib.php"); 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/class/propal.class.php"); diff --git a/htdocs/comm/index.php b/htdocs/comm/index.php index 1d8320fcfe3..234ffddbfcd 100644 --- a/htdocs/comm/index.php +++ b/htdocs/comm/index.php @@ -27,7 +27,7 @@ require("../main.inc.php"); require_once(DOL_DOCUMENT_ROOT."/core/class/html.formfile.class.php"); require_once(DOL_DOCUMENT_ROOT."/societe/class/client.class.php"); require_once(DOL_DOCUMENT_ROOT."/comm/action/class/actioncomm.class.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/agenda.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/agenda.lib.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/class/propal.class.php"); diff --git a/htdocs/comm/multiprix.php b/htdocs/comm/multiprix.php index a42babb571e..3d9ed3de3b6 100644 --- a/htdocs/comm/multiprix.php +++ b/htdocs/comm/multiprix.php @@ -24,7 +24,7 @@ */ require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/company.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/company.lib.php"); require_once(DOL_DOCUMENT_ROOT."/contact/class/contact.class.php"); $langs->load("orders"); diff --git a/htdocs/comm/prospect/fiche.php b/htdocs/comm/prospect/fiche.php index 47463460abe..3e99e1addef 100644 --- a/htdocs/comm/prospect/fiche.php +++ b/htdocs/comm/prospect/fiche.php @@ -24,7 +24,7 @@ */ require_once("../../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/company.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/company.lib.php"); require_once(DOL_DOCUMENT_ROOT."/comm/prospect/class/prospect.class.php"); require_once(DOL_DOCUMENT_ROOT."/core/class/html.formcompany.class.php"); require_once(DOL_DOCUMENT_ROOT."/contact/class/contact.class.php"); diff --git a/htdocs/comm/prospect/index.php b/htdocs/comm/prospect/index.php index 278e25a20c7..b93c0706b4a 100644 --- a/htdocs/comm/prospect/index.php +++ b/htdocs/comm/prospect/index.php @@ -24,7 +24,7 @@ */ require("../../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/agenda.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/agenda.lib.php"); $langs->load("propal"); diff --git a/htdocs/comm/prospect/recap-prospect.php b/htdocs/comm/prospect/recap-prospect.php index 57fb8e5e338..32347362e09 100644 --- a/htdocs/comm/prospect/recap-prospect.php +++ b/htdocs/comm/prospect/recap-prospect.php @@ -23,7 +23,7 @@ */ require("../../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/company.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/company.lib.php"); require_once(DOL_DOCUMENT_ROOT."/compta/facture/class/facture.class.php"); $langs->load("companies"); diff --git a/htdocs/comm/recap-client.php b/htdocs/comm/recap-client.php index 270499378f4..9ef8ffceb89 100644 --- a/htdocs/comm/recap-client.php +++ b/htdocs/comm/recap-client.php @@ -23,7 +23,7 @@ */ require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/company.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/company.lib.php"); require_once(DOL_DOCUMENT_ROOT."/compta/facture/class/facture.class.php"); $langs->load("companies"); diff --git a/htdocs/comm/remise.php b/htdocs/comm/remise.php index 2722ae7b426..abfb5005972 100644 --- a/htdocs/comm/remise.php +++ b/htdocs/comm/remise.php @@ -23,7 +23,7 @@ */ require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/company.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/company.lib.php"); require_once(DOL_DOCUMENT_ROOT."/contact/class/contact.class.php"); $langs->load("companies"); diff --git a/htdocs/comm/remx.php b/htdocs/comm/remx.php index e6b79bc44bc..977f9000ff2 100644 --- a/htdocs/comm/remx.php +++ b/htdocs/comm/remx.php @@ -24,7 +24,7 @@ */ require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/company.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/company.lib.php"); require_once(DOL_DOCUMENT_ROOT."/compta/facture/class/facture.class.php"); require_once(DOL_DOCUMENT_ROOT."/core/class/discount.class.php"); diff --git a/htdocs/compta/bank/account.php b/htdocs/compta/bank/account.php index 2d56d33b3d8..e0bf60b204a 100644 --- a/htdocs/compta/bank/account.php +++ b/htdocs/compta/bank/account.php @@ -27,7 +27,7 @@ */ require("./pre.inc.php"); // We use pre.inc.php to have a dynamic menu -require_once(DOL_DOCUMENT_ROOT."/lib/bank.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/bank.lib.php"); require_once(DOL_DOCUMENT_ROOT."/societe/class/societe.class.php"); require_once(DOL_DOCUMENT_ROOT."/adherents/class/adherent.class.php"); require_once(DOL_DOCUMENT_ROOT."/compta/sociales/class/chargesociales.class.php"); diff --git a/htdocs/compta/bank/admin/bank.php b/htdocs/compta/bank/admin/bank.php index 4d1608b7bd2..0802a931d70 100644 --- a/htdocs/compta/bank/admin/bank.php +++ b/htdocs/compta/bank/admin/bank.php @@ -24,7 +24,7 @@ */ require("../../../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php"); require_once(DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php'); $langs->load("admin"); diff --git a/htdocs/compta/bank/annuel.php b/htdocs/compta/bank/annuel.php index 154760a139c..77f188eb5c7 100644 --- a/htdocs/compta/bank/annuel.php +++ b/htdocs/compta/bank/annuel.php @@ -24,7 +24,7 @@ */ require("./pre.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/bank.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/bank.lib.php"); require_once(DOL_DOCUMENT_ROOT."/compta/bank/class/account.class.php"); // Security check diff --git a/htdocs/compta/bank/bankid_fr.php b/htdocs/compta/bank/bankid_fr.php index 5c27ce120bd..346887d312d 100644 --- a/htdocs/compta/bank/bankid_fr.php +++ b/htdocs/compta/bank/bankid_fr.php @@ -25,8 +25,8 @@ */ require("./pre.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/bank.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/company.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/bank.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/company.lib.php"); $langs->load("banks"); $langs->load("bills"); diff --git a/htdocs/compta/bank/class/account.class.php b/htdocs/compta/bank/class/account.class.php index 40362bb5f70..602da307cc0 100644 --- a/htdocs/compta/bank/class/account.class.php +++ b/htdocs/compta/bank/class/account.class.php @@ -354,7 +354,7 @@ class Account extends CommonObject } // Chargement librairie pour acces fonction controle RIB - require_once DOL_DOCUMENT_ROOT.'/lib/bank.lib.php'; + require_once DOL_DOCUMENT_ROOT.'/core/lib/bank.lib.php'; $now=dol_now(); @@ -510,7 +510,7 @@ class Account extends CommonObject global $conf,$langs; // Chargement librairie pour acces fonction controle RIB - require_once(DOL_DOCUMENT_ROOT.'/lib/bank.lib.php'); + require_once(DOL_DOCUMENT_ROOT.'/core/lib/bank.lib.php'); dol_syslog("Account::update_bban $this->code_banque,$this->code_guichet,$this->number,$this->cle_rib,$this->iban"); @@ -915,7 +915,7 @@ class Account extends CommonObject */ function verif() { - require_once DOL_DOCUMENT_ROOT . '/lib/bank.lib.php'; + require_once DOL_DOCUMENT_ROOT . '/core/lib/bank.lib.php'; // Call function to check BAN if (! checkBanForAccount($this)) diff --git a/htdocs/compta/bank/fiche.php b/htdocs/compta/bank/fiche.php index 6b52b903aee..888f9c584b0 100644 --- a/htdocs/compta/bank/fiche.php +++ b/htdocs/compta/bank/fiche.php @@ -25,8 +25,8 @@ */ require("./pre.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/bank.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/company.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/bank.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/company.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/class/html.formcompany.class.php"); $langs->load("banks"); diff --git a/htdocs/compta/bank/graph.php b/htdocs/compta/bank/graph.php index df4e557f6fa..df4f4f951c9 100644 --- a/htdocs/compta/bank/graph.php +++ b/htdocs/compta/bank/graph.php @@ -24,7 +24,7 @@ */ require("./pre.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/bank.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/bank.lib.php"); require_once(DOL_DOCUMENT_ROOT."/compta/bank/class/account.class.php"); require_once(DOL_DOCUMENT_ROOT."/core/class/dolgraph.class.php"); diff --git a/htdocs/compta/bank/index.php b/htdocs/compta/bank/index.php index 4c04e7ecc7b..08aaad1c78d 100644 --- a/htdocs/compta/bank/index.php +++ b/htdocs/compta/bank/index.php @@ -24,7 +24,7 @@ */ require("./pre.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/bank.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/bank.lib.php"); require_once(DOL_DOCUMENT_ROOT."/compta/tva/class/tva.class.php"); require_once(DOL_DOCUMENT_ROOT."/compta/sociales/class/chargesociales.class.php"); diff --git a/htdocs/compta/bank/rappro.php b/htdocs/compta/bank/rappro.php index fb8f2d98e69..301362dda1e 100644 --- a/htdocs/compta/bank/rappro.php +++ b/htdocs/compta/bank/rappro.php @@ -24,7 +24,7 @@ */ require("./pre.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/bank.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/bank.lib.php"); require_once(DOL_DOCUMENT_ROOT."/societe/class/societe.class.php"); require_once(DOL_DOCUMENT_ROOT."/adherents/class/adherent.class.php"); require_once(DOL_DOCUMENT_ROOT."/compta/sociales/class/chargesociales.class.php"); diff --git a/htdocs/compta/bank/releve.php b/htdocs/compta/bank/releve.php index 1affb418c16..0db2c4ec816 100644 --- a/htdocs/compta/bank/releve.php +++ b/htdocs/compta/bank/releve.php @@ -24,7 +24,7 @@ */ require("./pre.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/bank.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/bank.lib.php"); $langs->load("companies"); $langs->load("banks"); diff --git a/htdocs/compta/bank/search.php b/htdocs/compta/bank/search.php index 0031fb2dae2..528111982e0 100644 --- a/htdocs/compta/bank/search.php +++ b/htdocs/compta/bank/search.php @@ -24,7 +24,7 @@ */ require("./pre.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/bank.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/bank.lib.php"); require_once(DOL_DOCUMENT_ROOT."/societe/class/societe.class.php"); require_once(DOL_DOCUMENT_ROOT."/compta/bank/class/account.class.php"); require_once(DOL_DOCUMENT_ROOT."/compta/bank/class/bankcateg.class.php"); diff --git a/htdocs/compta/bank/treso.php b/htdocs/compta/bank/treso.php index 103b8bde928..6a6a1580f64 100644 --- a/htdocs/compta/bank/treso.php +++ b/htdocs/compta/bank/treso.php @@ -24,7 +24,7 @@ */ require("./pre.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/bank.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/bank.lib.php"); require_once(DOL_DOCUMENT_ROOT."/societe/class/societe.class.php"); require_once(DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php'); require_once(DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php'); diff --git a/htdocs/compta/bank/virement.php b/htdocs/compta/bank/virement.php index 4ec9e206e2a..8c6fc905e30 100644 --- a/htdocs/compta/bank/virement.php +++ b/htdocs/compta/bank/virement.php @@ -24,7 +24,7 @@ */ require("./pre.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/bank.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/bank.lib.php"); $langs->load("banks"); diff --git a/htdocs/compta/charges/index.php b/htdocs/compta/charges/index.php index 2c358e51edc..dd2f719f360 100644 --- a/htdocs/compta/charges/index.php +++ b/htdocs/compta/charges/index.php @@ -27,7 +27,7 @@ require("../../main.inc.php"); require_once(DOL_DOCUMENT_ROOT."/compta/tva/class/tva.class.php"); require_once(DOL_DOCUMENT_ROOT."/compta/sociales/class/chargesociales.class.php"); require_once(DOL_DOCUMENT_ROOT."/compta/sociales/class/paymentsocialcontribution.class.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/date.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/date.lib.php"); $langs->load("compta"); diff --git a/htdocs/compta/facture.php b/htdocs/compta/facture.php index e8a07835aa0..7926805d3bc 100644 --- a/htdocs/compta/facture.php +++ b/htdocs/compta/facture.php @@ -36,7 +36,7 @@ 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."/core/lib/functions2.lib.php"); require_once(DOL_DOCUMENT_ROOT.'/lib/invoice.lib.php'); -require_once(DOL_DOCUMENT_ROOT."/lib/date.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/date.lib.php"); if ($conf->projet->enabled) require_once(DOL_DOCUMENT_ROOT.'/projet/class/project.class.php'); if ($conf->projet->enabled) require_once(DOL_DOCUMENT_ROOT.'/lib/project.lib.php'); diff --git a/htdocs/compta/facture/class/facturestats.class.php b/htdocs/compta/facture/class/facturestats.class.php index c4fc13c00a5..4335d21855f 100644 --- a/htdocs/compta/facture/class/facturestats.class.php +++ b/htdocs/compta/facture/class/facturestats.class.php @@ -25,7 +25,7 @@ include_once DOL_DOCUMENT_ROOT . "/core/class/stats.class.php"; include_once DOL_DOCUMENT_ROOT . "/compta/facture/class/facture.class.php"; include_once DOL_DOCUMENT_ROOT . "/fourn/class/fournisseur.facture.class.php"; -include_once DOL_DOCUMENT_ROOT . "/lib/date.lib.php"; +include_once DOL_DOCUMENT_ROOT . "/core/lib/date.lib.php"; /** * \class FactureStats diff --git a/htdocs/compta/journal/purchasesjournal.php b/htdocs/compta/journal/purchasesjournal.php index 66964796dae..c9efde9acb6 100755 --- a/htdocs/compta/journal/purchasesjournal.php +++ b/htdocs/compta/journal/purchasesjournal.php @@ -24,7 +24,7 @@ */ require("../../main.inc.php"); require_once(DOL_DOCUMENT_ROOT."/lib/report.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/date.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/date.lib.php"); require_once(DOL_DOCUMENT_ROOT."/fourn/class/fournisseur.facture.class.php"); $langs->load("companies"); diff --git a/htdocs/compta/journal/sellsjournal.php b/htdocs/compta/journal/sellsjournal.php index 1ead0d71a72..602949ec724 100755 --- a/htdocs/compta/journal/sellsjournal.php +++ b/htdocs/compta/journal/sellsjournal.php @@ -24,7 +24,7 @@ */ require("../../main.inc.php"); require_once(DOL_DOCUMENT_ROOT."/lib/report.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/date.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/date.lib.php"); require_once(DOL_DOCUMENT_ROOT."/compta/facture/class/facture.class.php"); diff --git a/htdocs/compta/prelevement/create.php b/htdocs/compta/prelevement/create.php index e7a9098369b..fbf7535becf 100644 --- a/htdocs/compta/prelevement/create.php +++ b/htdocs/compta/prelevement/create.php @@ -27,7 +27,7 @@ require("../bank/pre.inc.php"); require_once(DOL_DOCUMENT_ROOT."/compta/prelevement/class/bon-prelevement.class.php"); require_once(DOL_DOCUMENT_ROOT."/compta/facture/class/facture.class.php"); require_once(DOL_DOCUMENT_ROOT."/societe/class/societe.class.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php"); $langs->load("widthdrawals"); $langs->load("companies"); diff --git a/htdocs/compta/recap-compta.php b/htdocs/compta/recap-compta.php index 6cf731dfaa8..72771a20c8b 100644 --- a/htdocs/compta/recap-compta.php +++ b/htdocs/compta/recap-compta.php @@ -23,7 +23,7 @@ */ require('../main.inc.php'); -require_once(DOL_DOCUMENT_ROOT."/lib/company.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/company.lib.php"); require_once(DOL_DOCUMENT_ROOT."/compta/facture/class/facture.class.php"); $langs->load("companies"); diff --git a/htdocs/compta/resultat/clientfourn.php b/htdocs/compta/resultat/clientfourn.php index 04557e00b8b..8b40189a080 100644 --- a/htdocs/compta/resultat/clientfourn.php +++ b/htdocs/compta/resultat/clientfourn.php @@ -27,7 +27,7 @@ require_once(DOL_DOCUMENT_ROOT."/compta/tva/class/tva.class.php"); require_once(DOL_DOCUMENT_ROOT."/compta/sociales/class/chargesociales.class.php"); require_once(DOL_DOCUMENT_ROOT."/lib/report.lib.php"); require_once(DOL_DOCUMENT_ROOT."/lib/tax.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/date.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/date.lib.php"); $langs->load("bills"); diff --git a/htdocs/compta/stats/cabyuser.php b/htdocs/compta/stats/cabyuser.php index 7ad351bb118..4a123777bd4 100644 --- a/htdocs/compta/stats/cabyuser.php +++ b/htdocs/compta/stats/cabyuser.php @@ -25,7 +25,7 @@ require('../../main.inc.php'); require_once(DOL_DOCUMENT_ROOT."/lib/report.lib.php"); require_once(DOL_DOCUMENT_ROOT."/lib/tax.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/date.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/date.lib.php"); // Security check $socid = isset($_REQUEST["socid"])?$_REQUEST["socid"]:''; diff --git a/htdocs/compta/stats/casoc.php b/htdocs/compta/stats/casoc.php index 5b26de3791b..edeea1495ec 100644 --- a/htdocs/compta/stats/casoc.php +++ b/htdocs/compta/stats/casoc.php @@ -26,7 +26,7 @@ require('../../main.inc.php'); require_once(DOL_DOCUMENT_ROOT."/lib/report.lib.php"); require_once(DOL_DOCUMENT_ROOT."/lib/tax.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/date.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/date.lib.php"); $langs->load("companies"); diff --git a/htdocs/compta/tva/clients.php b/htdocs/compta/tva/clients.php index 46f2c91caf4..6f9f1ad981e 100644 --- a/htdocs/compta/tva/clients.php +++ b/htdocs/compta/tva/clients.php @@ -27,7 +27,7 @@ require('../../main.inc.php'); require_once(DOL_DOCUMENT_ROOT."/lib/report.lib.php"); require_once(DOL_DOCUMENT_ROOT."/lib/tax.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/date.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/date.lib.php"); require_once(DOL_DOCUMENT_ROOT."/compta/tva/class/tva.class.php"); $langs->load("bills"); diff --git a/htdocs/compta/tva/index.php b/htdocs/compta/tva/index.php index a84d800164a..f4819240fe1 100644 --- a/htdocs/compta/tva/index.php +++ b/htdocs/compta/tva/index.php @@ -26,7 +26,7 @@ require('../../main.inc.php'); require_once(DOL_DOCUMENT_ROOT."/lib/tax.lib.php"); require_once(DOL_DOCUMENT_ROOT."/compta/tva/class/tva.class.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/date.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/date.lib.php"); $langs->load("other"); diff --git a/htdocs/compta/tva/quadri_detail.php b/htdocs/compta/tva/quadri_detail.php index 6a16a19ce73..d3348cfbf08 100644 --- a/htdocs/compta/tva/quadri_detail.php +++ b/htdocs/compta/tva/quadri_detail.php @@ -28,7 +28,7 @@ require('../../main.inc.php'); require_once(DOL_DOCUMENT_ROOT."/lib/report.lib.php"); require_once(DOL_DOCUMENT_ROOT."/lib/tax.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/date.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/date.lib.php"); require_once(DOL_DOCUMENT_ROOT."/compta/tva/class/tva.class.php"); require_once(DOL_DOCUMENT_ROOT."/compta/facture/class/facture.class.php"); require_once(DOL_DOCUMENT_ROOT."/product/class/product.class.php"); diff --git a/htdocs/contact/fiche.php b/htdocs/contact/fiche.php index 3a1d829a777..9e30170a702 100644 --- a/htdocs/contact/fiche.php +++ b/htdocs/contact/fiche.php @@ -29,7 +29,7 @@ require("../main.inc.php"); require_once(DOL_DOCUMENT_ROOT."/comm/action/class/actioncomm.class.php"); require_once(DOL_DOCUMENT_ROOT."/contact/class/contact.class.php"); require_once(DOL_DOCUMENT_ROOT."/lib/contact.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/company.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/company.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/class/html.formcompany.class.php"); $langs->load("companies"); diff --git a/htdocs/contact/perso.php b/htdocs/contact/perso.php index 7de2f333936..2c37327330b 100644 --- a/htdocs/contact/perso.php +++ b/htdocs/contact/perso.php @@ -199,7 +199,7 @@ else // Date To Birth if ($contact->birthday != '') { - include_once(DOL_DOCUMENT_ROOT.'/lib/date.lib.php'); + include_once(DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php'); print ''.$langs->trans("DateToBirth").''.dol_print_date($contact->birthday,"day"); diff --git a/htdocs/contrat/fiche.php b/htdocs/contrat/fiche.php index 6710aa0f0bf..4f95788c0dc 100644 --- a/htdocs/contrat/fiche.php +++ b/htdocs/contrat/fiche.php @@ -26,7 +26,7 @@ */ require ("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/date.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/date.lib.php"); require_once(DOL_DOCUMENT_ROOT.'/lib/contract.lib.php'); require_once(DOL_DOCUMENT_ROOT."/includes/modules/contract/modules_contract.php"); if ($conf->projet->enabled) require_once(DOL_DOCUMENT_ROOT."/projet/class/project.class.php"); diff --git a/htdocs/lib/admin_extrafields.inc.php b/htdocs/core/admin_extrafields.inc.php similarity index 98% rename from htdocs/lib/admin_extrafields.inc.php rename to htdocs/core/admin_extrafields.inc.php index 1854d635b48..00d4e4cfa48 100644 --- a/htdocs/lib/admin_extrafields.inc.php +++ b/htdocs/core/admin_extrafields.inc.php @@ -17,7 +17,7 @@ */ /** - * \file htdocs/lib/admin_extrafields.inc.php + * \file htdocs/core/admin_extrafields.inc.php * \brief Code for actions on extrafields admin pages */ diff --git a/htdocs/core/ajaxconstantonoff.php b/htdocs/core/ajaxconstantonoff.php index b7fcde0b2e7..65db9fb3ff8 100644 --- a/htdocs/core/ajaxconstantonoff.php +++ b/htdocs/core/ajaxconstantonoff.php @@ -28,7 +28,7 @@ if (! defined('NOREQUIRESOC')) define('NOREQUIRESOC','1'); if (! defined('NOREQUIRETRAN')) define('NOREQUIRETRAN','1'); require('../main.inc.php'); -require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php"); /* diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php index 6e7de839e06..c7e2d98c8f1 100644 --- a/htdocs/core/class/html.form.class.php +++ b/htdocs/core/class/html.form.class.php @@ -3238,7 +3238,7 @@ class Form { if ($iSecond) { - require_once(DOL_DOCUMENT_ROOT."/lib/date.lib.php"); + require_once(DOL_DOCUMENT_ROOT."/core/lib/date.lib.php"); $hourSelected = ConvertSecondToTime($iSecond,'hour'); $minSelected = ConvertSecondToTime($iSecond,'min'); diff --git a/htdocs/core/class/html.formother.class.php b/htdocs/core/class/html.formother.class.php index 4689ff37c2b..442559bb851 100644 --- a/htdocs/core/class/html.formother.class.php +++ b/htdocs/core/class/html.formother.class.php @@ -560,7 +560,7 @@ class FormOther */ function select_month($selected='',$htmlname='monthid',$useempty=0) { - require_once(DOL_DOCUMENT_ROOT."/lib/date.lib.php"); + require_once(DOL_DOCUMENT_ROOT."/core/lib/date.lib.php"); $month = monthArrayOrSelected(-1); // Get array diff --git a/htdocs/lib/accountancy.lib.php b/htdocs/core/lib/accountancy.lib.php similarity index 97% rename from htdocs/lib/accountancy.lib.php rename to htdocs/core/lib/accountancy.lib.php index 248db7b5ed7..a1500797866 100644 --- a/htdocs/lib/accountancy.lib.php +++ b/htdocs/core/lib/accountancy.lib.php @@ -17,7 +17,7 @@ */ /** - * \file htdocs/lib/accountancy.lib.php + * \file htdocs/core/lib/accountancy.lib.php * \brief Library of accountancy functions */ diff --git a/htdocs/lib/admin.lib.php b/htdocs/core/lib/admin.lib.php similarity index 99% rename from htdocs/lib/admin.lib.php rename to htdocs/core/lib/admin.lib.php index 5f0fa2d4813..fcb88ee0ede 100644 --- a/htdocs/lib/admin.lib.php +++ b/htdocs/core/lib/admin.lib.php @@ -18,7 +18,7 @@ */ /** - * \file htdocs/lib/admin.lib.php + * \file htdocs/core/lib/admin.lib.php * \brief Library of admin functions */ diff --git a/htdocs/lib/agenda.lib.php b/htdocs/core/lib/agenda.lib.php similarity index 99% rename from htdocs/lib/agenda.lib.php rename to htdocs/core/lib/agenda.lib.php index 8aa17c77c08..9be34529832 100644 --- a/htdocs/lib/agenda.lib.php +++ b/htdocs/core/lib/agenda.lib.php @@ -19,7 +19,7 @@ */ /** - * \file htdocs/lib/agenda.lib.php + * \file htdocs/core/lib/agenda.lib.php * \brief Set of function for the agenda module */ diff --git a/htdocs/lib/bank.lib.php b/htdocs/core/lib/bank.lib.php similarity index 99% rename from htdocs/lib/bank.lib.php rename to htdocs/core/lib/bank.lib.php index ccd931659e8..0ac206dea1f 100644 --- a/htdocs/lib/bank.lib.php +++ b/htdocs/core/lib/bank.lib.php @@ -17,7 +17,7 @@ */ /** - * \file htdocs/lib/bank.lib.php + * \file htdocs/core/lib/bank.lib.php * \brief Ensemble de fonctions de base pour le module banque * \ingroup banque */ diff --git a/htdocs/lib/bookmark.lib.php b/htdocs/core/lib/bookmark.lib.php similarity index 97% rename from htdocs/lib/bookmark.lib.php rename to htdocs/core/lib/bookmark.lib.php index ea87b9957c9..33bcfb97c50 100644 --- a/htdocs/lib/bookmark.lib.php +++ b/htdocs/core/lib/bookmark.lib.php @@ -17,7 +17,7 @@ */ /** - * \file htdocs/lib/bookmark.lib.php + * \file htdocs/core/lib/bookmark.lib.php * \brief List of functions for bookmark module */ diff --git a/htdocs/lib/categories.lib.php b/htdocs/core/lib/categories.lib.php similarity index 97% rename from htdocs/lib/categories.lib.php rename to htdocs/core/lib/categories.lib.php index 6d28390aaea..b2db2f04d3a 100644 --- a/htdocs/lib/categories.lib.php +++ b/htdocs/core/lib/categories.lib.php @@ -17,7 +17,7 @@ */ /** - * \file htdocs/lib/categories.lib.php + * \file htdocs/core/lib/categories.lib.php * \brief Ensemble de fonctions de base pour le module categorie * \ingroup categorie */ diff --git a/htdocs/lib/company.lib.php b/htdocs/core/lib/company.lib.php similarity index 99% rename from htdocs/lib/company.lib.php rename to htdocs/core/lib/company.lib.php index 602c6026bb2..16059e6fbe3 100644 --- a/htdocs/lib/company.lib.php +++ b/htdocs/core/lib/company.lib.php @@ -20,7 +20,7 @@ */ /** - * \file htdocs/lib/company.lib.php + * \file htdocs/core/lib/company.lib.php * \brief Ensemble de fonctions de base pour le module societe * \ingroup societe */ diff --git a/htdocs/lib/date.lib.php b/htdocs/core/lib/date.lib.php similarity index 99% rename from htdocs/lib/date.lib.php rename to htdocs/core/lib/date.lib.php index 1ff08b2a32c..e368943cced 100644 --- a/htdocs/lib/date.lib.php +++ b/htdocs/core/lib/date.lib.php @@ -19,7 +19,7 @@ */ /** - * \file htdocs/lib/date.lib.php + * \file htdocs/core/lib/date.lib.php * \brief Set of function to manipulate dates */ diff --git a/htdocs/externalsite/admin/externalsite.php b/htdocs/externalsite/admin/externalsite.php index ea6a948f0e4..45fdf290314 100644 --- a/htdocs/externalsite/admin/externalsite.php +++ b/htdocs/externalsite/admin/externalsite.php @@ -27,7 +27,7 @@ */ require("../../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php"); if (!$user->admin) diff --git a/htdocs/fichinter/fiche.php b/htdocs/fichinter/fiche.php index c363ebe24df..5535aeaffba 100644 --- a/htdocs/fichinter/fiche.php +++ b/htdocs/fichinter/fiche.php @@ -29,7 +29,7 @@ require_once(DOL_DOCUMENT_ROOT."/core/class/html.formfile.class.php"); require_once(DOL_DOCUMENT_ROOT."/fichinter/class/fichinter.class.php"); require_once(DOL_DOCUMENT_ROOT."/includes/modules/fichinter/modules_fichinter.php"); require_once(DOL_DOCUMENT_ROOT."/lib/fichinter.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/date.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/date.lib.php"); if ($conf->projet->enabled) { require_once(DOL_DOCUMENT_ROOT."/lib/project.lib.php"); diff --git a/htdocs/fichinter/list.php b/htdocs/fichinter/list.php index 1599895b62c..52d07817a06 100755 --- a/htdocs/fichinter/list.php +++ b/htdocs/fichinter/list.php @@ -27,7 +27,7 @@ require("../main.inc.php"); require_once(DOL_DOCUMENT_ROOT."/contact/class/contact.class.php"); require_once(DOL_DOCUMENT_ROOT."/fichinter/class/fichinter.class.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/date.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/date.lib.php"); $langs->load("companies"); $langs->load("interventions"); diff --git a/htdocs/fourn/facture/index.php b/htdocs/fourn/facture/index.php index 74403679d83..0fe0af9422c 100644 --- a/htdocs/fourn/facture/index.php +++ b/htdocs/fourn/facture/index.php @@ -27,7 +27,7 @@ require("../../main.inc.php"); require_once(DOL_DOCUMENT_ROOT."/fourn/class/fournisseur.facture.class.php"); require_once(DOL_DOCUMENT_ROOT."/fourn/class/fournisseur.class.php"); require_once(DOL_DOCUMENT_ROOT."/core/class/html.formother.class.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/date.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/date.lib.php"); if (!$user->rights->fournisseur->facture->lire) accessforbidden(); diff --git a/htdocs/fourn/fiche.php b/htdocs/fourn/fiche.php index a8b19441f90..a9a45f3c432 100644 --- a/htdocs/fourn/fiche.php +++ b/htdocs/fourn/fiche.php @@ -29,7 +29,7 @@ require("../main.inc.php"); require_once(DOL_DOCUMENT_ROOT."/fourn/class/fournisseur.class.php"); require_once(DOL_DOCUMENT_ROOT."/fourn/class/fournisseur.facture.class.php"); require_once(DOL_DOCUMENT_ROOT."/contact/class/contact.class.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/company.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/company.lib.php"); if ($conf->adherent->enabled) require_once(DOL_DOCUMENT_ROOT."/adherents/class/adherent.class.php"); $langs->load('suppliers'); diff --git a/htdocs/fourn/recap-fourn.php b/htdocs/fourn/recap-fourn.php index 8d63eaa3f18..78b9f4fa290 100644 --- a/htdocs/fourn/recap-fourn.php +++ b/htdocs/fourn/recap-fourn.php @@ -23,7 +23,7 @@ */ require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/company.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/company.lib.php"); require_once(DOL_DOCUMENT_ROOT."/fourn/class/fournisseur.facture.class.php"); $langs->load("companies"); diff --git a/htdocs/ftp/admin/ftpclient.php b/htdocs/ftp/admin/ftpclient.php index ce26f3f3ab2..353714bc5bb 100644 --- a/htdocs/ftp/admin/ftpclient.php +++ b/htdocs/ftp/admin/ftpclient.php @@ -23,7 +23,7 @@ */ require("../../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php"); $langs->load("admin"); $langs->load("ftp"); diff --git a/htdocs/includes/modules/DolibarrModules.class.php b/htdocs/includes/modules/DolibarrModules.class.php index bb5e7745995..e2a667d07b8 100644 --- a/htdocs/includes/modules/DolibarrModules.class.php +++ b/htdocs/includes/modules/DolibarrModules.class.php @@ -492,7 +492,7 @@ abstract class DolibarrModules $error=0; - include_once(DOL_DOCUMENT_ROOT ."/lib/admin.lib.php"); + include_once(DOL_DOCUMENT_ROOT ."/core/lib/admin.lib.php"); $ok = 1; foreach($conf->file->dol_document_root as $dirroot) diff --git a/htdocs/includes/modules/action/rapport.pdf.php b/htdocs/includes/modules/action/rapport.pdf.php index b4dbcc02486..fd19bca4b20 100644 --- a/htdocs/includes/modules/action/rapport.pdf.php +++ b/htdocs/includes/modules/action/rapport.pdf.php @@ -25,8 +25,8 @@ */ require_once(DOL_DOCUMENT_ROOT.'/lib/pdf.lib.php'); -require_once(DOL_DOCUMENT_ROOT.'/lib/date.lib.php'); -require_once(DOL_DOCUMENT_ROOT."/lib/company.lib.php"); +require_once(DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php'); +require_once(DOL_DOCUMENT_ROOT."/core/lib/company.lib.php"); /** * \class CommActionRapport diff --git a/htdocs/includes/modules/cheque/pdf/pdf_blochet.class.php b/htdocs/includes/modules/cheque/pdf/pdf_blochet.class.php index 3acd5771307..ab1fee40f44 100644 --- a/htdocs/includes/modules/cheque/pdf/pdf_blochet.class.php +++ b/htdocs/includes/modules/cheque/pdf/pdf_blochet.class.php @@ -24,7 +24,7 @@ */ require_once(DOL_DOCUMENT_ROOT.'/lib/pdf.lib.php'); -require_once(DOL_DOCUMENT_ROOT."/lib/company.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/company.lib.php"); require_once(DOL_DOCUMENT_ROOT."/includes/modules/cheque/pdf/modules_chequereceipts.php"); diff --git a/htdocs/includes/modules/commande/pdf_edison.modules.php b/htdocs/includes/modules/commande/pdf_edison.modules.php index 587c5eb490f..688081802a3 100644 --- a/htdocs/includes/modules/commande/pdf_edison.modules.php +++ b/htdocs/includes/modules/commande/pdf_edison.modules.php @@ -26,7 +26,7 @@ */ require_once(DOL_DOCUMENT_ROOT ."/includes/modules/commande/modules_commande.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/company.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/company.lib.php"); require_once(DOL_DOCUMENT_ROOT.'/lib/pdf.lib.php'); /** diff --git a/htdocs/includes/modules/commande/pdf_einstein.modules.php b/htdocs/includes/modules/commande/pdf_einstein.modules.php index c0dc9e8668f..4c79ca7a720 100644 --- a/htdocs/includes/modules/commande/pdf_einstein.modules.php +++ b/htdocs/includes/modules/commande/pdf_einstein.modules.php @@ -28,7 +28,7 @@ require_once(DOL_DOCUMENT_ROOT ."/includes/modules/commande/modules_commande.php"); require_once(DOL_DOCUMENT_ROOT."/product/class/product.class.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/company.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/company.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/functions2.lib.php"); require_once(DOL_DOCUMENT_ROOT.'/lib/pdf.lib.php'); diff --git a/htdocs/includes/modules/dons/html_cerfafr.modules.php b/htdocs/includes/modules/dons/html_cerfafr.modules.php index 64b8a301101..c4577c9a217 100644 --- a/htdocs/includes/modules/dons/html_cerfafr.modules.php +++ b/htdocs/includes/modules/dons/html_cerfafr.modules.php @@ -23,7 +23,7 @@ */ require_once(DOL_DOCUMENT_ROOT."/includes/modules/dons/modules_don.php"); require_once(DOL_DOCUMENT_ROOT."/compta/dons/class/don.class.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/company.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/company.lib.php"); /** diff --git a/htdocs/includes/modules/expedition/pdf/pdf_expedition_merou.modules.php b/htdocs/includes/modules/expedition/pdf/pdf_expedition_merou.modules.php index 24192d52c20..0591e8b8524 100644 --- a/htdocs/includes/modules/expedition/pdf/pdf_expedition_merou.modules.php +++ b/htdocs/includes/modules/expedition/pdf/pdf_expedition_merou.modules.php @@ -26,7 +26,7 @@ require_once DOL_DOCUMENT_ROOT."/includes/modules/expedition/pdf/ModelePdfExpedition.class.php"; require_once DOL_DOCUMENT_ROOT."/contact/class/contact.class.php"; -require_once(DOL_DOCUMENT_ROOT."/lib/company.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/company.lib.php"); require_once(DOL_DOCUMENT_ROOT.'/lib/pdf.lib.php'); diff --git a/htdocs/includes/modules/expedition/pdf/pdf_expedition_rouget.modules.php b/htdocs/includes/modules/expedition/pdf/pdf_expedition_rouget.modules.php index b3e33b9fedd..9e59b31d7a8 100644 --- a/htdocs/includes/modules/expedition/pdf/pdf_expedition_rouget.modules.php +++ b/htdocs/includes/modules/expedition/pdf/pdf_expedition_rouget.modules.php @@ -25,7 +25,7 @@ */ require_once DOL_DOCUMENT_ROOT."/includes/modules/expedition/pdf/ModelePdfExpedition.class.php"; -require_once(DOL_DOCUMENT_ROOT."/lib/company.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/company.lib.php"); require_once(DOL_DOCUMENT_ROOT.'/lib/pdf.lib.php'); diff --git a/htdocs/includes/modules/facture/doc/doc_generic_invoice_odt.modules.php b/htdocs/includes/modules/facture/doc/doc_generic_invoice_odt.modules.php index 1081fb13508..bf83dd74d1a 100644 --- a/htdocs/includes/modules/facture/doc/doc_generic_invoice_odt.modules.php +++ b/htdocs/includes/modules/facture/doc/doc_generic_invoice_odt.modules.php @@ -25,7 +25,7 @@ require_once(DOL_DOCUMENT_ROOT."/includes/modules/facture/modules_facture.php"); require_once(DOL_DOCUMENT_ROOT."/product/class/product.class.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/company.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/company.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/functions2.lib.php"); require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php"); diff --git a/htdocs/includes/modules/facture/doc/pdf_crabe.modules.php b/htdocs/includes/modules/facture/doc/pdf_crabe.modules.php index 393dbdb3047..a6bae3cfcaa 100755 --- a/htdocs/includes/modules/facture/doc/pdf_crabe.modules.php +++ b/htdocs/includes/modules/facture/doc/pdf_crabe.modules.php @@ -28,7 +28,7 @@ require_once(DOL_DOCUMENT_ROOT."/includes/modules/facture/modules_facture.php"); require_once(DOL_DOCUMENT_ROOT."/product/class/product.class.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/company.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/company.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/functions2.lib.php"); require_once(DOL_DOCUMENT_ROOT.'/lib/pdf.lib.php'); diff --git a/htdocs/includes/modules/facture/doc/pdf_oursin.modules.php b/htdocs/includes/modules/facture/doc/pdf_oursin.modules.php index f54fb724b64..699ad259d2e 100755 --- a/htdocs/includes/modules/facture/doc/pdf_oursin.modules.php +++ b/htdocs/includes/modules/facture/doc/pdf_oursin.modules.php @@ -29,7 +29,7 @@ require_once(DOL_DOCUMENT_ROOT."/product/class/product.class.php"); require_once(DOL_DOCUMENT_ROOT."/includes/modules/facture/modules_facture.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/company.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/company.lib.php"); require_once(DOL_DOCUMENT_ROOT.'/lib/pdf.lib.php'); diff --git a/htdocs/includes/modules/fichinter/pdf_soleil.modules.php b/htdocs/includes/modules/fichinter/pdf_soleil.modules.php index e7cb9256dcd..67c8e7c5e7f 100644 --- a/htdocs/includes/modules/fichinter/pdf_soleil.modules.php +++ b/htdocs/includes/modules/fichinter/pdf_soleil.modules.php @@ -25,9 +25,9 @@ * \brief Fichier de la classe permettant de generer les fiches d'intervention au modele Soleil */ require_once(DOL_DOCUMENT_ROOT."/includes/modules/fichinter/modules_fichinter.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/company.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/company.lib.php"); require_once(DOL_DOCUMENT_ROOT.'/lib/pdf.lib.php'); -require_once(DOL_DOCUMENT_ROOT.'/lib/date.lib.php'); +require_once(DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php'); /** diff --git a/htdocs/includes/modules/livraison/pdf/pdf_sirocco.modules.php b/htdocs/includes/modules/livraison/pdf/pdf_sirocco.modules.php index 8c469e0c147..1d68409a95c 100644 --- a/htdocs/includes/modules/livraison/pdf/pdf_sirocco.modules.php +++ b/htdocs/includes/modules/livraison/pdf/pdf_sirocco.modules.php @@ -26,7 +26,7 @@ */ require_once(DOL_DOCUMENT_ROOT."/includes/modules/livraison/modules_livraison.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/company.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/company.lib.php"); require_once(DOL_DOCUMENT_ROOT.'/lib/pdf.lib.php'); diff --git a/htdocs/includes/modules/livraison/pdf/pdf_typhon.modules.php b/htdocs/includes/modules/livraison/pdf/pdf_typhon.modules.php index 9cf0110f305..67613fa5fef 100644 --- a/htdocs/includes/modules/livraison/pdf/pdf_typhon.modules.php +++ b/htdocs/includes/modules/livraison/pdf/pdf_typhon.modules.php @@ -28,7 +28,7 @@ require_once(DOL_DOCUMENT_ROOT."/includes/modules/livraison/modules_livraison.php"); require_once(DOL_DOCUMENT_ROOT."/livraison/class/livraison.class.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/company.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/company.lib.php"); require_once(DOL_DOCUMENT_ROOT.'/lib/pdf.lib.php'); diff --git a/htdocs/includes/modules/modAdherent.class.php b/htdocs/includes/modules/modAdherent.class.php index b52c26b60ce..a9e3ccf0ace 100644 --- a/htdocs/includes/modules/modAdherent.class.php +++ b/htdocs/includes/modules/modAdherent.class.php @@ -205,7 +205,7 @@ class modAdherent extends DolibarrModules $r=0; $now=dol_now(); - require_once(DOL_DOCUMENT_ROOT."/lib/date.lib.php"); + require_once(DOL_DOCUMENT_ROOT."/core/lib/date.lib.php"); $r++; $this->import_code[$r]=$this->rights_class.'_'.$r; diff --git a/htdocs/includes/modules/project/pdf/pdf_baleine.modules.php b/htdocs/includes/modules/project/pdf/pdf_baleine.modules.php index a5ef42508a5..a233662a042 100644 --- a/htdocs/includes/modules/project/pdf/pdf_baleine.modules.php +++ b/htdocs/includes/modules/project/pdf/pdf_baleine.modules.php @@ -26,7 +26,7 @@ require_once(DOL_DOCUMENT_ROOT."/includes/modules/project/modules_project.php"); require_once(DOL_DOCUMENT_ROOT."/projet/class/project.class.php"); require_once(DOL_DOCUMENT_ROOT."/projet/class/task.class.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/company.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/company.lib.php"); require_once(DOL_DOCUMENT_ROOT.'/lib/pdf.lib.php'); diff --git a/htdocs/includes/modules/propale/pdf_propale_azur.modules.php b/htdocs/includes/modules/propale/pdf_propale_azur.modules.php index 1c8e7f38bb8..ec4fcde4cfb 100644 --- a/htdocs/includes/modules/propale/pdf_propale_azur.modules.php +++ b/htdocs/includes/modules/propale/pdf_propale_azur.modules.php @@ -27,7 +27,7 @@ */ require_once(DOL_DOCUMENT_ROOT."/includes/modules/propale/modules_propale.php"); require_once(DOL_DOCUMENT_ROOT."/product/class/product.class.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/company.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/company.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/functions2.lib.php"); require_once(DOL_DOCUMENT_ROOT.'/lib/pdf.lib.php'); diff --git a/htdocs/includes/modules/propale/pdf_propale_jaune.modules.php b/htdocs/includes/modules/propale/pdf_propale_jaune.modules.php index c187a2757f5..1fd06d31b0b 100644 --- a/htdocs/includes/modules/propale/pdf_propale_jaune.modules.php +++ b/htdocs/includes/modules/propale/pdf_propale_jaune.modules.php @@ -27,7 +27,7 @@ */ require_once(DOL_DOCUMENT_ROOT."/includes/modules/propale/modules_propale.php"); require_once(DOL_DOCUMENT_ROOT."/product/class/product.class.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/company.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/company.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/functions2.lib.php"); require_once(DOL_DOCUMENT_ROOT.'/lib/pdf.lib.php'); diff --git a/htdocs/includes/modules/rapport/pdf_paiement.class.php b/htdocs/includes/modules/rapport/pdf_paiement.class.php index 8b05950d414..716974270eb 100644 --- a/htdocs/includes/modules/rapport/pdf_paiement.class.php +++ b/htdocs/includes/modules/rapport/pdf_paiement.class.php @@ -23,7 +23,7 @@ * \brief File to build payment reports */ require_once(DOL_DOCUMENT_ROOT.'/lib/pdf.lib.php'); -require_once(DOL_DOCUMENT_ROOT."/lib/company.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/company.lib.php"); /** @@ -74,7 +74,7 @@ class pdf_paiement */ function write_file($_dir, $month, $year, $outputlangs) { - include_once(DOL_DOCUMENT_ROOT.'/lib/date.lib.php'); + include_once(DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php'); global $user,$langs,$conf; diff --git a/htdocs/includes/modules/societe/doc/doc_generic_odt.modules.php b/htdocs/includes/modules/societe/doc/doc_generic_odt.modules.php index d5445f970c9..a336fd0c1ca 100644 --- a/htdocs/includes/modules/societe/doc/doc_generic_odt.modules.php +++ b/htdocs/includes/modules/societe/doc/doc_generic_odt.modules.php @@ -25,7 +25,7 @@ require_once(DOL_DOCUMENT_ROOT."/includes/modules/societe/modules_societe.class.php"); require_once(DOL_DOCUMENT_ROOT."/societe/class/societe.class.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/company.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/company.lib.php"); require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php"); diff --git a/htdocs/includes/modules/supplier_invoice/pdf/pdf_canelle.modules.php b/htdocs/includes/modules/supplier_invoice/pdf/pdf_canelle.modules.php index 73ea0760690..80fe0c7a626 100755 --- a/htdocs/includes/modules/supplier_invoice/pdf/pdf_canelle.modules.php +++ b/htdocs/includes/modules/supplier_invoice/pdf/pdf_canelle.modules.php @@ -26,7 +26,7 @@ require_once(DOL_DOCUMENT_ROOT."/includes/modules/supplier_invoice/modules_facturefournisseur.php"); require_once(DOL_DOCUMENT_ROOT."/fourn/class/fournisseur.facture.class.php"); require_once(DOL_DOCUMENT_ROOT."/product/class/product.class.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/company.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/company.lib.php"); require_once(DOL_DOCUMENT_ROOT.'/lib/pdf.lib.php'); diff --git a/htdocs/includes/modules/supplier_order/pdf/pdf_muscadet.modules.php b/htdocs/includes/modules/supplier_order/pdf/pdf_muscadet.modules.php index 108acd8e506..e338475274a 100644 --- a/htdocs/includes/modules/supplier_order/pdf/pdf_muscadet.modules.php +++ b/htdocs/includes/modules/supplier_order/pdf/pdf_muscadet.modules.php @@ -28,7 +28,7 @@ require_once(DOL_DOCUMENT_ROOT."/includes/modules/supplier_order/modules_commandefournisseur.php"); require_once(DOL_DOCUMENT_ROOT."/fourn/class/fournisseur.commande.class.php"); require_once(DOL_DOCUMENT_ROOT."/product/class/product.class.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/company.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/company.lib.php"); require_once(DOL_DOCUMENT_ROOT.'/lib/pdf.lib.php'); diff --git a/htdocs/install/check.php b/htdocs/install/check.php index df105d458e9..ab473201867 100644 --- a/htdocs/install/check.php +++ b/htdocs/install/check.php @@ -272,14 +272,14 @@ else include_once($conffile); if (! empty($dolibarr_main_db_type) && ! empty($dolibarr_main_document_root)) { - if (! file_exists($dolibarr_main_document_root."/lib/admin.lib.php")) + if (! file_exists($dolibarr_main_document_root."/core/lib/admin.lib.php")) { print 'A '.$conffiletoshow.' file exists with a dolibarr_main_document_root to '.$dolibarr_main_document_root.' that seems wrong. Try to fix or remove the '.$conffiletoshow.' file.
'."\n"; dol_syslog("A '.$conffiletoshow.' file exists with a dolibarr_main_document_root to ".$dolibarr_main_document_root." that seems wrong. Try to fix or remove the '.$conffiletoshow.' file.", LOG_WARNING); } else { - require_once($dolibarr_main_document_root."/lib/admin.lib.php"); + require_once($dolibarr_main_document_root."/core/lib/admin.lib.php"); // $conf is already instancied inside inc.php $conf->db->type = $dolibarr_main_db_type; diff --git a/htdocs/install/etape2.php b/htdocs/install/etape2.php index cbaa34e7e52..865989f9e61 100644 --- a/htdocs/install/etape2.php +++ b/htdocs/install/etape2.php @@ -24,7 +24,7 @@ include("./inc.php"); require_once($dolibarr_main_document_root."/core/class/conf.class.php"); -require_once($dolibarr_main_document_root."/lib/admin.lib.php"); +require_once($dolibarr_main_document_root."/core/lib/admin.lib.php"); $etape = 2; $ok = 0; diff --git a/htdocs/install/etape4.php b/htdocs/install/etape4.php index d022fcba77a..d9f27fe4e32 100644 --- a/htdocs/install/etape4.php +++ b/htdocs/install/etape4.php @@ -27,7 +27,7 @@ include_once("./inc.php"); require_once($dolibarr_main_document_root."/core/class/conf.class.php"); -require_once($dolibarr_main_document_root."/lib/admin.lib.php"); +require_once($dolibarr_main_document_root."/core/lib/admin.lib.php"); $setuplang=isset($_POST["selectlang"])?$_POST["selectlang"]:(isset($_GET["selectlang"])?$_GET["selectlang"]:'auto'); diff --git a/htdocs/install/etape5.php b/htdocs/install/etape5.php index 19387092ef8..539ad68e0bd 100644 --- a/htdocs/install/etape5.php +++ b/htdocs/install/etape5.php @@ -27,7 +27,7 @@ include_once("./inc.php"); if (file_exists($conffile)) include_once($conffile); -require_once($dolibarr_main_document_root . "/lib/admin.lib.php"); +require_once($dolibarr_main_document_root . "/core/lib/admin.lib.php"); $setuplang=isset($_POST["selectlang"])?$_POST["selectlang"]:(isset($_GET["selectlang"])?$_GET["selectlang"]:'auto'); diff --git a/htdocs/install/inc.php b/htdocs/install/inc.php index 72601c80903..e4c5a8d79a9 100644 --- a/htdocs/install/inc.php +++ b/htdocs/install/inc.php @@ -36,7 +36,7 @@ if (! defined('ADODB_PATH')) require_once('../core/class/translate.class.php'); require_once('../lib/functions.lib.php'); -require_once('../lib/admin.lib.php'); +require_once('../core/lib/admin.lib.php'); require_once('../lib/files.lib.php'); require_once(ADODB_PATH.'adodb-time.inc.php'); diff --git a/htdocs/install/repair.php b/htdocs/install/repair.php index 317515631ea..2524d66395f 100644 --- a/htdocs/install/repair.php +++ b/htdocs/install/repair.php @@ -24,7 +24,7 @@ include_once("./inc.php"); if (file_exists($conffile)) include_once($conffile); -require_once($dolibarr_main_document_root."/lib/admin.lib.php"); +require_once($dolibarr_main_document_root."/core/lib/admin.lib.php"); $grant_query=''; diff --git a/htdocs/install/upgrade.php b/htdocs/install/upgrade.php index 4f865e86709..08d00535bdf 100644 --- a/htdocs/install/upgrade.php +++ b/htdocs/install/upgrade.php @@ -28,7 +28,7 @@ if (! file_exists($conffile)) print 'Error: Dolibarr config file was not found. This may means that Dolibarr is not installed yet. Please call the page "/install/index.php" instead of "/install/upgrade.php").'; } require_once($conffile); if (! isset($dolibarr_main_db_type)) $dolibarr_main_db_type='mysql'; // For backward compatibility -require_once($dolibarr_main_document_root."/lib/admin.lib.php"); +require_once($dolibarr_main_document_root."/core/lib/admin.lib.php"); $grant_query=''; $etape = 2; diff --git a/htdocs/lib/xcal.lib.php b/htdocs/lib/xcal.lib.php index d40c0dfa723..e26f04bfa6d 100644 --- a/htdocs/lib/xcal.lib.php +++ b/htdocs/lib/xcal.lib.php @@ -44,7 +44,7 @@ function build_calfile($format,$title,$desc,$events_array,$outputfile) $calfileh=fopen($outputfile,'w'); if ($calfileh) { - include_once(DOL_DOCUMENT_ROOT.'/lib/date.lib.php'); + include_once(DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php'); $now=dol_now(); $encoding=''; diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php index b4e23e205b5..9a616773075 100644 --- a/htdocs/main.inc.php +++ b/htdocs/main.inc.php @@ -242,7 +242,7 @@ if ((! empty($conf->global->MAIN_VERSION_LAST_UPGRADE) && ($conf->global->MAIN_V || (empty($conf->global->MAIN_VERSION_LAST_UPGRADE) && ! empty($conf->global->MAIN_VERSION_LAST_INSTALL) && ($conf->global->MAIN_VERSION_LAST_INSTALL != DOL_VERSION))) { $versiontocompare=empty($conf->global->MAIN_VERSION_LAST_UPGRADE)?$conf->global->MAIN_VERSION_LAST_INSTALL:$conf->global->MAIN_VERSION_LAST_UPGRADE; - require_once(DOL_DOCUMENT_ROOT ."/lib/admin.lib.php"); + require_once(DOL_DOCUMENT_ROOT ."/core/lib/admin.lib.php"); $dolibarrversionlastupgrade=preg_split('/[.-]/',$versiontocompare); $dolibarrversionprogram=preg_split('/[.-]/',DOL_VERSION); $rescomp=versioncompare($dolibarrversionprogram,$dolibarrversionlastupgrade); diff --git a/htdocs/master.inc.php b/htdocs/master.inc.php index b1293ff87c9..4f6c1568522 100644 --- a/htdocs/master.inc.php +++ b/htdocs/master.inc.php @@ -230,7 +230,7 @@ if (! defined('NOREQUIREDB') && ! defined('NOREQUIRESOC')) else // For backward compatibility { dol_syslog("Your country setup use an old syntax. Reedit it in setup area.", LOG_WARNING); - include_once(DOL_DOCUMENT_ROOT.'/lib/company.lib.php'); + include_once(DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php'); $country_code=getCountry($country_id,2,$db); // This need a SQL request, but it's the old feature $country_label=getCountry($country_id,0,$db); // This need a SQL request, but it's the old feature } diff --git a/htdocs/paybox/admin/paybox.php b/htdocs/paybox/admin/paybox.php index d25c26e1ae2..c6f0966ed66 100644 --- a/htdocs/paybox/admin/paybox.php +++ b/htdocs/paybox/admin/paybox.php @@ -24,7 +24,7 @@ */ require("../../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/class/doleditor.class.php"); $servicename='PayBox'; diff --git a/htdocs/paypal/admin/paypal.php b/htdocs/paypal/admin/paypal.php index 568c0a56d75..f9ad8560629 100644 --- a/htdocs/paypal/admin/paypal.php +++ b/htdocs/paypal/admin/paypal.php @@ -26,7 +26,7 @@ require("../../main.inc.php"); require_once(DOL_DOCUMENT_ROOT."/paypal/lib/paypal.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/class/doleditor.class.php"); $servicename='PayPal'; diff --git a/htdocs/product/admin/produit.php b/htdocs/product/admin/produit.php index 1f39bc3981f..dc0b77299cc 100644 --- a/htdocs/product/admin/produit.php +++ b/htdocs/product/admin/produit.php @@ -27,7 +27,7 @@ */ require("../../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php"); require_once(DOL_DOCUMENT_ROOT."/includes/barcode/html.formbarcode.class.php"); $langs->load("admin"); diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php index 08828d267c5..d8b33fb3c1f 100644 --- a/htdocs/product/class/product.class.php +++ b/htdocs/product/class/product.class.php @@ -1009,7 +1009,7 @@ class Product extends CommonObject */ function fetch($id='',$ref='',$ref_ext='') { - include_once(DOL_DOCUMENT_ROOT.'/lib/company.lib.php'); + include_once(DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php'); global $langs, $conf; diff --git a/htdocs/product/fiche.php b/htdocs/product/fiche.php index e4df1b3e2d8..bfb377c58cf 100644 --- a/htdocs/product/fiche.php +++ b/htdocs/product/fiche.php @@ -33,7 +33,7 @@ require_once(DOL_DOCUMENT_ROOT."/product/class/product.class.php"); require_once(DOL_DOCUMENT_ROOT."/product/class/html.formproduct.class.php"); require_once(DOL_DOCUMENT_ROOT."/core/class/extrafields.class.php"); require_once(DOL_DOCUMENT_ROOT."/lib/product.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/company.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/company.lib.php"); if ($conf->propal->enabled) require_once(DOL_DOCUMENT_ROOT."/comm/propal/class/propal.class.php"); if ($conf->facture->enabled) require_once(DOL_DOCUMENT_ROOT."/compta/facture/class/facture.class.php"); if ($conf->commande->enabled) require_once(DOL_DOCUMENT_ROOT."/commande/class/commande.class.php"); diff --git a/htdocs/product/stock/mouvement.php b/htdocs/product/stock/mouvement.php index 57ac3354853..cb7a9162f74 100644 --- a/htdocs/product/stock/mouvement.php +++ b/htdocs/product/stock/mouvement.php @@ -29,7 +29,7 @@ require_once(DOL_DOCUMENT_ROOT."/product/class/product.class.php"); require_once(DOL_DOCUMENT_ROOT."/core/class/html.formother.class.php"); require_once(DOL_DOCUMENT_ROOT."/lib/stock.lib.php"); require_once(DOL_DOCUMENT_ROOT."/lib/product.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/date.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/date.lib.php"); $langs->load("products"); $langs->load("stocks"); diff --git a/htdocs/projet/activity/index.php b/htdocs/projet/activity/index.php index d1252ed31cd..1bc200e92c5 100644 --- a/htdocs/projet/activity/index.php +++ b/htdocs/projet/activity/index.php @@ -27,7 +27,7 @@ require ("../../main.inc.php"); require_once(DOL_DOCUMENT_ROOT."/projet/class/project.class.php"); require_once(DOL_DOCUMENT_ROOT."/projet/class/task.class.php"); require_once(DOL_DOCUMENT_ROOT."/lib/project.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/date.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/date.lib.php"); $mine = $_REQUEST['mode']=='mine' ? 1 : 0; diff --git a/htdocs/projet/activity/list.php b/htdocs/projet/activity/list.php index 83168a5435b..b109004ab83 100644 --- a/htdocs/projet/activity/list.php +++ b/htdocs/projet/activity/list.php @@ -28,7 +28,7 @@ require ("../../main.inc.php"); require_once(DOL_DOCUMENT_ROOT."/projet/class/project.class.php"); require_once(DOL_DOCUMENT_ROOT."/projet/class/task.class.php"); require_once(DOL_DOCUMENT_ROOT."/lib/project.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/date.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/date.lib.php"); $langs->load('projects'); diff --git a/htdocs/projet/ganttview.php b/htdocs/projet/ganttview.php index 62aa7cf5b67..789dba883d4 100644 --- a/htdocs/projet/ganttview.php +++ b/htdocs/projet/ganttview.php @@ -27,7 +27,7 @@ require ("../main.inc.php"); require_once(DOL_DOCUMENT_ROOT."/projet/class/project.class.php"); require_once(DOL_DOCUMENT_ROOT."/projet/class/task.class.php"); require_once(DOL_DOCUMENT_ROOT."/lib/project.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/date.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/date.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/class/html.formother.class.php"); $projectid=isset($_REQUEST["id"])?$_REQUEST["id"]:$_POST["id"]; diff --git a/htdocs/projet/tasks.php b/htdocs/projet/tasks.php index cd69514b32f..345c161c4d6 100644 --- a/htdocs/projet/tasks.php +++ b/htdocs/projet/tasks.php @@ -27,7 +27,7 @@ require ("../main.inc.php"); require_once(DOL_DOCUMENT_ROOT."/projet/class/project.class.php"); require_once(DOL_DOCUMENT_ROOT."/projet/class/task.class.php"); require_once(DOL_DOCUMENT_ROOT."/lib/project.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/date.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/date.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/class/html.formother.class.php"); $mine = $_REQUEST['mode']=='mine' ? 1 : 0; diff --git a/htdocs/projet/tasks/index.php b/htdocs/projet/tasks/index.php index 7eeddae234c..335d8622869 100644 --- a/htdocs/projet/tasks/index.php +++ b/htdocs/projet/tasks/index.php @@ -27,7 +27,7 @@ require ("../../main.inc.php"); require_once(DOL_DOCUMENT_ROOT."/projet/class/project.class.php"); require_once(DOL_DOCUMENT_ROOT."/projet/class/task.class.php"); require_once(DOL_DOCUMENT_ROOT."/lib/project.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/date.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/date.lib.php"); $langs->load('projects'); $langs->load('users'); diff --git a/htdocs/projet/tasks/time.php b/htdocs/projet/tasks/time.php index 55e249445ec..4aab61e1a62 100644 --- a/htdocs/projet/tasks/time.php +++ b/htdocs/projet/tasks/time.php @@ -28,7 +28,7 @@ require("../../main.inc.php"); require_once(DOL_DOCUMENT_ROOT."/projet/class/project.class.php"); require_once(DOL_DOCUMENT_ROOT."/projet/class/task.class.php"); require_once(DOL_DOCUMENT_ROOT."/lib/project.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/date.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/date.lib.php"); $langs->load('projects'); diff --git a/htdocs/public/members/new.php b/htdocs/public/members/new.php index dbbbd4f0ab6..2a2a5fe79cf 100644 --- a/htdocs/public/members/new.php +++ b/htdocs/public/members/new.php @@ -41,7 +41,7 @@ require_once(DOL_DOCUMENT_ROOT."/adherents/class/adherent.class.php"); require_once(DOL_DOCUMENT_ROOT."/adherents/class/adherent_type.class.php"); require_once(DOL_DOCUMENT_ROOT."/core/class/extrafields.class.php"); require_once(DOL_DOCUMENT_ROOT."/core/class/html.formcompany.class.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/company.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/company.lib.php"); // Init vars $errmsg=''; diff --git a/htdocs/public/paybox/newpayment.php b/htdocs/public/paybox/newpayment.php index b1293cdb73f..880b69151fe 100644 --- a/htdocs/public/paybox/newpayment.php +++ b/htdocs/public/paybox/newpayment.php @@ -29,7 +29,7 @@ define("NOCSRFCHECK",1); // We accept to go on this page from external web site. require("../../main.inc.php"); require_once(DOL_DOCUMENT_ROOT."/paybox/lib/paybox.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/company.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/company.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/functions2.lib.php"); require_once(DOL_DOCUMENT_ROOT."/product/class/product.class.php"); diff --git a/htdocs/public/paybox/paymentko.php b/htdocs/public/paybox/paymentko.php index 1d93a90910f..d7c62a7e384 100644 --- a/htdocs/public/paybox/paymentko.php +++ b/htdocs/public/paybox/paymentko.php @@ -28,7 +28,7 @@ define("NOCSRFCHECK",1); // We accept to go on this page from external web site. require("../../main.inc.php"); require_once(DOL_DOCUMENT_ROOT."/paybox/lib/paybox.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/company.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/company.lib.php"); // Security check if (empty($conf->paybox->enabled)) accessforbidden('',1,1,1); diff --git a/htdocs/public/paybox/paymentok.php b/htdocs/public/paybox/paymentok.php index 5bad03905bc..0bd19318340 100644 --- a/htdocs/public/paybox/paymentok.php +++ b/htdocs/public/paybox/paymentok.php @@ -28,7 +28,7 @@ define("NOCSRFCHECK",1); // We accept to go on this page from external web site. require("../../main.inc.php"); require_once(DOL_DOCUMENT_ROOT."/paybox/lib/paybox.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/company.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/company.lib.php"); // Security check if (empty($conf->paybox->enabled)) accessforbidden('',1,1,1); diff --git a/htdocs/public/paypal/newpayment.php b/htdocs/public/paypal/newpayment.php index 38960e8db73..c5809df4cc4 100755 --- a/htdocs/public/paypal/newpayment.php +++ b/htdocs/public/paypal/newpayment.php @@ -30,7 +30,7 @@ define("NOCSRFCHECK",1); // We accept to go on this page from external web site. require("../../main.inc.php"); require_once(DOL_DOCUMENT_ROOT."/paypal/lib/paypal.lib.php"); require_once(DOL_DOCUMENT_ROOT."/paypal/lib/paypalfunctions.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/company.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/company.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/functions2.lib.php"); require_once(DOL_DOCUMENT_ROOT."/product/class/product.class.php"); diff --git a/htdocs/public/paypal/paymentko.php b/htdocs/public/paypal/paymentko.php index 1d01782cda3..57382f4309c 100755 --- a/htdocs/public/paypal/paymentko.php +++ b/htdocs/public/paypal/paymentko.php @@ -31,7 +31,7 @@ define("NOCSRFCHECK",1); // We accept to go on this page from external web site. require("../../main.inc.php"); require_once(DOL_DOCUMENT_ROOT."/paypal/lib/paypal.lib.php"); require_once(DOL_DOCUMENT_ROOT."/paypal/lib/paypalfunctions.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/company.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/company.lib.php"); // Security check if (empty($conf->paypal->enabled)) accessforbidden('',1,1,1); diff --git a/htdocs/public/paypal/paymentok.php b/htdocs/public/paypal/paymentok.php index 15530f82624..426d2539966 100755 --- a/htdocs/public/paypal/paymentok.php +++ b/htdocs/public/paypal/paymentok.php @@ -31,7 +31,7 @@ define("NOCSRFCHECK",1); // We accept to go on this page from external web site. require("../../main.inc.php"); require_once(DOL_DOCUMENT_ROOT."/paypal/lib/paypal.lib.php"); require_once(DOL_DOCUMENT_ROOT."/paypal/lib/paypalfunctions.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/company.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/company.lib.php"); // Security check if (empty($conf->paypal->enabled)) accessforbidden('',1,1,1); diff --git a/htdocs/societe/admin/societe.php b/htdocs/societe/admin/societe.php index 3a8070e3c52..b1e9e8efded 100644 --- a/htdocs/societe/admin/societe.php +++ b/htdocs/societe/admin/societe.php @@ -26,8 +26,8 @@ */ require("../../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/company.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/company.lib.php"); $langs->load("admin"); diff --git a/htdocs/societe/admin/societe_extrafields.php b/htdocs/societe/admin/societe_extrafields.php index 7f092bf3781..3975d10d458 100755 --- a/htdocs/societe/admin/societe_extrafields.php +++ b/htdocs/societe/admin/societe_extrafields.php @@ -24,7 +24,7 @@ */ require("../../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/company.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/company.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/class/extrafields.class.php"); $langs->load("companies"); @@ -52,7 +52,7 @@ if (!$user->admin) accessforbidden(); * Actions */ -require(DOL_DOCUMENT_ROOT."/lib/admin_extrafields.inc.php"); +require(DOL_DOCUMENT_ROOT."/core/admin_extrafields.inc.php"); diff --git a/htdocs/societe/agenda.php b/htdocs/societe/agenda.php index f1e98823efa..02283d0e8fb 100644 --- a/htdocs/societe/agenda.php +++ b/htdocs/societe/agenda.php @@ -61,7 +61,7 @@ $html = new Form($db); */ if ($_GET["socid"]) { - require_once(DOL_DOCUMENT_ROOT."/lib/company.lib.php"); + require_once(DOL_DOCUMENT_ROOT."/core/lib/company.lib.php"); require_once(DOL_DOCUMENT_ROOT."/societe/class/societe.class.php"); $langs->load("companies"); diff --git a/htdocs/societe/checkvat/checkVatPopup.php b/htdocs/societe/checkvat/checkVatPopup.php index 932f0cf48a7..7ebdf7c2f7e 100644 --- a/htdocs/societe/checkvat/checkVatPopup.php +++ b/htdocs/societe/checkvat/checkVatPopup.php @@ -22,7 +22,7 @@ */ require ("../../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/company.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/company.lib.php"); require_once(DOL_DOCUMENT_ROOT."/includes/nusoap/lib/nusoap.php"); $langs->load("companies"); diff --git a/htdocs/societe/commerciaux.php b/htdocs/societe/commerciaux.php index cc5c55f0810..c9998acc84b 100644 --- a/htdocs/societe/commerciaux.php +++ b/htdocs/societe/commerciaux.php @@ -24,7 +24,7 @@ */ require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/company.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/company.lib.php"); $langs->load("companies"); $langs->load("commercial"); diff --git a/htdocs/societe/document.php b/htdocs/societe/document.php index b7fcf2320ce..57c57637dca 100644 --- a/htdocs/societe/document.php +++ b/htdocs/societe/document.php @@ -25,7 +25,7 @@ */ require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/company.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/company.lib.php"); require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/images.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/class/html.formfile.class.php"); diff --git a/htdocs/societe/info.php b/htdocs/societe/info.php index d299c86991c..ab129074400 100644 --- a/htdocs/societe/info.php +++ b/htdocs/societe/info.php @@ -24,7 +24,7 @@ require("../main.inc.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/functions2.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/company.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/company.lib.php"); require_once(DOL_DOCUMENT_ROOT."/societe/class/societe.class.php"); $langs->load("companies"); diff --git a/htdocs/societe/lien.php b/htdocs/societe/lien.php index 8b8ff065331..ee9cd90fb74 100644 --- a/htdocs/societe/lien.php +++ b/htdocs/societe/lien.php @@ -24,7 +24,7 @@ */ require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/company.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/company.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/class/html.formcompany.class.php"); $langs->load("companies"); diff --git a/htdocs/societe/notify/fiche.php b/htdocs/societe/notify/fiche.php index 0b4870d91f2..bc9af371403 100644 --- a/htdocs/societe/notify/fiche.php +++ b/htdocs/societe/notify/fiche.php @@ -24,7 +24,7 @@ */ require("../../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/company.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/company.lib.php"); require_once(DOL_DOCUMENT_ROOT."/contact/class/contact.class.php"); require_once(DOL_DOCUMENT_ROOT."/includes/triggers/interface_modNotification_Notification.class.php"); diff --git a/htdocs/societe/rib.php b/htdocs/societe/rib.php index d10353e2be5..616bf860abf 100644 --- a/htdocs/societe/rib.php +++ b/htdocs/societe/rib.php @@ -25,8 +25,8 @@ */ require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/company.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/bank.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/company.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/bank.lib.php"); require_once DOL_DOCUMENT_ROOT."/societe/class/companybankaccount.class.php"; $langs->load("companies"); diff --git a/htdocs/societe/soc.php b/htdocs/societe/soc.php index 1947ec779c1..821901460d2 100644 --- a/htdocs/societe/soc.php +++ b/htdocs/societe/soc.php @@ -28,7 +28,7 @@ */ require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/company.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/company.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/images.lib.php"); require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/class/html.formadmin.class.php"); diff --git a/htdocs/societe/socnote.php b/htdocs/societe/socnote.php index 9395c90d93e..80cefe84987 100644 --- a/htdocs/societe/socnote.php +++ b/htdocs/societe/socnote.php @@ -25,7 +25,7 @@ */ require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/company.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/company.lib.php"); $action = isset($_GET["action"])?$_GET["action"]:$_POST["action"]; diff --git a/htdocs/support/inc.php b/htdocs/support/inc.php index 2bbea6c8764..c1118c35cd3 100644 --- a/htdocs/support/inc.php +++ b/htdocs/support/inc.php @@ -36,7 +36,7 @@ if (! defined('ADODB_PATH')) require_once('../core/class/translate.class.php'); require_once('../lib/functions.lib.php'); -require_once('../lib/admin.lib.php'); +require_once('../core/lib/admin.lib.php'); require_once('../lib/files.lib.php'); require_once(ADODB_PATH.'adodb-time.inc.php'); diff --git a/htdocs/webservices/admin/webservices.php b/htdocs/webservices/admin/webservices.php index b70281734b8..1d83f7a0514 100644 --- a/htdocs/webservices/admin/webservices.php +++ b/htdocs/webservices/admin/webservices.php @@ -24,7 +24,7 @@ */ require("../../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php"); $langs->load("admin"); diff --git a/htdocs/webservices/server_productorservice.php b/htdocs/webservices/server_productorservice.php index 614257ff1e1..509b0383c3a 100755 --- a/htdocs/webservices/server_productorservice.php +++ b/htdocs/webservices/server_productorservice.php @@ -283,7 +283,7 @@ function createProductOrService($authentication,$product) if (! $error) { - include_once(DOL_DOCUMENT_ROOT.'/lib/company.lib.php'); + include_once(DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php'); $newobject=new Product($db); $newobject->ref=$product['ref']; diff --git a/scripts/members/sync_members_ldap2dolibarr.php b/scripts/members/sync_members_ldap2dolibarr.php index 1a66df276ab..2f4b74ba291 100644 --- a/scripts/members/sync_members_ldap2dolibarr.php +++ b/scripts/members/sync_members_ldap2dolibarr.php @@ -42,7 +42,7 @@ $forcecommit=0; require_once($path."../../htdocs/master.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/date.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/date.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/class/ldap.class.php"); require_once(DOL_DOCUMENT_ROOT."/adherents/class/adherent.class.php"); require_once(DOL_DOCUMENT_ROOT."/adherents/class/cotisation.class.php"); diff --git a/test/phpunit/DateLibTest.php b/test/phpunit/DateLibTest.php index 9e99b77bd98..10eb4ce85e5 100644 --- a/test/phpunit/DateLibTest.php +++ b/test/phpunit/DateLibTest.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/Autoload.php'; require_once dirname(__FILE__).'/../../htdocs/master.inc.php'; -require_once dirname(__FILE__).'/../../htdocs/lib/date.lib.php'; +require_once dirname(__FILE__).'/../../htdocs/core/lib/date.lib.php'; if (empty($user->id)) { diff --git a/test/phpunit/WebservicesTest.php b/test/phpunit/WebservicesTest.php index cfc9b80d94c..6b459bc29a0 100755 --- a/test/phpunit/WebservicesTest.php +++ b/test/phpunit/WebservicesTest.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/Autoload.php'; require_once dirname(__FILE__).'/../../htdocs/master.inc.php'; -require_once dirname(__FILE__).'/../../htdocs/lib/date.lib.php'; +require_once dirname(__FILE__).'/../../htdocs/core/lib/date.lib.php'; require_once(NUSOAP_PATH.'/nusoap.php'); // Include SOAP