diff --git a/dev/skeletons/skeleton_webservice_server.php b/dev/skeletons/skeleton_webservice_server.php
index 6980c1322ec..3306d28a9f8 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 17ec9feb824..78d89b691a9 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 0d2da719ae8..fe8dc327f41 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 6086021f0cd..7f9d3fe1ca5 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 6f4bafd5139..d40e075e46e 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 445c7d302c2..43f75f7e122 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 b5602c26ce1..b3bc6a9a68f 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 4111d66e0ff..c6c4a9e0c4f 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 96adf248ab4..1f28bf85ae0 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 58a19fdf0e7..d7b86d7202d 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 7f14fccd751..7fc5b055798 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 a9f28e7bdbd..4634bc4a7d0 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 1f0d35d0b6e..d202a411271 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 0a5820c2dc4..49bafc349f4 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 5ac68ded510..d805316dae6 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 90fcf1f840c..33829124cc0 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 e26f56e088b..41da98b8ac9 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 11b8261b2ee..a3d09caff99 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 4244a56be9d..fb9fce66af8 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 5231c0c6235..66e41488edc 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 8526569f1fc..0401e57186d 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 7ec878ce5a7..0bbf3e2ec55 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 7ec5d5ef5d8..28a59e6c57e 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 aa3c0260424..fd3fee5a12d 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 de654b71832..62f536bcba7 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 e9cdbbfb423..17eadcaa563 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 a4285e2357b..80d394fa452 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 9d7b4f8d58c..f0ea032ea16 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 87a46c7eee2..9f2ea75cc00 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 .
*/
-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 9e822d2b465..d1203ec5674 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 a0dbbca0e7a..ab58b71972c 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 0b79eca3148..c712ce38e8b 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 4e5ebb4003d..542aac2679a 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 1b4ff95ec73..b8ebf2b0911 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 b37f2d91ce6..29bc44f5d4c 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 adfa2577238..b754aef6035 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 840442f99b4..6ecc759472b 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 8e7526410f9..0b844539bca 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 2e25be7e3ea..543537efe41 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 22556691b4b..6fbade0ac8c 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 ecff22ad16a..632120ac5ec 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 cb8de4ddf23..10b5e9ef4a5 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 a7556454a3c..dd64f66e865 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 4731f0343da..b025757364e 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 e4dfe3299a7..9ba449fee5c 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 3a3d41b2fcb..05860909553 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 1b95d4559c5..4758df0f0b7 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 3277f9cb812..18fb187033d 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 348e0000ba7..991718fe291 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 ba39d848325..3cbe3d57927 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 0502fea62a4..ebfb90552e7 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 bc5feec9fc7..5c2e43f0431 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 0120bb75ae6..4139763c5a1 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 03274702287..cad4ee3e70c 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 343b5d38e2b..dfd1be92018 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 18e4ff0292d..9142f3dc28e 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 750cd936988..e688274d4ee 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 7926805d3bc..0d43862bc08 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 1a33f00cde2..cac85592238 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 f9baebbe540..0ac3b4da79b 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 aa1f4b48816..31da3914858 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 2aae1a917c2..f826d454858 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 a2df7ced07e..14a47995a1b 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 9b49f27c7e1..8bfa5d75072 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 0fe5dbc4e1d..4bcf7acea5c 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 6fbb1b18049..90b338b8ce6 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 a67ecd2bbc9..a6b603d6d7b 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 c9efde9acb6..f48dda6de05 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 602949ec724..6d42ecbe133 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 cb72c923efb..18309fd1713 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 f23b09fdfb2..8266381265a 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 fbf7535becf..606bc3600f2 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 0d813e09876..58fe3761db9 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 1fd40679a25..0fb5e55cf77 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 2fdc98fb3e7..9d8261cf209 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 8ccde5bf97d..abe3798fc6a 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 80c54c315ab..7c9a1347d9b 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 c741bb04dbe..6333000b8ad 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 7660cf99a1e..519ae0960d5 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 8b40189a080..a5c566391e9 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 d8dce74a3cc..2af686bdec7 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 4a123777bd4..4b02a954fac 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 edeea1495ec..7962b3f1059 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 338a47a5d85..2942b62c912 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 6f9f1ad981e..2a407140eb8 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 f4819240fe1..b8a532399ea 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 d3348cfbf08..c45a609d5a3 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 6a93b254d11..e75b099a861 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 9e30170a702..514ca3a29a3 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 242866b7a7e..ad802afa59f 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 c7aa3ea5038..3daa1b3b0de 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 2c37327330b..9b6481b309b 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 cefaf94c63e..560941a64e3 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 858d531cbf6..bee4163db93 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 b9e7686a0ec..c8a7e6b6b0c 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 4f95788c0dc..f32998c3c4d 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 839e738f10b..315dc569432 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 748b309286d..8c4cc75f721 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 7c9ebe6a298..5a066d8b783 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 1b20860c6c8..46a70f250dc 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 c7e2d98c8f1..5d36d245abb 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 3383a3ce8ca..52580882ccc 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 fd98f27f37d..590282a5358 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 c1ea9e4a6b1..6735e9c91c2 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 75dc5ce5eff..cdcbcbd7282 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 87e25f70550..de6db84af94 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 0c0027a2bc1..00b34678f93 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 e425fc9f686..f7c267c8d3c 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 1780e0a2eed..b847d2c512e 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 ab6d36cf286..53ac8662738 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 ee08274abc8..717a6ba4ec4 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 9987d260112..4fc5114b256 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 3828662d34f..81e0f50b182 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 db317b4a549..7483cbd8e0f 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 23e7f30f73a..4e2f8224b00 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 22b0b276571..f718b345eec 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 343898df42c..65822f82972 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 f6bb5d33aa9..fb1000b0dd2 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 cd3de50e42d..10e592d090e 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 f210b492989..2e1f13cc220 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 88a4ddd83d5..6c2eb310525 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 62011d3ae97..5944af367e6 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 4f9eb49b112..f5309dd35f4 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 fc82d7df4cd..29451e58cd0 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 1485d92608d..2df28ab9218 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 0ee728e22ec..de6b38c669c 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 a1894b38634..6623a961e2d 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 8f940c24e67..d205b155185 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 9058ff28f2e..cef75daef65 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 c7d2c019453..f93513bcbdc 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 e26f04bfa6d..9ddefa83def 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 2b1a8202993..fbde981779c 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 8c06ea3078c..6a96f4c97e5 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 ac8429d0c0d..31adb1bca7c 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 feb37ef27f7..ec851c6e2fa 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 2fd20a9ed26..c0ffe1aa7dd 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 1d98e484af1..973ee2a4e4a 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 83a283fde35..2609e5eb723 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 7b1005493de..f3e0016ee9d 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 cb9da1f7989..30a50678796 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 d049528d8e4..19bf39dcb84 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 1e0050ba792..9b37eb076b4 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 b58b40c9e3e..7fe564aa948 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 6d240bfb31d..cac377c7b35 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 77c2aa75d98..a5893d6f419 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 d55461e5fc2..872d191cd1f 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 5535aeaffba..314b810cf72 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 baea3fa8ec5..05c74544d24 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 65a6b9c6e47..764e02bba0b 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 f91dc0003d9..8695e9d6004 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.
\n";
print "Please run dolibarr setup by calling page /install.
\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 f92cd5b2f00..51f2ef66671 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 f407958435a..9247057f4ed 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 8a7cc08aa50..08f6244a93c 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 0bb534d89e2..e569912f3bb 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 d28530f1348..31d2ef5749a 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 486ee57581f..3316766f8d5 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 98b64f2d185..a28f3ee4b0d 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 d0bd737f374..efef39c24b7 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 d05b29d7888..25274ccf72d 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 fd7b4de18c5..b0c0ab10a2e 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 8b3be30dc79..7e21975f9c9 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 2efeb38f612..71daf72ec81 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 e8af8fe7fc1..ea40e32c645 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 1c45855c89f..0ea5c62a2d7 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 1421d116343..a730fd23a5d 100644
--- a/htdocs/imports/emptyexample.php
+++ b/htdocs/imports/emptyexample.php
@@ -33,7 +33,7 @@ function llxHeader() { print 'Build an import example file<
function llxFooter() { print '