diff --git a/build/deb/conf.php.install b/build/deb/conf.php.install index d392d431955..78195f27006 100755 --- a/build/deb/conf.php.install +++ b/build/deb/conf.php.install @@ -136,7 +136,7 @@ $dolibarr_main_db_collation='latin1_swedish_ci'; # This parameter contains the way authentication is done. # If value "ldap" is used, you must also set parameters dolibarr_main_auth_ldap_* # Default value: dolibarr -# Possible values: Any values found in files in htdocs/includes/login directory after +# Possible values: Any values found in files in htdocs/core/login directory after # the "function_" string and before the ".php" string. You can also separate several # values using a ",". In this case, Dolibarr will check login/pass for each value in # order defined into value. However, note that this can't work with all values. diff --git a/build/makepack-dolibarrmodule.conf b/build/makepack-dolibarrmodule.conf index 287b4a58d55..8fddcd07a3b 100644 --- a/build/makepack-dolibarrmodule.conf +++ b/build/makepack-dolibarrmodule.conf @@ -8,8 +8,8 @@ # Setup: Go on Dolibarr setup - modules page to enable module. # # Files in module -htdocs/includes/modules/modMyModule.class.php -htdocs/includes/triggers/interface_mymodule.class.php +htdocs/core/modules/modMyModule.class.php +htdocs/core/triggers/interface_mymodule.class.php htdocs/mymodule/page1.php htdocs/mymodule/page2.php htdocs/mymodule/sql/script1.sql diff --git a/build/tgz/tar_exclude.txt b/build/tgz/tar_exclude.txt index 12ba7ebbf39..78b2360b27b 100644 --- a/build/tgz/tar_exclude.txt +++ b/build/tgz/tar_exclude.txt @@ -45,15 +45,15 @@ htdocs/includes/treemenu/docs htdocs/includes/treemenu/images htdocs/includes/treemenu/imagesAlt htdocs/includes/treemenu/imagesAlt2 -htdocs/includes/modules/modBookmark4u.class.php -htdocs/includes/modules/modDocument.class.php -htdocs/includes/modules/modDroitPret.class.php -htdocs/includes/modules/modEditeur.class.php -htdocs/includes/modules/modPostnuke.class.php -htdocs/includes/modules/modTelephonie.class.php -htdocs/includes/triggers/interface_user.class.php -htdocs/includes/triggers/interface_contractfrombill.class.php-NORUN -htdocs/includes/triggers/interface_modEditeur_Editeur.class.php-NORUN +htdocs/core/modules/modBookmark4u.class.php +htdocs/core/modules/modDocument.class.php +htdocs/core/modules/modDroitPret.class.php +htdocs/core/modules/modEditeur.class.php +htdocs/core/modules/modPostnuke.class.php +htdocs/core/modules/modTelephonie.class.php +htdocs/core/triggers/interface_user.class.php +htdocs/core/triggers/interface_contractfrombill.class.php-NORUN +htdocs/core/triggers/interface_modEditeur_Editeur.class.php-NORUN htdocs/includes/tcpdf/fonts/utils htdocs/includes/tcpdf/fonts/free*.ctg.z htdocs/includes/tcpdf/fonts/free*.z diff --git a/build/zip/zip_exclude.txt b/build/zip/zip_exclude.txt index e94edb93793..e6db7bddcc0 100644 --- a/build/zip/zip_exclude.txt +++ b/build/zip/zip_exclude.txt @@ -46,16 +46,16 @@ */htdocs/includes/treemenu/images/* */htdocs/includes/treemenu/imagesAlt/* */htdocs/includes/treemenu/imagesAlt2/* -*/htdocs/includes/modules/modBarcode.class.php -*/htdocs/includes/modules/modBookmark4u.class.php -*/htdocs/includes/modules/modClickToDial.class.php -*/htdocs/includes/modules/modDocument.class.php -*/htdocs/includes/modules/modDomain.class.php -*/htdocs/includes/modules/modDroitPret.class.php -*/htdocs/includes/modules/modEditeur.class.php -*/htdocs/includes/modules/modPostnuke.class.php -*/htdocs/includes/triggers/interface_user.class.php -*/htdocs/includes/triggers/interface_contractfrombill.class.php-NORUN +*/htdocs/core/modules/modBarcode.class.php +*/htdocs/core/modules/modBookmark4u.class.php +*/htdocs/core/modules/modClickToDial.class.php +*/htdocs/core/modules/modDocument.class.php +*/htdocs/core/modules/modDomain.class.php +*/htdocs/core/modules/modDroitPret.class.php +*/htdocs/core/modules/modEditeur.class.php +*/htdocs/core/modules/modPostnuke.class.php +*/htdocs/core/triggers/interface_user.class.php +*/htdocs/core/triggers/interface_contractfrombill.class.php-NORUN */htdocs/includes/tcpdf/fonts/utils/* */htdocs/includes/tcpdf/fonts/free*.ctg.z */htdocs/includes/tcpdf/fonts/free*.z diff --git a/dev/initdata/generate-propale.php b/dev/initdata/generate-propale.php index d7b97936e24..15df2afa79f 100644 --- a/dev/initdata/generate-propale.php +++ b/dev/initdata/generate-propale.php @@ -106,9 +106,9 @@ if ($resql) $user->rights->propale->valider=1; -if (! empty($conf->global->PROPALE_ADDON) && is_readable(DOL_DOCUMENT_ROOT ."/includes/modules/propale/".$conf->global->PROPALE_ADDON.".php")) +if (! empty($conf->global->PROPALE_ADDON) && is_readable(DOL_DOCUMENT_ROOT ."/core/modules/propale/".$conf->global->PROPALE_ADDON.".php")) { - require_once(DOL_DOCUMENT_ROOT ."/includes/modules/propale/".$conf->global->PROPALE_ADDON.".php"); + require_once(DOL_DOCUMENT_ROOT ."/core/modules/propale/".$conf->global->PROPALE_ADDON.".php"); } $i=0; diff --git a/dev/skeletons/modMyModule.class.php b/dev/skeletons/modMyModule.class.php index 27f44a01f22..2beb4eee7f1 100644 --- a/dev/skeletons/modMyModule.class.php +++ b/dev/skeletons/modMyModule.class.php @@ -20,12 +20,12 @@ /** * \defgroup mymodule Module MyModule * \brief Example of a module descriptor. - * Such a file must be copied into htdocs/mymodule/includes/modules directory. - * \file htdocs/mymodule/includes/modules/modMyModule.class.php + * Such a file must be copied into htdocs/mymodule/core/modules directory. + * \file htdocs/mymodule/core/modules/modMyModule.class.php * \ingroup mymodule * \brief Description and activation file for module MyModule */ -include_once(DOL_DOCUMENT_ROOT ."/includes/modules/DolibarrModules.class.php"); +include_once(DOL_DOCUMENT_ROOT ."/core/modules/DolibarrModules.class.php"); /** @@ -69,7 +69,7 @@ class modMyModule extends DolibarrModules // If file is in module/img directory under name object_pictovalue.png, use this->picto='pictovalue@module' $this->picto='generic'; - // Defined if the directory /mymodule/includes/triggers/ contains triggers or not + // Defined if the directory /mymodule/core/triggers/ contains triggers or not $this->triggers = 0; // Data directories to create when module is enabled. @@ -139,7 +139,7 @@ class modMyModule extends DolibarrModules */ // Boxes - // Add here list of php file(s) stored in includes/boxes that contains class to show a box. + // Add here list of php file(s) stored in core/boxes that contains class to show a box. $this->boxes = array(); // List of boxes $r=0; // Example: diff --git a/htdocs/adherents/cartes/carte.php b/htdocs/adherents/cartes/carte.php index b3bc6a9a68f..ad783039514 100755 --- a/htdocs/adherents/cartes/carte.php +++ b/htdocs/adherents/cartes/carte.php @@ -25,8 +25,8 @@ require("../../main.inc.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"); +require_once(DOL_DOCUMENT_ROOT."/core/modules/member/cards/modules_cards.php"); +require_once(DOL_DOCUMENT_ROOT."/core/modules/member/labels/modules_labels.php"); $langs->load("members"); $langs->load("errors"); diff --git a/htdocs/admin/barcode.php b/htdocs/admin/barcode.php index db838c9b7f7..66d4268ba38 100644 --- a/htdocs/admin/barcode.php +++ b/htdocs/admin/barcode.php @@ -108,7 +108,7 @@ clearstatcache(); foreach ($conf->file->dol_document_root as $dirroot) { - $dir = $dirroot . "/includes/modules/barcode/"; + $dir = $dirroot . "/core/modules/barcode/"; $handle=@opendir($dir); if (is_resource($handle)) @@ -193,7 +193,7 @@ if ($resql) // Chargement de la classe de codage foreach ($conf->file->dol_document_root as $dirroot) { - $dir=$dirroot . "/includes/modules/barcode/"; + $dir=$dirroot . "/core/modules/barcode/"; $result=@include_once($dir.$obj->coder.".modules.php"); //print $dir.$obj->coder.".modules.php - ".$result; if ($result) break; diff --git a/htdocs/admin/boxes.php b/htdocs/admin/boxes.php index 3a6ad26b40c..45d003a6acc 100644 --- a/htdocs/admin/boxes.php +++ b/htdocs/admin/boxes.php @@ -23,7 +23,7 @@ */ require("../main.inc.php"); -include_once(DOL_DOCUMENT_ROOT."/includes/boxes/modules_boxes.php"); +include_once(DOL_DOCUMENT_ROOT."/core/boxes/modules_boxes.php"); include_once(DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php"); $langs->load("admin"); @@ -277,12 +277,12 @@ if ($resql) { $boxname = $regs[1]; $module = $regs[2]; - $sourcefile = "/".$module."/includes/boxes/".$boxname.".php"; + $sourcefile = "/".$module."/core/boxes/".$boxname.".php"; } else { $boxname=preg_replace('/.php$/i','',$obj->file); - $sourcefile = "/includes/boxes/".$boxname.".php"; + $sourcefile = "/core/boxes/".$boxname.".php"; } dol_include_once($sourcefile); @@ -393,12 +393,12 @@ if ($resql) { $boxname = $regs[1]; $module = $regs[2]; - $sourcefile = "/".$module."/includes/boxes/".$boxname.".php"; + $sourcefile = "/".$module."/core/boxes/".$boxname.".php"; } else { $boxname=preg_replace('/.php$/i','',$obj->file); - $sourcefile = "/includes/boxes/".$boxname.".php"; + $sourcefile = "/core/boxes/".$boxname.".php"; } dol_include_once($sourcefile); diff --git a/htdocs/admin/commande.php b/htdocs/admin/commande.php index 2ad6ec754da..d5e71e6ade8 100644 --- a/htdocs/admin/commande.php +++ b/htdocs/admin/commande.php @@ -72,7 +72,7 @@ if ($action == 'specimen') $commande->initAsSpecimen(); // Charge le modele - $dir = DOL_DOCUMENT_ROOT . "/includes/modules/commande/"; + $dir = DOL_DOCUMENT_ROOT . "/core/modules/commande/"; $file = "pdf_".$modele.".modules.php"; if (file_exists($dir.$file)) { @@ -243,7 +243,7 @@ clearstatcache(); foreach ($conf->file->dol_document_root as $dirroot) { - $dir = $dirroot . "/includes/modules/commande/"; + $dir = $dirroot . "/core/modules/commande/"; if (is_dir($dir)) { @@ -258,7 +258,7 @@ foreach ($conf->file->dol_document_root as $dirroot) { $file = substr($file, 0, dol_strlen($file)-4); - require_once(DOL_DOCUMENT_ROOT ."/includes/modules/commande/".$file.".php"); + require_once(DOL_DOCUMENT_ROOT ."/core/modules/commande/".$file.".php"); $module = new $file; @@ -374,7 +374,7 @@ clearstatcache(); foreach ($conf->file->dol_document_root as $dirroot) { - $dir = $dirroot . "/includes/modules/commande/"; + $dir = $dirroot . "/core/modules/commande/"; if (is_dir($dir)) { diff --git a/htdocs/admin/confexped.php b/htdocs/admin/confexped.php index ec3415f339f..8c67fd28cf5 100644 --- a/htdocs/admin/confexped.php +++ b/htdocs/admin/confexped.php @@ -65,7 +65,7 @@ else if ($action == 'disable_delivery') /* * Affiche page */ -$dir = DOL_DOCUMENT_ROOT."/includes/modules/expedition/"; +$dir = DOL_DOCUMENT_ROOT."/core/modules/expedition/"; $html=new Form($db); llxHeader("",""); diff --git a/htdocs/admin/contract.php b/htdocs/admin/contract.php index 285887d15ba..a4ac55ac3e8 100644 --- a/htdocs/admin/contract.php +++ b/htdocs/admin/contract.php @@ -80,7 +80,7 @@ if ($action == 'setmod') llxHeader(); -$dir=DOL_DOCUMENT_ROOT."/includes/modules/contract/"; +$dir=DOL_DOCUMENT_ROOT."/core/modules/contract/"; $html=new Form($db); $linkback=''.$langs->trans("BackToModuleList").''; @@ -101,7 +101,7 @@ print "\n"; clearstatcache(); -$dir = "../includes/modules/contract/"; +$dir = "../core/modules/contract/"; $handle = opendir($dir); if (is_resource($handle)) { @@ -113,7 +113,7 @@ if (is_resource($handle)) { $file = substr($file, 0, dol_strlen($file)-4); - require_once(DOL_DOCUMENT_ROOT ."/includes/modules/contract/".$file.".php"); + require_once(DOL_DOCUMENT_ROOT ."/core/modules/contract/".$file.".php"); $module = new $file; diff --git a/htdocs/admin/dons.php b/htdocs/admin/dons.php index 632f4a9ac5b..54a5d208a5b 100644 --- a/htdocs/admin/dons.php +++ b/htdocs/admin/dons.php @@ -44,7 +44,7 @@ if ($_GET["action"] == 'specimen') $don->initAsSpecimen(); // Charge le modele - $dir = DOL_DOCUMENT_ROOT . "/includes/modules/dons/"; + $dir = DOL_DOCUMENT_ROOT . "/core/modules/dons/"; $file = $modele.".modules.php"; if (file_exists($dir.$file)) { @@ -126,7 +126,7 @@ if ($_GET["action"] == 'del') * View */ -$dir = "../includes/modules/dons/"; +$dir = "../core/modules/dons/"; $html=new Form($db); llxHeader('',$langs->trans("DonationsSetup"),'DonConfiguration'); diff --git a/htdocs/admin/expedition.php b/htdocs/admin/expedition.php index 245a4ea1146..471b48f5226 100644 --- a/htdocs/admin/expedition.php +++ b/htdocs/admin/expedition.php @@ -58,7 +58,7 @@ if ($action == 'specimen') //$exp->fetch_commande(); // Charge le modele - $dir = DOL_DOCUMENT_ROOT . "/includes/modules/expedition/pdf/"; + $dir = DOL_DOCUMENT_ROOT . "/core/modules/expedition/pdf/"; $file = "pdf_expedition_".$modele.".modules.php"; if (file_exists($dir.$file)) { @@ -161,7 +161,7 @@ if ($action == 'setmethod' || $action== 'setmod') $moduleid=GETPOST("moduleid"); $statut=GETPOST("statut"); - require_once(DOL_DOCUMENT_ROOT."/includes/modules/expedition/methode_expedition_$module.modules.php"); + require_once(DOL_DOCUMENT_ROOT."/core/modules/expedition/methode_expedition_$module.modules.php"); $classname = "methode_expedition_$module"; $expem = new $classname($db); @@ -350,7 +350,7 @@ clearstatcache(); foreach ($conf->file->dol_document_root as $dirroot) { - $dir = $dirroot . "/includes/modules/expedition/"; + $dir = $dirroot . "/core/modules/expedition/"; if (is_dir($dir)) { @@ -365,7 +365,7 @@ foreach ($conf->file->dol_document_root as $dirroot) { $file = substr($file, 0, dol_strlen($file)-4); - require_once(DOL_DOCUMENT_ROOT ."/includes/modules/expedition/".$file.".php"); + require_once(DOL_DOCUMENT_ROOT ."/core/modules/expedition/".$file.".php"); $module = new $file; @@ -486,7 +486,7 @@ clearstatcache(); foreach ($conf->file->dol_document_root as $dirroot) { - $dir = $dirroot . "/includes/modules/expedition/pdf/"; + $dir = $dirroot . "/core/modules/expedition/pdf/"; if (is_dir($dir)) { diff --git a/htdocs/admin/facture.php b/htdocs/admin/facture.php index 4530485501a..e7a96876c60 100644 --- a/htdocs/admin/facture.php +++ b/htdocs/admin/facture.php @@ -77,7 +77,7 @@ if ($action == 'specimen') $facture->initAsSpecimen(); // Load template - $dir = DOL_DOCUMENT_ROOT . "/includes/modules/facture/doc/"; + $dir = DOL_DOCUMENT_ROOT . "/core/modules/facture/doc/"; $file = "pdf_".$modele.".modules.php"; if (file_exists($dir.$file)) { @@ -345,7 +345,7 @@ clearstatcache(); $var=true; foreach ($conf->file->dol_document_root as $dirroot) { - $dir = $dirroot . "/includes/modules/facture/"; + $dir = $dirroot . "/core/modules/facture/"; if (is_dir($dir)) { @@ -512,7 +512,7 @@ foreach ($conf->file->dol_document_root as $dirroot) { foreach (array('','/doc') as $valdir) { - $dir = $dirroot . "/includes/modules/facture".$valdir; + $dir = $dirroot . "/core/modules/facture".$valdir; if (is_dir($dir)) { diff --git a/htdocs/admin/fichinter.php b/htdocs/admin/fichinter.php index 5b454bfcb0d..6ee36a8434f 100644 --- a/htdocs/admin/fichinter.php +++ b/htdocs/admin/fichinter.php @@ -106,7 +106,7 @@ if ($action == 'specimen') $inter->initAsSpecimen(); // Charge le modele - $dir = DOL_DOCUMENT_ROOT . "/includes/modules/fichinter/"; + $dir = DOL_DOCUMENT_ROOT . "/core/modules/fichinter/"; $file = "pdf_".$modele.".modules.php"; if (file_exists($dir.$file)) { @@ -242,7 +242,7 @@ clearstatcache(); foreach ($conf->file->dol_document_root as $dirroot) { - $dir = $dirroot . "/includes/modules/fichinter/"; + $dir = $dirroot . "/core/modules/fichinter/"; if (is_dir($dir)) { @@ -360,7 +360,7 @@ clearstatcache(); $var=true; foreach ($conf->file->dol_document_root as $dirroot) { - $dir = $dirroot . "/includes/modules/fichinter/"; + $dir = $dirroot . "/core/modules/fichinter/"; if (is_dir($dir)) { diff --git a/htdocs/admin/fournisseur.php b/htdocs/admin/fournisseur.php index d62024293bc..f22b81a3697 100644 --- a/htdocs/admin/fournisseur.php +++ b/htdocs/admin/fournisseur.php @@ -77,7 +77,7 @@ if ($action == 'specimen') // For orders $commande->thirdparty=$specimenthirdparty; // Charge le modele - $dir = "/includes/modules/supplier_order/pdf/"; + $dir = "/core/modules/supplier_order/pdf/"; $file = "pdf_".$modele.".modules.php"; $file = dol_buildpath($dir.$file); if (file_exists($file)) @@ -114,7 +114,7 @@ if ($action == 'specimenfacture') // For invoices $facture->thirdparty=$specimenthirdparty; // Define who should has build the invoice (so the supplier) // Charge le modele - $dir = "/includes/modules/supplier_invoice/pdf/"; + $dir = "/core/modules/supplier_invoice/pdf/"; $file = "pdf_".$modele.".modules.php"; $file = dol_buildpath($dir.$file); if (file_exists($file)) @@ -269,7 +269,7 @@ clearstatcache(); foreach ($conf->file->dol_document_root as $dirroot) { - $dir = $dirroot . "/includes/modules/supplier_order/"; + $dir = $dirroot . "/core/modules/supplier_order/"; if (is_dir($dir)) { @@ -404,7 +404,7 @@ clearstatcache(); foreach ($conf->file->dol_document_root as $dirroot) { - $dir = $dirroot . "/includes/modules/supplier_order/pdf/"; + $dir = $dirroot . "/core/modules/supplier_order/pdf/"; if (is_dir($dir)) { @@ -537,7 +537,7 @@ clearstatcache(); foreach ($conf->file->dol_document_root as $dirroot) { - $dir = $dirroot . "/includes/modules/supplier_invoice/pdf/"; + $dir = $dirroot . "/core/modules/supplier_invoice/pdf/"; if (is_dir($dir)) { diff --git a/htdocs/admin/livraison.php b/htdocs/admin/livraison.php index 6a5a6819bf0..9577de2db81 100644 --- a/htdocs/admin/livraison.php +++ b/htdocs/admin/livraison.php @@ -70,7 +70,7 @@ if ($action == 'specimen') //$sending->fetch_commande(); // Charge le modele - $dir = DOL_DOCUMENT_ROOT . "/includes/modules/livraison/pdf/"; + $dir = DOL_DOCUMENT_ROOT . "/core/modules/livraison/pdf/"; $file = "pdf_".$modele.".modules.php"; if (file_exists($dir.$file)) { @@ -238,7 +238,7 @@ clearstatcache(); foreach ($conf->file->dol_document_root as $dirroot) { - $dir = $dirroot . "/includes/modules/livraison/"; + $dir = $dirroot . "/core/modules/livraison/"; if (is_dir($dir)) { @@ -252,7 +252,7 @@ foreach ($conf->file->dol_document_root as $dirroot) { $file = substr($file, 0, dol_strlen($file)-4); - require_once(DOL_DOCUMENT_ROOT ."/includes/modules/livraison/".$file.".php"); + require_once(DOL_DOCUMENT_ROOT ."/core/modules/livraison/".$file.".php"); $module = new $file; @@ -371,7 +371,7 @@ clearstatcache(); foreach ($conf->file->dol_document_root as $dirroot) { - $dir = $dirroot . "/includes/modules/livraison/pdf/"; + $dir = $dirroot . "/core/modules/livraison/pdf/"; if (is_dir($dir)) { diff --git a/htdocs/admin/menus.php b/htdocs/admin/menus.php index 54542b98095..356828b7bdc 100644 --- a/htdocs/admin/menus.php +++ b/htdocs/admin/menus.php @@ -38,9 +38,9 @@ $langs->load("other"); // Security check if (!$user->admin) accessforbidden(); -$dirtop = "/includes/menus/standard"; -$dirleft = "/includes/menus/standard"; -$dirsmartphone = "/includes/menus/smartphone"; +$dirtop = "/core/menus/standard"; +$dirleft = "/core/menus/standard"; +$dirsmartphone = "/core/menus/smartphone"; // Cette page peut etre longue. On augmente le delai autorise. @@ -77,7 +77,7 @@ if (isset($_POST["action"]) && $_POST["action"] == 'update' && empty($_POST["can foreach ($listofmenuhandler as $key => $val) { // Load sql init_menu_handler.sql file - $dir = "/includes/menus/"; + $dir = "/core/menus/"; $file='init_menu_'.$key.'.sql'; $fullpath=dol_buildpath($dir.$file); diff --git a/htdocs/admin/menus/edit.php b/htdocs/admin/menus/edit.php index df5d7c740f3..5c8dc99ab0f 100644 --- a/htdocs/admin/menus/edit.php +++ b/htdocs/admin/menus/edit.php @@ -33,9 +33,9 @@ $langs->load("admin"); if (! $user->admin) accessforbidden(); -$dirtop = "/includes/menus/standard"; -$dirleft = "/includes/menus/standard"; -$dirsmartphone = "/includes/menus/smartphone"; +$dirtop = "/core/menus/standard"; +$dirleft = "/core/menus/standard"; +$dirsmartphone = "/core/menus/smartphone"; $dirmenu = array($dirleft,$dirsmartphone); diff --git a/htdocs/admin/menus/index.php b/htdocs/admin/menus/index.php index 71531c2f4f7..b528f7e374f 100644 --- a/htdocs/admin/menus/index.php +++ b/htdocs/admin/menus/index.php @@ -33,9 +33,9 @@ $langs->load("admin"); if (! $user->admin) accessforbidden(); -$dirtop = "/includes/menus/standard"; -$dirleft = "/includes/menus/standard"; -$dirsmartphone = "/includes/menus/smartphone"; +$dirtop = "/core/menus/standard"; +$dirleft = "/core/menus/standard"; +$dirsmartphone = "/core/menus/smartphone"; $dirmenu = array($dirleft,$dirsmartphone); diff --git a/htdocs/admin/modules.php b/htdocs/admin/modules.php index c51b14859dc..fb85c0016be 100644 --- a/htdocs/admin/modules.php +++ b/htdocs/admin/modules.php @@ -85,7 +85,7 @@ $j = 0; // j is module number. Automatically affected if module number not defin foreach ($conf->file->dol_document_root as $type => $dirroot) { - $modulesdir[] = $dirroot . "/includes/modules/"; + $modulesdir[] = $dirroot . "/core/modules/"; if ($type == 'alt') { @@ -96,9 +96,9 @@ foreach ($conf->file->dol_document_root as $type => $dirroot) { if (is_dir($dirroot.'/'.$file) && substr($file, 0, 1) <> '.' && substr($file, 0, 3) <> 'CVS' && $file != 'includes') { - if (is_dir($dirroot . '/' . $file . '/includes/modules/')) + if (is_dir($dirroot . '/' . $file . '/core/modules/')) { - $modulesdir[] = $dirroot . '/' . $file . '/includes/modules/'; + $modulesdir[] = $dirroot . '/' . $file . '/core/modules/'; } } } diff --git a/htdocs/admin/notification.php b/htdocs/admin/notification.php index 6f5eec72b5b..9855c45a0dc 100644 --- a/htdocs/admin/notification.php +++ b/htdocs/admin/notification.php @@ -24,7 +24,7 @@ require("../main.inc.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/includes/triggers/interface_modNotification_Notification.class.php"); +require_once(DOL_DOCUMENT_ROOT."/core/triggers/interface_modNotification_Notification.class.php"); $langs->load("admin"); $langs->load("other"); diff --git a/htdocs/admin/perms.php b/htdocs/admin/perms.php index 67a1792142e..f874f6ed074 100644 --- a/htdocs/admin/perms.php +++ b/htdocs/admin/perms.php @@ -83,7 +83,7 @@ $modulesdir = array(); foreach ($conf->file->dol_document_root as $type => $dirroot) { - $modulesdir[] = $dirroot . "/includes/modules/"; + $modulesdir[] = $dirroot . "/core/modules/"; if ($type == 'alt') { @@ -94,9 +94,9 @@ foreach ($conf->file->dol_document_root as $type => $dirroot) { if (is_dir($dirroot.'/'.$file) && substr($file, 0, 1) <> '.' && substr($file, 0, 3) <> 'CVS' && $file != 'includes') { - if (is_dir($dirroot . '/' . $file . '/includes/modules/')) + if (is_dir($dirroot . '/' . $file . '/core/modules/')) { - $modulesdir[] = $dirroot . '/' . $file . '/includes/modules/'; + $modulesdir[] = $dirroot . '/' . $file . '/core/modules/'; } } } diff --git a/htdocs/admin/project.php b/htdocs/admin/project.php index 321bb024b42..52a9df582ff 100644 --- a/htdocs/admin/project.php +++ b/htdocs/admin/project.php @@ -69,7 +69,7 @@ if ($action == 'specimen') $project->initAsSpecimen(); // Charge le modele - $dir = DOL_DOCUMENT_ROOT . "/includes/modules/project/pdf/"; + $dir = DOL_DOCUMENT_ROOT . "/core/modules/project/pdf/"; $file = "pdf_".$modele.".modules.php"; if (file_exists($dir.$file)) { @@ -183,7 +183,7 @@ print "
"; // Project numbering module -$dir = DOL_DOCUMENT_ROOT."/includes/modules/project/"; +$dir = DOL_DOCUMENT_ROOT."/core/modules/project/"; print_titre($langs->trans("ProjectsNumberingModules")); @@ -209,7 +209,7 @@ if (is_resource($handle)) { $file = substr($file, 0, dol_strlen($file)-4); - require_once(DOL_DOCUMENT_ROOT ."/includes/modules/project/".$file.".php"); + require_once(DOL_DOCUMENT_ROOT ."/core/modules/project/".$file.".php"); $module = new $file; @@ -280,7 +280,7 @@ print '
'; * Modeles documents for projects */ -$dir = DOL_DOCUMENT_ROOT.'/includes/modules/project/pdf/'; +$dir = DOL_DOCUMENT_ROOT.'/core/modules/project/pdf/'; print_titre($langs->trans("ProjectsModelModule")); diff --git a/htdocs/admin/propale.php b/htdocs/admin/propale.php index 63ba2e37ca7..9dfe9bf979a 100644 --- a/htdocs/admin/propale.php +++ b/htdocs/admin/propale.php @@ -71,7 +71,7 @@ if ($action == 'specimen') $propal->initAsSpecimen(); // Charge le modele - $dir = "/includes/modules/propale/"; + $dir = "/core/modules/propale/"; $file = "pdf_propale_".$modele.".modules.php"; $file = dol_buildpath($dir.$file); if (file_exists($file)) @@ -276,7 +276,7 @@ clearstatcache(); foreach ($conf->file->dol_document_root as $dirroot) { - $dir = $dirroot . "/includes/modules/propale/"; + $dir = $dirroot . "/core/modules/propale/"; if (is_dir($dir)) { @@ -406,7 +406,7 @@ clearstatcache(); foreach ($conf->file->dol_document_root as $dirroot) { - $dir = $dirroot . "/includes/modules/propale/"; + $dir = $dirroot . "/core/modules/propale/"; if (is_dir($dir)) { diff --git a/htdocs/admin/security.php b/htdocs/admin/security.php index 142bb63e919..2d50dc77679 100644 --- a/htdocs/admin/security.php +++ b/htdocs/admin/security.php @@ -211,7 +211,7 @@ print ''; print ''; // Charge tableau des modules generation -$dir = "../includes/modules/security/generate"; +$dir = "../core/modules/security/generate"; clearstatcache(); $handle=opendir($dir); $i=1; diff --git a/htdocs/admin/system/modules.php b/htdocs/admin/system/modules.php index 08bcd0329ed..84c8340ff12 100644 --- a/htdocs/admin/system/modules.php +++ b/htdocs/admin/system/modules.php @@ -49,7 +49,7 @@ $modules_files = array(); foreach ($conf->file->dol_document_root as $type => $dirroot) { - $modulesdir[] = $dirroot . "/includes/modules/"; + $modulesdir[] = $dirroot . "/core/modules/"; if ($type == 'alt') { @@ -60,9 +60,9 @@ foreach ($conf->file->dol_document_root as $type => $dirroot) { if (is_dir($dirroot.'/'.$file) && substr($file, 0, 1) <> '.' && substr($file, 0, 3) <> 'CVS' && $file != 'includes') { - if (is_dir($dirroot . '/' . $file . '/includes/modules/')) + if (is_dir($dirroot . '/' . $file . '/core/modules/')) { - $modulesdir[] = $dirroot . '/' . $file . '/includes/modules/'; + $modulesdir[] = $dirroot . '/' . $file . '/core/modules/'; } } } diff --git a/htdocs/boxes.php b/htdocs/boxes.php index 24d0faf6683..d6e7931deed 100644 --- a/htdocs/boxes.php +++ b/htdocs/boxes.php @@ -204,12 +204,12 @@ class InfoBox { $boxname = $regs[1]; $module = $regs[2]; - $sourcefile = dol_buildpath("/".$module."/includes/boxes/".$boxname.".php"); + $sourcefile = dol_buildpath("/".$module."/core/boxes/".$boxname.".php"); } else { $boxname=preg_replace('/.php$/i','',$obj->file); - $sourcefile = DOL_DOCUMENT_ROOT."/includes/boxes/".$boxname.".php"; + $sourcefile = DOL_DOCUMENT_ROOT."/core/boxes/".$boxname.".php"; } include_once($sourcefile); @@ -265,12 +265,12 @@ class InfoBox { $boxname = $regs[1]; $module = $regs[2]; - $sourcefile = "/".$module."/includes/boxes/".$boxname.".php"; + $sourcefile = "/".$module."/core/boxes/".$boxname.".php"; } else { $boxname=preg_replace('/.php$/i','',$obj->file); - $sourcefile = "/includes/boxes/".$boxname.".php"; + $sourcefile = "/core/boxes/".$boxname.".php"; } dol_include_once($sourcefile); diff --git a/htdocs/comm/action/rapport/index.php b/htdocs/comm/action/rapport/index.php index 6ecc759472b..25d0403f3c4 100644 --- a/htdocs/comm/action/rapport/index.php +++ b/htdocs/comm/action/rapport/index.php @@ -28,7 +28,7 @@ require("../../../main.inc.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"); +require_once(DOL_DOCUMENT_ROOT."/core/modules/action/rapport.pdf.php"); $sortfield = GETPOST("sortfield",'alpha'); $sortorder = GETPOST("sortorder",'alpha'); diff --git a/htdocs/comm/addpropal.php b/htdocs/comm/addpropal.php index 0b844539bca..2cecb224515 100644 --- a/htdocs/comm/addpropal.php +++ b/htdocs/comm/addpropal.php @@ -27,7 +27,7 @@ require("../main.inc.php"); require_once(DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php'); -require_once(DOL_DOCUMENT_ROOT.'/includes/modules/propale/modules_propale.php'); +require_once(DOL_DOCUMENT_ROOT.'/core/modules/propale/modules_propale.php'); if ($conf->projet->enabled) { require_once(DOL_DOCUMENT_ROOT."/projet/class/project.class.php"); @@ -82,9 +82,9 @@ if ($_GET["action"] == 'create') $obj = $conf->global->PROPALE_ADDON; if ($obj) { - if (! empty($conf->global->PROPALE_ADDON) && is_readable(DOL_DOCUMENT_ROOT ."/includes/modules/propale/".$conf->global->PROPALE_ADDON.".php")) + if (! empty($conf->global->PROPALE_ADDON) && is_readable(DOL_DOCUMENT_ROOT ."/core/modules/propale/".$conf->global->PROPALE_ADDON.".php")) { - require_once(DOL_DOCUMENT_ROOT ."/includes/modules/propale/".$conf->global->PROPALE_ADDON.".php"); + require_once(DOL_DOCUMENT_ROOT ."/core/modules/propale/".$conf->global->PROPALE_ADDON.".php"); $modPropale = new $obj; $numpr = $modPropale->getNextValue($soc,$propal); } diff --git a/htdocs/comm/mailing/cibles.php b/htdocs/comm/mailing/cibles.php index 543537efe41..8b4516bfd63 100644 --- a/htdocs/comm/mailing/cibles.php +++ b/htdocs/comm/mailing/cibles.php @@ -36,7 +36,7 @@ if (! $user->rights->mailing->lire || $user->societe_id > 0) accessforbidden(); -$dirmod=DOL_DOCUMENT_ROOT."/includes/modules/mailings"; +$dirmod=DOL_DOCUMENT_ROOT."/core/modules/mailings"; $mesg = ''; @@ -69,7 +69,7 @@ if ($_GET["action"] == 'add') $var=true; foreach ($conf->file->dol_document_root as $dirmod) { - $dir=$dirmod."/includes/modules/mailings/"; + $dir=$dirmod."/core/modules/mailings/"; if (is_dir($dir)) { @@ -229,7 +229,7 @@ if ($mil->fetch($_REQUEST["id"]) >= 0) $var=true; foreach ($conf->file->dol_document_root as $dirroot) { - $dir=$dirroot."/includes/modules/mailings/"; + $dir=$dirroot."/core/modules/mailings/"; if (is_dir($dir)) { diff --git a/htdocs/comm/mailing/index.php b/htdocs/comm/mailing/index.php index 34a45e23487..ba9c9371213 100644 --- a/htdocs/comm/mailing/index.php +++ b/htdocs/comm/mailing/index.php @@ -67,7 +67,7 @@ print "
\n"; print ''; print ''; -$dir=DOL_DOCUMENT_ROOT."/includes/modules/mailings"; +$dir=DOL_DOCUMENT_ROOT."/core/modules/mailings"; $handle=opendir($dir); $var=True; diff --git a/htdocs/comm/propal.php b/htdocs/comm/propal.php index 10b5e9ef4a5..f202b1ce7d7 100644 --- a/htdocs/comm/propal.php +++ b/htdocs/comm/propal.php @@ -30,7 +30,7 @@ require("../main.inc.php"); require_once(DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php'); -require_once(DOL_DOCUMENT_ROOT."/includes/modules/propale/modules_propale.php"); +require_once(DOL_DOCUMENT_ROOT."/core/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"); diff --git a/htdocs/comm/propal/class/propal.class.php b/htdocs/comm/propal/class/propal.class.php index b025757364e..e553641f54c 100644 --- a/htdocs/comm/propal/class/propal.class.php +++ b/htdocs/comm/propal/class/propal.class.php @@ -885,7 +885,7 @@ class Propal extends CommonObject $objsoc->fetch($object->socid); - if (empty($conf->global->PROPALE_ADDON) || ! is_readable(DOL_DOCUMENT_ROOT ."/includes/modules/propale/".$conf->global->PROPALE_ADDON.".php")) + if (empty($conf->global->PROPALE_ADDON) || ! is_readable(DOL_DOCUMENT_ROOT ."/core/modules/propale/".$conf->global->PROPALE_ADDON.".php")) { $this->error='ErrorSetupNotComplete'; return -1; @@ -900,7 +900,7 @@ class Propal extends CommonObject $object->ref_client = ''; // Set ref - require_once(DOL_DOCUMENT_ROOT ."/includes/modules/propale/".$conf->global->PROPALE_ADDON.".php"); + require_once(DOL_DOCUMENT_ROOT ."/core/modules/propale/".$conf->global->PROPALE_ADDON.".php"); $obj = $conf->global->PROPALE_ADDON; $modPropale = new $obj; $object->ref = $modPropale->getNextValue($objsoc,$object); @@ -2275,7 +2275,7 @@ class Propal extends CommonObject global $conf, $db, $langs; $langs->load("propal"); - $dir = DOL_DOCUMENT_ROOT . "/includes/modules/propale/"; + $dir = DOL_DOCUMENT_ROOT . "/core/modules/propale/"; if (! empty($conf->global->PROPALE_ADDON)) { diff --git a/htdocs/commande/class/commande.class.php b/htdocs/commande/class/commande.class.php index 3cbe3d57927..e40ef308228 100644 --- a/htdocs/commande/class/commande.class.php +++ b/htdocs/commande/class/commande.class.php @@ -126,7 +126,7 @@ class Commande extends CommonObject global $db, $langs, $conf; $langs->load("order"); - $dir = DOL_DOCUMENT_ROOT . "/includes/modules/commande"; + $dir = DOL_DOCUMENT_ROOT . "/core/modules/commande"; if (! empty($conf->global->COMMANDE_ADDON)) { diff --git a/htdocs/commande/fiche.php b/htdocs/commande/fiche.php index 4139763c5a1..9330ece6129 100644 --- a/htdocs/commande/fiche.php +++ b/htdocs/commande/fiche.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.formorder.class.php"); -require_once(DOL_DOCUMENT_ROOT."/includes/modules/commande/modules_commande.php"); +require_once(DOL_DOCUMENT_ROOT."/core/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."/core/lib/order.lib.php"); @@ -852,7 +852,7 @@ if ($action == 'builddoc') // In get or post { /* * Generate order document - * define into /includes/modules/commande/modules_commande.php + * define into /core/modules/commande/modules_commande.php */ // Sauvegarde le dernier modele choisi pour generer un document @@ -1285,7 +1285,7 @@ if ($action == 'create' && $user->rights->commande->creer) print ''; print '"; diff --git a/htdocs/compta/dons/fiche.php b/htdocs/compta/dons/fiche.php index e688274d4ee..0051d74f56a 100644 --- a/htdocs/compta/dons/fiche.php +++ b/htdocs/compta/dons/fiche.php @@ -23,7 +23,7 @@ */ require("../../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/includes/modules/dons/modules_don.php"); +require_once(DOL_DOCUMENT_ROOT."/core/modules/dons/modules_don.php"); 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"); diff --git a/htdocs/compta/facture.php b/htdocs/compta/facture.php index 0d43862bc08..cf2943d0404 100644 --- a/htdocs/compta/facture.php +++ b/htdocs/compta/facture.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.'/includes/modules/facture/modules_facture.php'); +require_once(DOL_DOCUMENT_ROOT.'/core/modules/facture/modules_facture.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.'/compta/paiement/class/paiement.class.php'); @@ -1722,7 +1722,7 @@ if ($action == 'create') // Modele PDF print ''; print '"; diff --git a/htdocs/compta/facture/class/facture.class.php b/htdocs/compta/facture/class/facture.class.php index 31da3914858..78591487591 100644 --- a/htdocs/compta/facture/class/facture.class.php +++ b/htdocs/compta/facture/class/facture.class.php @@ -2557,7 +2557,7 @@ class Facture extends CommonObject // Include file with class foreach ($conf->file->dol_document_root as $dirroot) { - $dir = $dirroot."/includes/modules/facture/"; + $dir = $dirroot."/core/modules/facture/"; // Load file with numbering class (if found) $mybool|=@include_once($dir.$file); } @@ -2570,7 +2570,7 @@ class Facture extends CommonObject // Include file with class foreach ($conf->file->dol_document_root as $dirroot) { - $dir = $dirroot."/includes/modules/facture/"; + $dir = $dirroot."/core/modules/facture/"; // Load file with numbering class (if found) $mybool|=@include_once($dir.$file); } diff --git a/htdocs/compta/paiement/cheque/class/remisecheque.class.php b/htdocs/compta/paiement/cheque/class/remisecheque.class.php index e7890ec980a..dfe19ad5988 100644 --- a/htdocs/compta/paiement/cheque/class/remisecheque.class.php +++ b/htdocs/compta/paiement/cheque/class/remisecheque.class.php @@ -479,7 +479,7 @@ class RemiseCheque extends CommonObject dol_syslog("RemiseCheque::generatePdf model=".$model." id=".$this->id, LOG_DEBUG); - $dir=DOL_DOCUMENT_ROOT ."/includes/modules/cheque/pdf/"; + $dir=DOL_DOCUMENT_ROOT ."/core/modules/cheque/pdf/"; // Charge le modele $file = "pdf_".$model.".class.php"; diff --git a/htdocs/compta/paiement/fiche.php b/htdocs/compta/paiement/fiche.php index ae1223a1e01..b0b9dc690df 100644 --- a/htdocs/compta/paiement/fiche.php +++ b/htdocs/compta/paiement/fiche.php @@ -28,7 +28,7 @@ require("../../main.inc.php"); require_once(DOL_DOCUMENT_ROOT.'/compta/paiement/class/paiement.class.php'); require_once(DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php'); -require_once(DOL_DOCUMENT_ROOT ."/includes/modules/facture/modules_facture.php"); +require_once(DOL_DOCUMENT_ROOT ."/core/modules/facture/modules_facture.php"); if ($conf->banque->enabled) require_once(DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php'); $langs->load('bills'); diff --git a/htdocs/compta/paiement/rapport.php b/htdocs/compta/paiement/rapport.php index 18309fd1713..5a939f37365 100644 --- a/htdocs/compta/paiement/rapport.php +++ b/htdocs/compta/paiement/rapport.php @@ -23,7 +23,7 @@ */ require("../../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/includes/modules/rapport/pdf_paiement.class.php"); +require_once(DOL_DOCUMENT_ROOT."/core/modules/rapport/pdf_paiement.class.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php"); // Security check diff --git a/htdocs/compta/payment_sc/fiche.php b/htdocs/compta/payment_sc/fiche.php index d69efe561ab..577fe00342b 100644 --- a/htdocs/compta/payment_sc/fiche.php +++ b/htdocs/compta/payment_sc/fiche.php @@ -29,7 +29,7 @@ require('../../main.inc.php'); require_once(DOL_DOCUMENT_ROOT."/compta/sociales/class/chargesociales.class.php"); require_once(DOL_DOCUMENT_ROOT."/compta/sociales/class/paymentsocialcontribution.class.php"); require_once(DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php'); -require_once(DOL_DOCUMENT_ROOT."/includes/modules/facture/modules_facture.php"); +require_once(DOL_DOCUMENT_ROOT."/core/modules/facture/modules_facture.php"); if ($conf->banque->enabled) require_once(DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php'); $langs->load('bills'); diff --git a/htdocs/compta/prelevement/demandes.php b/htdocs/compta/prelevement/demandes.php index 5bd3db7b996..82ab1bb4402 100644 --- a/htdocs/compta/prelevement/demandes.php +++ b/htdocs/compta/prelevement/demandes.php @@ -23,7 +23,7 @@ * \brief Page to list withdraw requests */ require("../bank/pre.inc.php"); -require_once DOL_DOCUMENT_ROOT."/includes/modules/modPrelevement.class.php"; +require_once DOL_DOCUMENT_ROOT."/core/modules/modPrelevement.class.php"; require_once DOL_DOCUMENT_ROOT."/compta/facture/class/facture.class.php"; require_once DOL_DOCUMENT_ROOT."/societe/class/societe.class.php"; diff --git a/htdocs/conf/conf.php.example b/htdocs/conf/conf.php.example index 9d59caf0cc4..61366fe7219 100644 --- a/htdocs/conf/conf.php.example +++ b/htdocs/conf/conf.php.example @@ -156,7 +156,7 @@ $dolibarr_main_db_collation='latin1_swedish_ci'; # This parameter contains the way authentication is done. # If value "ldap" is used, you must also set parameters dolibarr_main_auth_ldap_* # Default value: dolibarr -# Possible values: Any values found in files in htdocs/includes/login directory after +# Possible values: Any values found in files in htdocs/core/login directory after # the "function_" string and before the ".php" string. You can also separate several # values using a ",". In this case, Dolibarr will check login/pass for each value in # order defined into value. However, note that this can't work with all values. diff --git a/htdocs/contrat/class/contrat.class.php b/htdocs/contrat/class/contrat.class.php index 560941a64e3..25d6bdbe883 100644 --- a/htdocs/contrat/class/contrat.class.php +++ b/htdocs/contrat/class/contrat.class.php @@ -95,7 +95,7 @@ class Contrat extends CommonObject global $db, $langs, $conf; $langs->load("contract"); - $dir = DOL_DOCUMENT_ROOT . "/includes/modules/contract"; + $dir = DOL_DOCUMENT_ROOT . "/core/modules/contract"; if (empty($conf->global->CONTRACT_ADDON)) { diff --git a/htdocs/contrat/fiche.php b/htdocs/contrat/fiche.php index f32998c3c4d..beccf9a85f8 100644 --- a/htdocs/contrat/fiche.php +++ b/htdocs/contrat/fiche.php @@ -28,7 +28,7 @@ require ("../main.inc.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/date.lib.php"); require_once(DOL_DOCUMENT_ROOT.'/core/lib/contract.lib.php'); -require_once(DOL_DOCUMENT_ROOT."/includes/modules/contract/modules_contract.php"); +require_once(DOL_DOCUMENT_ROOT."/core/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"); diff --git a/htdocs/includes/boxes/box_actions.php b/htdocs/core/boxes/box_actions.php similarity index 97% rename from htdocs/includes/boxes/box_actions.php rename to htdocs/core/boxes/box_actions.php index 1b27b7dceb9..d8a9548f73d 100644 --- a/htdocs/includes/boxes/box_actions.php +++ b/htdocs/core/boxes/box_actions.php @@ -18,12 +18,12 @@ */ /** - * \file htdocs/includes/boxes/box_actions.php + * \file htdocs/core/boxes/box_actions.php * \ingroup actions * \brief Module to build boxe for events */ -include_once(DOL_DOCUMENT_ROOT."/includes/boxes/modules_boxes.php"); +include_once(DOL_DOCUMENT_ROOT."/core/boxes/modules_boxes.php"); class box_actions extends ModeleBoxes { diff --git a/htdocs/includes/boxes/box_bookmarks.php b/htdocs/core/boxes/box_bookmarks.php similarity index 96% rename from htdocs/includes/boxes/box_bookmarks.php rename to htdocs/core/boxes/box_bookmarks.php index dbf1585e022..aa31aa3cf7d 100644 --- a/htdocs/includes/boxes/box_bookmarks.php +++ b/htdocs/core/boxes/box_bookmarks.php @@ -16,11 +16,11 @@ */ /** - * \file htdocs/includes/boxes/box_bookmarks.php + * \file htdocs/core/boxes/box_bookmarks.php * \ingroup bookmark * \brief Module to generate box of bookmarks list */ -include_once(DOL_DOCUMENT_ROOT."/includes/boxes/modules_boxes.php"); +include_once(DOL_DOCUMENT_ROOT."/core/boxes/modules_boxes.php"); class box_bookmarks extends ModeleBoxes { diff --git a/htdocs/includes/boxes/box_clients.php b/htdocs/core/boxes/box_clients.php similarity index 97% rename from htdocs/includes/boxes/box_clients.php rename to htdocs/core/boxes/box_clients.php index 33feb5e4910..c9db0650c43 100644 --- a/htdocs/includes/boxes/box_clients.php +++ b/htdocs/core/boxes/box_clients.php @@ -18,12 +18,12 @@ */ /** - * \file htdocs/includes/boxes/box_clients.php + * \file htdocs/core/boxes/box_clients.php * \ingroup societes * \brief Module de generation de l'affichage de la box clients */ -include_once(DOL_DOCUMENT_ROOT."/includes/boxes/modules_boxes.php"); +include_once(DOL_DOCUMENT_ROOT."/core/boxes/modules_boxes.php"); class box_clients extends ModeleBoxes { diff --git a/htdocs/includes/boxes/box_commandes.php b/htdocs/core/boxes/box_commandes.php similarity index 97% rename from htdocs/includes/boxes/box_commandes.php rename to htdocs/core/boxes/box_commandes.php index b5fdd6cfb4d..8aac9fada59 100644 --- a/htdocs/includes/boxes/box_commandes.php +++ b/htdocs/core/boxes/box_commandes.php @@ -18,12 +18,12 @@ */ /** - * \file htdocs/includes/boxes/box_commandes.php + * \file htdocs/core/boxes/box_commandes.php * \ingroup commande * \brief Module de generation de l'affichage de la box commandes */ -include_once(DOL_DOCUMENT_ROOT."/includes/boxes/modules_boxes.php"); +include_once(DOL_DOCUMENT_ROOT."/core/boxes/modules_boxes.php"); class box_commandes extends ModeleBoxes { diff --git a/htdocs/includes/boxes/box_comptes.php b/htdocs/core/boxes/box_comptes.php similarity index 97% rename from htdocs/includes/boxes/box_comptes.php rename to htdocs/core/boxes/box_comptes.php index be8e3abd56e..fc70f640161 100644 --- a/htdocs/includes/boxes/box_comptes.php +++ b/htdocs/core/boxes/box_comptes.php @@ -18,11 +18,11 @@ */ /** - * \file htdocs/includes/boxes/box_comptes.php + * \file htdocs/core/boxes/box_comptes.php * \ingroup banque * \brief Module to generate box for bank accounts */ -include_once(DOL_DOCUMENT_ROOT."/includes/boxes/modules_boxes.php"); +include_once(DOL_DOCUMENT_ROOT."/core/boxes/modules_boxes.php"); include_once(DOL_DOCUMENT_ROOT."/compta/bank/class/account.class.php"); diff --git a/htdocs/includes/boxes/box_contacts.php b/htdocs/core/boxes/box_contacts.php similarity index 97% rename from htdocs/includes/boxes/box_contacts.php rename to htdocs/core/boxes/box_contacts.php index 8ae7c6a81d6..0371e821d22 100755 --- a/htdocs/includes/boxes/box_contacts.php +++ b/htdocs/core/boxes/box_contacts.php @@ -18,12 +18,12 @@ */ /** - * \file htdocs/includes/boxes/box_contacts.php + * \file htdocs/core/boxes/box_contacts.php * \ingroup societes * \brief Module to show box of contacts */ -include_once(DOL_DOCUMENT_ROOT."/includes/boxes/modules_boxes.php"); +include_once(DOL_DOCUMENT_ROOT."/core/boxes/modules_boxes.php"); include_once(DOL_DOCUMENT_ROOT."/contact/class/contact.class.php"); diff --git a/htdocs/includes/boxes/box_contracts.php b/htdocs/core/boxes/box_contracts.php similarity index 97% rename from htdocs/includes/boxes/box_contracts.php rename to htdocs/core/boxes/box_contracts.php index 9da5205c1be..223d9259d8f 100644 --- a/htdocs/includes/boxes/box_contracts.php +++ b/htdocs/core/boxes/box_contracts.php @@ -16,12 +16,12 @@ */ /** - * \file htdocs/includes/boxes/box_contracts.php + * \file htdocs/core/boxes/box_contracts.php * \ingroup contracts * \brief Module de generation de l'affichage de la box contracts */ -include_once(DOL_DOCUMENT_ROOT."/includes/boxes/modules_boxes.php"); +include_once(DOL_DOCUMENT_ROOT."/core/boxes/modules_boxes.php"); class box_contracts extends ModeleBoxes { diff --git a/htdocs/includes/boxes/box_external_rss.php b/htdocs/core/boxes/box_external_rss.php similarity index 97% rename from htdocs/includes/boxes/box_external_rss.php rename to htdocs/core/boxes/box_external_rss.php index cf159c41599..dfaf342f5e8 100644 --- a/htdocs/includes/boxes/box_external_rss.php +++ b/htdocs/core/boxes/box_external_rss.php @@ -19,13 +19,13 @@ */ /** - * \file htdocs/includes/boxes/box_external_rss.php + * \file htdocs/core/boxes/box_external_rss.php * \ingroup external_rss * \brief Fichier de gestion d'une box pour le module external_rss */ include_once(DOL_DOCUMENT_ROOT."/core/class/rssparser.class.php"); -include_once(DOL_DOCUMENT_ROOT."/includes/boxes/modules_boxes.php"); +include_once(DOL_DOCUMENT_ROOT."/core/boxes/modules_boxes.php"); class box_external_rss extends ModeleBoxes { diff --git a/htdocs/includes/boxes/box_factures.php b/htdocs/core/boxes/box_factures.php similarity index 97% rename from htdocs/includes/boxes/box_factures.php rename to htdocs/core/boxes/box_factures.php index e917a42e6ed..b7359c19932 100644 --- a/htdocs/includes/boxes/box_factures.php +++ b/htdocs/core/boxes/box_factures.php @@ -18,11 +18,11 @@ */ /** - * \file htdocs/includes/boxes/box_factures.php + * \file htdocs/core/boxes/box_factures.php * \ingroup factures * \brief Module de generation de l'affichage de la box factures */ -include_once(DOL_DOCUMENT_ROOT."/includes/boxes/modules_boxes.php"); +include_once(DOL_DOCUMENT_ROOT."/core/boxes/modules_boxes.php"); class box_factures extends ModeleBoxes { diff --git a/htdocs/includes/boxes/box_factures_fourn.php b/htdocs/core/boxes/box_factures_fourn.php similarity index 97% rename from htdocs/includes/boxes/box_factures_fourn.php rename to htdocs/core/boxes/box_factures_fourn.php index dd28066c6ef..5cbb0af5cd9 100644 --- a/htdocs/includes/boxes/box_factures_fourn.php +++ b/htdocs/core/boxes/box_factures_fourn.php @@ -18,11 +18,11 @@ */ /** - * \file htdocs/includes/boxes/box_factures_fourn.php + * \file htdocs/core/boxes/box_factures_fourn.php * \ingroup supplier * \brief Fichier de gestion d'une box des factures fournisseurs */ -include_once(DOL_DOCUMENT_ROOT."/includes/boxes/modules_boxes.php"); +include_once(DOL_DOCUMENT_ROOT."/core/boxes/modules_boxes.php"); class box_factures_fourn extends ModeleBoxes { diff --git a/htdocs/includes/boxes/box_factures_fourn_imp.php b/htdocs/core/boxes/box_factures_fourn_imp.php similarity index 97% rename from htdocs/includes/boxes/box_factures_fourn_imp.php rename to htdocs/core/boxes/box_factures_fourn_imp.php index 1f1d7430a7d..61363d2bcac 100644 --- a/htdocs/includes/boxes/box_factures_fourn_imp.php +++ b/htdocs/core/boxes/box_factures_fourn_imp.php @@ -17,11 +17,11 @@ */ /** - * \file htdocs/includes/boxes/box_factures_fourn_imp.php + * \file htdocs/core/boxes/box_factures_fourn_imp.php * \ingroup fournisseur * \brief Fichier de gestion d'une box des factures fournisseurs impayees */ -include_once(DOL_DOCUMENT_ROOT."/includes/boxes/modules_boxes.php"); +include_once(DOL_DOCUMENT_ROOT."/core/boxes/modules_boxes.php"); class box_factures_fourn_imp extends ModeleBoxes { diff --git a/htdocs/includes/boxes/box_factures_imp.php b/htdocs/core/boxes/box_factures_imp.php similarity index 97% rename from htdocs/includes/boxes/box_factures_imp.php rename to htdocs/core/boxes/box_factures_imp.php index 3b268185e2c..57b0e2cb722 100644 --- a/htdocs/includes/boxes/box_factures_imp.php +++ b/htdocs/core/boxes/box_factures_imp.php @@ -18,12 +18,12 @@ */ /** - * \file htdocs/includes/boxes/box_factures_imp.php + * \file htdocs/core/boxes/box_factures_imp.php * \ingroup factures * \brief Module de generation de l'affichage de la box factures impayees */ -require_once(DOL_DOCUMENT_ROOT."/includes/boxes/modules_boxes.php"); +require_once(DOL_DOCUMENT_ROOT."/core/boxes/modules_boxes.php"); require_once(DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php'); diff --git a/htdocs/includes/boxes/box_fournisseurs.php b/htdocs/core/boxes/box_fournisseurs.php similarity index 97% rename from htdocs/includes/boxes/box_fournisseurs.php rename to htdocs/core/boxes/box_fournisseurs.php index 5528066c158..5ca61023b71 100644 --- a/htdocs/includes/boxes/box_fournisseurs.php +++ b/htdocs/core/boxes/box_fournisseurs.php @@ -17,12 +17,12 @@ */ /** - * \file htdocs/includes/boxes/box_fournisseurs.php + * \file htdocs/core/boxes/box_fournisseurs.php * \ingroup fournisseurs * \brief Module to generate box of suppliers */ -include_once(DOL_DOCUMENT_ROOT."/includes/boxes/modules_boxes.php"); +include_once(DOL_DOCUMENT_ROOT."/core/boxes/modules_boxes.php"); class box_fournisseurs extends ModeleBoxes { diff --git a/htdocs/includes/boxes/box_members.php b/htdocs/core/boxes/box_members.php similarity index 96% rename from htdocs/includes/boxes/box_members.php rename to htdocs/core/boxes/box_members.php index 0cba1596a3c..8b3cc143b33 100755 --- a/htdocs/includes/boxes/box_members.php +++ b/htdocs/core/boxes/box_members.php @@ -18,12 +18,12 @@ */ /** - * \file htdocs/includes/boxes/box_members.php + * \file htdocs/core/boxes/box_members.php * \ingroup societes * \brief Module de generation de l'affichage de la box clients */ -include_once(DOL_DOCUMENT_ROOT."/includes/boxes/modules_boxes.php"); +include_once(DOL_DOCUMENT_ROOT."/core/boxes/modules_boxes.php"); class box_members extends ModeleBoxes { diff --git a/htdocs/includes/boxes/box_osc_client.php b/htdocs/core/boxes/box_osc_client.php similarity index 96% rename from htdocs/includes/boxes/box_osc_client.php rename to htdocs/core/boxes/box_osc_client.php index f9ea1fb4c40..a2a539f22ac 100644 --- a/htdocs/includes/boxes/box_osc_client.php +++ b/htdocs/core/boxes/box_osc_client.php @@ -17,12 +17,12 @@ */ /** - * \file htdocs/includes/boxes/box_osc_client.php + * \file htdocs/core/boxes/box_osc_client.php * \ingroup osc * \brief Module to generate box of shop customers */ -include_once(DOL_DOCUMENT_ROOT."/includes/boxes/modules_boxes.php"); +include_once(DOL_DOCUMENT_ROOT."/core/boxes/modules_boxes.php"); class box_osc_clients extends ModeleBoxes { diff --git a/htdocs/includes/boxes/box_produits.php b/htdocs/core/boxes/box_produits.php similarity index 97% rename from htdocs/includes/boxes/box_produits.php rename to htdocs/core/boxes/box_produits.php index 166711e8e2e..711ee033a8c 100644 --- a/htdocs/includes/boxes/box_produits.php +++ b/htdocs/core/boxes/box_produits.php @@ -18,12 +18,12 @@ */ /** - * \file htdocs/includes/boxes/box_produits.php + * \file htdocs/core/boxes/box_produits.php * \ingroup produits,services * \brief Module to generate box of last products/services */ -include_once(DOL_DOCUMENT_ROOT."/includes/boxes/modules_boxes.php"); +include_once(DOL_DOCUMENT_ROOT."/core/boxes/modules_boxes.php"); include_once(DOL_DOCUMENT_ROOT."/product/class/product.class.php"); diff --git a/htdocs/includes/boxes/box_propales.php b/htdocs/core/boxes/box_propales.php similarity index 97% rename from htdocs/includes/boxes/box_propales.php rename to htdocs/core/boxes/box_propales.php index 64d7508ff6b..91bc157ea80 100644 --- a/htdocs/includes/boxes/box_propales.php +++ b/htdocs/core/boxes/box_propales.php @@ -18,12 +18,12 @@ */ /** - * \file htdocs/includes/boxes/box_propales.php + * \file htdocs/core/boxes/box_propales.php * \ingroup propales * \brief Module de generation de l'affichage de la box propales */ -include_once(DOL_DOCUMENT_ROOT."/includes/boxes/modules_boxes.php"); +include_once(DOL_DOCUMENT_ROOT."/core/boxes/modules_boxes.php"); class box_propales extends ModeleBoxes { diff --git a/htdocs/includes/boxes/box_prospect.php b/htdocs/core/boxes/box_prospect.php similarity index 97% rename from htdocs/includes/boxes/box_prospect.php rename to htdocs/core/boxes/box_prospect.php index c34e18e0028..3e4c3c67a0b 100644 --- a/htdocs/includes/boxes/box_prospect.php +++ b/htdocs/core/boxes/box_prospect.php @@ -18,13 +18,13 @@ */ /** - * \file htdocs/includes/boxes/box_prospect.php + * \file htdocs/core/boxes/box_prospect.php * \ingroup societe * \brief Module to generate the last prospects box. */ -include_once(DOL_DOCUMENT_ROOT."/includes/boxes/modules_boxes.php"); +include_once(DOL_DOCUMENT_ROOT."/core/boxes/modules_boxes.php"); include_once(DOL_DOCUMENT_ROOT."/comm/prospect/class/prospect.class.php"); diff --git a/htdocs/includes/boxes/box_services_vendus.php b/htdocs/core/boxes/box_services_vendus.php similarity index 97% rename from htdocs/includes/boxes/box_services_vendus.php rename to htdocs/core/boxes/box_services_vendus.php index 2ccf675ed23..067deee6d1f 100644 --- a/htdocs/includes/boxes/box_services_vendus.php +++ b/htdocs/core/boxes/box_services_vendus.php @@ -18,12 +18,12 @@ */ /** - * \file htdocs/includes/boxes/box_services_vendus.php + * \file htdocs/core/boxes/box_services_vendus.php * \ingroup produits,services * \brief Module de generation de l'affichage de la box services_vendus */ -include_once(DOL_DOCUMENT_ROOT."/includes/boxes/modules_boxes.php"); +include_once(DOL_DOCUMENT_ROOT."/core/boxes/modules_boxes.php"); class box_services_vendus extends ModeleBoxes { diff --git a/htdocs/includes/boxes/modules_boxes.php b/htdocs/core/boxes/modules_boxes.php similarity index 99% rename from htdocs/includes/boxes/modules_boxes.php rename to htdocs/core/boxes/modules_boxes.php index d899f0e0ce3..e03ec6aa778 100644 --- a/htdocs/includes/boxes/modules_boxes.php +++ b/htdocs/core/boxes/modules_boxes.php @@ -17,7 +17,7 @@ */ /** - * \file htdocs/includes/boxes/modules_boxes.php + * \file htdocs/core/boxes/modules_boxes.php * \ingroup facture * \brief Fichier contenant la classe mere des boites */ diff --git a/htdocs/core/class/conf.class.php b/htdocs/core/class/conf.class.php index 9b21460fef5..44a366f876c 100644 --- a/htdocs/core/class/conf.class.php +++ b/htdocs/core/class/conf.class.php @@ -90,7 +90,7 @@ class Conf dol_syslog("Conf::setValues"); // Directory of core triggers - $this->triggers_modules[] = "/includes/triggers"; // Default relative path to triggers file + $this->triggers_modules[] = "/core/triggers"; // Default relative path to triggers file // Avoid warning if not defined if (empty($this->db->dolibarr_main_db_encryption)) $this->db->dolibarr_main_db_encryption=0; @@ -142,13 +142,13 @@ class Conf elseif (preg_match('/^MAIN_MODULE_([A-Z_]+)_TRIGGERS$/i',$key,$reg)) { $modulename = strtolower($reg[1]); - $this->triggers_modules[] = '/'.$modulename.'/includes/triggers/'; + $this->triggers_modules[] = '/'.$modulename.'/core/triggers/'; } // If this is constant for login method activated by a module elseif (preg_match('/^MAIN_MODULE_([A-Z_]+)_LOGIN_METHOD$/i',$key,$reg)) { $modulename = strtolower($reg[1]); - $this->login_method_modules[] = dol_buildpath('/'.$modulename.'/includes/login/'); + $this->login_method_modules[] = dol_buildpath('/'.$modulename.'/core/login/'); } // If this is constant for hook activated by a module. Value is list of hooked tabs separated with : elseif (preg_match('/^MAIN_MODULE_([A-Z_]+)_HOOKS$/i',$key,$reg)) diff --git a/htdocs/core/class/html.formfile.class.php b/htdocs/core/class/html.formfile.class.php index 52580882ccc..df036a26f59 100644 --- a/htdocs/core/class/html.formfile.class.php +++ b/htdocs/core/class/html.formfile.class.php @@ -221,7 +221,7 @@ class FormFile if (is_array($genallowed)) $modellist=$genallowed; else { - include_once(DOL_DOCUMENT_ROOT.'/includes/modules/societe/modules_societe.class.php'); + include_once(DOL_DOCUMENT_ROOT.'/core/modules/societe/modules_societe.class.php'); $modellist=ModeleThirdPartyDoc::liste_modeles($this->db); } } @@ -230,7 +230,7 @@ class FormFile if (is_array($genallowed)) $modellist=$genallowed; else { - include_once(DOL_DOCUMENT_ROOT.'/includes/modules/propale/modules_propale.php'); + include_once(DOL_DOCUMENT_ROOT.'/core/modules/propale/modules_propale.php'); $modellist=ModelePDFPropales::liste_modeles($this->db); } } @@ -239,7 +239,7 @@ class FormFile if (is_array($genallowed)) $modellist=$genallowed; else { - include_once(DOL_DOCUMENT_ROOT.'/includes/modules/commande/modules_commande.php'); + include_once(DOL_DOCUMENT_ROOT.'/core/modules/commande/modules_commande.php'); $modellist=ModelePDFCommandes::liste_modeles($this->db); } } @@ -248,7 +248,7 @@ class FormFile if (is_array($genallowed)) $modellist=$genallowed; else { - include_once(DOL_DOCUMENT_ROOT.'/includes/modules/expedition/pdf/ModelePdfExpedition.class.php'); + include_once(DOL_DOCUMENT_ROOT.'/core/modules/expedition/pdf/ModelePdfExpedition.class.php'); $modellist=ModelePDFExpedition::liste_modeles($this->db); } } @@ -257,7 +257,7 @@ class FormFile if (is_array($genallowed)) $modellist=$genallowed; else { - include_once(DOL_DOCUMENT_ROOT.'/includes/modules/livraison/modules_livraison.php'); + include_once(DOL_DOCUMENT_ROOT.'/core/modules/livraison/modules_livraison.php'); $modellist=ModelePDFDeliveryOrder::liste_modeles($this->db); } } @@ -266,7 +266,7 @@ class FormFile if (is_array($genallowed)) $modellist=$genallowed; else { - include_once(DOL_DOCUMENT_ROOT.'/includes/modules/fichinter/modules_fichinter.php'); + include_once(DOL_DOCUMENT_ROOT.'/core/modules/fichinter/modules_fichinter.php'); $modellist=ModelePDFFicheinter::liste_modeles($this->db); } } @@ -275,7 +275,7 @@ class FormFile if (is_array($genallowed)) $modellist=$genallowed; else { - include_once(DOL_DOCUMENT_ROOT.'/includes/modules/facture/modules_facture.php'); + include_once(DOL_DOCUMENT_ROOT.'/core/modules/facture/modules_facture.php'); $modellist=ModelePDFFactures::liste_modeles($this->db); // This is to allow to join external files to invoices @@ -295,7 +295,7 @@ class FormFile if (is_array($genallowed)) $modellist=$genallowed; else { - include_once(DOL_DOCUMENT_ROOT.'/includes/modules/project/modules_project.php'); + include_once(DOL_DOCUMENT_ROOT.'/core/modules/project/modules_project.php'); $modellist=ModelePDFProjects::liste_modeles($this->db); } } @@ -304,7 +304,7 @@ class FormFile if (is_array($genallowed)) $modellist=$genallowed; else { - include_once(DOL_DOCUMENT_ROOT.'/includes/modules/export/modules_export.php'); + include_once(DOL_DOCUMENT_ROOT.'/core/modules/export/modules_export.php'); $modellist=ModeleExports::liste_modeles($this->db); } } @@ -313,7 +313,7 @@ class FormFile if (is_array($genallowed)) $modellist=$genallowed; else { - include_once(DOL_DOCUMENT_ROOT.'/includes/modules/supplier_order/modules_commandefournisseur.php'); + include_once(DOL_DOCUMENT_ROOT.'/core/modules/supplier_order/modules_commandefournisseur.php'); $modellist=ModelePDFSuppliersOrders::liste_modeles($this->db); } } @@ -322,7 +322,7 @@ class FormFile if (is_array($genallowed)) $modellist=$genallowed; else { - include_once(DOL_DOCUMENT_ROOT.'/includes/modules/supplier_invoice/modules_facturefournisseur.php'); + include_once(DOL_DOCUMENT_ROOT.'/core/modules/supplier_invoice/modules_facturefournisseur.php'); $modellist=ModelePDFSuppliersInvoices::liste_modeles($this->db); } } @@ -331,7 +331,7 @@ class FormFile if (is_array($genallowed)) $modellist=$genallowed; else { - include_once(DOL_DOCUMENT_ROOT.'/includes/modules/cheque/pdf/modules_chequereceipts.php'); + include_once(DOL_DOCUMENT_ROOT.'/core/modules/cheque/pdf/modules_chequereceipts.php'); $modellist=ModeleChequeReceipts::liste_modeles($this->db); } } @@ -340,7 +340,7 @@ class FormFile if (is_array($genallowed)) $modellist=$genallowed; else { - include_once(DOL_DOCUMENT_ROOT.'/includes/modules/dons/modules_don.php'); + include_once(DOL_DOCUMENT_ROOT.'/core/modules/dons/modules_don.php'); $modellist=ModeleDon::liste_modeles($this->db); } } @@ -351,7 +351,7 @@ class FormFile else { // Generic feature, for external modules - $file=dol_buildpath('/includes/modules/'.$modulepart.'/modules_'.$modulepart.'.php',0); + $file=dol_buildpath('/core/modules/'.$modulepart.'/modules_'.$modulepart.'.php',0); if (file_exists($file)) { $res=include_once($file); diff --git a/htdocs/core/class/interfaces.class.php b/htdocs/core/class/interfaces.class.php index 86837c476b7..5803ac00c46 100644 --- a/htdocs/core/class/interfaces.class.php +++ b/htdocs/core/class/interfaces.class.php @@ -91,7 +91,7 @@ class Interfaces if (in_array($modName,$modules)) { $langs->load("errors"); - dol_syslog("Interface::run_triggers action=".$action." ".$langs->trans("ErrorDuplicateTrigger",$modName,"/htdocs/includes/triggers/"),LOG_ERR); + dol_syslog("Interface::run_triggers action=".$action." ".$langs->trans("ErrorDuplicateTrigger",$modName,"/htdocs/core/triggers/"),LOG_ERR); continue; } @@ -210,7 +210,7 @@ class Interfaces if (in_array($modName,$modules)) { $langs->load("errors"); - print '
'.$langs->trans("Error").' : '.$langs->trans("ErrorDuplicateTrigger",$modName,"/htdocs/includes/triggers/").'
'; + print '
'.$langs->trans("Error").' : '.$langs->trans("ErrorDuplicateTrigger",$modName,"/htdocs/core/triggers/").'
'; $objMod = new $modName($this->db); $modules[$i] = $modName; diff --git a/htdocs/core/class/translate.class.php b/htdocs/core/class/translate.class.php index 7fff033ba57..c293b63283f 100644 --- a/htdocs/core/class/translate.class.php +++ b/htdocs/core/class/translate.class.php @@ -606,7 +606,7 @@ class Translate { $newnumber=$number; foreach ($conf->file->dol_document_root as $dirroot) { - $dir=$dirroot."/includes/modules/substitutions"; + $dir=$dirroot."/core/modules/substitutions"; $fonc='numberwords'; if (file_exists($dir.'/functions_'.$fonc.'.lib.php')) { diff --git a/htdocs/core/lib/admin.lib.php b/htdocs/core/lib/admin.lib.php index fcb88ee0ede..949df2d1e7b 100644 --- a/htdocs/core/lib/admin.lib.php +++ b/htdocs/core/lib/admin.lib.php @@ -636,7 +636,7 @@ function Activate($value,$withdeps=1) $found=false; foreach ($conf->file->dol_document_root as $type => $dirroot) { - $modulesdir[] = $dirroot."/includes/modules/"; + $modulesdir[] = $dirroot."/core/modules/"; if ($type == 'alt') { @@ -647,9 +647,9 @@ function Activate($value,$withdeps=1) { if (is_dir($dirroot.'/'.$file) && substr($file, 0, 1) <> '.' && substr($file, 0, 3) <> 'CVS' && $file != 'includes') { - if (is_dir($dirroot . '/' . $file . '/includes/modules/')) + if (is_dir($dirroot . '/' . $file . '/core/modules/')) { - $modulesdir[] = $dirroot . '/' . $file . '/includes/modules/'; + $modulesdir[] = $dirroot . '/' . $file . '/core/modules/'; } } } @@ -703,7 +703,7 @@ function Activate($value,$withdeps=1) $num = count($objMod->depends); for ($i = 0; $i < $num; $i++) { - if (file_exists(DOL_DOCUMENT_ROOT."/includes/modules/".$objMod->depends[$i].".class.php")) + if (file_exists(DOL_DOCUMENT_ROOT."/core/modules/".$objMod->depends[$i].".class.php")) { Activate($objMod->depends[$i]); } @@ -716,7 +716,7 @@ function Activate($value,$withdeps=1) $num = count($objMod->conflictwith); for ($i = 0; $i < $num; $i++) { - if (file_exists(DOL_DOCUMENT_ROOT."/includes/modules/".$objMod->conflictwith[$i].".class.php")) + if (file_exists(DOL_DOCUMENT_ROOT."/core/modules/".$objMod->conflictwith[$i].".class.php")) { UnActivate($objMod->conflictwith[$i],0); } @@ -751,7 +751,7 @@ function UnActivate($value, $requiredby=1) $found=false; foreach ($conf->file->dol_document_root as $type => $dirroot) { - $modulesdir[] = $dirroot."/includes/modules/"; + $modulesdir[] = $dirroot."/core/modules/"; if ($type == 'alt') { @@ -762,9 +762,9 @@ function UnActivate($value, $requiredby=1) { if (is_dir($dirroot.'/'.$file) && substr($file, 0, 1) <> '.' && substr($file, 0, 3) <> 'CVS' && $file != 'includes') { - if (is_dir($dirroot . '/' . $file . '/includes/modules/')) + if (is_dir($dirroot . '/' . $file . '/core/modules/')) { - $modulesdir[] = $dirroot . '/' . $file . '/includes/modules/'; + $modulesdir[] = $dirroot . '/' . $file . '/core/modules/'; } } } @@ -842,7 +842,7 @@ function complete_dictionnary_with_modules(&$taborder,&$tabname,&$tablib,&$tabsq $j = 0; // j is module number. Automatically affected if module number not defined. foreach ($conf->file->dol_document_root as $dirroot) { - $dir = $dirroot . "/includes/modules/"; + $dir = $dirroot . "/core/modules/"; // Load modules attributes in arrays (name, numero, orders) from dir directory //print $dir."\n
"; diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php index 81e0f50b182..bac286e3c20 100644 --- a/htdocs/core/lib/functions.lib.php +++ b/htdocs/core/lib/functions.lib.php @@ -3815,11 +3815,11 @@ function complete_substitutions_array(&$substitutionarray,$outputlangs,$object=' 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 + // We look files into the core/modules/substitutions directory // By default, there is no such external plugins. foreach ($conf->file->dol_document_root as $dirroot) { - $substitfiles=dol_dir_list($dirroot.'/includes/modules/substitutions','files',0,'functions_'); + $substitfiles=dol_dir_list($dirroot.'/core/modules/substitutions','files',0,'functions_'); foreach($substitfiles as $substitfile) { if (preg_match('/functions_(.*)\.lib\.php/i',$substitfile['name'],$reg)) @@ -3828,7 +3828,7 @@ function complete_substitutions_array(&$substitutionarray,$outputlangs,$object=' if (! empty($conf->$module->enabled)) // If module enabled { dol_syslog("Library functions_".$module.".lib.php found into ".$dirroot); - require_once($dirroot."/includes/modules/substitutions/functions_".$module.".lib.php"); + require_once($dirroot."/core/modules/substitutions/functions_".$module.".lib.php"); $function_name=$module."_completesubstitutionarray"; $function_name($substitutionarray,$outputlangs,$object); } diff --git a/htdocs/core/lib/security.lib.php b/htdocs/core/lib/security.lib.php index 9b24f98738e..12268fd370d 100644 --- a/htdocs/core/lib/security.lib.php +++ b/htdocs/core/lib/security.lib.php @@ -101,7 +101,7 @@ function checkLoginPassEntity($usertotest,$passwordtotest,$entitytotest,$authmod if ($test && $mode && ! $login) { $mode=trim($mode); - $authfile=DOL_DOCUMENT_ROOT.'/includes/login/functions_'.$mode.'.php'; + $authfile=DOL_DOCUMENT_ROOT.'/core/login/functions_'.$mode.'.php'; $result=include_once($authfile); if ($result) { @@ -513,8 +513,8 @@ function getRandomPassword($generic=false) { $nomclass="modGeneratePass".ucfirst($conf->global->USER_PASSWORD_GENERATED); $nomfichier=$nomclass.".class.php"; - //print DOL_DOCUMENT_ROOT."/includes/modules/security/generate/".$nomclass; - require_once(DOL_DOCUMENT_ROOT."/includes/modules/security/generate/".$nomfichier); + //print DOL_DOCUMENT_ROOT."/core/modules/security/generate/".$nomclass; + require_once(DOL_DOCUMENT_ROOT."/core/modules/security/generate/".$nomfichier); $genhandler=new $nomclass($db,$conf,$langs,$user); $generated_password=$genhandler->getNewGeneratedPassword(); unset($genhandler); diff --git a/htdocs/includes/login/README.txt b/htdocs/core/login/README.txt similarity index 92% rename from htdocs/includes/login/README.txt rename to htdocs/core/login/README.txt index beb66115858..7c00a86887f 100644 --- a/htdocs/includes/login/README.txt +++ b/htdocs/core/login/README.txt @@ -1,6 +1,6 @@ README (english) --------------------------------------------- -Decription of htdocs/includes/login directory +Decription of htdocs/core/login directory --------------------------------------------- This directory contains files that handle way to validate passwords. diff --git a/htdocs/includes/login/functions_dolibarr.php b/htdocs/core/login/functions_dolibarr.php similarity index 98% rename from htdocs/includes/login/functions_dolibarr.php rename to htdocs/core/login/functions_dolibarr.php index e3b2325409a..de814814f91 100644 --- a/htdocs/includes/login/functions_dolibarr.php +++ b/htdocs/core/login/functions_dolibarr.php @@ -17,7 +17,7 @@ */ /** - * \file htdocs/includes/login/functions_dolibarr.php + * \file htdocs/core/login/functions_dolibarr.php * \ingroup core * \brief Authentication functions for Dolibarr mode */ diff --git a/htdocs/includes/login/functions_empty.php b/htdocs/core/login/functions_empty.php similarity index 95% rename from htdocs/includes/login/functions_empty.php rename to htdocs/core/login/functions_empty.php index cf535aff82b..aafba4d9099 100644 --- a/htdocs/includes/login/functions_empty.php +++ b/htdocs/core/login/functions_empty.php @@ -16,7 +16,7 @@ */ /** - * \file htdocs/includes/login/functions_empty.php + * \file htdocs/core/login/functions_empty.php * \ingroup core * \brief Empty authentication functions for test */ diff --git a/htdocs/includes/login/functions_forceuser.php b/htdocs/core/login/functions_forceuser.php similarity index 96% rename from htdocs/includes/login/functions_forceuser.php rename to htdocs/core/login/functions_forceuser.php index 8c341b76d56..a2612df16b2 100644 --- a/htdocs/includes/login/functions_forceuser.php +++ b/htdocs/core/login/functions_forceuser.php @@ -17,7 +17,7 @@ */ /** - * \file htdocs/includes/login/functions_forceuser.php + * \file htdocs/core/login/functions_forceuser.php * \ingroup core * \brief Authentication functions for forceuser */ diff --git a/htdocs/includes/login/functions_http.php b/htdocs/core/login/functions_http.php similarity index 96% rename from htdocs/includes/login/functions_http.php rename to htdocs/core/login/functions_http.php index 1e05b10db58..c40e3b1609d 100644 --- a/htdocs/includes/login/functions_http.php +++ b/htdocs/core/login/functions_http.php @@ -16,7 +16,7 @@ */ /** - * \file htdocs/includes/login/functions_http.php + * \file htdocs/core/login/functions_http.php * \ingroup core * \brief Authentication functions for HTTP Basic */ diff --git a/htdocs/includes/login/functions_ldap.php b/htdocs/core/login/functions_ldap.php similarity index 99% rename from htdocs/includes/login/functions_ldap.php rename to htdocs/core/login/functions_ldap.php index c817fd47980..794187d5ca5 100644 --- a/htdocs/includes/login/functions_ldap.php +++ b/htdocs/core/login/functions_ldap.php @@ -17,7 +17,7 @@ */ /** - * \file htdocs/includes/login/functions_ldap.php + * \file htdocs/core/login/functions_ldap.php * \ingroup core * \brief Authentication functions for LDAP */ diff --git a/htdocs/includes/login/functions_myopenid.php b/htdocs/core/login/functions_myopenid.php similarity index 99% rename from htdocs/includes/login/functions_myopenid.php rename to htdocs/core/login/functions_myopenid.php index ecb831465c1..c8c5e28cecb 100644 --- a/htdocs/includes/login/functions_myopenid.php +++ b/htdocs/core/login/functions_myopenid.php @@ -17,7 +17,7 @@ */ /** - * \file htdocs/includes/login/functions_myopenid.php + * \file htdocs/core/login/functions_myopenid.php * \ingroup core * \brief Authentication functions for OpenId mode */ diff --git a/htdocs/includes/menus/init_menu_auguria.sql b/htdocs/core/menus/init_menu_auguria.sql similarity index 100% rename from htdocs/includes/menus/init_menu_auguria.sql rename to htdocs/core/menus/init_menu_auguria.sql diff --git a/htdocs/includes/menus/init_menu_smartphone.sql b/htdocs/core/menus/init_menu_smartphone.sql similarity index 100% rename from htdocs/includes/menus/init_menu_smartphone.sql rename to htdocs/core/menus/init_menu_smartphone.sql diff --git a/htdocs/includes/menus/smartphone/smartphone.lib.php b/htdocs/core/menus/smartphone/smartphone.lib.php similarity index 98% rename from htdocs/includes/menus/smartphone/smartphone.lib.php rename to htdocs/core/menus/smartphone/smartphone.lib.php index 79fef992ee7..b78c0f7c3e8 100755 --- a/htdocs/includes/menus/smartphone/smartphone.lib.php +++ b/htdocs/core/menus/smartphone/smartphone.lib.php @@ -18,7 +18,7 @@ */ /** - * \file htdocs/includes/menus/smartphone/smartphone.lib.php + * \file htdocs/core/menus/smartphone/smartphone.lib.php * \brief Library for file smartphone menus */ diff --git a/htdocs/includes/menus/smartphone/smartphone_backoffice.php b/htdocs/core/menus/smartphone/smartphone_backoffice.php similarity index 91% rename from htdocs/includes/menus/smartphone/smartphone_backoffice.php rename to htdocs/core/menus/smartphone/smartphone_backoffice.php index e8f5cc9bbf5..9cf2c1ab7db 100755 --- a/htdocs/includes/menus/smartphone/smartphone_backoffice.php +++ b/htdocs/core/menus/smartphone/smartphone_backoffice.php @@ -17,7 +17,7 @@ */ /** - * \file htdocs/includes/menus/smartphone/smartphone_backoffice.php + * \file htdocs/core/menus/smartphone/smartphone_backoffice.php * \brief Gestionnaire nomme smartphone du menu smartphone */ @@ -50,7 +50,7 @@ class MenuSmart { */ function showmenu($limitmenuto) { - require_once(DOL_DOCUMENT_ROOT.'/includes/menus/smartphone/smartphone.lib.php'); + require_once(DOL_DOCUMENT_ROOT.'/core/menus/smartphone/smartphone.lib.php'); print_smartphone_menu($this->db,$this->atarget,$this->hideifnotallowed,$limitmenuto); } diff --git a/htdocs/includes/menus/smartphone/smartphone_frontoffice.php b/htdocs/core/menus/smartphone/smartphone_frontoffice.php similarity index 91% rename from htdocs/includes/menus/smartphone/smartphone_frontoffice.php rename to htdocs/core/menus/smartphone/smartphone_frontoffice.php index 85129ff8d21..4be38b571c8 100755 --- a/htdocs/includes/menus/smartphone/smartphone_frontoffice.php +++ b/htdocs/core/menus/smartphone/smartphone_frontoffice.php @@ -17,7 +17,7 @@ */ /** - * \file htdocs/includes/menus/smartphone/smartphone_frontoffice.php + * \file htdocs/core/menus/smartphone/smartphone_frontoffice.php * \brief Gestionnaire nomme smartphone du menu smartphone */ @@ -51,7 +51,7 @@ class MenuSmart { */ function showmenu($limitmenuto) { - require_once(DOL_DOCUMENT_ROOT.'/includes/menus/smartphone/smartphone.lib.php'); + require_once(DOL_DOCUMENT_ROOT.'/core/menus/smartphone/smartphone.lib.php'); print_smartphone_menu($this->db,$this->atarget,$this->hideifnotallowed,$limitmenuto); } diff --git a/htdocs/includes/menus/standard/auguria.lib.php b/htdocs/core/menus/standard/auguria.lib.php similarity index 99% rename from htdocs/includes/menus/standard/auguria.lib.php rename to htdocs/core/menus/standard/auguria.lib.php index 8a5cf7b5461..84253517cde 100644 --- a/htdocs/includes/menus/standard/auguria.lib.php +++ b/htdocs/core/menus/standard/auguria.lib.php @@ -18,7 +18,7 @@ */ /** - * \file htdocs/includes/menus/standard/auguria.lib.php + * \file htdocs/core/menus/standard/auguria.lib.php * \brief Library for file auguria menus */ diff --git a/htdocs/includes/menus/standard/auguria_backoffice.php b/htdocs/core/menus/standard/auguria_backoffice.php similarity index 92% rename from htdocs/includes/menus/standard/auguria_backoffice.php rename to htdocs/core/menus/standard/auguria_backoffice.php index 7c5d669f069..f23153e04ef 100644 --- a/htdocs/includes/menus/standard/auguria_backoffice.php +++ b/htdocs/core/menus/standard/auguria_backoffice.php @@ -18,7 +18,7 @@ */ /** - * \file htdocs/includes/menus/standard/auguria_backoffice.php + * \file htdocs/core/menus/standard/auguria_backoffice.php * \brief Gestionnaire nomme Auguria du menu du haut * * \remarks La construction d'un gestionnaire pour le menu du haut est simple: @@ -56,7 +56,7 @@ class MenuTop { */ function showmenu() { - require_once(DOL_DOCUMENT_ROOT.'/includes/menus/standard/auguria.lib.php'); + require_once(DOL_DOCUMENT_ROOT.'/core/menus/standard/auguria.lib.php'); print_auguria_menu($this->db,$this->atarget,$this->hideifnotallowed); } @@ -98,7 +98,7 @@ class MenuLeft { */ function showmenu() { - require_once(DOL_DOCUMENT_ROOT.'/includes/menus/standard/auguria.lib.php'); + require_once(DOL_DOCUMENT_ROOT.'/core/menus/standard/auguria.lib.php'); $res=print_left_auguria_menu($this->db,$this->menu_array,$this->menu_array_after); diff --git a/htdocs/includes/menus/standard/auguria_frontoffice.php b/htdocs/core/menus/standard/auguria_frontoffice.php similarity index 92% rename from htdocs/includes/menus/standard/auguria_frontoffice.php rename to htdocs/core/menus/standard/auguria_frontoffice.php index abd3e3a8be8..e1197a10439 100644 --- a/htdocs/includes/menus/standard/auguria_frontoffice.php +++ b/htdocs/core/menus/standard/auguria_frontoffice.php @@ -18,7 +18,7 @@ */ /** - * \file htdocs/includes/menus/standard/auguria_frontoffice.php + * \file htdocs/core/menus/standard/auguria_frontoffice.php * \brief Gestionnaire nomme Auguria du menu du haut * * \remarks La construction d'un gestionnaire pour le menu du haut est simple: @@ -57,7 +57,7 @@ class MenuTop { */ function showmenu() { - require_once(DOL_DOCUMENT_ROOT.'/includes/menus/standard/auguria.lib.php'); + require_once(DOL_DOCUMENT_ROOT.'/core/menus/standard/auguria.lib.php'); print_auguria_menu($this->db,$this->atarget,$this->hideifnotallowed); } @@ -98,7 +98,7 @@ class MenuLeft { */ function showmenu() { - require_once(DOL_DOCUMENT_ROOT.'/includes/menus/standard/auguria.lib.php'); + require_once(DOL_DOCUMENT_ROOT.'/core/menus/standard/auguria.lib.php'); $res=print_left_auguria_menu($this->db,$this->menu_array,$this->menu_array_after); diff --git a/htdocs/includes/menus/standard/eldy.lib.php b/htdocs/core/menus/standard/eldy.lib.php similarity index 99% rename from htdocs/includes/menus/standard/eldy.lib.php rename to htdocs/core/menus/standard/eldy.lib.php index cb918651725..9cf00b15144 100644 --- a/htdocs/includes/menus/standard/eldy.lib.php +++ b/htdocs/core/menus/standard/eldy.lib.php @@ -18,7 +18,7 @@ */ /** - * \file htdocs/includes/menus/standard/eldy.lib.php + * \file htdocs/core/menus/standard/eldy.lib.php * \brief Library for file eldy menus */ diff --git a/htdocs/includes/menus/standard/eldy_backoffice.php b/htdocs/core/menus/standard/eldy_backoffice.php similarity index 92% rename from htdocs/includes/menus/standard/eldy_backoffice.php rename to htdocs/core/menus/standard/eldy_backoffice.php index 6d70dbb97d8..2785e75520f 100644 --- a/htdocs/includes/menus/standard/eldy_backoffice.php +++ b/htdocs/core/menus/standard/eldy_backoffice.php @@ -17,7 +17,7 @@ */ /** - * \file htdocs/includes/menus/standard/eldy_backoffice.php + * \file htdocs/core/menus/standard/eldy_backoffice.php * \brief Gestionnaire nomme eldy du menu du haut * * \remarks La construction d'un gestionnaire pour le menu du haut est simple: @@ -54,7 +54,7 @@ class MenuTop { */ function showmenu() { - require_once(DOL_DOCUMENT_ROOT.'/includes/menus/standard/eldy.lib.php'); + require_once(DOL_DOCUMENT_ROOT.'/core/menus/standard/eldy.lib.php'); print_eldy_menu($this->db,$this->atarget,$this->hideifnotallowed); } @@ -95,7 +95,7 @@ class MenuLeft { */ function showmenu() { - require_once(DOL_DOCUMENT_ROOT.'/includes/menus/standard/eldy.lib.php'); + require_once(DOL_DOCUMENT_ROOT.'/core/menus/standard/eldy.lib.php'); $res=print_left_eldy_menu($this->db,$this->menu_array,$this->menu_array_after); diff --git a/htdocs/includes/menus/standard/eldy_frontoffice.php b/htdocs/core/menus/standard/eldy_frontoffice.php similarity index 92% rename from htdocs/includes/menus/standard/eldy_frontoffice.php rename to htdocs/core/menus/standard/eldy_frontoffice.php index 7821add41f3..52366e88a9d 100644 --- a/htdocs/includes/menus/standard/eldy_frontoffice.php +++ b/htdocs/core/menus/standard/eldy_frontoffice.php @@ -17,7 +17,7 @@ */ /** - * \file htdocs/includes/menus/standard/eldy_frontoffice.php + * \file htdocs/core/menus/standard/eldy_frontoffice.php * \brief Gestionnaire nomme eldy du menu du haut * * \remarks La construction d'un gestionnaire pour le menu du haut est simple: @@ -54,7 +54,7 @@ class MenuTop { */ function showmenu() { - require_once(DOL_DOCUMENT_ROOT.'/includes/menus/standard/eldy.lib.php'); + require_once(DOL_DOCUMENT_ROOT.'/core/menus/standard/eldy.lib.php'); print_eldy_menu($this->db,$this->atarget,$this->hideifnotallowed); } @@ -95,7 +95,7 @@ class MenuLeft { */ function showmenu() { - require_once(DOL_DOCUMENT_ROOT.'/includes/menus/standard/eldy.lib.php'); + require_once(DOL_DOCUMENT_ROOT.'/core/menus/standard/eldy.lib.php'); $res=print_left_eldy_menu($this->db,$this->menu_array,$this->menu_array_after); diff --git a/htdocs/includes/menus/standard/empty.php b/htdocs/core/menus/standard/empty.php similarity index 99% rename from htdocs/includes/menus/standard/empty.php rename to htdocs/core/menus/standard/empty.php index 66a93c6ce73..e7ac7d0e6f4 100644 --- a/htdocs/includes/menus/standard/empty.php +++ b/htdocs/core/menus/standard/empty.php @@ -16,7 +16,7 @@ */ /** - * \file htdocs/includes/menus/standard/empty.php + * \file htdocs/core/menus/standard/empty.php * \brief This is an example of an empty top menu handler */ diff --git a/htdocs/includes/modules/.cvsignore b/htdocs/core/modules/.cvsignore similarity index 100% rename from htdocs/includes/modules/.cvsignore rename to htdocs/core/modules/.cvsignore diff --git a/htdocs/includes/modules/DolibarrModules.class.php b/htdocs/core/modules/DolibarrModules.class.php similarity index 99% rename from htdocs/includes/modules/DolibarrModules.class.php rename to htdocs/core/modules/DolibarrModules.class.php index e2a667d07b8..463ae3c172f 100644 --- a/htdocs/includes/modules/DolibarrModules.class.php +++ b/htdocs/core/modules/DolibarrModules.class.php @@ -21,7 +21,7 @@ */ /** - * \file htdocs/includes/modules/DolibarrModules.class.php + * \file htdocs/core/modules/DolibarrModules.class.php * \brief Fichier de description et activation des modules Dolibarr */ diff --git a/htdocs/includes/modules/action/rapport.pdf.php b/htdocs/core/modules/action/rapport.pdf.php similarity index 99% rename from htdocs/includes/modules/action/rapport.pdf.php rename to htdocs/core/modules/action/rapport.pdf.php index ff706f69662..e056ff1831b 100644 --- a/htdocs/includes/modules/action/rapport.pdf.php +++ b/htdocs/core/modules/action/rapport.pdf.php @@ -19,7 +19,7 @@ */ /** - * \file htdocs/includes/modules/action/rapport.pdf.php + * \file htdocs/core/modules/action/rapport.pdf.php * \ingroup commercial * \brief File to build PDF with events */ diff --git a/htdocs/includes/modules/barcode/barcodecoder.modules.php b/htdocs/core/modules/barcode/barcodecoder.modules.php similarity index 97% rename from htdocs/includes/modules/barcode/barcodecoder.modules.php rename to htdocs/core/modules/barcode/barcodecoder.modules.php index 57ea4b4e4a9..025044dc863 100644 --- a/htdocs/includes/modules/barcode/barcodecoder.modules.php +++ b/htdocs/core/modules/barcode/barcodecoder.modules.php @@ -17,12 +17,12 @@ */ /** - * \file htdocs/includes/modules/barcode/barcodecoder.modules.php + * \file htdocs/core/modules/barcode/barcodecoder.modules.php * \ingroup barcode * \brief Fichier contenant la classe du modele de generation code barre Barcode Coder */ -require_once(DOL_DOCUMENT_ROOT ."/includes/modules/barcode/modules_barcode.php"); +require_once(DOL_DOCUMENT_ROOT ."/core/modules/barcode/modules_barcode.php"); /** * \class modBarcodeCoder diff --git a/htdocs/includes/modules/barcode/modules_barcode.php b/htdocs/core/modules/barcode/modules_barcode.php similarity index 95% rename from htdocs/includes/modules/barcode/modules_barcode.php rename to htdocs/core/modules/barcode/modules_barcode.php index f0c567fbaef..2de96b94599 100644 --- a/htdocs/includes/modules/barcode/modules_barcode.php +++ b/htdocs/core/modules/barcode/modules_barcode.php @@ -20,7 +20,7 @@ */ /** - * \file htdocs/includes/modules/barcode/modules_barcode.php + * \file htdocs/core/modules/barcode/modules_barcode.php * \ingroup barcode * \brief Fichier contenant la classe mere de generation des codes barres */ diff --git a/htdocs/includes/modules/barcode/phpbarcode.modules.php b/htdocs/core/modules/barcode/phpbarcode.modules.php similarity index 96% rename from htdocs/includes/modules/barcode/phpbarcode.modules.php rename to htdocs/core/modules/barcode/phpbarcode.modules.php index 9915fe7723d..7891b12ee93 100644 --- a/htdocs/includes/modules/barcode/phpbarcode.modules.php +++ b/htdocs/core/modules/barcode/phpbarcode.modules.php @@ -18,12 +18,12 @@ */ /** - * \file htdocs/includes/modules/barcode/phpbarcode.modules.php + * \file htdocs/core/modules/barcode/phpbarcode.modules.php * \ingroup facture * \brief Fichier contenant la classe du modele de generation code barre phpbarcode */ -require_once(DOL_DOCUMENT_ROOT ."/includes/modules/barcode/modules_barcode.php"); +require_once(DOL_DOCUMENT_ROOT ."/core/modules/barcode/modules_barcode.php"); /** \class modPhpbarcode * \brief Classe du modele de numerotation de generation code barre phpbarcode diff --git a/htdocs/includes/modules/cheque/pdf/modules_chequereceipts.php b/htdocs/core/modules/cheque/pdf/modules_chequereceipts.php similarity index 96% rename from htdocs/includes/modules/cheque/pdf/modules_chequereceipts.php rename to htdocs/core/modules/cheque/pdf/modules_chequereceipts.php index fd03de12b9d..9a3fa4c68c8 100644 --- a/htdocs/includes/modules/cheque/pdf/modules_chequereceipts.php +++ b/htdocs/core/modules/cheque/pdf/modules_chequereceipts.php @@ -20,7 +20,7 @@ */ /** - * \file htdocs/includes/modules/cheque/pdf/modules_chequereceipts.php + * \file htdocs/core/modules/cheque/pdf/modules_chequereceipts.php * \ingroup facture * \brief File with parent class of check receipt document generators */ @@ -74,7 +74,7 @@ function chequereceipt_pdf_create($db, $id, $message, $modele, $outputlangs) global $conf,$langs; $langs->load("bills"); - $dir = DOL_DOCUMENT_ROOT . "/includes/modules/cheque/pdf/"; + $dir = DOL_DOCUMENT_ROOT . "/core/modules/cheque/pdf/"; // Positionne modele sur le nom du modele a utiliser if (! dol_strlen($modele)) diff --git a/htdocs/includes/modules/cheque/pdf/pdf_blochet.class.php b/htdocs/core/modules/cheque/pdf/pdf_blochet.class.php similarity index 98% rename from htdocs/includes/modules/cheque/pdf/pdf_blochet.class.php rename to htdocs/core/modules/cheque/pdf/pdf_blochet.class.php index 2f9f4b4ca08..3f56674b8b9 100644 --- a/htdocs/includes/modules/cheque/pdf/pdf_blochet.class.php +++ b/htdocs/core/modules/cheque/pdf/pdf_blochet.class.php @@ -18,14 +18,14 @@ */ /** - * \file htdocs/includes/modules/cheque/pdf/pdf_blochet.class.php + * \file htdocs/core/modules/cheque/pdf/pdf_blochet.class.php * \ingroup banque * \brief File to build cheque deposit receipts */ require_once(DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php'); require_once(DOL_DOCUMENT_ROOT."/core/lib/company.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/includes/modules/cheque/pdf/modules_chequereceipts.php"); +require_once(DOL_DOCUMENT_ROOT."/core/modules/cheque/pdf/modules_chequereceipts.php"); /** diff --git a/htdocs/includes/modules/commande/mod_commande_marbre.php b/htdocs/core/modules/commande/mod_commande_marbre.php similarity index 96% rename from htdocs/includes/modules/commande/mod_commande_marbre.php rename to htdocs/core/modules/commande/mod_commande_marbre.php index 5aedaa3a137..cd060ae4a11 100644 --- a/htdocs/includes/modules/commande/mod_commande_marbre.php +++ b/htdocs/core/modules/commande/mod_commande_marbre.php @@ -18,11 +18,11 @@ */ /** - * \file htdocs/includes/modules/commande/mod_commande_marbre.php + * \file htdocs/core/modules/commande/mod_commande_marbre.php * \ingroup commande * \brief File of class to manage customer order numbering rules Marbre */ -require_once(DOL_DOCUMENT_ROOT ."/includes/modules/commande/modules_commande.php"); +require_once(DOL_DOCUMENT_ROOT ."/core/modules/commande/modules_commande.php"); /** \class mod_commande_marbre * \brief Class to manage customer order numbering rules Marbre diff --git a/htdocs/includes/modules/commande/mod_commande_saphir.php b/htdocs/core/modules/commande/mod_commande_saphir.php similarity index 96% rename from htdocs/includes/modules/commande/mod_commande_saphir.php rename to htdocs/core/modules/commande/mod_commande_saphir.php index 8d40c5644d2..dbc5b568b65 100644 --- a/htdocs/includes/modules/commande/mod_commande_saphir.php +++ b/htdocs/core/modules/commande/mod_commande_saphir.php @@ -20,12 +20,12 @@ */ /** - * \file htdocs/includes/modules/commande/mod_commande_saphir.php + * \file htdocs/core/modules/commande/mod_commande_saphir.php * \ingroup commande * \brief Fichier contenant la classe du modele de numerotation de reference de commande Saphir */ -require_once(DOL_DOCUMENT_ROOT ."/includes/modules/commande/modules_commande.php"); +require_once(DOL_DOCUMENT_ROOT ."/core/modules/commande/modules_commande.php"); /** diff --git a/htdocs/includes/modules/commande/modules_commande.php b/htdocs/core/modules/commande/modules_commande.php similarity index 98% rename from htdocs/includes/modules/commande/modules_commande.php rename to htdocs/core/modules/commande/modules_commande.php index cb8e4259721..b829321b019 100644 --- a/htdocs/includes/modules/commande/modules_commande.php +++ b/htdocs/core/modules/commande/modules_commande.php @@ -21,7 +21,7 @@ */ /** - * \file htdocs/includes/modules/commande/modules_commande.php + * \file htdocs/core/modules/commande/modules_commande.php * \ingroup commande * \brief Fichier contenant la classe mere de generation des commandes en PDF * et la classe mere de numerotation des commandes @@ -155,7 +155,7 @@ function commande_pdf_create($db, $object, $modele, $outputlangs, $hidedetails=0 global $conf,$user,$langs; $langs->load("orders"); - $dir = "/includes/modules/commande/"; + $dir = "/core/modules/commande/"; $srctemplatepath=''; $modelisok=0; $liste=array(); diff --git a/htdocs/includes/modules/commande/pdf_edison.modules.php b/htdocs/core/modules/commande/pdf_edison.modules.php similarity index 99% rename from htdocs/includes/modules/commande/pdf_edison.modules.php rename to htdocs/core/modules/commande/pdf_edison.modules.php index 5b26393b5df..e293cae0ae1 100644 --- a/htdocs/includes/modules/commande/pdf_edison.modules.php +++ b/htdocs/core/modules/commande/pdf_edison.modules.php @@ -20,12 +20,12 @@ */ /** - * \file htdocs/includes/modules/commande/pdf_edison.modules.php + * \file htdocs/core/modules/commande/pdf_edison.modules.php * \ingroup commande * \brief Fichier de la classe permettant de generer les commandes au modele Edison */ -require_once(DOL_DOCUMENT_ROOT ."/includes/modules/commande/modules_commande.php"); +require_once(DOL_DOCUMENT_ROOT ."/core/modules/commande/modules_commande.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/company.lib.php"); require_once(DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php'); diff --git a/htdocs/includes/modules/commande/pdf_einstein.modules.php b/htdocs/core/modules/commande/pdf_einstein.modules.php similarity index 99% rename from htdocs/includes/modules/commande/pdf_einstein.modules.php rename to htdocs/core/modules/commande/pdf_einstein.modules.php index 36f71b69e61..b8292177a4f 100644 --- a/htdocs/includes/modules/commande/pdf_einstein.modules.php +++ b/htdocs/core/modules/commande/pdf_einstein.modules.php @@ -20,13 +20,13 @@ */ /** - * \file htdocs/includes/modules/commande/pdf_einstein.modules.php + * \file htdocs/core/modules/commande/pdf_einstein.modules.php * \ingroup commande * \brief Fichier de la classe permettant de generer les commandes au modele Einstein * \author Laurent Destailleur */ -require_once(DOL_DOCUMENT_ROOT ."/includes/modules/commande/modules_commande.php"); +require_once(DOL_DOCUMENT_ROOT ."/core/modules/commande/modules_commande.php"); require_once(DOL_DOCUMENT_ROOT."/product/class/product.class.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/company.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/functions2.lib.php"); diff --git a/htdocs/includes/modules/contract/mod_contract_magre.php b/htdocs/core/modules/contract/mod_contract_magre.php similarity index 96% rename from htdocs/includes/modules/contract/mod_contract_magre.php rename to htdocs/core/modules/contract/mod_contract_magre.php index 41e40b5597e..362ba30ac5a 100755 --- a/htdocs/includes/modules/contract/mod_contract_magre.php +++ b/htdocs/core/modules/contract/mod_contract_magre.php @@ -17,12 +17,12 @@ */ /** - * \file htdocs/includes/modules/contract/mod_contract_magre.php + * \file htdocs/core/modules/contract/mod_contract_magre.php * \ingroup contract * \brief File of class to manage contract numbering rules Magre */ -require_once(DOL_DOCUMENT_ROOT ."/includes/modules/contract/modules_contract.php"); +require_once(DOL_DOCUMENT_ROOT ."/core/modules/contract/modules_contract.php"); /** \class mod_commande_magre * \brief Class to manage contract numbering rules Magre diff --git a/htdocs/includes/modules/contract/mod_contract_serpis.php b/htdocs/core/modules/contract/mod_contract_serpis.php similarity index 95% rename from htdocs/includes/modules/contract/mod_contract_serpis.php rename to htdocs/core/modules/contract/mod_contract_serpis.php index 51ade8b5d98..9972aeb7f4e 100755 --- a/htdocs/includes/modules/contract/mod_contract_serpis.php +++ b/htdocs/core/modules/contract/mod_contract_serpis.php @@ -17,11 +17,11 @@ */ /** - * \file htdocs/includes/modules/contract/mod_contract_serpis.php + * \file htdocs/core/modules/contract/mod_contract_serpis.php * \ingroup contract * \brief File of class to manage contract numbering rules Serpis */ -require_once(DOL_DOCUMENT_ROOT ."/includes/modules/contract/modules_contract.php"); +require_once(DOL_DOCUMENT_ROOT ."/core/modules/contract/modules_contract.php"); /** \class mod_commande_serpis * \brief Class to manage contract numbering rules Serpis diff --git a/htdocs/includes/modules/contract/modules_contract.php b/htdocs/core/modules/contract/modules_contract.php similarity index 97% rename from htdocs/includes/modules/contract/modules_contract.php rename to htdocs/core/modules/contract/modules_contract.php index 60eaea341fa..199ca102c5e 100755 --- a/htdocs/includes/modules/contract/modules_contract.php +++ b/htdocs/core/modules/contract/modules_contract.php @@ -22,7 +22,7 @@ */ /** - * \file htdocs/includes/modules/contract/modules_contract.php + * \file htdocs/core/modules/contract/modules_contract.php * \ingroup contract * \brief File of class to manage contract numbering */ diff --git a/htdocs/includes/modules/dons/html_cerfafr.html b/htdocs/core/modules/dons/html_cerfafr.html similarity index 100% rename from htdocs/includes/modules/dons/html_cerfafr.html rename to htdocs/core/modules/dons/html_cerfafr.html diff --git a/htdocs/includes/modules/dons/html_cerfafr.modules.php b/htdocs/core/modules/dons/html_cerfafr.modules.php similarity index 95% rename from htdocs/includes/modules/dons/html_cerfafr.modules.php rename to htdocs/core/modules/dons/html_cerfafr.modules.php index c4577c9a217..1a5a06c0ec0 100644 --- a/htdocs/includes/modules/dons/html_cerfafr.modules.php +++ b/htdocs/core/modules/dons/html_cerfafr.modules.php @@ -17,11 +17,11 @@ */ /** - * \file htdocs/includes/modules/dons/html_cerfafr.modules.php + * \file htdocs/core/modules/dons/html_cerfafr.modules.php * \ingroup don * \brief Formulaire de don */ -require_once(DOL_DOCUMENT_ROOT."/includes/modules/dons/modules_don.php"); +require_once(DOL_DOCUMENT_ROOT."/core/modules/dons/modules_don.php"); require_once(DOL_DOCUMENT_ROOT."/compta/dons/class/don.class.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/company.lib.php"); @@ -113,7 +113,7 @@ class html_cerfafr extends ModeleDon if (file_exists($dir)) { // Defini contenu - $donmodel=DOL_DOCUMENT_ROOT ."/includes/modules/dons/html_cerfafr.html"; + $donmodel=DOL_DOCUMENT_ROOT ."/core/modules/dons/html_cerfafr.html"; $html = implode('', file($donmodel)); $html = str_replace('__REF__',$id,$html); $html = str_replace('__DATE__',dol_print_date($don->date,'day',false,$outputlangs),$html); diff --git a/htdocs/includes/modules/dons/modules_don.php b/htdocs/core/modules/dons/modules_don.php similarity index 98% rename from htdocs/includes/modules/dons/modules_don.php rename to htdocs/core/modules/dons/modules_don.php index 528e5564766..02c25f41f61 100644 --- a/htdocs/includes/modules/dons/modules_don.php +++ b/htdocs/core/modules/dons/modules_don.php @@ -20,7 +20,7 @@ */ /** - * \file htdocs/includes/modules/dons/modules_don.php + * \file htdocs/core/modules/dons/modules_don.php * \ingroup don * \brief File of class to manage donation document generation */ @@ -140,7 +140,7 @@ function don_create($db, $id, $message, $modele, $outputlangs) global $conf, $langs; $langs->load("bills"); - $dir = DOL_DOCUMENT_ROOT . "/includes/modules/dons/"; + $dir = DOL_DOCUMENT_ROOT . "/core/modules/dons/"; // Positionne modele sur le nom du modele � utiliser if (! dol_strlen($modele)) diff --git a/htdocs/includes/modules/expedition/methode_expedition.modules.php b/htdocs/core/modules/expedition/methode_expedition.modules.php similarity index 95% rename from htdocs/includes/modules/expedition/methode_expedition.modules.php rename to htdocs/core/modules/expedition/methode_expedition.modules.php index 6affea15c6b..f86cd4e8d9f 100644 --- a/htdocs/includes/modules/expedition/methode_expedition.modules.php +++ b/htdocs/core/modules/expedition/methode_expedition.modules.php @@ -18,7 +18,7 @@ */ /** - * \file htdocs/includes/modules/expedition/methode_expedition.modules.php + * \file htdocs/core/modules/expedition/methode_expedition.modules.php * \ingroup expedition * \brief Fichier contenant la classe mere de generation de bon de livraison en PDF * et la classe mere de numerotation des bons de livraisons diff --git a/htdocs/includes/modules/expedition/methode_expedition_colsui.modules.php b/htdocs/core/modules/expedition/methode_expedition_colsui.modules.php similarity index 93% rename from htdocs/includes/modules/expedition/methode_expedition_colsui.modules.php rename to htdocs/core/modules/expedition/methode_expedition_colsui.modules.php index de45b86b83c..49e1c2542dc 100644 --- a/htdocs/includes/modules/expedition/methode_expedition_colsui.modules.php +++ b/htdocs/core/modules/expedition/methode_expedition_colsui.modules.php @@ -17,7 +17,7 @@ */ /** - * \file htdocs/includes/modules/expedition/methode_expedition_colsui.modules.php + * \file htdocs/core/modules/expedition/methode_expedition_colsui.modules.php * \ingroup expedition */ include_once "methode_expedition.modules.php"; diff --git a/htdocs/includes/modules/expedition/methode_expedition_enl.modules.php b/htdocs/core/modules/expedition/methode_expedition_enl.modules.php similarity index 93% rename from htdocs/includes/modules/expedition/methode_expedition_enl.modules.php rename to htdocs/core/modules/expedition/methode_expedition_enl.modules.php index 69210249661..d59eb771429 100644 --- a/htdocs/includes/modules/expedition/methode_expedition_enl.modules.php +++ b/htdocs/core/modules/expedition/methode_expedition_enl.modules.php @@ -16,7 +16,7 @@ */ /** - * \file htdocs/includes/modules/expedition/methode_expedition_enl.modules.php + * \file htdocs/core/modules/expedition/methode_expedition_enl.modules.php * \ingroup expedition */ include_once "methode_expedition.modules.php"; diff --git a/htdocs/includes/modules/expedition/methode_expedition_lettremax.modules.php b/htdocs/core/modules/expedition/methode_expedition_lettremax.modules.php similarity index 93% rename from htdocs/includes/modules/expedition/methode_expedition_lettremax.modules.php rename to htdocs/core/modules/expedition/methode_expedition_lettremax.modules.php index 4c01bc47424..d7170ec8764 100644 --- a/htdocs/includes/modules/expedition/methode_expedition_lettremax.modules.php +++ b/htdocs/core/modules/expedition/methode_expedition_lettremax.modules.php @@ -16,7 +16,7 @@ */ /** - * \file htdocs/includes/modules/expedition/methode_expedition_lettremax.modules.php + * \file htdocs/core/modules/expedition/methode_expedition_lettremax.modules.php * \ingroup expedition */ diff --git a/htdocs/includes/modules/expedition/methode_expedition_trans.modules.php b/htdocs/core/modules/expedition/methode_expedition_trans.modules.php similarity index 93% rename from htdocs/includes/modules/expedition/methode_expedition_trans.modules.php rename to htdocs/core/modules/expedition/methode_expedition_trans.modules.php index 64b8b597271..eb971030ac4 100644 --- a/htdocs/includes/modules/expedition/methode_expedition_trans.modules.php +++ b/htdocs/core/modules/expedition/methode_expedition_trans.modules.php @@ -16,7 +16,7 @@ */ /** - * \file htdocs/includes/modules/expedition/methode_expedition_trans.modules.php + * \file htdocs/core/modules/expedition/methode_expedition_trans.modules.php * \ingroup expedition */ include_once "methode_expedition.modules.php"; diff --git a/htdocs/includes/modules/expedition/mod_expedition_ribera.php b/htdocs/core/modules/expedition/mod_expedition_ribera.php similarity index 95% rename from htdocs/includes/modules/expedition/mod_expedition_ribera.php rename to htdocs/core/modules/expedition/mod_expedition_ribera.php index 2fd9c8ab175..5a8fb13e458 100755 --- a/htdocs/includes/modules/expedition/mod_expedition_ribera.php +++ b/htdocs/core/modules/expedition/mod_expedition_ribera.php @@ -17,12 +17,12 @@ */ /** - * \file htdocs/includes/modules/expedition/mod_expedition_ribera.php + * \file htdocs/core/modules/expedition/mod_expedition_ribera.php * \ingroup expedition * \brief File of class to manage expedition numbering rules Ribera */ -require_once(DOL_DOCUMENT_ROOT ."/includes/modules/expedition/modules_expedition.php"); +require_once(DOL_DOCUMENT_ROOT ."/core/modules/expedition/modules_expedition.php"); /** \class mod_expedition_ribera * \brief Class to manage expedition numbering rules Ribera diff --git a/htdocs/includes/modules/expedition/mod_expedition_safor.php b/htdocs/core/modules/expedition/mod_expedition_safor.php similarity index 95% rename from htdocs/includes/modules/expedition/mod_expedition_safor.php rename to htdocs/core/modules/expedition/mod_expedition_safor.php index 762890eebc4..502c5f2ac77 100755 --- a/htdocs/includes/modules/expedition/mod_expedition_safor.php +++ b/htdocs/core/modules/expedition/mod_expedition_safor.php @@ -17,11 +17,11 @@ */ /** - * \file htdocs/includes/modules/expedition/mod_expedition_safor.php + * \file htdocs/core/modules/expedition/mod_expedition_safor.php * \ingroup expedition * \brief File of class to manage shipments numbering rules Safor */ -require_once(DOL_DOCUMENT_ROOT ."/includes/modules/expedition/modules_expedition.php"); +require_once(DOL_DOCUMENT_ROOT ."/core/modules/expedition/modules_expedition.php"); /** \class mod_commande_safor * \brief Class to manage expedition numbering rules Safor diff --git a/htdocs/includes/modules/expedition/modules_expedition.php b/htdocs/core/modules/expedition/modules_expedition.php similarity index 97% rename from htdocs/includes/modules/expedition/modules_expedition.php rename to htdocs/core/modules/expedition/modules_expedition.php index 2deef0504d9..c169f90f162 100755 --- a/htdocs/includes/modules/expedition/modules_expedition.php +++ b/htdocs/core/modules/expedition/modules_expedition.php @@ -22,7 +22,7 @@ */ /** - * \file htdocs/includes/modules/expedition/modules_expedition.php + * \file htdocs/core/modules/expedition/modules_expedition.php * \ingroup expedition * \brief File of class to manage expedition numbering */ diff --git a/htdocs/includes/modules/expedition/pdf/ModelePdfExpedition.class.php b/htdocs/core/modules/expedition/pdf/ModelePdfExpedition.class.php similarity index 96% rename from htdocs/includes/modules/expedition/pdf/ModelePdfExpedition.class.php rename to htdocs/core/modules/expedition/pdf/ModelePdfExpedition.class.php index 24f9947f0b8..1a637144546 100644 --- a/htdocs/includes/modules/expedition/pdf/ModelePdfExpedition.class.php +++ b/htdocs/core/modules/expedition/pdf/ModelePdfExpedition.class.php @@ -19,7 +19,7 @@ */ /** - * \file htdocs/includes/modules/expedition/pdf/ModelePdfExpedition.class.php + * \file htdocs/core/modules/expedition/pdf/ModelePdfExpedition.class.php * \ingroup shipping * \brief Fichier contenant la classe mere de generation des expeditions */ @@ -67,7 +67,7 @@ function expedition_pdf_create($db, $object, $modele, $outputlangs) global $conf,$langs; $langs->load("sendings"); - $dir = "/includes/modules/expedition/pdf/"; + $dir = "/core/modules/expedition/pdf/"; $modelisok=0; // Positionne modele sur le nom du modele de commande a utiliser diff --git a/htdocs/includes/modules/expedition/pdf/pdf_expedition_merou.modules.php b/htdocs/core/modules/expedition/pdf/pdf_expedition_merou.modules.php similarity index 98% rename from htdocs/includes/modules/expedition/pdf/pdf_expedition_merou.modules.php rename to htdocs/core/modules/expedition/pdf/pdf_expedition_merou.modules.php index 39b20ce6d26..c7159277e89 100644 --- a/htdocs/includes/modules/expedition/pdf/pdf_expedition_merou.modules.php +++ b/htdocs/core/modules/expedition/pdf/pdf_expedition_merou.modules.php @@ -19,12 +19,12 @@ */ /** - * \file htdocs/includes/modules/expedition/pdf/pdf_expedition_merou.modules.php + * \file htdocs/core/modules/expedition/pdf/pdf_expedition_merou.modules.php * \ingroup expedition * \brief Fichier de la classe permettant de generer les bordereaux envoi au modele Merou */ -require_once DOL_DOCUMENT_ROOT."/includes/modules/expedition/pdf/ModelePdfExpedition.class.php"; +require_once DOL_DOCUMENT_ROOT."/core/modules/expedition/pdf/ModelePdfExpedition.class.php"; require_once DOL_DOCUMENT_ROOT."/contact/class/contact.class.php"; require_once(DOL_DOCUMENT_ROOT."/core/lib/company.lib.php"); require_once(DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php'); diff --git a/htdocs/includes/modules/expedition/pdf/pdf_expedition_rouget.modules.php b/htdocs/core/modules/expedition/pdf/pdf_expedition_rouget.modules.php similarity index 98% rename from htdocs/includes/modules/expedition/pdf/pdf_expedition_rouget.modules.php rename to htdocs/core/modules/expedition/pdf/pdf_expedition_rouget.modules.php index 47ec6815a44..85de36612cb 100644 --- a/htdocs/includes/modules/expedition/pdf/pdf_expedition_rouget.modules.php +++ b/htdocs/core/modules/expedition/pdf/pdf_expedition_rouget.modules.php @@ -19,12 +19,12 @@ */ /** - * \file htdocs/includes/modules/expedition/pdf/pdf_expedition_rouget.modules.php + * \file htdocs/core/modules/expedition/pdf/pdf_expedition_rouget.modules.php * \ingroup expedition * \brief Fichier de la classe permettant de generer les bordereaux envoi au modele Rouget */ -require_once DOL_DOCUMENT_ROOT."/includes/modules/expedition/pdf/ModelePdfExpedition.class.php"; +require_once DOL_DOCUMENT_ROOT."/core/modules/expedition/pdf/ModelePdfExpedition.class.php"; require_once(DOL_DOCUMENT_ROOT."/core/lib/company.lib.php"); require_once(DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php'); diff --git a/htdocs/includes/modules/export/export_csv.modules.php b/htdocs/core/modules/export/export_csv.modules.php similarity index 97% rename from htdocs/includes/modules/export/export_csv.modules.php rename to htdocs/core/modules/export/export_csv.modules.php index f5456218970..8d6939757b7 100644 --- a/htdocs/includes/modules/export/export_csv.modules.php +++ b/htdocs/core/modules/export/export_csv.modules.php @@ -16,13 +16,13 @@ */ /** - * \file htdocs/includes/modules/export/export_csv.modules.php + * \file htdocs/core/modules/export/export_csv.modules.php * \ingroup export * \brief File of class to build exports with CSV format * \author Laurent Destailleur */ -require_once(DOL_DOCUMENT_ROOT ."/includes/modules/export/modules_export.php"); +require_once(DOL_DOCUMENT_ROOT ."/core/modules/export/modules_export.php"); /** diff --git a/htdocs/includes/modules/export/export_excel.modules.php b/htdocs/core/modules/export/export_excel.modules.php similarity index 98% rename from htdocs/includes/modules/export/export_excel.modules.php rename to htdocs/core/modules/export/export_excel.modules.php index 63864456f8b..494136f13b5 100644 --- a/htdocs/includes/modules/export/export_excel.modules.php +++ b/htdocs/core/modules/export/export_excel.modules.php @@ -16,13 +16,13 @@ */ /** - * \file htdocs/includes/modules/export/export_excel.modules.php + * \file htdocs/core/modules/export/export_excel.modules.php * \ingroup export * \brief File of class to generate export file with Excel format * \author Laurent Destailleur */ -require_once(DOL_DOCUMENT_ROOT."/includes/modules/export/modules_export.php"); +require_once(DOL_DOCUMENT_ROOT."/core/modules/export/modules_export.php"); /** diff --git a/htdocs/includes/modules/export/export_excel2007.modules.php b/htdocs/core/modules/export/export_excel2007.modules.php similarity index 98% rename from htdocs/includes/modules/export/export_excel2007.modules.php rename to htdocs/core/modules/export/export_excel2007.modules.php index 8c381d02cd1..e7b1f8c44cf 100755 --- a/htdocs/includes/modules/export/export_excel2007.modules.php +++ b/htdocs/core/modules/export/export_excel2007.modules.php @@ -16,14 +16,14 @@ */ /** - * \file htdocs/includes/modules/export/export_excel.modules.php + * \file htdocs/core/modules/export/export_excel.modules.php * \ingroup export * \brief File of class to generate export file with Excel format * \author Laurent Destailleur */ -require_once(DOL_DOCUMENT_ROOT."/includes/modules/export/modules_export.php"); -require_once(DOL_DOCUMENT_ROOT."/includes/modules/export/export_excel.modules.php"); +require_once(DOL_DOCUMENT_ROOT."/core/modules/export/modules_export.php"); +require_once(DOL_DOCUMENT_ROOT."/core/modules/export/export_excel.modules.php"); /** diff --git a/htdocs/includes/modules/export/export_tsv.modules.php b/htdocs/core/modules/export/export_tsv.modules.php similarity index 97% rename from htdocs/includes/modules/export/export_tsv.modules.php rename to htdocs/core/modules/export/export_tsv.modules.php index ffe697a884f..934ed7516f4 100644 --- a/htdocs/includes/modules/export/export_tsv.modules.php +++ b/htdocs/core/modules/export/export_tsv.modules.php @@ -16,13 +16,13 @@ */ /** - * \file htdocs/includes/modules/export/export_csv.modules.php + * \file htdocs/core/modules/export/export_csv.modules.php * \ingroup export * \brief File of class to build export files with format TSV * \author Laurent Destailleur */ -require_once(DOL_DOCUMENT_ROOT ."/includes/modules/export/modules_export.php"); +require_once(DOL_DOCUMENT_ROOT ."/core/modules/export/modules_export.php"); /** diff --git a/htdocs/includes/modules/export/modules_export.php b/htdocs/core/modules/export/modules_export.php similarity index 96% rename from htdocs/includes/modules/export/modules_export.php rename to htdocs/core/modules/export/modules_export.php index 7aab0370d88..947a7975a3e 100644 --- a/htdocs/includes/modules/export/modules_export.php +++ b/htdocs/core/modules/export/modules_export.php @@ -17,7 +17,7 @@ */ /** - * \file htdocs/includes/modules/export/modules_export.php + * \file htdocs/core/modules/export/modules_export.php * \ingroup export * \brief File of parent class for export modules */ @@ -48,7 +48,7 @@ class ModeleExports extends CommonDocGenerator // This class can't be abstrac { dol_syslog("ModeleExport::liste_modeles"); - $dir=DOL_DOCUMENT_ROOT."/includes/modules/export/"; + $dir=DOL_DOCUMENT_ROOT."/core/modules/export/"; $handle=opendir($dir); // Recherche des fichiers drivers exports disponibles diff --git a/htdocs/includes/modules/facture/doc/doc_generic_invoice_odt.modules.php b/htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php similarity index 99% rename from htdocs/includes/modules/facture/doc/doc_generic_invoice_odt.modules.php rename to htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php index 84336a0fe05..29db22df3fd 100644 --- a/htdocs/includes/modules/facture/doc/doc_generic_invoice_odt.modules.php +++ b/htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php @@ -17,13 +17,13 @@ */ /** - * \file htdocs/includes/modules/facture/doc/doc_generic_invoice_odt.modules.php + * \file htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php * \ingroup societe * \brief File of class to build ODT documents for third parties * \author Laurent Destailleur */ -require_once(DOL_DOCUMENT_ROOT."/includes/modules/facture/modules_facture.php"); +require_once(DOL_DOCUMENT_ROOT."/core/modules/facture/modules_facture.php"); require_once(DOL_DOCUMENT_ROOT."/product/class/product.class.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/company.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/functions2.lib.php"); diff --git a/htdocs/includes/modules/facture/doc/pdf_crabe.modules.php b/htdocs/core/modules/facture/doc/pdf_crabe.modules.php similarity index 99% rename from htdocs/includes/modules/facture/doc/pdf_crabe.modules.php rename to htdocs/core/modules/facture/doc/pdf_crabe.modules.php index e7a7cfd26a8..e1bb598705e 100755 --- a/htdocs/includes/modules/facture/doc/pdf_crabe.modules.php +++ b/htdocs/core/modules/facture/doc/pdf_crabe.modules.php @@ -20,13 +20,13 @@ */ /** - * \file htdocs/includes/modules/facture/doc/pdf_crabe.modules.php + * \file htdocs/core/modules/facture/doc/pdf_crabe.modules.php * \ingroup facture * \brief File of class to generate invoices from crab model * \author Laurent Destailleur */ -require_once(DOL_DOCUMENT_ROOT."/includes/modules/facture/modules_facture.php"); +require_once(DOL_DOCUMENT_ROOT."/core/modules/facture/modules_facture.php"); require_once(DOL_DOCUMENT_ROOT."/product/class/product.class.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/company.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/functions2.lib.php"); diff --git a/htdocs/includes/modules/facture/doc/pdf_oursin.modules.php b/htdocs/core/modules/facture/doc/pdf_oursin.modules.php similarity index 99% rename from htdocs/includes/modules/facture/doc/pdf_oursin.modules.php rename to htdocs/core/modules/facture/doc/pdf_oursin.modules.php index d00a7ad9fb8..07a061b5995 100755 --- a/htdocs/includes/modules/facture/doc/pdf_oursin.modules.php +++ b/htdocs/core/modules/facture/doc/pdf_oursin.modules.php @@ -21,14 +21,14 @@ */ /** - * \file htdocs/includes/modules/facture/doc/pdf_oursin.modules.php + * \file htdocs/core/modules/facture/doc/pdf_oursin.modules.php * \ingroup facture * \brief Fichier de la classe permettant de generer les factures au modele oursin * \author Sylvain SCATTOLINI base sur un modele de Laurent Destailleur */ require_once(DOL_DOCUMENT_ROOT."/product/class/product.class.php"); -require_once(DOL_DOCUMENT_ROOT."/includes/modules/facture/modules_facture.php"); +require_once(DOL_DOCUMENT_ROOT."/core/modules/facture/modules_facture.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/company.lib.php"); require_once(DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php'); diff --git a/htdocs/includes/modules/facture/mod_facture_mercure.php b/htdocs/core/modules/facture/mod_facture_mercure.php similarity index 97% rename from htdocs/includes/modules/facture/mod_facture_mercure.php rename to htdocs/core/modules/facture/mod_facture_mercure.php index fba12d7727a..a2402237dac 100644 --- a/htdocs/includes/modules/facture/mod_facture_mercure.php +++ b/htdocs/core/modules/facture/mod_facture_mercure.php @@ -20,11 +20,11 @@ */ /** - * \file htdocs/includes/modules/facture/mod_facture_mercure.php + * \file htdocs/core/modules/facture/mod_facture_mercure.php * \ingroup facture * \brief File containing class for numbering module Mercure */ -require_once(DOL_DOCUMENT_ROOT ."/includes/modules/facture/modules_facture.php"); +require_once(DOL_DOCUMENT_ROOT ."/core/modules/facture/modules_facture.php"); /** diff --git a/htdocs/includes/modules/facture/mod_facture_terre.php b/htdocs/core/modules/facture/mod_facture_terre.php similarity index 97% rename from htdocs/includes/modules/facture/mod_facture_terre.php rename to htdocs/core/modules/facture/mod_facture_terre.php index d690ec746ac..a6f6f09188f 100644 --- a/htdocs/includes/modules/facture/mod_facture_terre.php +++ b/htdocs/core/modules/facture/mod_facture_terre.php @@ -18,11 +18,11 @@ */ /** - * \file htdocs/includes/modules/facture/mod_facture_terre.php + * \file htdocs/core/modules/facture/mod_facture_terre.php * \ingroup facture * \brief File containing class for numbering module Terre */ -require_once(DOL_DOCUMENT_ROOT ."/includes/modules/facture/modules_facture.php"); +require_once(DOL_DOCUMENT_ROOT ."/core/modules/facture/modules_facture.php"); /** \class mod_facture_terre * \brief Classe du modele de numerotation de reference de facture Terre diff --git a/htdocs/includes/modules/facture/modules_facture.php b/htdocs/core/modules/facture/modules_facture.php similarity index 98% rename from htdocs/includes/modules/facture/modules_facture.php rename to htdocs/core/modules/facture/modules_facture.php index 8cda5e5dd36..d50a9ecac1b 100644 --- a/htdocs/includes/modules/facture/modules_facture.php +++ b/htdocs/core/modules/facture/modules_facture.php @@ -20,7 +20,7 @@ */ /** - * \file htdocs/includes/modules/facture/modules_facture.php + * \file htdocs/core/modules/facture/modules_facture.php * \ingroup facture * \brief Fichier contenant la classe mere de generation des factures en PDF * et la classe mere de numerotation des factures @@ -155,7 +155,7 @@ function facture_pdf_create($db, $object, $message, $modele, $outputlangs, $hide @set_time_limit(120); error_reporting($err); - $dir = "/includes/modules/facture/"; + $dir = "/core/modules/facture/"; $srctemplatepath=''; // Positionne le modele sur le nom du modele a utiliser diff --git a/htdocs/includes/modules/fichinter/mod_arctic.php b/htdocs/core/modules/fichinter/mod_arctic.php similarity index 96% rename from htdocs/includes/modules/fichinter/mod_arctic.php rename to htdocs/core/modules/fichinter/mod_arctic.php index 3312af5b9c0..e529b110569 100644 --- a/htdocs/includes/modules/fichinter/mod_arctic.php +++ b/htdocs/core/modules/fichinter/mod_arctic.php @@ -20,11 +20,11 @@ */ /** - * \file htdocs/includes/modules/fichinter/mod_arctic.php + * \file htdocs/core/modules/fichinter/mod_arctic.php * \ingroup fiche intervention * \brief File with Arctic numbering module for interventions */ -require_once(DOL_DOCUMENT_ROOT ."/includes/modules/fichinter/modules_fichinter.php"); +require_once(DOL_DOCUMENT_ROOT ."/core/modules/fichinter/modules_fichinter.php"); /** * \class mod_arctic diff --git a/htdocs/includes/modules/fichinter/mod_pacific.php b/htdocs/core/modules/fichinter/mod_pacific.php similarity index 96% rename from htdocs/includes/modules/fichinter/mod_pacific.php rename to htdocs/core/modules/fichinter/mod_pacific.php index 8d98806c26e..6102a682532 100644 --- a/htdocs/includes/modules/fichinter/mod_pacific.php +++ b/htdocs/core/modules/fichinter/mod_pacific.php @@ -18,11 +18,11 @@ */ /** - * \file htdocs/includes/modules/fichinter/mod_pacific.php + * \file htdocs/core/modules/fichinter/mod_pacific.php * \ingroup fiche intervention * \brief File with Pacific numbering module for interventions */ -require_once(DOL_DOCUMENT_ROOT ."/includes/modules/fichinter/modules_fichinter.php"); +require_once(DOL_DOCUMENT_ROOT ."/core/modules/fichinter/modules_fichinter.php"); /** * \class mod_pacific diff --git a/htdocs/includes/modules/fichinter/modules_fichinter.php b/htdocs/core/modules/fichinter/modules_fichinter.php similarity index 98% rename from htdocs/includes/modules/fichinter/modules_fichinter.php rename to htdocs/core/modules/fichinter/modules_fichinter.php index cd735982099..a7b4617f000 100644 --- a/htdocs/includes/modules/fichinter/modules_fichinter.php +++ b/htdocs/core/modules/fichinter/modules_fichinter.php @@ -19,7 +19,7 @@ */ /** - * \file htdocs/includes/modules/fichinter/modules_fichinter.php + * \file htdocs/core/modules/fichinter/modules_fichinter.php * \ingroup ficheinter * \brief Fichier contenant la classe mere de generation des fiches interventions en PDF * et la classe mere de numerotation des fiches interventions @@ -145,7 +145,7 @@ function fichinter_create($db, $object, $modele='', $outputlangs='') global $conf,$langs; $langs->load("ficheinter"); - $dir = "/includes/modules/fichinter/"; + $dir = "/core/modules/fichinter/"; // Positionne modele sur le nom du modele de facture a utiliser if (! dol_strlen($modele)) diff --git a/htdocs/includes/modules/fichinter/pdf_soleil.modules.php b/htdocs/core/modules/fichinter/pdf_soleil.modules.php similarity index 98% rename from htdocs/includes/modules/fichinter/pdf_soleil.modules.php rename to htdocs/core/modules/fichinter/pdf_soleil.modules.php index f504f482989..4e20b9b5749 100644 --- a/htdocs/includes/modules/fichinter/pdf_soleil.modules.php +++ b/htdocs/core/modules/fichinter/pdf_soleil.modules.php @@ -20,11 +20,11 @@ */ /** - * \file htdocs/includes/modules/fichinter/pdf_soleil.modules.php + * \file htdocs/core/modules/fichinter/pdf_soleil.modules.php * \ingroup ficheinter * \brief Fichier de la classe permettant de generer les fiches d'intervention au modele Soleil */ -require_once(DOL_DOCUMENT_ROOT."/includes/modules/fichinter/modules_fichinter.php"); +require_once(DOL_DOCUMENT_ROOT."/core/modules/fichinter/modules_fichinter.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/company.lib.php"); require_once(DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php'); require_once(DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php'); diff --git a/htdocs/includes/modules/import/import_csv.modules.php b/htdocs/core/modules/import/import_csv.modules.php similarity index 98% rename from htdocs/includes/modules/import/import_csv.modules.php rename to htdocs/core/modules/import/import_csv.modules.php index 691c6412612..5d54d64d03a 100644 --- a/htdocs/includes/modules/import/import_csv.modules.php +++ b/htdocs/core/modules/import/import_csv.modules.php @@ -18,13 +18,13 @@ */ /** - * \file htdocs/includes/modules/import/import_csv.modules.php + * \file htdocs/core/modules/import/import_csv.modules.php * \ingroup import * \brief File to load import files with CSV format * \author Laurent Destailleur */ -require_once(DOL_DOCUMENT_ROOT ."/includes/modules/import/modules_import.php"); +require_once(DOL_DOCUMENT_ROOT ."/core/modules/import/modules_import.php"); /** diff --git a/htdocs/includes/modules/import/modules_import.php b/htdocs/core/modules/import/modules_import.php similarity index 96% rename from htdocs/includes/modules/import/modules_import.php rename to htdocs/core/modules/import/modules_import.php index 54254bd9bc0..3322c6586ea 100644 --- a/htdocs/includes/modules/import/modules_import.php +++ b/htdocs/core/modules/import/modules_import.php @@ -18,7 +18,7 @@ */ /** - * \file htdocs/includes/modules/import/modules_import.php + * \file htdocs/core/modules/import/modules_import.php * \ingroup export * \brief File of parent class for import file readers */ @@ -56,7 +56,7 @@ class ModeleImports { dol_syslog("ModeleImport::liste_modeles"); - $dir=DOL_DOCUMENT_ROOT."/includes/modules/import/"; + $dir=DOL_DOCUMENT_ROOT."/core/modules/import/"; $handle=opendir($dir); // Recherche des fichiers drivers imports disponibles diff --git a/htdocs/includes/modules/livraison/mod_livraison_jade.php b/htdocs/core/modules/livraison/mod_livraison_jade.php similarity index 96% rename from htdocs/includes/modules/livraison/mod_livraison_jade.php rename to htdocs/core/modules/livraison/mod_livraison_jade.php index a6d6accb03e..6783ad6a02a 100644 --- a/htdocs/includes/modules/livraison/mod_livraison_jade.php +++ b/htdocs/core/modules/livraison/mod_livraison_jade.php @@ -19,12 +19,12 @@ */ /** - * \file htdocs/includes/modules/livraison/mod_livraison_jade.php + * \file htdocs/core/modules/livraison/mod_livraison_jade.php * \ingroup delivery * \brief Fichier contenant la classe du modele de numerotation de reference de bon de livraison Jade */ -require_once(DOL_DOCUMENT_ROOT ."/includes/modules/livraison/modules_livraison.php"); +require_once(DOL_DOCUMENT_ROOT ."/core/modules/livraison/modules_livraison.php"); /** diff --git a/htdocs/includes/modules/livraison/mod_livraison_saphir.php b/htdocs/core/modules/livraison/mod_livraison_saphir.php similarity index 96% rename from htdocs/includes/modules/livraison/mod_livraison_saphir.php rename to htdocs/core/modules/livraison/mod_livraison_saphir.php index 4dd3a79f924..008cbdc3fd8 100644 --- a/htdocs/includes/modules/livraison/mod_livraison_saphir.php +++ b/htdocs/core/modules/livraison/mod_livraison_saphir.php @@ -19,11 +19,11 @@ */ /** - * \file htdocs/includes/modules/livraison/mod_livraison_saphir.php + * \file htdocs/core/modules/livraison/mod_livraison_saphir.php * \ingroup expedition * \brief Fichier contenant la classe du modele de numerotation de reference de livraison Saphir */ -require_once(DOL_DOCUMENT_ROOT ."/includes/modules/livraison/modules_livraison.php"); +require_once(DOL_DOCUMENT_ROOT ."/core/modules/livraison/modules_livraison.php"); /** * \class mod_livraison_saphir diff --git a/htdocs/includes/modules/livraison/modules_livraison.php b/htdocs/core/modules/livraison/modules_livraison.php similarity index 98% rename from htdocs/includes/modules/livraison/modules_livraison.php rename to htdocs/core/modules/livraison/modules_livraison.php index a748ae7fa6e..ff3009c9d06 100644 --- a/htdocs/includes/modules/livraison/modules_livraison.php +++ b/htdocs/core/modules/livraison/modules_livraison.php @@ -20,7 +20,7 @@ */ /** - * \file htdocs/includes/modules/livraison/modules_livraison.php + * \file htdocs/core/modules/livraison/modules_livraison.php * \ingroup expedition * \brief Fichier contenant la classe mere de generation de bon de livraison en PDF * et la classe mere de numerotation des bons de livraisons @@ -141,7 +141,7 @@ function delivery_order_pdf_create($db, $object, $model='', $outputlangs='') global $conf,$langs; $langs->load("deliveries"); - $dir = "/includes/modules/livraison/pdf/"; + $dir = "/core/modules/livraison/pdf/"; // Positionne modele sur le nom du modele de bon de livraison a utiliser if (! dol_strlen($model)) diff --git a/htdocs/includes/modules/livraison/pdf/pdf_sirocco.modules.php b/htdocs/core/modules/livraison/pdf/pdf_sirocco.modules.php similarity index 98% rename from htdocs/includes/modules/livraison/pdf/pdf_sirocco.modules.php rename to htdocs/core/modules/livraison/pdf/pdf_sirocco.modules.php index c0c1b929aec..fa0f8acaec6 100644 --- a/htdocs/includes/modules/livraison/pdf/pdf_sirocco.modules.php +++ b/htdocs/core/modules/livraison/pdf/pdf_sirocco.modules.php @@ -20,12 +20,12 @@ */ /** - * \file htdocs/includes/modules/livraison/pdf/pdf_sirocco.modules.php + * \file htdocs/core/modules/livraison/pdf/pdf_sirocco.modules.php * \ingroup livraison * \brief File of class to manage receving receipts with template Sirocco */ -require_once(DOL_DOCUMENT_ROOT."/includes/modules/livraison/modules_livraison.php"); +require_once(DOL_DOCUMENT_ROOT."/core/modules/livraison/modules_livraison.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/company.lib.php"); require_once(DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php'); diff --git a/htdocs/includes/modules/livraison/pdf/pdf_typhon.modules.php b/htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php similarity index 99% rename from htdocs/includes/modules/livraison/pdf/pdf_typhon.modules.php rename to htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php index 555d1e1610c..e65a12aad2f 100644 --- a/htdocs/includes/modules/livraison/pdf/pdf_typhon.modules.php +++ b/htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php @@ -20,13 +20,13 @@ */ /** - * \file htdocs/includes/modules/livraison/pdf/pdf_typhon.modules.php + * \file htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php * \ingroup livraison * \brief File of class to manage receving receipts with template Typhon * \author Laurent Destailleur */ -require_once(DOL_DOCUMENT_ROOT."/includes/modules/livraison/modules_livraison.php"); +require_once(DOL_DOCUMENT_ROOT."/core/modules/livraison/modules_livraison.php"); require_once(DOL_DOCUMENT_ROOT."/livraison/class/livraison.class.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/company.lib.php"); require_once(DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php'); diff --git a/htdocs/includes/modules/mailings/.cvsignore b/htdocs/core/modules/mailings/.cvsignore similarity index 100% rename from htdocs/includes/modules/mailings/.cvsignore rename to htdocs/core/modules/mailings/.cvsignore diff --git a/htdocs/includes/modules/mailings/README b/htdocs/core/modules/mailings/README similarity index 93% rename from htdocs/includes/modules/mailings/README rename to htdocs/core/modules/mailings/README index d277105cf58..096f680bd38 100644 --- a/htdocs/includes/modules/mailings/README +++ b/htdocs/core/modules/mailings/README @@ -11,9 +11,9 @@ to add you own email predefined selector: ***** STEP 1 ***** Copy file -htdocs/includes/modules/mailings/example.modules.php +htdocs/core/modules/mailings/example.modules.php into -htdocs/includes/modules/mailings/myselector.modules.php +htdocs/core/modules/mailings/myselector.modules.php You can choose value of your choice instead of "myselector" in name of new file. diff --git a/htdocs/includes/modules/mailings/contacts1.modules.php b/htdocs/core/modules/mailings/contacts1.modules.php similarity index 98% rename from htdocs/includes/modules/mailings/contacts1.modules.php rename to htdocs/core/modules/mailings/contacts1.modules.php index e5210efbe40..5b7b04d95c1 100755 --- a/htdocs/includes/modules/mailings/contacts1.modules.php +++ b/htdocs/core/modules/mailings/contacts1.modules.php @@ -19,12 +19,12 @@ */ /** - * \file htdocs/includes/modules/mailings/contacts1.modules.php + * \file htdocs/core/modules/mailings/contacts1.modules.php * \ingroup mailing * \brief File of class to offer a selector of emailing targets with Rule 'Poire'. */ -include_once DOL_DOCUMENT_ROOT.'/includes/modules/mailings/modules_mailings.php'; +include_once DOL_DOCUMENT_ROOT.'/core/modules/mailings/modules_mailings.php'; /** diff --git a/htdocs/includes/modules/mailings/contacts2.modules.php b/htdocs/core/modules/mailings/contacts2.modules.php similarity index 97% rename from htdocs/includes/modules/mailings/contacts2.modules.php rename to htdocs/core/modules/mailings/contacts2.modules.php index 250e1ece1f1..17a1fd2a217 100755 --- a/htdocs/includes/modules/mailings/contacts2.modules.php +++ b/htdocs/core/modules/mailings/contacts2.modules.php @@ -17,12 +17,12 @@ */ /** - * \file htdocs/includes/modules/mailings/contacts2.modules.php + * \file htdocs/core/modules/mailings/contacts2.modules.php * \ingroup mailing * \brief Provides a list of recipients for mailing module */ -include_once DOL_DOCUMENT_ROOT.'/includes/modules/mailings/modules_mailings.php'; +include_once DOL_DOCUMENT_ROOT.'/core/modules/mailings/modules_mailings.php'; /** diff --git a/htdocs/includes/modules/mailings/contacts3.modules.php b/htdocs/core/modules/mailings/contacts3.modules.php similarity index 98% rename from htdocs/includes/modules/mailings/contacts3.modules.php rename to htdocs/core/modules/mailings/contacts3.modules.php index 80ea22a5696..b776bfdb796 100755 --- a/htdocs/includes/modules/mailings/contacts3.modules.php +++ b/htdocs/core/modules/mailings/contacts3.modules.php @@ -17,12 +17,12 @@ */ /** - * \file htdocs/includes/modules/mailings/contacts3.modules.php + * \file htdocs/core/modules/mailings/contacts3.modules.php * \ingroup mailing * \brief Provides a list of recipients for mailing module */ -include_once DOL_DOCUMENT_ROOT.'/includes/modules/mailings/modules_mailings.php'; +include_once DOL_DOCUMENT_ROOT.'/core/modules/mailings/modules_mailings.php'; /** diff --git a/htdocs/includes/modules/mailings/example.modules.php b/htdocs/core/modules/mailings/example.modules.php similarity index 96% rename from htdocs/includes/modules/mailings/example.modules.php rename to htdocs/core/modules/mailings/example.modules.php index 47d7029c8db..d82611174d7 100644 --- a/htdocs/includes/modules/mailings/example.modules.php +++ b/htdocs/core/modules/mailings/example.modules.php @@ -9,12 +9,12 @@ */ /** - * \file htdocs/includes/modules/mailings/example.modules.php + * \file htdocs/core/modules/mailings/example.modules.php * \ingroup mailing * \brief Example file to provide a list of recipients for mailing module */ -include_once DOL_DOCUMENT_ROOT.'/includes/modules/mailings/modules_mailings.php'; +include_once DOL_DOCUMENT_ROOT.'/core/modules/mailings/modules_mailings.php'; // CHANGE THIS: Class name must be called mailing_xxx with xxx=name of your selector diff --git a/htdocs/includes/modules/mailings/fraise.modules.php b/htdocs/core/modules/mailings/fraise.modules.php similarity index 98% rename from htdocs/includes/modules/mailings/fraise.modules.php rename to htdocs/core/modules/mailings/fraise.modules.php index 60a28853844..997522d669e 100644 --- a/htdocs/includes/modules/mailings/fraise.modules.php +++ b/htdocs/core/modules/mailings/fraise.modules.php @@ -18,12 +18,12 @@ */ /** - * \file htdocs/includes/modules/mailings/fraise.modules.php + * \file htdocs/core/modules/mailings/fraise.modules.php * \ingroup mailing * \brief File of class to generate target according to rule Fraise */ -include_once DOL_DOCUMENT_ROOT.'/includes/modules/mailings/modules_mailings.php'; +include_once DOL_DOCUMENT_ROOT.'/core/modules/mailings/modules_mailings.php'; include_once DOL_DOCUMENT_ROOT.'/core/class/html.form.class.php'; diff --git a/htdocs/includes/modules/mailings/framboise.modules.php b/htdocs/core/modules/mailings/framboise.modules.php similarity index 97% rename from htdocs/includes/modules/mailings/framboise.modules.php rename to htdocs/core/modules/mailings/framboise.modules.php index 08ffd5e0834..90f2cc77388 100644 --- a/htdocs/includes/modules/mailings/framboise.modules.php +++ b/htdocs/core/modules/mailings/framboise.modules.php @@ -10,12 +10,12 @@ */ /** - * \file htdocs/includes/modules/mailings/framboise.modules.php + * \file htdocs/core/modules/mailings/framboise.modules.php * \ingroup mailing * \brief Example file to provide a list of recipients for mailing module */ -include_once DOL_DOCUMENT_ROOT.'/includes/modules/mailings/modules_mailings.php'; +include_once DOL_DOCUMENT_ROOT.'/core/modules/mailings/modules_mailings.php'; /** diff --git a/htdocs/includes/modules/mailings/modules_mailings.php b/htdocs/core/modules/mailings/modules_mailings.php similarity index 98% rename from htdocs/includes/modules/mailings/modules_mailings.php rename to htdocs/core/modules/mailings/modules_mailings.php index 9a32cd7ea36..b58b2d94d0e 100644 --- a/htdocs/includes/modules/mailings/modules_mailings.php +++ b/htdocs/core/modules/mailings/modules_mailings.php @@ -19,7 +19,7 @@ */ /** - * \file htdocs/includes/modules/mailings/modules_mailings.php + * \file htdocs/core/modules/mailings/modules_mailings.php * \ingroup mailing * \brief File with parent class of emailing target selectors modules */ diff --git a/htdocs/includes/modules/mailings/peche.modules.php b/htdocs/core/modules/mailings/peche.modules.php similarity index 97% rename from htdocs/includes/modules/mailings/peche.modules.php rename to htdocs/core/modules/mailings/peche.modules.php index 1a9ca96c6a5..c0894917e17 100644 --- a/htdocs/includes/modules/mailings/peche.modules.php +++ b/htdocs/core/modules/mailings/peche.modules.php @@ -17,11 +17,11 @@ */ /** - * \file htdocs/includes/modules/mailings/peche.modules.php + * \file htdocs/core/modules/mailings/peche.modules.php * \ingroup mailing * \brief File of class to offer a selector of emailing targets with Rule 'Peche'. */ -include_once DOL_DOCUMENT_ROOT.'/includes/modules/mailings/modules_mailings.php'; +include_once DOL_DOCUMENT_ROOT.'/core/modules/mailings/modules_mailings.php'; require_once(DOL_DOCUMENT_ROOT."/core/lib/functions2.lib.php"); diff --git a/htdocs/includes/modules/mailings/pomme.modules.php b/htdocs/core/modules/mailings/pomme.modules.php similarity index 97% rename from htdocs/includes/modules/mailings/pomme.modules.php rename to htdocs/core/modules/mailings/pomme.modules.php index 2a0674c653e..41dfe8514f3 100644 --- a/htdocs/includes/modules/mailings/pomme.modules.php +++ b/htdocs/core/modules/mailings/pomme.modules.php @@ -18,11 +18,11 @@ */ /** - * \file htdocs/includes/modules/mailings/pomme.modules.php + * \file htdocs/core/modules/mailings/pomme.modules.php * \ingroup mailing * \brief File of class to offer a selector of emailing targets with Rule 'Pomme'. */ -include_once DOL_DOCUMENT_ROOT.'/includes/modules/mailings/modules_mailings.php'; +include_once DOL_DOCUMENT_ROOT.'/core/modules/mailings/modules_mailings.php'; /** diff --git a/htdocs/includes/modules/mailings/thirdparties.modules.php b/htdocs/core/modules/mailings/thirdparties.modules.php similarity index 97% rename from htdocs/includes/modules/mailings/thirdparties.modules.php rename to htdocs/core/modules/mailings/thirdparties.modules.php index 9c5ffbe167b..45b6318272d 100755 --- a/htdocs/includes/modules/mailings/thirdparties.modules.php +++ b/htdocs/core/modules/mailings/thirdparties.modules.php @@ -10,12 +10,12 @@ */ /** - * \file htdocs/includes/modules/mailings/thirdparties.modules.php + * \file htdocs/core/modules/mailings/thirdparties.modules.php * \ingroup mailing * \brief Example file to provide a list of recipients for mailing module */ -include_once DOL_DOCUMENT_ROOT.'/includes/modules/mailings/modules_mailings.php'; +include_once DOL_DOCUMENT_ROOT.'/core/modules/mailings/modules_mailings.php'; /** diff --git a/htdocs/includes/modules/mailings/thirdparties_services_expired.modules.php b/htdocs/core/modules/mailings/thirdparties_services_expired.modules.php similarity index 97% rename from htdocs/includes/modules/mailings/thirdparties_services_expired.modules.php rename to htdocs/core/modules/mailings/thirdparties_services_expired.modules.php index d3f04ef197d..abaee5eeca7 100755 --- a/htdocs/includes/modules/mailings/thirdparties_services_expired.modules.php +++ b/htdocs/core/modules/mailings/thirdparties_services_expired.modules.php @@ -9,11 +9,11 @@ */ /** - * \file htdocs/includes/modules/mailings/thirdparties_services_expired.modules.php + * \file htdocs/core/modules/mailings/thirdparties_services_expired.modules.php * \ingroup mailing * \brief File of class to offer a selector of emailing targets with Rule 'services expired'. */ -include_once DOL_DOCUMENT_ROOT.'/includes/modules/mailings/modules_mailings.php'; +include_once DOL_DOCUMENT_ROOT.'/core/modules/mailings/modules_mailings.php'; require_once(DOL_DOCUMENT_ROOT."/core/lib/functions2.lib.php"); diff --git a/htdocs/includes/modules/member/cards/modules_cards.php b/htdocs/core/modules/member/cards/modules_cards.php similarity index 96% rename from htdocs/includes/modules/member/cards/modules_cards.php rename to htdocs/core/modules/member/cards/modules_cards.php index 28df2886d3f..119d675f912 100644 --- a/htdocs/includes/modules/member/cards/modules_cards.php +++ b/htdocs/core/modules/member/cards/modules_cards.php @@ -20,7 +20,7 @@ */ /** - * \file htdocs/includes/modules/member/cards/modules_cards.php + * \file htdocs/core/modules/member/cards/modules_cards.php * \ingroup member * \brief File of parent class of document generator for members cards. */ @@ -70,7 +70,7 @@ function members_card_pdf_create($db, $arrayofmembers, $modele, $outputlangs) global $conf,$langs; $langs->load("members"); - $dir = DOL_DOCUMENT_ROOT . "/includes/modules/member/cards/"; + $dir = DOL_DOCUMENT_ROOT . "/core/modules/member/cards/"; // Positionne modele sur le nom du modele a utiliser if (! dol_strlen($modele)) diff --git a/htdocs/includes/modules/member/cards/pdf_standard.class.php b/htdocs/core/modules/member/cards/pdf_standard.class.php similarity index 99% rename from htdocs/includes/modules/member/cards/pdf_standard.class.php rename to htdocs/core/modules/member/cards/pdf_standard.class.php index b45d11496ce..b058855a697 100644 --- a/htdocs/includes/modules/member/cards/pdf_standard.class.php +++ b/htdocs/core/modules/member/cards/pdf_standard.class.php @@ -53,7 +53,7 @@ //////////////////////////////////////////////////// /** - * \file htdocs/includes/modules/member/cards/pdf_standard.class.php + * \file htdocs/core/modules/member/cards/pdf_standard.class.php * \ingroup member * \brief Fichier de la classe permettant d'editer au format PDF des etiquettes au format Avery ou personnalise * \author Steve Dillon diff --git a/htdocs/includes/modules/member/labels/modules_labels.php b/htdocs/core/modules/member/labels/modules_labels.php similarity index 96% rename from htdocs/includes/modules/member/labels/modules_labels.php rename to htdocs/core/modules/member/labels/modules_labels.php index 7a8a6fb0a32..49fd8d06750 100644 --- a/htdocs/includes/modules/member/labels/modules_labels.php +++ b/htdocs/core/modules/member/labels/modules_labels.php @@ -20,7 +20,7 @@ */ /** - * \file htdocs/includes/modules/member/labels/modules_labels.php + * \file htdocs/core/modules/member/labels/modules_labels.php * \ingroup member * \brief File of parent class of document generator for members labels sheets. */ @@ -72,7 +72,7 @@ function members_label_pdf_create($db, $arrayofmembers, $modele, $outputlangs) global $conf,$langs; $langs->load("members"); - $dir = DOL_DOCUMENT_ROOT . "/includes/modules/member/labels/"; + $dir = DOL_DOCUMENT_ROOT . "/core/modules/member/labels/"; // Positionne modele sur le nom du modele a utiliser if (! dol_strlen($modele)) diff --git a/htdocs/includes/modules/member/labels/pdf_standardlabel.class.php b/htdocs/core/modules/member/labels/pdf_standardlabel.class.php similarity index 99% rename from htdocs/includes/modules/member/labels/pdf_standardlabel.class.php rename to htdocs/core/modules/member/labels/pdf_standardlabel.class.php index 2c84b0bafe0..85cba5f324a 100644 --- a/htdocs/includes/modules/member/labels/pdf_standardlabel.class.php +++ b/htdocs/core/modules/member/labels/pdf_standardlabel.class.php @@ -53,7 +53,7 @@ //////////////////////////////////////////////////// /** - * \file htdocs/includes/modules/member/labels/pdf_standardlabel.class.php + * \file htdocs/core/modules/member/labels/pdf_standardlabel.class.php * \ingroup member * \brief Fichier de la classe permettant d'editer au format PDF des etiquettes au format Avery ou personnalise * \author Steve Dillon diff --git a/htdocs/includes/modules/modAccounting.class.php b/htdocs/core/modules/modAccounting.class.php similarity index 97% rename from htdocs/includes/modules/modAccounting.class.php rename to htdocs/core/modules/modAccounting.class.php index e46f3ba0411..dfa07932052 100644 --- a/htdocs/includes/modules/modAccounting.class.php +++ b/htdocs/core/modules/modAccounting.class.php @@ -21,12 +21,12 @@ /** * \defgroup accounting Module accounting * \brief Module to include accounting features - * \file htdocs/includes/modules/modAccounting.class.php + * \file htdocs/core/modules/modAccounting.class.php * \ingroup accounting * \brief Fichier de description et activation du module Comptabilite Expert */ -include_once(DOL_DOCUMENT_ROOT ."/includes/modules/DolibarrModules.class.php"); +include_once(DOL_DOCUMENT_ROOT ."/core/modules/DolibarrModules.class.php"); /** diff --git a/htdocs/includes/modules/modAdherent.class.php b/htdocs/core/modules/modAdherent.class.php similarity index 99% rename from htdocs/includes/modules/modAdherent.class.php rename to htdocs/core/modules/modAdherent.class.php index a9e3ccf0ace..0941f24ab19 100644 --- a/htdocs/includes/modules/modAdherent.class.php +++ b/htdocs/core/modules/modAdherent.class.php @@ -22,12 +22,12 @@ /** * \defgroup member Module foundation * \brief Module to manage members of a foundation - * \file htdocs/includes/modules/modAdherent.class.php + * \file htdocs/core/modules/modAdherent.class.php * \ingroup member * \brief File descriptor or module Member */ -include_once(DOL_DOCUMENT_ROOT ."/includes/modules/DolibarrModules.class.php"); +include_once(DOL_DOCUMENT_ROOT ."/core/modules/DolibarrModules.class.php"); /** * \class modAdherent diff --git a/htdocs/includes/modules/modAgenda.class.php b/htdocs/core/modules/modAgenda.class.php similarity index 99% rename from htdocs/includes/modules/modAgenda.class.php rename to htdocs/core/modules/modAgenda.class.php index 2032fa81379..84c71c08134 100644 --- a/htdocs/includes/modules/modAgenda.class.php +++ b/htdocs/core/modules/modAgenda.class.php @@ -23,11 +23,11 @@ /** * \defgroup agenda Module agenda * \brief Module pour gerer l'agenda et actions - * \file htdocs/includes/modules/modAgenda.class.php + * \file htdocs/core/modules/modAgenda.class.php * \ingroup agenda * \brief Fichier de description et activation du module agenda */ -include_once(DOL_DOCUMENT_ROOT ."/includes/modules/DolibarrModules.class.php"); +include_once(DOL_DOCUMENT_ROOT ."/core/modules/DolibarrModules.class.php"); /** * \class modAgenda diff --git a/htdocs/includes/modules/modBanque.class.php b/htdocs/core/modules/modBanque.class.php similarity index 98% rename from htdocs/includes/modules/modBanque.class.php rename to htdocs/core/modules/modBanque.class.php index d3bdfc89976..2a5c285c430 100644 --- a/htdocs/includes/modules/modBanque.class.php +++ b/htdocs/core/modules/modBanque.class.php @@ -22,12 +22,12 @@ /** * \defgroup banque Module bank * \brief Module pour gerer la tenue d'un compte bancaire et rapprochements - * \file htdocs/includes/modules/modBanque.class.php + * \file htdocs/core/modules/modBanque.class.php * \ingroup banque * \brief Fichier de description et activation du module Banque */ -include_once(DOL_DOCUMENT_ROOT ."/includes/modules/DolibarrModules.class.php"); +include_once(DOL_DOCUMENT_ROOT ."/core/modules/DolibarrModules.class.php"); /** diff --git a/htdocs/includes/modules/modBarcode.class.php b/htdocs/core/modules/modBarcode.class.php similarity index 96% rename from htdocs/includes/modules/modBarcode.class.php rename to htdocs/core/modules/modBarcode.class.php index 94582c37ece..7d50a096163 100644 --- a/htdocs/includes/modules/modBarcode.class.php +++ b/htdocs/core/modules/modBarcode.class.php @@ -20,12 +20,12 @@ /** * \defgroup barcode Module barcode * \brief Module pour gerer les codes barres - * \file htdocs/includes/modules/modBarcode.class.php + * \file htdocs/core/modules/modBarcode.class.php * \ingroup barcode,produit * \brief Fichier de description et activation du module Barcode */ -include_once(DOL_DOCUMENT_ROOT ."/includes/modules/DolibarrModules.class.php"); +include_once(DOL_DOCUMENT_ROOT ."/core/modules/DolibarrModules.class.php"); /** * \class modBarcode diff --git a/htdocs/includes/modules/modBookmark.class.php b/htdocs/core/modules/modBookmark.class.php similarity index 96% rename from htdocs/includes/modules/modBookmark.class.php rename to htdocs/core/modules/modBookmark.class.php index b02ac6152db..ffd4450cae5 100644 --- a/htdocs/includes/modules/modBookmark.class.php +++ b/htdocs/core/modules/modBookmark.class.php @@ -19,12 +19,12 @@ /** * \defgroup bookmark Module bookmarks * \brief Module to manage Bookmarks - * \file htdocs/includes/modules/modBookmark.class.php + * \file htdocs/core/modules/modBookmark.class.php * \ingroup bookmark * \brief Fichier de description et activation du module Bookmarks */ -include_once(DOL_DOCUMENT_ROOT ."/includes/modules/DolibarrModules.class.php"); +include_once(DOL_DOCUMENT_ROOT ."/core/modules/DolibarrModules.class.php"); /** diff --git a/htdocs/includes/modules/modBoutique.class.php b/htdocs/core/modules/modBoutique.class.php similarity index 96% rename from htdocs/includes/modules/modBoutique.class.php rename to htdocs/core/modules/modBoutique.class.php index 3f7c075a246..6c8f33ffd8d 100644 --- a/htdocs/includes/modules/modBoutique.class.php +++ b/htdocs/core/modules/modBoutique.class.php @@ -21,12 +21,12 @@ /** * \defgroup oscommerce Module oscommerce * \brief Module pour gerer une boutique et interface avec OSCommerce - * \file htdocs/includes/modules/modBoutique.class.php + * \file htdocs/core/modules/modBoutique.class.php * \ingroup oscommerce * \brief Fichier de description et activation du module OSCommerce */ -include_once(DOL_DOCUMENT_ROOT ."/includes/modules/DolibarrModules.class.php"); +include_once(DOL_DOCUMENT_ROOT ."/core/modules/DolibarrModules.class.php"); /** diff --git a/htdocs/includes/modules/modCashDesk.class.php b/htdocs/core/modules/modCashDesk.class.php similarity index 97% rename from htdocs/includes/modules/modCashDesk.class.php rename to htdocs/core/modules/modCashDesk.class.php index f7281dabc5a..ab299097588 100644 --- a/htdocs/includes/modules/modCashDesk.class.php +++ b/htdocs/core/modules/modCashDesk.class.php @@ -18,11 +18,11 @@ /** * \defgroup pos Module points of sale * \brief Module to manage points of sale - * \file htdocs/includes/modules/modCashDesk.class.php + * \file htdocs/core/modules/modCashDesk.class.php * \ingroup pos * \brief File to enable/disable module Point Of Sales */ -include_once(DOL_DOCUMENT_ROOT ."/includes/modules/DolibarrModules.class.php"); +include_once(DOL_DOCUMENT_ROOT ."/core/modules/DolibarrModules.class.php"); /** diff --git a/htdocs/includes/modules/modCategorie.class.php b/htdocs/core/modules/modCategorie.class.php similarity index 98% rename from htdocs/includes/modules/modCategorie.class.php rename to htdocs/core/modules/modCategorie.class.php index e3e6a8d9759..eff35c10b4a 100644 --- a/htdocs/includes/modules/modCategorie.class.php +++ b/htdocs/core/modules/modCategorie.class.php @@ -19,11 +19,11 @@ /** * \defgroup category Module categories * \brief Module to manage categories - * \file htdocs/includes/modules/modCategorie.class.php + * \file htdocs/core/modules/modCategorie.class.php * \ingroup category * \brief Fichier de description et activation du module Categorie */ -include_once(DOL_DOCUMENT_ROOT ."/includes/modules/DolibarrModules.class.php"); +include_once(DOL_DOCUMENT_ROOT ."/core/modules/DolibarrModules.class.php"); /** diff --git a/htdocs/includes/modules/modClickToDial.class.php b/htdocs/core/modules/modClickToDial.class.php similarity index 95% rename from htdocs/includes/modules/modClickToDial.class.php rename to htdocs/core/modules/modClickToDial.class.php index 9e990ebf9e5..173961fcc34 100644 --- a/htdocs/includes/modules/modClickToDial.class.php +++ b/htdocs/core/modules/modClickToDial.class.php @@ -19,12 +19,12 @@ /** * \defgroup clicktodial Module clicktodial * \brief Module pour gerer l'appel automatique - * \file htdocs/includes/modules/modClickToDial.class.php + * \file htdocs/core/modules/modClickToDial.class.php * \ingroup clicktodial * \brief Fichier de description et activation du module de click to Dial */ -include_once(DOL_DOCUMENT_ROOT ."/includes/modules/DolibarrModules.class.php"); +include_once(DOL_DOCUMENT_ROOT ."/core/modules/DolibarrModules.class.php"); /** diff --git a/htdocs/includes/modules/modCommande.class.php b/htdocs/core/modules/modCommande.class.php similarity index 98% rename from htdocs/includes/modules/modCommande.class.php rename to htdocs/core/modules/modCommande.class.php index ed4bc30f242..36b07293dac 100644 --- a/htdocs/includes/modules/modCommande.class.php +++ b/htdocs/core/modules/modCommande.class.php @@ -23,12 +23,12 @@ /** * \defgroup commande Module orders * \brief Module pour gerer le suivi des commandes - * \file htdocs/includes/modules/modCommande.class.php + * \file htdocs/core/modules/modCommande.class.php * \ingroup commande * \brief Fichier de description et activation du module Commande */ -include_once(DOL_DOCUMENT_ROOT ."/includes/modules/DolibarrModules.class.php"); +include_once(DOL_DOCUMENT_ROOT ."/core/modules/DolibarrModules.class.php"); /** diff --git a/htdocs/includes/modules/modComptabilite.class.php b/htdocs/core/modules/modComptabilite.class.php similarity index 96% rename from htdocs/includes/modules/modComptabilite.class.php rename to htdocs/core/modules/modComptabilite.class.php index f7b9143fa14..fd0cb925e1f 100644 --- a/htdocs/includes/modules/modComptabilite.class.php +++ b/htdocs/core/modules/modComptabilite.class.php @@ -21,12 +21,12 @@ /** * \defgroup comptabilite Module comptabilite * \brief Module pour inclure des fonctions de comptabilite (gestion de comptes comptables et rapports) - * \file htdocs/includes/modules/modComptabilite.class.php + * \file htdocs/core/modules/modComptabilite.class.php * \ingroup comptabilite * \brief Fichier de description et activation du module Comptabilite */ -include_once(DOL_DOCUMENT_ROOT ."/includes/modules/DolibarrModules.class.php"); +include_once(DOL_DOCUMENT_ROOT ."/core/modules/DolibarrModules.class.php"); /** diff --git a/htdocs/includes/modules/modContrat.class.php b/htdocs/core/modules/modContrat.class.php similarity index 96% rename from htdocs/includes/modules/modContrat.class.php rename to htdocs/core/modules/modContrat.class.php index 1b36e2b6524..0de06eb5e6a 100644 --- a/htdocs/includes/modules/modContrat.class.php +++ b/htdocs/core/modules/modContrat.class.php @@ -20,12 +20,12 @@ /** * \defgroup contrat Module contract * \brief Module pour gerer la tenue de contrat de services - * \file htdocs/includes/modules/modContrat.class.php + * \file htdocs/core/modules/modContrat.class.php * \ingroup contrat * \brief Fichier de description et activation du module Contrat */ -include_once(DOL_DOCUMENT_ROOT ."/includes/modules/DolibarrModules.class.php"); +include_once(DOL_DOCUMENT_ROOT ."/core/modules/DolibarrModules.class.php"); /** diff --git a/htdocs/includes/modules/modDeplacement.class.php b/htdocs/core/modules/modDeplacement.class.php similarity index 97% rename from htdocs/includes/modules/modDeplacement.class.php rename to htdocs/core/modules/modDeplacement.class.php index ad338d51724..7803cc623b8 100644 --- a/htdocs/includes/modules/modDeplacement.class.php +++ b/htdocs/core/modules/modDeplacement.class.php @@ -19,11 +19,11 @@ /** * \defgroup deplacement Module trips * \brief Module pour gerer les deplacements et notes de frais - * \file htdocs/includes/modules/modDeplacement.class.php + * \file htdocs/core/modules/modDeplacement.class.php * \ingroup deplacement * \brief Fichier de description et activation du module Deplacement et notes de frais */ -include_once(DOL_DOCUMENT_ROOT ."/includes/modules/DolibarrModules.class.php"); +include_once(DOL_DOCUMENT_ROOT ."/core/modules/DolibarrModules.class.php"); /** diff --git a/htdocs/includes/modules/modDocument.class.php b/htdocs/core/modules/modDocument.class.php similarity index 96% rename from htdocs/includes/modules/modDocument.class.php rename to htdocs/core/modules/modDocument.class.php index 387079f3148..f20c1a72041 100644 --- a/htdocs/includes/modules/modDocument.class.php +++ b/htdocs/core/modules/modDocument.class.php @@ -20,12 +20,12 @@ /** * \defgroup document Module mass mailings * \brief Module pour gerer des generations de documents - * \file htdocs/includes/modules/modDocument.class.php + * \file htdocs/core/modules/modDocument.class.php * \ingroup document * \brief Fichier de description et activation du module Generation document */ -include_once(DOL_DOCUMENT_ROOT ."/includes/modules/DolibarrModules.class.php"); +include_once(DOL_DOCUMENT_ROOT ."/core/modules/DolibarrModules.class.php"); /** diff --git a/htdocs/includes/modules/modDon.class.php b/htdocs/core/modules/modDon.class.php similarity index 96% rename from htdocs/includes/modules/modDon.class.php rename to htdocs/core/modules/modDon.class.php index afc22ce4cae..e55afc88f89 100644 --- a/htdocs/includes/modules/modDon.class.php +++ b/htdocs/core/modules/modDon.class.php @@ -20,12 +20,12 @@ /** * \defgroup don Module donation * \brief Module pour gerer le suivi des dons - * \file htdocs/includes/modules/modDon.class.php + * \file htdocs/core/modules/modDon.class.php * \ingroup don * \brief Fichier de description et activation du module Don */ -include_once(DOL_DOCUMENT_ROOT ."/includes/modules/DolibarrModules.class.php"); +include_once(DOL_DOCUMENT_ROOT ."/core/modules/DolibarrModules.class.php"); /** diff --git a/htdocs/includes/modules/modECM.class.php b/htdocs/core/modules/modECM.class.php similarity index 96% rename from htdocs/includes/modules/modECM.class.php rename to htdocs/core/modules/modECM.class.php index 76dd1bddfa0..feae143c35a 100644 --- a/htdocs/includes/modules/modECM.class.php +++ b/htdocs/core/modules/modECM.class.php @@ -18,12 +18,12 @@ /** \defgroup ecm Module ecm * \brief Module for ECM (Electronic Content Management) - * \file htdocs/includes/modules/modECM.class.php + * \file htdocs/core/modules/modECM.class.php * \ingroup ecm * \brief Description and activation file for module ECM */ -include_once(DOL_DOCUMENT_ROOT ."/includes/modules/DolibarrModules.class.php"); +include_once(DOL_DOCUMENT_ROOT ."/core/modules/DolibarrModules.class.php"); /** \class modECM @@ -78,7 +78,7 @@ class modECM extends DolibarrModules $this->boxes = array(); // List of boxes $r=0; - // Add here list of php file(s) stored in includes/boxes that contains class to show a box. + // Add here list of php file(s) stored in core/boxes that contains class to show a box. // Example: //$this->boxes[$r][1] = "myboxa.php"; //$r++; diff --git a/htdocs/includes/modules/modExpedition.class.php b/htdocs/core/modules/modExpedition.class.php similarity index 98% rename from htdocs/includes/modules/modExpedition.class.php rename to htdocs/core/modules/modExpedition.class.php index f4e07aa453b..32f419e18d4 100644 --- a/htdocs/includes/modules/modExpedition.class.php +++ b/htdocs/core/modules/modExpedition.class.php @@ -21,12 +21,12 @@ /** * \defgroup expedition Module shipping * \brief Module pour gerer les expeditions de produits - * \file htdocs/includes/modules/modExpedition.class.php + * \file htdocs/core/modules/modExpedition.class.php * \ingroup expedition * \brief Fichier de description et activation du module Expedition */ -include_once(DOL_DOCUMENT_ROOT ."/includes/modules/DolibarrModules.class.php"); +include_once(DOL_DOCUMENT_ROOT ."/core/modules/DolibarrModules.class.php"); /** diff --git a/htdocs/includes/modules/modExport.class.php b/htdocs/core/modules/modExport.class.php similarity index 95% rename from htdocs/includes/modules/modExport.class.php rename to htdocs/core/modules/modExport.class.php index 00dee4606d9..d3737d89969 100644 --- a/htdocs/includes/modules/modExport.class.php +++ b/htdocs/core/modules/modExport.class.php @@ -19,12 +19,12 @@ /** * \defgroup export Module export * \brief Module generique pour realiser des exports de donnees en base - * \file htdocs/includes/modules/modExport.class.php + * \file htdocs/core/modules/modExport.class.php * \ingroup export * \brief Fichier de description et activation du module export */ -include_once(DOL_DOCUMENT_ROOT ."/includes/modules/DolibarrModules.class.php"); +include_once(DOL_DOCUMENT_ROOT ."/core/modules/DolibarrModules.class.php"); /** \class modExport diff --git a/htdocs/includes/modules/modExternalRss.class.php b/htdocs/core/modules/modExternalRss.class.php similarity index 96% rename from htdocs/includes/modules/modExternalRss.class.php rename to htdocs/core/modules/modExternalRss.class.php index d72158e8597..43e41cbbc1d 100644 --- a/htdocs/includes/modules/modExternalRss.class.php +++ b/htdocs/core/modules/modExternalRss.class.php @@ -19,12 +19,12 @@ /** * \defgroup externalrss Module externalrss * \brief Module pour inclure des informations externes RSS - * \file htdocs/includes/modules/modExternalRss.class.php + * \file htdocs/core/modules/modExternalRss.class.php * \ingroup externalrss * \brief Fichier de description et activation du module externalrss */ -include_once(DOL_DOCUMENT_ROOT ."/includes/modules/DolibarrModules.class.php"); +include_once(DOL_DOCUMENT_ROOT ."/core/modules/DolibarrModules.class.php"); /** \class modExternalRss diff --git a/htdocs/includes/modules/modExternalSite.class.php b/htdocs/core/modules/modExternalSite.class.php similarity index 95% rename from htdocs/includes/modules/modExternalSite.class.php rename to htdocs/core/modules/modExternalSite.class.php index 271e52f0b0d..004b60a4c49 100644 --- a/htdocs/includes/modules/modExternalSite.class.php +++ b/htdocs/core/modules/modExternalSite.class.php @@ -20,12 +20,12 @@ /** * \defgroup externalsite Module externalsite * \brief Module to include an external web site/tools into Dolibarr menu and into a frame page. - * \file htdocs/includes/modules/modExternalSite.class.php + * \file htdocs/core/modules/modExternalSite.class.php * \ingroup externalsite * \brief Description and activation file for module ExternalSite */ -include_once(DOL_DOCUMENT_ROOT ."/includes/modules/DolibarrModules.class.php"); +include_once(DOL_DOCUMENT_ROOT ."/core/modules/DolibarrModules.class.php"); /** \class modExternalSite @@ -83,7 +83,7 @@ class modExternalSite extends DolibarrModules $this->boxes = array(); // List of boxes $r=0; - // Add here list of php file(s) stored in includes/boxes that contains class to show a box. + // Add here list of php file(s) stored in core/boxes that contains class to show a box. // Example: //$this->boxes[$r][1] = "myboxa.php"; //$r++; diff --git a/htdocs/includes/modules/modFTP.class.php b/htdocs/core/modules/modFTP.class.php similarity index 95% rename from htdocs/includes/modules/modFTP.class.php rename to htdocs/core/modules/modFTP.class.php index c831763f801..dcba440ad40 100644 --- a/htdocs/includes/modules/modFTP.class.php +++ b/htdocs/core/modules/modFTP.class.php @@ -19,12 +19,12 @@ /** * \defgroup ftp Module FTP * \brief Module for FTP client module - * \file htdocs/includes/modules/modFTP.class.php + * \file htdocs/core/modules/modFTP.class.php * \ingroup ftp * \brief Description and activation file for module FTP */ -include_once(DOL_DOCUMENT_ROOT ."/includes/modules/DolibarrModules.class.php"); +include_once(DOL_DOCUMENT_ROOT ."/core/modules/DolibarrModules.class.php"); /** \class modFTP @@ -82,7 +82,7 @@ class modFTP extends DolibarrModules $this->boxes = array(); // List of boxes $r=0; - // Add here list of php file(s) stored in includes/boxes that contains class to show a box. + // Add here list of php file(s) stored in core/boxes that contains class to show a box. // Example: //$this->boxes[$r][1] = "myboxa.php"; //$r++; diff --git a/htdocs/includes/modules/modFacture.class.php b/htdocs/core/modules/modFacture.class.php similarity index 98% rename from htdocs/includes/modules/modFacture.class.php rename to htdocs/core/modules/modFacture.class.php index 7ac03cf74b1..86f5791dcea 100644 --- a/htdocs/includes/modules/modFacture.class.php +++ b/htdocs/core/modules/modFacture.class.php @@ -22,11 +22,11 @@ /** * \defgroup facture Module invoices * \brief Module pour gerer les factures clients et/ou fournisseurs - * \file htdocs/includes/modules/modFacture.class.php + * \file htdocs/core/modules/modFacture.class.php * \ingroup facture * \brief Fichier de la classe de description et activation du module Facture */ -include_once(DOL_DOCUMENT_ROOT ."/includes/modules/DolibarrModules.class.php"); +include_once(DOL_DOCUMENT_ROOT ."/core/modules/DolibarrModules.class.php"); /** diff --git a/htdocs/includes/modules/modFckeditor.class.php b/htdocs/core/modules/modFckeditor.class.php similarity index 96% rename from htdocs/includes/modules/modFckeditor.class.php rename to htdocs/core/modules/modFckeditor.class.php index fbdc67e2199..24a07aabaab 100644 --- a/htdocs/includes/modules/modFckeditor.class.php +++ b/htdocs/core/modules/modFckeditor.class.php @@ -20,12 +20,12 @@ /** * \defgroup fckeditor Module fckeditor * \brief Module pour mettre en page les zones de saisie de texte - * \file htdocs/includes/modules/modFckeditor.class.php + * \file htdocs/core/modules/modFckeditor.class.php * \ingroup fckeditor * \brief Fichier de description et activation du module Fckeditor */ -include_once(DOL_DOCUMENT_ROOT ."/includes/modules/DolibarrModules.class.php"); +include_once(DOL_DOCUMENT_ROOT ."/core/modules/DolibarrModules.class.php"); /** diff --git a/htdocs/includes/modules/modFicheinter.class.php b/htdocs/core/modules/modFicheinter.class.php similarity index 98% rename from htdocs/includes/modules/modFicheinter.class.php rename to htdocs/core/modules/modFicheinter.class.php index 1ecfda9cbcf..f5f823851a1 100644 --- a/htdocs/includes/modules/modFicheinter.class.php +++ b/htdocs/core/modules/modFicheinter.class.php @@ -23,12 +23,12 @@ /** * \defgroup ficheinter Module intervention cards * \brief Module to manage intervention cards - * \file htdocs/includes/modules/modFicheinter.class.php + * \file htdocs/core/modules/modFicheinter.class.php * \ingroup ficheinter * \brief Fichier de description et activation du module Ficheinter */ -include_once(DOL_DOCUMENT_ROOT ."/includes/modules/DolibarrModules.class.php"); +include_once(DOL_DOCUMENT_ROOT ."/core/modules/DolibarrModules.class.php"); /** diff --git a/htdocs/includes/modules/modFournisseur.class.php b/htdocs/core/modules/modFournisseur.class.php similarity index 99% rename from htdocs/includes/modules/modFournisseur.class.php rename to htdocs/core/modules/modFournisseur.class.php index de6b78c6fc4..1cf445502fd 100644 --- a/htdocs/includes/modules/modFournisseur.class.php +++ b/htdocs/core/modules/modFournisseur.class.php @@ -20,11 +20,11 @@ /** * \defgroup fournisseur Module suppliers * \brief Module pour gerer des societes et contacts de type fournisseurs - * \file htdocs/includes/modules/modFournisseur.class.php + * \file htdocs/core/modules/modFournisseur.class.php * \ingroup fournisseur * \brief Fichier de description et activation du module Fournisseur */ -include_once(DOL_DOCUMENT_ROOT ."/includes/modules/DolibarrModules.class.php"); +include_once(DOL_DOCUMENT_ROOT ."/core/modules/DolibarrModules.class.php"); /** diff --git a/htdocs/includes/modules/modGeoIPMaxmind.class.php b/htdocs/core/modules/modGeoIPMaxmind.class.php similarity index 96% rename from htdocs/includes/modules/modGeoIPMaxmind.class.php rename to htdocs/core/modules/modGeoIPMaxmind.class.php index 5e3ae85b0a0..0acfc0790ad 100644 --- a/htdocs/includes/modules/modGeoIPMaxmind.class.php +++ b/htdocs/core/modules/modGeoIPMaxmind.class.php @@ -18,12 +18,12 @@ /** * \defgroup geoip Module GeoIP * \brief Module to make geoip conversions - * \file htdocs/includes/modules/modGeoIPMaxmind.class.php + * \file htdocs/core/modules/modGeoIPMaxmind.class.php * \ingroup geoip * \brief File of geoipmaxmind module descriptor */ -include_once(DOL_DOCUMENT_ROOT ."/includes/modules/DolibarrModules.class.php"); +include_once(DOL_DOCUMENT_ROOT ."/core/modules/DolibarrModules.class.php"); /** \class modGeoIPMaxmind diff --git a/htdocs/includes/modules/modGravatar.class.php b/htdocs/core/modules/modGravatar.class.php similarity index 98% rename from htdocs/includes/modules/modGravatar.class.php rename to htdocs/core/modules/modGravatar.class.php index f8730a86d6a..fcf51da987d 100644 --- a/htdocs/includes/modules/modGravatar.class.php +++ b/htdocs/core/modules/modGravatar.class.php @@ -19,11 +19,11 @@ /** * \defgroup gravatar Module gravatar * \brief Module to use Gravatar to show photo of users - * \file htdocs/includes/modules/modGravatar.class.php + * \file htdocs/core/modules/modGravatar.class.php * \ingroup gravatar * \brief Description and activation file for module Gravatar */ -include_once(DOL_DOCUMENT_ROOT ."/includes/modules/DolibarrModules.class.php"); +include_once(DOL_DOCUMENT_ROOT ."/core/modules/DolibarrModules.class.php"); /** \class modGravatar @@ -94,7 +94,7 @@ class modGravatar extends DolibarrModules $this->boxes = array(); // List of boxes $r=0; - // Add here list of php file(s) stored in includes/boxes that contains class to show a box. + // Add here list of php file(s) stored in core/boxes that contains class to show a box. // Example: //$this->boxes[$r][1] = "myboxa.php"; //$r++; diff --git a/htdocs/includes/modules/modImport.class.php b/htdocs/core/modules/modImport.class.php similarity index 96% rename from htdocs/includes/modules/modImport.class.php rename to htdocs/core/modules/modImport.class.php index 88a0f350015..613f25d6800 100644 --- a/htdocs/includes/modules/modImport.class.php +++ b/htdocs/core/modules/modImport.class.php @@ -19,12 +19,12 @@ /** * \defgroup import Module import * \brief Module to make generic import of data into dolibarr database - * \file htdocs/includes/modules/modImport.class.php + * \file htdocs/core/modules/modImport.class.php * \ingroup import * \brief Fichier de description et activation du module Import */ -include_once(DOL_DOCUMENT_ROOT ."/includes/modules/DolibarrModules.class.php"); +include_once(DOL_DOCUMENT_ROOT ."/core/modules/DolibarrModules.class.php"); /** \class modImport diff --git a/htdocs/includes/modules/modLabel.class.php b/htdocs/core/modules/modLabel.class.php similarity index 96% rename from htdocs/includes/modules/modLabel.class.php rename to htdocs/core/modules/modLabel.class.php index dc59b0320ec..0d1a123c1d3 100644 --- a/htdocs/includes/modules/modLabel.class.php +++ b/htdocs/core/modules/modLabel.class.php @@ -19,12 +19,12 @@ /** * \defgroup label Module labels * \brief Module pour gerer les formats d'impression des etiquettes - * \file htdocs/includes/modules/modLabel.class.php + * \file htdocs/core/modules/modLabel.class.php * \ingroup other * \brief Fichier de description et activation du module Label */ -include_once(DOL_DOCUMENT_ROOT ."/includes/modules/DolibarrModules.class.php"); +include_once(DOL_DOCUMENT_ROOT ."/core/modules/DolibarrModules.class.php"); /** diff --git a/htdocs/includes/modules/modLdap.class.php b/htdocs/core/modules/modLdap.class.php similarity index 96% rename from htdocs/includes/modules/modLdap.class.php rename to htdocs/core/modules/modLdap.class.php index d9b314be602..9334d648e77 100644 --- a/htdocs/includes/modules/modLdap.class.php +++ b/htdocs/core/modules/modLdap.class.php @@ -20,11 +20,11 @@ /** * \defgroup ldap Module ldap * \brief Module to manage LDAP interfaces with contacts or users - * \file htdocs/includes/modules/modLdap.class.php + * \file htdocs/core/modules/modLdap.class.php * \ingroup ldap * \brief File to describe and activate Ldap module */ -include_once(DOL_DOCUMENT_ROOT ."/includes/modules/DolibarrModules.class.php"); +include_once(DOL_DOCUMENT_ROOT ."/core/modules/DolibarrModules.class.php"); /** diff --git a/htdocs/includes/modules/modMailing.class.php b/htdocs/core/modules/modMailing.class.php similarity index 96% rename from htdocs/includes/modules/modMailing.class.php rename to htdocs/core/modules/modMailing.class.php index 30e1ee96fc3..a6ed37f1f88 100644 --- a/htdocs/includes/modules/modMailing.class.php +++ b/htdocs/core/modules/modMailing.class.php @@ -20,12 +20,12 @@ /** * \defgroup mailing Module emailing * \brief Module to manage EMailings - * \file htdocs/includes/modules/modMailing.class.php + * \file htdocs/core/modules/modMailing.class.php * \ingroup mailing * \brief Fichier de description et activation du module Mailing */ -include_once(DOL_DOCUMENT_ROOT ."/includes/modules/DolibarrModules.class.php"); +include_once(DOL_DOCUMENT_ROOT ."/core/modules/DolibarrModules.class.php"); /** diff --git a/htdocs/includes/modules/modNotification.class.php b/htdocs/core/modules/modNotification.class.php similarity index 95% rename from htdocs/includes/modules/modNotification.class.php rename to htdocs/core/modules/modNotification.class.php index efb3cfb5038..ca430eab2da 100644 --- a/htdocs/includes/modules/modNotification.class.php +++ b/htdocs/core/modules/modNotification.class.php @@ -19,12 +19,12 @@ /** * \defgroup notification Module email notification * \brief Module pour gerer les notifications (par mail ou autre) - * \file htdocs/includes/modules/modNotification.class.php + * \file htdocs/core/modules/modNotification.class.php * \ingroup notification * \brief Fichier de description et activation du module Notification */ -include_once(DOL_DOCUMENT_ROOT ."/includes/modules/DolibarrModules.class.php"); +include_once(DOL_DOCUMENT_ROOT ."/core/modules/DolibarrModules.class.php"); /** * \class modNotification diff --git a/htdocs/includes/modules/modPaybox.class.php b/htdocs/core/modules/modPaybox.class.php similarity index 98% rename from htdocs/includes/modules/modPaybox.class.php rename to htdocs/core/modules/modPaybox.class.php index 059c30fb70b..92299a5b82f 100644 --- a/htdocs/includes/modules/modPaybox.class.php +++ b/htdocs/core/modules/modPaybox.class.php @@ -19,11 +19,11 @@ /** * \defgroup paybox Module paybox * \brief Add integration with Paybox online payment system. - * \file htdocs/includes/modules/modPaybox.class.php + * \file htdocs/core/modules/modPaybox.class.php * \ingroup paybox * \brief Description and activation file for module Paybox */ -include_once(DOL_DOCUMENT_ROOT ."/includes/modules/DolibarrModules.class.php"); +include_once(DOL_DOCUMENT_ROOT ."/core/modules/DolibarrModules.class.php"); /** \class modPayBox @@ -93,7 +93,7 @@ class modPayBox extends DolibarrModules $this->boxes = array(); // List of boxes $r=0; - // Add here list of php file(s) stored in includes/boxes that contains class to show a box. + // Add here list of php file(s) stored in core/boxes that contains class to show a box. // Example: //$this->boxes[$r][1] = "myboxa.php"; //$r++; diff --git a/htdocs/includes/modules/modPaypal.class.php b/htdocs/core/modules/modPaypal.class.php similarity index 97% rename from htdocs/includes/modules/modPaypal.class.php rename to htdocs/core/modules/modPaypal.class.php index 31abc711e94..b9589227a2e 100644 --- a/htdocs/includes/modules/modPaypal.class.php +++ b/htdocs/core/modules/modPaypal.class.php @@ -20,11 +20,11 @@ /** * \defgroup paypal Module paypal * \brief Add integration with Paypal online payment system. - * \file htdocs/includes/modules/modPaypal.class.php + * \file htdocs/core/modules/modPaypal.class.php * \ingroup paypal * \brief Description and activation file for module Paypal */ -include_once(DOL_DOCUMENT_ROOT ."/includes/modules/DolibarrModules.class.php"); +include_once(DOL_DOCUMENT_ROOT ."/core/modules/DolibarrModules.class.php"); /** \class modPaypal @@ -94,7 +94,7 @@ class modPaypal extends DolibarrModules $this->boxes = array(); // List of boxes $r=0; - // Add here list of php file(s) stored in includes/boxes that contains class to show a box. + // Add here list of php file(s) stored in core/boxes that contains class to show a box. // Example: //$this->boxes[$r][1] = "myboxa.php"; //$r++; diff --git a/htdocs/includes/modules/modPrelevement.class.php b/htdocs/core/modules/modPrelevement.class.php similarity index 96% rename from htdocs/includes/modules/modPrelevement.class.php rename to htdocs/core/modules/modPrelevement.class.php index 2a71750dfaf..87198e9641c 100644 --- a/htdocs/includes/modules/modPrelevement.class.php +++ b/htdocs/core/modules/modPrelevement.class.php @@ -21,12 +21,12 @@ /** * \defgroup prelevement Module prelevement * \brief Module de gestion des prelevements bancaires - * \file htdocs/includes/modules/modPrelevement.class.php + * \file htdocs/core/modules/modPrelevement.class.php * \ingroup prelevement * \brief Fichier de description et activation du module Prelevement */ -include_once(DOL_DOCUMENT_ROOT ."/includes/modules/DolibarrModules.class.php"); +include_once(DOL_DOCUMENT_ROOT ."/core/modules/DolibarrModules.class.php"); /** diff --git a/htdocs/includes/modules/modProduct.class.php b/htdocs/core/modules/modProduct.class.php similarity index 98% rename from htdocs/includes/modules/modProduct.class.php rename to htdocs/core/modules/modProduct.class.php index 76ce02a7055..c0510190c50 100644 --- a/htdocs/includes/modules/modProduct.class.php +++ b/htdocs/core/modules/modProduct.class.php @@ -22,12 +22,12 @@ /** * \defgroup produit Module products * \brief Module pour gerer le suivi de produits predefinis - * \file htdocs/includes/modules/modProduct.class.php + * \file htdocs/core/modules/modProduct.class.php * \ingroup produit * \brief Fichier de description et activation du module Produit */ -include_once(DOL_DOCUMENT_ROOT ."/includes/modules/DolibarrModules.class.php"); +include_once(DOL_DOCUMENT_ROOT ."/core/modules/DolibarrModules.class.php"); /** diff --git a/htdocs/includes/modules/modProjet.class.php b/htdocs/core/modules/modProjet.class.php similarity index 97% rename from htdocs/includes/modules/modProjet.class.php rename to htdocs/core/modules/modProjet.class.php index 0da0ba4dc31..a00d3d4b826 100644 --- a/htdocs/includes/modules/modProjet.class.php +++ b/htdocs/core/modules/modProjet.class.php @@ -22,12 +22,12 @@ /** * \defgroup projet Module project * \brief Module to create projects/tasks/gantt diagram. Projects can them be affected to tasks. - * \file htdocs/includes/modules/modProjet.class.php + * \file htdocs/core/modules/modProjet.class.php * \ingroup projet * \brief Fichier de description et activation du module Projet */ -include_once(DOL_DOCUMENT_ROOT ."/includes/modules/DolibarrModules.class.php"); +include_once(DOL_DOCUMENT_ROOT ."/core/modules/DolibarrModules.class.php"); /** diff --git a/htdocs/includes/modules/modPropale.class.php b/htdocs/core/modules/modPropale.class.php similarity index 98% rename from htdocs/includes/modules/modPropale.class.php rename to htdocs/core/modules/modPropale.class.php index c3f5d9cb7ad..3d67b95afa7 100644 --- a/htdocs/includes/modules/modPropale.class.php +++ b/htdocs/core/modules/modPropale.class.php @@ -22,12 +22,12 @@ /** * \defgroup propale Module commercial proposals * \brief Module pour gerer la tenue de propositions commerciales - * \file htdocs/includes/modules/modPropale.class.php + * \file htdocs/core/modules/modPropale.class.php * \ingroup propale * \brief Fichier de description et activation du module Propale */ -include_once(DOL_DOCUMENT_ROOT ."/includes/modules/DolibarrModules.class.php"); +include_once(DOL_DOCUMENT_ROOT ."/core/modules/DolibarrModules.class.php"); /** diff --git a/htdocs/includes/modules/modService.class.php b/htdocs/core/modules/modService.class.php similarity index 97% rename from htdocs/includes/modules/modService.class.php rename to htdocs/core/modules/modService.class.php index 7ea8a47d8a1..7a24697eb1a 100644 --- a/htdocs/includes/modules/modService.class.php +++ b/htdocs/core/modules/modService.class.php @@ -23,12 +23,12 @@ /** * \defgroup service Module services * \brief Module pour gerer le suivi de services predefinis - * \file htdocs/includes/modules/modService.class.php + * \file htdocs/core/modules/modService.class.php * \ingroup service * \brief Fichier de description et activation du module Service */ -include_once(DOL_DOCUMENT_ROOT ."/includes/modules/DolibarrModules.class.php"); +include_once(DOL_DOCUMENT_ROOT ."/core/modules/DolibarrModules.class.php"); /** \class modService diff --git a/htdocs/includes/modules/modSociete.class.php b/htdocs/core/modules/modSociete.class.php similarity index 99% rename from htdocs/includes/modules/modSociete.class.php rename to htdocs/core/modules/modSociete.class.php index 4aa343a1f03..43946280014 100644 --- a/htdocs/includes/modules/modSociete.class.php +++ b/htdocs/core/modules/modSociete.class.php @@ -22,12 +22,12 @@ /** * \defgroup societe Module societe * \brief Module to manage third parties (customers, prospects) - * \file htdocs/includes/modules/modSociete.class.php + * \file htdocs/core/modules/modSociete.class.php * \ingroup societe * \brief Fichier de description et activation du module Societe */ -include_once(DOL_DOCUMENT_ROOT ."/includes/modules/DolibarrModules.class.php"); +include_once(DOL_DOCUMENT_ROOT ."/core/modules/DolibarrModules.class.php"); /** diff --git a/htdocs/includes/modules/modStock.class.php b/htdocs/core/modules/modStock.class.php similarity index 97% rename from htdocs/includes/modules/modStock.class.php rename to htdocs/core/modules/modStock.class.php index debff8f49a0..f1a5d89f0eb 100644 --- a/htdocs/includes/modules/modStock.class.php +++ b/htdocs/core/modules/modStock.class.php @@ -20,12 +20,12 @@ /** * \defgroup stock Module stocks * \brief Module pour gerer la tenue de stocks produits - * \file htdocs/includes/modules/modStock.class.php + * \file htdocs/core/modules/modStock.class.php * \ingroup stock * \brief Fichier de description et activation du module Stock */ -include_once(DOL_DOCUMENT_ROOT ."/includes/modules/DolibarrModules.class.php"); +include_once(DOL_DOCUMENT_ROOT ."/core/modules/DolibarrModules.class.php"); /** diff --git a/htdocs/includes/modules/modSyslog.class.php b/htdocs/core/modules/modSyslog.class.php similarity index 96% rename from htdocs/includes/modules/modSyslog.class.php rename to htdocs/core/modules/modSyslog.class.php index 1a362f43079..2a2c726fad4 100644 --- a/htdocs/includes/modules/modSyslog.class.php +++ b/htdocs/core/modules/modSyslog.class.php @@ -19,12 +19,12 @@ /** * \defgroup syslog Module syslog * \brief Module pour gerer les messages d'erreur dans syslog - * \file htdocs/includes/modules/modSyslog.class.php + * \file htdocs/core/modules/modSyslog.class.php * \ingroup syslog * \brief Fichier de description et activation du module de syslog */ -include_once(DOL_DOCUMENT_ROOT ."/includes/modules/DolibarrModules.class.php"); +include_once(DOL_DOCUMENT_ROOT ."/core/modules/DolibarrModules.class.php"); /** * \class modSyslog diff --git a/htdocs/includes/modules/modTax.class.php b/htdocs/core/modules/modTax.class.php similarity index 94% rename from htdocs/includes/modules/modTax.class.php rename to htdocs/core/modules/modTax.class.php index 85ac5c20fba..cc18764e2a6 100644 --- a/htdocs/includes/modules/modTax.class.php +++ b/htdocs/core/modules/modTax.class.php @@ -23,12 +23,12 @@ /** * \defgroup tax Module taxes * \brief Module pour inclure des fonctions de saisies des taxes (tva) et charges sociales - * \file htdocs/includes/modules/modTax.class.php + * \file htdocs/core/modules/modTax.class.php * \ingroup tax * \brief Fichier de description et activation du module Taxe */ -include_once(DOL_DOCUMENT_ROOT ."/includes/modules/DolibarrModules.class.php"); +include_once(DOL_DOCUMENT_ROOT ."/core/modules/DolibarrModules.class.php"); /** diff --git a/htdocs/includes/modules/modUser.class.php b/htdocs/core/modules/modUser.class.php similarity index 98% rename from htdocs/includes/modules/modUser.class.php rename to htdocs/core/modules/modUser.class.php index c6e4d87b3e0..952efb9f25f 100644 --- a/htdocs/includes/modules/modUser.class.php +++ b/htdocs/core/modules/modUser.class.php @@ -20,12 +20,12 @@ /** * \defgroup user Module user management * \brief Module pour gerer les utilisateurs - * \file htdocs/includes/modules/modUser.class.php + * \file htdocs/core/modules/modUser.class.php * \ingroup user * \brief Fichier de description et activation du module Utilisateur */ -include_once(DOL_DOCUMENT_ROOT ."/includes/modules/DolibarrModules.class.php"); +include_once(DOL_DOCUMENT_ROOT ."/core/modules/DolibarrModules.class.php"); /** * \class modUser diff --git a/htdocs/includes/modules/modWebServices.class.php b/htdocs/core/modules/modWebServices.class.php similarity index 96% rename from htdocs/includes/modules/modWebServices.class.php rename to htdocs/core/modules/modWebServices.class.php index 8915922e100..6b0cdf0d347 100644 --- a/htdocs/includes/modules/modWebServices.class.php +++ b/htdocs/core/modules/modWebServices.class.php @@ -18,12 +18,12 @@ /** * \defgroup webservices Module webservices * \brief Module to enable the Dolibarr server of web services - * \file htdocs/includes/modules/modWebServices.class.php + * \file htdocs/core/modules/modWebServices.class.php * \ingroup webservices * \brief File to describe webservices module */ -include_once(DOL_DOCUMENT_ROOT ."/includes/modules/DolibarrModules.class.php"); +include_once(DOL_DOCUMENT_ROOT ."/core/modules/DolibarrModules.class.php"); /** * \class modWebServices diff --git a/htdocs/includes/modules/modWorkflow.class.php b/htdocs/core/modules/modWorkflow.class.php similarity index 96% rename from htdocs/includes/modules/modWorkflow.class.php rename to htdocs/core/modules/modWorkflow.class.php index 3391e6a7986..e4d66941ee0 100644 --- a/htdocs/includes/modules/modWorkflow.class.php +++ b/htdocs/core/modules/modWorkflow.class.php @@ -19,12 +19,12 @@ /** * \defgroup workflow Module workflow * \brief Workflow management - * \file htdocs/includes/modules/modWorkflow.class.php + * \file htdocs/core/modules/modWorkflow.class.php * \ingroup workflow * \brief File to describe and activate module Workflow */ -include_once(DOL_DOCUMENT_ROOT ."/includes/modules/DolibarrModules.class.php"); +include_once(DOL_DOCUMENT_ROOT ."/core/modules/DolibarrModules.class.php"); /** @@ -65,7 +65,7 @@ class modWorkflow extends DolibarrModules // If file is in module/img directory under name object_pictovalue.png, use this->picto='pictovalue@module' $this->picto='technic'; - // Defined if the directory /mymodule/includes/triggers/ contains triggers or not + // Defined if the directory /mymodule/core/triggers/ contains triggers or not $this->triggers = 1; // Data directories to create when module is enabled diff --git a/htdocs/includes/modules/project/mod_project_simple.php b/htdocs/core/modules/project/mod_project_simple.php similarity index 96% rename from htdocs/includes/modules/project/mod_project_simple.php rename to htdocs/core/modules/project/mod_project_simple.php index e92cb1c5518..4547fb3a8a9 100644 --- a/htdocs/includes/modules/project/mod_project_simple.php +++ b/htdocs/core/modules/project/mod_project_simple.php @@ -18,12 +18,12 @@ */ /** - * \file htdocs/includes/modules/project/mod_project_simple.php + * \file htdocs/core/modules/project/mod_project_simple.php * \ingroup project * \brief File with class to manage the numbering module Simple for project references */ -require_once(DOL_DOCUMENT_ROOT ."/includes/modules/project/modules_project.php"); +require_once(DOL_DOCUMENT_ROOT ."/core/modules/project/modules_project.php"); /** diff --git a/htdocs/includes/modules/project/mod_project_universal.php b/htdocs/core/modules/project/mod_project_universal.php similarity index 96% rename from htdocs/includes/modules/project/mod_project_universal.php rename to htdocs/core/modules/project/mod_project_universal.php index 76cc85e604b..a8564be3091 100644 --- a/htdocs/includes/modules/project/mod_project_universal.php +++ b/htdocs/core/modules/project/mod_project_universal.php @@ -17,12 +17,12 @@ */ /** - * \file htdocs/includes/modules/project/mod_project_universal.php + * \file htdocs/core/modules/project/mod_project_universal.php * \ingroup project * \brief Fichier contenant la classe du modele de numerotation de reference de projet Universal */ -require_once(DOL_DOCUMENT_ROOT ."/includes/modules/project/modules_project.php"); +require_once(DOL_DOCUMENT_ROOT ."/core/modules/project/modules_project.php"); /** diff --git a/htdocs/includes/modules/project/modules_project.php b/htdocs/core/modules/project/modules_project.php similarity index 97% rename from htdocs/includes/modules/project/modules_project.php rename to htdocs/core/modules/project/modules_project.php index 2c67de1c2c0..a61b6301931 100644 --- a/htdocs/includes/modules/project/modules_project.php +++ b/htdocs/core/modules/project/modules_project.php @@ -17,7 +17,7 @@ */ /** - * \file htdocs/includes/modules/project/modules_project.php + * \file htdocs/core/modules/project/modules_project.php * \ingroup project * \brief File that contain parent class for projects models * and parent class for projects numbering models @@ -143,7 +143,7 @@ function project_pdf_create($db, $object, $model,$outputlangs) global $conf,$langs; $langs->load("projects"); - $dir = DOL_DOCUMENT_ROOT."/includes/modules/project/pdf/"; + $dir = DOL_DOCUMENT_ROOT."/core/modules/project/pdf/"; // Positionne modele sur le nom du modele de projet a utiliser if (! dol_strlen($model)) diff --git a/htdocs/includes/modules/project/pdf/pdf_baleine.modules.php b/htdocs/core/modules/project/pdf/pdf_baleine.modules.php similarity index 98% rename from htdocs/includes/modules/project/pdf/pdf_baleine.modules.php rename to htdocs/core/modules/project/pdf/pdf_baleine.modules.php index a42a08602ea..d5c163c12c6 100644 --- a/htdocs/includes/modules/project/pdf/pdf_baleine.modules.php +++ b/htdocs/core/modules/project/pdf/pdf_baleine.modules.php @@ -17,13 +17,13 @@ */ /** - * \file htdocs/includes/modules/project/pdf/pdf_baleine.modules.php + * \file htdocs/core/modules/project/pdf/pdf_baleine.modules.php * \ingroup project * \brief Fichier de la classe permettant de generer les projets au modele Baleine * \author Regis Houssin */ -require_once(DOL_DOCUMENT_ROOT."/includes/modules/project/modules_project.php"); +require_once(DOL_DOCUMENT_ROOT."/core/modules/project/modules_project.php"); require_once(DOL_DOCUMENT_ROOT."/projet/class/project.class.php"); require_once(DOL_DOCUMENT_ROOT."/projet/class/task.class.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/company.lib.php"); diff --git a/htdocs/includes/modules/propale/mod_propale_marbre.php b/htdocs/core/modules/propale/mod_propale_marbre.php similarity index 96% rename from htdocs/includes/modules/propale/mod_propale_marbre.php rename to htdocs/core/modules/propale/mod_propale_marbre.php index 1fbf784d874..7a0bad694c4 100644 --- a/htdocs/includes/modules/propale/mod_propale_marbre.php +++ b/htdocs/core/modules/propale/mod_propale_marbre.php @@ -18,12 +18,12 @@ */ /** - * \file htdocs/includes/modules/propale/mod_propale_marbre.php + * \file htdocs/core/modules/propale/mod_propale_marbre.php * \ingroup propale * \brief File of class to manage commercial proposal numbering rules Marbre */ -require_once(DOL_DOCUMENT_ROOT ."/includes/modules/propale/modules_propale.php"); +require_once(DOL_DOCUMENT_ROOT ."/core/modules/propale/modules_propale.php"); /** \class mod_propale_marbre diff --git a/htdocs/includes/modules/propale/mod_propale_saphir.php b/htdocs/core/modules/propale/mod_propale_saphir.php similarity index 96% rename from htdocs/includes/modules/propale/mod_propale_saphir.php rename to htdocs/core/modules/propale/mod_propale_saphir.php index 0d0bd838c52..956827dd523 100644 --- a/htdocs/includes/modules/propale/mod_propale_saphir.php +++ b/htdocs/core/modules/propale/mod_propale_saphir.php @@ -20,12 +20,12 @@ */ /** - * \file htdocs/includes/modules/propale/mod_propale_saphir.php + * \file htdocs/core/modules/propale/mod_propale_saphir.php * \ingroup propale * \brief File that contains the numbering module rules Saphir */ -require_once(DOL_DOCUMENT_ROOT ."/includes/modules/propale/modules_propale.php"); +require_once(DOL_DOCUMENT_ROOT ."/core/modules/propale/modules_propale.php"); /** diff --git a/htdocs/includes/modules/propale/modules_propale.php b/htdocs/core/modules/propale/modules_propale.php similarity index 98% rename from htdocs/includes/modules/propale/modules_propale.php rename to htdocs/core/modules/propale/modules_propale.php index 773d47697b0..10480c1d3d9 100644 --- a/htdocs/includes/modules/propale/modules_propale.php +++ b/htdocs/core/modules/propale/modules_propale.php @@ -19,7 +19,7 @@ */ /** - * \file htdocs/includes/modules/propale/modules_propale.php + * \file htdocs/core/modules/propale/modules_propale.php * \ingroup propale * \brief Fichier contenant la classe mere de generation des propales en PDF * et la classe mere de numerotation des propales @@ -145,7 +145,7 @@ function propale_pdf_create($db, $object, $modele, $outputlangs, $hidedetails=0, global $conf,$user,$langs; $langs->load("propale"); - $dir = "/includes/modules/propale/"; + $dir = "/core/modules/propale/"; $srctemplatepath=''; $modelisok=0; diff --git a/htdocs/includes/modules/propale/pdf_propale_azur.modules.php b/htdocs/core/modules/propale/pdf_propale_azur.modules.php similarity index 99% rename from htdocs/includes/modules/propale/pdf_propale_azur.modules.php rename to htdocs/core/modules/propale/pdf_propale_azur.modules.php index a9819f1ce0a..34b41f44e52 100644 --- a/htdocs/includes/modules/propale/pdf_propale_azur.modules.php +++ b/htdocs/core/modules/propale/pdf_propale_azur.modules.php @@ -20,12 +20,12 @@ */ /** - * \file htdocs/includes/modules/propale/pdf_propale_azur.modules.php + * \file htdocs/core/modules/propale/pdf_propale_azur.modules.php * \ingroup propale * \brief Fichier de la classe permettant de generer les propales au modele Azur * \author Laurent Destailleur */ -require_once(DOL_DOCUMENT_ROOT."/includes/modules/propale/modules_propale.php"); +require_once(DOL_DOCUMENT_ROOT."/core/modules/propale/modules_propale.php"); require_once(DOL_DOCUMENT_ROOT."/product/class/product.class.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/company.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/functions2.lib.php"); diff --git a/htdocs/includes/modules/propale/pdf_propale_jaune.modules.php b/htdocs/core/modules/propale/pdf_propale_jaune.modules.php similarity index 99% rename from htdocs/includes/modules/propale/pdf_propale_jaune.modules.php rename to htdocs/core/modules/propale/pdf_propale_jaune.modules.php index cd9e4668be0..92acc9a56c6 100644 --- a/htdocs/includes/modules/propale/pdf_propale_jaune.modules.php +++ b/htdocs/core/modules/propale/pdf_propale_jaune.modules.php @@ -20,12 +20,12 @@ */ /** - * \file htdocs/includes/modules/propale/pdf_propale_jaune.modules.php + * \file htdocs/core/modules/propale/pdf_propale_jaune.modules.php * \ingroup propale * \brief Fichier de la classe permettant de generer les propales au modele Jaune * \author Laurent Destailleur */ -require_once(DOL_DOCUMENT_ROOT."/includes/modules/propale/modules_propale.php"); +require_once(DOL_DOCUMENT_ROOT."/core/modules/propale/modules_propale.php"); require_once(DOL_DOCUMENT_ROOT."/product/class/product.class.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/company.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/functions2.lib.php"); diff --git a/htdocs/includes/modules/rapport/pdf_paiement.class.php b/htdocs/core/modules/rapport/pdf_paiement.class.php similarity index 99% rename from htdocs/includes/modules/rapport/pdf_paiement.class.php rename to htdocs/core/modules/rapport/pdf_paiement.class.php index 24b9c6543e9..238655ab18c 100644 --- a/htdocs/includes/modules/rapport/pdf_paiement.class.php +++ b/htdocs/core/modules/rapport/pdf_paiement.class.php @@ -18,7 +18,7 @@ */ /** - * \file htdocs/includes/modules/rapport/pdf_paiement.class.php + * \file htdocs/core/modules/rapport/pdf_paiement.class.php * \ingroup banque * \brief File to build payment reports */ diff --git a/htdocs/includes/modules/security/generate/README b/htdocs/core/modules/security/generate/README similarity index 89% rename from htdocs/includes/modules/security/generate/README rename to htdocs/core/modules/security/generate/README index 15aa41188ba..c47cee09469 100755 --- a/htdocs/includes/modules/security/generate/README +++ b/htdocs/core/modules/security/generate/README @@ -11,9 +11,9 @@ to add you own password generator: ***** STEP 1 ***** Copy file -htdocs/includes/modules/security/modGeneratePassNone.class.php +htdocs/core/modules/security/modGeneratePassNone.class.php into -htdocs/includes/modules/mailings/modMyGenerator.class.php +htdocs/core/modules/mailings/modMyGenerator.class.php You can choose value of your choice instead of "myGenerator" in name of new file. diff --git a/htdocs/includes/modules/security/generate/modGeneratePassNone.class.php b/htdocs/core/modules/security/generate/modGeneratePassNone.class.php similarity index 92% rename from htdocs/includes/modules/security/generate/modGeneratePassNone.class.php rename to htdocs/core/modules/security/generate/modGeneratePassNone.class.php index 8e909ec0cb1..95debcd7058 100644 --- a/htdocs/includes/modules/security/generate/modGeneratePassNone.class.php +++ b/htdocs/core/modules/security/generate/modGeneratePassNone.class.php @@ -17,12 +17,12 @@ */ /** - * \file htdocs/includes/modules/security/generate/modGeneratePassNone.class.php + * \file htdocs/core/modules/security/generate/modGeneratePassNone.class.php * \ingroup core * \brief File to manage no password generation. */ -require_once(DOL_DOCUMENT_ROOT ."/includes/modules/security/generate/modules_genpassword.php"); +require_once(DOL_DOCUMENT_ROOT ."/core/modules/security/generate/modules_genpassword.php"); /** diff --git a/htdocs/includes/modules/security/generate/modGeneratePassStandard.class.php b/htdocs/core/modules/security/generate/modGeneratePassStandard.class.php similarity index 93% rename from htdocs/includes/modules/security/generate/modGeneratePassStandard.class.php rename to htdocs/core/modules/security/generate/modGeneratePassStandard.class.php index 17687b914a9..76ec32db477 100644 --- a/htdocs/includes/modules/security/generate/modGeneratePassStandard.class.php +++ b/htdocs/core/modules/security/generate/modGeneratePassStandard.class.php @@ -17,12 +17,12 @@ */ /** - * \file htdocs/includes/modules/security/generate/modGeneratePassStandard.class.php + * \file htdocs/core/modules/security/generate/modGeneratePassStandard.class.php * \ingroup core * \brief File to manage password generation according to standard rule */ -require_once(DOL_DOCUMENT_ROOT ."/includes/modules/security/generate/modules_genpassword.php"); +require_once(DOL_DOCUMENT_ROOT ."/core/modules/security/generate/modules_genpassword.php"); /** diff --git a/htdocs/includes/modules/security/generate/modules_genpassword.php b/htdocs/core/modules/security/generate/modules_genpassword.php similarity index 96% rename from htdocs/includes/modules/security/generate/modules_genpassword.php rename to htdocs/core/modules/security/generate/modules_genpassword.php index d9c8efa8338..82022024572 100644 --- a/htdocs/includes/modules/security/generate/modules_genpassword.php +++ b/htdocs/core/modules/security/generate/modules_genpassword.php @@ -17,7 +17,7 @@ */ /** - * \file htdocs/includes/modules/security/generate/modules_genpassword.php + * \file htdocs/core/modules/security/generate/modules_genpassword.php * \ingroup core * \brief File with parent class for password generating classes */ diff --git a/htdocs/includes/modules/societe/doc/doc_generic_odt.modules.php b/htdocs/core/modules/societe/doc/doc_generic_odt.modules.php similarity index 98% rename from htdocs/includes/modules/societe/doc/doc_generic_odt.modules.php rename to htdocs/core/modules/societe/doc/doc_generic_odt.modules.php index 708b601895d..76fb65db8c7 100644 --- a/htdocs/includes/modules/societe/doc/doc_generic_odt.modules.php +++ b/htdocs/core/modules/societe/doc/doc_generic_odt.modules.php @@ -17,13 +17,13 @@ */ /** - * \file htdocs/includes/modules/societe/doc/doc_generic_odt.modules.php + * \file htdocs/core/modules/societe/doc/doc_generic_odt.modules.php * \ingroup societe * \brief File of class to build ODT documents for third parties * \author Laurent Destailleur */ -require_once(DOL_DOCUMENT_ROOT."/includes/modules/societe/modules_societe.class.php"); +require_once(DOL_DOCUMENT_ROOT."/core/modules/societe/modules_societe.class.php"); require_once(DOL_DOCUMENT_ROOT."/societe/class/societe.class.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/company.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php"); diff --git a/htdocs/includes/modules/societe/mod_codeclient_elephant.php b/htdocs/core/modules/societe/mod_codeclient_elephant.php similarity index 98% rename from htdocs/includes/modules/societe/mod_codeclient_elephant.php rename to htdocs/core/modules/societe/mod_codeclient_elephant.php index cbb14945863..9f1728a594e 100644 --- a/htdocs/includes/modules/societe/mod_codeclient_elephant.php +++ b/htdocs/core/modules/societe/mod_codeclient_elephant.php @@ -20,12 +20,12 @@ */ /** - * \file htdocs/includes/modules/societe/mod_codeclient_elephant.php + * \file htdocs/core/modules/societe/mod_codeclient_elephant.php * \ingroup societe * \brief File of class to manage third party code with elephant rule */ -require_once(DOL_DOCUMENT_ROOT."/includes/modules/societe/modules_societe.class.php"); +require_once(DOL_DOCUMENT_ROOT."/core/modules/societe/modules_societe.class.php"); /** diff --git a/htdocs/includes/modules/societe/mod_codeclient_leopard.php b/htdocs/core/modules/societe/mod_codeclient_leopard.php similarity index 95% rename from htdocs/includes/modules/societe/mod_codeclient_leopard.php rename to htdocs/core/modules/societe/mod_codeclient_leopard.php index 8a425a929ad..40fd8752585 100644 --- a/htdocs/includes/modules/societe/mod_codeclient_leopard.php +++ b/htdocs/core/modules/societe/mod_codeclient_leopard.php @@ -18,12 +18,12 @@ */ /** - * \file htdocs/includes/modules/societe/mod_codeclient_leopard.php + * \file htdocs/core/modules/societe/mod_codeclient_leopard.php * \ingroup societe * \brief Fichier de la classe des gestion leopard des codes clients */ -require_once(DOL_DOCUMENT_ROOT."/includes/modules/societe/modules_societe.class.php"); +require_once(DOL_DOCUMENT_ROOT."/core/modules/societe/modules_societe.class.php"); /** diff --git a/htdocs/includes/modules/societe/mod_codeclient_monkey.php b/htdocs/core/modules/societe/mod_codeclient_monkey.php similarity index 97% rename from htdocs/includes/modules/societe/mod_codeclient_monkey.php rename to htdocs/core/modules/societe/mod_codeclient_monkey.php index 4dff34fb761..293b924be26 100644 --- a/htdocs/includes/modules/societe/mod_codeclient_monkey.php +++ b/htdocs/core/modules/societe/mod_codeclient_monkey.php @@ -18,12 +18,12 @@ */ /** - * \file htdocs/includes/modules/societe/mod_codeclient_monkey.php + * \file htdocs/core/modules/societe/mod_codeclient_monkey.php * \ingroup societe * \brief Fichier de la classe des gestion lion des codes clients */ -require_once(DOL_DOCUMENT_ROOT."/includes/modules/societe/modules_societe.class.php"); +require_once(DOL_DOCUMENT_ROOT."/core/modules/societe/modules_societe.class.php"); /** diff --git a/htdocs/includes/modules/societe/mod_codecompta_aquarium.php b/htdocs/core/modules/societe/mod_codecompta_aquarium.php similarity index 97% rename from htdocs/includes/modules/societe/mod_codecompta_aquarium.php rename to htdocs/core/modules/societe/mod_codecompta_aquarium.php index 3ca26693809..e4b94e0b75a 100644 --- a/htdocs/includes/modules/societe/mod_codecompta_aquarium.php +++ b/htdocs/core/modules/societe/mod_codecompta_aquarium.php @@ -19,11 +19,11 @@ */ /** - * \file htdocs/includes/modules/societe/mod_codecompta_aquarium.php + * \file htdocs/core/modules/societe/mod_codecompta_aquarium.php * \ingroup societe * \brief File of class to manage accountancy code of thirdparties with Panicum rules */ -require_once(DOL_DOCUMENT_ROOT."/includes/modules/societe/modules_societe.class.php"); +require_once(DOL_DOCUMENT_ROOT."/core/modules/societe/modules_societe.class.php"); /** diff --git a/htdocs/includes/modules/societe/mod_codecompta_panicum.php b/htdocs/core/modules/societe/mod_codecompta_panicum.php similarity index 93% rename from htdocs/includes/modules/societe/mod_codecompta_panicum.php rename to htdocs/core/modules/societe/mod_codecompta_panicum.php index a4c57c41dee..06ad0d17a78 100644 --- a/htdocs/includes/modules/societe/mod_codecompta_panicum.php +++ b/htdocs/core/modules/societe/mod_codecompta_panicum.php @@ -18,11 +18,11 @@ */ /** - * \file htdocs/includes/modules/societe/mod_codecompta_panicum.php + * \file htdocs/core/modules/societe/mod_codecompta_panicum.php * \ingroup societe * \brief File of class to manage accountancy code of thirdparties with Panicum rules */ -require_once(DOL_DOCUMENT_ROOT."/includes/modules/societe/modules_societe.class.php"); +require_once(DOL_DOCUMENT_ROOT."/core/modules/societe/modules_societe.class.php"); /** diff --git a/htdocs/includes/modules/societe/modules_societe.class.php b/htdocs/core/modules/societe/modules_societe.class.php similarity index 98% rename from htdocs/includes/modules/societe/modules_societe.class.php rename to htdocs/core/modules/societe/modules_societe.class.php index bc6c56af196..f674b4fb11f 100644 --- a/htdocs/includes/modules/societe/modules_societe.class.php +++ b/htdocs/core/modules/societe/modules_societe.class.php @@ -20,7 +20,7 @@ */ /** - * \file htdocs/includes/modules/societe/modules_societe.class.php + * \file htdocs/core/modules/societe/modules_societe.class.php * \ingroup societe * \brief File with parent class of submodules to manage numbering and document generation */ @@ -364,7 +364,7 @@ function thirdparty_doc_create($db, $id, $message, $modele, $outputlangs) global $conf,$langs; $langs->load("bills"); - $dir = DOL_DOCUMENT_ROOT . "/includes/modules/societe/doc"; + $dir = DOL_DOCUMENT_ROOT . "/core/modules/societe/doc"; $srctemplatepath=''; // Positionne modele sur le nom du modele a utiliser diff --git a/htdocs/includes/modules/supplier_invoice/modules_facturefournisseur.php b/htdocs/core/modules/supplier_invoice/modules_facturefournisseur.php similarity index 96% rename from htdocs/includes/modules/supplier_invoice/modules_facturefournisseur.php rename to htdocs/core/modules/supplier_invoice/modules_facturefournisseur.php index 32de721358f..aab5c6b2d9e 100755 --- a/htdocs/includes/modules/supplier_invoice/modules_facturefournisseur.php +++ b/htdocs/core/modules/supplier_invoice/modules_facturefournisseur.php @@ -17,7 +17,7 @@ */ /** - * \file htdocs/includes/modules/supplier_invoice/modules_facturefournisseur.php + * \file htdocs/core/modules/supplier_invoice/modules_facturefournisseur.php * \ingroup facture fourniseur * \brief File that contain parent class for supplier invoices models */ @@ -68,7 +68,7 @@ function supplier_invoice_pdf_create($db, $object, $model, $outputlangs) $langs->load("suppliers"); - $dir = DOL_DOCUMENT_ROOT."/includes/modules/supplier_invoice/pdf/"; + $dir = DOL_DOCUMENT_ROOT."/core/modules/supplier_invoice/pdf/"; // Positionne modele sur le nom du modele de invoice fournisseur a utiliser if (! dol_strlen($model)) diff --git a/htdocs/includes/modules/supplier_invoice/pdf/pdf_canelle.modules.php b/htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php similarity index 99% rename from htdocs/includes/modules/supplier_invoice/pdf/pdf_canelle.modules.php rename to htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php index e6c056dcb13..c80ad2266e4 100755 --- a/htdocs/includes/modules/supplier_invoice/pdf/pdf_canelle.modules.php +++ b/htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php @@ -18,12 +18,12 @@ */ /** - * \file htdocs/includes/modules/supplier_invoice/pdf/pdf_canelle.modules.php + * \file htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php * \ingroup fournisseur * \brief Class file to generate the supplier invoices with the canelle model */ -require_once(DOL_DOCUMENT_ROOT."/includes/modules/supplier_invoice/modules_facturefournisseur.php"); +require_once(DOL_DOCUMENT_ROOT."/core/modules/supplier_invoice/modules_facturefournisseur.php"); require_once(DOL_DOCUMENT_ROOT."/fourn/class/fournisseur.facture.class.php"); require_once(DOL_DOCUMENT_ROOT."/product/class/product.class.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/company.lib.php"); diff --git a/htdocs/includes/modules/supplier_order/mod_commande_fournisseur_muguet.php b/htdocs/core/modules/supplier_order/mod_commande_fournisseur_muguet.php similarity index 95% rename from htdocs/includes/modules/supplier_order/mod_commande_fournisseur_muguet.php rename to htdocs/core/modules/supplier_order/mod_commande_fournisseur_muguet.php index 61f3da21f35..ed6bc8e7f17 100644 --- a/htdocs/includes/modules/supplier_order/mod_commande_fournisseur_muguet.php +++ b/htdocs/core/modules/supplier_order/mod_commande_fournisseur_muguet.php @@ -18,12 +18,12 @@ */ /** - * \file htdocs/includes/modules/supplier_order/mod_commande_fournisseur_muguet.php + * \file htdocs/core/modules/supplier_order/mod_commande_fournisseur_muguet.php * \ingroup commande * \brief Fichier contenant la classe du modele de numerotation de reference de commande fournisseur Muguet */ -require_once(DOL_DOCUMENT_ROOT ."/includes/modules/supplier_order/modules_commandefournisseur.php"); +require_once(DOL_DOCUMENT_ROOT ."/core/modules/supplier_order/modules_commandefournisseur.php"); /** \class mod_commande_fournisseur_muguet diff --git a/htdocs/includes/modules/supplier_order/mod_commande_fournisseur_orchidee.php b/htdocs/core/modules/supplier_order/mod_commande_fournisseur_orchidee.php similarity index 95% rename from htdocs/includes/modules/supplier_order/mod_commande_fournisseur_orchidee.php rename to htdocs/core/modules/supplier_order/mod_commande_fournisseur_orchidee.php index 871e150224a..a8b0e1f0720 100644 --- a/htdocs/includes/modules/supplier_order/mod_commande_fournisseur_orchidee.php +++ b/htdocs/core/modules/supplier_order/mod_commande_fournisseur_orchidee.php @@ -19,12 +19,12 @@ */ /** - * \file htdocs/includes/modules/supplier_order/mod_commande_fournisseur_orchidee.php + * \file htdocs/core/modules/supplier_order/mod_commande_fournisseur_orchidee.php * \ingroup commande * \brief Fichier contenant la classe du modele de numerotation de reference de commande fournisseur Orchidee */ -require_once(DOL_DOCUMENT_ROOT ."/includes/modules/supplier_order/modules_commandefournisseur.php"); +require_once(DOL_DOCUMENT_ROOT ."/core/modules/supplier_order/modules_commandefournisseur.php"); /** diff --git a/htdocs/includes/modules/supplier_order/modules_commandefournisseur.php b/htdocs/core/modules/supplier_order/modules_commandefournisseur.php similarity index 98% rename from htdocs/includes/modules/supplier_order/modules_commandefournisseur.php rename to htdocs/core/modules/supplier_order/modules_commandefournisseur.php index 9d55e32c6ce..e7d06c4192a 100644 --- a/htdocs/includes/modules/supplier_order/modules_commandefournisseur.php +++ b/htdocs/core/modules/supplier_order/modules_commandefournisseur.php @@ -22,7 +22,7 @@ */ /** - * \file htdocs/includes/modules/supplier_order/modules_commandefournisseur.php + * \file htdocs/core/modules/supplier_order/modules_commandefournisseur.php * \ingroup commande * \brief File that contain parent class for supplier orders models * and parent class for supplier orders numbering models @@ -153,7 +153,7 @@ function supplier_order_pdf_create($db, $object, $model, $outputlangs, $hidedeta global $conf,$langs; $langs->load("suppliers"); - $dir = "/includes/modules/supplier_order/pdf/"; + $dir = "/core/modules/supplier_order/pdf/"; $srctemplatepath=''; $modelisok=0; $liste=array(); diff --git a/htdocs/includes/modules/supplier_order/pdf/pdf_muscadet.modules.php b/htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php similarity index 99% rename from htdocs/includes/modules/supplier_order/pdf/pdf_muscadet.modules.php rename to htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php index 46165333d00..625dbdee60c 100644 --- a/htdocs/includes/modules/supplier_order/pdf/pdf_muscadet.modules.php +++ b/htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php @@ -20,12 +20,12 @@ */ /** - * \file htdocs/includes/modules/supplier_order/pdf/pdf_muscadet.modules.php + * \file htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php * \ingroup fournisseur * \brief Fichier de la classe permettant de generer les commandes fournisseurs au modele Muscadet */ -require_once(DOL_DOCUMENT_ROOT."/includes/modules/supplier_order/modules_commandefournisseur.php"); +require_once(DOL_DOCUMENT_ROOT."/core/modules/supplier_order/modules_commandefournisseur.php"); require_once(DOL_DOCUMENT_ROOT."/fourn/class/fournisseur.commande.class.php"); require_once(DOL_DOCUMENT_ROOT."/product/class/product.class.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/company.lib.php"); diff --git a/htdocs/includes/triggers/README b/htdocs/core/triggers/README similarity index 88% rename from htdocs/includes/triggers/README rename to htdocs/core/triggers/README index a5e9bda9f17..b54c3809ab1 100644 --- a/htdocs/includes/triggers/README +++ b/htdocs/core/triggers/README @@ -6,7 +6,7 @@ Trigger file name syntax is: > interface_modModule_Mytrigger.php[-NORUN] where: -> modModule is part of module descriptor file name found in includes/modules +> modModule is part of module descriptor file name found in core/modules directory or value 'all' if not enabled by a particular module. > Mytrigger is name of the trigger. The PHP class inside the trigger file would be named InterfaceMytrigger. diff --git a/htdocs/includes/triggers/README-FR b/htdocs/core/triggers/README-FR similarity index 90% rename from htdocs/includes/triggers/README-FR rename to htdocs/core/triggers/README-FR index 10aecb080b7..b0522f1d086 100644 --- a/htdocs/includes/triggers/README-FR +++ b/htdocs/core/triggers/README-FR @@ -7,7 +7,7 @@ La syntaxe d'un fichier Trigger est: où: > modModule est la partie du nom du descripteur de module trouvé dans le - répertoire includes/modules pour lequel le trigger doit être. + répertoire core/modules pour lequel le trigger doit être. actif ou la valeur 'all' si ne doit pas être actif pour un module particulier. > Mytrigger est le nom du trigger. La classe PHP dans le fichier trigger diff --git a/htdocs/includes/triggers/interface_all_Demo.class.php-NORUN b/htdocs/core/triggers/interface_all_Demo.class.php-NORUN similarity index 99% rename from htdocs/includes/triggers/interface_all_Demo.class.php-NORUN rename to htdocs/core/triggers/interface_all_Demo.class.php-NORUN index 1a83196a930..0c79524f3da 100644 --- a/htdocs/includes/triggers/interface_all_Demo.class.php-NORUN +++ b/htdocs/core/triggers/interface_all_Demo.class.php-NORUN @@ -17,13 +17,13 @@ */ /** - * \file htdocs/includes/triggers/interface_all_Demo.class.php + * \file htdocs/core/triggers/interface_all_Demo.class.php * \ingroup core * \brief Fichier de demo de personalisation des actions du workflow * \remarks Son propre fichier d'actions peut etre cree par recopie de celui-ci: * - Le nom du fichier doit etre: interface_modMymodule_Mytrigger.class.php * ou: interface_all_Mytrigger.class.php - * - Le fichier doit rester stocke dans includes/triggers + * - Le fichier doit rester stocke dans core/triggers * - Le nom de la classe doit etre InterfaceMytrigger * - Le nom de la methode constructeur doit etre InterfaceMytrigger * - Le nom de la propriete name doit etre Mytrigger @@ -90,7 +90,7 @@ class InterfaceDemo /** * Function called when a Dolibarrr business event is done. - * All functions "run_trigger" are triggered if file is inside directory htdocs/includes/triggers + * All functions "run_trigger" are triggered if file is inside directory htdocs/core/triggers * @param action Code de l'evenement * @param object Objet concerne * @param user Objet user diff --git a/htdocs/includes/triggers/interface_all_Logevents.class.php b/htdocs/core/triggers/interface_all_Logevents.class.php similarity index 98% rename from htdocs/includes/triggers/interface_all_Logevents.class.php rename to htdocs/core/triggers/interface_all_Logevents.class.php index 1f78001cd64..bba2794b177 100644 --- a/htdocs/includes/triggers/interface_all_Logevents.class.php +++ b/htdocs/core/triggers/interface_all_Logevents.class.php @@ -17,7 +17,7 @@ */ /** - * \file htdocs/includes/triggers/interface_all_Logevents.class.php + * \file htdocs/core/triggers/interface_all_Logevents.class.php * \ingroup core * \brief Trigger file for */ @@ -87,7 +87,7 @@ class InterfaceLogevents /** * Function called when a Dolibarrr business event is done. - * All functions "run_trigger" are triggered if file is inside directory htdocs/includes/triggers + * All functions "run_trigger" are triggered if file is inside directory htdocs/core/triggers * @param action Code de l'evenement * @param object Objet concerne * @param user Objet user diff --git a/htdocs/includes/triggers/interface_modAgenda_ActionsAuto.class.php b/htdocs/core/triggers/interface_modAgenda_ActionsAuto.class.php similarity index 99% rename from htdocs/includes/triggers/interface_modAgenda_ActionsAuto.class.php rename to htdocs/core/triggers/interface_modAgenda_ActionsAuto.class.php index a3eb22bea44..2551fba0731 100644 --- a/htdocs/includes/triggers/interface_modAgenda_ActionsAuto.class.php +++ b/htdocs/core/triggers/interface_modAgenda_ActionsAuto.class.php @@ -18,7 +18,7 @@ */ /** - * \file htdocs/includes/triggers/interface_modAgenda_ActionsAuto.class.php + * \file htdocs/core/triggers/interface_modAgenda_ActionsAuto.class.php * \ingroup agenda * \brief Trigger file for agenda module */ @@ -88,7 +88,7 @@ class InterfaceActionsAuto /** * Function called when a Dolibarrr business event is done. - * All functions "run_trigger" are triggered if file is inside directory htdocs/includes/triggers + * All functions "run_trigger" are triggered if file is inside directory htdocs/core/triggers * * Following properties must be filled: * $object->actiontypecode (translation action code: AC_OTH, ...) diff --git a/htdocs/includes/triggers/interface_modLdap_Ldapsynchro.class.php b/htdocs/core/triggers/interface_modLdap_Ldapsynchro.class.php similarity index 99% rename from htdocs/includes/triggers/interface_modLdap_Ldapsynchro.class.php rename to htdocs/core/triggers/interface_modLdap_Ldapsynchro.class.php index 3c878206947..f8e22bf722d 100644 --- a/htdocs/includes/triggers/interface_modLdap_Ldapsynchro.class.php +++ b/htdocs/core/triggers/interface_modLdap_Ldapsynchro.class.php @@ -16,7 +16,7 @@ */ /** - * \file htdocs/includes/triggers/interface_modLdap_Ldapsynchro.class.php + * \file htdocs/core/triggers/interface_modLdap_Ldapsynchro.class.php * \ingroup core * \brief Fichier de gestion des triggers LDAP */ @@ -83,7 +83,7 @@ class InterfaceLdapsynchro /** * Function called when a Dolibarrr business event is done. - * All functions "run_trigger" are triggered if file is inside directory htdocs/includes/triggers + * All functions "run_trigger" are triggered if file is inside directory htdocs/core/triggers * @param action Event code (COMPANY_CREATE, PROPAL_VALIDATE, ...) * @param object Object action is done on * @param user Object user diff --git a/htdocs/includes/triggers/interface_modNotification_Notification.class.php b/htdocs/core/triggers/interface_modNotification_Notification.class.php similarity index 98% rename from htdocs/includes/triggers/interface_modNotification_Notification.class.php rename to htdocs/core/triggers/interface_modNotification_Notification.class.php index 2e0687e3cf3..eff1ded2345 100644 --- a/htdocs/includes/triggers/interface_modNotification_Notification.class.php +++ b/htdocs/core/triggers/interface_modNotification_Notification.class.php @@ -17,7 +17,7 @@ */ /** - * \file htdocs/includes/triggers/interface_modNotification_Notification.class.php + * \file htdocs/core/triggers/interface_modNotification_Notification.class.php * \ingroup notification * \brief File of class of triggers for notification module */ @@ -83,7 +83,7 @@ class InterfaceNotification /** * Function called when a Dolibarrr business event is done. - * All functions "run_trigger" are triggered if file is inside directory htdocs/includes/triggers + * All functions "run_trigger" are triggered if file is inside directory htdocs/core/triggers * @param action Event code (COMPANY_CREATE, PROPAL_VALIDATE, ...) * @param object Object action is done on * @param user Object user diff --git a/htdocs/includes/triggers/interface_modPaypal_PaypalWorkflow.class.php b/htdocs/core/triggers/interface_modPaypal_PaypalWorkflow.class.php similarity index 97% rename from htdocs/includes/triggers/interface_modPaypal_PaypalWorkflow.class.php rename to htdocs/core/triggers/interface_modPaypal_PaypalWorkflow.class.php index ec458302c71..22a814989c0 100644 --- a/htdocs/includes/triggers/interface_modPaypal_PaypalWorkflow.class.php +++ b/htdocs/core/triggers/interface_modPaypal_PaypalWorkflow.class.php @@ -16,7 +16,7 @@ */ /** - * \file /htdocs/includes/triggers/interface_modPaypal_PaypalWorkflow.class.php + * \file /htdocs/core/triggers/interface_modPaypal_PaypalWorkflow.class.php * \ingroup paypal * \brief Trigger file for paypal workflow */ @@ -82,7 +82,7 @@ class InterfacePaypalWorkflow /** * \brief Fonction appelee lors du declenchement d'un evenement Dolibarr. - * D'autres fonctions run_trigger peuvent etre presentes dans includes/triggers + * D'autres fonctions run_trigger peuvent etre presentes dans core/triggers * \param action Code de l'evenement * \param object Objet concerne * \param user Objet user diff --git a/htdocs/includes/triggers/interface_modWorkflow_WorkflowManager.class.php b/htdocs/core/triggers/interface_modWorkflow_WorkflowManager.class.php similarity index 97% rename from htdocs/includes/triggers/interface_modWorkflow_WorkflowManager.class.php rename to htdocs/core/triggers/interface_modWorkflow_WorkflowManager.class.php index 374096d4fb0..a123bd63842 100755 --- a/htdocs/includes/triggers/interface_modWorkflow_WorkflowManager.class.php +++ b/htdocs/core/triggers/interface_modWorkflow_WorkflowManager.class.php @@ -17,7 +17,7 @@ */ /** - * \file htdocs/includes/triggers/interface_modWorkflow_WorkflowManager.class.php + * \file htdocs/core/triggers/interface_modWorkflow_WorkflowManager.class.php * \ingroup core * \brief Trigger file for workflows */ @@ -84,7 +84,7 @@ class InterfaceWorkflowManager /** * Function called when a Dolibarrr business event is done. - * All functions "run_trigger" are triggered if file is inside directory htdocs/includes/triggers + * All functions "run_trigger" are triggered if file is inside directory htdocs/core/triggers * * @param action Event code (COMPANY_CREATE, PROPAL_VALIDATE, ...) * @param object Object action is done on diff --git a/htdocs/expedition/class/expedition.class.php b/htdocs/expedition/class/expedition.class.php index 30a50678796..e7e74f33063 100644 --- a/htdocs/expedition/class/expedition.class.php +++ b/htdocs/expedition/class/expedition.class.php @@ -101,7 +101,7 @@ class Expedition extends CommonObject global $db, $langs, $conf; $langs->load("sendings"); - $dir = DOL_DOCUMENT_ROOT . "/includes/modules/expedition"; + $dir = DOL_DOCUMENT_ROOT . "/core/modules/expedition"; if (empty($conf->global->EXPEDITION_ADDON_NUMBER)) { @@ -1151,9 +1151,9 @@ class Expedition extends CommonObject $classname = "methode_expedition_".strtolower($code); $url=''; - if (file_exists(DOL_DOCUMENT_ROOT."/includes/modules/expedition/methode_expedition_".strtolower($code).".modules.php") && ! empty($this->tracking_number)) + if (file_exists(DOL_DOCUMENT_ROOT."/core/modules/expedition/methode_expedition_".strtolower($code).".modules.php") && ! empty($this->tracking_number)) { - require_once(DOL_DOCUMENT_ROOT."/includes/modules/expedition/methode_expedition_".strtolower($code).".modules.php"); + require_once(DOL_DOCUMENT_ROOT."/core/modules/expedition/methode_expedition_".strtolower($code).".modules.php"); $shipmethod = new $classname(); $url = $shipmethod->provider_url_status($this->tracking_number); } diff --git a/htdocs/expedition/fiche.php b/htdocs/expedition/fiche.php index 19bf39dcb84..5fba4f64bb9 100644 --- a/htdocs/expedition/fiche.php +++ b/htdocs/expedition/fiche.php @@ -29,7 +29,7 @@ require("../main.inc.php"); 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/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."/core/lib/product.lib.php"); @@ -252,7 +252,7 @@ if ($action == 'settrackingnumber' || $action == 'settrackingurl' */ if ($action == 'builddoc') // En get ou en post { - require_once(DOL_DOCUMENT_ROOT."/includes/modules/expedition/pdf/ModelePdfExpedition.class.php"); + require_once(DOL_DOCUMENT_ROOT."/core/modules/expedition/pdf/ModelePdfExpedition.class.php"); // Sauvegarde le dernier modele choisi pour generer un document $shipment = new Expedition($db); diff --git a/htdocs/exports/class/export.class.php b/htdocs/exports/class/export.class.php index e062ccb67e3..c5ddf7eb96e 100644 --- a/htdocs/exports/class/export.class.php +++ b/htdocs/exports/class/export.class.php @@ -76,7 +76,7 @@ class Export foreach ($conf->file->dol_document_root as $type => $dirroot) { - $modulesdir[] = $dirroot . "/includes/modules/"; + $modulesdir[] = $dirroot . "/core/modules/"; if ($type == 'alt') { @@ -87,9 +87,9 @@ class Export { if (is_dir($dirroot.'/'.$file) && substr($file, 0, 1) <> '.' && substr($file, 0, 3) <> 'CVS' && $file != 'includes') { - if (is_dir($dirroot . '/' . $file . '/includes/modules/')) + if (is_dir($dirroot . '/' . $file . '/core/modules/')) { - $modulesdir[] = $dirroot . '/' . $file . '/includes/modules/'; + $modulesdir[] = $dirroot . '/' . $file . '/core/modules/'; } } } @@ -263,7 +263,7 @@ class Export } // Creation de la classe d'export du model ExportXXX - $dir = DOL_DOCUMENT_ROOT . "/includes/modules/export/"; + $dir = DOL_DOCUMENT_ROOT . "/core/modules/export/"; $file = "export_".$model.".modules.php"; $classname = "Export".$model; require_once($dir.$file); diff --git a/htdocs/exports/export.php b/htdocs/exports/export.php index 380854ddbf3..f01e40c607d 100644 --- a/htdocs/exports/export.php +++ b/htdocs/exports/export.php @@ -26,7 +26,7 @@ require_once("../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."/exports/class/export.class.php"); -require_once(DOL_DOCUMENT_ROOT.'/includes/modules/export/modules_export.php'); +require_once(DOL_DOCUMENT_ROOT.'/core/modules/export/modules_export.php'); $langs->load("exports"); diff --git a/htdocs/exports/index.php b/htdocs/exports/index.php index de92fbcdb11..264c62e2af9 100644 --- a/htdocs/exports/index.php +++ b/htdocs/exports/index.php @@ -64,7 +64,7 @@ print ''; print ''; print ''; -include_once(DOL_DOCUMENT_ROOT.'/includes/modules/export/modules_export.php'); +include_once(DOL_DOCUMENT_ROOT.'/core/modules/export/modules_export.php'); $model=new ModeleExports(); $liste=$model->liste_modeles($db); // This is not a static method for exports because method load non static properties diff --git a/htdocs/fichinter/class/fichinter.class.php b/htdocs/fichinter/class/fichinter.class.php index cac377c7b35..1a3afead912 100644 --- a/htdocs/fichinter/class/fichinter.class.php +++ b/htdocs/fichinter/class/fichinter.class.php @@ -462,7 +462,7 @@ class Fichinter extends CommonObject global $conf, $db, $langs; $langs->load("interventions"); - $dir = DOL_DOCUMENT_ROOT . "/includes/modules/fichinter/"; + $dir = DOL_DOCUMENT_ROOT . "/core/modules/fichinter/"; if (! empty($conf->global->FICHEINTER_ADDON)) { diff --git a/htdocs/fichinter/fiche.php b/htdocs/fichinter/fiche.php index 314b810cf72..40c66520a31 100644 --- a/htdocs/fichinter/fiche.php +++ b/htdocs/fichinter/fiche.php @@ -27,7 +27,7 @@ require("../main.inc.php"); require_once(DOL_DOCUMENT_ROOT."/core/class/html.formfile.class.php"); require_once(DOL_DOCUMENT_ROOT."/fichinter/class/fichinter.class.php"); -require_once(DOL_DOCUMENT_ROOT."/includes/modules/fichinter/modules_fichinter.php"); +require_once(DOL_DOCUMENT_ROOT."/core/modules/fichinter/modules_fichinter.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) @@ -35,9 +35,9 @@ if ($conf->projet->enabled) 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")) +if (! empty($conf->global->FICHEINTER_ADDON) && is_readable(DOL_DOCUMENT_ROOT ."/core/modules/fichinter/mod_".$conf->global->FICHEINTER_ADDON.".php")) { - require_once(DOL_DOCUMENT_ROOT ."/includes/modules/fichinter/mod_".$conf->global->FICHEINTER_ADDON.".php"); + require_once(DOL_DOCUMENT_ROOT ."/core/modules/fichinter/mod_".$conf->global->FICHEINTER_ADDON.".php"); } $langs->load("companies"); diff --git a/htdocs/fourn/class/fournisseur.commande.class.php b/htdocs/fourn/class/fournisseur.commande.class.php index 51f2ef66671..9c306ea7c86 100644 --- a/htdocs/fourn/class/fournisseur.commande.class.php +++ b/htdocs/fourn/class/fournisseur.commande.class.php @@ -569,7 +569,7 @@ class CommandeFournisseur extends Commande global $db, $langs, $conf; $langs->load("orders"); - $dir = DOL_DOCUMENT_ROOT .'/includes/modules/supplier_order/'; + $dir = DOL_DOCUMENT_ROOT .'/core/modules/supplier_order/'; if (! empty($conf->global->COMMANDE_SUPPLIER_ADDON)) { diff --git a/htdocs/fourn/commande/dispatch.php b/htdocs/fourn/commande/dispatch.php index e569912f3bb..32474ba8af8 100644 --- a/htdocs/fourn/commande/dispatch.php +++ b/htdocs/fourn/commande/dispatch.php @@ -27,7 +27,7 @@ */ require("../../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT.'/includes/modules/supplier_order/modules_commandefournisseur.php'); +require_once(DOL_DOCUMENT_ROOT.'/core/modules/supplier_order/modules_commandefournisseur.php'); require_once(DOL_DOCUMENT_ROOT."/product/stock/class/entrepot.class.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/fourn.lib.php"); require_once(DOL_DOCUMENT_ROOT."/fourn/class/fournisseur.commande.class.php"); diff --git a/htdocs/fourn/commande/fiche.php b/htdocs/fourn/commande/fiche.php index 3316766f8d5..a29212fa4c7 100644 --- a/htdocs/fourn/commande/fiche.php +++ b/htdocs/fourn/commande/fiche.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.formorder.class.php"); -require_once(DOL_DOCUMENT_ROOT.'/includes/modules/supplier_order/modules_commandefournisseur.php'); +require_once(DOL_DOCUMENT_ROOT.'/core/modules/supplier_order/modules_commandefournisseur.php'); 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"; diff --git a/htdocs/fourn/facture/fiche.php b/htdocs/fourn/facture/fiche.php index 7e21975f9c9..daf4c2ce3a9 100644 --- a/htdocs/fourn/facture/fiche.php +++ b/htdocs/fourn/facture/fiche.php @@ -29,7 +29,7 @@ require("../../main.inc.php"); require_once(DOL_DOCUMENT_ROOT."/core/class/html.formfile.class.php"); 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.'/core/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.'/core/lib/fourn.lib.php'); diff --git a/htdocs/imports/class/import.class.php b/htdocs/imports/class/import.class.php index af0ae64074a..fa9fdf20df7 100644 --- a/htdocs/imports/class/import.class.php +++ b/htdocs/imports/class/import.class.php @@ -67,10 +67,10 @@ class Import $var=true; $i=0; - //$dir=DOL_DOCUMENT_ROOT."/includes/modules"; + //$dir=DOL_DOCUMENT_ROOT."/core/modules"; foreach($conf->file->dol_document_root as $dirroot) { - $dir = $dirroot.'/includes/modules'; + $dir = $dirroot.'/core/modules'; // Search available exports $handle=@opendir(dol_osencode($dir)); @@ -182,7 +182,7 @@ class Import dol_syslog(get_class($this)."::build_example_file ".$model); // Creation de la classe d'import du model Import_XXX - $dir = DOL_DOCUMENT_ROOT . "/includes/modules/import/"; + $dir = DOL_DOCUMENT_ROOT . "/core/modules/import/"; $file = "import_".$model.".modules.php"; $classname = "Import".$model; require_once($dir.$file); diff --git a/htdocs/imports/emptyexample.php b/htdocs/imports/emptyexample.php index a730fd23a5d..c65791568da 100644 --- a/htdocs/imports/emptyexample.php +++ b/htdocs/imports/emptyexample.php @@ -35,7 +35,7 @@ function llxFooter() { print ''; } require("../main.inc.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php"); require_once(DOL_DOCUMENT_ROOT."/imports/class/import.class.php"); -require_once(DOL_DOCUMENT_ROOT.'/includes/modules/import/modules_import.php'); +require_once(DOL_DOCUMENT_ROOT.'/core/modules/import/modules_import.php'); $langs->load("exports"); diff --git a/htdocs/imports/import.php b/htdocs/imports/import.php index b9125754200..1f14a967de8 100644 --- a/htdocs/imports/import.php +++ b/htdocs/imports/import.php @@ -26,7 +26,7 @@ require_once("../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."/imports/class/import.class.php"); -require_once(DOL_DOCUMENT_ROOT.'/includes/modules/import/modules_import.php'); +require_once(DOL_DOCUMENT_ROOT.'/core/modules/import/modules_import.php'); require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/import.lib.php"); @@ -574,7 +574,7 @@ if ($step == 4 && $datatoimport) $liste=$objmodelimport->liste_modeles($db); // Create classe to use for import - $dir = DOL_DOCUMENT_ROOT . "/includes/modules/import/"; + $dir = DOL_DOCUMENT_ROOT . "/core/modules/import/"; $file = "import_".$model.".modules.php"; $classname = "Import".ucfirst($model); require_once($dir.$file); @@ -1026,7 +1026,7 @@ if ($step == 5 && $datatoimport) $liste=$objmodelimport->liste_modeles($db); // Create classe to use for import - $dir = DOL_DOCUMENT_ROOT . "/includes/modules/import/"; + $dir = DOL_DOCUMENT_ROOT . "/core/modules/import/"; $file = "import_".$model.".modules.php"; $classname = "Import".ucfirst($model); require_once($dir.$file); @@ -1353,7 +1353,7 @@ if ($step == 6 && $datatoimport) // Create classe to use for import - $dir = DOL_DOCUMENT_ROOT . "/includes/modules/import/"; + $dir = DOL_DOCUMENT_ROOT . "/core/modules/import/"; $file = "import_".$model.".modules.php"; $classname = "Import".ucfirst($model); require_once($dir.$file); diff --git a/htdocs/imports/index.php b/htdocs/imports/index.php index d5f2396b4e4..d24a8eb1854 100644 --- a/htdocs/imports/index.php +++ b/htdocs/imports/index.php @@ -61,7 +61,7 @@ print ''; print ''; print ''; -include_once(DOL_DOCUMENT_ROOT.'/includes/modules/import/modules_import.php'); +include_once(DOL_DOCUMENT_ROOT.'/core/modules/import/modules_import.php'); $model=new ModeleImports(); $liste=$model->liste_modeles($db); diff --git a/htdocs/index.php b/htdocs/index.php index bd71f270ab4..ca2b6f00896 100644 --- a/htdocs/index.php +++ b/htdocs/index.php @@ -57,11 +57,11 @@ if (preg_match('/^smartphone/',$conf->smart_menu) && isset($conf->browser->phone $limitmenuto=1; // A virer // Load the smartphone menu manager - $result=@include_once(DOL_DOCUMENT_ROOT ."/includes/menus/smartphone/".$conf->smart_menu); + $result=@include_once(DOL_DOCUMENT_ROOT ."/core/menus/smartphone/".$conf->smart_menu); if (! $result) // If failed to include, we try with standard { $conf->smart_menu='smartphone_backoffice.php'; - include_once(DOL_DOCUMENT_ROOT ."/includes/menus/smartphone/".$conf->smart_menu); + include_once(DOL_DOCUMENT_ROOT ."/core/menus/smartphone/".$conf->smart_menu); } $menusmart = new MenuSmart($db); diff --git a/htdocs/install/etape5.php b/htdocs/install/etape5.php index 539ad68e0bd..9b236c8026d 100644 --- a/htdocs/install/etape5.php +++ b/htdocs/install/etape5.php @@ -146,8 +146,8 @@ if ($action == "set" || preg_match('/upgrade/i',$action)) // Active module user $modName='modUser'; $file = $modName . ".class.php"; - dolibarr_install_syslog('install/etape5.php Load module user '.DOL_DOCUMENT_ROOT ."/includes/modules/".$file, LOG_INFO); - include_once(DOL_DOCUMENT_ROOT ."/includes/modules/".$file); + dolibarr_install_syslog('install/etape5.php Load module user '.DOL_DOCUMENT_ROOT ."/core/modules/".$file, LOG_INFO); + include_once(DOL_DOCUMENT_ROOT ."/core/modules/".$file); $objMod = new $modName($db); $result=$objMod->init(); if (! $result) print 'ERROR in activating module file='.$file; @@ -227,7 +227,7 @@ if ($action == "set" || preg_match('/upgrade/i',$action)) $file=$modtoactivatenew.'.class.php'; dolibarr_install_syslog('install/etape5.php Activate module file='.$file); - $res=dol_include_once("/includes/modules/".$file); + $res=dol_include_once("/core/modules/".$file); $res=Activate($modtoactivatenew,1); if (! $result) print 'ERROR in activating module file='.$file; diff --git a/htdocs/install/upgrade2.php b/htdocs/install/upgrade2.php index ddb3ff5bb41..666824d98f7 100644 --- a/htdocs/install/upgrade2.php +++ b/htdocs/install/upgrade2.php @@ -1728,7 +1728,7 @@ function migrate_modeles($db,$langs,$conf) if (! empty($conf->facture->enabled)) { - include_once(DOL_DOCUMENT_ROOT.'/includes/modules/facture/modules_facture.php'); + include_once(DOL_DOCUMENT_ROOT.'/core/modules/facture/modules_facture.php'); $modellist=ModelePDFFactures::liste_modeles($db); if (count($modellist)==0) { @@ -1741,7 +1741,7 @@ function migrate_modeles($db,$langs,$conf) if (! empty($conf->commande->enabled)) { - include_once(DOL_DOCUMENT_ROOT.'/includes/modules/commande/modules_commande.php'); + include_once(DOL_DOCUMENT_ROOT.'/core/modules/commande/modules_commande.php'); $modellist=ModelePDFCommandes::liste_modeles($db); if (count($modellist)==0) { @@ -1754,7 +1754,7 @@ function migrate_modeles($db,$langs,$conf) if (! empty($conf->expedition->enabled)) { - include_once(DOL_DOCUMENT_ROOT.'/includes/modules/expedition/pdf/ModelePdfExpedition.class.php'); + include_once(DOL_DOCUMENT_ROOT.'/core/modules/expedition/pdf/ModelePdfExpedition.class.php'); $modellist=ModelePDFExpedition::liste_modeles($db); if (count($modellist)==0) { @@ -3191,26 +3191,26 @@ function migrate_delete_old_files($db,$langs,$conf) // List of files to delete $filetodeletearray=array( - DOL_DOCUMENT_ROOT.'/includes/triggers/interface_demo.class.php', - DOL_DOCUMENT_ROOT.'/includes/menus/barre_left/default.php', - DOL_DOCUMENT_ROOT.'/includes/menus/barre_top/default.php', - DOL_DOCUMENT_ROOT.'/includes/modules/modComptabiliteExpert.class.php', - DOL_DOCUMENT_ROOT.'/includes/modules/modCommercial.class.php', - DOL_DOCUMENT_ROOT.'/includes/modules/modProduit.class.php', + DOL_DOCUMENT_ROOT.'/core/triggers/interface_demo.class.php', + DOL_DOCUMENT_ROOT.'/core/menus/barre_left/default.php', + DOL_DOCUMENT_ROOT.'/core/menus/barre_top/default.php', + DOL_DOCUMENT_ROOT.'/core/modules/modComptabiliteExpert.class.php', + DOL_DOCUMENT_ROOT.'/core/modules/modCommercial.class.php', + DOL_DOCUMENT_ROOT.'/core/modules/modProduit.class.php', DOL_DOCUMENT_ROOT.'/phenix/inc/triggers/interface_modPhenix_Phenixsynchro.class.php', DOL_DOCUMENT_ROOT.'/webcalendar/inc/triggers/interface_modWebcalendar_webcalsynchro.class.php', - DOL_DOCUMENT_ROOT.'/includes/triggers/interface_modWebcalendar_Webcalsynchro.class.php', - DOL_DOCUMENT_ROOT.'/includes/triggers/interface_modCommande_Ecotax.class.php', - DOL_DOCUMENT_ROOT.'/includes/triggers/interface_modCommande_fraisport.class.php', - DOL_DOCUMENT_ROOT.'/includes/triggers/interface_modPropale_PropalWorkflow.class.php', - DOL_DOCUMENT_ROOT.'/includes/menus/smartphone/iphone.lib.php', - DOL_DOCUMENT_ROOT.'/includes/menus/smartphone/iphone_backoffice.php', - DOL_DOCUMENT_ROOT.'/includes/menus/smartphone/iphone_frontoffice.php', - DOL_DOCUMENT_ROOT.'/includes/modules/mailings/dolibarr_services_expired.modules.php', - DOL_DOCUMENT_ROOT.'/includes/modules/mailings/poire.modules.php', - DOL_DOCUMENT_ROOT.'/includes/modules/mailings/kiwi.modules.php', - DOL_DOCUMENT_ROOT.'/includes/modules/facture/pdf_crabe.modules.php', - DOL_DOCUMENT_ROOT.'/includes/modules/facture/pdf_oursin.modules.php' + DOL_DOCUMENT_ROOT.'/core/triggers/interface_modWebcalendar_Webcalsynchro.class.php', + DOL_DOCUMENT_ROOT.'/core/triggers/interface_modCommande_Ecotax.class.php', + DOL_DOCUMENT_ROOT.'/core/triggers/interface_modCommande_fraisport.class.php', + DOL_DOCUMENT_ROOT.'/core/triggers/interface_modPropale_PropalWorkflow.class.php', + DOL_DOCUMENT_ROOT.'/core/menus/smartphone/iphone.lib.php', + DOL_DOCUMENT_ROOT.'/core/menus/smartphone/iphone_backoffice.php', + DOL_DOCUMENT_ROOT.'/core/menus/smartphone/iphone_frontoffice.php', + DOL_DOCUMENT_ROOT.'/core/modules/mailings/dolibarr_services_expired.modules.php', + DOL_DOCUMENT_ROOT.'/core/modules/mailings/poire.modules.php', + DOL_DOCUMENT_ROOT.'/core/modules/mailings/kiwi.modules.php', + DOL_DOCUMENT_ROOT.'/core/modules/facture/pdf_crabe.modules.php', + DOL_DOCUMENT_ROOT.'/core/modules/facture/pdf_oursin.modules.php' ); foreach ($filetodeletearray as $filetodelete) @@ -3251,8 +3251,8 @@ function migrate_delete_old_dir($db,$langs,$conf) // List of files to delete $filetodeletearray=array( - DOL_DOCUMENT_ROOT.'/includes/modules/facture/terre', - DOL_DOCUMENT_ROOT.'/includes/modules/facture/mercure' + DOL_DOCUMENT_ROOT.'/core/modules/facture/terre', + DOL_DOCUMENT_ROOT.'/core/modules/facture/mercure' ); foreach ($filetodeletearray as $filetodelete) @@ -3290,7 +3290,7 @@ function migrate_reload_modules($db,$langs,$conf) if (! empty($conf->global->MAIN_MODULE_AGENDA)) { dolibarr_install_syslog("upgrade2::migrate_reload_modules Reactivate module Agenda"); - $res=@include_once(DOL_DOCUMENT_ROOT.'/includes/modules/modAgenda.class.php'); + $res=@include_once(DOL_DOCUMENT_ROOT.'/core/modules/modAgenda.class.php'); if ($res) { $mod=new modAgenda($db); $mod->remove('noboxes'); @@ -3300,7 +3300,7 @@ function migrate_reload_modules($db,$langs,$conf) if (! empty($conf->global->MAIN_MODULE_PHENIX)) { dolibarr_install_syslog("upgrade2::migrate_reload_modules Reactivate module Phenix"); - $res=@include_once(DOL_DOCUMENT_ROOT.'/includes/modules/modPhenix.class.php'); + $res=@include_once(DOL_DOCUMENT_ROOT.'/core/modules/modPhenix.class.php'); if ($res) { $mod=new modPhenix($db); $mod->remove('noboxes'); @@ -3310,7 +3310,7 @@ function migrate_reload_modules($db,$langs,$conf) if (! empty($conf->global->MAIN_MODULE_WEBCALENDAR)) { dolibarr_install_syslog("upgrade2::migrate_reload_modules Reactivate module Webcalendar"); - $res=@include_once(DOL_DOCUMENT_ROOT.'/includes/modules/modWebcalendar.class.php'); + $res=@include_once(DOL_DOCUMENT_ROOT.'/core/modules/modWebcalendar.class.php'); if ($res) { $mod=new modWebcalendar($db); $mod->remove('noboxes'); @@ -3320,7 +3320,7 @@ function migrate_reload_modules($db,$langs,$conf) if (! empty($conf->global->MAIN_MODULE_MANTIS)) { dolibarr_install_syslog("upgrade2::migrate_reload_modules Reactivate module Mantis"); - $res=@include_once(DOL_DOCUMENT_ROOT.'/includes/modules/modMantis.class.php'); + $res=@include_once(DOL_DOCUMENT_ROOT.'/core/modules/modMantis.class.php'); if ($res) { $mod=new modMantis($db); $mod->remove('noboxes'); @@ -3330,7 +3330,7 @@ function migrate_reload_modules($db,$langs,$conf) if (! empty($conf->global->MAIN_MODULE_SOCIETE)) { dolibarr_install_syslog("upgrade2::migrate_reload_modules Reactivate module Societe"); - $res=@include_once(DOL_DOCUMENT_ROOT.'/includes/modules/modSociete.class.php'); + $res=@include_once(DOL_DOCUMENT_ROOT.'/core/modules/modSociete.class.php'); if ($res) { $mod=new modSociete($db); $mod->remove('noboxes'); @@ -3340,7 +3340,7 @@ function migrate_reload_modules($db,$langs,$conf) if (! empty($conf->global->MAIN_MODULE_PRODUIT)) // Permission has changed into 2.7 { dolibarr_install_syslog("upgrade2::migrate_reload_modules Reactivate module Produit"); - $res=@include_once(DOL_DOCUMENT_ROOT.'/includes/modules/modProduct.class.php'); + $res=@include_once(DOL_DOCUMENT_ROOT.'/core/modules/modProduct.class.php'); if ($res) { $mod=new modProduct($db); //$mod->remove('noboxes'); @@ -3351,7 +3351,7 @@ function migrate_reload_modules($db,$langs,$conf) { dolibarr_install_syslog("upgrade2::migrate_reload_modules Reactivate module Service"); if ($res) { - $res=@include_once(DOL_DOCUMENT_ROOT.'/includes/modules/modService.class.php'); + $res=@include_once(DOL_DOCUMENT_ROOT.'/core/modules/modService.class.php'); $mod=new modService($db); //$mod->remove('noboxes'); $mod->init(); @@ -3361,7 +3361,7 @@ function migrate_reload_modules($db,$langs,$conf) { dolibarr_install_syslog("upgrade2::migrate_reload_modules Reactivate module Commande"); if ($res) { - $res=@include_once(DOL_DOCUMENT_ROOT.'/includes/modules/modCommande.class.php'); + $res=@include_once(DOL_DOCUMENT_ROOT.'/core/modules/modCommande.class.php'); $mod=new modCommande($db); //$mod->remove('noboxes'); $mod->init(); @@ -3371,7 +3371,7 @@ function migrate_reload_modules($db,$langs,$conf) { dolibarr_install_syslog("upgrade2::migrate_reload_modules Reactivate module Facture"); if ($res) { - $res=@include_once(DOL_DOCUMENT_ROOT.'/includes/modules/modFacture.class.php'); + $res=@include_once(DOL_DOCUMENT_ROOT.'/core/modules/modFacture.class.php'); $mod=new modFacture($db); //$mod->remove('noboxes'); $mod->init(); @@ -3380,7 +3380,7 @@ function migrate_reload_modules($db,$langs,$conf) if (! empty($conf->global->MAIN_MODULE_FOURNISSEUR)) // Permission has changed into 2.9 { dolibarr_install_syslog("upgrade2::migrate_reload_modules Reactivate module Fournisseur"); - $res=@include_once(DOL_DOCUMENT_ROOT.'/includes/modules/modFournisseur.class.php'); + $res=@include_once(DOL_DOCUMENT_ROOT.'/core/modules/modFournisseur.class.php'); if ($res) { $mod=new modFournisseur($db); //$mod->remove('noboxes'); @@ -3391,7 +3391,7 @@ function migrate_reload_modules($db,$langs,$conf) if (! empty($conf->global->MAIN_MODULE_USER)) // Permission has changed into 3.0 { dolibarr_install_syslog("upgrade2::migrate_reload_modules Reactivate module User"); - $res=@include_once(DOL_DOCUMENT_ROOT.'/includes/modules/modUser.class.php'); + $res=@include_once(DOL_DOCUMENT_ROOT.'/core/modules/modUser.class.php'); if ($res) { $mod=new modUser($db); //$mod->remove('noboxes'); // We need to remove because id of module has changed @@ -3401,7 +3401,7 @@ function migrate_reload_modules($db,$langs,$conf) if (! empty($conf->global->MAIN_MODULE_DEPLACEMENT)) // Permission has changed into 3.0 { dolibarr_install_syslog("upgrade2::migrate_reload_modules Reactivate module Deplacement"); - $res=@include_once(DOL_DOCUMENT_ROOT.'/includes/modules/modDeplacement.class.php'); + $res=@include_once(DOL_DOCUMENT_ROOT.'/core/modules/modDeplacement.class.php'); if ($res) { $mod=new modDeplacement($db); //$mod->remove('noboxes'); // We need to remove because a permission id has been removed @@ -3411,7 +3411,7 @@ function migrate_reload_modules($db,$langs,$conf) if (! empty($conf->global->MAIN_MODULE_DON)) // Permission has changed into 3.0 { dolibarr_install_syslog("upgrade2::migrate_reload_modules Reactivate module Don"); - $res=@include_once(DOL_DOCUMENT_ROOT.'/includes/modules/modDon.class.php'); + $res=@include_once(DOL_DOCUMENT_ROOT.'/core/modules/modDon.class.php'); if ($res) { $mod=new modDon($db); //$mod->remove('noboxes'); // We need to remove because a permission id has been removed @@ -3422,7 +3422,7 @@ function migrate_reload_modules($db,$langs,$conf) { dolibarr_install_syslog("upgrade2::migrate_reload_modules Reactivate module ECM"); if ($res) { - $res=@include_once(DOL_DOCUMENT_ROOT.'/includes/modules/modECM.class.php'); + $res=@include_once(DOL_DOCUMENT_ROOT.'/core/modules/modECM.class.php'); $mod=new modECM($db); $mod->remove('noboxes'); // We need to remove because a permission id has been removed $mod->init(); @@ -3431,7 +3431,7 @@ function migrate_reload_modules($db,$langs,$conf) if (! empty($conf->global->MAIN_MODULE_PAYBOX)) // Permission has changed into 3.0 { dolibarr_install_syslog("upgrade2::migrate_reload_modules Reactivate module Paybox"); - $res=@include_once(DOL_DOCUMENT_ROOT.'/includes/modules/modPaybox.class.php'); + $res=@include_once(DOL_DOCUMENT_ROOT.'/core/modules/modPaybox.class.php'); if ($res) { $mod=new modPaybox($db); $mod->remove('noboxes'); // We need to remove because id of module has changed @@ -3487,7 +3487,7 @@ function migrate_reload_menu($db,$langs,$conf,$versionto) print ''.$langs->trans('Upgrade').': '.$langs->trans('MenuHandler')." ".$key."
\n"; // Load sql ini_menu_handler.sql file - $dir = DOL_DOCUMENT_ROOT."/includes/menus/"; + $dir = DOL_DOCUMENT_ROOT."/core/menus/"; $file='init_menu_'.$key.'.sql'; if (file_exists($dir.$file)) { diff --git a/htdocs/langs/ca_ES/admin.lang b/htdocs/langs/ca_ES/admin.lang index 56d3ab17c99..678c486fdd5 100644 --- a/htdocs/langs/ca_ES/admin.lang +++ b/htdocs/langs/ca_ES/admin.lang @@ -807,7 +807,7 @@ ToActivateModule=Per activar els mòduls, aneu a l'àrea de Configuració (Inici SessionTimeOut=Time out de sesions SessionExplanation=Assegura que el període de sessions no expirarà abans d'aquest moment. Tanmateix, la gestió del període de sessions de PHP no garanteix que el període de sessions expirar després d'aquest període: Aquest serà el cas si un sistema de neteja del cau de sessions és actiu.
Nota: Sense mecanisme especial, el mecanisme intern per netejar el període de sessions de PHP tots els accessos %s /%s, però només al voltant de l'accés d'altres períodes de sessions. TriggersAvailable=Triggers disponibles -TriggersDesc=Els triggers són arxius que, une vegada dipositats a la carpeta htdocs/includes/triggers, modifiquen el comportament del workflow d'Dolibarr. Realitzen accions suplementàries, desencadenades pels esdeveniments Dolibarr (creació d'empresa, validació factura, tancament de contracte, etc). +TriggersDesc=Els triggers són arxius que, une vegada dipositats a la carpeta htdocs/core/triggers, modifiquen el comportament del workflow d'Dolibarr. Realitzen accions suplementàries, desencadenades pels esdeveniments Dolibarr (creació d'empresa, validació factura, tancament de contracte, etc). TriggerDisabledByName=Triggers d'aquest arxiu desactivador pel sufix -NORUN en el nom de l'arxiu. TriggerDisabledAsModuleDisabled=Triggers d'aquest arxiu desactivats ja que el mòdul %s no està activat. TriggerAlwaysActive=Triggers d'aquest arxiu sempre actius, ja que els mòduls Dolibarr relacionats estan activats diff --git a/htdocs/langs/ca_ES/mails.lang b/htdocs/langs/ca_ES/mails.lang index 65c256854d9..30605b3e2a4 100644 --- a/htdocs/langs/ca_ES/mails.lang +++ b/htdocs/langs/ca_ES/mails.lang @@ -57,7 +57,7 @@ NoTargetYet=Cap destinatari definit AddRecipients=Afegeix destinataris RemoveRecipient=Eliminar destinatari CommonSubstitutions=Substitucions comuns -YouCanAddYourOwnPredefindedListHere=Per crear el seu mòdul de selecció e-mails, mireu htdocs /includes/modules/mailings/README. +YouCanAddYourOwnPredefindedListHere=Per crear el seu mòdul de selecció e-mails, mireu htdocs /core/modules/mailings/README. EMailTestSubstitutionReplacedByGenericValues=En mode prova, les variables de substitució són substituïdes per valors genèrics MailingAddFile=Adjuntar aquest arxiu NoAttachedFiles=Sense fitxers adjunts diff --git a/htdocs/langs/de_AT/admin.lang b/htdocs/langs/de_AT/admin.lang index 3bfffcdc9d9..7f74d64af61 100755 --- a/htdocs/langs/de_AT/admin.lang +++ b/htdocs/langs/de_AT/admin.lang @@ -590,7 +590,7 @@ ToActivateModule=Zum Aktivieren von Modulen gehen Sie zu Übersicht->Einstellung SessionTimeOut=Sitzungszeitbegrenzung SessionExplanation=Dieser Wert garantiert, dass eine Sitzung nie vor Zeitablauf beendet wird. Die PHP-Sitzungsverwaltung garantiert jedoch nicht, dass eine Sitzung wirklich nach Ablauf dieser Zeit beendet wird. Hierzu kann es kommen, wenn ein System zur Sitzungscache-Bereinigung im Einsatz ist.
Hinweis: ohne spezielles System wird PHP die Sitzung nach etwa %s/%s beenden - allerdings erst nach dem Start einer anderen Sitzung. TriggersAvailable=Verfügbare Trigger -TriggersDesc=Trigger sind Dateien, die nach einem Kopieren in das Verzeichnis htdocs/includes/triggers das Workflow-Verhalten des Systems beeinflussen. Diese stellen neue, mit Systemereignissen verbundene, Maßnahmen dar (Neuer Partner angelegt, Rechnung freigegeben, ...). +TriggersDesc=Trigger sind Dateien, die nach einem Kopieren in das Verzeichnis htdocs/core/triggers das Workflow-Verhalten des Systems beeinflussen. Diese stellen neue, mit Systemereignissen verbundene, Maßnahmen dar (Neuer Partner angelegt, Rechnung freigegeben, ...). TriggerDisabledByName=Trigger in dieser Datei sind durch das -NORUN-Suffix in ihrem Namen deaktviert. TriggerDisabledAsModuleDisabled=Trigger in dieser Datei sind durch das übergeordnete Modul %s deaktiviert. TriggerAlwaysActive=Trigger in dieser Datei sind unabhängig der Modulkonfiguration immer aktiviert. diff --git a/htdocs/langs/de_AT/mails.lang b/htdocs/langs/de_AT/mails.lang index 9d68c8f8815..56e04b46aba 100755 --- a/htdocs/langs/de_AT/mails.lang +++ b/htdocs/langs/de_AT/mails.lang @@ -60,7 +60,7 @@ NoTargetYet=Noch keine Empfänger ausgewählt (Bitte wechseln Sie zur Registerka AddRecipients=Empfänger hinzufügen RemoveRecipient=Empfänger entfernen CommonSubstitutions=Allgemeine Ersetzungen -YouCanAddYourOwnPredefindedListHere=Für nähere Informationen zur Erstellung Ihres eigenen E-Mail-Selector-Moduls, lesen Sie bitte die Datei htdocs/includes/modules/mailings/README. +YouCanAddYourOwnPredefindedListHere=Für nähere Informationen zur Erstellung Ihres eigenen E-Mail-Selector-Moduls, lesen Sie bitte die Datei htdocs/core/modules/mailings/README. EMailTestSubstitutionReplacedByGenericValues=Im Testmodus werden die Variablen durch generische Werte ersetzt MailingAddFile=Diese Datei anhängen NoAttachedFiles=Keine angehängten Dateien diff --git a/htdocs/langs/de_DE/admin.lang b/htdocs/langs/de_DE/admin.lang index 3bfffcdc9d9..7f74d64af61 100644 --- a/htdocs/langs/de_DE/admin.lang +++ b/htdocs/langs/de_DE/admin.lang @@ -590,7 +590,7 @@ ToActivateModule=Zum Aktivieren von Modulen gehen Sie zu Übersicht->Einstellung SessionTimeOut=Sitzungszeitbegrenzung SessionExplanation=Dieser Wert garantiert, dass eine Sitzung nie vor Zeitablauf beendet wird. Die PHP-Sitzungsverwaltung garantiert jedoch nicht, dass eine Sitzung wirklich nach Ablauf dieser Zeit beendet wird. Hierzu kann es kommen, wenn ein System zur Sitzungscache-Bereinigung im Einsatz ist.
Hinweis: ohne spezielles System wird PHP die Sitzung nach etwa %s/%s beenden - allerdings erst nach dem Start einer anderen Sitzung. TriggersAvailable=Verfügbare Trigger -TriggersDesc=Trigger sind Dateien, die nach einem Kopieren in das Verzeichnis htdocs/includes/triggers das Workflow-Verhalten des Systems beeinflussen. Diese stellen neue, mit Systemereignissen verbundene, Maßnahmen dar (Neuer Partner angelegt, Rechnung freigegeben, ...). +TriggersDesc=Trigger sind Dateien, die nach einem Kopieren in das Verzeichnis htdocs/core/triggers das Workflow-Verhalten des Systems beeinflussen. Diese stellen neue, mit Systemereignissen verbundene, Maßnahmen dar (Neuer Partner angelegt, Rechnung freigegeben, ...). TriggerDisabledByName=Trigger in dieser Datei sind durch das -NORUN-Suffix in ihrem Namen deaktviert. TriggerDisabledAsModuleDisabled=Trigger in dieser Datei sind durch das übergeordnete Modul %s deaktiviert. TriggerAlwaysActive=Trigger in dieser Datei sind unabhängig der Modulkonfiguration immer aktiviert. diff --git a/htdocs/langs/de_DE/mails.lang b/htdocs/langs/de_DE/mails.lang index 95bf3184184..f6c467661a0 100644 --- a/htdocs/langs/de_DE/mails.lang +++ b/htdocs/langs/de_DE/mails.lang @@ -60,7 +60,7 @@ NoTargetYet=Noch keine Empfänger ausgewählt (Bitte wechseln Sie zur Registerka AddRecipients=Empfänger hinzufügen RemoveRecipient=Empfänger entfernen CommonSubstitutions=Allgemeine Ersetzungen -YouCanAddYourOwnPredefindedListHere=Für nähere Informationen zur Erstellung Ihres eigenen E-Mail-Selector-Moduls, lesen Sie bitte die Datei htdocs/includes/modules/mailings/README. +YouCanAddYourOwnPredefindedListHere=Für nähere Informationen zur Erstellung Ihres eigenen E-Mail-Selector-Moduls, lesen Sie bitte die Datei htdocs/core/modules/mailings/README. EMailTestSubstitutionReplacedByGenericValues=Im Testmodus werden die Variablen durch generische Werte ersetzt MailingAddFile=Diese Datei anhängen NoAttachedFiles=Keine angehängten Dateien diff --git a/htdocs/langs/el_GR/admin.lang b/htdocs/langs/el_GR/admin.lang index e200ba6f14c..ae6f0ac3998 100755 --- a/htdocs/langs/el_GR/admin.lang +++ b/htdocs/langs/el_GR/admin.lang @@ -761,7 +761,7 @@ ToActivateModule=To activate modules, go on setup Area (Home->Setup->Modules). SessionTimeOut=Time out for session SessionExplanation=This number guarantee that session will never expire before this delay. But PHP sessoin management does not guaranty that session always expire after this delay: This occurs if a system to clean cache session is running.
Note: with no particular system, internal PHP process will clean session every about %s/%s access but only during access made by other sessions. TriggersAvailable=Available triggers -TriggersDesc=Triggers are files that will modify the behaviour of Dolibarr workflow once copied into the directory htdocs/includes/triggers. They realised new actions, activated on Dolibarr events (new company creation, invoice validation, ...). +TriggersDesc=Triggers are files that will modify the behaviour of Dolibarr workflow once copied into the directory htdocs/core/triggers. They realised new actions, activated on Dolibarr events (new company creation, invoice validation, ...). TriggerDisabledByName=Triggers in this file are disabled by the -NORUN suffix in their name. TriggerDisabledAsModuleDisabled=Triggers in this file are disabled as module %s is disabled. TriggerAlwaysActive=Triggers in this file are always active, whatever are the activated Dolibarr modules. diff --git a/htdocs/langs/el_GR/mails.lang b/htdocs/langs/el_GR/mails.lang index ab4e95f3262..63790e12f3b 100755 --- a/htdocs/langs/el_GR/mails.lang +++ b/htdocs/langs/el_GR/mails.lang @@ -57,7 +57,7 @@ NoTargetYet=No recipients defined yet (Go on tab 'Recipients') AddRecipients=Add recipients RemoveRecipient=Remove recipient CommonSubstitutions=Common substitutions -YouCanAddYourOwnPredefindedListHere=To create your email selector module, see htdocs/includes/modules/mailings/README. +YouCanAddYourOwnPredefindedListHere=To create your email selector module, see htdocs/core/modules/mailings/README. EMailTestSubstitutionReplacedByGenericValues=When using test mode, substitutions variables are replaced by generic values MailingAddFile=Attach this file NoAttachedFiles=No attached files diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang index d0a67deb2db..9a61c3d6dea 100644 --- a/htdocs/langs/en_US/admin.lang +++ b/htdocs/langs/en_US/admin.lang @@ -800,7 +800,7 @@ ToActivateModule=To activate modules, go on setup Area (Home->Setup->Modules). SessionTimeOut=Time out for session SessionExplanation=This number guarantee that session will never expire before this delay. But PHP session management does not guaranty that session always expire after this delay: This occurs if a system to clean cache session is running.
Note: with no particular system, internal PHP process will clean session every about %s/%s access but only during access made by other sessions. TriggersAvailable=Available triggers -TriggersDesc=Triggers are files that will modify the behaviour of Dolibarr workflow once copied into the directory htdocs/includes/triggers. They realised new actions, activated on Dolibarr events (new company creation, invoice validation, ...). +TriggersDesc=Triggers are files that will modify the behaviour of Dolibarr workflow once copied into the directory htdocs/core/triggers. They realised new actions, activated on Dolibarr events (new company creation, invoice validation, ...). TriggerDisabledByName=Triggers in this file are disabled by the -NORUN suffix in their name. TriggerDisabledAsModuleDisabled=Triggers in this file are disabled as module %s is disabled. TriggerAlwaysActive=Triggers in this file are always active, whatever are the activated Dolibarr modules. diff --git a/htdocs/langs/en_US/mails.lang b/htdocs/langs/en_US/mails.lang index e6dcd89f445..65d8460d442 100644 --- a/htdocs/langs/en_US/mails.lang +++ b/htdocs/langs/en_US/mails.lang @@ -57,7 +57,7 @@ NoTargetYet=No recipients defined yet (Go on tab 'Recipients') AddRecipients=Add recipients RemoveRecipient=Remove recipient CommonSubstitutions=Common substitutions -YouCanAddYourOwnPredefindedListHere=To create your email selector module, see htdocs/includes/modules/mailings/README. +YouCanAddYourOwnPredefindedListHere=To create your email selector module, see htdocs/core/modules/mailings/README. EMailTestSubstitutionReplacedByGenericValues=When using test mode, substitutions variables are replaced by generic values MailingAddFile=Attach this file NoAttachedFiles=No attached files diff --git a/htdocs/langs/es_ES/admin.lang b/htdocs/langs/es_ES/admin.lang index af55b925637..290e10f1832 100644 --- a/htdocs/langs/es_ES/admin.lang +++ b/htdocs/langs/es_ES/admin.lang @@ -807,7 +807,7 @@ ToActivateModule=Para activar los módulos, vaya al área de Configuración (Ini SessionTimeOut=Time out de sesiones SessionExplanation=Asegura que el período de sesiones no expirará antes de este momento. Sin embargo, la gestión del período de sesiones de PHP no garantiza que el período de sesiones expira después de este período: Este será el caso si un sistema de limpieza del caché de sesiones es activo.
Nota: Sin mecanismo especial, el mecanismo interno para limpiar el período de sesiones de PHP todos los accesos %s/%s, pero sólo en torno al acceso de otros períodos de sesiones. TriggersAvailable=Triggers disponibles -TriggersDesc=Los triggers son archivos que, une vez depositados en el directorio htdocs/includes/triggers, modifican el comportamiento del workflow de Dolibarr. Realizan acciones suplementarias, desencadenadas por los eventos Dolibarr (creación de empresa, validación factura, cierre contrato, etc). +TriggersDesc=Los triggers son archivos que, une vez depositados en el directorio htdocs/core/triggers, modifican el comportamiento del workflow de Dolibarr. Realizan acciones suplementarias, desencadenadas por los eventos Dolibarr (creación de empresa, validación factura, cierre contrato, etc). TriggerDisabledByName=Triggers de este archivo desactivados por el sufijo -NORUN en el nombre del archivo. TriggerDisabledAsModuleDisabled=Triggers de este archivo desactivados ya que el módulo %s no está activado. TriggerAlwaysActive=Triggers de este archivo siempre activos, ya que los módulos Dolibarr relacionados están activados diff --git a/htdocs/langs/es_ES/mails.lang b/htdocs/langs/es_ES/mails.lang index 2e4bed29600..c5c2ed7e51e 100644 --- a/htdocs/langs/es_ES/mails.lang +++ b/htdocs/langs/es_ES/mails.lang @@ -57,7 +57,7 @@ NoTargetYet=Ningún destinatario definido AddRecipients=Añadir destinatarios RemoveRecipient=Eliminar destinatario CommonSubstitutions=Substituciones comunes -YouCanAddYourOwnPredefindedListHere=Para crear su módulo de selección e-mails, vea htdocs/includes/modules/mailings/README. +YouCanAddYourOwnPredefindedListHere=Para crear su módulo de selección e-mails, vea htdocs/core/modules/mailings/README. EMailTestSubstitutionReplacedByGenericValues=En modo prueba, las variables de sustitución son sustituidas por valores genéricos MailingAddFile=Adjuntar este archivo NoAttachedFiles=Sin archivos adjuntos diff --git a/htdocs/langs/fr_FR/admin.lang b/htdocs/langs/fr_FR/admin.lang index a44227fd787..3bc88394e28 100644 --- a/htdocs/langs/fr_FR/admin.lang +++ b/htdocs/langs/fr_FR/admin.lang @@ -808,7 +808,7 @@ ToActivateModule= Pour activer des modules, aller dans l'espace Configuration (A SessionTimeOut= Time out des sessions SessionExplanation= Ce nombre garanti que la session n'expire pas avant ce délai. Mais la gestion de session PHP ne garantie pas que la session expire après ce délai: Ce sera le cas si un système de nettoyage des caches sessions est en place.
Note: Sans mécanisme spécial, le mécanisme interne à PHP nettoie la session tous les %s/%s accès environ mais uniquement lors d'accès fait par d'autres sessions. TriggersAvailable= Triggers disponibles -TriggersDesc= Les triggers sont des fichiers qui, une fois déposés dans le répertoire htdocs/includes/triggers, modifient le comportement du workflow de Dolibarr. Ils réalisent des actions supplémentaires, déclenchées par les événements Dolibarr (création société, validation facture, clôture contrat...). +TriggersDesc= Les triggers sont des fichiers qui, une fois déposés dans le répertoire htdocs/core/triggers, modifient le comportement du workflow de Dolibarr. Ils réalisent des actions supplémentaires, déclenchées par les événements Dolibarr (création société, validation facture, clôture contrat...). TriggerDisabledByName= Triggers de ce fichier désactivés par le suffix -NORUN dans le nom du fichier. TriggerDisabledAsModuleDisabled= Triggers de ce fichier désactivés car le module %s n'est pas actif. TriggerAlwaysActive= Triggers de ce fichier toujours actifs, quelque soient les modules Dolibarr activés. diff --git a/htdocs/langs/fr_FR/mails.lang b/htdocs/langs/fr_FR/mails.lang index fa874bc3743..eb44be793e5 100644 --- a/htdocs/langs/fr_FR/mails.lang +++ b/htdocs/langs/fr_FR/mails.lang @@ -57,7 +57,7 @@ NoTargetYet=Aucun destinataire défini (Aller sur l'onglet Destinataires) AddRecipients=Ajout de destinataires RemoveRecipient=Supprime destinataire CommonSubstitutions=Substitutions communes -YouCanAddYourOwnPredefindedListHere=Pour créer votre module sélection mails, voir htdocs/includes/modules/mailings/README. +YouCanAddYourOwnPredefindedListHere=Pour créer votre module sélection mails, voir htdocs/core/modules/mailings/README. EMailTestSubstitutionReplacedByGenericValues=En mode test, les variables de substitution sont remplacées par des valeurs génériques MailingAddFile=Joindre ce fichier NoAttachedFiles=Aucun fichier joint diff --git a/htdocs/langs/hu_HU/mails.lang b/htdocs/langs/hu_HU/mails.lang index 1c3c579646b..594f016a9f3 100644 --- a/htdocs/langs/hu_HU/mails.lang +++ b/htdocs/langs/hu_HU/mails.lang @@ -57,7 +57,7 @@ NoTargetYet=Nincs címzett megadva ('Címzettek fül') AddRecipients=Címzett hozzáadása RemoveRecipient=Címzett eltávolítása CommonSubstitutions=Általános helyettesítések -YouCanAddYourOwnPredefindedListHere=To create your email selector module, see htdocs/includes/modules/mailings/README. +YouCanAddYourOwnPredefindedListHere=To create your email selector module, see htdocs/core/modules/mailings/README. EMailTestSubstitutionReplacedByGenericValues=When using test mode, substitutions variables are replaced by generic values diff --git a/htdocs/langs/it_IT/mails.lang b/htdocs/langs/it_IT/mails.lang index 990c05ff4e3..f6484a28b7a 100644 --- a/htdocs/langs/it_IT/mails.lang +++ b/htdocs/langs/it_IT/mails.lang @@ -54,7 +54,7 @@ NoTargetYet =Nessun destinatario ancora definito (Vai alla scheda 'des AddRecipients =Aggiungi destinatari RemoveRecipient =Rimuovi destinatario CommonSubstitutions =Sostituzioni comuni -YouCanAddYourOwnPredefindedListHere =Per creare le liste di email predefinite leggi htdocs/includes/modules/mail/README. +YouCanAddYourOwnPredefindedListHere =Per creare le liste di email predefinite leggi htdocs/core/modules/mail/README. EMailTestSubstitutionReplacedByGenericValues =Quando si utilizza modalità di prova, le variabili vengono sostituite con valori generici MailingAddFile =Allega questo file NoAttachedFiles =Nessun file allegato diff --git a/htdocs/langs/nb_NO/admin.lang b/htdocs/langs/nb_NO/admin.lang index 3aae88275b4..dfb35ed66fc 100644 --- a/htdocs/langs/nb_NO/admin.lang +++ b/htdocs/langs/nb_NO/admin.lang @@ -594,7 +594,7 @@ ToActivateModule=Gå til innstillinger for å aktivere moduler. SessionTimeOut=Tidsgrense for økter SessionExplanation=Styrer atøkten aldri vil løpe ut før denne grensen. Men PHP gkan ikke garantere at økten altid vil løpe ut etter denne grensen. This occurs if a system to clean cache session is running.
Note: with no particular system, internal PHP process will clean session every about %s/%s access but only during access made by other sessions. TriggersAvailable=Tilgjengelige utløsere -TriggersDesc=Utløsere (triggers) er filer som vil påvirke Dolibarrs virkemåte og arbeidsflyt når de kopieres inn i mappen htdocs/includes/triggers. De aktiverer nye handlinger, aktivert av Dolibarrhendelser (ny tredjepart, opprette faktura ...). +TriggersDesc=Utløsere (triggers) er filer som vil påvirke Dolibarrs virkemåte og arbeidsflyt når de kopieres inn i mappen htdocs/core/triggers. De aktiverer nye handlinger, aktivert av Dolibarrhendelser (ny tredjepart, opprette faktura ...). TriggerDisabledByName=Utløserne i denne filen er slått av med endelsen -NORUN i navnet. TriggerDisabledAsModuleDisabled=Utløserne i denne filen er slått av ettersom modulen %s er slått av. TriggerAlwaysActive=Utløserne i denne filen er alltid slått på, uansett hvilke moduler som er slått på. diff --git a/htdocs/langs/nb_NO/mails.lang b/htdocs/langs/nb_NO/mails.lang index 1e33c6d6014..aeb9fbbcb63 100644 --- a/htdocs/langs/nb_NO/mails.lang +++ b/htdocs/langs/nb_NO/mails.lang @@ -54,7 +54,7 @@ NoTargetYet=Ingen mottagere angitt (Gå til fanen 'Mottakere') AddRecipients=Legg til mottakere RemoveRecipient=Fjern mottaker CommonSubstitutions=Vanlige flettefelt -YouCanAddYourOwnPredefindedListHere=Les mer om hvordan du lager din egen utvalgsliste her: htdocs/includes/modules/mailings/README. +YouCanAddYourOwnPredefindedListHere=Les mer om hvordan du lager din egen utvalgsliste her: htdocs/core/modules/mailings/README. EMailTestSubstitutionReplacedByGenericValues=Når du er i testmodus blir flettefelt erstattet med generiske verdier MailingAddFile=Legg ved denne filen NoAttachedFiles=Ingen vedlagte filer diff --git a/htdocs/langs/nl_BE/mails.lang b/htdocs/langs/nl_BE/mails.lang index e5678c53a44..c9b0881e58a 100644 --- a/htdocs/langs/nl_BE/mails.lang +++ b/htdocs/langs/nl_BE/mails.lang @@ -54,7 +54,7 @@ NoTargetYet=Nog geen ontvangers gedefiniëerd (Ga op het tabblad "Ontvangers") AddRecipients=Ontvangers toevoegen RemoveRecipient=Verwijder ontvanger CommonSubstitutions=Common substitutions -YouCanAddYourOwnPredefindedListHere=Om uw email selector module te creëren, zie htdocs/includes/modules/mailings/README. +YouCanAddYourOwnPredefindedListHere=Om uw email selector module te creëren, zie htdocs/core/modules/mailings/README. EMailTestSubstitutionReplacedByGenericValues=Bij het gebruik van test-modus, substituties variabelen worden vervangen door algemene waarden MailingAddFile=Bestand toevoegen NoAttachedFiles=Geen bijgevoegde bestanden diff --git a/htdocs/langs/nl_NL/admin.lang b/htdocs/langs/nl_NL/admin.lang index a02f922c42e..0ac03784ae8 100644 --- a/htdocs/langs/nl_NL/admin.lang +++ b/htdocs/langs/nl_NL/admin.lang @@ -776,7 +776,7 @@ ToActivateModule = Om modules te activeren, ga naar Home->Instellingen->Modules. SessionTimeOut = Time-out van de sessie SessionExplanation = De hier ingestelde waarde garandeert dat de sessie nooit zal verlopen voordat deze periode is verlopen, maar niet dat de sessie wel verloopt na deze vertraging, omdat sessies worden worden verwijderd wanneer het systeem zelf een opschoning begint.
Opmerking: bij geen specifiek systeem, zal PHP elke sessie wissen rond %s/%s toegang, maar alleen tijdens de toegang van andere sessies. TriggersAvailable = Beschikbare initiatoren (triggers) -TriggersDesc = Initiatoren zijn bestanden die het gedrag van de 'workflow' van Dolibarr zullen beïnvloeden vanaf het moment dat zij zijn gekopieerd naar de map htdocs/includes/triggers.Zij initiëren nieuwe acties, geactiveerd door Dolibarr gebeurtenissen (de creatie van nieuwe bedrijven, factuur validatie, etc). +TriggersDesc = Initiatoren zijn bestanden die het gedrag van de 'workflow' van Dolibarr zullen beïnvloeden vanaf het moment dat zij zijn gekopieerd naar de map htdocs/core/triggers.Zij initiëren nieuwe acties, geactiveerd door Dolibarr gebeurtenissen (de creatie van nieuwe bedrijven, factuur validatie, etc). TriggerDisabledByName = Initiatoren in dit bestand zijn uitgeschakeld door het NoRun achtervoegsel in hun naam. TriggerDisabledAsModuleDisabled = Initiatoren in dit bestand zijn uitgeschakeld als module %s is uitgeschakeld. TriggerAlwaysActive = Initiatoren in dit bestand zijn altijd actief, ongeacht de geactiveerde modules in Dolibarr. diff --git a/htdocs/langs/nl_NL/mails.lang b/htdocs/langs/nl_NL/mails.lang index a4a2a9d8591..9955177cbdb 100644 --- a/htdocs/langs/nl_NL/mails.lang +++ b/htdocs/langs/nl_NL/mails.lang @@ -57,7 +57,7 @@ NoTargetYet = Nog geen ontvangers gedefinieerd (Ga naar het tabblad "Ontvangers" AddRecipients = Ontvangers toevoegen RemoveRecipient = Ontvangers verwijderen CommonSubstitutions = Vaak voorkomende vervangingen -YouCanAddYourOwnPredefindedListHere = Om uw e-mailselectormodule te creëren, zie htdocs/includes/modules/mailings/README. +YouCanAddYourOwnPredefindedListHere = Om uw e-mailselectormodule te creëren, zie htdocs/core/modules/mailings/README. EMailTestSubstitutionReplacedByGenericValues = Bij het gebruik van de testmodus, worden de vervangingsvariabelen door algemene waarden vervangen MailingAddFile = Voeg dit bestand bij NoAttachedFiles = Geen bijgevoegde bestanden diff --git a/htdocs/langs/pt_BR/admin.lang b/htdocs/langs/pt_BR/admin.lang index ab1a572ea8b..1cfd2654a38 100644 --- a/htdocs/langs/pt_BR/admin.lang +++ b/htdocs/langs/pt_BR/admin.lang @@ -659,7 +659,7 @@ ToActivateModule=Para ativar os módulos, ir à área de configuração. SessionTimeOut=Time out de sessões SessionExplanation=Asegura que o período de sessões não expirará antes deste momento. sem embargo, a Administração do período de sessões de PHP não garantiza que o período de sessões expira depois deste período: Este será o caso sim um sistema de limpieza do caché de sessões é ativo.
Nota: sem mecanismo especial, o mecanismo interno para limpiar o período de sessões de PHP todos os acessos %s/%s, mas só em torno à acesso de Outros períodos de sessões. TriggersAvailable=Triggers disponíveis -TriggersDesc=os triggers são Arquivos que, une vez depositados na pasta htdocs/includes/triggers, modifican o comportamento do workflow de Dolibarr. Realizan ações suplementarias, desencadenadas por os eventos Dolibarr (criação de empresa, validação fatura, fechar contrato, etc). +TriggersDesc=os triggers são Arquivos que, une vez depositados na pasta htdocs/core/triggers, modifican o comportamento do workflow de Dolibarr. Realizan ações suplementarias, desencadenadas por os eventos Dolibarr (criação de empresa, validação fatura, fechar contrato, etc). TriggerDisabledByName=Triggers deste Arquivo desativador por o sufijo -NORUN ao Nome do Arquivo. TriggerDisabledAsModuleDisabled=Triggers deste Arquivo desativados já que o módulo %s não está ativado. TriggerAlwaysActive=Triggers deste Arquivo sempre ativos, já que os módulos Dolibarr relacionados estão ativados diff --git a/htdocs/langs/pt_BR/mails.lang b/htdocs/langs/pt_BR/mails.lang index 37fa4b57211..a59827054fc 100644 --- a/htdocs/langs/pt_BR/mails.lang +++ b/htdocs/langs/pt_BR/mails.lang @@ -57,7 +57,7 @@ NoTargetYet=Nenhum destinatário definido AddRecipients=Adicionar destinatários RemoveRecipient=Eliminar destinatário CommonSubstitutions=Substituições comuns -YouCanAddYourOwnPredefindedListHere=Para Criar o seu módulo de seleção e-mails, tem que ir a htdocs/includes/modules/mailings/README. +YouCanAddYourOwnPredefindedListHere=Para Criar o seu módulo de seleção e-mails, tem que ir a htdocs/core/modules/mailings/README. EMailTestSubstitutionReplacedByGenericValues=Em modo teste, as Variávels de substituição são sustituidas por valores genéricos MailingAddFile=Adicionar este Arquivo NoAttachedFiles=Sem arquivos anexos diff --git a/htdocs/langs/pt_PT/admin.lang b/htdocs/langs/pt_PT/admin.lang index 4c8f677f0e0..8939a91aa55 100644 --- a/htdocs/langs/pt_PT/admin.lang +++ b/htdocs/langs/pt_PT/admin.lang @@ -638,7 +638,7 @@ ToActivateModule=Para activar os módulos, ir à área de configuração. SessionTimeOut=Time out de sessões SessionExplanation=Asegura que o período de sessões não expirará antes de este momento. sem embargo, a Gestão do período de sessões de PHP não garantiza que o período de sessões expira depois de este período: Este será o caso sim um sistema de limpieza do caché de sessões é activo.
Nota: sem mecanismo especial, o mecanismo interno para limpiar o período de sessões de PHP todos os acessos %s/%s, mas só em torno à acesso de Outros períodos de sessões. TriggersAvailable=Triggers disponiveis -TriggersDesc=os triggers são Ficheiros que, une vez depositados na pasta htdocs/includes/triggers, modifican o comportamento do workflow de Dolibarr. Realizan acções suplementarias, desencadenadas por os eventos Dolibarr (criação de empresa, validação factura, fechar contrato, etc). +TriggersDesc=os triggers são Ficheiros que, une vez depositados na pasta htdocs/core/triggers, modifican o comportamento do workflow de Dolibarr. Realizan acções suplementarias, desencadenadas por os eventos Dolibarr (criação de empresa, validação factura, fechar contrato, etc). TriggerDisabledByName=Triggers de este Ficheiro desactivador por o sufijo -NORUN ao Nome do Ficheiro. TriggerDisabledAsModuleDisabled=Triggers de este Ficheiro desactivados já que o módulo %s não está activado. TriggerAlwaysActive=Triggers de este Ficheiro sempre activos, já que os módulos Dolibarr relacionados estão activados diff --git a/htdocs/langs/pt_PT/mails.lang b/htdocs/langs/pt_PT/mails.lang index dc99ab2f815..f90204b1b06 100644 --- a/htdocs/langs/pt_PT/mails.lang +++ b/htdocs/langs/pt_PT/mails.lang @@ -55,7 +55,7 @@ NoTargetYet=Nenhum destinatario definido AddRecipients=Adicionar destinatarios RemoveRecipient=Eliminar destinatario CommonSubstitutions=Substituições comuns -YouCanAddYourOwnPredefindedListHere=Para Criar o seu módulo de selecção e-mails, tem que ir a htdocs/includes/modules/mailings/README. +YouCanAddYourOwnPredefindedListHere=Para Criar o seu módulo de selecção e-mails, tem que ir a htdocs/core/modules/mailings/README. EMailTestSubstitutionReplacedByGenericValues=Em modo teste, as Variávels de substituição são sustituidas por valores genéricos MailingAddFile=Adicionar este Ficheiro NoAttachedFiles=Sem ficheiros anexos diff --git a/htdocs/langs/sl_SI/admin.lang b/htdocs/langs/sl_SI/admin.lang index edc44f1adac..c78ba867666 100755 --- a/htdocs/langs/sl_SI/admin.lang +++ b/htdocs/langs/sl_SI/admin.lang @@ -768,7 +768,7 @@ ToActivateModule=Za aktivacijo modula, pojdite na področje nastavitev (Domov->N SessionTimeOut=Potečen čas seje SessionExplanation=Ta številka zagotavlja, da seja nikoli ne bo potekla pred to zakasnitvijo. Vendar pa upravljanje PHP sej ne zagotavlja, da bo seja potekla po tej zakasnitvi: To se pojavi, če je zagnan sistem za čiščenje predpomnilnika sej.
Opomba: Brez posebej določenega sistema bo interni PHP proces pobrisal seje približno na vsakih %s/%s dostopov, vendar le, med dostopanjem drugih sej. TriggersAvailable=Možni prožilci -TriggersDesc=Prožilci so datoteke, ki spremenijo obnašanje aplikacije Dolibarr ko so skopirani v mapo htdocs/includes/triggers. Zaznajo nove aktivnosti, Ki so bile aktivirane z Dolibarr dogodki (kreiranje novega podjetja, potrjevanje računa, ...). +TriggersDesc=Prožilci so datoteke, ki spremenijo obnašanje aplikacije Dolibarr ko so skopirani v mapo htdocs/core/triggers. Zaznajo nove aktivnosti, Ki so bile aktivirane z Dolibarr dogodki (kreiranje novega podjetja, potrjevanje računa, ...). TriggerDisabledByName=Prožilci v tej datoteki so onemogočeni s predpono -NORUN v njihovem imenu. TriggerDisabledAsModuleDisabled=Prožilci v tej datoteki so onemogočeni, ker je onemogočen modul %s . TriggerAlwaysActive=Prožilci v tej datoteki so aktivni vedno, ne glede na aktiven Dolibarr module. diff --git a/htdocs/langs/sl_SI/mails.lang b/htdocs/langs/sl_SI/mails.lang index ca18a1b6172..908f849d37c 100755 --- a/htdocs/langs/sl_SI/mails.lang +++ b/htdocs/langs/sl_SI/mails.lang @@ -57,7 +57,7 @@ NoTargetYet=Noben prejemnik še ni določen (Pojdite na jeziček 'Prejemniki') AddRecipients=Dodaj prejemnike RemoveRecipient=Odstrani prejemnika CommonSubstitutions=Običajne zamenjave -YouCanAddYourOwnPredefindedListHere=Za kreiranje vašega modula e-pošte glejte htdocs/includes/modules/mailings/README. +YouCanAddYourOwnPredefindedListHere=Za kreiranje vašega modula e-pošte glejte htdocs/core/modules/mailings/README. EMailTestSubstitutionReplacedByGenericValues=V testnem načinu so nadomestne spremenljivke zamenjane z generičnimi vrednostmi MailingAddFile=Dodaj to datoteko NoAttachedFiles=Ni dodanih datotek diff --git a/htdocs/livraison/class/livraison.class.php b/htdocs/livraison/class/livraison.class.php index 3d0fa964e6f..7f1f32c1741 100644 --- a/htdocs/livraison/class/livraison.class.php +++ b/htdocs/livraison/class/livraison.class.php @@ -329,9 +329,9 @@ class Livraison extends CommonObject // Definition du nom de module de numerotation de commande $modName = $conf->global->LIVRAISON_ADDON; - if (is_readable(DOL_DOCUMENT_ROOT .'/includes/modules/livraison/'.$modName.'.php')) + if (is_readable(DOL_DOCUMENT_ROOT .'/core/modules/livraison/'.$modName.'.php')) { - require_once DOL_DOCUMENT_ROOT .'/includes/modules/livraison/'.$modName.'.php'; + require_once DOL_DOCUMENT_ROOT .'/core/modules/livraison/'.$modName.'.php'; // Recuperation de la nouvelle reference $objMod = new $modName($this->db); diff --git a/htdocs/livraison/fiche.php b/htdocs/livraison/fiche.php index cffdf236cdc..56ac0452eda 100644 --- a/htdocs/livraison/fiche.php +++ b/htdocs/livraison/fiche.php @@ -27,7 +27,7 @@ require("../main.inc.php"); require_once(DOL_DOCUMENT_ROOT."/livraison/class/livraison.class.php"); -require_once(DOL_DOCUMENT_ROOT."/includes/modules/livraison/modules_livraison.php"); +require_once(DOL_DOCUMENT_ROOT."/core/modules/livraison/modules_livraison.php"); require_once(DOL_DOCUMENT_ROOT."/core/class/html.formfile.class.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"); diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php index 9a616773075..0b46afe4689 100644 --- a/htdocs/main.inc.php +++ b/htdocs/main.inc.php @@ -1154,11 +1154,11 @@ function top_menu($head, $title='', $target='', $disablejs=0, $disablehead=0, $a if (GETPOST('menu')) $top_menu=GETPOST('menu'); // menu=eldy_backoffice.php // Load the top menu manager - $result=dol_include_once("/includes/menus/standard/".$top_menu); + $result=dol_include_once("/core/menus/standard/".$top_menu); if (! $result) // If failed to include, we try with standard { $top_menu='eldy_backoffice.php'; - include_once(DOL_DOCUMENT_ROOT."/includes/menus/standard/".$top_menu); + include_once(DOL_DOCUMENT_ROOT."/core/menus/standard/".$top_menu); } @@ -1351,11 +1351,11 @@ function left_menu($menu_array_before, $helppagename='', $moresearchform='', $me if (GETPOST('menu')) $left_menu=GETPOST('menu'); // menu=eldy_backoffice.php // Load the left menu manager - $result=dol_include_once("/includes/menus/standard/".$left_menu); + $result=dol_include_once("/core/menus/standard/".$left_menu); if (! $result) // If menu manager removed or not found { $left_menu='eldy_backoffice.php'; - include_once(DOL_DOCUMENT_ROOT ."/includes/menus/standard/".$left_menu); + include_once(DOL_DOCUMENT_ROOT ."/core/menus/standard/".$left_menu); } // Left column diff --git a/htdocs/projet/fiche.php b/htdocs/projet/fiche.php index 83b026724cd..9d703d5dcd6 100644 --- a/htdocs/projet/fiche.php +++ b/htdocs/projet/fiche.php @@ -28,7 +28,7 @@ require_once(DOL_DOCUMENT_ROOT."/projet/class/project.class.php"); require_once(DOL_DOCUMENT_ROOT."/projet/class/task.class.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/project.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/class/html.formfile.class.php"); -require_once(DOL_DOCUMENT_ROOT."/includes/modules/project/modules_project.php"); +require_once(DOL_DOCUMENT_ROOT."/core/modules/project/modules_project.php"); $langs->load("projects"); $langs->load('companies'); @@ -284,9 +284,9 @@ if ($_GET["action"] == 'create' && $user->rights->projet->creer) $defaultref=''; $obj = empty($conf->global->PROJECT_ADDON)?'mod_project_simple':$conf->global->PROJECT_ADDON; - if (! empty($conf->global->PROJECT_ADDON) && is_readable(DOL_DOCUMENT_ROOT ."/includes/modules/project/".$conf->global->PROJECT_ADDON.".php")) + if (! empty($conf->global->PROJECT_ADDON) && is_readable(DOL_DOCUMENT_ROOT ."/core/modules/project/".$conf->global->PROJECT_ADDON.".php")) { - require_once(DOL_DOCUMENT_ROOT ."/includes/modules/project/".$conf->global->PROJECT_ADDON.".php"); + require_once(DOL_DOCUMENT_ROOT ."/core/modules/project/".$conf->global->PROJECT_ADDON.".php"); $modProject = new $obj; $defaultref = $modProject->getNextValue($soc,$project); } diff --git a/htdocs/public/demo/index.php b/htdocs/public/demo/index.php index a72497616b4..f4f5de8c7b3 100644 --- a/htdocs/public/demo/index.php +++ b/htdocs/public/demo/index.php @@ -79,7 +79,7 @@ $i = 0; // is a sequencer of modules found $j = 0; // j is module number. Automatically affected if module number not defined. foreach ($dirlist as $dirroot) { - $dir = $dirroot . "/includes/modules/"; + $dir = $dirroot . "/core/modules/"; // Charge tableaux modules, nom, numero, orders depuis repertoire dir $handle=opendir($dir); diff --git a/htdocs/societe/admin/societe.php b/htdocs/societe/admin/societe.php index b1e9e8efded..2d3cd689887 100644 --- a/htdocs/societe/admin/societe.php +++ b/htdocs/societe/admin/societe.php @@ -234,7 +234,7 @@ print "\n"; $var = true; foreach ($conf->file->dol_document_root as $dirroot) { - $dir = $dirroot . "/includes/modules/societe/"; + $dir = $dirroot . "/core/modules/societe/"; $handle = opendir($dir); if (is_resource($handle)) { @@ -245,7 +245,7 @@ foreach ($conf->file->dol_document_root as $dirroot) { $file = substr($file, 0, dol_strlen($file)-4); - dol_include_once("/includes/modules/societe/".$file.".php"); + dol_include_once("/core/modules/societe/".$file.".php"); $modCodeTiers = new $file; @@ -305,7 +305,7 @@ print "\n"; $var = true; foreach ($conf->file->dol_document_root as $dirroot) { - $dir = $dirroot . "/includes/modules/societe/"; + $dir = $dirroot . "/core/modules/societe/"; $handle = opendir($dir); if (is_resource($handle)) { @@ -315,7 +315,7 @@ foreach ($conf->file->dol_document_root as $dirroot) { $file = substr($file, 0, dol_strlen($file)-4); - dol_include_once("/includes/modules/societe/".$file.".php"); + dol_include_once("/core/modules/societe/".$file.".php"); $modCodeCompta = new $file; $var = !$var; @@ -391,7 +391,7 @@ print "\n"; $var=true; foreach ($conf->file->dol_document_root as $dirroot) { - $dir = $dirroot . "/includes/modules/societe/doc"; + $dir = $dirroot . "/core/modules/societe/doc"; if (is_dir($dir)) { diff --git a/htdocs/societe/canvas/actions_card_common.class.php b/htdocs/societe/canvas/actions_card_common.class.php index afa4eb21a2d..accc3365c6f 100644 --- a/htdocs/societe/canvas/actions_card_common.class.php +++ b/htdocs/societe/canvas/actions_card_common.class.php @@ -335,7 +335,7 @@ abstract class ActionsCardCommon } else { - require_once(DOL_DOCUMENT_ROOT.'/includes/modules/societe/modules_societe.class.php'); + require_once(DOL_DOCUMENT_ROOT.'/core/modules/societe/modules_societe.class.php'); $this->object->fetch_thirdparty(); @@ -437,7 +437,7 @@ abstract class ActionsCardCommon { $module = substr($module, 0, dol_strlen($module)-4); } - require_once(DOL_DOCUMENT_ROOT ."/includes/modules/societe/".$module.".php"); + require_once(DOL_DOCUMENT_ROOT ."/core/modules/societe/".$module.".php"); $modCodeClient = new $module; $this->tpl['auto_customercode'] = $modCodeClient->code_auto; // We verified if the tag prefix is used @@ -469,7 +469,7 @@ abstract class ActionsCardCommon { $module = substr($module, 0, dol_strlen($module)-4); } - require_once(DOL_DOCUMENT_ROOT ."/includes/modules/societe/".$module.".php"); + require_once(DOL_DOCUMENT_ROOT ."/core/modules/societe/".$module.".php"); $modCodeFournisseur = new $module; $this->tpl['auto_suppliercode'] = $modCodeFournisseur->code_auto; // We verified if the tag prefix is used diff --git a/htdocs/societe/class/societe.class.php b/htdocs/societe/class/societe.class.php index 25d5a378562..38a6635312b 100644 --- a/htdocs/societe/class/societe.class.php +++ b/htdocs/societe/class/societe.class.php @@ -1743,7 +1743,7 @@ class Societe extends CommonObject global $conf; if ($conf->global->SOCIETE_CODECLIENT_ADDON) { - require_once DOL_DOCUMENT_ROOT.'/includes/modules/societe/'.$conf->global->SOCIETE_CODECLIENT_ADDON.'.php'; + require_once DOL_DOCUMENT_ROOT.'/core/modules/societe/'.$conf->global->SOCIETE_CODECLIENT_ADDON.'.php'; $var = $conf->global->SOCIETE_CODECLIENT_ADDON; $mod = new $var; @@ -1763,7 +1763,7 @@ class Societe extends CommonObject global $conf; if ($conf->global->SOCIETE_CODEFOURNISSEUR_ADDON) { - require_once DOL_DOCUMENT_ROOT.'/includes/modules/societe/'.$conf->global->SOCIETE_CODEFOURNISSEUR_ADDON.'.php'; + require_once DOL_DOCUMENT_ROOT.'/core/modules/societe/'.$conf->global->SOCIETE_CODEFOURNISSEUR_ADDON.'.php'; $var = $conf->global->SOCIETE_CODEFOURNISSEUR_ADDON; $mod = new $var; @@ -1784,7 +1784,7 @@ class Societe extends CommonObject global $conf; if ($conf->global->SOCIETE_CODECLIENT_ADDON) { - require_once DOL_DOCUMENT_ROOT.'/includes/modules/societe/'.$conf->global->SOCIETE_CODECLIENT_ADDON.'.php'; + require_once DOL_DOCUMENT_ROOT.'/core/modules/societe/'.$conf->global->SOCIETE_CODECLIENT_ADDON.'.php'; $var = $conf->global->SOCIETE_CODECLIENT_ADDON; @@ -1812,7 +1812,7 @@ class Societe extends CommonObject global $conf; if ($conf->global->SOCIETE_CODEFOURNISSEUR_ADDON) { - require_once DOL_DOCUMENT_ROOT.'/includes/modules/societe/'.$conf->global->SOCIETE_CODEFOURNISSEUR_ADDON.'.php'; + require_once DOL_DOCUMENT_ROOT.'/core/modules/societe/'.$conf->global->SOCIETE_CODEFOURNISSEUR_ADDON.'.php'; $var = $conf->global->SOCIETE_CODEFOURNISSEUR_ADDON; @@ -1844,7 +1844,7 @@ class Societe extends CommonObject global $conf; if ($conf->global->SOCIETE_CODECLIENT_ADDON) { - require_once DOL_DOCUMENT_ROOT.'/includes/modules/societe/'.$conf->global->SOCIETE_CODECLIENT_ADDON.'.php'; + require_once DOL_DOCUMENT_ROOT.'/core/modules/societe/'.$conf->global->SOCIETE_CODECLIENT_ADDON.'.php'; $var = $conf->global->SOCIETE_CODECLIENT_ADDON; @@ -1873,7 +1873,7 @@ class Societe extends CommonObject global $conf; if ($conf->global->SOCIETE_CODEFOURNISSEUR_ADDON) { - require_once DOL_DOCUMENT_ROOT.'/includes/modules/societe/'.$conf->global->SOCIETE_CODEFOURNISSEUR_ADDON.'.php'; + require_once DOL_DOCUMENT_ROOT.'/core/modules/societe/'.$conf->global->SOCIETE_CODEFOURNISSEUR_ADDON.'.php'; $var = $conf->global->SOCIETE_CODEFOURNISSEUR_ADDON; @@ -1902,7 +1902,7 @@ class Societe extends CommonObject if ($conf->global->SOCIETE_CODECOMPTA_ADDON) { - require_once DOL_DOCUMENT_ROOT.'/includes/modules/societe/'.$conf->global->SOCIETE_CODECOMPTA_ADDON.'.php'; + require_once DOL_DOCUMENT_ROOT.'/core/modules/societe/'.$conf->global->SOCIETE_CODECOMPTA_ADDON.'.php'; $var = $conf->global->SOCIETE_CODECOMPTA_ADDON; diff --git a/htdocs/societe/notify/fiche.php b/htdocs/societe/notify/fiche.php index bc9af371403..4e18863ad4c 100644 --- a/htdocs/societe/notify/fiche.php +++ b/htdocs/societe/notify/fiche.php @@ -26,7 +26,7 @@ require("../../main.inc.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/company.lib.php"); require_once(DOL_DOCUMENT_ROOT."/contact/class/contact.class.php"); -require_once(DOL_DOCUMENT_ROOT."/includes/triggers/interface_modNotification_Notification.class.php"); +require_once(DOL_DOCUMENT_ROOT."/core/triggers/interface_modNotification_Notification.class.php"); $langs->load("companies"); $langs->load("mails"); diff --git a/htdocs/societe/soc.php b/htdocs/societe/soc.php index fc9a466e337..7ad52e2c35e 100644 --- a/htdocs/societe/soc.php +++ b/htdocs/societe/soc.php @@ -419,7 +419,7 @@ if (empty($reshook)) } else { - require_once(DOL_DOCUMENT_ROOT.'/includes/modules/societe/modules_societe.class.php'); + require_once(DOL_DOCUMENT_ROOT.'/core/modules/societe/modules_societe.class.php'); $object->fetch($socid); $object->fetch_thirdparty(); @@ -500,7 +500,7 @@ else { $module = substr($module, 0, dol_strlen($module)-4); } - require_once(DOL_DOCUMENT_ROOT ."/includes/modules/societe/".$module.".php"); + require_once(DOL_DOCUMENT_ROOT ."/core/modules/societe/".$module.".php"); $modCodeClient = new $module; $module=$conf->global->SOCIETE_CODEFOURNISSEUR_ADDON; if (! $module) $module=$conf->global->SOCIETE_CODECLIENT_ADDON; @@ -508,7 +508,7 @@ else { $module = substr($module, 0, dol_strlen($module)-4); } - require_once(DOL_DOCUMENT_ROOT ."/includes/modules/societe/".$module.".php"); + require_once(DOL_DOCUMENT_ROOT ."/core/modules/societe/".$module.".php"); $modCodeFournisseur = new $module; //if ($_GET["type"]=='cp') { $object->client=3; } @@ -994,7 +994,7 @@ else { $module = substr($module, 0, dol_strlen($module)-4); } - require_once(DOL_DOCUMENT_ROOT ."/includes/modules/societe/".$module.".php"); + require_once(DOL_DOCUMENT_ROOT ."/core/modules/societe/".$module.".php"); $modCodeClient = new $module; // We verified if the tag prefix is used if ($modCodeClient->code_auto) @@ -1007,7 +1007,7 @@ else { $module = substr($module, 0, dol_strlen($module)-4); } - require_once(DOL_DOCUMENT_ROOT ."/includes/modules/societe/".$module.".php"); + require_once(DOL_DOCUMENT_ROOT ."/core/modules/societe/".$module.".php"); $modCodeFournisseur = new $module; // On verifie si la balise prefix est utilisee if ($modCodeFournisseur->code_auto) diff --git a/htdocs/user/group/perms.php b/htdocs/user/group/perms.php index af7a977858d..2588377405c 100644 --- a/htdocs/user/group/perms.php +++ b/htdocs/user/group/perms.php @@ -99,7 +99,7 @@ if ($id) foreach ($conf->file->dol_document_root as $type => $dirroot) { - $modulesdir[] = $dirroot . "/includes/modules/"; + $modulesdir[] = $dirroot . "/core/modules/"; if ($type == 'alt') { @@ -110,9 +110,9 @@ if ($id) { if (is_dir($dirroot.'/'.$file) && substr($file, 0, 1) <> '.' && substr($file, 0, 3) <> 'CVS' && $file != 'includes') { - if (is_dir($dirroot . '/' . $file . '/includes/modules/')) + if (is_dir($dirroot . '/' . $file . '/core/modules/')) { - $modulesdir[] = $dirroot . '/' . $file . '/includes/modules/'; + $modulesdir[] = $dirroot . '/' . $file . '/core/modules/'; } } } diff --git a/htdocs/user/param_ihm.php b/htdocs/user/param_ihm.php index d9edc9447fc..6c41f551fe1 100644 --- a/htdocs/user/param_ihm.php +++ b/htdocs/user/param_ihm.php @@ -56,8 +56,8 @@ if ($user->id <> $_REQUEST["id"] && ! $canreaduser) accessforbidden(); $id=! empty($_GET["id"])?$_GET["id"]:$_POST["id"]; -$dirtop = "../includes/menus/standard"; -$dirleft = "../includes/menus/standard"; +$dirtop = "../core/menus/standard"; +$dirleft = "../core/menus/standard"; // Charge utilisateur edite $fuser = new User($db); diff --git a/htdocs/user/perms.php b/htdocs/user/perms.php index 96b1d372d6e..5a5f374949a 100644 --- a/htdocs/user/perms.php +++ b/htdocs/user/perms.php @@ -126,7 +126,7 @@ $modulesdir = array(); foreach ($conf->file->dol_document_root as $type => $dirroot) { - $modulesdir[] = $dirroot . "/includes/modules/"; + $modulesdir[] = $dirroot . "/core/modules/"; if ($type == 'alt') { @@ -137,9 +137,9 @@ foreach ($conf->file->dol_document_root as $type => $dirroot) { if (is_dir($dirroot.'/'.$file) && substr($file, 0, 1) <> '.' && substr($file, 0, 3) <> 'CVS' && $file != 'includes') { - if (is_dir($dirroot . '/' . $file . '/includes/modules/')) + if (is_dir($dirroot . '/' . $file . '/core/modules/')) { - $modulesdir[] = $dirroot . '/' . $file . '/includes/modules/'; + $modulesdir[] = $dirroot . '/' . $file . '/core/modules/'; } } } diff --git a/htdocs/viewimage.php b/htdocs/viewimage.php index 03f4847fb08..ce812cf048c 100644 --- a/htdocs/viewimage.php +++ b/htdocs/viewimage.php @@ -400,7 +400,7 @@ if ($modulepart == 'barcode') // Output files with barcode generators foreach ($conf->file->dol_document_root as $dirroot) { - $dir=$dirroot . "/includes/modules/barcode/"; + $dir=$dirroot . "/core/modules/barcode/"; $result=@include_once($dir.$generator.".modules.php"); if ($result) break; } diff --git a/scripts/invoices/rebuild_merge_pdf.php b/scripts/invoices/rebuild_merge_pdf.php index dec671c01c7..1695f3505d8 100644 --- a/scripts/invoices/rebuild_merge_pdf.php +++ b/scripts/invoices/rebuild_merge_pdf.php @@ -38,7 +38,7 @@ require_once($path."../../htdocs/master.inc.php"); // After this $db is an opened handler to database. We close it at end of file. require_once(DOL_DOCUMENT_ROOT."/cron/functions_cron.lib.php"); require_once(DOL_DOCUMENT_ROOT."/compta/facture/class/facture.class.php"); -require_once(DOL_DOCUMENT_ROOT."/includes/modules/facture/modules_facture.php"); +require_once(DOL_DOCUMENT_ROOT."/core/modules/facture/modules_facture.php"); require_once(DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php'); diff --git a/test/phpunit/BuildDocTest.php b/test/phpunit/BuildDocTest.php index 815a86b2844..c1b05121447 100644 --- a/test/phpunit/BuildDocTest.php +++ b/test/phpunit/BuildDocTest.php @@ -35,23 +35,23 @@ require_once dirname(__FILE__).'/../../htdocs/expedition/class/expedition.class. require_once dirname(__FILE__).'/../../htdocs/projet/class/project.class.php'; require_once dirname(__FILE__).'/../../htdocs/projet/class/task.class.php'; require_once dirname(__FILE__).'/../../htdocs/core/lib/pdf.lib.php'; -require_once dirname(__FILE__).'/../../htdocs/includes/modules/facture/doc/pdf_crabe.modules.php'; -require_once dirname(__FILE__).'/../../htdocs/includes/modules/facture/doc/pdf_oursin.modules.php'; -require_once dirname(__FILE__).'/../../htdocs/includes/modules/commande/pdf_edison.modules.php'; -require_once dirname(__FILE__).'/../../htdocs/includes/modules/commande/pdf_einstein.modules.php'; -require_once dirname(__FILE__).'/../../htdocs/includes/modules/propale/pdf_propale_azur.modules.php'; -require_once dirname(__FILE__).'/../../htdocs/includes/modules/propale/pdf_propale_jaune.modules.php'; -require_once dirname(__FILE__).'/../../htdocs/includes/modules/project/pdf/pdf_baleine.modules.php'; -require_once dirname(__FILE__).'/../../htdocs/includes/modules/fichinter/pdf_soleil.modules.php'; -require_once dirname(__FILE__).'/../../htdocs/includes/modules/expedition/pdf/pdf_expedition_merou.modules.php'; -require_once dirname(__FILE__).'/../../htdocs/includes/modules/expedition/pdf/pdf_expedition_rouget.modules.php'; +require_once dirname(__FILE__).'/../../htdocs/core/modules/facture/doc/pdf_crabe.modules.php'; +require_once dirname(__FILE__).'/../../htdocs/core/modules/facture/doc/pdf_oursin.modules.php'; +require_once dirname(__FILE__).'/../../htdocs/core/modules/commande/pdf_edison.modules.php'; +require_once dirname(__FILE__).'/../../htdocs/core/modules/commande/pdf_einstein.modules.php'; +require_once dirname(__FILE__).'/../../htdocs/core/modules/propale/pdf_propale_azur.modules.php'; +require_once dirname(__FILE__).'/../../htdocs/core/modules/propale/pdf_propale_jaune.modules.php'; +require_once dirname(__FILE__).'/../../htdocs/core/modules/project/pdf/pdf_baleine.modules.php'; +require_once dirname(__FILE__).'/../../htdocs/core/modules/fichinter/pdf_soleil.modules.php'; +require_once dirname(__FILE__).'/../../htdocs/core/modules/expedition/pdf/pdf_expedition_merou.modules.php'; +require_once dirname(__FILE__).'/../../htdocs/core/modules/expedition/pdf/pdf_expedition_rouget.modules.php'; // Mother classes of pdf generators -require_once dirname(__FILE__).'/../../htdocs/includes/modules/facture/modules_facture.php'; -require_once dirname(__FILE__).'/../../htdocs/includes/modules/commande/modules_commande.php'; -require_once dirname(__FILE__).'/../../htdocs/includes/modules/propale/modules_propale.php'; -require_once dirname(__FILE__).'/../../htdocs/includes/modules/project/modules_project.php'; -require_once dirname(__FILE__).'/../../htdocs/includes/modules/fichinter/modules_fichinter.php'; -require_once dirname(__FILE__).'/../../htdocs/includes/modules/expedition/pdf/ModelePdfExpedition.class.php'; +require_once dirname(__FILE__).'/../../htdocs/core/modules/facture/modules_facture.php'; +require_once dirname(__FILE__).'/../../htdocs/core/modules/commande/modules_commande.php'; +require_once dirname(__FILE__).'/../../htdocs/core/modules/propale/modules_propale.php'; +require_once dirname(__FILE__).'/../../htdocs/core/modules/project/modules_project.php'; +require_once dirname(__FILE__).'/../../htdocs/core/modules/fichinter/modules_fichinter.php'; +require_once dirname(__FILE__).'/../../htdocs/core/modules/expedition/pdf/ModelePdfExpedition.class.php'; if (empty($user->id)) { diff --git a/test/phpunit/ModulesTest.php b/test/phpunit/ModulesTest.php index 088c094a3bd..9169b064d84 100755 --- a/test/phpunit/ModulesTest.php +++ b/test/phpunit/ModulesTest.php @@ -124,7 +124,7 @@ class ModulesTest extends PHPUnit_Framework_TestCase 'Service','Societe','Stock','Syslog','Tax','User','WebServices'); foreach($modulelist as $modlabel) { - require_once(DOL_DOCUMENT_ROOT.'/includes/modules/mod'.$modlabel.'.class.php'); + require_once(DOL_DOCUMENT_ROOT.'/core/modules/mod'.$modlabel.'.class.php'); $class='mod'.$modlabel; $mod=new $class($db); $result=$mod->remove(); diff --git a/test/phpunit/hudson_phpunittest.xml b/test/phpunit/hudson_phpunittest.xml index 98a793df7cb..ccd0561976f 100644 --- a/test/phpunit/hudson_phpunittest.xml +++ b/test/phpunit/hudson_phpunittest.xml @@ -29,7 +29,7 @@ ../../htdocs/includes/geoip/../../htdocs/includes/jquery/../../htdocs/includes/jsgantt/ - ../../htdocs/includes/menus/smartphone/ + ../../htdocs/core/menus/smartphone/../../htdocs/includes/nusoap/../../htdocs/includes/odtphp/../../htdocs/includes/phpexcel/ @@ -40,11 +40,11 @@ ../../htdocs/../../htdocs/../../htdocs/ - ../../htdocs/includes/modules/facture/modules_facture.php - ../../htdocs/includes/modules/commande/modules_commande.php - ../../htdocs/includes/modules/propale/modules_propale.php - ../../htdocs/includes/modules/project/modules_project.php - ../../htdocs/includes/modules/fichinter/modules_fichinter.php + ../../htdocs/core/modules/facture/modules_facture.php + ../../htdocs/core/modules/commande/modules_commande.php + ../../htdocs/core/modules/propale/modules_propale.php + ../../htdocs/core/modules/project/modules_project.php + ../../htdocs/core/modules/fichinter/modules_fichinter.php ../../build/ ../../dev/ @@ -67,7 +67,7 @@ ../../htdocs/includes/geoip/ ../../htdocs/includes/jquery/ ../../htdocs/includes/jsgantt/ - ../../htdocs/includes/menus/smartphone + ../../htdocs/core/menus/smartphone ../../htdocs/includes/nusoap/ ../../htdocs/includes/odtphp/ ../../htdocs/includes/phpexcel/ diff --git a/test/phpunit/phpunittest.xml b/test/phpunit/phpunittest.xml index 42eef476c2b..9709e6dd19b 100644 --- a/test/phpunit/phpunittest.xml +++ b/test/phpunit/phpunittest.xml @@ -22,7 +22,7 @@ ../../htdocs/includes/geoip/ ../../htdocs/includes/jquery/ ../../htdocs/includes/jsgantt/ - ../../htdocs/includes/menus/smartphone/ + ../../htdocs/core/menus/smartphone/ ../../htdocs/includes/nusoap/ ../../htdocs/includes/odtphp/ ../../htdocs/includes/phpexcel/ @@ -33,11 +33,11 @@ ../../htdocs/ ../../htdocs/ ../../htdocs/ - ../../htdocs/includes/modules/facture/modules_facture.php - ../../htdocs/includes/modules/commande/modules_commande.php - ../../htdocs/includes/modules/propale/modules_propale.php - ../../htdocs/includes/modules/project/modules_project.php - ../../htdocs/includes/modules/fichinter/modules_fichinter.php + ../../htdocs/core/modules/facture/modules_facture.php + ../../htdocs/core/modules/commande/modules_commande.php + ../../htdocs/core/modules/propale/modules_propale.php + ../../htdocs/core/modules/project/modules_project.php + ../../htdocs/core/modules/fichinter/modules_fichinter.php ../CVS/ ../../build/ @@ -58,7 +58,7 @@ ../../htdocs/includes/geoip/ ../../htdocs/includes/jquery/ ../../htdocs/includes/jsgantt/ - ../../htdocs/includes/menus/smartphone + ../../htdocs/core/menus/smartphone ../../htdocs/includes/nusoap/ ../../htdocs/includes/odtphp/ ../../htdocs/includes/phpexcel/
'.$langs->trans("TargetsStatistics").'
'.$langs->trans('Model').''; // pdf - include_once(DOL_DOCUMENT_ROOT.'/includes/modules/commande/modules_commande.php'); + include_once(DOL_DOCUMENT_ROOT.'/core/modules/commande/modules_commande.php'); $liste=ModelePDFCommandes::liste_modeles($db); print $html->selectarray('model',$liste,$conf->global->COMMANDE_ADDON_PDF); print "
'.$langs->trans('Model').''; - include_once(DOL_DOCUMENT_ROOT.'/includes/modules/facture/modules_facture.php'); + include_once(DOL_DOCUMENT_ROOT.'/core/modules/facture/modules_facture.php'); $liste=ModelePDFFactures::liste_modeles($db); print $html->selectarray('model',$liste,$conf->global->FACTURE_ADDON_PDF); print "
'.$langs->trans("LibraryShort").''.$langs->trans("LibraryVersion").'
'.$langs->trans("LibraryShort").''.$langs->trans("LibraryVersion").'