diff --git a/dev/skeletons/skeleton_webservice_server.php b/dev/skeletons/skeleton_webservice_server.php
index 6980c1322ec58e4acffc55167ebb7ef5fb39708a..3306d28a9f89fa562d948939758f1116786a8a71 100644
--- a/dev/skeletons/skeleton_webservice_server.php
+++ b/dev/skeletons/skeleton_webservice_server.php
@@ -26,7 +26,7 @@ set_include_path($_SERVER['DOCUMENT_ROOT'].'/htdocs');
require_once("../master.inc.php");
require_once(NUSOAP_PATH.'/nusoap.php'); // Include SOAP
-require_once(DOL_DOCUMENT_ROOT."/lib/ws.lib.php");
+require_once(DOL_DOCUMENT_ROOT."/core/lib/ws.lib.php");
require_once(DOL_DOCUMENT_ROOT."/skeleton/class/skeleton.class.php");
diff --git a/dev/translation/autotranslator.php b/dev/translation/autotranslator.php
index 17ec9feb82404b3e6f7c93a6b02d9c043c57b7e8..78d89b691a9ad013078e543b60e53fd70e594067 100644
--- a/dev/translation/autotranslator.php
+++ b/dev/translation/autotranslator.php
@@ -36,7 +36,7 @@ if (substr($sapi_type, 0, 3) == 'cgi') {
// Include Dolibarr environment
require_once($path.'../../htdocs/master.inc.php');
-require_once($path.'../../htdocs/lib/files.lib.php');
+require_once($path.'../../htdocs/core/lib/files.lib.php');
// After this $db is an opened handler to database. We close it at end of file.
// Load main language strings
diff --git a/htdocs/adherents/admin/adherent.php b/htdocs/adherents/admin/adherent.php
index 0d2da719ae8b3ca24ae6810855d6ad6e4f2c1be5..fe8dc327f41b6af206d6a34ecdcf6ca645cd6940 100644
--- a/htdocs/adherents/admin/adherent.php
+++ b/htdocs/adherents/admin/adherent.php
@@ -29,7 +29,7 @@
require("../../main.inc.php");
require_once(DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php");
-require_once(DOL_DOCUMENT_ROOT."/lib/member.lib.php");
+require_once(DOL_DOCUMENT_ROOT."/core/lib/member.lib.php");
$langs->load("admin");
$langs->load("members");
diff --git a/htdocs/adherents/admin/adherent_extrafields.php b/htdocs/adherents/admin/adherent_extrafields.php
index 6086021f0cd2e06b59335c9496ac19d6aa2b8dac..7f9d3fe1ca5ab9fc4efc971df6a1e09966bf5647 100755
--- a/htdocs/adherents/admin/adherent_extrafields.php
+++ b/htdocs/adherents/admin/adherent_extrafields.php
@@ -24,7 +24,7 @@
*/
require("../../main.inc.php");
-require_once(DOL_DOCUMENT_ROOT."/lib/member.lib.php");
+require_once(DOL_DOCUMENT_ROOT."/core/lib/member.lib.php");
require_once(DOL_DOCUMENT_ROOT."/core/class/extrafields.class.php");
$langs->load("members");
diff --git a/htdocs/adherents/admin/public.php b/htdocs/adherents/admin/public.php
index 6f4bafd51394fdae067ef1af0cb1aeed5dabd627..d40e075e46ec63f140ced17273c1bb8b9e550f75 100755
--- a/htdocs/adherents/admin/public.php
+++ b/htdocs/adherents/admin/public.php
@@ -27,7 +27,7 @@
require("../../main.inc.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");
+require_once(DOL_DOCUMENT_ROOT."/core/lib/member.lib.php");
$langs->load("members");
$langs->load("admin");
diff --git a/htdocs/adherents/card_subscriptions.php b/htdocs/adherents/card_subscriptions.php
index 445c7d302c2d9e2f87efb656582f5ecfc869a83a..43f75f7e1223f7d56de4fdff851125f33cd9b8d5 100644
--- a/htdocs/adherents/card_subscriptions.php
+++ b/htdocs/adherents/card_subscriptions.php
@@ -24,7 +24,7 @@
*/
require("../main.inc.php");
-require_once(DOL_DOCUMENT_ROOT."/lib/member.lib.php");
+require_once(DOL_DOCUMENT_ROOT."/core/lib/member.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");
@@ -372,7 +372,7 @@ if ($user->rights->adherent->cotisation->creer && $action == 'cotisation' && ! $
{
require_once(DOL_DOCUMENT_ROOT.'/compta/paiement/class/paiement.class.php');
require_once(DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php');
- require_once(DOL_DOCUMENT_ROOT.'/lib/functions.lib.php');
+ require_once(DOL_DOCUMENT_ROOT.'/core/lib/functions.lib.php');
// Creation de la ligne paiement
$amounts[$invoice->id] = price2num($cotisation);
diff --git a/htdocs/adherents/cartes/carte.php b/htdocs/adherents/cartes/carte.php
index b5602c26ce107fefc0c8be5b36fa631714594547..b3bc6a9a68f10516b94f9e87f5dcd68968446b8c 100755
--- a/htdocs/adherents/cartes/carte.php
+++ b/htdocs/adherents/cartes/carte.php
@@ -23,7 +23,7 @@
* \brief Page to output members business cards
*/
require("../../main.inc.php");
-require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php");
+require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
require_once(DOL_DOCUMENT_ROOT."/adherents/class/adherent.class.php");
require_once(DOL_DOCUMENT_ROOT."/includes/modules/member/cards/modules_cards.php");
require_once(DOL_DOCUMENT_ROOT."/includes/modules/member/labels/modules_labels.php");
diff --git a/htdocs/adherents/document.php b/htdocs/adherents/document.php
index 4111d66e0ff777aa729f0a8468053d0acef1c4a9..c6c4a9e0c4f9e48bd1b87f6623146333d0826b5d 100644
--- a/htdocs/adherents/document.php
+++ b/htdocs/adherents/document.php
@@ -25,8 +25,8 @@
*/
require("../main.inc.php");
-require_once(DOL_DOCUMENT_ROOT."/lib/member.lib.php");
-require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php");
+require_once(DOL_DOCUMENT_ROOT."/core/lib/member.lib.php");
+require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
require_once(DOL_DOCUMENT_ROOT."/core/class/html.formfile.class.php");
require_once(DOL_DOCUMENT_ROOT."/adherents/class/adherent.class.php");
require_once(DOL_DOCUMENT_ROOT."/adherents/class/adherent_type.class.php");
@@ -67,7 +67,7 @@ $upload_dir = $conf->adherent->dir_output . "/" . get_exdir($id,2,0,1) . '/' . $
// Envoie fichier
if ( $_POST["sendit"] && ! empty($conf->global->MAIN_UPLOAD_DOC))
{
- require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php");
+ require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
if (create_exdir($upload_dir) >= 0)
{
diff --git a/htdocs/adherents/fiche.php b/htdocs/adherents/fiche.php
index 96adf248ab4db44d567915bdcce3695a764108df..1f28bf85ae03d4239068f7cef4fc36a21170bc43 100644
--- a/htdocs/adherents/fiche.php
+++ b/htdocs/adherents/fiche.php
@@ -25,7 +25,7 @@
*/
require("../main.inc.php");
-require_once(DOL_DOCUMENT_ROOT."/lib/member.lib.php");
+require_once(DOL_DOCUMENT_ROOT."/core/lib/member.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");
@@ -206,7 +206,7 @@ if ($_REQUEST["action"] == 'confirm_sendinfo' && $_REQUEST["confirm"] == 'yes')
if ($_REQUEST["action"] == 'update' && ! $_POST["cancel"] && $user->rights->adherent->creer)
{
- require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php");
+ require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
$datenaiss='';
if (isset($_POST["naissday"]) && $_POST["naissday"]
diff --git a/htdocs/adherents/fiche_subscription.php b/htdocs/adherents/fiche_subscription.php
index 58a19fdf0e7ff8a157269e2a84bd65ecc2193752..d7b86d7202d4d34ea339ae73ccdca31b26c330c6 100644
--- a/htdocs/adherents/fiche_subscription.php
+++ b/htdocs/adherents/fiche_subscription.php
@@ -22,7 +22,7 @@
*/
require("../main.inc.php");
-require_once(DOL_DOCUMENT_ROOT."/lib/member.lib.php");
+require_once(DOL_DOCUMENT_ROOT."/core/lib/member.lib.php");
require_once(DOL_DOCUMENT_ROOT."/adherents/class/adherent.class.php");
require_once(DOL_DOCUMENT_ROOT."/adherents/class/cotisation.class.php");
require_once(DOL_DOCUMENT_ROOT."/compta/bank/class/account.class.php");
diff --git a/htdocs/adherents/info.php b/htdocs/adherents/info.php
index 7f14fccd751484a83488cee80a084607f1848dae..7fc5b055798f8d8e6aabd2edd5a5295724b63375 100644
--- a/htdocs/adherents/info.php
+++ b/htdocs/adherents/info.php
@@ -25,7 +25,7 @@
require("../main.inc.php");
require_once(DOL_DOCUMENT_ROOT."/core/lib/functions2.lib.php");
require_once(DOL_DOCUMENT_ROOT."/adherents/class/adherent.class.php");
-require_once(DOL_DOCUMENT_ROOT."/lib/member.lib.php");
+require_once(DOL_DOCUMENT_ROOT."/core/lib/member.lib.php");
$langs->load("companies");
$langs->load("bills");
diff --git a/htdocs/adherents/info_subscription.php b/htdocs/adherents/info_subscription.php
index a9f28e7bdbdde0afd6574eb71d796b09befbab7a..4634bc4a7d0eae7ef2fed970ff1a7f7e0b3acf2d 100644
--- a/htdocs/adherents/info_subscription.php
+++ b/htdocs/adherents/info_subscription.php
@@ -25,7 +25,7 @@
require("../main.inc.php");
require_once(DOL_DOCUMENT_ROOT."/core/lib/functions2.lib.php");
require_once(DOL_DOCUMENT_ROOT."/adherents/class/adherent.class.php");
-require_once(DOL_DOCUMENT_ROOT."/lib/member.lib.php");
+require_once(DOL_DOCUMENT_ROOT."/core/lib/member.lib.php");
require_once(DOL_DOCUMENT_ROOT."/adherents/class/cotisation.class.php");
$langs->load("companies");
diff --git a/htdocs/adherents/ldap.php b/htdocs/adherents/ldap.php
index 1f0d35d0b6e6a2d6d52ad3681751c9310039004d..d202a411271e596179fc41568d45b047c10634ad 100644
--- a/htdocs/adherents/ldap.php
+++ b/htdocs/adherents/ldap.php
@@ -23,7 +23,7 @@
*/
require("../main.inc.php");
-require_once(DOL_DOCUMENT_ROOT."/lib/member.lib.php");
+require_once(DOL_DOCUMENT_ROOT."/core/lib/member.lib.php");
require_once(DOL_DOCUMENT_ROOT."/core/lib/ldap.lib.php");
require_once(DOL_DOCUMENT_ROOT."/core/class/ldap.class.php");
require_once(DOL_DOCUMENT_ROOT."/adherents/class/adherent.class.php");
diff --git a/htdocs/adherents/note.php b/htdocs/adherents/note.php
index 0a5820c2dc46385ff792af810f58cef953e6f2c6..49bafc349f42dfcd1d2a446dbca91de2d0441dee 100644
--- a/htdocs/adherents/note.php
+++ b/htdocs/adherents/note.php
@@ -23,7 +23,7 @@
*/
require("../main.inc.php");
-require_once(DOL_DOCUMENT_ROOT.'/lib/member.lib.php');
+require_once(DOL_DOCUMENT_ROOT.'/core/lib/member.lib.php');
require_once(DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php');
require_once(DOL_DOCUMENT_ROOT."/adherents/class/adherent_type.class.php");
diff --git a/htdocs/adherents/stats/geo.php b/htdocs/adherents/stats/geo.php
index 5ac68ded5102fe39182d60bcc6108e6e14b37b4b..d805316dae6e311797018143001c7e0bda94c136 100755
--- a/htdocs/adherents/stats/geo.php
+++ b/htdocs/adherents/stats/geo.php
@@ -23,7 +23,7 @@
require("../../main.inc.php");
require_once(DOL_DOCUMENT_ROOT."/core/class/dolgraph.class.php");
-require_once(DOL_DOCUMENT_ROOT."/lib/member.lib.php");
+require_once(DOL_DOCUMENT_ROOT."/core/lib/member.lib.php");
$graphwidth = 700;
$mapratio = 0.5;
diff --git a/htdocs/adherents/stats/index.php b/htdocs/adherents/stats/index.php
index 90fcf1f840ce21700ebe0cb0ae0f0db2ff53a8ca..33829124cc03f9015e67d6fbf30424bfff488c10 100644
--- a/htdocs/adherents/stats/index.php
+++ b/htdocs/adherents/stats/index.php
@@ -26,7 +26,7 @@
require("../../main.inc.php");
require_once(DOL_DOCUMENT_ROOT."/adherents/class/adherentstats.class.php");
require_once(DOL_DOCUMENT_ROOT."/core/class/dolgraph.class.php");
-require_once(DOL_DOCUMENT_ROOT."/lib/member.lib.php");
+require_once(DOL_DOCUMENT_ROOT."/core/lib/member.lib.php");
$WIDTH=500;
$HEIGHT=200;
diff --git a/htdocs/admin/company.php b/htdocs/admin/company.php
index e26f56e088bd33051f3aaf4e06f4a6fcb1ae2d05..41da98b8ac9b7aa7ab15f5d30b8ab85f540c3d00 100644
--- a/htdocs/admin/company.php
+++ b/htdocs/admin/company.php
@@ -47,7 +47,7 @@ accessforbidden();
if ( (isset($_POST["action"]) && $_POST["action"] == 'update' && empty($_POST["cancel"]))
|| (isset($_POST["action"]) && $_POST["action"] == 'updateedit') )
{
- require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php");
+ require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
$new_pays_id=$_POST["pays_id"];
$new_pays_code=getCountry($new_pays_id,2);
@@ -201,7 +201,7 @@ if ($_GET["action"] == 'addthumb')
if ($_GET["action"] == 'removelogo')
{
- require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php");
+ require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
$logofile=$conf->mycompany->dir_output.'/logos/'.$mysoc->logo;
dol_delete_file($logofile);
diff --git a/htdocs/admin/ihm.php b/htdocs/admin/ihm.php
index 11b8261b2eece63f8f12b912b8a7285899fd0952..a3d09caff99f75ca99c05e285481ece0b016f298 100644
--- a/htdocs/admin/ihm.php
+++ b/htdocs/admin/ihm.php
@@ -23,7 +23,7 @@
*/
require("../main.inc.php");
-require_once(DOL_DOCUMENT_ROOT."/lib/usergroups.lib.php");
+require_once(DOL_DOCUMENT_ROOT."/core/lib/usergroups.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");
diff --git a/htdocs/admin/limits.php b/htdocs/admin/limits.php
index 4244a56be9d8a793b90f27c958fbbb62adba292e..fb9fce66af816bab6332646b1afe0aeb4b104e49 100644
--- a/htdocs/admin/limits.php
+++ b/htdocs/admin/limits.php
@@ -24,7 +24,7 @@
require("../main.inc.php");
require_once(DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php");
-require_once(DOL_DOCUMENT_ROOT."/lib/price.lib.php");
+require_once(DOL_DOCUMENT_ROOT."/core/lib/price.lib.php");
$langs->load("companies");
$langs->load("products");
diff --git a/htdocs/admin/mails.php b/htdocs/admin/mails.php
index 5231c0c623557b377c4fcba21fbaa4a4c96f7603..66e41488edcd108417a8f3c3c7c361413a74c443 100644
--- a/htdocs/admin/mails.php
+++ b/htdocs/admin/mails.php
@@ -23,7 +23,7 @@
require("../main.inc.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/lib/files.lib.php");
$langs->load("companies");
$langs->load("products");
@@ -74,7 +74,7 @@ if (isset($_POST["action"]) && $_POST["action"] == 'update' && empty($_POST["can
*/
if ($_POST['addfile'] || $_POST['addfilehtml'])
{
- require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php");
+ require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
// Set tmp user directory
$vardir=$conf->user->dir_output."/".$user->id;
diff --git a/htdocs/admin/menus/menu.js.php b/htdocs/admin/menus/menu.js.php
index 8526569f1fcb41bc09286c1f82bd40ad43a8792c..0401e57186d2b6b3df6fc5646ec8fdbb86ed788d 100644
--- a/htdocs/admin/menus/menu.js.php
+++ b/htdocs/admin/menus/menu.js.php
@@ -35,7 +35,7 @@ if (! defined('NOREQUIREAJAX')) define('NOREQUIREAJAX','1');
session_cache_limiter(FALSE);
require_once("../../master.inc.php");
-require_once(DOL_DOCUMENT_ROOT."/lib/functions.lib.php");
+require_once(DOL_DOCUMENT_ROOT."/core/lib/functions.lib.php");
// Define css type
header('Content-type: application/javascript');
diff --git a/htdocs/admin/pdf.php b/htdocs/admin/pdf.php
index 7ec878ce5a76f7f46cf9f61e72de843089be88fd..0bbf3e2ec55e0d72391dbaeb39299b89b7b12323 100755
--- a/htdocs/admin/pdf.php
+++ b/htdocs/admin/pdf.php
@@ -23,7 +23,7 @@
*/
require("../main.inc.php");
-require_once(DOL_DOCUMENT_ROOT."/lib/usergroups.lib.php");
+require_once(DOL_DOCUMENT_ROOT."/core/lib/usergroups.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");
diff --git a/htdocs/admin/security_other.php b/htdocs/admin/security_other.php
index 7ec5d5ef5d8a713bc3d8dbd2fc426b3cfd638c5a..28a59e6c57e7353387e5851715b848851652a9e6 100644
--- a/htdocs/admin/security_other.php
+++ b/htdocs/admin/security_other.php
@@ -41,7 +41,7 @@ $upload_dir=$conf->admin->dir_temp;
if ($_POST["sendit"] && ! empty($conf->global->MAIN_UPLOAD_DOC))
{
- require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php");
+ require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
$result=create_exdir($upload_dir); // Create dir if not exists
if ($result >= 0)
diff --git a/htdocs/admin/tools/export.php b/htdocs/admin/tools/export.php
index aa3c026042403daf8e96a444454cb4ea1b1b1536..fd3fee5a12dcd0ce9b1dd54dcffab731a243b3c7 100644
--- a/htdocs/admin/tools/export.php
+++ b/htdocs/admin/tools/export.php
@@ -22,7 +22,7 @@
require("../../main.inc.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/lib/files.lib.php");
require_once(DOL_DOCUMENT_ROOT."/core/class/html.formfile.class.php");
$what=$_REQUEST["what"];
diff --git a/htdocs/admin/tools/purge.php b/htdocs/admin/tools/purge.php
index de654b71832d21b3dca9308fb4737cb85d7e4878..62f536bcba7be5f8a3d34d537d9adefb4d938dcc 100644
--- a/htdocs/admin/tools/purge.php
+++ b/htdocs/admin/tools/purge.php
@@ -21,7 +21,7 @@
*/
require("../../main.inc.php");
-include_once(DOL_DOCUMENT_ROOT.'/lib/files.lib.php');
+include_once(DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php');
$langs->load("admin");
diff --git a/htdocs/admin/tools/update.php b/htdocs/admin/tools/update.php
index e9cdbbfb423028dcfbd5f5406ec0b68e15341078..17eadcaa56333718beeaf8fd92d833f3ff0582ea 100644
--- a/htdocs/admin/tools/update.php
+++ b/htdocs/admin/tools/update.php
@@ -22,7 +22,7 @@
*/
require("../../main.inc.php");
-include_once $dolibarr_main_document_root."/lib/files.lib.php";
+include_once $dolibarr_main_document_root."/core/lib/files.lib.php";
$langs->load("admin");
$langs->load("other");
diff --git a/htdocs/asterisk/wrapper.php b/htdocs/asterisk/wrapper.php
index a4285e2357befd68cb1c2fd8abd4e2c50b264081..80d394fa452547e43549a2325a3dd0c66221ae71 100644
--- a/htdocs/asterisk/wrapper.php
+++ b/htdocs/asterisk/wrapper.php
@@ -61,7 +61,7 @@ function llxFooter()
}
require_once("../main.inc.php");
-require_once(DOL_DOCUMENT_ROOT."/lib/functions.lib.php");
+require_once(DOL_DOCUMENT_ROOT."/core/lib/functions.lib.php");
require_once(DOL_DOCUMENT_ROOT."/core/lib/functions2.lib.php");
diff --git a/htdocs/cache.manifest b/htdocs/cache.manifest
index 9d7b4f8d58c1151ae28bfdf84e143d7b8bd695ae..f0ea032ea16285383470af5e8d84463803dfd936 100644
--- a/htdocs/cache.manifest
+++ b/htdocs/cache.manifest
@@ -12,7 +12,7 @@ index.php
main.inc.php
master.inc.php
filefunc.inc.php
-lib/functions.lib.php
+core/lib/functions.lib.php
# The NETWORK section contains the path to a folder to ensure that requests
# to load resources contained under /api will bypass the cache and always fetch the resource from the server.
diff --git a/htdocs/cashdesk/class/Facturation.class.php b/htdocs/cashdesk/class/Facturation.class.php
index 87a46c7eee2f19e407173a4c37a338bd07dbac27..9f2ea75cc005348bf0089194f277cc92b2bd42d0 100644
--- a/htdocs/cashdesk/class/Facturation.class.php
+++ b/htdocs/cashdesk/class/Facturation.class.php
@@ -17,7 +17,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-include_once(DOL_DOCUMENT_ROOT.'/lib/price.lib.php');
+include_once(DOL_DOCUMENT_ROOT.'/core/lib/price.lib.php');
/**
diff --git a/htdocs/categories/categorie.php b/htdocs/categories/categorie.php
index 9e822d2b465f8f4bda6cfa7e866b6547350c5177..d1203ec56749061868420a6f3e56487b4cdef57f 100644
--- a/htdocs/categories/categorie.php
+++ b/htdocs/categories/categorie.php
@@ -284,7 +284,7 @@ else if ($id || $ref)
/*
* Fiche categorie de produit
*/
- require_once(DOL_DOCUMENT_ROOT."/lib/product.lib.php");
+ require_once(DOL_DOCUMENT_ROOT."/core/lib/product.lib.php");
require_once(DOL_DOCUMENT_ROOT."/product/class/product.class.php");
// Produit
@@ -339,7 +339,7 @@ else if ($id || $ref)
/*
* Fiche categorie d'adherent
*/
- require_once(DOL_DOCUMENT_ROOT."/lib/member.lib.php");
+ require_once(DOL_DOCUMENT_ROOT."/core/lib/member.lib.php");
require_once(DOL_DOCUMENT_ROOT."/adherents/class/adherent.class.php");
require_once(DOL_DOCUMENT_ROOT."/adherents/class/adherent_type.class.php");
diff --git a/htdocs/categories/class/categorie.class.php b/htdocs/categories/class/categorie.class.php
index a0dbbca0e7aa904f58e195efc6abc45300bd4a57..ab58b71972c6179a2114746009d03fa200369a62 100644
--- a/htdocs/categories/class/categorie.class.php
+++ b/htdocs/categories/class/categorie.class.php
@@ -1201,7 +1201,7 @@ class Categorie
*/
function add_photo($sdir, $file, $maxWidth = 160, $maxHeight = 120)
{
- require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php");
+ require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
$dir = $sdir .'/'. get_exdir($this->id,2) . $this->id ."/";
$dir .= "photos/";
@@ -1306,7 +1306,7 @@ class Categorie
*/
function delete_photo($file)
{
- require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php");
+ require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
$dir = dirname($file).'/'; // Chemin du dossier contenant l'image d'origine
$dirthumb = $dir.'/thumbs/'; // Chemin du dossier contenant la vignette
diff --git a/htdocs/comm/action/class/actioncomm.class.php b/htdocs/comm/action/class/actioncomm.class.php
index 0b79eca314870b60ca5b60d4a47474a7034de0d7..c712ce38e8b603e52524746322cb616ec0c3194c 100644
--- a/htdocs/comm/action/class/actioncomm.class.php
+++ b/htdocs/comm/action/class/actioncomm.class.php
@@ -665,7 +665,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 ."/core/lib/xcal.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);
@@ -695,7 +695,7 @@ class ActionComm extends CommonObject
if ($cachedelay)
{
$nowgmt = dol_now();
- include_once(DOL_DOCUMENT_ROOT.'/lib/files.lib.php');
+ include_once(DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php');
if (dol_filemtime($outputfile) > ($nowgmt - $cachedelay))
{
dol_syslog(get_class($this)."::build_exportfile file ".$outputfile." is not older than now - cachedelay (".$nowgmt." - ".$cachedelay."). Build is canceled");
diff --git a/htdocs/comm/action/document.php b/htdocs/comm/action/document.php
index 4e5ebb4003d10e0645e7663d29f2844286e882d0..542aac2679ac0202cab253dcb21cf1ca2764c0d6 100755
--- a/htdocs/comm/action/document.php
+++ b/htdocs/comm/action/document.php
@@ -30,7 +30,7 @@ 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");
-require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php");
+require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
require_once(DOL_DOCUMENT_ROOT."/core/class/html.formfile.class.php");
if ($conf->projet->enabled) require_once(DOL_DOCUMENT_ROOT."/projet/class/project.class.php");
@@ -67,7 +67,7 @@ if (! $sortfield) $sortfield="name";
*/
if ( $_POST["sendit"] && ! empty($conf->global->MAIN_UPLOAD_DOC))
{
- require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php");
+ require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
// Creation repertoire si n'existe pas
$upload_dir = $conf->agenda->dir_output.'/'.dol_sanitizeFileName($objectid);
diff --git a/htdocs/comm/action/fiche.php b/htdocs/comm/action/fiche.php
index 1b4ff95ec73c8f015eacb2161bf6ffb5a68e47ff..b8ebf2b09119ab681e5d9a0e7082254d4e6d331d 100644
--- a/htdocs/comm/action/fiche.php
+++ b/htdocs/comm/action/fiche.php
@@ -33,7 +33,7 @@ require_once(DOL_DOCUMENT_ROOT."/comm/action/class/cactioncomm.class.php");
require_once(DOL_DOCUMENT_ROOT."/comm/action/class/actioncomm.class.php");
require_once(DOL_DOCUMENT_ROOT."/core/class/html.formactions.class.php");
require_once(DOL_DOCUMENT_ROOT."/projet/class/project.class.php");
-require_once(DOL_DOCUMENT_ROOT."/lib/project.lib.php");
+require_once(DOL_DOCUMENT_ROOT."/core/lib/project.lib.php");
$langs->load("companies");
$langs->load("commercial");
diff --git a/htdocs/comm/action/index.php b/htdocs/comm/action/index.php
index b37f2d91ce6b084418ca4b8ff225ba1f2e35857c..29bc44f5d4cf5db9121d1b1539a53105d0100d18 100644
--- a/htdocs/comm/action/index.php
+++ b/htdocs/comm/action/index.php
@@ -31,7 +31,7 @@ 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."/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");
+if ($conf->projet->enabled) require_once(DOL_DOCUMENT_ROOT."/core/lib/project.lib.php");
$filter=GETPOST("filter");
$filtera = GETPOST("userasked","int")?GETPOST("userasked","int"):GETPOST("filtera","int");
diff --git a/htdocs/comm/action/listactions.php b/htdocs/comm/action/listactions.php
index adfa257723847b06b0a53ab2c7438139e6e7bbba..b754aef603545250faa5ba05e01df821c0de7580 100644
--- a/htdocs/comm/action/listactions.php
+++ b/htdocs/comm/action/listactions.php
@@ -29,7 +29,7 @@ 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."/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");
+if ($conf->projet->enabled) require_once(DOL_DOCUMENT_ROOT."/core/lib/project.lib.php");
$langs->load("companies");
$langs->load("agenda");
diff --git a/htdocs/comm/action/rapport/index.php b/htdocs/comm/action/rapport/index.php
index 840442f99b450f67f91d56ae382d27e2e151bdec..6ecc759472be6763e2c19d02496a3e1a7d6e4912 100644
--- a/htdocs/comm/action/rapport/index.php
+++ b/htdocs/comm/action/rapport/index.php
@@ -25,7 +25,7 @@
*/
require("../../../main.inc.php");
-require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php");
+require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.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."/includes/modules/action/rapport.pdf.php");
diff --git a/htdocs/comm/addpropal.php b/htdocs/comm/addpropal.php
index 8e7526410f97b93d38b1898ad960348eb172d012..0b844539bcac555a922bd1c563427db21b4a848b 100644
--- a/htdocs/comm/addpropal.php
+++ b/htdocs/comm/addpropal.php
@@ -31,7 +31,7 @@ require_once(DOL_DOCUMENT_ROOT.'/includes/modules/propale/modules_propale.php');
if ($conf->projet->enabled)
{
require_once(DOL_DOCUMENT_ROOT."/projet/class/project.class.php");
- require_once(DOL_DOCUMENT_ROOT.'/lib/project.lib.php');
+ require_once(DOL_DOCUMENT_ROOT.'/core/lib/project.lib.php');
}
$langs->load("propal");
diff --git a/htdocs/comm/mailing/cibles.php b/htdocs/comm/mailing/cibles.php
index 2e25be7e3ea5ae588ebc1c5867f023ff864d6dad..543537efe41979360a94d0d8d92b397d9845572c 100644
--- a/htdocs/comm/mailing/cibles.php
+++ b/htdocs/comm/mailing/cibles.php
@@ -25,7 +25,7 @@
require("../../main.inc.php");
require_once(DOL_DOCUMENT_ROOT."/comm/mailing/class/mailing.class.php");
-require_once(DOL_DOCUMENT_ROOT."/lib/emailing.lib.php");
+require_once(DOL_DOCUMENT_ROOT."/core/lib/emailing.lib.php");
require_once(DOL_DOCUMENT_ROOT."/core/class/CMailFile.class.php");
require_once(DOL_DOCUMENT_ROOT."/core/lib/functions2.lib.php");
diff --git a/htdocs/comm/mailing/fiche.php b/htdocs/comm/mailing/fiche.php
index 22556691b4b67b5123404b0b800f579885b83ad9..6fbade0ac8c64586a2359e304a61693e6fa0418f 100644
--- a/htdocs/comm/mailing/fiche.php
+++ b/htdocs/comm/mailing/fiche.php
@@ -23,8 +23,8 @@
*/
require("../../main.inc.php");
-require_once(DOL_DOCUMENT_ROOT."/lib/emailing.lib.php");
-require_once(DOL_DOCUMENT_ROOT.'/lib/files.lib.php');
+require_once(DOL_DOCUMENT_ROOT."/core/lib/emailing.lib.php");
+require_once(DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php');
require_once(DOL_DOCUMENT_ROOT."/core/class/CMailFile.class.php");
require_once(DOL_DOCUMENT_ROOT."/core/lib/functions2.lib.php");
require_once(DOL_DOCUMENT_ROOT."/comm/mailing/class/mailing.class.php");
@@ -450,7 +450,7 @@ if (! empty($_POST["removedfileid"]))
// Action update emailing
if ($_POST["action"] == 'update' && empty($_POST["removedfile"]) && empty($_POST["cancel"]))
{
- require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php");
+ require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
$mil = new Mailing($db);
$mil->fetch($_POST["id"]);
diff --git a/htdocs/comm/mailing/info.php b/htdocs/comm/mailing/info.php
index ecff22ad16accdfb5091062eac8a9294f3c15c1e..632120ac5ecebc0d65fa81500f187f01d0b306d2 100644
--- a/htdocs/comm/mailing/info.php
+++ b/htdocs/comm/mailing/info.php
@@ -25,7 +25,7 @@
require("../../main.inc.php");
require_once(DOL_DOCUMENT_ROOT ."/comm/mailing/class/mailing.class.php");
require_once(DOL_DOCUMENT_ROOT."/core/lib/functions2.lib.php");
-require_once(DOL_DOCUMENT_ROOT."/lib/emailing.lib.php");
+require_once(DOL_DOCUMENT_ROOT."/core/lib/emailing.lib.php");
$langs->load("mails");
diff --git a/htdocs/comm/propal.php b/htdocs/comm/propal.php
index cb8de4ddf239ba714dacd6bb90b000ca12732646..10b5e9ef4a5e2cbf2310c28adb2745e51131adde 100644
--- a/htdocs/comm/propal.php
+++ b/htdocs/comm/propal.php
@@ -34,7 +34,7 @@ require_once(DOL_DOCUMENT_ROOT."/includes/modules/propale/modules_propale.php");
require_once(DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.class.php');
require_once(DOL_DOCUMENT_ROOT."/core/class/html.formother.class.php");
require_once(DOL_DOCUMENT_ROOT."/core/class/html.formfile.class.php");
-require_once(DOL_DOCUMENT_ROOT."/lib/propal.lib.php");
+require_once(DOL_DOCUMENT_ROOT."/core/lib/propal.lib.php");
require_once(DOL_DOCUMENT_ROOT."/core/lib/functions2.lib.php");
if ($conf->projet->enabled) require_once(DOL_DOCUMENT_ROOT.'/projet/class/project.class.php');
@@ -399,7 +399,7 @@ if (GETPOST('action') == 'setstatut' && $user->rights->propale->cloturer)
*/
if ($_POST['addfile'])
{
- require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php");
+ require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
// Set tmp user directory TODO Use a dedicated directory for temp mails files
$vardir=$conf->user->dir_output."/".$user->id;
@@ -416,7 +416,7 @@ if ($_POST['addfile'])
*/
if (! empty($_POST['removedfile']))
{
- require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php");
+ require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
// Set tmp user directory
$vardir=$conf->user->dir_output."/".$user->id;
diff --git a/htdocs/comm/propal/apercu.php b/htdocs/comm/propal/apercu.php
index a7556454a3c070b7f67be19562a2cf0cf0785225..dd64f66e865e7f72a083e15ff9d91f28a0fc9b21 100644
--- a/htdocs/comm/propal/apercu.php
+++ b/htdocs/comm/propal/apercu.php
@@ -26,8 +26,8 @@
require("../../main.inc.php");
require_once(DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php');
-require_once(DOL_DOCUMENT_ROOT."/lib/propal.lib.php");
-require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php");
+require_once(DOL_DOCUMENT_ROOT."/core/lib/propal.lib.php");
+require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
if ($conf->projet->enabled) require_once(DOL_DOCUMENT_ROOT."/projet/class/project.class.php");
$langs->load('propal');
diff --git a/htdocs/comm/propal/class/propal.class.php b/htdocs/comm/propal/class/propal.class.php
index 4731f0343dad0f545f4a95725f312147baffaf5c..b025757364e10e41e938520cec9a9efad7e2cd08 100644
--- a/htdocs/comm/propal/class/propal.class.php
+++ b/htdocs/comm/propal/class/propal.class.php
@@ -209,7 +209,7 @@ class Propal extends CommonObject
{
global $langs;
- include_once(DOL_DOCUMENT_ROOT.'/lib/price.lib.php');
+ include_once(DOL_DOCUMENT_ROOT.'/core/lib/price.lib.php');
include_once(DOL_DOCUMENT_ROOT.'/core/class/discount.class.php');
$this->db->begin();
@@ -306,7 +306,7 @@ class Propal extends CommonObject
global $conf;
dol_syslog("Propal::Addline propalid=$propalid, desc=$desc, pu_ht=$pu_ht, qty=$qty, txtva=$txtva, fk_product=$fk_product, remise_except=$remise_percent, price_base_type=$price_base_type, pu_ttc=$pu_ttc, info_bits=$info_bits, type=$type");
- include_once(DOL_DOCUMENT_ROOT.'/lib/price.lib.php');
+ include_once(DOL_DOCUMENT_ROOT.'/core/lib/price.lib.php');
// Clean parameters
if (empty($remise_percent)) $remise_percent=0;
@@ -453,7 +453,7 @@ class Propal extends CommonObject
global $conf,$user,$langs;
dol_syslog("Propal::UpdateLine $rowid, $pu, $qty, $remise_percent, $txtva, $desc, $price_base_type, $info_bits");
- include_once(DOL_DOCUMENT_ROOT.'/lib/price.lib.php');
+ include_once(DOL_DOCUMENT_ROOT.'/core/lib/price.lib.php');
// Clean parameters
$remise_percent=price2num($remise_percent);
@@ -1734,7 +1734,7 @@ class Propal extends CommonObject
function delete($user, $notrigger=0)
{
global $conf,$langs;
- require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php");
+ require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
$error=0;
diff --git a/htdocs/comm/propal/contact.php b/htdocs/comm/propal/contact.php
index e4dfe3299a7fba6c225d3730037b0a4b3966f55e..9ba449fee5c62db0b9bd5ff7ca0f2b4ab0c67487 100644
--- a/htdocs/comm/propal/contact.php
+++ b/htdocs/comm/propal/contact.php
@@ -25,7 +25,7 @@
require("../../main.inc.php");
require_once(DOL_DOCUMENT_ROOT."/comm/propal/class/propal.class.php");
require_once(DOL_DOCUMENT_ROOT."/contact/class/contact.class.php");
-require_once(DOL_DOCUMENT_ROOT."/lib/propal.lib.php");
+require_once(DOL_DOCUMENT_ROOT."/core/lib/propal.lib.php");
require_once(DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php');
$langs->load("facture");
diff --git a/htdocs/comm/propal/document.php b/htdocs/comm/propal/document.php
index 3a3d41b2fcb405bfe37e16f142a6951104c9d36b..05860909553b09070ae7bbbfe904c99b31e2d6b0 100644
--- a/htdocs/comm/propal/document.php
+++ b/htdocs/comm/propal/document.php
@@ -26,8 +26,8 @@
require("../../main.inc.php");
require_once(DOL_DOCUMENT_ROOT."/comm/propal/class/propal.class.php");
-require_once(DOL_DOCUMENT_ROOT."/lib/propal.lib.php");
-require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php");
+require_once(DOL_DOCUMENT_ROOT."/core/lib/propal.lib.php");
+require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
require_once(DOL_DOCUMENT_ROOT."/core/class/html.formfile.class.php");
$langs->load('compta');
diff --git a/htdocs/comm/propal/info.php b/htdocs/comm/propal/info.php
index 1b95d4559c566624d143b38ce83348df509e9cdd..4758df0f0b7512a3695efb5a1dbafaba0d553253 100644
--- a/htdocs/comm/propal/info.php
+++ b/htdocs/comm/propal/info.php
@@ -26,7 +26,7 @@
require("../../main.inc.php");
require_once(DOL_DOCUMENT_ROOT."/core/lib/functions2.lib.php");
require_once(DOL_DOCUMENT_ROOT."/comm/propal/class/propal.class.php");
-require_once(DOL_DOCUMENT_ROOT."/lib/propal.lib.php");
+require_once(DOL_DOCUMENT_ROOT."/core/lib/propal.lib.php");
$langs->load('propal');
$langs->load('compta');
diff --git a/htdocs/comm/propal/note.php b/htdocs/comm/propal/note.php
index 3277f9cb812ff7c3ada43a457396f261d524c6c5..18fb187033d5cb72d8f49ff89c78a98b241e5e4f 100644
--- a/htdocs/comm/propal/note.php
+++ b/htdocs/comm/propal/note.php
@@ -26,7 +26,7 @@
require("../../main.inc.php");
require_once(DOL_DOCUMENT_ROOT."/comm/propal/class/propal.class.php");
-require_once(DOL_DOCUMENT_ROOT."/lib/propal.lib.php");
+require_once(DOL_DOCUMENT_ROOT."/core/lib/propal.lib.php");
$langs->load('propal');
$langs->load('compta');
diff --git a/htdocs/commande/apercu.php b/htdocs/commande/apercu.php
index 348e0000ba7b0e907ab21b67dd22630bae9a2eeb..991718fe291cb95d6d838d2bae9553bfcd3060a9 100644
--- a/htdocs/commande/apercu.php
+++ b/htdocs/commande/apercu.php
@@ -25,8 +25,8 @@
*/
require("../main.inc.php");
-require_once(DOL_DOCUMENT_ROOT."/lib/order.lib.php");
-require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php");
+require_once(DOL_DOCUMENT_ROOT."/core/lib/order.lib.php");
+require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
require_once(DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php');
if ($conf->propal->enabled) require_once(DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php');
if ($conf->projet->enabled) require_once(DOL_DOCUMENT_ROOT."/projet/class/project.class.php");
diff --git a/htdocs/commande/class/commande.class.php b/htdocs/commande/class/commande.class.php
index ba39d848325ab1fe43f3de70463adea5ca9f124c..3cbe3d57927b08069a412599e6d57465796527c4 100644
--- a/htdocs/commande/class/commande.class.php
+++ b/htdocs/commande/class/commande.class.php
@@ -174,7 +174,7 @@ class Commande extends CommonObject
function valid($user)
{
global $conf,$langs;
- require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php");
+ require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
$error=0;
@@ -975,7 +975,7 @@ class Commande extends CommonObject
{
dol_syslog("Commande::addline commandeid=$commandeid, desc=$desc, pu_ht=$pu_ht, qty=$qty, txtva=$txtva, fk_product=$fk_product, remise_percent=$remise_percent, info_bits=$info_bits, fk_remise_except=$fk_remise_except, price_base_type=$price_base_type, pu_ttc=$pu_ttc, date_start=$date_start, date_end=$date_end, type=$type", LOG_DEBUG);
- include_once(DOL_DOCUMENT_ROOT.'/lib/price.lib.php');
+ include_once(DOL_DOCUMENT_ROOT.'/core/lib/price.lib.php');
// Clean parameters
if (empty($remise_percent)) $remise_percent=0;
@@ -1320,7 +1320,7 @@ class Commande extends CommonObject
{
global $langs;
- include_once(DOL_DOCUMENT_ROOT.'/lib/price.lib.php');
+ include_once(DOL_DOCUMENT_ROOT.'/core/lib/price.lib.php');
include_once(DOL_DOCUMENT_ROOT.'/core/class/discount.class.php');
$this->db->begin();
@@ -2173,7 +2173,7 @@ class Commande extends CommonObject
global $conf;
dol_syslog("CustomerOrder::UpdateLine $rowid, $desc, $pu, $qty, $remise_percent, $txtva, $txlocaltax1, $txlocaltax2, $price_base_type, $info_bits, $date_start, $date_end, $type");
- include_once(DOL_DOCUMENT_ROOT.'/lib/price.lib.php');
+ include_once(DOL_DOCUMENT_ROOT.'/core/lib/price.lib.php');
if ($this->brouillon)
{
@@ -2290,7 +2290,7 @@ class Commande extends CommonObject
function delete($user)
{
global $conf, $langs;
- require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php");
+ require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
$err = 0;
diff --git a/htdocs/commande/contact.php b/htdocs/commande/contact.php
index 0502fea62a4ef95085d72e66d65541c536e5ac3d..ebfb90552e7a47b2bbfc8b759c18af0301b41cde 100644
--- a/htdocs/commande/contact.php
+++ b/htdocs/commande/contact.php
@@ -26,7 +26,7 @@
require("../main.inc.php");
require_once(DOL_DOCUMENT_ROOT."/commande/class/commande.class.php");
require_once(DOL_DOCUMENT_ROOT."/contact/class/contact.class.php");
-require_once(DOL_DOCUMENT_ROOT."/lib/order.lib.php");
+require_once(DOL_DOCUMENT_ROOT."/core/lib/order.lib.php");
require_once(DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php');
$langs->load("orders");
diff --git a/htdocs/commande/document.php b/htdocs/commande/document.php
index bc5feec9fc7fb1763761a840e94be45ef818cd4c..5c2e43f04316023f0374ba928de364a2cc0ad897 100644
--- a/htdocs/commande/document.php
+++ b/htdocs/commande/document.php
@@ -25,8 +25,8 @@
*/
require("../main.inc.php");
-require_once(DOL_DOCUMENT_ROOT.'/lib/order.lib.php');
-require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php");
+require_once(DOL_DOCUMENT_ROOT.'/core/lib/order.lib.php');
+require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
require_once(DOL_DOCUMENT_ROOT."/core/class/html.formfile.class.php");
require_once(DOL_DOCUMENT_ROOT ."/commande/class/commande.class.php");
diff --git a/htdocs/commande/fiche.php b/htdocs/commande/fiche.php
index 0120bb75ae65ced999de516fd9f8ff6f330c9330..4139763c5a159ca8a031845c6fbd2b3dfc1a0d21 100644
--- a/htdocs/commande/fiche.php
+++ b/htdocs/commande/fiche.php
@@ -33,10 +33,10 @@ require_once(DOL_DOCUMENT_ROOT."/core/class/html.formorder.class.php");
require_once(DOL_DOCUMENT_ROOT."/includes/modules/commande/modules_commande.php");
require_once(DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php');
require_once(DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.class.php');
-require_once(DOL_DOCUMENT_ROOT."/lib/order.lib.php");
+require_once(DOL_DOCUMENT_ROOT."/core/lib/order.lib.php");
require_once(DOL_DOCUMENT_ROOT."/core/lib/functions2.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');
+if ($conf->projet->enabled) require_once(DOL_DOCUMENT_ROOT.'/core/lib/project.lib.php');
if ($conf->propal->enabled) require_once(DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php');
if (!$user->rights->commande->lire) accessforbidden();
@@ -892,7 +892,7 @@ if ($action == 'remove_file')
{
if ($object->fetch($id))
{
- require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php");
+ require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
$upload_dir = $conf->commande->dir_output;
$file = $upload_dir . '/' . $_GET['file'];
@@ -906,7 +906,7 @@ if ($action == 'remove_file')
*/
if ($_POST['addfile'])
{
- require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php");
+ require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
// Set tmp user directory TODO Use a dedicated directory for temp mails files
$vardir=$conf->user->dir_output."/".$user->id;
@@ -922,7 +922,7 @@ if ($_POST['addfile'])
*/
if (! empty($_POST['removedfile']))
{
- require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php");
+ require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
// Set tmp user directory
$vardir=$conf->user->dir_output."/".$user->id;
diff --git a/htdocs/commande/info.php b/htdocs/commande/info.php
index 03274702287be9d9d929b692b0193781b64af866..cad4ee3e70c1ddb05bd55c863a7a968ef444d8d4 100644
--- a/htdocs/commande/info.php
+++ b/htdocs/commande/info.php
@@ -25,7 +25,7 @@
require("../main.inc.php");
require_once(DOL_DOCUMENT_ROOT."/core/lib/functions2.lib.php");
require_once(DOL_DOCUMENT_ROOT."/commande/class/commande.class.php");
-require_once(DOL_DOCUMENT_ROOT."/lib/order.lib.php");
+require_once(DOL_DOCUMENT_ROOT."/core/lib/order.lib.php");
if (!$user->rights->commande->lire) accessforbidden();
diff --git a/htdocs/commande/note.php b/htdocs/commande/note.php
index 343b5d38e2babf98b14a9b22cf967350898e1659..dfd1be920184bb1491af71848c8fe3bddf1057e1 100644
--- a/htdocs/commande/note.php
+++ b/htdocs/commande/note.php
@@ -24,7 +24,7 @@
*/
require("../main.inc.php");
-require_once(DOL_DOCUMENT_ROOT.'/lib/order.lib.php');
+require_once(DOL_DOCUMENT_ROOT.'/core/lib/order.lib.php');
require_once(DOL_DOCUMENT_ROOT ."/commande/class/commande.class.php");
$socid=isset($_GET["socid"])?$_GET["socid"]:isset($_POST["socid"])?$_POST["socid"]:"";
diff --git a/htdocs/compta/deplacement/fiche.php b/htdocs/compta/deplacement/fiche.php
index 18e4ff0292d1c1266b2411b096bee6a4e3face61..9142f3dc28e4d634f711ff87f70618ff54a471ca 100644
--- a/htdocs/compta/deplacement/fiche.php
+++ b/htdocs/compta/deplacement/fiche.php
@@ -28,7 +28,7 @@ require_once(DOL_DOCUMENT_ROOT."/compta/deplacement/class/deplacement.class.php"
require_once(DOL_DOCUMENT_ROOT."/core/class/html.formfile.class.php");
if ($conf->projet->enabled)
{
- require_once(DOL_DOCUMENT_ROOT."/lib/project.lib.php");
+ require_once(DOL_DOCUMENT_ROOT."/core/lib/project.lib.php");
require_once(DOL_DOCUMENT_ROOT."/projet/class/project.class.php");
}
diff --git a/htdocs/compta/dons/fiche.php b/htdocs/compta/dons/fiche.php
index 750cd93698812a69f3d67e2a342e9ca95ebb433a..e688274d4eea65d17d9fcfc0b97214dc31131ece 100644
--- a/htdocs/compta/dons/fiche.php
+++ b/htdocs/compta/dons/fiche.php
@@ -28,7 +28,7 @@ require_once(DOL_DOCUMENT_ROOT."/core/class/html.formfile.class.php");
require_once(DOL_DOCUMENT_ROOT."/core/class/html.formcompany.class.php");
require_once(DOL_DOCUMENT_ROOT."/compta/dons/class/don.class.php");
require_once(DOL_DOCUMENT_ROOT."/compta/paiement/class/paiement.class.php");
-if ($conf->projet->enabled) require_once(DOL_DOCUMENT_ROOT.'/lib/project.lib.php');
+if ($conf->projet->enabled) require_once(DOL_DOCUMENT_ROOT.'/core/lib/project.lib.php');
$langs->load("companies");
$langs->load("donations");
diff --git a/htdocs/compta/facture.php b/htdocs/compta/facture.php
index 7926805d3bccc76756f39172c3f0f6122cf68512..0d43862bc0833fdd10886aedb22f5f0eec9f8ae6 100644
--- a/htdocs/compta/facture.php
+++ b/htdocs/compta/facture.php
@@ -35,10 +35,10 @@ require_once(DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php');
require_once(DOL_DOCUMENT_ROOT.'/core/class/discount.class.php');
require_once(DOL_DOCUMENT_ROOT.'/compta/paiement/class/paiement.class.php');
require_once(DOL_DOCUMENT_ROOT."/core/lib/functions2.lib.php");
-require_once(DOL_DOCUMENT_ROOT.'/lib/invoice.lib.php');
+require_once(DOL_DOCUMENT_ROOT.'/core/lib/invoice.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');
+if ($conf->projet->enabled) require_once(DOL_DOCUMENT_ROOT.'/core/lib/project.lib.php');
$langs->load('bills');
//print 'ee'.$langs->trans('BillsCustomer');exit;
@@ -1177,7 +1177,7 @@ if ($action == 'down' && $user->rights->facture->creer)
*/
if ($_POST['addfile'])
{
- require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php");
+ require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
// Set tmp user directory
$vardir=$conf->user->dir_output."/".$user->id;
@@ -1193,7 +1193,7 @@ if ($_POST['addfile'])
*/
if (! empty($_POST['removedfile']))
{
- require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php");
+ require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
// Set tmp user directory
$vardir=$conf->user->dir_output."/".$user->id;
diff --git a/htdocs/compta/facture/apercu.php b/htdocs/compta/facture/apercu.php
index 1a33f00cde204595dff6a1e63dd4439a236ab3d8..cac85592238dcda76e58ecae928a333830ed40fc 100644
--- a/htdocs/compta/facture/apercu.php
+++ b/htdocs/compta/facture/apercu.php
@@ -27,8 +27,8 @@
require("../../main.inc.php");
require_once(DOL_DOCUMENT_ROOT."/compta/facture/class/facture.class.php");
-require_once(DOL_DOCUMENT_ROOT.'/lib/invoice.lib.php');
-require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php");
+require_once(DOL_DOCUMENT_ROOT.'/core/lib/invoice.lib.php');
+require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
if ($conf->projet->enabled) require_once(DOL_DOCUMENT_ROOT."/projet/class/project.class.php");
$langs->load("bills");
diff --git a/htdocs/compta/facture/class/facture-rec.class.php b/htdocs/compta/facture/class/facture-rec.class.php
index f9baebbe540ae00ac286e2218a8eab6f63ba7b03..0ac3b4da79b50c22c8ec2b6c9b86f2fbc5cb3363 100644
--- a/htdocs/compta/facture/class/facture-rec.class.php
+++ b/htdocs/compta/facture/class/facture-rec.class.php
@@ -409,7 +409,7 @@ class FactureRec extends Facture
function addline($facid, $desc, $pu_ht, $qty, $txtva, $fk_product=0, $remise_percent=0, $price_base_type='HT', $info_bits=0, $fk_remise_except='', $pu_ttc=0, $type=0, $rang=-1, $special_code=0)
{
dol_syslog("FactureRec::addline facid=$facid,desc=$desc,pu_ht=$pu_ht,qty=$qty,txtva=$txtva,fk_product=$fk_product,remise_percent=$remise_percent,date_start=$date_start,date_end=$date_end,ventil=$ventil,info_bits=$info_bits,fk_remise_except=$fk_remise_except,price_base_type=$price_base_type,pu_ttc=$pu_ttc,type=$type", LOG_DEBUG);
- include_once(DOL_DOCUMENT_ROOT.'/lib/price.lib.php');
+ include_once(DOL_DOCUMENT_ROOT.'/core/lib/price.lib.php');
// Check parameters
if ($type < 0) return -1;
diff --git a/htdocs/compta/facture/class/facture.class.php b/htdocs/compta/facture/class/facture.class.php
index aa1f4b48816972e19197ed7043457de718a86639..31da3914858101838feed71e845ec5b01144d1a3 100644
--- a/htdocs/compta/facture/class/facture.class.php
+++ b/htdocs/compta/facture/class/facture.class.php
@@ -1044,7 +1044,7 @@ class Facture extends CommonObject
{
global $langs;
- include_once(DOL_DOCUMENT_ROOT.'/lib/price.lib.php');
+ include_once(DOL_DOCUMENT_ROOT.'/core/lib/price.lib.php');
include_once(DOL_DOCUMENT_ROOT.'/core/class/discount.class.php');
$this->db->begin();
@@ -1488,7 +1488,7 @@ class Facture extends CommonObject
function validate($user, $force_number='')
{
global $conf,$langs;
- require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php");
+ require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
$error=0;
@@ -1790,7 +1790,7 @@ class Facture extends CommonObject
function addline($facid, $desc, $pu_ht, $qty, $txtva, $txlocaltax1=0, $txlocaltax2=0, $fk_product=0, $remise_percent=0, $date_start='', $date_end='', $ventil=0, $info_bits=0, $fk_remise_except='', $price_base_type='HT', $pu_ttc=0, $type=0, $rang=-1, $special_code=0, $origin='', $origin_id=0, $fk_parent_line=0)
{
dol_syslog("Facture::Addline facid=$facid,desc=$desc,pu_ht=$pu_ht,qty=$qty,txtva=$txtva, txlocaltax1=$txlocaltax1, txlocaltax2=$txlocaltax2, fk_product=$fk_product,remise_percent=$remise_percent,date_start=$date_start,date_end=$date_end,ventil=$ventil,info_bits=$info_bits,fk_remise_except=$fk_remise_except,price_base_type=$price_base_type,pu_ttc=$pu_ttc,type=$type", LOG_DEBUG);
- include_once(DOL_DOCUMENT_ROOT.'/lib/price.lib.php');
+ include_once(DOL_DOCUMENT_ROOT.'/core/lib/price.lib.php');
// Clean parameters
if (empty($remise_percent)) $remise_percent=0;
@@ -1947,7 +1947,7 @@ class Facture extends CommonObject
*/
function updateline($rowid, $desc, $pu, $qty, $remise_percent=0, $date_start, $date_end, $txtva, $txlocaltax1=0, $txlocaltax2=0,$price_base_type='HT', $info_bits=0, $type=0, $fk_parent_line=0, $skip_update_total=0)
{
- include_once(DOL_DOCUMENT_ROOT.'/lib/price.lib.php');
+ include_once(DOL_DOCUMENT_ROOT.'/core/lib/price.lib.php');
dol_syslog("Facture::UpdateLine $rowid, $desc, $pu, $qty, $remise_percent, $date_start, $date_end, $txtva, $txlocaltax1, $txlocaltax2, $price_base_type, $info_bits, $type", LOG_DEBUG);
diff --git a/htdocs/compta/facture/contact.php b/htdocs/compta/facture/contact.php
index 2aae1a917c2dd4c60460f3588ed82a97d1a79605..f826d45485819024648a41604741e96077282dd3 100644
--- a/htdocs/compta/facture/contact.php
+++ b/htdocs/compta/facture/contact.php
@@ -26,7 +26,7 @@ require("../../main.inc.php");
require_once(DOL_DOCUMENT_ROOT."/compta/facture/class/facture.class.php");
require_once(DOL_DOCUMENT_ROOT."/contact/class/contact.class.php");
require_once(DOL_DOCUMENT_ROOT.'/core/class/discount.class.php');
-require_once(DOL_DOCUMENT_ROOT.'/lib/invoice.lib.php');
+require_once(DOL_DOCUMENT_ROOT.'/core/lib/invoice.lib.php');
require_once(DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php');
$langs->load("bills");
diff --git a/htdocs/compta/facture/document.php b/htdocs/compta/facture/document.php
index a2df7ced07efa7a6dafbea867f72cb07037975b7..14a47995a1bf4b41a2a50812289ae82f4d5c7213 100644
--- a/htdocs/compta/facture/document.php
+++ b/htdocs/compta/facture/document.php
@@ -27,8 +27,8 @@
require("../../main.inc.php");
require_once(DOL_DOCUMENT_ROOT."/compta/facture/class/facture.class.php");
require_once(DOL_DOCUMENT_ROOT.'/core/class/discount.class.php');
-require_once(DOL_DOCUMENT_ROOT."/lib/invoice.lib.php");
-require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php");
+require_once(DOL_DOCUMENT_ROOT."/core/lib/invoice.lib.php");
+require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
require_once(DOL_DOCUMENT_ROOT."/core/class/html.formfile.class.php");
$langs->load('propal');
diff --git a/htdocs/compta/facture/impayees.php b/htdocs/compta/facture/impayees.php
index 9b49f27c7e1a823509d050a0c5cb74b8c78474cb..8bfa5d7507216f3b7b6467e0cf11e420522ec63e 100644
--- a/htdocs/compta/facture/impayees.php
+++ b/htdocs/compta/facture/impayees.php
@@ -28,8 +28,8 @@ require("../../main.inc.php");
require_once(DOL_DOCUMENT_ROOT."/core/class/html.formfile.class.php");
require_once(DOL_DOCUMENT_ROOT."/compta/facture/class/facture.class.php");
require_once(DOL_DOCUMENT_ROOT."/compta/paiement/class/paiement.class.php");
-require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php");
-require_once(DOL_DOCUMENT_ROOT.'/lib/pdf.lib.php');
+require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
+require_once(DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php');
$langs->load("bills");
diff --git a/htdocs/compta/facture/info.php b/htdocs/compta/facture/info.php
index 0fe5dbc4e1d3a5d4b2fac8ac36e2f1c8f7bd2494..4bcf7acea5cb167eb3c3cb34d8b39924c7da6daa 100644
--- a/htdocs/compta/facture/info.php
+++ b/htdocs/compta/facture/info.php
@@ -26,7 +26,7 @@ require("../../main.inc.php");
require_once(DOL_DOCUMENT_ROOT."/compta/facture/class/facture.class.php");
require_once(DOL_DOCUMENT_ROOT.'/core/class/discount.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.'/core/lib/invoice.lib.php');
$langs->load("bills");
diff --git a/htdocs/compta/facture/note.php b/htdocs/compta/facture/note.php
index 6fbb1b1804937ea0f5367f442829ff342f7d92d0..90b338b8ce68e4e0c6aa3810f5417722664d5b2a 100644
--- a/htdocs/compta/facture/note.php
+++ b/htdocs/compta/facture/note.php
@@ -25,7 +25,7 @@
require("../../main.inc.php");
require_once(DOL_DOCUMENT_ROOT."/compta/facture/class/facture.class.php");
require_once(DOL_DOCUMENT_ROOT.'/core/class/discount.class.php');
-require_once(DOL_DOCUMENT_ROOT.'/lib/invoice.lib.php');
+require_once(DOL_DOCUMENT_ROOT.'/core/lib/invoice.lib.php');
$socid=isset($_GET["socid"])?$_GET["socid"]:isset($_POST["socid"])?$_POST["socid"]:"";
diff --git a/htdocs/compta/facture/prelevement.php b/htdocs/compta/facture/prelevement.php
index a67ecd2bbc992a5a263827578604785b41baa586..a6b603d6d7bee3915d2eb73a70b9cc5f2e5d1a72 100644
--- a/htdocs/compta/facture/prelevement.php
+++ b/htdocs/compta/facture/prelevement.php
@@ -25,7 +25,7 @@
*/
require("../../main.inc.php");
-require_once(DOL_DOCUMENT_ROOT.'/lib/invoice.lib.php');
+require_once(DOL_DOCUMENT_ROOT.'/core/lib/invoice.lib.php');
require_once(DOL_DOCUMENT_ROOT."/compta/facture/class/facture.class.php");
require_once(DOL_DOCUMENT_ROOT."/compta/prelevement/class/bon-prelevement.class.php");
require_once(DOL_DOCUMENT_ROOT.'/core/class/discount.class.php');
diff --git a/htdocs/compta/journal/purchasesjournal.php b/htdocs/compta/journal/purchasesjournal.php
index c9efde9acb68f74157b1141fb17c34a3000cb5bc..f48dda6de05ca245203c365e7ed763c71aa2abc3 100755
--- a/htdocs/compta/journal/purchasesjournal.php
+++ b/htdocs/compta/journal/purchasesjournal.php
@@ -23,7 +23,7 @@
* \brief Page with purchases journal
*/
require("../../main.inc.php");
-require_once(DOL_DOCUMENT_ROOT."/lib/report.lib.php");
+require_once(DOL_DOCUMENT_ROOT."/core/lib/report.lib.php");
require_once(DOL_DOCUMENT_ROOT."/core/lib/date.lib.php");
require_once(DOL_DOCUMENT_ROOT."/fourn/class/fournisseur.facture.class.php");
diff --git a/htdocs/compta/journal/sellsjournal.php b/htdocs/compta/journal/sellsjournal.php
index 602949ec724fdef6b2a206235218d62782db0884..6d42ecbe1330b3af1d2cac685a9dfd5eb7db5d3a 100755
--- a/htdocs/compta/journal/sellsjournal.php
+++ b/htdocs/compta/journal/sellsjournal.php
@@ -23,7 +23,7 @@
* \brief Page with sells journal
*/
require("../../main.inc.php");
-require_once(DOL_DOCUMENT_ROOT."/lib/report.lib.php");
+require_once(DOL_DOCUMENT_ROOT."/core/lib/report.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/paiement/rapport.php b/htdocs/compta/paiement/rapport.php
index cb72c923efb8036d2320d3a477b41b5e17b12fe1..18309fd17135eaceb3528d325a1046f742390234 100644
--- a/htdocs/compta/paiement/rapport.php
+++ b/htdocs/compta/paiement/rapport.php
@@ -24,7 +24,7 @@
require("../../main.inc.php");
require_once(DOL_DOCUMENT_ROOT."/includes/modules/rapport/pdf_paiement.class.php");
-require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php");
+require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
// Security check
if (! $user->rights->facture->lire)
diff --git a/htdocs/compta/prelevement/bon.php b/htdocs/compta/prelevement/bon.php
index f23b09fdfb236662872d632a3c3a9bbc50d3c9c6..8266381265a9442eb766ab671d2bf1a0f945f3ac 100644
--- a/htdocs/compta/prelevement/bon.php
+++ b/htdocs/compta/prelevement/bon.php
@@ -24,8 +24,8 @@
*/
require("../bank/pre.inc.php");
-require_once(DOL_DOCUMENT_ROOT."/lib/prelevement.lib.php");
-require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php");
+require_once(DOL_DOCUMENT_ROOT."/core/lib/prelevement.lib.php");
+require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
require_once DOL_DOCUMENT_ROOT."/compta/prelevement/class/bon-prelevement.class.php";
$langs->load("bills");
diff --git a/htdocs/compta/prelevement/create.php b/htdocs/compta/prelevement/create.php
index fbf7535becfcfa1b28b2aaae525faaf4aa0e91af..606bc3600f25536bf44249c3b76765afac20e720 100644
--- a/htdocs/compta/prelevement/create.php
+++ b/htdocs/compta/prelevement/create.php
@@ -80,7 +80,7 @@ $bprev = new BonPrelevement($db);
llxHeader('', $langs->trans("NewStandingOrder"));
-require_once(DOL_DOCUMENT_ROOT."/lib/prelevement.lib.php");
+require_once(DOL_DOCUMENT_ROOT."/core/lib/prelevement.lib.php");
if (prelevement_check_config() < 0)
{
$langs->load("errors");
diff --git a/htdocs/compta/prelevement/factures.php b/htdocs/compta/prelevement/factures.php
index 0d813e09876ee4bb14d189589f0aa0070d9a423c..58fe3761db98ea65672d59b79a5ebc0fdf45b9e9 100644
--- a/htdocs/compta/prelevement/factures.php
+++ b/htdocs/compta/prelevement/factures.php
@@ -25,7 +25,7 @@
*/
require("../bank/pre.inc.php");
-require_once(DOL_DOCUMENT_ROOT."/lib/prelevement.lib.php");
+require_once(DOL_DOCUMENT_ROOT."/core/lib/prelevement.lib.php");
require_once(DOL_DOCUMENT_ROOT."/compta/prelevement/class/bon-prelevement.class.php");
require_once(DOL_DOCUMENT_ROOT."/compta/prelevement/class/rejet-prelevement.class.php");
require_once(DOL_DOCUMENT_ROOT."/compta/paiement/class/paiement.class.php");
diff --git a/htdocs/compta/prelevement/fiche-rejet.php b/htdocs/compta/prelevement/fiche-rejet.php
index 1fd40679a259e8338bb956872faebf3d1f733549..0fb5e55cf77cb64f65ed3e493b52dabd9361271f 100644
--- a/htdocs/compta/prelevement/fiche-rejet.php
+++ b/htdocs/compta/prelevement/fiche-rejet.php
@@ -24,7 +24,7 @@
*/
require("../bank/pre.inc.php");
-require_once(DOL_DOCUMENT_ROOT."/lib/prelevement.lib.php");
+require_once(DOL_DOCUMENT_ROOT."/core/lib/prelevement.lib.php");
require_once(DOL_DOCUMENT_ROOT."/compta/prelevement/class/bon-prelevement.class.php");
require_once(DOL_DOCUMENT_ROOT."/compta/prelevement/class/rejet-prelevement.class.php");
require_once(DOL_DOCUMENT_ROOT."/compta/paiement/class/paiement.class.php");
diff --git a/htdocs/compta/prelevement/fiche-stat.php b/htdocs/compta/prelevement/fiche-stat.php
index 2fdc98fb3e781b22e549fd206ad7b06866026315..9d8261cf20971be31462d7327b267f1091176fd3 100644
--- a/htdocs/compta/prelevement/fiche-stat.php
+++ b/htdocs/compta/prelevement/fiche-stat.php
@@ -23,7 +23,7 @@
*/
require("../bank/pre.inc.php");
-require_once(DOL_DOCUMENT_ROOT."/lib/prelevement.lib.php");
+require_once(DOL_DOCUMENT_ROOT."/core/lib/prelevement.lib.php");
require_once(DOL_DOCUMENT_ROOT."/compta/prelevement/class/bon-prelevement.class.php");
require_once(DOL_DOCUMENT_ROOT."/compta/prelevement/class/ligne-prelevement.class.php");
diff --git a/htdocs/compta/prelevement/fiche.php b/htdocs/compta/prelevement/fiche.php
index 8ccde5bf97da6e78f3d79dd7043e805386468ae6..abe3798fc6ad9322d4b2ca02cc50058dea2f4a43 100644
--- a/htdocs/compta/prelevement/fiche.php
+++ b/htdocs/compta/prelevement/fiche.php
@@ -24,7 +24,7 @@
*/
require("../bank/pre.inc.php");
-require_once(DOL_DOCUMENT_ROOT."/lib/prelevement.lib.php");
+require_once(DOL_DOCUMENT_ROOT."/core/lib/prelevement.lib.php");
require_once(DOL_DOCUMENT_ROOT."/compta/prelevement/class/bon-prelevement.class.php");
if (!$user->rights->prelevement->bons->lire)
@@ -58,7 +58,7 @@ if ( $action == 'confirm_credite' && GETPOST("confirm") == 'yes')
if ($action == 'infotrans' && $user->rights->prelevement->bons->send)
{
- require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php");
+ require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
$bon = new BonPrelevement($db,"");
$bon->fetch($id);
diff --git a/htdocs/compta/prelevement/index.php b/htdocs/compta/prelevement/index.php
index 80c54c315ab44bf12a2e00ed886df4379781c912..7c9a1347d9b933da3bf2c194b8682614343af9c9 100644
--- a/htdocs/compta/prelevement/index.php
+++ b/htdocs/compta/prelevement/index.php
@@ -49,7 +49,7 @@ $result = restrictedArea($user, 'prelevement','','');
llxHeader('',$langs->trans("CustomersStandingOrdersArea"));
-require_once(DOL_DOCUMENT_ROOT."/lib/prelevement.lib.php");
+require_once(DOL_DOCUMENT_ROOT."/core/lib/prelevement.lib.php");
if (prelevement_check_config() < 0)
{
$langs->load("errors");
diff --git a/htdocs/compta/prelevement/lignes.php b/htdocs/compta/prelevement/lignes.php
index c741bb04dbe2739b7c6b6ca80815face302861d6..6333000b8ad17546c136d7cf8ae3c52884545838 100644
--- a/htdocs/compta/prelevement/lignes.php
+++ b/htdocs/compta/prelevement/lignes.php
@@ -24,7 +24,7 @@
*/
require("../bank/pre.inc.php");
-require_once(DOL_DOCUMENT_ROOT."/lib/prelevement.lib.php");
+require_once(DOL_DOCUMENT_ROOT."/core/lib/prelevement.lib.php");
require_once(DOL_DOCUMENT_ROOT."/compta/prelevement/class/bon-prelevement.class.php");
require_once(DOL_DOCUMENT_ROOT."/compta/prelevement/class/ligne-prelevement.class.php");
require_once(DOL_DOCUMENT_ROOT."/compta/prelevement/class/rejet-prelevement.class.php");
diff --git a/htdocs/compta/propal.php b/htdocs/compta/propal.php
index 7660cf99a1ef358b0660d185092114a701e0c2c4..519ae0960d58f2e1e11a0b32c83f9bd1c26330e0 100644
--- a/htdocs/compta/propal.php
+++ b/htdocs/compta/propal.php
@@ -30,7 +30,7 @@ require('../main.inc.php');
require_once(DOL_DOCUMENT_ROOT."/core/class/html.formfile.class.php");
require_once(DOL_DOCUMENT_ROOT."/core/class/html.formother.class.php");
require_once(DOL_DOCUMENT_ROOT."/comm/propal/class/propal.class.php");
-require_once(DOL_DOCUMENT_ROOT."/lib/propal.lib.php");
+require_once(DOL_DOCUMENT_ROOT."/core/lib/propal.lib.php");
if ($conf->projet->enabled) require_once(DOL_DOCUMENT_ROOT.'/projet/class/project.class.php');
if ($conf->commande->enabled) require_once(DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php');
diff --git a/htdocs/compta/resultat/clientfourn.php b/htdocs/compta/resultat/clientfourn.php
index 8b40189a0807a1dc2b24da077712e09fe1aea718..a5c566391e9837ff7e054a5c6820e2f1f2274a7e 100644
--- a/htdocs/compta/resultat/clientfourn.php
+++ b/htdocs/compta/resultat/clientfourn.php
@@ -25,8 +25,8 @@
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."/lib/report.lib.php");
-require_once(DOL_DOCUMENT_ROOT."/lib/tax.lib.php");
+require_once(DOL_DOCUMENT_ROOT."/core/lib/report.lib.php");
+require_once(DOL_DOCUMENT_ROOT."/core/lib/tax.lib.php");
require_once(DOL_DOCUMENT_ROOT."/core/lib/date.lib.php");
diff --git a/htdocs/compta/resultat/index.php b/htdocs/compta/resultat/index.php
index d8dce74a3ccbca74ef756d2e7797d01d98b291f9..2af686bdec7ad2f7f8a5073383b65ced2881b45c 100644
--- a/htdocs/compta/resultat/index.php
+++ b/htdocs/compta/resultat/index.php
@@ -23,7 +23,7 @@
*/
require('../../main.inc.php');
-require_once(DOL_DOCUMENT_ROOT."/lib/report.lib.php");
+require_once(DOL_DOCUMENT_ROOT."/core/lib/report.lib.php");
$year_start=isset($_GET["year_start"])?$_GET["year_start"]:$_POST["year_start"];
diff --git a/htdocs/compta/stats/cabyuser.php b/htdocs/compta/stats/cabyuser.php
index 4a123777bd4e40a01aba7972d006db99a89f95b1..4b02a954faccfe79e0cf090912097b60e02cf017 100644
--- a/htdocs/compta/stats/cabyuser.php
+++ b/htdocs/compta/stats/cabyuser.php
@@ -23,8 +23,8 @@
*/
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."/core/lib/report.lib.php");
+require_once(DOL_DOCUMENT_ROOT."/core/lib/tax.lib.php");
require_once(DOL_DOCUMENT_ROOT."/core/lib/date.lib.php");
// Security check
diff --git a/htdocs/compta/stats/casoc.php b/htdocs/compta/stats/casoc.php
index edeea1495ecb4e2ba2181792e4854d66ac339757..7962b3f1059ea05a22770c24a6d9b1f096e2ae28 100644
--- a/htdocs/compta/stats/casoc.php
+++ b/htdocs/compta/stats/casoc.php
@@ -24,8 +24,8 @@
*/
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."/core/lib/report.lib.php");
+require_once(DOL_DOCUMENT_ROOT."/core/lib/tax.lib.php");
require_once(DOL_DOCUMENT_ROOT."/core/lib/date.lib.php");
$langs->load("companies");
diff --git a/htdocs/compta/stats/index.php b/htdocs/compta/stats/index.php
index 338a47a5d85f571460b9d1401a302cb98a2b72d2..2942b62c91203870cde3f5946e61ec820241186a 100644
--- a/htdocs/compta/stats/index.php
+++ b/htdocs/compta/stats/index.php
@@ -23,7 +23,7 @@
*/
require('../../main.inc.php');
-require_once(DOL_DOCUMENT_ROOT."/lib/report.lib.php");
+require_once(DOL_DOCUMENT_ROOT."/core/lib/report.lib.php");
$year_start=isset($_GET["year_start"])?$_GET["year_start"]:$_POST["year_start"];
diff --git a/htdocs/compta/tva/clients.php b/htdocs/compta/tva/clients.php
index 6f9f1ad981e051a372469497f3a026d388f12d82..2a407140eb84767a28b5434e0613ed2f8a137d56 100644
--- a/htdocs/compta/tva/clients.php
+++ b/htdocs/compta/tva/clients.php
@@ -25,8 +25,8 @@
*/
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."/core/lib/report.lib.php");
+require_once(DOL_DOCUMENT_ROOT."/core/lib/tax.lib.php");
require_once(DOL_DOCUMENT_ROOT."/core/lib/date.lib.php");
require_once(DOL_DOCUMENT_ROOT."/compta/tva/class/tva.class.php");
diff --git a/htdocs/compta/tva/index.php b/htdocs/compta/tva/index.php
index f4819240fe1c1c50b54f1d666517e408d1c82708..b8a532399ea75799d284ef200bc4ce9cb0c20bef 100644
--- a/htdocs/compta/tva/index.php
+++ b/htdocs/compta/tva/index.php
@@ -24,7 +24,7 @@
* \brief Index page of VAT reports
*/
require('../../main.inc.php');
-require_once(DOL_DOCUMENT_ROOT."/lib/tax.lib.php");
+require_once(DOL_DOCUMENT_ROOT."/core/lib/tax.lib.php");
require_once(DOL_DOCUMENT_ROOT."/compta/tva/class/tva.class.php");
require_once(DOL_DOCUMENT_ROOT."/core/lib/date.lib.php");
diff --git a/htdocs/compta/tva/quadri_detail.php b/htdocs/compta/tva/quadri_detail.php
index d3348cfbf083e7f7c4a281888e79a3f3baa33f65..c45a609d5a3d69ca576089ccfcf1339fb4f25b25 100644
--- a/htdocs/compta/tva/quadri_detail.php
+++ b/htdocs/compta/tva/quadri_detail.php
@@ -26,8 +26,8 @@
*/
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."/core/lib/report.lib.php");
+require_once(DOL_DOCUMENT_ROOT."/core/lib/tax.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");
diff --git a/htdocs/contact/exportimport.php b/htdocs/contact/exportimport.php
index 6a93b254d110f26c454cc0518c461b667be09aba..e75b099a861a94e80dd5ed1cca2386621d2a2725 100644
--- a/htdocs/contact/exportimport.php
+++ b/htdocs/contact/exportimport.php
@@ -24,7 +24,7 @@
require("../main.inc.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."/core/lib/contact.lib.php");
$langs->load("companies");
diff --git a/htdocs/contact/fiche.php b/htdocs/contact/fiche.php
index 9e30170a702c1c8e15ea28216ad42c778d1f3209..514ca3a29a331b7ddb58ee33852542b12d9d5500 100644
--- a/htdocs/contact/fiche.php
+++ b/htdocs/contact/fiche.php
@@ -28,7 +28,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."/core/lib/contact.lib.php");
require_once(DOL_DOCUMENT_ROOT."/core/lib/company.lib.php");
require_once(DOL_DOCUMENT_ROOT."/core/class/html.formcompany.class.php");
diff --git a/htdocs/contact/info.php b/htdocs/contact/info.php
index 242866b7a7e2709a37da8719b81048cb379fbd75..ad802afa59f62eced19c3087f866bd8bf2da373d 100644
--- a/htdocs/contact/info.php
+++ b/htdocs/contact/info.php
@@ -25,7 +25,7 @@
require("../main.inc.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."/lib/contact.lib.php");
+require_once(DOL_DOCUMENT_ROOT."/core/lib/contact.lib.php");
$langs->load("companies");
diff --git a/htdocs/contact/ldap.php b/htdocs/contact/ldap.php
index c7aa3ea503806d28eb991a261108b75834fb6145..3daa1b3b0deef3799b9b01db54f0570276090413 100644
--- a/htdocs/contact/ldap.php
+++ b/htdocs/contact/ldap.php
@@ -24,7 +24,7 @@
require("../main.inc.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."/core/lib/contact.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/contact/perso.php b/htdocs/contact/perso.php
index 2c37327330b0932e1dc317edf34f6a3e9d496349..9b6481b309ba23c20c2632248ed8e90f67307ce0 100644
--- a/htdocs/contact/perso.php
+++ b/htdocs/contact/perso.php
@@ -24,7 +24,7 @@
require("../main.inc.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."/core/lib/contact.lib.php");
$langs->load("companies");
$langs->load("other");
diff --git a/htdocs/contrat/class/contrat.class.php b/htdocs/contrat/class/contrat.class.php
index cefaf94c63e2613b7b0f107d4cdcb3a159da9784..560941a64e3ed32d6119b60f7212a61fbe4656b5 100644
--- a/htdocs/contrat/class/contrat.class.php
+++ b/htdocs/contrat/class/contrat.class.php
@@ -28,7 +28,7 @@
require_once(DOL_DOCUMENT_ROOT."/core/class/commonobject.class.php");
require_once(DOL_DOCUMENT_ROOT."/product/class/product.class.php");
-require_once(DOL_DOCUMENT_ROOT."/lib/price.lib.php");
+require_once(DOL_DOCUMENT_ROOT."/core/lib/price.lib.php");
/**
diff --git a/htdocs/contrat/contact.php b/htdocs/contrat/contact.php
index 858d531cbf6e8e535e700037d789631904c00948..bee4163db93bbcaf42541b6d4e3b0097ac8d65ee 100644
--- a/htdocs/contrat/contact.php
+++ b/htdocs/contrat/contact.php
@@ -23,7 +23,7 @@
*/
require ("../main.inc.php");
-require_once(DOL_DOCUMENT_ROOT.'/lib/contract.lib.php');
+require_once(DOL_DOCUMENT_ROOT.'/core/lib/contract.lib.php');
require_once(DOL_DOCUMENT_ROOT."/contrat/class/contrat.class.php");
require_once(DOL_DOCUMENT_ROOT."/contact/class/contact.class.php");
require_once(DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php');
diff --git a/htdocs/contrat/document.php b/htdocs/contrat/document.php
index b9e7686a0ec9bc47f9fb435088dbe598d418bd68..c8a7e6b6b0c1e1a261f128d75e7e0d20e5c4b378 100644
--- a/htdocs/contrat/document.php
+++ b/htdocs/contrat/document.php
@@ -26,9 +26,9 @@
*/
require ("../main.inc.php");
-require_once(DOL_DOCUMENT_ROOT."/lib/contract.lib.php");
+require_once(DOL_DOCUMENT_ROOT."/core/lib/contract.lib.php");
require_once(DOL_DOCUMENT_ROOT."/contrat/class/contrat.class.php");
-require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php");
+require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
require_once(DOL_DOCUMENT_ROOT."/core/class/html.formfile.class.php");
$langs->load("other");
@@ -69,7 +69,7 @@ $modulepart='contract';
*/
if ($_POST["sendit"] && ! empty($conf->global->MAIN_UPLOAD_DOC))
{
- require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php");
+ require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
if (create_exdir($upload_dir) >= 0)
{
diff --git a/htdocs/contrat/fiche.php b/htdocs/contrat/fiche.php
index 4f95788c0dcb57c32878b2e620ef583c1d8736e4..f32998c3c4d9b3497fe601b467855c00e34f7131 100644
--- a/htdocs/contrat/fiche.php
+++ b/htdocs/contrat/fiche.php
@@ -27,12 +27,12 @@
require ("../main.inc.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.'/core/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");
if ($conf->propal->enabled) require_once(DOL_DOCUMENT_ROOT."/comm/propal/class/propal.class.php");
if ($conf->contrat->enabled) require_once(DOL_DOCUMENT_ROOT."/contrat/class/contrat.class.php");
-if ($conf->projet->enabled) require_once(DOL_DOCUMENT_ROOT."/lib/project.lib.php");
+if ($conf->projet->enabled) require_once(DOL_DOCUMENT_ROOT."/core/lib/project.lib.php");
$langs->load("contracts");
$langs->load("orders");
diff --git a/htdocs/contrat/info.php b/htdocs/contrat/info.php
index 839e738f10bbec89d00f390b18b6fdc3fc350b6d..315dc56943295fb06d2f0aacce704195c603ac7b 100644
--- a/htdocs/contrat/info.php
+++ b/htdocs/contrat/info.php
@@ -23,7 +23,7 @@
require ("../main.inc.php");
require_once(DOL_DOCUMENT_ROOT."/core/lib/functions2.lib.php");
-require_once(DOL_DOCUMENT_ROOT.'/lib/contract.lib.php');
+require_once(DOL_DOCUMENT_ROOT.'/core/lib/contract.lib.php');
require_once(DOL_DOCUMENT_ROOT."/contrat/class/contrat.class.php");
$langs->load("contracts");
diff --git a/htdocs/contrat/note.php b/htdocs/contrat/note.php
index 748b309286d6101e71ddb37d5cb46b029b0fa2e0..8c4cc75f7218c03f81d0cb40885fc7f78b809871 100644
--- a/htdocs/contrat/note.php
+++ b/htdocs/contrat/note.php
@@ -23,7 +23,7 @@
*/
require ("../main.inc.php");
-require_once(DOL_DOCUMENT_ROOT.'/lib/contract.lib.php');
+require_once(DOL_DOCUMENT_ROOT.'/core/lib/contract.lib.php');
if ($conf->contrat->enabled) require_once(DOL_DOCUMENT_ROOT."/contrat/class/contrat.class.php");
$socid=isset($_GET["socid"])?$_GET["socid"]:isset($_POST["socid"])?$_POST["socid"]:"";
diff --git a/htdocs/core/ajaxfileupload.php b/htdocs/core/ajaxfileupload.php
index 7c9ebe6a29825eb96bcda299c78594e8708a168e..5a066d8b783355262d03952ff65c0c064841468c 100644
--- a/htdocs/core/ajaxfileupload.php
+++ b/htdocs/core/ajaxfileupload.php
@@ -35,7 +35,7 @@ if (! defined('NOREQUIREHTML')) define('NOREQUIREHTML','1'); // If we don't nee
require("../main.inc.php");
-require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php");
+require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
require_once(DOL_DOCUMENT_ROOT."/core/lib/images.lib.php");
error_reporting(E_ALL | E_STRICT);
diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index 1b20860c6c88baeac9e2a47fd29163ab801a3456..46a70f250dc617b2ab8d2bc7ec72938b066f18c2 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -1122,7 +1122,7 @@ abstract class CommonObject
*/
function update_price($exclspec=0,$roundingadjust=-1)
{
- include_once(DOL_DOCUMENT_ROOT.'/lib/price.lib.php');
+ include_once(DOL_DOCUMENT_ROOT.'/core/lib/price.lib.php');
if ($roundingadjust < 0 && isset($conf->global->MAIN_ROUNDOFTOTAL_NOT_TOTALOFROUND)) $roundingadjust=$conf->global->MAIN_ROUNDOFTOTAL_NOT_TOTALOFROUND;
if ($roundingadjust < 0) $roundingadjust=0;
diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index c7e2d98c8f14b50ca6e16108b6bd2c21d59ceb9e..5d36d245abb33f10ff73b08185375a02f43ff53b 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -2253,7 +2253,7 @@ class Form
{
global $langs;
- require_once(DOL_DOCUMENT_ROOT."/lib/project.lib.php");
+ require_once(DOL_DOCUMENT_ROOT."/core/lib/project.lib.php");
$langs->load("project");
if ($htmlname != "none")
diff --git a/htdocs/core/class/html.formfile.class.php b/htdocs/core/class/html.formfile.class.php
index 3383a3ce8ca4f44584e38d40d98624bcc7aa54ac..52580882cccd189dc5d67d24050dd4cca846707e 100644
--- a/htdocs/core/class/html.formfile.class.php
+++ b/htdocs/core/class/html.formfile.class.php
@@ -182,7 +182,7 @@ class FormFile
function showdocuments($modulepart,$filename,$filedir,$urlsource,$genallowed,$delallowed=0,$modelselected='',$allowgenifempty=1,$forcenomultilang=0,$iconPDF=0,$maxfilenamelength=28,$noform=0,$param='',$title='',$buttonlabel='',$codelang='',$hookmanager=false)
{
// filedir = conf->...dir_ouput."/".get_exdir(id)
- include_once(DOL_DOCUMENT_ROOT.'/lib/files.lib.php');
+ include_once(DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php');
global $langs,$bc,$conf;
diff --git a/htdocs/core/class/html.formmail.class.php b/htdocs/core/class/html.formmail.class.php
index fd98f27f37d2868c7d460b0ca391ae2ca15a9985..590282a5358d4f6d046827af445b1e0ffe3a0b21 100644
--- a/htdocs/core/class/html.formmail.class.php
+++ b/htdocs/core/class/html.formmail.class.php
@@ -107,7 +107,7 @@ class FormMail
function clear_attached_files()
{
global $conf,$user;
- require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php");
+ require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
// Set tmp user directory
$vardir=$conf->user->dir_output."/".$user->id;
diff --git a/htdocs/core/class/notify.class.php b/htdocs/core/class/notify.class.php
index c1ea9e4a6b1440ee45b22d4e4cc68e2a6eec65e3..6735e9c91c21b888af205cf260e8f3b07c6da172 100644
--- a/htdocs/core/class/notify.class.php
+++ b/htdocs/core/class/notify.class.php
@@ -161,7 +161,7 @@ class Notify
if (dol_strlen($sendto))
{
- include_once(DOL_DOCUMENT_ROOT.'/lib/files.lib.php');
+ include_once(DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php');
$application=($conf->global->MAIN_APPLICATION_TITLE?$conf->global->MAIN_APPLICATION_TITLE:'Dolibarr ERP/CRM');
$subject = '['.$application.'] '.$langs->transnoentitiesnoconv("DolibarrNotification");
diff --git a/htdocs/core/class/rssparser.class.php b/htdocs/core/class/rssparser.class.php
index 75dc5ce5eff368ec8b025767d02b4146e3fecf01..cdcbcbd7282e96ed908227c032440c01ddea590a 100755
--- a/htdocs/core/class/rssparser.class.php
+++ b/htdocs/core/class/rssparser.class.php
@@ -80,7 +80,7 @@ class RssParser
*/
public function parser($urlRSS, $maxNb=0, $cachedelay=60, $cachedir='')
{
- include_once(DOL_DOCUMENT_ROOT.'/lib/files.lib.php');
+ include_once(DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php');
$str=''; // This will contain content of feed
diff --git a/htdocs/lib/doxygen.php b/htdocs/core/doxygen.php
similarity index 100%
rename from htdocs/lib/doxygen.php
rename to htdocs/core/doxygen.php
diff --git a/htdocs/lib/contact.lib.php b/htdocs/core/lib/contact.lib.php
similarity index 97%
rename from htdocs/lib/contact.lib.php
rename to htdocs/core/lib/contact.lib.php
index 87e25f70550d0276352b0bcfc49954defe25be16..de6db84af94655b30d8b908d8ef71d4359935517 100644
--- a/htdocs/lib/contact.lib.php
+++ b/htdocs/core/lib/contact.lib.php
@@ -18,7 +18,7 @@
*/
/**
- * \file htdocs/lib/contact.lib.php
+ * \file htdocs/core/lib/contact.lib.php
* \brief Ensemble de fonctions de base pour les contacts
*/
diff --git a/htdocs/lib/contract.lib.php b/htdocs/core/lib/contract.lib.php
similarity index 97%
rename from htdocs/lib/contract.lib.php
rename to htdocs/core/lib/contract.lib.php
index 0c0027a2bc1b68b9b97d1533b4574ee2b75857ec..00b34678f9311a3584bdb2a1430593425937e4a3 100644
--- a/htdocs/lib/contract.lib.php
+++ b/htdocs/core/lib/contract.lib.php
@@ -18,7 +18,7 @@
*/
/**
- * \file htdocs/lib/contract.lib.php
+ * \file htdocs/core/lib/contract.lib.php
* \brief Ensemble de fonctions de base pour le module contrat
*/
diff --git a/htdocs/lib/ecm.lib.php b/htdocs/core/lib/ecm.lib.php
similarity index 97%
rename from htdocs/lib/ecm.lib.php
rename to htdocs/core/lib/ecm.lib.php
index e425fc9f686ede61fdfd18d2a108eedadf698e2c..f7c267c8d3c86090e5ced3d2a40b8bb01860f511 100644
--- a/htdocs/lib/ecm.lib.php
+++ b/htdocs/core/lib/ecm.lib.php
@@ -17,7 +17,7 @@
*/
/**
- * \file htdocs/lib/ecm.lib.php
+ * \file htdocs/core/lib/ecm.lib.php
* \brief Ensemble de fonctions de base pour le module ecm
* \ingroup ecm
*/
diff --git a/htdocs/lib/emailing.lib.php b/htdocs/core/lib/emailing.lib.php
similarity index 96%
rename from htdocs/lib/emailing.lib.php
rename to htdocs/core/lib/emailing.lib.php
index 1780e0a2eed6c74a99852c8fef1b80f9c77b8f63..b847d2c512e8d9f46f039607c6ff3425f3823d6c 100644
--- a/htdocs/lib/emailing.lib.php
+++ b/htdocs/core/lib/emailing.lib.php
@@ -17,7 +17,7 @@
*/
/**
- * \file htdocs/lib/emailing.lib.php
+ * \file htdocs/core/lib/emailing.lib.php
* \brief Library file with function for emailing module
*/
diff --git a/htdocs/lib/fichinter.lib.php b/htdocs/core/lib/fichinter.lib.php
similarity index 98%
rename from htdocs/lib/fichinter.lib.php
rename to htdocs/core/lib/fichinter.lib.php
index ab6d36cf28636954609969272d9a5b40f43ff795..53ac86627382f8488ea48df1e42f507cd1d5dcb0 100644
--- a/htdocs/lib/fichinter.lib.php
+++ b/htdocs/core/lib/fichinter.lib.php
@@ -18,7 +18,7 @@
*/
/**
- * \file htdocs/lib/fichinter.lib.php
+ * \file htdocs/core/lib/fichinter.lib.php
* \brief Ensemble de fonctions de base pour le module fichinter
* \ingroup fichinter
*/
diff --git a/htdocs/lib/files.lib.php b/htdocs/core/lib/files.lib.php
similarity index 99%
rename from htdocs/lib/files.lib.php
rename to htdocs/core/lib/files.lib.php
index ee08274abc8dcd34ef144c0a028925f7887a18bb..717a6ba4ec4cf4f044f189d7874a3fc5c503f746 100644
--- a/htdocs/lib/files.lib.php
+++ b/htdocs/core/lib/files.lib.php
@@ -17,7 +17,7 @@
*/
/**
- * \file htdocs/lib/files.lib.php
+ * \file htdocs/core/lib/files.lib.php
* \brief Library for file managing functions
*/
@@ -724,7 +724,7 @@ function dol_delete_dir_recursive($dir,$count=0,$nophperrors=0)
function dol_delete_preview($object)
{
global $langs,$conf;
- require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php");
+ require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
if ($object->element == 'commande') $dir = $conf->commande->dir_output;
if (empty($dir)) return 'ErrorObjectNoSupportedByFunction';
diff --git a/htdocs/lib/fourn.lib.php b/htdocs/core/lib/fourn.lib.php
similarity index 96%
rename from htdocs/lib/fourn.lib.php
rename to htdocs/core/lib/fourn.lib.php
index 9987d2601126b3b9f7b0198a47f8c97cd34b6f58..4fc5114b2567238f9c83af81dc5ee4df726aacef 100644
--- a/htdocs/lib/fourn.lib.php
+++ b/htdocs/core/lib/fourn.lib.php
@@ -18,7 +18,7 @@
*/
/**
- * \file htdocs/lib/fourn.lib.php
+ * \file htdocs/core/lib/fourn.lib.php
* \brief Functions used by supplier invoice module
* \ingroup supplier
*/
@@ -58,7 +58,7 @@ function facturefourn_prepare_head($object)
$head[$h][0] = DOL_URL_ROOT.'/fourn/facture/document.php?facid='.$object->id;
/*$filesdir = $conf->fournisseur->dir_output.'/facture/'.get_exdir($fac->id,2).$fac->id;
- include_once(DOL_DOCUMENT_ROOT.'/lib/files.lib.php');
+ include_once(DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php');
$listoffiles=dol_dir_list($filesdir,'files',1);
$head[$h][1] = (count($listoffiles)?$langs->trans('DocumentsNb',count($listoffiles)):$langs->trans('Documents'));*/
$head[$h][1] = $langs->trans('Documents');
@@ -112,7 +112,7 @@ function ordersupplier_prepare_head($object)
$head[$h][0] = DOL_URL_ROOT.'/fourn/commande/document.php?id='.$object->id;
/*$filesdir = $conf->fournisseur->dir_output . "/commande/" . dol_sanitizeFileName($commande->ref);
- include_once(DOL_DOCUMENT_ROOT.'/lib/files.lib.php');
+ include_once(DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php');
$listoffiles=dol_dir_list($filesdir,'files',1);
$head[$h][1] = (count($listoffiles)?$langs->trans('DocumentsNb',count($listoffiles)):$langs->trans('Documents'));*/
$head[$h][1] = $langs->trans('Documents');
diff --git a/htdocs/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
similarity index 99%
rename from htdocs/lib/functions.lib.php
rename to htdocs/core/lib/functions.lib.php
index 3828662d34f79d07ced6ed3d96e2997d0a5b2860..81e0f50b182042666f7cd830b7204660546a10bf 100644
--- a/htdocs/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -25,7 +25,7 @@
*/
/**
- * \file htdocs/lib/functions.lib.php
+ * \file htdocs/core/lib/functions.lib.php
* \brief A set of functions for Dolibarr
* This file contains all frequently used functions.
*/
@@ -2081,7 +2081,7 @@ function img_allow($allow,$alt='default')
*/
function img_mime($file,$alt='')
{
- require_once(DOL_DOCUMENT_ROOT.'/lib/files.lib.php');
+ require_once(DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php');
$mimetype=dol_mimetype($file,'',1);
$mimeimg=dol_mimetype($file,'',2);
@@ -3812,7 +3812,7 @@ function complete_substitutions_array(&$substitutionarray,$outputlangs,$object='
{
global $conf,$user;
- require_once(DOL_DOCUMENT_ROOT.'/lib/files.lib.php');
+ require_once(DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php');
// Check if there is external substitution to do asked by plugins
// We look files into the includes/modules/substitutions directory
diff --git a/htdocs/core/lib/functions2.lib.php b/htdocs/core/lib/functions2.lib.php
index db317b4a54925f30d5295c0adf2d7d245268c42c..7483cbd8e0fba8b7b16bf2af0b6470f752aba0d8 100644
--- a/htdocs/core/lib/functions2.lib.php
+++ b/htdocs/core/lib/functions2.lib.php
@@ -1059,7 +1059,7 @@ function getListOfModels($db,$type,$maxfilenamelength=0)
// with the constant that contains list of directories to scan (COMPANY_ADDON_PDF_ODT_PATH, ...).
if (! empty($obj->description)) // List of directories to scan is defined
{
- include_once(DOL_DOCUMENT_ROOT.'/lib/files.lib.php');
+ include_once(DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php');
$const=$obj->description;
$dirtoscan.=($dirtoscan?',':'').preg_replace('/[\r\n]+/',',',trim($conf->global->$const));
diff --git a/htdocs/lib/import.lib.php b/htdocs/core/lib/import.lib.php
similarity index 97%
rename from htdocs/lib/import.lib.php
rename to htdocs/core/lib/import.lib.php
index 23e7f30f73ad97aaa1f78ce0d86cbd958902ffe9..4e2f8224b009140119334a5c15c1763cfdfb3464 100755
--- a/htdocs/lib/import.lib.php
+++ b/htdocs/core/lib/import.lib.php
@@ -20,7 +20,7 @@
*/
/**
- * \file htdocs/lib/order.lib.php
+ * \file htdocs/core/lib/order.lib.php
* \brief Ensemble de fonctions de base pour le module commande
* \ingroup commande
*/
diff --git a/htdocs/lib/invoice.lib.php b/htdocs/core/lib/invoice.lib.php
similarity index 96%
rename from htdocs/lib/invoice.lib.php
rename to htdocs/core/lib/invoice.lib.php
index 22b0b276571f6d0146efcec0581b44a5820622d9..f718b345eec96dd96f2c9e65b445a6aedbe383ee 100644
--- a/htdocs/lib/invoice.lib.php
+++ b/htdocs/core/lib/invoice.lib.php
@@ -17,7 +17,7 @@
*/
/**
- * \file htdocs/lib/invoice.lib.php
+ * \file htdocs/core/lib/invoice.lib.php
* \brief Functions used by invoice module
* \ingroup invoice
*/
@@ -74,7 +74,7 @@ function facture_prepare_head($object)
$head[$h][0] = DOL_URL_ROOT.'/compta/facture/document.php?facid='.$object->id;
/*$filesdir = $conf->facture->dir_output . "/" . dol_sanitizeFileName($fac->ref);
- include_once(DOL_DOCUMENT_ROOT.'/lib/files.lib.php');
+ include_once(DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php');
$listoffiles=dol_dir_list($filesdir,'files',1);
$head[$h][1] = (count($listoffiles)?$langs->trans('DocumentsNb',count($listoffiles)):$langs->trans('Documents'));*/
$head[$h][1] = $langs->trans('Documents');
diff --git a/htdocs/lib/member.lib.php b/htdocs/core/lib/member.lib.php
similarity index 99%
rename from htdocs/lib/member.lib.php
rename to htdocs/core/lib/member.lib.php
index 343898df42c47df1d21a0f76802ac80794503edd..65822f82972698fdd4d66029bc8f65596c85fdf8 100644
--- a/htdocs/lib/member.lib.php
+++ b/htdocs/core/lib/member.lib.php
@@ -17,7 +17,7 @@
*/
/**
- * \file htdocs/lib/member.lib.php
+ * \file htdocs/core/lib/member.lib.php
* \brief Ensemble de fonctions de base pour les adherents
*/
diff --git a/htdocs/lib/order.lib.php b/htdocs/core/lib/order.lib.php
similarity index 97%
rename from htdocs/lib/order.lib.php
rename to htdocs/core/lib/order.lib.php
index f6bb5d33aa94e3dc00e446fa48da9469075bb3fc..fb1000b0dd2c94074d539df9d90b971ee1336511 100644
--- a/htdocs/lib/order.lib.php
+++ b/htdocs/core/lib/order.lib.php
@@ -20,7 +20,7 @@
*/
/**
- * \file htdocs/lib/order.lib.php
+ * \file htdocs/core/lib/order.lib.php
* \brief Ensemble de fonctions de base pour le module commande
* \ingroup commande
*/
@@ -75,7 +75,7 @@ function commande_prepare_head($object)
$head[$h][0] = DOL_URL_ROOT.'/commande/document.php?id='.$object->id;
/*$filesdir = $conf->commande->dir_output . "/" . dol_sanitizeFileName($commande->ref);
- include_once(DOL_DOCUMENT_ROOT.'/lib/files.lib.php');
+ include_once(DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php');
$listoffiles=dol_dir_list($filesdir,'files',1);
$head[$h][1] = (count($listoffiles)?$langs->trans('DocumentsNb',count($listoffiles)):$langs->trans('Documents'));*/
$head[$h][1] = $langs->trans('Documents');
diff --git a/htdocs/lib/pdf.lib.php b/htdocs/core/lib/pdf.lib.php
similarity index 99%
rename from htdocs/lib/pdf.lib.php
rename to htdocs/core/lib/pdf.lib.php
index cd3de50e42d6a66644de4e60f6b7ef9f001c862b..10e592d090ea064c0ce5d0342a4b85a2720e18ea 100644
--- a/htdocs/lib/pdf.lib.php
+++ b/htdocs/core/lib/pdf.lib.php
@@ -21,7 +21,7 @@
*/
/**
- * \file htdocs/lib/pdf.lib.php
+ * \file htdocs/core/lib/pdf.lib.php
* \brief Set of functions used for PDF generation
* \ingroup core
*/
diff --git a/htdocs/lib/prelevement.lib.php b/htdocs/core/lib/prelevement.lib.php
similarity index 98%
rename from htdocs/lib/prelevement.lib.php
rename to htdocs/core/lib/prelevement.lib.php
index f210b492989937c58e6ef6b4b68c43fae58715ee..2e1f13cc220be931b58c6e41061b6a118d1f06d8 100644
--- a/htdocs/lib/prelevement.lib.php
+++ b/htdocs/core/lib/prelevement.lib.php
@@ -19,7 +19,7 @@
*/
/**
- * \file htdocs/lib/prelevement.lib.php
+ * \file htdocs/core/lib/prelevement.lib.php
* \brief Ensemble de fonctions de base pour le module prelevement
* \ingroup propal
*/
diff --git a/htdocs/lib/price.lib.php b/htdocs/core/lib/price.lib.php
similarity index 99%
rename from htdocs/lib/price.lib.php
rename to htdocs/core/lib/price.lib.php
index 88a4ddd83d5308a846005a1dac3a0ecc55389d73..6c2eb31052542590ed7061e84fa83c6c46e79faf 100644
--- a/htdocs/lib/price.lib.php
+++ b/htdocs/core/lib/price.lib.php
@@ -18,7 +18,7 @@
*/
/**
- * \file htdocs/lib/price.lib.php
+ * \file htdocs/core/lib/price.lib.php
* \brief Librairie contenant les fonctions pour calculer un prix.
*/
diff --git a/htdocs/lib/product.lib.php b/htdocs/core/lib/product.lib.php
similarity index 99%
rename from htdocs/lib/product.lib.php
rename to htdocs/core/lib/product.lib.php
index 62011d3ae97feceef0ab09372254ab2d4dfa1720..5944af367e63bc6da145aeb4505135b3e69e169c 100644
--- a/htdocs/lib/product.lib.php
+++ b/htdocs/core/lib/product.lib.php
@@ -19,7 +19,7 @@
*/
/**
- * \file htdocs/lib/product.lib.php
+ * \file htdocs/core/lib/product.lib.php
* \brief Ensemble de fonctions de base pour le module produit et service
* \ingroup product
*/
diff --git a/htdocs/lib/project.lib.php b/htdocs/core/lib/project.lib.php
similarity index 98%
rename from htdocs/lib/project.lib.php
rename to htdocs/core/lib/project.lib.php
index 4f9eb49b112d204f5e6cb63314e54daf9f906739..f5309dd35f467402e4c5d0f8f7ce99d615d92397 100644
--- a/htdocs/lib/project.lib.php
+++ b/htdocs/core/lib/project.lib.php
@@ -19,7 +19,7 @@
*/
/**
- * \file htdocs/lib/project.lib.php
+ * \file htdocs/core/lib/project.lib.php
* \brief Functions used by project module
* \ingroup project
*/
@@ -59,7 +59,7 @@ function project_prepare_head($object)
$head[$h][0] = DOL_URL_ROOT.'/projet/document.php?id='.$object->id;
/*$filesdir = $conf->projet->dir_output . "/" . dol_sanitizeFileName($object->ref);
- include_once(DOL_DOCUMENT_ROOT.'/lib/files.lib.php');
+ include_once(DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php');
$listoffiles=dol_dir_list($filesdir,'files',1);
$head[$h][1] = (count($listoffiles)?$langs->trans('DocumentsNb',count($listoffiles)):$langs->trans('Documents'));*/
$head[$h][1] = $langs->trans('Documents');
@@ -94,7 +94,7 @@ function project_prepare_head($object)
/**
- * \file htdocs/lib/project.lib.php
+ * \file htdocs/core/lib/project.lib.php
* \brief Ensemble de fonctions de base pour le module projet
* \ingroup societe
*/
@@ -127,7 +127,7 @@ function task_prepare_head($object)
$head[$h][0] = DOL_URL_ROOT.'/projet/tasks/document.php?id='.$object->id;
/*$filesdir = $conf->projet->dir_output . "/" . dol_sanitizeFileName($object->ref);
- include_once(DOL_DOCUMENT_ROOT.'/lib/files.lib.php');
+ include_once(DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php');
$listoffiles=dol_dir_list($filesdir,'files',1);
$head[$h][1] = (count($listoffiles)?$langs->trans('DocumentsNb',count($listoffiles)):$langs->trans('Documents'));*/
$head[$h][1] = $langs->trans('Documents');
diff --git a/htdocs/lib/propal.lib.php b/htdocs/core/lib/propal.lib.php
similarity index 96%
rename from htdocs/lib/propal.lib.php
rename to htdocs/core/lib/propal.lib.php
index fc82d7df4cd45d0b21fc3a11338b66fe0dbda732..29451e58cd0e7b1754086acb0801feffbccb7b53 100644
--- a/htdocs/lib/propal.lib.php
+++ b/htdocs/core/lib/propal.lib.php
@@ -18,7 +18,7 @@
*/
/**
- * \file htdocs/lib/propal.lib.php
+ * \file htdocs/core/lib/propal.lib.php
* \brief Ensemble de fonctions de base pour le module propal
* \ingroup propal
*/
@@ -81,7 +81,7 @@ function propal_prepare_head($object)
$head[$h][0] = DOL_URL_ROOT.'/comm/propal/document.php?id='.$object->id;
/*$filesdir = $conf->propale->dir_output . "/" . dol_sanitizeFileName($propal->ref);
- include_once(DOL_DOCUMENT_ROOT.'/lib/files.lib.php');
+ include_once(DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php');
$listoffiles=dol_dir_list($filesdir,'files',1);
$head[$h][1] = (count($listoffiles)?$langs->trans('DocumentsNb',count($listoffiles)):$langs->trans('Documents'));*/
$head[$h][1] = $langs->trans('Documents');
diff --git a/htdocs/lib/report.lib.php b/htdocs/core/lib/report.lib.php
similarity index 98%
rename from htdocs/lib/report.lib.php
rename to htdocs/core/lib/report.lib.php
index 1485d92608d926aa9a1f8d34cf7324a00a1177cd..2df28ab9218023dc01755e09cfd12415a5fe9c0d 100644
--- a/htdocs/lib/report.lib.php
+++ b/htdocs/core/lib/report.lib.php
@@ -17,7 +17,7 @@
*/
/**
- * \file htdocs/lib/report.lib.php
+ * \file htdocs/core/lib/report.lib.php
* \brief Set of functions for reporting
*/
diff --git a/htdocs/lib/sendings.lib.php b/htdocs/core/lib/sendings.lib.php
similarity index 99%
rename from htdocs/lib/sendings.lib.php
rename to htdocs/core/lib/sendings.lib.php
index 0ee728e22ecf02e07590f12fbd2de2a567af9d9a..de6b38c669cff26213789b80d78c79f8993702a3 100644
--- a/htdocs/lib/sendings.lib.php
+++ b/htdocs/core/lib/sendings.lib.php
@@ -16,7 +16,7 @@
*/
/**
- * \file htdocs/lib/sendings.lib.php
+ * \file htdocs/core/lib/sendings.lib.php
* \ingroup expedition
* \brief Library for expedition module
*/
diff --git a/htdocs/lib/stock.lib.php b/htdocs/core/lib/stock.lib.php
similarity index 98%
rename from htdocs/lib/stock.lib.php
rename to htdocs/core/lib/stock.lib.php
index a1894b38634c664d028d737b61372c8e9c2a2639..6623a961e2d7fc61b3d035e4cd66c820b055790f 100644
--- a/htdocs/lib/stock.lib.php
+++ b/htdocs/core/lib/stock.lib.php
@@ -17,7 +17,7 @@
*/
/**
- * \file htdocs/lib/stock.lib.php
+ * \file htdocs/core/lib/stock.lib.php
* \brief Library file with function for stock module
*/
diff --git a/htdocs/lib/tax.lib.php b/htdocs/core/lib/tax.lib.php
similarity index 99%
rename from htdocs/lib/tax.lib.php
rename to htdocs/core/lib/tax.lib.php
index 8f940c24e6789bcb75dc958155ee55cc5db91cc1..d205b155185a24a7619adb4f2de727b3bb447b53 100644
--- a/htdocs/lib/tax.lib.php
+++ b/htdocs/core/lib/tax.lib.php
@@ -18,7 +18,7 @@
*/
/**
- * \file htdocs/lib/tax.lib.php
+ * \file htdocs/core/lib/tax.lib.php
* \ingroup tax
* \brief Library for tax module
*/
diff --git a/htdocs/lib/usergroups.lib.php b/htdocs/core/lib/usergroups.lib.php
similarity index 99%
rename from htdocs/lib/usergroups.lib.php
rename to htdocs/core/lib/usergroups.lib.php
index 9058ff28f2e3582dd99044d04ba64723cf58784e..cef75daef659d04804b77ad8eef56713d6452526 100644
--- a/htdocs/lib/usergroups.lib.php
+++ b/htdocs/core/lib/usergroups.lib.php
@@ -19,7 +19,7 @@
/**
- * \file htdocs/lib/usergroups.lib.php
+ * \file htdocs/core/lib/usergroups.lib.php
* \brief Ensemble de fonctions de base pour la gestion des utilisaterus et groupes
*/
function user_prepare_head($object)
diff --git a/htdocs/lib/ws.lib.php b/htdocs/core/lib/ws.lib.php
similarity index 98%
rename from htdocs/lib/ws.lib.php
rename to htdocs/core/lib/ws.lib.php
index c7d2c0194537c4a7a07522451945150ce81eb0ed..f93513bcbdc2e6bf11603171b6153e5cc4760aa5 100755
--- a/htdocs/lib/ws.lib.php
+++ b/htdocs/core/lib/ws.lib.php
@@ -17,7 +17,7 @@
*/
/**
- * \file htdocs/lib/ws.lib.php
+ * \file htdocs/core/lib/ws.lib.php
* \ingroup webservices
* \brief Set of function for manipulating web services
*/
diff --git a/htdocs/lib/xcal.lib.php b/htdocs/core/lib/xcal.lib.php
similarity index 99%
rename from htdocs/lib/xcal.lib.php
rename to htdocs/core/lib/xcal.lib.php
index e26f04bfa6d34c0f1c3fdfeb1e40895ee2551378..9ddefa83def38e8c199758a82df25076b8dbcf4a 100644
--- a/htdocs/lib/xcal.lib.php
+++ b/htdocs/core/lib/xcal.lib.php
@@ -17,7 +17,7 @@
/**
- * \file htdocs/lib/xcal.lib.php
+ * \file htdocs/core/lib/xcal.lib.php
* \brief Function to manage calendar files (vcal/ical/...)
*/
diff --git a/htdocs/core/photos_resize.php b/htdocs/core/photos_resize.php
index 2b1a82029933fbe77d36696fb8935e62d89295b9..fbde981779ca5de38be432dec68b1c9e6e42afa2 100644
--- a/htdocs/core/photos_resize.php
+++ b/htdocs/core/photos_resize.php
@@ -34,7 +34,7 @@
//if (! defined("NOLOGIN")) define("NOLOGIN",'1'); // If this page is public (can be called outside logged session)
require("../main.inc.php");
-require_once(DOL_DOCUMENT_ROOT."/lib/product.lib.php");
+require_once(DOL_DOCUMENT_ROOT."/core/lib/product.lib.php");
require_once(DOL_DOCUMENT_ROOT."/core/lib/images.lib.php");
require_once(DOL_DOCUMENT_ROOT."/product/class/product.class.php");
diff --git a/htdocs/document.php b/htdocs/document.php
index 8c06ea3078c8346c661763f791fb2daf0619bd15..6a96f4c97e5bfbcfde7c3a1dad135d9b99c0034d 100644
--- a/htdocs/document.php
+++ b/htdocs/document.php
@@ -47,7 +47,7 @@ if (! defined('NOREQUIREAJAX')) define('NOREQUIREAJAX','1');
function llxHeader() { }
require("./main.inc.php"); // Load $user and permissions
-require_once(DOL_DOCUMENT_ROOT.'/lib/files.lib.php');
+require_once(DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php');
$encoding = '';
$action = GETPOST("action");
diff --git a/htdocs/ecm/class/ecmdirectory.class.php b/htdocs/ecm/class/ecmdirectory.class.php
index ac8429d0c0df7a13972e7c64b3259f3a3007cc6a..31adb1bca7c04893adb6b511e2b7f665eb7d75cf 100644
--- a/htdocs/ecm/class/ecmdirectory.class.php
+++ b/htdocs/ecm/class/ecmdirectory.class.php
@@ -322,7 +322,7 @@ class EcmDirectory // extends CommonObject
function delete($user)
{
global $conf, $langs;
- require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php");
+ require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
$relativepath=$this->getRelativePath(1); // Ex: dir1/dir2/dir3
@@ -643,7 +643,7 @@ class EcmDirectory // extends CommonObject
function refreshcachenboffile($all=0)
{
global $conf;
- include_once(DOL_DOCUMENT_ROOT.'/lib/files.lib.php');
+ include_once(DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php');
$dir=$conf->ecm->dir_output.'/'.$this->getRelativePath();
$filelist=dol_dir_list($dir,'files',0,'','\.meta$');
diff --git a/htdocs/ecm/docfile.php b/htdocs/ecm/docfile.php
index feb37ef27f72f9fef9f0c02b88f21041980bf495..ec851c6e2fabb6583ce0a280aa419c6bb0577d04 100644
--- a/htdocs/ecm/docfile.php
+++ b/htdocs/ecm/docfile.php
@@ -25,8 +25,8 @@
require("../main.inc.php");
require_once(DOL_DOCUMENT_ROOT."/core/class/html.formfile.class.php");
require_once(DOL_DOCUMENT_ROOT."/ecm/class/ecmdirectory.class.php");
-require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php");
-require_once(DOL_DOCUMENT_ROOT."/lib/ecm.lib.php");
+require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
+require_once(DOL_DOCUMENT_ROOT."/core/lib/ecm.lib.php");
// Load traductions files
$langs->load("ecm");
diff --git a/htdocs/ecm/docmine.php b/htdocs/ecm/docmine.php
index 2fd20a9ed269b7e138f3b9a3319106155698b9fc..c0ffe1aa7ddd2f467256cf4a44accadd12be09b8 100644
--- a/htdocs/ecm/docmine.php
+++ b/htdocs/ecm/docmine.php
@@ -26,8 +26,8 @@
require("../main.inc.php");
require_once(DOL_DOCUMENT_ROOT."/core/class/html.formfile.class.php");
require_once(DOL_DOCUMENT_ROOT."/ecm/class/ecmdirectory.class.php");
-require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php");
-require_once(DOL_DOCUMENT_ROOT."/lib/ecm.lib.php");
+require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
+require_once(DOL_DOCUMENT_ROOT."/core/lib/ecm.lib.php");
// Load traductions files
@@ -83,7 +83,7 @@ $upload_dir = $conf->ecm->dir_output.'/'.$relativepath;
// Upload file
if (GETPOST("sendit") && ! empty($conf->global->MAIN_UPLOAD_DOC))
{
- require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php");
+ require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
if (create_exdir($upload_dir) >= 0)
{
diff --git a/htdocs/ecm/docother.php b/htdocs/ecm/docother.php
index 1d98e484af1adbdab20186776c3743e73858ae60..973ee2a4e4a5c742ac79e5afd1d97478afa3d3bc 100644
--- a/htdocs/ecm/docother.php
+++ b/htdocs/ecm/docother.php
@@ -11,7 +11,7 @@
require("../main.inc.php");
require_once(DOL_DOCUMENT_ROOT."/core/class/html.formfile.class.php");
-require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php");
+require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
// Load traductions files
$langs->load("ecm");
@@ -46,7 +46,7 @@ $upload_dir = $conf->ecm->dir_output.'/'.$section;
// Envoie fichier
if ( $_POST["sendit"] && ! empty($conf->global->MAIN_UPLOAD_DOC))
{
- require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php");
+ require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
if (create_exdir($upload_dir) >= 0)
{
diff --git a/htdocs/ecm/index.php b/htdocs/ecm/index.php
index 83a283fde35560e94b8bab11629e923e751e7387..2609e5eb72310c4e27a63f3b63b9d9ae7d8c2b3b 100644
--- a/htdocs/ecm/index.php
+++ b/htdocs/ecm/index.php
@@ -27,8 +27,8 @@ if (! defined('REQUIRE_JQUERY_LAYOUT')) define('REQUIRE_JQUERY_LAYOUT','1');
require("../main.inc.php");
require_once(DOL_DOCUMENT_ROOT."/core/class/html.formfile.class.php");
-require_once(DOL_DOCUMENT_ROOT."/lib/ecm.lib.php");
-require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php");
+require_once(DOL_DOCUMENT_ROOT."/core/lib/ecm.lib.php");
+require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
require_once(DOL_DOCUMENT_ROOT."/core/lib/treeview.lib.php");
require_once(DOL_DOCUMENT_ROOT."/ecm/class/ecmdirectory.class.php");
diff --git a/htdocs/ecm/search.php b/htdocs/ecm/search.php
index 7b1005493de6fb97e83879e98f48700c5d18728a..f3e0016ee9d08da784cddd37847c0729aa129e53 100644
--- a/htdocs/ecm/search.php
+++ b/htdocs/ecm/search.php
@@ -25,8 +25,8 @@
require("../main.inc.php");
require_once(DOL_DOCUMENT_ROOT."/core/class/html.formfile.class.php");
-require_once(DOL_DOCUMENT_ROOT."/lib/ecm.lib.php");
-require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php");
+require_once(DOL_DOCUMENT_ROOT."/core/lib/ecm.lib.php");
+require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
require_once(DOL_DOCUMENT_ROOT."/core/lib/treeview.lib.php");
require_once(DOL_DOCUMENT_ROOT."/ecm/class/ecmdirectory.class.php");
diff --git a/htdocs/expedition/class/expedition.class.php b/htdocs/expedition/class/expedition.class.php
index cb9da1f79891a2e5f1fa4416eb6aa3dd8c7a8463..30a5067879690b4911c71a171fab17a49f19efab 100644
--- a/htdocs/expedition/class/expedition.class.php
+++ b/htdocs/expedition/class/expedition.class.php
@@ -421,7 +421,7 @@ class Expedition extends CommonObject
{
global $conf, $langs;
- require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php");
+ require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
dol_syslog("Expedition::valid");
@@ -770,7 +770,7 @@ class Expedition extends CommonObject
{
global $conf, $langs, $user;
- require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php");
+ require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
$this->db->begin();
$sql = "DELETE FROM ".MAIN_DB_PREFIX."expeditiondet";
diff --git a/htdocs/expedition/fiche.php b/htdocs/expedition/fiche.php
index d049528d8e468b1fb44143207b72ea4222f8c852..19bf39dcb846e0524ef35dc5fba39278823d462e 100644
--- a/htdocs/expedition/fiche.php
+++ b/htdocs/expedition/fiche.php
@@ -32,8 +32,8 @@ require_once(DOL_DOCUMENT_ROOT."/expedition/class/expedition.class.php");
require_once(DOL_DOCUMENT_ROOT."/includes/modules/expedition/pdf/ModelePdfExpedition.class.php");
require_once(DOL_DOCUMENT_ROOT."/core/class/html.formfile.class.php");
require_once(DOL_DOCUMENT_ROOT."/product/class/html.formproduct.class.php");
-require_once(DOL_DOCUMENT_ROOT."/lib/product.lib.php");
-require_once(DOL_DOCUMENT_ROOT."/lib/sendings.lib.php");
+require_once(DOL_DOCUMENT_ROOT."/core/lib/product.lib.php");
+require_once(DOL_DOCUMENT_ROOT."/core/lib/sendings.lib.php");
if ($conf->product->enabled || $conf->service->enabled) require_once(DOL_DOCUMENT_ROOT."/product/class/product.class.php");
if ($conf->propal->enabled) require_once(DOL_DOCUMENT_ROOT."/comm/propal/class/propal.class.php");
if ($conf->commande->enabled) require_once(DOL_DOCUMENT_ROOT."/commande/class/commande.class.php");
@@ -287,7 +287,7 @@ if ($action == 'builddoc') // En get ou en post
*/
if ($_POST['addfile'])
{
- require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php");
+ require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
// Set tmp user directory TODO Use a dedicated directory for temp mails files
$vardir=$conf->user->dir_output."/".$user->id;
@@ -303,7 +303,7 @@ if ($_POST['addfile'])
*/
if (! empty($_POST['removedfile']))
{
- require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php");
+ require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
// Set tmp user directory
$vardir=$conf->user->dir_output."/".$user->id;
diff --git a/htdocs/expedition/shipment.php b/htdocs/expedition/shipment.php
index 1e0050ba7923c796d7fc8525f319bd99ba686061..9b37eb076b4eafeba4f3362c8673a591c8cf504a 100644
--- a/htdocs/expedition/shipment.php
+++ b/htdocs/expedition/shipment.php
@@ -28,8 +28,8 @@ require("../main.inc.php");
require_once(DOL_DOCUMENT_ROOT."/expedition/class/expedition.class.php");
require_once(DOL_DOCUMENT_ROOT."/core/class/html.formfile.class.php");
require_once(DOL_DOCUMENT_ROOT."/product/class/html.formproduct.class.php");
-require_once(DOL_DOCUMENT_ROOT."/lib/order.lib.php");
-require_once(DOL_DOCUMENT_ROOT."/lib/sendings.lib.php");
+require_once(DOL_DOCUMENT_ROOT."/core/lib/order.lib.php");
+require_once(DOL_DOCUMENT_ROOT."/core/lib/sendings.lib.php");
if ($conf->product->enabled || $conf->service->enabled) require_once(DOL_DOCUMENT_ROOT."/product/class/product.class.php");
if ($conf->projet->enabled) require_once(DOL_DOCUMENT_ROOT."/projet/class/project.class.php");
if ($conf->propal->enabled) require_once(DOL_DOCUMENT_ROOT."/comm/propal/class/propal.class.php");
diff --git a/htdocs/fichinter/apercu.php b/htdocs/fichinter/apercu.php
index b58b40c9e3ece0359f4cc2358ef521b6fc983335..7fe564aa9484aa54457e898c6356989d2dc517f9 100644
--- a/htdocs/fichinter/apercu.php
+++ b/htdocs/fichinter/apercu.php
@@ -24,8 +24,8 @@
*/
require("../main.inc.php");
-require_once(DOL_DOCUMENT_ROOT."/lib/fichinter.lib.php");
-require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php");
+require_once(DOL_DOCUMENT_ROOT."/core/lib/fichinter.lib.php");
+require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
require_once(DOL_DOCUMENT_ROOT.'/fichinter/class/fichinter.class.php');
if ($conf->projet->enabled) require_once(DOL_DOCUMENT_ROOT."/projet/class/project.class.php");
diff --git a/htdocs/fichinter/class/fichinter.class.php b/htdocs/fichinter/class/fichinter.class.php
index 6d240bfb31def18ca19e2daa0ee4e0b24fa9273e..cac377c7b3539c30a889e8ce07bd887887815fe6 100644
--- a/htdocs/fichinter/class/fichinter.class.php
+++ b/htdocs/fichinter/class/fichinter.class.php
@@ -555,7 +555,7 @@ class Fichinter extends CommonObject
function delete($user)
{
global $conf;
- require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php");
+ require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
$error=0;
diff --git a/htdocs/fichinter/contact.php b/htdocs/fichinter/contact.php
index 77c2aa75d9898ec987e5298f6ecaa71aed21f989..a5893d6f4195776ae7a2031cd11de6cd02b80137 100644
--- a/htdocs/fichinter/contact.php
+++ b/htdocs/fichinter/contact.php
@@ -25,7 +25,7 @@
require("../main.inc.php");
require_once(DOL_DOCUMENT_ROOT."/fichinter/class/fichinter.class.php");
require_once(DOL_DOCUMENT_ROOT."/contact/class/contact.class.php");
-require_once(DOL_DOCUMENT_ROOT."/lib/fichinter.lib.php");
+require_once(DOL_DOCUMENT_ROOT."/core/lib/fichinter.lib.php");
require_once(DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php');
$langs->load("interventions");
diff --git a/htdocs/fichinter/document.php b/htdocs/fichinter/document.php
index d55461e5fc29ec072d894b281670eb221940c4ab..872d191cd1faf6af07871e96ec8453666762bf87 100644
--- a/htdocs/fichinter/document.php
+++ b/htdocs/fichinter/document.php
@@ -28,8 +28,8 @@
require("../main.inc.php");
require_once(DOL_DOCUMENT_ROOT."/fichinter/class/fichinter.class.php");
-require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php");
-require_once(DOL_DOCUMENT_ROOT."/lib/fichinter.lib.php");
+require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
+require_once(DOL_DOCUMENT_ROOT."/core/lib/fichinter.lib.php");
require_once(DOL_DOCUMENT_ROOT."/core/class/html.formfile.class.php");
$langs->load("other");
@@ -69,7 +69,7 @@ $modulepart='fichinter';
*/
if (GETPOST("sendit") && ! empty($conf->global->MAIN_UPLOAD_DOC))
{
- require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php");
+ require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
if (create_exdir($upload_dir) >= 0)
{
diff --git a/htdocs/fichinter/fiche.php b/htdocs/fichinter/fiche.php
index 5535aeaffba08e64ba4c62c8a35d6b83cd1400eb..314b810cf725837c7307331e560bbe3db95e825e 100644
--- a/htdocs/fichinter/fiche.php
+++ b/htdocs/fichinter/fiche.php
@@ -28,11 +28,11 @@ require("../main.inc.php");
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."/core/lib/fichinter.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");
+ require_once(DOL_DOCUMENT_ROOT."/core/lib/project.lib.php");
require_once(DOL_DOCUMENT_ROOT."/projet/class/project.class.php");
}
if (! empty($conf->global->FICHEINTER_ADDON) && is_readable(DOL_DOCUMENT_ROOT ."/includes/modules/fichinter/mod_".$conf->global->FICHEINTER_ADDON.".php"))
@@ -458,7 +458,7 @@ if ($action == 'down' && $user->rights->ficheinter->creer)
*/
if ($_POST['addfile'])
{
- require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php");
+ require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
// Set tmp user directory TODO Use a dedicated directory for temp mails files
$vardir=$conf->user->dir_output."/".$user->id;
@@ -474,7 +474,7 @@ if ($_POST['addfile'])
*/
if (! empty($_POST['removedfile']))
{
- require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php");
+ require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
// Set tmp user directory
$vardir=$conf->user->dir_output."/".$user->id;
diff --git a/htdocs/fichinter/info.php b/htdocs/fichinter/info.php
index baea3fa8ec53984db8dd7ec0823267b72c7338ec..05c74544d24ef7e01a130cec340dcd6da05e47df 100644
--- a/htdocs/fichinter/info.php
+++ b/htdocs/fichinter/info.php
@@ -26,7 +26,7 @@
require("../main.inc.php");
require_once(DOL_DOCUMENT_ROOT."/core/lib/functions2.lib.php");
require_once(DOL_DOCUMENT_ROOT."/fichinter/class/fichinter.class.php");
-require_once(DOL_DOCUMENT_ROOT."/lib/fichinter.lib.php");
+require_once(DOL_DOCUMENT_ROOT."/core/lib/fichinter.lib.php");
$langs->load('companies');
$langs->load("interventions");
diff --git a/htdocs/fichinter/note.php b/htdocs/fichinter/note.php
index 65a6b9c6e479938cb86c767ca1b136dccfac2952..764e02bba0bbf48a51cee863faa6f43d0f1c042d 100644
--- a/htdocs/fichinter/note.php
+++ b/htdocs/fichinter/note.php
@@ -24,7 +24,7 @@
require("../main.inc.php");
require_once(DOL_DOCUMENT_ROOT."/fichinter/class/fichinter.class.php");
-require_once(DOL_DOCUMENT_ROOT."/lib/fichinter.lib.php");
+require_once(DOL_DOCUMENT_ROOT."/core/lib/fichinter.lib.php");
$langs->load('companies');
$langs->load("interventions");
diff --git a/htdocs/filefunc.inc.php b/htdocs/filefunc.inc.php
index f91dc0003d96d561b33f15b3f9b7bf933b87f23c..8695e9d60045a167ecb7d16d7b8b428027058897 100755
--- a/htdocs/filefunc.inc.php
+++ b/htdocs/filefunc.inc.php
@@ -205,14 +205,14 @@ if (! defined('DOL_DEFAULT_TTF_BOLD')) { define('DOL_DEFAULT_TTF_BOLD', (!isset(
if (! defined('ADODB_DATE_VERSION')) include_once(ADODB_PATH.'adodb-time.inc.php');
-if (! file_exists(DOL_DOCUMENT_ROOT ."/lib/functions.lib.php"))
+if (! file_exists(DOL_DOCUMENT_ROOT ."/core/lib/functions.lib.php"))
{
print "Error: Dolibarr config file content seems to be not correctly defined.<br>\n";
print "Please run dolibarr setup by calling page <b>/install</b>.<br>\n";
exit;
}
-include_once(DOL_DOCUMENT_ROOT ."/lib/functions.lib.php"); // Need 970ko memory (1.1 in 2.2)
+include_once(DOL_DOCUMENT_ROOT ."/core/lib/functions.lib.php"); // Need 970ko memory (1.1 in 2.2)
include_once(DOL_DOCUMENT_ROOT ."/core/lib/security.lib.php"); // Include by default
// If password is encoded, we decode it
diff --git a/htdocs/fourn/class/fournisseur.commande.class.php b/htdocs/fourn/class/fournisseur.commande.class.php
index f92cd5b2f00da37d1fb585b4f1558cd9a0cbe548..51f2ef6667159fb5f6f5d49a52dd781ab0355eac 100644
--- a/htdocs/fourn/class/fournisseur.commande.class.php
+++ b/htdocs/fourn/class/fournisseur.commande.class.php
@@ -272,7 +272,7 @@ class CommandeFournisseur extends Commande
function valid($user)
{
global $langs,$conf;
- require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php");
+ require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
$error=0;
@@ -933,7 +933,7 @@ class CommandeFournisseur extends Commande
global $langs,$mysoc;
dol_syslog("FournisseurCommande::addline $desc, $pu_ht, $qty, $txtva, $txlocaltax1, $txlocaltax2. $fk_product, $fk_prod_fourn_price, $fourn_ref, $remise_percent, $price_base_type, $pu_ttc, $type");
- include_once(DOL_DOCUMENT_ROOT.'/lib/price.lib.php');
+ include_once(DOL_DOCUMENT_ROOT.'/core/lib/price.lib.php');
// Clean parameters
if (! $qty) $qty=1;
@@ -1565,7 +1565,7 @@ class CommandeFournisseur extends Commande
function updateline($rowid, $desc, $pu, $qty, $remise_percent=0, $txtva, $txlocaltax1=0, $txlocaltax2=0, $price_base_type='HT', $info_bits=0, $type=0)
{
dol_syslog("CommandeFournisseur::UpdateLine $rowid, $desc, $pu, $qty, $remise_percent, $txtva, $price_base_type, $info_bits, $type");
- include_once(DOL_DOCUMENT_ROOT.'/lib/price.lib.php');
+ include_once(DOL_DOCUMENT_ROOT.'/core/lib/price.lib.php');
if ($this->brouillon)
{
diff --git a/htdocs/fourn/class/fournisseur.facture.class.php b/htdocs/fourn/class/fournisseur.facture.class.php
index f407958435a30e9f1c2744080faedb8edd02adba..9247057f4ed231f9864e085ac982146a46a580ae 100644
--- a/htdocs/fourn/class/fournisseur.facture.class.php
+++ b/htdocs/fourn/class/fournisseur.facture.class.php
@@ -928,7 +928,7 @@ class FactureFournisseur extends Facture
function addline($desc, $pu, $txtva, $txlocaltax1=0, $txlocaltax2=0, $qty, $fk_product=0, $remise_percent=0, $date_start='', $date_end='', $ventil=0, $info_bits='', $price_base_type='HT', $type=0)
{
dol_syslog("FactureFourn::Addline $desc,$pu,$qty,$txtva,$fk_product,$remise_percent,$date_start,$date_end,$ventil,$info_bits,$price_base_type,$type", LOG_DEBUG);
- include_once(DOL_DOCUMENT_ROOT.'/lib/price.lib.php');
+ include_once(DOL_DOCUMENT_ROOT.'/core/lib/price.lib.php');
// Clean parameters
if ($txtva == '') $txtva=0;
@@ -988,7 +988,7 @@ class FactureFournisseur extends Facture
*/
function updateline($id, $label, $pu, $vatrate, $txlocaltax1=0, $txlocaltax2=0, $qty=1, $idproduct=0, $price_base_type='HT', $info_bits=0, $type=0)
{
- include_once(DOL_DOCUMENT_ROOT.'/lib/price.lib.php');
+ include_once(DOL_DOCUMENT_ROOT.'/core/lib/price.lib.php');
$pu = price2num($pu);
$qty = price2num($qty);
diff --git a/htdocs/fourn/commande/contact.php b/htdocs/fourn/commande/contact.php
index 8a7cc08aa505ff398c7095ba2aded7e24747576a..08f6244a93ce0889a8e46f7bbd1a783f1c3ee129 100644
--- a/htdocs/fourn/commande/contact.php
+++ b/htdocs/fourn/commande/contact.php
@@ -26,7 +26,7 @@
require("../../main.inc.php");
require_once(DOL_DOCUMENT_ROOT."/fourn/class/fournisseur.commande.class.php");
require_once(DOL_DOCUMENT_ROOT."/contact/class/contact.class.php");
-require_once DOL_DOCUMENT_ROOT."/lib/fourn.lib.php";
+require_once DOL_DOCUMENT_ROOT."/core/lib/fourn.lib.php";
require_once(DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php');
$langs->load("facture");
diff --git a/htdocs/fourn/commande/dispatch.php b/htdocs/fourn/commande/dispatch.php
index 0bb534d89e212b647380e987177f2373bc802559..e569912f3bbe637e68fda63115f23f645104a9bb 100644
--- a/htdocs/fourn/commande/dispatch.php
+++ b/htdocs/fourn/commande/dispatch.php
@@ -29,7 +29,7 @@
require("../../main.inc.php");
require_once(DOL_DOCUMENT_ROOT.'/includes/modules/supplier_order/modules_commandefournisseur.php');
require_once(DOL_DOCUMENT_ROOT."/product/stock/class/entrepot.class.php");
-require_once(DOL_DOCUMENT_ROOT."/lib/fourn.lib.php");
+require_once(DOL_DOCUMENT_ROOT."/core/lib/fourn.lib.php");
require_once(DOL_DOCUMENT_ROOT."/fourn/class/fournisseur.commande.class.php");
if ($conf->projet->enabled) require_once(DOL_DOCUMENT_ROOT.'/projet/class/project.class.php');
diff --git a/htdocs/fourn/commande/document.php b/htdocs/fourn/commande/document.php
index d28530f13481237e24d63022fdab7a584adf098d..31d2ef5749a06680e2bbc50bc5fc9df13bed2b50 100644
--- a/htdocs/fourn/commande/document.php
+++ b/htdocs/fourn/commande/document.php
@@ -25,9 +25,9 @@
*/
require("../../main.inc.php");
-require_once(DOL_DOCUMENT_ROOT.'/lib/order.lib.php');
-require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php");
-require_once(DOL_DOCUMENT_ROOT."/lib/fourn.lib.php");
+require_once(DOL_DOCUMENT_ROOT.'/core/lib/order.lib.php');
+require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
+require_once(DOL_DOCUMENT_ROOT."/core/lib/fourn.lib.php");
require_once(DOL_DOCUMENT_ROOT."/core/class/html.formfile.class.php");
require_once DOL_DOCUMENT_ROOT."/fourn/class/fournisseur.commande.class.php";
@@ -74,7 +74,7 @@ if ($commande->fetch($_GET['id'],$_GET['ref']) < 0)
// Envoi fichier
if ($_POST["sendit"] && ! empty($conf->global->MAIN_UPLOAD_DOC))
{
- require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php");
+ require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
$upload_dir = $conf->fournisseur->dir_output . "/commande/" . dol_sanitizeFileName($commande->ref);
diff --git a/htdocs/fourn/commande/fiche.php b/htdocs/fourn/commande/fiche.php
index 486ee57581fca41a6dc688b1ef828af4e76e39c9..3316766f8d5e20d11ca007667c40e59c2417fbfb 100644
--- a/htdocs/fourn/commande/fiche.php
+++ b/htdocs/fourn/commande/fiche.php
@@ -34,7 +34,7 @@ require_once(DOL_DOCUMENT_ROOT.'/includes/modules/supplier_order/modules_command
require_once DOL_DOCUMENT_ROOT."/fourn/class/fournisseur.commande.class.php";
require_once DOL_DOCUMENT_ROOT."/fourn/class/fournisseur.product.class.php";
require_once DOL_DOCUMENT_ROOT."/product/class/product.class.php";
-require_once DOL_DOCUMENT_ROOT."/lib/fourn.lib.php";
+require_once DOL_DOCUMENT_ROOT."/core/lib/fourn.lib.php";
require_once(DOL_DOCUMENT_ROOT."/core/lib/functions2.lib.php");
if ($conf->projet->enabled) require_once(DOL_DOCUMENT_ROOT.'/projet/class/project.class.php');
@@ -524,7 +524,7 @@ if ($action == 'builddoc') // En get ou en post
// Delete file in doc form
if ($action=='remove_file')
{
- require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php");
+ require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
if ($object->fetch($id))
{
@@ -574,7 +574,7 @@ if ($action == 'create')
*/
if ($_POST['addfile'])
{
- require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php");
+ require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
// Set tmp user directory TODO Use a dedicated directory for temp mails files
$vardir=$conf->user->dir_output."/".$user->id;
@@ -590,7 +590,7 @@ if ($_POST['addfile'])
*/
if (! empty($_POST['removedfile']))
{
- require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php");
+ require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
// Set tmp user directory
$vardir=$conf->user->dir_output."/".$user->id;
diff --git a/htdocs/fourn/commande/history.php b/htdocs/fourn/commande/history.php
index 98b64f2d185dee5f2da1a15830e462ffca5f13db..a28f3ee4b0d6f09e258c619fe1ceea1f89e39e29 100644
--- a/htdocs/fourn/commande/history.php
+++ b/htdocs/fourn/commande/history.php
@@ -24,7 +24,7 @@
*/
require("../../main.inc.php");
-require_once(DOL_DOCUMENT_ROOT."/lib/fourn.lib.php");
+require_once(DOL_DOCUMENT_ROOT."/core/lib/fourn.lib.php");
require_once(DOL_DOCUMENT_ROOT."/fourn/class/fournisseur.commande.class.php");
$langs->load("orders");
diff --git a/htdocs/fourn/commande/note.php b/htdocs/fourn/commande/note.php
index d0bd737f37472ba2fd1971af480029d826b2ecb5..efef39c24b7f96c1a0570c032b14e72e6e87cbc1 100644
--- a/htdocs/fourn/commande/note.php
+++ b/htdocs/fourn/commande/note.php
@@ -24,7 +24,7 @@
*/
require("../../main.inc.php");
-require_once(DOL_DOCUMENT_ROOT."/lib/fourn.lib.php");
+require_once(DOL_DOCUMENT_ROOT."/core/lib/fourn.lib.php");
require_once(DOL_DOCUMENT_ROOT."/fourn/class/fournisseur.commande.class.php");
$langs->load("orders");
diff --git a/htdocs/fourn/facture/contact.php b/htdocs/fourn/facture/contact.php
index d05b29d7888173b8e3d1cf6d5835a038e94947a6..25274ccf72dc75b027b9d70e82a868a3990ca7b0 100644
--- a/htdocs/fourn/facture/contact.php
+++ b/htdocs/fourn/facture/contact.php
@@ -27,7 +27,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/fourn.lib.php');
+require_once(DOL_DOCUMENT_ROOT.'/core/lib/fourn.lib.php');
require_once(DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php');
$langs->load("bills");
diff --git a/htdocs/fourn/facture/document.php b/htdocs/fourn/facture/document.php
index fd7b4de18c5282d959de3d82f9a0ab8b03656761..b0c0ab10a2e93e2f3de6826df4766ee45a7a498d 100644
--- a/htdocs/fourn/facture/document.php
+++ b/htdocs/fourn/facture/document.php
@@ -27,8 +27,8 @@
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.'/lib/fourn.lib.php');
-require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php");
+require_once(DOL_DOCUMENT_ROOT.'/core/lib/fourn.lib.php');
+require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
require_once(DOL_DOCUMENT_ROOT."/core/class/html.formfile.class.php");
$langs->load('bills');
@@ -62,7 +62,7 @@ if (! $sortfield) $sortfield="name";
// Envoi fichier
if ($_POST['sendit'] && ! empty($conf->global->MAIN_UPLOAD_DOC))
{
- require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php");
+ require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
$facture = new FactureFournisseur($db);
if ($facture->fetch($facid))
diff --git a/htdocs/fourn/facture/fiche.php b/htdocs/fourn/facture/fiche.php
index 8b3be30dc7922604af54c4bfd02471f38dce71da..7e21975f9c92132ade410459670ee2990ee63c35 100644
--- a/htdocs/fourn/facture/fiche.php
+++ b/htdocs/fourn/facture/fiche.php
@@ -32,7 +32,7 @@ require_once(DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.class.php');
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.'/fourn/class/paiementfourn.class.php');
-require_once(DOL_DOCUMENT_ROOT.'/lib/fourn.lib.php');
+require_once(DOL_DOCUMENT_ROOT.'/core/lib/fourn.lib.php');
require_once(DOL_DOCUMENT_ROOT.'/product/class/product.class.php');
if ($conf->projet->enabled) require_once(DOL_DOCUMENT_ROOT.'/projet/class/project.class.php');
@@ -620,7 +620,7 @@ if ($action == 'reopen' && $user->rights->fournisseur->facture->creer)
*/
if ($_POST['addfile'])
{
- require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php");
+ require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
// Set tmp user directory TODO Use a dedicated directory for temp mails files
$vardir=$conf->user->dir_output."/".$user->id;
@@ -636,7 +636,7 @@ if ($_POST['addfile'])
*/
if (! empty($_POST['removedfile']))
{
- require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php");
+ require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
// Set tmp user directory
$vardir=$conf->user->dir_output."/".$user->id;
@@ -838,7 +838,7 @@ if ($action == 'builddoc')
// Delete file in doc form
if ($action == 'remove_file')
{
- require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php");
+ require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
if ($object->fetch($id))
{
diff --git a/htdocs/fourn/facture/info.php b/htdocs/fourn/facture/info.php
index 2efeb38f6120062c986d37a9f3d3c9d6c79cae65..71daf72ec81c1aee0fa821094772cc0b7689083b 100644
--- a/htdocs/fourn/facture/info.php
+++ b/htdocs/fourn/facture/info.php
@@ -27,7 +27,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."/core/lib/functions2.lib.php");
-require_once(DOL_DOCUMENT_ROOT.'/lib/fourn.lib.php');
+require_once(DOL_DOCUMENT_ROOT.'/core/lib/fourn.lib.php');
$langs->load('bills');
diff --git a/htdocs/fourn/facture/note.php b/htdocs/fourn/facture/note.php
index e8af8fe7fc11c0d5a6b1e1580fd8d05d5ea6c9e1..ea40e32c645abc00edf33e842e8698ee1c0e36b6 100644
--- a/htdocs/fourn/facture/note.php
+++ b/htdocs/fourn/facture/note.php
@@ -24,7 +24,7 @@
*/
require("../../main.inc.php");
-require_once(DOL_DOCUMENT_ROOT.'/lib/fourn.lib.php');
+require_once(DOL_DOCUMENT_ROOT.'/core/lib/fourn.lib.php');
require_once(DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.class.php');
require_once(DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php');
diff --git a/htdocs/ftp/index.php b/htdocs/ftp/index.php
index 1c45855c89f9a7a82cfef96e7bd405fd8b18433e..0ea5c62a2d7cf930971374486fc66ba2449a75ea 100644
--- a/htdocs/ftp/index.php
+++ b/htdocs/ftp/index.php
@@ -25,7 +25,7 @@
require("./pre.inc.php"); // We use pre.inc.php to have a dynamic menu
require_once(DOL_DOCUMENT_ROOT."/core/class/html.formfile.class.php");
-require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php");
+require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
require_once(DOL_DOCUMENT_ROOT."/core/lib/treeview.lib.php");
// Load traductions files
@@ -82,7 +82,7 @@ $conn_id=0; // FTP connection ID
// Envoie fichier
if ( $_POST["sendit"] && ! empty($conf->global->MAIN_UPLOAD_DOC))
{
- require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php");
+ require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
$result=$ecmdir->fetch($_REQUEST["section"]);
if (! $result > 0)
diff --git a/htdocs/imports/emptyexample.php b/htdocs/imports/emptyexample.php
index 1421d1163430f777a3ca1f442f362610c2e8ccfb..a730fd23a5d6003f12f4d0d50dc0be570ffc66eb 100644
--- a/htdocs/imports/emptyexample.php
+++ b/htdocs/imports/emptyexample.php
@@ -33,7 +33,7 @@ function llxHeader() { print '<html><title>Build an import example file</title><
function llxFooter() { print '</body></html>'; }
require("../main.inc.php");
-require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php");
+require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
require_once(DOL_DOCUMENT_ROOT."/imports/class/import.class.php");
require_once(DOL_DOCUMENT_ROOT.'/includes/modules/import/modules_import.php');
diff --git a/htdocs/imports/import.php b/htdocs/imports/import.php
index 25d1e087bd15016031863fff6497dc8b003f86f0..b9125754200885ecd040a44aef732dfce001ae35 100644
--- a/htdocs/imports/import.php
+++ b/htdocs/imports/import.php
@@ -27,8 +27,8 @@ require_once(DOL_DOCUMENT_ROOT."/core/class/html.formfile.class.php");
require_once(DOL_DOCUMENT_ROOT."/core/class/html.formother.class.php");
require_once(DOL_DOCUMENT_ROOT."/imports/class/import.class.php");
require_once(DOL_DOCUMENT_ROOT.'/includes/modules/import/modules_import.php');
-require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php");
-require_once(DOL_DOCUMENT_ROOT."/lib/import.lib.php");
+require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
+require_once(DOL_DOCUMENT_ROOT."/core/lib/import.lib.php");
$langs->load("exports");
$langs->load("errors");
@@ -191,7 +191,7 @@ if ($action == 'add_import_model')
if ($step == 3 && $datatoimport)
{
- require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php");
+ require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
if ( $_POST["sendit"] && ! empty($conf->global->MAIN_UPLOAD_DOC))
{
diff --git a/htdocs/includes/modules/action/rapport.pdf.php b/htdocs/includes/modules/action/rapport.pdf.php
index fd19bca4b20269a7e623dedb1a225ee73fe09b11..ff706f6966255190a61524cfdf7ea3f20f7c938e 100644
--- a/htdocs/includes/modules/action/rapport.pdf.php
+++ b/htdocs/includes/modules/action/rapport.pdf.php
@@ -24,7 +24,7 @@
* \brief File to build PDF with events
*/
-require_once(DOL_DOCUMENT_ROOT.'/lib/pdf.lib.php');
+require_once(DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php');
require_once(DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php');
require_once(DOL_DOCUMENT_ROOT."/core/lib/company.lib.php");
diff --git a/htdocs/includes/modules/barcode/modules_barcode.php b/htdocs/includes/modules/barcode/modules_barcode.php
index 5b3a782adc189c01d897e85a2942a5bcfd1b3b79..f0c567fbaef46ada2f27a247bf94848e17c449e3 100644
--- a/htdocs/includes/modules/barcode/modules_barcode.php
+++ b/htdocs/includes/modules/barcode/modules_barcode.php
@@ -24,7 +24,7 @@
* \ingroup barcode
* \brief Fichier contenant la classe mere de generation des codes barres
*/
-require_once(DOL_DOCUMENT_ROOT.'/lib/functions.lib.php');
+require_once(DOL_DOCUMENT_ROOT.'/core/lib/functions.lib.php');
/**
diff --git a/htdocs/includes/modules/cheque/pdf/pdf_blochet.class.php b/htdocs/includes/modules/cheque/pdf/pdf_blochet.class.php
index ab1fee40f448ee41a3e29a917f5beea1ec93618e..2f9f4b4ca0889c9f014f784a5e3ba9fd499e3c96 100644
--- a/htdocs/includes/modules/cheque/pdf/pdf_blochet.class.php
+++ b/htdocs/includes/modules/cheque/pdf/pdf_blochet.class.php
@@ -23,7 +23,7 @@
* \brief File to build cheque deposit receipts
*/
-require_once(DOL_DOCUMENT_ROOT.'/lib/pdf.lib.php');
+require_once(DOL_DOCUMENT_ROOT.'/core/lib/pdf.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/modules_commande.php b/htdocs/includes/modules/commande/modules_commande.php
index 744c9196b0ce8a674f28e9f98e3213dc29597ebf..cb8e425972172cd5d993c968ef1d506f54710bd8 100644
--- a/htdocs/includes/modules/commande/modules_commande.php
+++ b/htdocs/includes/modules/commande/modules_commande.php
@@ -203,7 +203,7 @@ function commande_pdf_create($db, $object, $modele, $outputlangs, $hidedetails=0
$outputlangs->charset_output=$sav_charset_output;
// we delete preview files
- require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php");
+ require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
dol_delete_preview($object);
// Appel des triggers
diff --git a/htdocs/includes/modules/commande/pdf_edison.modules.php b/htdocs/includes/modules/commande/pdf_edison.modules.php
index 688081802a3e4477bb53f7f01b54f2431eb4d0e6..5b26393b5df3c87523e382d9908cdf9a8479b9c8 100644
--- a/htdocs/includes/modules/commande/pdf_edison.modules.php
+++ b/htdocs/includes/modules/commande/pdf_edison.modules.php
@@ -27,7 +27,7 @@
require_once(DOL_DOCUMENT_ROOT ."/includes/modules/commande/modules_commande.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.'/core/lib/pdf.lib.php');
/**
* \class pdf_edison
diff --git a/htdocs/includes/modules/commande/pdf_einstein.modules.php b/htdocs/includes/modules/commande/pdf_einstein.modules.php
index 4c79ca7a7205a741092ce4b8490c2fc66d734f4c..36f71b69e6163117e2f56d5de8b3b1823101994d 100644
--- a/htdocs/includes/modules/commande/pdf_einstein.modules.php
+++ b/htdocs/includes/modules/commande/pdf_einstein.modules.php
@@ -30,7 +30,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."/core/lib/company.lib.php");
require_once(DOL_DOCUMENT_ROOT."/core/lib/functions2.lib.php");
-require_once(DOL_DOCUMENT_ROOT.'/lib/pdf.lib.php');
+require_once(DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php');
/**
diff --git a/htdocs/includes/modules/expedition/methode_expedition.modules.php b/htdocs/includes/modules/expedition/methode_expedition.modules.php
index 509c5cc121979e3b7a8c33356a0498504a620383..6affea15c6be48ed0d2226685f90d48a94bbcf3c 100644
--- a/htdocs/includes/modules/expedition/methode_expedition.modules.php
+++ b/htdocs/includes/modules/expedition/methode_expedition.modules.php
@@ -23,7 +23,7 @@
* \brief Fichier contenant la classe mere de generation de bon de livraison en PDF
* et la classe mere de numerotation des bons de livraisons
*/
-require_once(DOL_DOCUMENT_ROOT.'/lib/pdf.lib.php');
+require_once(DOL_DOCUMENT_ROOT.'/core/lib/pdf.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 0591e8b852451b3a38f4167784a7aafc54351df4..39b20ce6d26ebbe73236f3becb74ebbb775e5ed6 100644
--- a/htdocs/includes/modules/expedition/pdf/pdf_expedition_merou.modules.php
+++ b/htdocs/includes/modules/expedition/pdf/pdf_expedition_merou.modules.php
@@ -27,7 +27,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."/core/lib/company.lib.php");
-require_once(DOL_DOCUMENT_ROOT.'/lib/pdf.lib.php');
+require_once(DOL_DOCUMENT_ROOT.'/core/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 9e59b31d7a828d8fc6a6ca5aaa7dde04cf8585ed..47ec6815a44fe829b1ad883fa747f7b0e633bbb5 100644
--- a/htdocs/includes/modules/expedition/pdf/pdf_expedition_rouget.modules.php
+++ b/htdocs/includes/modules/expedition/pdf/pdf_expedition_rouget.modules.php
@@ -26,7 +26,7 @@
require_once DOL_DOCUMENT_ROOT."/includes/modules/expedition/pdf/ModelePdfExpedition.class.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.'/core/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 bf83dd74d1ae5bb89a5f1251139eabb6fb8464a7..84336a0fe051499de8b5736412a7eefeb9646f4d 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
@@ -27,7 +27,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."/core/lib/company.lib.php");
require_once(DOL_DOCUMENT_ROOT."/core/lib/functions2.lib.php");
-require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php");
+require_once(DOL_DOCUMENT_ROOT."/core/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 a6bae3cfcaab335574517eb09f58e2e9877dc793..e7a7cfd26a822e4b8e10cbba8d08ba8cd576c093 100755
--- a/htdocs/includes/modules/facture/doc/pdf_crabe.modules.php
+++ b/htdocs/includes/modules/facture/doc/pdf_crabe.modules.php
@@ -30,7 +30,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."/core/lib/company.lib.php");
require_once(DOL_DOCUMENT_ROOT."/core/lib/functions2.lib.php");
-require_once(DOL_DOCUMENT_ROOT.'/lib/pdf.lib.php');
+require_once(DOL_DOCUMENT_ROOT.'/core/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 699ad259d2eb0c1a2ce80c61de23858ba3effea6..d00a7ad9fb8773cf878ab3ed8dc462c9f59d93c8 100755
--- a/htdocs/includes/modules/facture/doc/pdf_oursin.modules.php
+++ b/htdocs/includes/modules/facture/doc/pdf_oursin.modules.php
@@ -30,7 +30,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."/core/lib/company.lib.php");
-require_once(DOL_DOCUMENT_ROOT.'/lib/pdf.lib.php');
+require_once(DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php');
/**
diff --git a/htdocs/includes/modules/facture/modules_facture.php b/htdocs/includes/modules/facture/modules_facture.php
index f0ec7568380b4f83731d5585b15529747f59d02a..8cda5e5dd369ab596cb561b2e4916c94e170ffb6 100644
--- a/htdocs/includes/modules/facture/modules_facture.php
+++ b/htdocs/includes/modules/facture/modules_facture.php
@@ -306,7 +306,7 @@ function facture_meta_create($db, $facid, $message="")
function facture_delete_preview($db, $facid)
{
global $langs,$conf;
- require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php");
+ require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
$fac = new Facture($db);
$fac->fetch($facid);
diff --git a/htdocs/includes/modules/fichinter/modules_fichinter.php b/htdocs/includes/modules/fichinter/modules_fichinter.php
index 9dd588eccec4892a6d3e5ed9df20c5119c8865af..cd735982099f679c13cc62639b040fcb623dec17 100644
--- a/htdocs/includes/modules/fichinter/modules_fichinter.php
+++ b/htdocs/includes/modules/fichinter/modules_fichinter.php
@@ -206,7 +206,7 @@ function fichinter_create($db, $object, $modele='', $outputlangs='')
function fichinter_delete_preview($db, $fichinterid, $fichinterref='')
{
global $langs,$conf;
- require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php");
+ require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
if (!$fichinterref)
{
diff --git a/htdocs/includes/modules/fichinter/pdf_soleil.modules.php b/htdocs/includes/modules/fichinter/pdf_soleil.modules.php
index 67c8e7c5e7fb935b972cec981b3f4a35c177876c..f504f4829897a1f0054b7670a60f9535da0212f3 100644
--- a/htdocs/includes/modules/fichinter/pdf_soleil.modules.php
+++ b/htdocs/includes/modules/fichinter/pdf_soleil.modules.php
@@ -26,7 +26,7 @@
*/
require_once(DOL_DOCUMENT_ROOT."/includes/modules/fichinter/modules_fichinter.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.'/core/lib/pdf.lib.php');
require_once(DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php');
diff --git a/htdocs/includes/modules/import/modules_import.php b/htdocs/includes/modules/import/modules_import.php
index 9ff2837fae18f6547d4f24f0c744764ba7e51eab..54254bd9bc0e691be30e237b7755e1be19e4798e 100644
--- a/htdocs/includes/modules/import/modules_import.php
+++ b/htdocs/includes/modules/import/modules_import.php
@@ -22,7 +22,7 @@
* \ingroup export
* \brief File of parent class for import file readers
*/
-require_once(DOL_DOCUMENT_ROOT.'/lib/functions.lib.php');
+require_once(DOL_DOCUMENT_ROOT.'/core/lib/functions.lib.php');
/**
diff --git a/htdocs/includes/modules/livraison/modules_livraison.php b/htdocs/includes/modules/livraison/modules_livraison.php
index f2d4a06af40a0a5e02fd638070eb5481e144da03..a748ae7fa6e56cbff1c0d4a6daa18cc47c1dd11d 100644
--- a/htdocs/includes/modules/livraison/modules_livraison.php
+++ b/htdocs/includes/modules/livraison/modules_livraison.php
@@ -197,7 +197,7 @@ function delivery_order_pdf_create($db, $object, $model='', $outputlangs='')
function delivery_order_delete_preview($db, $deliveryid)
{
global $langs,$conf;
- require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php");
+ require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
$delivery = new Livraison($db,"",$deliveryid);
$delivery->fetch($deliveryid);
diff --git a/htdocs/includes/modules/livraison/pdf/pdf_sirocco.modules.php b/htdocs/includes/modules/livraison/pdf/pdf_sirocco.modules.php
index 1d68409a95c6c168ef33a5c83af5bc772dbd5802..c0c1b929aec97a736a507bcac47e88a4ce8e43c4 100644
--- a/htdocs/includes/modules/livraison/pdf/pdf_sirocco.modules.php
+++ b/htdocs/includes/modules/livraison/pdf/pdf_sirocco.modules.php
@@ -27,7 +27,7 @@
require_once(DOL_DOCUMENT_ROOT."/includes/modules/livraison/modules_livraison.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.'/core/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 67613fa5fef134c2d73b0432ba9a805848166cd6..555d1e1610ce88ef580cac30052de85127ed5df8 100644
--- a/htdocs/includes/modules/livraison/pdf/pdf_typhon.modules.php
+++ b/htdocs/includes/modules/livraison/pdf/pdf_typhon.modules.php
@@ -29,7 +29,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."/core/lib/company.lib.php");
-require_once(DOL_DOCUMENT_ROOT.'/lib/pdf.lib.php');
+require_once(DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php');
/**
diff --git a/htdocs/includes/modules/mailings/modules_mailings.php b/htdocs/includes/modules/mailings/modules_mailings.php
index 115ce374c2edd573c70b1546fa4a48f876fb833e..9a32cd7ea36f20795df155dd14af2a2c528ef170 100644
--- a/htdocs/includes/modules/mailings/modules_mailings.php
+++ b/htdocs/includes/modules/mailings/modules_mailings.php
@@ -23,7 +23,7 @@
* \ingroup mailing
* \brief File with parent class of emailing target selectors modules
*/
-require_once(DOL_DOCUMENT_ROOT.'/lib/functions.lib.php');
+require_once(DOL_DOCUMENT_ROOT.'/core/lib/functions.lib.php');
/**
diff --git a/htdocs/includes/modules/mailings/peche.modules.php b/htdocs/includes/modules/mailings/peche.modules.php
index c7c79d809288ce49795576aac296e3b7fb834c3d..1a9ca96c6a5a730f4fbae5e98df98bdeca6e336a 100644
--- a/htdocs/includes/modules/mailings/peche.modules.php
+++ b/htdocs/includes/modules/mailings/peche.modules.php
@@ -104,7 +104,7 @@ class mailing_peche extends MailingTargets
{
global $conf,$langs,$_FILES;
- require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php");
+ require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
// For compatibility with Unix, MS-Dos or Macintosh
ini_set('auto_detect_line_endings', true);
diff --git a/htdocs/includes/modules/member/cards/modules_cards.php b/htdocs/includes/modules/member/cards/modules_cards.php
index 86f15e5b2ee0dd1ced38d8d450eb47b6352a875d..28df2886d3f1f188e44450bbe47eba592dfb6992 100644
--- a/htdocs/includes/modules/member/cards/modules_cards.php
+++ b/htdocs/includes/modules/member/cards/modules_cards.php
@@ -25,7 +25,7 @@
* \brief File of parent class of document generator for members cards.
*/
-require_once(DOL_DOCUMENT_ROOT.'/lib/pdf.lib.php');
+require_once(DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php');
require_once(DOL_DOCUMENT_ROOT."/product/class/product.class.php");
diff --git a/htdocs/includes/modules/member/cards/pdf_standard.class.php b/htdocs/includes/modules/member/cards/pdf_standard.class.php
index c36a1ac05ede66976606637f038fec065e4f72eb..b45d11496ce93ff966864c05c7da672c82b69a2b 100644
--- a/htdocs/includes/modules/member/cards/pdf_standard.class.php
+++ b/htdocs/includes/modules/member/cards/pdf_standard.class.php
@@ -62,7 +62,7 @@
* \author Jean Louis Bergamo.
*/
-require_once(DOL_DOCUMENT_ROOT.'/lib/pdf.lib.php');
+require_once(DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php');
require_once(DOL_DOCUMENT_ROOT.'/core/lib/format_cards.lib.php');
diff --git a/htdocs/includes/modules/member/labels/modules_labels.php b/htdocs/includes/modules/member/labels/modules_labels.php
index db4706dee859a03e44fb14c1021563f77c5c6fb7..7a8a6fb0a32421defbf1aeb83fc0767745c28558 100644
--- a/htdocs/includes/modules/member/labels/modules_labels.php
+++ b/htdocs/includes/modules/member/labels/modules_labels.php
@@ -25,7 +25,7 @@
* \brief File of parent class of document generator for members labels sheets.
*/
-require_once(DOL_DOCUMENT_ROOT.'/lib/pdf.lib.php');
+require_once(DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php');
require_once(DOL_DOCUMENT_ROOT."/product/class/product.class.php");
diff --git a/htdocs/includes/modules/member/labels/pdf_standardlabel.class.php b/htdocs/includes/modules/member/labels/pdf_standardlabel.class.php
index f9256e545dae26cd4454efa9e163813445cac878..2c84b0bafe0c2eb1ef924a542ff9b2ba019a40ed 100644
--- a/htdocs/includes/modules/member/labels/pdf_standardlabel.class.php
+++ b/htdocs/includes/modules/member/labels/pdf_standardlabel.class.php
@@ -62,7 +62,7 @@
* \author Jean Louis Bergamo.
*/
-require_once(DOL_DOCUMENT_ROOT.'/lib/pdf.lib.php');
+require_once(DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php');
require_once(DOL_DOCUMENT_ROOT.'/core/lib/format_cards.lib.php');
diff --git a/htdocs/includes/modules/modFacture.class.php b/htdocs/includes/modules/modFacture.class.php
index 48a27f933f49d2a5f0a05658c65c6a40f7fa6473..7ac03cf74b14fa17b188539209008f13a04b9b24 100644
--- a/htdocs/includes/modules/modFacture.class.php
+++ b/htdocs/includes/modules/modFacture.class.php
@@ -214,7 +214,7 @@ class modFacture extends DolibarrModules
// Remove permissions and default values
$this->remove($options);
- require_once(DOL_DOCUMENT_ROOT.'/lib/files.lib.php');
+ require_once(DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php');
$dirodt=DOL_DATA_ROOT.'/doctemplates/invoices';
create_exdir($dirodt);
dol_copy(DOL_DOCUMENT_ROOT.'/install/doctemplates/invoices/template_invoice.odt',$dirodt.'/template_invoice.odt',0,0);
diff --git a/htdocs/includes/modules/modSociete.class.php b/htdocs/includes/modules/modSociete.class.php
index d02511f7cdf7558af37fdbaea93105e54b43f9d5..4aa343a1f03b1636c29c3caca20f57061a7ba284 100644
--- a/htdocs/includes/modules/modSociete.class.php
+++ b/htdocs/includes/modules/modSociete.class.php
@@ -305,7 +305,7 @@ class modSociete extends DolibarrModules
// We disable this to prevent pb of modules not correctly disabled
//$this->remove($options);
- require_once(DOL_DOCUMENT_ROOT.'/lib/files.lib.php');
+ require_once(DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php');
$dirodt=DOL_DATA_ROOT.'/doctemplates/thirdparties';
create_exdir($dirodt);
dol_copy(DOL_DOCUMENT_ROOT.'/install/doctemplates/thirdparties/template_thirdparty.odt',$dirodt.'/template_thirdparty.odt',0,0);
diff --git a/htdocs/includes/modules/project/modules_project.php b/htdocs/includes/modules/project/modules_project.php
index c42449728c1cc16d7a6f87c82c5d4ca5ceacff88..2c67de1c2c02d8f31bf82eccfce599bd62f39f35 100644
--- a/htdocs/includes/modules/project/modules_project.php
+++ b/htdocs/includes/modules/project/modules_project.php
@@ -205,7 +205,7 @@ function project_pdf_create($db, $object, $model,$outputlangs)
function project_delete_preview($db, $objectid)
{
global $langs,$conf;
- require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php");
+ require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
$project = new Project($db);
$project->fetch($objectid);
diff --git a/htdocs/includes/modules/project/pdf/pdf_baleine.modules.php b/htdocs/includes/modules/project/pdf/pdf_baleine.modules.php
index a233662a04232437ce6aee413169f9c7851d23d3..a42a08602eab97b66b88faf41e854933a59fb0cf 100644
--- a/htdocs/includes/modules/project/pdf/pdf_baleine.modules.php
+++ b/htdocs/includes/modules/project/pdf/pdf_baleine.modules.php
@@ -27,7 +27,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."/core/lib/company.lib.php");
-require_once(DOL_DOCUMENT_ROOT.'/lib/pdf.lib.php');
+require_once(DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php');
/**
diff --git a/htdocs/includes/modules/propale/modules_propale.php b/htdocs/includes/modules/propale/modules_propale.php
index f179cbb04008559cc3fa209e21e9dd16a57780b3..773d47697b034a8994a371fab25ae970b3bcdf6c 100644
--- a/htdocs/includes/modules/propale/modules_propale.php
+++ b/htdocs/includes/modules/propale/modules_propale.php
@@ -248,7 +248,7 @@ function propale_pdf_create($db, $object, $modele, $outputlangs, $hidedetails=0,
function propale_delete_preview($db, $propalid, $propalref='')
{
global $langs,$conf;
- require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php");
+ require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
if (!$propalref)
{
diff --git a/htdocs/includes/modules/propale/pdf_propale_azur.modules.php b/htdocs/includes/modules/propale/pdf_propale_azur.modules.php
index ec4fcde4cfbb64c072b6150534a3133662fd4738..a9819f1ce0adced0f95c85b4233c812651b3278a 100644
--- a/htdocs/includes/modules/propale/pdf_propale_azur.modules.php
+++ b/htdocs/includes/modules/propale/pdf_propale_azur.modules.php
@@ -29,7 +29,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."/core/lib/company.lib.php");
require_once(DOL_DOCUMENT_ROOT."/core/lib/functions2.lib.php");
-require_once(DOL_DOCUMENT_ROOT.'/lib/pdf.lib.php');
+require_once(DOL_DOCUMENT_ROOT.'/core/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 1fd06d31b0b04e22dddfc9abe9f456946957b29d..cd9e4668be0041a16cc0fac0cc7127ab525d54ae 100644
--- a/htdocs/includes/modules/propale/pdf_propale_jaune.modules.php
+++ b/htdocs/includes/modules/propale/pdf_propale_jaune.modules.php
@@ -29,7 +29,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."/core/lib/company.lib.php");
require_once(DOL_DOCUMENT_ROOT."/core/lib/functions2.lib.php");
-require_once(DOL_DOCUMENT_ROOT.'/lib/pdf.lib.php');
+require_once(DOL_DOCUMENT_ROOT.'/core/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 716974270eb66d59e3d773e9bb25dc8440940f8c..24b9c6543e941f22ffa7ffc4d39c82ee03dc5fc7 100644
--- a/htdocs/includes/modules/rapport/pdf_paiement.class.php
+++ b/htdocs/includes/modules/rapport/pdf_paiement.class.php
@@ -22,7 +22,7 @@
* \ingroup banque
* \brief File to build payment reports
*/
-require_once(DOL_DOCUMENT_ROOT.'/lib/pdf.lib.php');
+require_once(DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php');
require_once(DOL_DOCUMENT_ROOT."/core/lib/company.lib.php");
diff --git a/htdocs/includes/modules/security/generate/modules_genpassword.php b/htdocs/includes/modules/security/generate/modules_genpassword.php
index e462a76e85060864637c6ffc1b83ff9219529c6d..d9c8efa8338500fa33c74fa36f2402912d5fa24b 100644
--- a/htdocs/includes/modules/security/generate/modules_genpassword.php
+++ b/htdocs/includes/modules/security/generate/modules_genpassword.php
@@ -21,7 +21,7 @@
* \ingroup core
* \brief File with parent class for password generating classes
*/
-require_once(DOL_DOCUMENT_ROOT.'/lib/functions.lib.php');
+require_once(DOL_DOCUMENT_ROOT.'/core/lib/functions.lib.php');
/**
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 a336fd0c1ca265dd33be7eecb3267a1fc4909de9..708b601895d2aa94562e9fe02f5df90f175ccba3 100644
--- a/htdocs/includes/modules/societe/doc/doc_generic_odt.modules.php
+++ b/htdocs/includes/modules/societe/doc/doc_generic_odt.modules.php
@@ -26,7 +26,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."/core/lib/company.lib.php");
-require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php");
+require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
/**
diff --git a/htdocs/includes/modules/supplier_invoice/modules_facturefournisseur.php b/htdocs/includes/modules/supplier_invoice/modules_facturefournisseur.php
index a84517bd1f129ede9f2410e53b1fa02090344bec..32de721358f3fd3e35b71e2a8becf7ddbe33f78f 100755
--- a/htdocs/includes/modules/supplier_invoice/modules_facturefournisseur.php
+++ b/htdocs/includes/modules/supplier_invoice/modules_facturefournisseur.php
@@ -128,7 +128,7 @@ function supplier_invoice_pdf_create($db, $object, $model, $outputlangs)
function supplier_invoice_delete_preview($db, $objectid)
{
global $langs,$conf;
- require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php");
+ require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
$comfourn = new FactureFournisseur($db);
$comfourn->fetch($objectid);
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 80fe0c7a6267507337008c55c8337f8bf0fa088e..e6c056dcb13c9e985e967825be2ba857c6abcc06 100755
--- a/htdocs/includes/modules/supplier_invoice/pdf/pdf_canelle.modules.php
+++ b/htdocs/includes/modules/supplier_invoice/pdf/pdf_canelle.modules.php
@@ -27,7 +27,7 @@ require_once(DOL_DOCUMENT_ROOT."/includes/modules/supplier_invoice/modules_factu
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."/core/lib/company.lib.php");
-require_once(DOL_DOCUMENT_ROOT.'/lib/pdf.lib.php');
+require_once(DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php');
/**
diff --git a/htdocs/includes/modules/supplier_order/modules_commandefournisseur.php b/htdocs/includes/modules/supplier_order/modules_commandefournisseur.php
index 7909c4497ccf25776afccc92cf1fdafcb8f1d898..9d55e32c6ce69a396d815ff13da75a2afad3f5ee 100644
--- a/htdocs/includes/modules/supplier_order/modules_commandefournisseur.php
+++ b/htdocs/includes/modules/supplier_order/modules_commandefournisseur.php
@@ -235,7 +235,7 @@ function supplier_order_pdf_create($db, $object, $model, $outputlangs, $hidedeta
function supplier_order_delete_preview($db, $comfournid, $comfournref='')
{
global $langs,$conf;
- require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php");
+ require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
if (!$comfournref)
{
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 e338475274ad0de61569535aaed357fd3285e85b..46165333d007ea4b7de028a234820013cef72209 100644
--- a/htdocs/includes/modules/supplier_order/pdf/pdf_muscadet.modules.php
+++ b/htdocs/includes/modules/supplier_order/pdf/pdf_muscadet.modules.php
@@ -29,7 +29,7 @@ require_once(DOL_DOCUMENT_ROOT."/includes/modules/supplier_order/modules_command
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."/core/lib/company.lib.php");
-require_once(DOL_DOCUMENT_ROOT.'/lib/pdf.lib.php');
+require_once(DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php');
/**
diff --git a/htdocs/install/inc.php b/htdocs/install/inc.php
index e4c5a8d79a9a2d9b3d017e0e289f5d5b56fe6cd4..f4ebaaf17a953ed8dc4e4531433cd9182b92eb61 100644
--- a/htdocs/install/inc.php
+++ b/htdocs/install/inc.php
@@ -35,9 +35,9 @@ if (! defined('ADODB_PATH'))
}
require_once('../core/class/translate.class.php');
-require_once('../lib/functions.lib.php');
+require_once('../core/lib/functions.lib.php');
require_once('../core/lib/admin.lib.php');
-require_once('../lib/files.lib.php');
+require_once('../core/lib/files.lib.php');
require_once(ADODB_PATH.'adodb-time.inc.php');
error_reporting(E_ALL); // To have all errors without disabled E_STRICT
diff --git a/htdocs/install/upgrade2.php b/htdocs/install/upgrade2.php
index bee0e48e43ea67aa7bc56df7b1e5e1123f911271..ddb3ff5bb41ba8a715bbe0d8a7e492633bb5355a 100644
--- a/htdocs/install/upgrade2.php
+++ b/htdocs/install/upgrade2.php
@@ -34,9 +34,9 @@ require_once($dolibarr_main_document_root . '/comm/propal/class/propal.class.php
require_once($dolibarr_main_document_root . '/contrat/class/contrat.class.php');
require_once($dolibarr_main_document_root . '/commande/class/commande.class.php');
require_once($dolibarr_main_document_root . '/fourn/class/fournisseur.commande.class.php');
-require_once($dolibarr_main_document_root . '/lib/price.lib.php');
+require_once($dolibarr_main_document_root . '/core/lib/price.lib.php');
require_once($dolibarr_main_document_root . '/core/class/menubase.class.php');
-require_once($dolibarr_main_document_root . '/lib/files.lib.php');
+require_once($dolibarr_main_document_root . '/core/lib/files.lib.php');
$grant_query='';
$etape = 2;
diff --git a/htdocs/lib/.cvsignore b/htdocs/lib/.cvsignore
deleted file mode 100644
index 6c8214fdbe20830800b11d5643b7c9c36394c246..0000000000000000000000000000000000000000
--- a/htdocs/lib/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-htmlMimeMail
diff --git a/htdocs/lib/index.php b/htdocs/lib/index.php
deleted file mode 100644
index 7db0dd9ebf92f2ddad5a82d32d38ab764846107a..0000000000000000000000000000000000000000
--- a/htdocs/lib/index.php
+++ /dev/null
@@ -1 +0,0 @@
-Url not available
\ No newline at end of file
diff --git a/htdocs/livraison/class/livraison.class.php b/htdocs/livraison/class/livraison.class.php
index 97c3a72d4b2d01eae62269a8f2519b6b58035ec0..3d0fa964e6f70d7949c17e2b8526f6f00b0882ca 100644
--- a/htdocs/livraison/class/livraison.class.php
+++ b/htdocs/livraison/class/livraison.class.php
@@ -314,7 +314,7 @@ class Livraison extends CommonObject
function valid($user)
{
global $conf;
- require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php");
+ require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
dol_syslog("livraison.class.php::valid begin");
@@ -526,7 +526,7 @@ class Livraison extends CommonObject
*/
function delete()
{
- require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php");
+ require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
$this->db->begin();
$sql = "DELETE FROM ".MAIN_DB_PREFIX."livraisondet";
diff --git a/htdocs/livraison/fiche.php b/htdocs/livraison/fiche.php
index b794ed59eeb59c583b3b7a6a32bd36f8326fa7e1..cffdf236cdcec03c7b3574af06f5025456398812 100644
--- a/htdocs/livraison/fiche.php
+++ b/htdocs/livraison/fiche.php
@@ -29,7 +29,7 @@ require("../main.inc.php");
require_once(DOL_DOCUMENT_ROOT."/livraison/class/livraison.class.php");
require_once(DOL_DOCUMENT_ROOT."/includes/modules/livraison/modules_livraison.php");
require_once(DOL_DOCUMENT_ROOT."/core/class/html.formfile.class.php");
-require_once(DOL_DOCUMENT_ROOT."/lib/sendings.lib.php");
+require_once(DOL_DOCUMENT_ROOT."/core/lib/sendings.lib.php");
if ($conf->product->enabled || $conf->service->enabled) require_once(DOL_DOCUMENT_ROOT."/product/class/product.class.php");
if ($conf->expedition_bon->enabled) require_once(DOL_DOCUMENT_ROOT."/expedition/class/expedition.class.php");
if ($conf->stock->enabled) require_once(DOL_DOCUMENT_ROOT."/product/stock/class/entrepot.class.php");
diff --git a/htdocs/product/barcode.php b/htdocs/product/barcode.php
index 3532baba1d76e0815258bc7ed3be02e52c5f0512..144bd9c5f62d35533b14d076f905707ea7378046 100644
--- a/htdocs/product/barcode.php
+++ b/htdocs/product/barcode.php
@@ -24,7 +24,7 @@
*/
require("../main.inc.php");
-require_once(DOL_DOCUMENT_ROOT."/lib/product.lib.php");
+require_once(DOL_DOCUMENT_ROOT."/core/lib/product.lib.php");
require_once(DOL_DOCUMENT_ROOT."/product/class/product.class.php");
require_once(DOL_DOCUMENT_ROOT."/includes/barcode/html.formbarcode.class.php");
diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php
index d8b33fb3c1f18a48e50e09015104fa40ae65a202..6fb35027c980a0f54d404b2874dea148af2ab011 100644
--- a/htdocs/product/class/product.class.php
+++ b/htdocs/product/class/product.class.php
@@ -2459,7 +2459,7 @@ class Product extends CommonObject
*/
function add_photo($sdir, $file, $maxWidth = 160, $maxHeight = 120)
{
- require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php");
+ require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
$dir = $sdir .'/'. get_exdir($this->id,2) . $this->id ."/photos";
@@ -2544,7 +2544,7 @@ class Product extends CommonObject
*/
function is_photo_available($sdir)
{
- include_once(DOL_DOCUMENT_ROOT ."/lib/files.lib.php");
+ include_once(DOL_DOCUMENT_ROOT ."/core/lib/files.lib.php");
$pdir = get_exdir($this->id,2) . $this->id ."/photos/";
$dir = $sdir . '/'. $pdir;
@@ -2585,7 +2585,7 @@ class Product extends CommonObject
{
global $conf,$user,$langs;
- include_once(DOL_DOCUMENT_ROOT ."/lib/files.lib.php");
+ include_once(DOL_DOCUMENT_ROOT ."/core/lib/files.lib.php");
include_once(DOL_DOCUMENT_ROOT ."/core/lib/images.lib.php");
$pdir = get_exdir($this->id,2) . $this->id ."/photos/";
@@ -2745,7 +2745,7 @@ class Product extends CommonObject
*/
function liste_photos($dir,$nbmax=0)
{
- include_once(DOL_DOCUMENT_ROOT.'/lib/files.lib.php');
+ include_once(DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php');
$nbphoto=0;
$tabobj=array();
@@ -2797,7 +2797,7 @@ class Product extends CommonObject
*/
function delete_photo($file)
{
- require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php");
+ require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
$dir = dirname($file).'/'; // Chemin du dossier contenant l'image d'origine
$dirthumb = $dir.'/thumbs/'; // Chemin du dossier contenant la vignette
diff --git a/htdocs/product/composition/fiche.php b/htdocs/product/composition/fiche.php
index f5a254e650f0688c0615fb5708cac7366c283b65..cdee1c53aca5cbce3b77c341ff674a67db56b374 100644
--- a/htdocs/product/composition/fiche.php
+++ b/htdocs/product/composition/fiche.php
@@ -28,7 +28,7 @@
require("../../main.inc.php");
-require_once(DOL_DOCUMENT_ROOT."/lib/product.lib.php");
+require_once(DOL_DOCUMENT_ROOT."/core/lib/product.lib.php");
require_once(DOL_DOCUMENT_ROOT."/product/class/product.class.php");
require_once(DOL_DOCUMENT_ROOT."/categories/class/categorie.class.php");
diff --git a/htdocs/product/document.php b/htdocs/product/document.php
index 855f641b9065a37e025350f20b6102b217c55f3a..17ee1d5d9e20599be5a628cffaa41f26bd219741 100755
--- a/htdocs/product/document.php
+++ b/htdocs/product/document.php
@@ -26,9 +26,9 @@
*/
require('../main.inc.php');
-require_once(DOL_DOCUMENT_ROOT."/lib/product.lib.php");
+require_once(DOL_DOCUMENT_ROOT."/core/lib/product.lib.php");
require_once(DOL_DOCUMENT_ROOT."/product/class/product.class.php");
-require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php");
+require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
require_once(DOL_DOCUMENT_ROOT."/core/class/html.formfile.class.php");
$langs->load("other");
@@ -74,7 +74,7 @@ $modulepart='produit';
if ($_POST["sendit"] && ! empty($conf->global->MAIN_UPLOAD_DOC))
{
- require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php");
+ require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
if (create_exdir($upload_dir) >= 0)
{
diff --git a/htdocs/product/fiche.php b/htdocs/product/fiche.php
index bfb377c58cfb1aeeb3cfdb2dfa59f4787285c6b2..9c71db624cd9594ff4f5f578a160ffb0d4ea99eb 100644
--- a/htdocs/product/fiche.php
+++ b/htdocs/product/fiche.php
@@ -32,7 +32,7 @@ require_once(DOL_DOCUMENT_ROOT."/core/class/canvas.class.php");
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."/core/lib/product.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");
diff --git a/htdocs/product/fournisseurs.php b/htdocs/product/fournisseurs.php
index 2f7c4749d5732f60217c58e01e039bb1cc02c901..7f39a3ef563349ddebd88b99be12189a49108471 100644
--- a/htdocs/product/fournisseurs.php
+++ b/htdocs/product/fournisseurs.php
@@ -26,7 +26,7 @@
*/
require("../main.inc.php");
-require_once(DOL_DOCUMENT_ROOT."/lib/product.lib.php");
+require_once(DOL_DOCUMENT_ROOT."/core/lib/product.lib.php");
require_once(DOL_DOCUMENT_ROOT."/comm/propal/class/propal.class.php");
require_once(DOL_DOCUMENT_ROOT."/fourn/class/fournisseur.product.class.php");
diff --git a/htdocs/product/photos.php b/htdocs/product/photos.php
index e7432c2fd2ecb57fe3d973de5abf3ca5cb336ab9..ed182dec840fb9116e61eb7c1e48720e130fd806 100644
--- a/htdocs/product/photos.php
+++ b/htdocs/product/photos.php
@@ -25,7 +25,7 @@
*/
require("../main.inc.php");
-require_once(DOL_DOCUMENT_ROOT."/lib/product.lib.php");
+require_once(DOL_DOCUMENT_ROOT."/core/lib/product.lib.php");
require_once(DOL_DOCUMENT_ROOT."/product/class/product.class.php");
require_once(DOL_DOCUMENT_ROOT."/core/class/html.formfile.class.php");
diff --git a/htdocs/product/price.php b/htdocs/product/price.php
index 242a203819e3ece141bcaba224e163cf8314973e..c14961ff55ad86c90c94a45fe86f7b0ed4628acd 100644
--- a/htdocs/product/price.php
+++ b/htdocs/product/price.php
@@ -26,7 +26,7 @@
*/
require("../main.inc.php");
-require_once(DOL_DOCUMENT_ROOT."/lib/product.lib.php");
+require_once(DOL_DOCUMENT_ROOT."/core/lib/product.lib.php");
require_once(DOL_DOCUMENT_ROOT."/product/class/product.class.php");
$langs->load("products");
diff --git a/htdocs/product/stats/commande.php b/htdocs/product/stats/commande.php
index 356fac863c10f04b7dca900a133c1be8fdbf5514..57dabd161b4b0318a3de8b5444d54260b7785651 100644
--- a/htdocs/product/stats/commande.php
+++ b/htdocs/product/stats/commande.php
@@ -24,7 +24,7 @@
*/
require("../../main.inc.php");
-require_once(DOL_DOCUMENT_ROOT."/lib/product.lib.php");
+require_once(DOL_DOCUMENT_ROOT."/core/lib/product.lib.php");
require_once(DOL_DOCUMENT_ROOT."/commande/class/commande.class.php");
require_once(DOL_DOCUMENT_ROOT."/product/class/product.class.php");
diff --git a/htdocs/product/stats/commande_fournisseur.php b/htdocs/product/stats/commande_fournisseur.php
index b9faf7cf016cac91e57fa26384fd27282ab3ca9b..78ed5cdd81f70b550dc8d183fd1c128a80b63652 100644
--- a/htdocs/product/stats/commande_fournisseur.php
+++ b/htdocs/product/stats/commande_fournisseur.php
@@ -24,7 +24,7 @@
*/
require("../../main.inc.php");
-require_once(DOL_DOCUMENT_ROOT."/lib/product.lib.php");
+require_once(DOL_DOCUMENT_ROOT."/core/lib/product.lib.php");
require_once(DOL_DOCUMENT_ROOT."/commande/class/commande.class.php");
require_once(DOL_DOCUMENT_ROOT."/product/class/product.class.php");
diff --git a/htdocs/product/stats/contrat.php b/htdocs/product/stats/contrat.php
index 677b8b9021df3e0d87796e183fda9ff643e0797c..e70314c8273532abbac6c4cc94236896931c681f 100644
--- a/htdocs/product/stats/contrat.php
+++ b/htdocs/product/stats/contrat.php
@@ -24,7 +24,7 @@
*/
require("../../main.inc.php");
-require_once(DOL_DOCUMENT_ROOT."/lib/product.lib.php");
+require_once(DOL_DOCUMENT_ROOT."/core/lib/product.lib.php");
require_once(DOL_DOCUMENT_ROOT."/contrat/class/contrat.class.php");
require_once(DOL_DOCUMENT_ROOT."/product/class/product.class.php");
diff --git a/htdocs/product/stats/facture.php b/htdocs/product/stats/facture.php
index 37423aae0e0828e6b14d5aedee15374a97f67605..7f980b15041fcabb7cbe0b83d336f44abaa65db3 100644
--- a/htdocs/product/stats/facture.php
+++ b/htdocs/product/stats/facture.php
@@ -24,7 +24,7 @@
*/
require("../../main.inc.php");
-require_once(DOL_DOCUMENT_ROOT."/lib/product.lib.php");
+require_once(DOL_DOCUMENT_ROOT."/core/lib/product.lib.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/product/stats/facture_fournisseur.php b/htdocs/product/stats/facture_fournisseur.php
index 95a45d8a658b9ad4d1a8d1eb6c9277054fef00be..63f043bcad364212c92220a2ba782388b070d0db 100644
--- a/htdocs/product/stats/facture_fournisseur.php
+++ b/htdocs/product/stats/facture_fournisseur.php
@@ -24,7 +24,7 @@
*/
require("../../main.inc.php");
-require_once(DOL_DOCUMENT_ROOT."/lib/product.lib.php");
+require_once(DOL_DOCUMENT_ROOT."/core/lib/product.lib.php");
require_once(DOL_DOCUMENT_ROOT."/fourn/class/fournisseur.facture.class.php");
require_once(DOL_DOCUMENT_ROOT."/product/class/product.class.php");
diff --git a/htdocs/product/stats/fiche.php b/htdocs/product/stats/fiche.php
index 1319ae7cedee37aded299287f3e72184f1265e7f..eabd7f2b844a4aaab1af14c2543fbcb7d5490493 100644
--- a/htdocs/product/stats/fiche.php
+++ b/htdocs/product/stats/fiche.php
@@ -25,7 +25,7 @@
*/
require("../../main.inc.php");
-require_once(DOL_DOCUMENT_ROOT."/lib/product.lib.php");
+require_once(DOL_DOCUMENT_ROOT."/core/lib/product.lib.php");
require_once(DOL_DOCUMENT_ROOT."/product/class/product.class.php");
require_once(DOL_DOCUMENT_ROOT."/core/class/dolgraph.class.php");
diff --git a/htdocs/product/stats/propal.php b/htdocs/product/stats/propal.php
index 9348be54f84927ed62da0ff3007c59f2ff31c1af..4ed7f31882f6cc608213772754c638c1b1f445ec 100644
--- a/htdocs/product/stats/propal.php
+++ b/htdocs/product/stats/propal.php
@@ -25,7 +25,7 @@
require("../../main.inc.php");
-require_once(DOL_DOCUMENT_ROOT."/lib/product.lib.php");
+require_once(DOL_DOCUMENT_ROOT."/core/lib/product.lib.php");
require_once(DOL_DOCUMENT_ROOT."/comm/propal/class/propal.class.php");
require_once(DOL_DOCUMENT_ROOT."/product/class/product.class.php");
diff --git a/htdocs/product/stock/fiche-valo.php b/htdocs/product/stock/fiche-valo.php
index c9a6e8053ba645cb413539555540bf53a88044f7..31262e08e7ae8268b1c79de407a62353b1e1aa34 100644
--- a/htdocs/product/stock/fiche-valo.php
+++ b/htdocs/product/stock/fiche-valo.php
@@ -24,7 +24,7 @@
require("../../main.inc.php");
require_once(DOL_DOCUMENT_ROOT."/product/stock/class/entrepot.class.php");
-require_once(DOL_DOCUMENT_ROOT."/lib/stock.lib.php");
+require_once(DOL_DOCUMENT_ROOT."/core/lib/stock.lib.php");
$langs->load("products");
$langs->load("stocks");
diff --git a/htdocs/product/stock/fiche.php b/htdocs/product/stock/fiche.php
index 1391e71d15655592a2121420b80bde6a493aae97..6fd5a617e94b2bb327badb896042a9ac090ce149 100644
--- a/htdocs/product/stock/fiche.php
+++ b/htdocs/product/stock/fiche.php
@@ -27,8 +27,8 @@
require("../../main.inc.php");
require_once(DOL_DOCUMENT_ROOT."/product/stock/class/entrepot.class.php");
require_once(DOL_DOCUMENT_ROOT."/product/class/product.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."/core/lib/stock.lib.php");
+require_once(DOL_DOCUMENT_ROOT."/core/lib/product.lib.php");
$langs->load("products");
$langs->load("stocks");
diff --git a/htdocs/product/stock/info.php b/htdocs/product/stock/info.php
index 6065e4268b7c228571afd5f7e0095bc996b421fe..f0eacdfa9e1bc02a1f619ba1207b2a0dae37503a 100644
--- a/htdocs/product/stock/info.php
+++ b/htdocs/product/stock/info.php
@@ -24,7 +24,7 @@
require("../../main.inc.php");
require_once(DOL_DOCUMENT_ROOT."/product/stock/class/entrepot.class.php");
require_once(DOL_DOCUMENT_ROOT."/core/lib/functions2.lib.php");
-require_once(DOL_DOCUMENT_ROOT."/lib/stock.lib.php");
+require_once(DOL_DOCUMENT_ROOT."/core/lib/stock.lib.php");
$langs->load("stocks");
diff --git a/htdocs/product/stock/mouvement.php b/htdocs/product/stock/mouvement.php
index cb7a9162f74736114e0cc1fa98a799ff46ed163f..d2763537639bffcbf87d9863255b03fd54519cdf 100644
--- a/htdocs/product/stock/mouvement.php
+++ b/htdocs/product/stock/mouvement.php
@@ -27,8 +27,8 @@ require("../../main.inc.php");
require_once(DOL_DOCUMENT_ROOT."/product/stock/class/entrepot.class.php");
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."/core/lib/stock.lib.php");
+require_once(DOL_DOCUMENT_ROOT."/core/lib/product.lib.php");
require_once(DOL_DOCUMENT_ROOT."/core/lib/date.lib.php");
$langs->load("products");
diff --git a/htdocs/product/stock/product.php b/htdocs/product/stock/product.php
index e7de512ade170d41f1d54d9e19c2e2262237638f..4944be1bde2c201db739153f82b44cbc06e9526a 100644
--- a/htdocs/product/stock/product.php
+++ b/htdocs/product/stock/product.php
@@ -28,7 +28,7 @@
require("../../main.inc.php");
require_once(DOL_DOCUMENT_ROOT."/product/stock/class/entrepot.class.php");
require_once(DOL_DOCUMENT_ROOT."/product/class/product.class.php");
-require_once(DOL_DOCUMENT_ROOT."/lib/product.lib.php");
+require_once(DOL_DOCUMENT_ROOT."/core/lib/product.lib.php");
require_once(DOL_DOCUMENT_ROOT."/product/class/html.formproduct.class.php");
$langs->load("products");
diff --git a/htdocs/product/stock/user.php b/htdocs/product/stock/user.php
index 6e88eb466bc1a8eaab1e9d9690f113971cee2d09..174c0b38885ea48f399d455ac145c123b31df1d6 100644
--- a/htdocs/product/stock/user.php
+++ b/htdocs/product/stock/user.php
@@ -27,7 +27,7 @@
require("../../main.inc.php");
require_once(DOL_DOCUMENT_ROOT."/product/stock/class/entrepot.class.php");
-require_once(DOL_DOCUMENT_ROOT."/lib/stock.lib.php");
+require_once(DOL_DOCUMENT_ROOT."/core/lib/stock.lib.php");
$langs->load("products");
diff --git a/htdocs/product/traduction.php b/htdocs/product/traduction.php
index ce21422bce345f08ff399fdf1f1b99465425f890..5987bb93fe0a3c18818f7558ff69cbf3d75bb005 100644
--- a/htdocs/product/traduction.php
+++ b/htdocs/product/traduction.php
@@ -25,7 +25,7 @@
*/
require("../main.inc.php");
-require_once(DOL_DOCUMENT_ROOT."/lib/product.lib.php");
+require_once(DOL_DOCUMENT_ROOT."/core/lib/product.lib.php");
require_once(DOL_DOCUMENT_ROOT."/core/lib/functions2.lib.php");
require_once(DOL_DOCUMENT_ROOT."/product/class/product.class.php");
require_once(DOL_DOCUMENT_ROOT."/core/class/html.formadmin.class.php");
diff --git a/htdocs/projet/activity/index.php b/htdocs/projet/activity/index.php
index 1bc200e92c514786f5c81df825ad1066c55a5717..d0762fccd5b25255f66090090c231d0e3f55a373 100644
--- a/htdocs/projet/activity/index.php
+++ b/htdocs/projet/activity/index.php
@@ -26,7 +26,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."/core/lib/project.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 b109004ab83c605e3a7d7674d2b6560c250cb2a9..1a15568dc9093bba71096c882503196dab0f4275 100644
--- a/htdocs/projet/activity/list.php
+++ b/htdocs/projet/activity/list.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."/core/lib/project.lib.php");
require_once(DOL_DOCUMENT_ROOT."/core/lib/date.lib.php");
$langs->load('projects');
diff --git a/htdocs/projet/class/project.class.php b/htdocs/projet/class/project.class.php
index 4583e20a4a5ef174da89a18d36f98b1dbe7498e8..11fe01ace16a94e5e3326732ae322aa7da487713 100644
--- a/htdocs/projet/class/project.class.php
+++ b/htdocs/projet/class/project.class.php
@@ -383,7 +383,7 @@ class Project extends CommonObject
function delete($user, $notrigger=0)
{
global $langs,$conf;
- require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php");
+ require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
$error=0;
diff --git a/htdocs/projet/contact.php b/htdocs/projet/contact.php
index 0e32a7aba33a618229b8671e3294086dcd6da1a0..e87891ad22ec34d8cd0eed7d919464e6ae48be7e 100644
--- a/htdocs/projet/contact.php
+++ b/htdocs/projet/contact.php
@@ -24,7 +24,7 @@
require("../main.inc.php");
require_once(DOL_DOCUMENT_ROOT."/projet/class/project.class.php");
require_once(DOL_DOCUMENT_ROOT."/contact/class/contact.class.php");
-require_once(DOL_DOCUMENT_ROOT."/lib/project.lib.php");
+require_once(DOL_DOCUMENT_ROOT."/core/lib/project.lib.php");
require_once(DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php');
$langs->load("projects");
diff --git a/htdocs/projet/document.php b/htdocs/projet/document.php
index 5aea22728a1862320c14f40647aab7abaecafd6d..69d67b4c5a3ee66fec66d55ef7c153ff42573306 100644
--- a/htdocs/projet/document.php
+++ b/htdocs/projet/document.php
@@ -23,8 +23,8 @@
require('../main.inc.php');
require_once(DOL_DOCUMENT_ROOT."/projet/class/project.class.php");
-require_once(DOL_DOCUMENT_ROOT.'/lib/project.lib.php');
-require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php");
+require_once(DOL_DOCUMENT_ROOT.'/core/lib/project.lib.php');
+require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
require_once(DOL_DOCUMENT_ROOT."/core/class/html.formfile.class.php");
$langs->load('projects');
@@ -69,7 +69,7 @@ if (! $project->fetch($_GET['id'],$_GET['ref']) > 0)
// Envoi fichier
if ($_POST["sendit"] && ! empty($conf->global->MAIN_UPLOAD_DOC))
{
- require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php");
+ require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
$upload_dir = $conf->projet->dir_output . "/" . dol_sanitizeFileName($project->ref);
diff --git a/htdocs/projet/element.php b/htdocs/projet/element.php
index 03c10d4771f10ba16fef1e5f65d19da76511521e..bc53b2bb4160ed1c57f86d7cdcb6c88e83eaf8f2 100644
--- a/htdocs/projet/element.php
+++ b/htdocs/projet/element.php
@@ -25,7 +25,7 @@
require("../main.inc.php");
require_once(DOL_DOCUMENT_ROOT."/projet/class/project.class.php");
-require_once(DOL_DOCUMENT_ROOT."/lib/project.lib.php");
+require_once(DOL_DOCUMENT_ROOT."/core/lib/project.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->facture->enabled) require_once(DOL_DOCUMENT_ROOT."/compta/facture/class/facture-rec.class.php");
diff --git a/htdocs/projet/fiche.php b/htdocs/projet/fiche.php
index a9994f4f8bad647599381dcb16fcd3452ce9f2ed..83b026724cd9f7d3b9dab3cedf38ee2d41b8c8ed 100644
--- a/htdocs/projet/fiche.php
+++ b/htdocs/projet/fiche.php
@@ -26,7 +26,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."/core/lib/project.lib.php");
require_once(DOL_DOCUMENT_ROOT."/core/class/html.formfile.class.php");
require_once(DOL_DOCUMENT_ROOT."/includes/modules/project/modules_project.php");
diff --git a/htdocs/projet/ganttview.php b/htdocs/projet/ganttview.php
index 789dba883d4fe4e1eb48a1161b1787319fbbc5bd..7da800e13044d07134d1c7fd7fc17c90372abaa4 100644
--- a/htdocs/projet/ganttview.php
+++ b/htdocs/projet/ganttview.php
@@ -26,7 +26,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."/core/lib/project.lib.php");
require_once(DOL_DOCUMENT_ROOT."/core/lib/date.lib.php");
require_once(DOL_DOCUMENT_ROOT."/core/class/html.formother.class.php");
diff --git a/htdocs/projet/index.php b/htdocs/projet/index.php
index 5d339d1577551f840ca2df205af7a2f7dd59ac85..f692a2edf297d6b521b693d04753206d48edbf6c 100644
--- a/htdocs/projet/index.php
+++ b/htdocs/projet/index.php
@@ -25,7 +25,7 @@
require("../main.inc.php");
require_once(DOL_DOCUMENT_ROOT."/projet/class/project.class.php");
-require_once(DOL_DOCUMENT_ROOT."/lib/project.lib.php");
+require_once(DOL_DOCUMENT_ROOT."/core/lib/project.lib.php");
$langs->load("projects");
diff --git a/htdocs/projet/note.php b/htdocs/projet/note.php
index 9a475379f97547856e98d01041e1456196f95970..d696529e4d32fd431a2d712157948ca8ed1961c8 100644
--- a/htdocs/projet/note.php
+++ b/htdocs/projet/note.php
@@ -23,7 +23,7 @@
require("../main.inc.php");
require_once(DOL_DOCUMENT_ROOT."/projet/class/project.class.php");
-require_once(DOL_DOCUMENT_ROOT."/lib/project.lib.php");
+require_once(DOL_DOCUMENT_ROOT."/core/lib/project.lib.php");
$langs->load('projects');
diff --git a/htdocs/projet/tasks.php b/htdocs/projet/tasks.php
index 345c161c4d6ef7ff844c549f9034f3ff9cb465ea..8c6f5898a49d8aadf0556fb7b32fd2afddbfd1a9 100644
--- a/htdocs/projet/tasks.php
+++ b/htdocs/projet/tasks.php
@@ -26,7 +26,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."/core/lib/project.lib.php");
require_once(DOL_DOCUMENT_ROOT."/core/lib/date.lib.php");
require_once(DOL_DOCUMENT_ROOT."/core/class/html.formother.class.php");
diff --git a/htdocs/projet/tasks/contact.php b/htdocs/projet/tasks/contact.php
index 8514911803088cf0e845480c860df880a439e703..516c7aa65ff5c0d5682b1c6be451a045b4ca2ef8 100644
--- a/htdocs/projet/tasks/contact.php
+++ b/htdocs/projet/tasks/contact.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."/contact/class/contact.class.php");
-require_once(DOL_DOCUMENT_ROOT."/lib/project.lib.php");
+require_once(DOL_DOCUMENT_ROOT."/core/lib/project.lib.php");
require_once(DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php');
$langs->load("projects");
diff --git a/htdocs/projet/tasks/document.php b/htdocs/projet/tasks/document.php
index 68c08ae6e710df9c6d09bff81a6883c782ebdfb4..ac2dd13d9b450ce9016c969957050f4e9e6d04e6 100644
--- a/htdocs/projet/tasks/document.php
+++ b/htdocs/projet/tasks/document.php
@@ -24,8 +24,8 @@
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/files.lib.php");
+require_once(DOL_DOCUMENT_ROOT.'/core/lib/project.lib.php');
+require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
require_once(DOL_DOCUMENT_ROOT."/core/class/html.formfile.class.php");
@@ -84,7 +84,7 @@ else
// Envoi fichier
if ($_POST["sendit"] && ! empty($conf->global->MAIN_UPLOAD_DOC))
{
- require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php");
+ require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
if (create_exdir($upload_dir) >= 0)
{
diff --git a/htdocs/projet/tasks/index.php b/htdocs/projet/tasks/index.php
index 335d86228694d3b5a27f526e918a7fef70ca6e10..095137e49663b03a472a8e3ab5019e2b92c972fb 100644
--- a/htdocs/projet/tasks/index.php
+++ b/htdocs/projet/tasks/index.php
@@ -26,7 +26,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."/core/lib/project.lib.php");
require_once(DOL_DOCUMENT_ROOT."/core/lib/date.lib.php");
$langs->load('projects');
diff --git a/htdocs/projet/tasks/note.php b/htdocs/projet/tasks/note.php
index d36d24f05172c515751af4b28f50d8a55a32e1da..e14f8005fbcba14d65def7e05d61c20b0f8edda6 100644
--- a/htdocs/projet/tasks/note.php
+++ b/htdocs/projet/tasks/note.php
@@ -24,7 +24,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."/core/lib/project.lib.php");
$langs->load('projects');
diff --git a/htdocs/projet/tasks/task.php b/htdocs/projet/tasks/task.php
index 690284c899ce5225e568500b651fb69a2d397a2c..f4f608f03bb3cc5389325e29153b3dd134b0c0ef 100644
--- a/htdocs/projet/tasks/task.php
+++ b/htdocs/projet/tasks/task.php
@@ -26,7 +26,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."/core/lib/project.lib.php");
require_once(DOL_DOCUMENT_ROOT."/core/class/html.formother.class.php");
$taskid = GETPOST("id");
diff --git a/htdocs/projet/tasks/time.php b/htdocs/projet/tasks/time.php
index 4aab61e1a626320d11e52b515aa80a5bd337dc1e..535f10ba5b84f59a8e6e037ece9069560f01c440 100644
--- a/htdocs/projet/tasks/time.php
+++ b/htdocs/projet/tasks/time.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."/core/lib/project.lib.php");
require_once(DOL_DOCUMENT_ROOT."/core/lib/date.lib.php");
$langs->load('projects');
diff --git a/htdocs/societe/class/societe.class.php b/htdocs/societe/class/societe.class.php
index 068b864bd6469cf18277a5704b539e05f39c3cc6..25d5a3785622ee63a283d951e7e0b337cfd0766e 100644
--- a/htdocs/societe/class/societe.class.php
+++ b/htdocs/societe/class/societe.class.php
@@ -866,7 +866,7 @@ class Societe extends CommonObject
function delete($id)
{
global $user,$langs,$conf;
- require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php");
+ require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
dol_syslog(get_class($this)."::delete", LOG_DEBUG);
$error = 0;
diff --git a/htdocs/societe/document.php b/htdocs/societe/document.php
index 57c57637dca585e04e95b393ffa3b596036d080f..9058601728d72faaf4d2c8cad2d4e9c6ba3fbe72 100644
--- a/htdocs/societe/document.php
+++ b/htdocs/societe/document.php
@@ -26,7 +26,7 @@
require("../main.inc.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/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/soc.php b/htdocs/societe/soc.php
index 821901460d26d531e709b4c10f87f393f8c95a69..fc9a466e33725083f779090a9d193708c60fa75c 100644
--- a/htdocs/societe/soc.php
+++ b/htdocs/societe/soc.php
@@ -30,7 +30,7 @@
require("../main.inc.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/lib/files.lib.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."/core/class/html.formfile.class.php");
diff --git a/htdocs/support/inc.php b/htdocs/support/inc.php
index c1118c35cd3ff1c0e22cc3025688663b03fecf7f..7a372fd8ab8f78e6642e4446b87cadd093622136 100644
--- a/htdocs/support/inc.php
+++ b/htdocs/support/inc.php
@@ -35,9 +35,9 @@ if (! defined('ADODB_PATH'))
}
require_once('../core/class/translate.class.php');
-require_once('../lib/functions.lib.php');
+require_once('../core/lib/functions.lib.php');
require_once('../core/lib/admin.lib.php');
-require_once('../lib/files.lib.php');
+require_once('../core/lib/files.lib.php');
require_once(ADODB_PATH.'adodb-time.inc.php');
diff --git a/htdocs/theme/auguria/style.css.php b/htdocs/theme/auguria/style.css.php
index 2452e5f1b781e96566845055d14cc45530862d60..3ab3d691e9bd411443de647b51e6ecffae10b909 100644
--- a/htdocs/theme/auguria/style.css.php
+++ b/htdocs/theme/auguria/style.css.php
@@ -36,7 +36,7 @@ if (! defined('NOREQUIREAJAX')) define('NOREQUIREAJAX','1');
session_cache_limiter(FALSE);
require_once("../../main.inc.php");
-require_once(DOL_DOCUMENT_ROOT."/lib/functions.lib.php");
+require_once(DOL_DOCUMENT_ROOT."/core/lib/functions.lib.php");
// Define css type
header('Content-type: text/css');
diff --git a/htdocs/theme/bureau2crea/style.css.php b/htdocs/theme/bureau2crea/style.css.php
index 28983084fd651e36b344b91d0a90efe5ed4c3964..4dda379c374ff3f383bc23d59a9dbfee4e41d8e0 100644
--- a/htdocs/theme/bureau2crea/style.css.php
+++ b/htdocs/theme/bureau2crea/style.css.php
@@ -37,7 +37,7 @@ if (! defined('NOREQUIREAJAX')) define('NOREQUIREAJAX','1');
require_once("../../main.inc.php");
-require_once(DOL_DOCUMENT_ROOT."/lib/functions.lib.php");
+require_once(DOL_DOCUMENT_ROOT."/core/lib/functions.lib.php");
// Define css type
header('Content-type: text/css');
diff --git a/htdocs/theme/cameleo/style.css.php b/htdocs/theme/cameleo/style.css.php
index 4e623ca7e3abfc882a5ed17c47d37547c307a254..bb8372247a13945a8adf428a921c1905e7c4cfd2 100644
--- a/htdocs/theme/cameleo/style.css.php
+++ b/htdocs/theme/cameleo/style.css.php
@@ -38,7 +38,7 @@ if (! defined('NOREQUIREAJAX')) define('NOREQUIREAJAX','1');
session_cache_limiter(FALSE);
require_once("../../main.inc.php");
-require_once(DOL_DOCUMENT_ROOT."/lib/functions.lib.php");
+require_once(DOL_DOCUMENT_ROOT."/core/lib/functions.lib.php");
// Define css type
header('Content-type: text/css');
diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
index 1f2e7c15fd4454602fc94bab140a1134beb29edf..61cedd8395a7b9b75a9ee959fcc64d566f02169d 100644
--- a/htdocs/theme/eldy/style.css.php
+++ b/htdocs/theme/eldy/style.css.php
@@ -37,7 +37,7 @@ if (! defined('NOREQUIREAJAX')) define('NOREQUIREAJAX','1');
session_cache_limiter(FALSE);
require_once("../../main.inc.php");
-require_once(DOL_DOCUMENT_ROOT."/lib/functions.lib.php");
+require_once(DOL_DOCUMENT_ROOT."/core/lib/functions.lib.php");
// Define css type
header('Content-type: text/css');
diff --git a/htdocs/theme/phones/smartphone/theme/default/default.css.php b/htdocs/theme/phones/smartphone/theme/default/default.css.php
index c31b3f61a689200feaca41e8c859c12f5ec6b8e0..407381051684bd25ae29284b4f6c5f656d852a36 100644
--- a/htdocs/theme/phones/smartphone/theme/default/default.css.php
+++ b/htdocs/theme/phones/smartphone/theme/default/default.css.php
@@ -34,7 +34,7 @@ if (! defined('NOREQUIREAJAX')) define('NOREQUIREAJAX','1');
session_cache_limiter(FALSE);
require_once("../../../../../main.inc.php");
-require_once(DOL_DOCUMENT_ROOT."/lib/functions.lib.php");
+require_once(DOL_DOCUMENT_ROOT."/core/lib/functions.lib.php");
// Define css type
header('Content-type: text/css');
diff --git a/htdocs/user/clicktodial.php b/htdocs/user/clicktodial.php
index c2044000a45db35f07f7e138bc8c718492479b4b..70b5faad5ba708b1729224eb30cf269103466322 100644
--- a/htdocs/user/clicktodial.php
+++ b/htdocs/user/clicktodial.php
@@ -22,7 +22,7 @@
*/
require("../main.inc.php");
-require_once(DOL_DOCUMENT_ROOT."/lib/usergroups.lib.php");
+require_once(DOL_DOCUMENT_ROOT."/core/lib/usergroups.lib.php");
$langs->load("users");
$langs->load("admin");
diff --git a/htdocs/user/fiche.php b/htdocs/user/fiche.php
index cad5412cb7ca28fa57ebe2008bd800a913179f8f..c3fc65c1d08e2190164f05f9b9ee65c1b25f58ff 100644
--- a/htdocs/user/fiche.php
+++ b/htdocs/user/fiche.php
@@ -31,7 +31,7 @@ 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."/contact/class/contact.class.php");
require_once(DOL_DOCUMENT_ROOT."/core/lib/images.lib.php");
-require_once(DOL_DOCUMENT_ROOT."/lib/usergroups.lib.php");
+require_once(DOL_DOCUMENT_ROOT."/core/lib/usergroups.lib.php");
if ($conf->ldap->enabled) require_once(DOL_DOCUMENT_ROOT."/core/class/ldap.class.php");
if ($conf->adherent->enabled) require_once(DOL_DOCUMENT_ROOT."/adherents/class/adherent.class.php");
if (! empty($conf->multicompany->enabled)) dol_include_once("/multicompany/class/actions_multicompany.class.php");
@@ -267,7 +267,7 @@ if (($action == 'addgroup' || $action == 'removegroup') && $caneditfield)
if ($action == 'update' && ! $_POST["cancel"])
{
- require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php");
+ require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
if ($caneditfield) // Case we can edit all field
{
diff --git a/htdocs/user/group/fiche.php b/htdocs/user/group/fiche.php
index a5842f331e0c925ef050366254dcf3adc06e691f..7ffac06a564fa507be0027f3618a56bb5da51a42 100644
--- a/htdocs/user/group/fiche.php
+++ b/htdocs/user/group/fiche.php
@@ -25,7 +25,7 @@
require("../../main.inc.php");
require_once(DOL_DOCUMENT_ROOT."/user/class/usergroup.class.php");
-require_once(DOL_DOCUMENT_ROOT."/lib/usergroups.lib.php");
+require_once(DOL_DOCUMENT_ROOT."/core/lib/usergroups.lib.php");
if(! empty($conf->multicompany->enabled)) dol_include_once("/multicompany/class/actions_multicompany.class.php");
// Defini si peux lire/modifier utilisateurs et permisssions
diff --git a/htdocs/user/group/ldap.php b/htdocs/user/group/ldap.php
index 564ce79fb9ef7fe2c01b8a6a6281af273a46c517..01be80d35647ddce45b45ffb05ae87a64a7e1d44 100644
--- a/htdocs/user/group/ldap.php
+++ b/htdocs/user/group/ldap.php
@@ -25,7 +25,7 @@
require("../../main.inc.php");
require_once(DOL_DOCUMENT_ROOT.'/user/class/usergroup.class.php');
require_once(DOL_DOCUMENT_ROOT."/contact/class/contact.class.php");
-require_once(DOL_DOCUMENT_ROOT."/lib/usergroups.lib.php");
+require_once(DOL_DOCUMENT_ROOT."/core/lib/usergroups.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/user/group/perms.php b/htdocs/user/group/perms.php
index 8281285b452c0386dd75094e134a8093b82eeec1..af7a977858d9544bbabdfd637730b379c2d307e1 100644
--- a/htdocs/user/group/perms.php
+++ b/htdocs/user/group/perms.php
@@ -26,7 +26,7 @@
require("../../main.inc.php");
require_once(DOL_DOCUMENT_ROOT.'/user/class/usergroup.class.php');
-require_once(DOL_DOCUMENT_ROOT."/lib/usergroups.lib.php");
+require_once(DOL_DOCUMENT_ROOT."/core/lib/usergroups.lib.php");
$langs->load("users");
diff --git a/htdocs/user/info.php b/htdocs/user/info.php
index 934a54ee5e5596790ddb2f3c26325dc6a9796d76..bb69ec84ccaa68cb0c72c64555f1699bcb0280d7 100644
--- a/htdocs/user/info.php
+++ b/htdocs/user/info.php
@@ -23,7 +23,7 @@
require("../main.inc.php");
require_once(DOL_DOCUMENT_ROOT."/core/lib/functions2.lib.php");
-require_once(DOL_DOCUMENT_ROOT.'/lib/usergroups.lib.php');
+require_once(DOL_DOCUMENT_ROOT.'/core/lib/usergroups.lib.php');
require_once(DOL_DOCUMENT_ROOT."/user/class/user.class.php");
$langs->load("users");
diff --git a/htdocs/user/ldap.php b/htdocs/user/ldap.php
index e730d8f1979823ae9ba780a9d6265e670f3c02f0..131ec6de54c9d7f42bfa26d353cea678d0a1e380 100644
--- a/htdocs/user/ldap.php
+++ b/htdocs/user/ldap.php
@@ -23,7 +23,7 @@
*/
require("../main.inc.php");
-require_once(DOL_DOCUMENT_ROOT."/lib/usergroups.lib.php");
+require_once(DOL_DOCUMENT_ROOT."/core/lib/usergroups.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/user/note.php b/htdocs/user/note.php
index d83adced357740bc99519aba6cbccecbe6e95954..01fd68c6362ede5d9b505b5a68b200530f1fed84 100644
--- a/htdocs/user/note.php
+++ b/htdocs/user/note.php
@@ -23,7 +23,7 @@
*/
require("../main.inc.php");
-require_once(DOL_DOCUMENT_ROOT.'/lib/usergroups.lib.php');
+require_once(DOL_DOCUMENT_ROOT.'/core/lib/usergroups.lib.php');
require_once(DOL_DOCUMENT_ROOT.'/user/class/user.class.php');
$action=isset($_GET["action"])?$_GET["action"]:(isset($_POST["action"])?$_POST["action"]:"");
diff --git a/htdocs/user/param_ihm.php b/htdocs/user/param_ihm.php
index daf788b10c3c46fc67f15ab53188e493113121f2..d9edc9447fc83be03d394a37bd8e232040d2e5af 100644
--- a/htdocs/user/param_ihm.php
+++ b/htdocs/user/param_ihm.php
@@ -23,7 +23,7 @@
require("../main.inc.php");
require_once(DOL_DOCUMENT_ROOT."/core/lib/functions2.lib.php");
-require_once(DOL_DOCUMENT_ROOT."/lib/usergroups.lib.php");
+require_once(DOL_DOCUMENT_ROOT."/core/lib/usergroups.lib.php");
require_once(DOL_DOCUMENT_ROOT."/core/class/html.formadmin.class.php");
$langs->load("companies");
diff --git a/htdocs/user/passwordforgotten.php b/htdocs/user/passwordforgotten.php
index b7b1737a085bb8697448bb2ea9ec4aeac642d689..d836c0c9179f3f84b4a01100a03e965995668a06 100644
--- a/htdocs/user/passwordforgotten.php
+++ b/htdocs/user/passwordforgotten.php
@@ -25,7 +25,7 @@ define("NOLOGIN",1); // This means this output page does not require to be logge
require("../main.inc.php");
require_once(DOL_DOCUMENT_ROOT."/contact/class/contact.class.php");
-require_once(DOL_DOCUMENT_ROOT."/lib/usergroups.lib.php");
+require_once(DOL_DOCUMENT_ROOT."/core/lib/usergroups.lib.php");
if ($conf->ldap->enabled) require_once(DOL_DOCUMENT_ROOT."/core/class/ldap.class.php");
$langs->load("other");
diff --git a/htdocs/user/perms.php b/htdocs/user/perms.php
index 618a9a560c4ab94b9b2db6d9911b42b2b5318b6e..96b1d372d6e964553ef50f1a07e7c3f699e592ed 100644
--- a/htdocs/user/perms.php
+++ b/htdocs/user/perms.php
@@ -25,7 +25,7 @@
*/
require("../main.inc.php");
-require_once(DOL_DOCUMENT_ROOT."/lib/usergroups.lib.php");
+require_once(DOL_DOCUMENT_ROOT."/core/lib/usergroups.lib.php");
$langs->load("users");
$langs->load("admin");
diff --git a/htdocs/viewimage.php b/htdocs/viewimage.php
index c42ff64e79aa51069da80fe3b7f75fdbf3def5ca..03f4847fb081fed85f6301c2a984ec3fdc0817d7 100644
--- a/htdocs/viewimage.php
+++ b/htdocs/viewimage.php
@@ -51,7 +51,7 @@ function llxHeader() { }
require("./main.inc.php");
-require_once(DOL_DOCUMENT_ROOT.'/lib/files.lib.php');
+require_once(DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php');
// Security check
if (empty($modulepart)) accessforbidden('Bad value for parameter modulepart');
diff --git a/htdocs/webservices/server_invoice.php b/htdocs/webservices/server_invoice.php
index 05e8b93ad7da6cd8a76448b1c5fb8bced432a20e..6bb16855beb838c3f0c2d1ec177f2222db9aaec6 100755
--- a/htdocs/webservices/server_invoice.php
+++ b/htdocs/webservices/server_invoice.php
@@ -25,7 +25,7 @@ set_include_path($_SERVER['DOCUMENT_ROOT'].'/htdocs');
require_once("../master.inc.php");
require_once(NUSOAP_PATH.'/nusoap.php'); // Include SOAP
-require_once(DOL_DOCUMENT_ROOT."/lib/ws.lib.php");
+require_once(DOL_DOCUMENT_ROOT."/core/lib/ws.lib.php");
require_once(DOL_DOCUMENT_ROOT."/user/class/user.class.php");
require_once(DOL_DOCUMENT_ROOT."/compta/facture/class/facture.class.php");
diff --git a/htdocs/webservices/server_other.php b/htdocs/webservices/server_other.php
index 187a4ff67beb561b08b064ab728f47cb8bbfb0f2..1483797622255d91acfc0cb5db4829960ce581a3 100644
--- a/htdocs/webservices/server_other.php
+++ b/htdocs/webservices/server_other.php
@@ -25,7 +25,7 @@ set_include_path($_SERVER['DOCUMENT_ROOT'].'/htdocs');
require_once("../master.inc.php");
require_once(NUSOAP_PATH.'/nusoap.php'); // Include SOAP
-require_once(DOL_DOCUMENT_ROOT."/lib/ws.lib.php");
+require_once(DOL_DOCUMENT_ROOT."/core/lib/ws.lib.php");
require_once(DOL_DOCUMENT_ROOT."/user/class/user.class.php");
require_once(DOL_DOCUMENT_ROOT."/core/lib/functions2.lib.php");
diff --git a/htdocs/webservices/server_productorservice.php b/htdocs/webservices/server_productorservice.php
index 509b0383c3a6a45b50d4e02e424b25e999b295b3..c16a33be3aef31045c3756f68e6e3290086fae2c 100755
--- a/htdocs/webservices/server_productorservice.php
+++ b/htdocs/webservices/server_productorservice.php
@@ -25,7 +25,7 @@ set_include_path($_SERVER['DOCUMENT_ROOT'].'/htdocs');
require_once("../master.inc.php");
require_once(NUSOAP_PATH.'/nusoap.php'); // Include SOAP
-require_once(DOL_DOCUMENT_ROOT."/lib/ws.lib.php");
+require_once(DOL_DOCUMENT_ROOT."/core/lib/ws.lib.php");
require_once(DOL_DOCUMENT_ROOT."/user/class/user.class.php");
require_once(DOL_DOCUMENT_ROOT."/product/class/product.class.php");
diff --git a/htdocs/webservices/server_supplier_invoice.php b/htdocs/webservices/server_supplier_invoice.php
index 8f65042c3da2ffa4600c0b750c2a37bc684b2168..f2a5c851149644afc012d236e198c18722dd5dc9 100755
--- a/htdocs/webservices/server_supplier_invoice.php
+++ b/htdocs/webservices/server_supplier_invoice.php
@@ -25,7 +25,7 @@ set_include_path($_SERVER['DOCUMENT_ROOT'].'/htdocs');
require_once("../master.inc.php");
require_once(NUSOAP_PATH.'/nusoap.php'); // Include SOAP
-require_once(DOL_DOCUMENT_ROOT."/lib/ws.lib.php");
+require_once(DOL_DOCUMENT_ROOT."/core/lib/ws.lib.php");
require_once(DOL_DOCUMENT_ROOT."/user/class/user.class.php");
require_once(DOL_DOCUMENT_ROOT."/fourn/class/fournisseur.facture.class.php");
diff --git a/htdocs/webservices/server_thirdparty.php b/htdocs/webservices/server_thirdparty.php
index e4b19ad66dd209112b828b3a74e4c75e022d9d5b..e2550e32a46d10e72d9c869e3d09cedf099ff9b3 100755
--- a/htdocs/webservices/server_thirdparty.php
+++ b/htdocs/webservices/server_thirdparty.php
@@ -25,7 +25,7 @@ set_include_path($_SERVER['DOCUMENT_ROOT'].'/htdocs');
require_once("../master.inc.php");
require_once(NUSOAP_PATH.'/nusoap.php'); // Include SOAP
-require_once(DOL_DOCUMENT_ROOT."/lib/ws.lib.php");
+require_once(DOL_DOCUMENT_ROOT."/core/lib/ws.lib.php");
require_once(DOL_DOCUMENT_ROOT."/user/class/user.class.php");
require_once(DOL_DOCUMENT_ROOT."/societe/class/societe.class.php");
diff --git a/htdocs/webservices/server_user.php b/htdocs/webservices/server_user.php
index 189840058b1bc00cea42d42993a6ceb50d44fe9d..b56b6a569fd1ba061e3214605c3cec0a8b6aed73 100644
--- a/htdocs/webservices/server_user.php
+++ b/htdocs/webservices/server_user.php
@@ -26,7 +26,7 @@ set_include_path($_SERVER['DOCUMENT_ROOT'].'/htdocs');
require_once("../master.inc.php");
require_once(NUSOAP_PATH.'/nusoap.php'); // Include SOAP
-require_once(DOL_DOCUMENT_ROOT."/lib/ws.lib.php");
+require_once(DOL_DOCUMENT_ROOT."/core/lib/ws.lib.php");
require_once(DOL_DOCUMENT_ROOT."/user/class/user.class.php");
diff --git a/scripts/invoices/rebuild_merge_pdf.php b/scripts/invoices/rebuild_merge_pdf.php
index fa7e1e9e9bd36f021aa5146d004d69b66ad2e18a..dec671c01c71a97b2539afb35645bb7453a27347 100644
--- a/scripts/invoices/rebuild_merge_pdf.php
+++ b/scripts/invoices/rebuild_merge_pdf.php
@@ -39,7 +39,7 @@ require_once($path."../../htdocs/master.inc.php");
require_once(DOL_DOCUMENT_ROOT."/cron/functions_cron.lib.php");
require_once(DOL_DOCUMENT_ROOT."/compta/facture/class/facture.class.php");
require_once(DOL_DOCUMENT_ROOT."/includes/modules/facture/modules_facture.php");
-require_once(DOL_DOCUMENT_ROOT.'/lib/pdf.lib.php');
+require_once(DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php');
// Load main language strings
diff --git a/test/phpunit/BuildDocTest.php b/test/phpunit/BuildDocTest.php
index b9e5b9db6d9649d876e57c9663353332aa966970..815a86b2844e89aaf6500f9052fb0422e87d4758 100644
--- a/test/phpunit/BuildDocTest.php
+++ b/test/phpunit/BuildDocTest.php
@@ -34,7 +34,7 @@ require_once dirname(__FILE__).'/../../htdocs/fichinter/class/fichinter.class.ph
require_once dirname(__FILE__).'/../../htdocs/expedition/class/expedition.class.php';
require_once dirname(__FILE__).'/../../htdocs/projet/class/project.class.php';
require_once dirname(__FILE__).'/../../htdocs/projet/class/task.class.php';
-require_once dirname(__FILE__).'/../../htdocs/lib/pdf.lib.php';
+require_once dirname(__FILE__).'/../../htdocs/core/lib/pdf.lib.php';
require_once dirname(__FILE__).'/../../htdocs/includes/modules/facture/doc/pdf_crabe.modules.php';
require_once dirname(__FILE__).'/../../htdocs/includes/modules/facture/doc/pdf_oursin.modules.php';
require_once dirname(__FILE__).'/../../htdocs/includes/modules/commande/pdf_edison.modules.php';
diff --git a/test/phpunit/SecurityTest.php b/test/phpunit/SecurityTest.php
index fcd4080239a0eaa991922cef01bb18e7841a4090..bf4b5c85775e6487c486bca6d2f94180a61c3dd5 100755
--- a/test/phpunit/SecurityTest.php
+++ b/test/phpunit/SecurityTest.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/functions.lib.php';
+require_once dirname(__FILE__).'/../../htdocs/core/lib/functions.lib.php';
require_once dirname(__FILE__).'/../../htdocs/core/lib/security.lib.php';
if (! defined('NOREQUIREUSER')) define('NOREQUIREUSER','1');