lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop

Browse Source
This commit is contained in:
Laurent Destailleur 2011-10-24 14:20:10 +02:00
commit 7b31fa3369
312 changed files with 695 additions and 695 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build/deb/conf.php.install
View File

@ -136,7 +136,7 @@ $dolibarr_main_db_collation='latin1_swedish_ci';
# This parameter contains the way authentication is done. # This parameter contains the way authentication is done.
# If value "ldap" is used, you must also set parameters dolibarr_main_auth_ldap_* # If value "ldap" is used, you must also set parameters dolibarr_main_auth_ldap_*
# Default value: dolibarr # 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 # 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 # 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. # order defined into value. However, note that this can't work with all values.

4
build/makepack-dolibarrmodule.conf
View File

@ -8,8 +8,8 @@
# Setup: Go on Dolibarr setup - modules page to enable module. # Setup: Go on Dolibarr setup - modules page to enable module.
# #
# Files in module # Files in module
htdocs/includes/modules/modMyModule.class.php htdocs/core/modules/modMyModule.class.php
htdocs/includes/triggers/interface_mymodule.class.php htdocs/core/triggers/interface_mymodule.class.php
htdocs/mymodule/page1.php htdocs/mymodule/page1.php
htdocs/mymodule/page2.php htdocs/mymodule/page2.php
htdocs/mymodule/sql/script1.sql htdocs/mymodule/sql/script1.sql

18
build/tgz/tar_exclude.txt
View File

@ -45,15 +45,15 @@ htdocs/includes/treemenu/docs
htdocs/includes/treemenu/images htdocs/includes/treemenu/images
htdocs/includes/treemenu/imagesAlt htdocs/includes/treemenu/imagesAlt
htdocs/includes/treemenu/imagesAlt2 htdocs/includes/treemenu/imagesAlt2
htdocs/includes/modules/modBookmark4u.class.php htdocs/core/modules/modBookmark4u.class.php
htdocs/includes/modules/modDocument.class.php htdocs/core/modules/modDocument.class.php
htdocs/includes/modules/modDroitPret.class.php htdocs/core/modules/modDroitPret.class.php
htdocs/includes/modules/modEditeur.class.php htdocs/core/modules/modEditeur.class.php
htdocs/includes/modules/modPostnuke.class.php htdocs/core/modules/modPostnuke.class.php
htdocs/includes/modules/modTelephonie.class.php htdocs/core/modules/modTelephonie.class.php
htdocs/includes/triggers/interface_user.class.php htdocs/core/triggers/interface_user.class.php
htdocs/includes/triggers/interface_contractfrombill.class.php-NORUN htdocs/core/triggers/interface_contractfrombill.class.php-NORUN
htdocs/includes/triggers/interface_modEditeur_Editeur.class.php-NORUN htdocs/core/triggers/interface_modEditeur_Editeur.class.php-NORUN
htdocs/includes/tcpdf/fonts/utils htdocs/includes/tcpdf/fonts/utils
htdocs/includes/tcpdf/fonts/free*.ctg.z htdocs/includes/tcpdf/fonts/free*.ctg.z
htdocs/includes/tcpdf/fonts/free*.z htdocs/includes/tcpdf/fonts/free*.z

20
build/zip/zip_exclude.txt
View File

@ -46,16 +46,16 @@
*/htdocs/includes/treemenu/images/* */htdocs/includes/treemenu/images/*
*/htdocs/includes/treemenu/imagesAlt/* */htdocs/includes/treemenu/imagesAlt/*
*/htdocs/includes/treemenu/imagesAlt2/* */htdocs/includes/treemenu/imagesAlt2/*
*/htdocs/includes/modules/modBarcode.class.php */htdocs/core/modules/modBarcode.class.php
*/htdocs/includes/modules/modBookmark4u.class.php */htdocs/core/modules/modBookmark4u.class.php
*/htdocs/includes/modules/modClickToDial.class.php */htdocs/core/modules/modClickToDial.class.php
*/htdocs/includes/modules/modDocument.class.php */htdocs/core/modules/modDocument.class.php
*/htdocs/includes/modules/modDomain.class.php */htdocs/core/modules/modDomain.class.php
*/htdocs/includes/modules/modDroitPret.class.php */htdocs/core/modules/modDroitPret.class.php
*/htdocs/includes/modules/modEditeur.class.php */htdocs/core/modules/modEditeur.class.php
*/htdocs/includes/modules/modPostnuke.class.php */htdocs/core/modules/modPostnuke.class.php
*/htdocs/includes/triggers/interface_user.class.php */htdocs/core/triggers/interface_user.class.php
*/htdocs/includes/triggers/interface_contractfrombill.class.php-NORUN */htdocs/core/triggers/interface_contractfrombill.class.php-NORUN
*/htdocs/includes/tcpdf/fonts/utils/* */htdocs/includes/tcpdf/fonts/utils/*
*/htdocs/includes/tcpdf/fonts/free*.ctg.z */htdocs/includes/tcpdf/fonts/free*.ctg.z
*/htdocs/includes/tcpdf/fonts/free*.z */htdocs/includes/tcpdf/fonts/free*.z

4
dev/initdata/generate-propale.php
View File

@ -106,9 +106,9 @@ if ($resql)
$user->rights->propale->valider=1; $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; $i=0;

10
dev/skeletons/modMyModule.class.php
View File

@ -20,12 +20,12 @@
/** /**
* \defgroup mymodule Module MyModule * \defgroup mymodule Module MyModule
* \brief Example of a module descriptor. * \brief Example of a module descriptor.
* Such a file must be copied into htdocs/mymodule/includes/modules directory. * Such a file must be copied into htdocs/mymodule/core/modules directory.
* \file htdocs/mymodule/includes/modules/modMyModule.class.php * \file htdocs/mymodule/core/modules/modMyModule.class.php
* \ingroup mymodule * \ingroup mymodule
* \brief Description and activation file for module 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' // If file is in module/img directory under name object_pictovalue.png, use this->picto='pictovalue@module'
$this->picto='generic'; $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; $this->triggers = 0;
// Data directories to create when module is enabled. // Data directories to create when module is enabled.
@ -139,7 +139,7 @@ class modMyModule extends DolibarrModules
*/ */
// Boxes // 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 $this->boxes = array(); // List of boxes
$r=0; $r=0;
// Example: // Example:

4
htdocs/adherents/cartes/carte.php
View File

@ -25,8 +25,8 @@
require("../../main.inc.php"); require("../../main.inc.php");
require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
require_once(DOL_DOCUMENT_ROOT."/adherents/class/adherent.class.php"); require_once(DOL_DOCUMENT_ROOT."/adherents/class/adherent.class.php");
require_once(DOL_DOCUMENT_ROOT."/includes/modules/member/cards/modules_cards.php"); require_once(DOL_DOCUMENT_ROOT."/core/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/labels/modules_labels.php");
$langs->load("members"); $langs->load("members");
$langs->load("errors"); $langs->load("errors");

4
htdocs/admin/barcode.php
View File

@ -108,7 +108,7 @@ clearstatcache();
foreach ($conf->file->dol_document_root as $dirroot) foreach ($conf->file->dol_document_root as $dirroot)
{ {
$dir = $dirroot . "/includes/modules/barcode/"; $dir = $dirroot . "/core/modules/barcode/";
$handle=@opendir($dir); $handle=@opendir($dir);
if (is_resource($handle)) if (is_resource($handle))
@ -193,7 +193,7 @@ if ($resql)
// Chargement de la classe de codage // Chargement de la classe de codage
foreach ($conf->file->dol_document_root as $dirroot) 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"); $result=@include_once($dir.$obj->coder.".modules.php");
//print $dir.$obj->coder.".modules.php - ".$result; //print $dir.$obj->coder.".modules.php - ".$result;
if ($result) break; if ($result) break;

10
htdocs/admin/boxes.php
View File

@ -23,7 +23,7 @@
*/ */
require("../main.inc.php"); 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"); include_once(DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php");
$langs->load("admin"); $langs->load("admin");
@ -277,12 +277,12 @@ if ($resql)
{ {
$boxname = $regs[1]; $boxname = $regs[1];
$module = $regs[2]; $module = $regs[2];
$sourcefile = "/".$module."/includes/boxes/".$boxname.".php"; $sourcefile = "/".$module."/core/boxes/".$boxname.".php";
} }
else else
{ {
$boxname=preg_replace('/.php$/i','',$obj->file); $boxname=preg_replace('/.php$/i','',$obj->file);
$sourcefile = "/includes/boxes/".$boxname.".php"; $sourcefile = "/core/boxes/".$boxname.".php";
} }
dol_include_once($sourcefile); dol_include_once($sourcefile);
@ -393,12 +393,12 @@ if ($resql)
{ {
$boxname = $regs[1]; $boxname = $regs[1];
$module = $regs[2]; $module = $regs[2];
$sourcefile = "/".$module."/includes/boxes/".$boxname.".php"; $sourcefile = "/".$module."/core/boxes/".$boxname.".php";
} }
else else
{ {
$boxname=preg_replace('/.php$/i','',$obj->file); $boxname=preg_replace('/.php$/i','',$obj->file);
$sourcefile = "/includes/boxes/".$boxname.".php"; $sourcefile = "/core/boxes/".$boxname.".php";
} }
dol_include_once($sourcefile); dol_include_once($sourcefile);

8
htdocs/admin/commande.php
View File

@ -72,7 +72,7 @@ if ($action == 'specimen')
$commande->initAsSpecimen(); $commande->initAsSpecimen();
// Charge le modele // Charge le modele
$dir = DOL_DOCUMENT_ROOT . "/includes/modules/commande/"; $dir = DOL_DOCUMENT_ROOT . "/core/modules/commande/";
$file = "pdf_".$modele.".modules.php"; $file = "pdf_".$modele.".modules.php";
if (file_exists($dir.$file)) if (file_exists($dir.$file))
{ {
@ -243,7 +243,7 @@ clearstatcache();
foreach ($conf->file->dol_document_root as $dirroot) foreach ($conf->file->dol_document_root as $dirroot)
{ {
$dir = $dirroot . "/includes/modules/commande/"; $dir = $dirroot . "/core/modules/commande/";
if (is_dir($dir)) if (is_dir($dir))
{ {
@ -258,7 +258,7 @@ foreach ($conf->file->dol_document_root as $dirroot)
{ {
$file = substr($file, 0, dol_strlen($file)-4); $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; $module = new $file;
@ -374,7 +374,7 @@ clearstatcache();
foreach ($conf->file->dol_document_root as $dirroot) foreach ($conf->file->dol_document_root as $dirroot)
{ {
$dir = $dirroot . "/includes/modules/commande/"; $dir = $dirroot . "/core/modules/commande/";
if (is_dir($dir)) if (is_dir($dir))
{ {

2
htdocs/admin/confexped.php
View File

@ -65,7 +65,7 @@ else if ($action == 'disable_delivery')
/* /*
* Affiche page * Affiche page
*/ */
$dir = DOL_DOCUMENT_ROOT."/includes/modules/expedition/"; $dir = DOL_DOCUMENT_ROOT."/core/modules/expedition/";
$html=new Form($db); $html=new Form($db);
llxHeader("",""); llxHeader("","");

6
htdocs/admin/contract.php
View File

@ -80,7 +80,7 @@ if ($action == 'setmod')
llxHeader(); llxHeader();
$dir=DOL_DOCUMENT_ROOT."/includes/modules/contract/"; $dir=DOL_DOCUMENT_ROOT."/core/modules/contract/";
$html=new Form($db); $html=new Form($db);
$linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>'; $linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';
@ -101,7 +101,7 @@ print "</tr>\n";
clearstatcache(); clearstatcache();
$dir = "../includes/modules/contract/"; $dir = "../core/modules/contract/";
$handle = opendir($dir); $handle = opendir($dir);
if (is_resource($handle)) if (is_resource($handle))
{ {
@ -113,7 +113,7 @@ if (is_resource($handle))
{ {
$file = substr($file, 0, dol_strlen($file)-4); $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; $module = new $file;

4
htdocs/admin/dons.php
View File

@ -44,7 +44,7 @@ if ($_GET["action"] == 'specimen')
$don->initAsSpecimen(); $don->initAsSpecimen();
// Charge le modele // Charge le modele
$dir = DOL_DOCUMENT_ROOT . "/includes/modules/dons/"; $dir = DOL_DOCUMENT_ROOT . "/core/modules/dons/";
$file = $modele.".modules.php"; $file = $modele.".modules.php";
if (file_exists($dir.$file)) if (file_exists($dir.$file))
{ {
@ -126,7 +126,7 @@ if ($_GET["action"] == 'del')
* View * View
*/ */
$dir = "../includes/modules/dons/"; $dir = "../core/modules/dons/";
$html=new Form($db); $html=new Form($db);
llxHeader('',$langs->trans("DonationsSetup"),'DonConfiguration'); llxHeader('',$langs->trans("DonationsSetup"),'DonConfiguration');

10
htdocs/admin/expedition.php
View File

@ -58,7 +58,7 @@ if ($action == 'specimen')
//$exp->fetch_commande(); //$exp->fetch_commande();
// Charge le modele // 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"; $file = "pdf_expedition_".$modele.".modules.php";
if (file_exists($dir.$file)) if (file_exists($dir.$file))
{ {
@ -161,7 +161,7 @@ if ($action == 'setmethod' || $action== 'setmod')
$moduleid=GETPOST("moduleid"); $moduleid=GETPOST("moduleid");
$statut=GETPOST("statut"); $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"; $classname = "methode_expedition_$module";
$expem = new $classname($db); $expem = new $classname($db);
@ -350,7 +350,7 @@ clearstatcache();
foreach ($conf->file->dol_document_root as $dirroot) foreach ($conf->file->dol_document_root as $dirroot)
{ {
$dir = $dirroot . "/includes/modules/expedition/"; $dir = $dirroot . "/core/modules/expedition/";
if (is_dir($dir)) if (is_dir($dir))
{ {
@ -365,7 +365,7 @@ foreach ($conf->file->dol_document_root as $dirroot)
{ {
$file = substr($file, 0, dol_strlen($file)-4); $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; $module = new $file;
@ -486,7 +486,7 @@ clearstatcache();
foreach ($conf->file->dol_document_root as $dirroot) foreach ($conf->file->dol_document_root as $dirroot)
{ {
$dir = $dirroot . "/includes/modules/expedition/pdf/"; $dir = $dirroot . "/core/modules/expedition/pdf/";
if (is_dir($dir)) if (is_dir($dir))
{ {

6
htdocs/admin/facture.php
View File

@ -77,7 +77,7 @@ if ($action == 'specimen')
$facture->initAsSpecimen(); $facture->initAsSpecimen();
// Load template // Load template
$dir = DOL_DOCUMENT_ROOT . "/includes/modules/facture/doc/"; $dir = DOL_DOCUMENT_ROOT . "/core/modules/facture/doc/";
$file = "pdf_".$modele.".modules.php"; $file = "pdf_".$modele.".modules.php";
if (file_exists($dir.$file)) if (file_exists($dir.$file))
{ {
@ -345,7 +345,7 @@ clearstatcache();
$var=true; $var=true;
foreach ($conf->file->dol_document_root as $dirroot) foreach ($conf->file->dol_document_root as $dirroot)
{ {
$dir = $dirroot . "/includes/modules/facture/"; $dir = $dirroot . "/core/modules/facture/";
if (is_dir($dir)) if (is_dir($dir))
{ {
@ -512,7 +512,7 @@ foreach ($conf->file->dol_document_root as $dirroot)
{ {
foreach (array('','/doc') as $valdir) foreach (array('','/doc') as $valdir)
{ {
$dir = $dirroot . "/includes/modules/facture".$valdir; $dir = $dirroot . "/core/modules/facture".$valdir;
if (is_dir($dir)) if (is_dir($dir))
{ {

6
htdocs/admin/fichinter.php
View File

@ -106,7 +106,7 @@ if ($action == 'specimen')
$inter->initAsSpecimen(); $inter->initAsSpecimen();
// Charge le modele // Charge le modele
$dir = DOL_DOCUMENT_ROOT . "/includes/modules/fichinter/"; $dir = DOL_DOCUMENT_ROOT . "/core/modules/fichinter/";
$file = "pdf_".$modele.".modules.php"; $file = "pdf_".$modele.".modules.php";
if (file_exists($dir.$file)) if (file_exists($dir.$file))
{ {
@ -242,7 +242,7 @@ clearstatcache();
foreach ($conf->file->dol_document_root as $dirroot) foreach ($conf->file->dol_document_root as $dirroot)
{ {
$dir = $dirroot . "/includes/modules/fichinter/"; $dir = $dirroot . "/core/modules/fichinter/";
if (is_dir($dir)) if (is_dir($dir))
{ {
@ -360,7 +360,7 @@ clearstatcache();
$var=true; $var=true;
foreach ($conf->file->dol_document_root as $dirroot) foreach ($conf->file->dol_document_root as $dirroot)
{ {
$dir = $dirroot . "/includes/modules/fichinter/"; $dir = $dirroot . "/core/modules/fichinter/";
if (is_dir($dir)) if (is_dir($dir))
{ {

10
htdocs/admin/fournisseur.php
View File

@ -77,7 +77,7 @@ if ($action == 'specimen') // For orders
$commande->thirdparty=$specimenthirdparty; $commande->thirdparty=$specimenthirdparty;
// Charge le modele // Charge le modele
$dir = "/includes/modules/supplier_order/pdf/"; $dir = "/core/modules/supplier_order/pdf/";
$file = "pdf_".$modele.".modules.php"; $file = "pdf_".$modele.".modules.php";
$file = dol_buildpath($dir.$file); $file = dol_buildpath($dir.$file);
if (file_exists($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) $facture->thirdparty=$specimenthirdparty; // Define who should has build the invoice (so the supplier)
// Charge le modele // Charge le modele
$dir = "/includes/modules/supplier_invoice/pdf/"; $dir = "/core/modules/supplier_invoice/pdf/";
$file = "pdf_".$modele.".modules.php"; $file = "pdf_".$modele.".modules.php";
$file = dol_buildpath($dir.$file); $file = dol_buildpath($dir.$file);
if (file_exists($file)) if (file_exists($file))
@ -269,7 +269,7 @@ clearstatcache();
foreach ($conf->file->dol_document_root as $dirroot) foreach ($conf->file->dol_document_root as $dirroot)
{ {
$dir = $dirroot . "/includes/modules/supplier_order/"; $dir = $dirroot . "/core/modules/supplier_order/";
if (is_dir($dir)) if (is_dir($dir))
{ {
@ -404,7 +404,7 @@ clearstatcache();
foreach ($conf->file->dol_document_root as $dirroot) 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)) if (is_dir($dir))
{ {
@ -537,7 +537,7 @@ clearstatcache();
foreach ($conf->file->dol_document_root as $dirroot) 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)) if (is_dir($dir))
{ {

8
htdocs/admin/livraison.php
View File

@ -70,7 +70,7 @@ if ($action == 'specimen')
//$sending->fetch_commande(); //$sending->fetch_commande();
// Charge le modele // Charge le modele
$dir = DOL_DOCUMENT_ROOT . "/includes/modules/livraison/pdf/"; $dir = DOL_DOCUMENT_ROOT . "/core/modules/livraison/pdf/";
$file = "pdf_".$modele.".modules.php"; $file = "pdf_".$modele.".modules.php";
if (file_exists($dir.$file)) if (file_exists($dir.$file))
{ {
@ -238,7 +238,7 @@ clearstatcache();
foreach ($conf->file->dol_document_root as $dirroot) foreach ($conf->file->dol_document_root as $dirroot)
{ {
$dir = $dirroot . "/includes/modules/livraison/"; $dir = $dirroot . "/core/modules/livraison/";
if (is_dir($dir)) if (is_dir($dir))
{ {
@ -252,7 +252,7 @@ foreach ($conf->file->dol_document_root as $dirroot)
{ {
$file = substr($file, 0, dol_strlen($file)-4); $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; $module = new $file;
@ -371,7 +371,7 @@ clearstatcache();
foreach ($conf->file->dol_document_root as $dirroot) foreach ($conf->file->dol_document_root as $dirroot)
{ {
$dir = $dirroot . "/includes/modules/livraison/pdf/"; $dir = $dirroot . "/core/modules/livraison/pdf/";
if (is_dir($dir)) if (is_dir($dir))
{ {

8
htdocs/admin/menus.php
View File

@ -38,9 +38,9 @@ $langs->load("other");
// Security check // Security check
if (!$user->admin) accessforbidden(); if (!$user->admin) accessforbidden();
$dirtop = "/includes/menus/standard"; $dirtop = "/core/menus/standard";
$dirleft = "/includes/menus/standard"; $dirleft = "/core/menus/standard";
$dirsmartphone = "/includes/menus/smartphone"; $dirsmartphone = "/core/menus/smartphone";
// Cette page peut etre longue. On augmente le delai autorise. // 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) foreach ($listofmenuhandler as $key => $val)
{ {
// Load sql init_menu_handler.sql file // Load sql init_menu_handler.sql file
$dir = "/includes/menus/"; $dir = "/core/menus/";
$file='init_menu_'.$key.'.sql'; $file='init_menu_'.$key.'.sql';
$fullpath=dol_buildpath($dir.$file); $fullpath=dol_buildpath($dir.$file);

6
htdocs/admin/menus/edit.php
View File

@ -33,9 +33,9 @@ $langs->load("admin");
if (! $user->admin) if (! $user->admin)
accessforbidden(); accessforbidden();
$dirtop = "/includes/menus/standard"; $dirtop = "/core/menus/standard";
$dirleft = "/includes/menus/standard"; $dirleft = "/core/menus/standard";
$dirsmartphone = "/includes/menus/smartphone"; $dirsmartphone = "/core/menus/smartphone";
$dirmenu = array($dirleft,$dirsmartphone); $dirmenu = array($dirleft,$dirsmartphone);

6
htdocs/admin/menus/index.php
View File

@ -33,9 +33,9 @@ $langs->load("admin");
if (! $user->admin) if (! $user->admin)
accessforbidden(); accessforbidden();
$dirtop = "/includes/menus/standard"; $dirtop = "/core/menus/standard";
$dirleft = "/includes/menus/standard"; $dirleft = "/core/menus/standard";
$dirsmartphone = "/includes/menus/smartphone"; $dirsmartphone = "/core/menus/smartphone";
$dirmenu = array($dirleft,$dirsmartphone); $dirmenu = array($dirleft,$dirsmartphone);

6
htdocs/admin/modules.php
View File

@ -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) foreach ($conf->file->dol_document_root as $type => $dirroot)
{ {
$modulesdir[] = $dirroot . "/includes/modules/"; $modulesdir[] = $dirroot . "/core/modules/";
if ($type == 'alt') 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) && 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/';
} }
} }
} }

2
htdocs/admin/notification.php
View File

@ -24,7 +24,7 @@
require("../main.inc.php"); require("../main.inc.php");
require_once(DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php");
require_once(DOL_DOCUMENT_ROOT."/includes/triggers/interface_modNotification_Notification.class.php"); require_once(DOL_DOCUMENT_ROOT."/core/triggers/interface_modNotification_Notification.class.php");
$langs->load("admin"); $langs->load("admin");
$langs->load("other"); $langs->load("other");

6
htdocs/admin/perms.php
View File

@ -83,7 +83,7 @@ $modulesdir = array();
foreach ($conf->file->dol_document_root as $type => $dirroot) foreach ($conf->file->dol_document_root as $type => $dirroot)
{ {
$modulesdir[] = $dirroot . "/includes/modules/"; $modulesdir[] = $dirroot . "/core/modules/";
if ($type == 'alt') 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) && 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/';
} }
} }
} }

8
htdocs/admin/project.php
View File

@ -69,7 +69,7 @@ if ($action == 'specimen')
$project->initAsSpecimen(); $project->initAsSpecimen();
// Charge le modele // Charge le modele
$dir = DOL_DOCUMENT_ROOT . "/includes/modules/project/pdf/"; $dir = DOL_DOCUMENT_ROOT . "/core/modules/project/pdf/";
$file = "pdf_".$modele.".modules.php"; $file = "pdf_".$modele.".modules.php";
if (file_exists($dir.$file)) if (file_exists($dir.$file))
{ {
@ -183,7 +183,7 @@ print "<br>";
// Project numbering module // Project numbering module
$dir = DOL_DOCUMENT_ROOT."/includes/modules/project/"; $dir = DOL_DOCUMENT_ROOT."/core/modules/project/";
print_titre($langs->trans("ProjectsNumberingModules")); print_titre($langs->trans("ProjectsNumberingModules"));
@ -209,7 +209,7 @@ if (is_resource($handle))
{ {
$file = substr($file, 0, dol_strlen($file)-4); $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; $module = new $file;
@ -280,7 +280,7 @@ print '</table><br>';
* Modeles documents for projects * 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")); print_titre($langs->trans("ProjectsModelModule"));

6
htdocs/admin/propale.php
View File

@ -71,7 +71,7 @@ if ($action == 'specimen')
$propal->initAsSpecimen(); $propal->initAsSpecimen();
// Charge le modele // Charge le modele
$dir = "/includes/modules/propale/"; $dir = "/core/modules/propale/";
$file = "pdf_propale_".$modele.".modules.php"; $file = "pdf_propale_".$modele.".modules.php";
$file = dol_buildpath($dir.$file); $file = dol_buildpath($dir.$file);
if (file_exists($file)) if (file_exists($file))
@ -276,7 +276,7 @@ clearstatcache();
foreach ($conf->file->dol_document_root as $dirroot) foreach ($conf->file->dol_document_root as $dirroot)
{ {
$dir = $dirroot . "/includes/modules/propale/"; $dir = $dirroot . "/core/modules/propale/";
if (is_dir($dir)) if (is_dir($dir))
{ {
@ -406,7 +406,7 @@ clearstatcache();
foreach ($conf->file->dol_document_root as $dirroot) foreach ($conf->file->dol_document_root as $dirroot)
{ {
$dir = $dirroot . "/includes/modules/propale/"; $dir = $dirroot . "/core/modules/propale/";
if (is_dir($dir)) if (is_dir($dir))
{ {

2
htdocs/admin/security.php
View File

@ -211,7 +211,7 @@ print '<input type="hidden" name="constname" value="USER_PASSWORD_GENERATED">';
print '<input type="hidden" name="consttype" value="yesno">'; print '<input type="hidden" name="consttype" value="yesno">';
// Charge tableau des modules generation // Charge tableau des modules generation
$dir = "../includes/modules/security/generate"; $dir = "../core/modules/security/generate";
clearstatcache(); clearstatcache();
$handle=opendir($dir); $handle=opendir($dir);
$i=1; $i=1;

6
htdocs/admin/system/modules.php
View File

@ -49,7 +49,7 @@ $modules_files = array();
foreach ($conf->file->dol_document_root as $type => $dirroot) foreach ($conf->file->dol_document_root as $type => $dirroot)
{ {
$modulesdir[] = $dirroot . "/includes/modules/"; $modulesdir[] = $dirroot . "/core/modules/";
if ($type == 'alt') 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) && 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/';
} }
} }
} }

8
htdocs/boxes.php
View File

@ -204,12 +204,12 @@ class InfoBox
{ {
$boxname = $regs[1]; $boxname = $regs[1];
$module = $regs[2]; $module = $regs[2];
$sourcefile = dol_buildpath("/".$module."/includes/boxes/".$boxname.".php"); $sourcefile = dol_buildpath("/".$module."/core/boxes/".$boxname.".php");
} }
else else
{ {
$boxname=preg_replace('/.php$/i','',$obj->file); $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); include_once($sourcefile);
@ -265,12 +265,12 @@ class InfoBox
{ {
$boxname = $regs[1]; $boxname = $regs[1];
$module = $regs[2]; $module = $regs[2];
$sourcefile = "/".$module."/includes/boxes/".$boxname.".php"; $sourcefile = "/".$module."/core/boxes/".$boxname.".php";
} }
else else
{ {
$boxname=preg_replace('/.php$/i','',$obj->file); $boxname=preg_replace('/.php$/i','',$obj->file);
$sourcefile = "/includes/boxes/".$boxname.".php"; $sourcefile = "/core/boxes/".$boxname.".php";
} }
dol_include_once($sourcefile); dol_include_once($sourcefile);

2
htdocs/comm/action/rapport/index.php
View File

@ -28,7 +28,7 @@ require("../../../main.inc.php");
require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
require_once(DOL_DOCUMENT_ROOT."/contact/class/contact.class.php"); require_once(DOL_DOCUMENT_ROOT."/contact/class/contact.class.php");
require_once(DOL_DOCUMENT_ROOT."/comm/action/class/actioncomm.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'); $sortfield = GETPOST("sortfield",'alpha');
$sortorder = GETPOST("sortorder",'alpha'); $sortorder = GETPOST("sortorder",'alpha');

6
htdocs/comm/addpropal.php
View File

@ -27,7 +27,7 @@
require("../main.inc.php"); require("../main.inc.php");
require_once(DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.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) if ($conf->projet->enabled)
{ {
require_once(DOL_DOCUMENT_ROOT."/projet/class/project.class.php"); require_once(DOL_DOCUMENT_ROOT."/projet/class/project.class.php");
@ -82,9 +82,9 @@ if ($_GET["action"] == 'create')
$obj = $conf->global->PROPALE_ADDON; $obj = $conf->global->PROPALE_ADDON;
if ($obj) 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; $modPropale = new $obj;
$numpr = $modPropale->getNextValue($soc,$propal); $numpr = $modPropale->getNextValue($soc,$propal);
} }

6
htdocs/comm/mailing/cibles.php
View File

@ -36,7 +36,7 @@ if (! $user->rights->mailing->lire || $user->societe_id > 0)
accessforbidden(); accessforbidden();
$dirmod=DOL_DOCUMENT_ROOT."/includes/modules/mailings"; $dirmod=DOL_DOCUMENT_ROOT."/core/modules/mailings";
$mesg = ''; $mesg = '';
@ -69,7 +69,7 @@ if ($_GET["action"] == 'add')
$var=true; $var=true;
foreach ($conf->file->dol_document_root as $dirmod) foreach ($conf->file->dol_document_root as $dirmod)
{ {
$dir=$dirmod."/includes/modules/mailings/"; $dir=$dirmod."/core/modules/mailings/";
if (is_dir($dir)) if (is_dir($dir))
{ {
@ -229,7 +229,7 @@ if ($mil->fetch($_REQUEST["id"]) >= 0)
$var=true; $var=true;
foreach ($conf->file->dol_document_root as $dirroot) foreach ($conf->file->dol_document_root as $dirroot)
{ {
$dir=$dirroot."/includes/modules/mailings/"; $dir=$dirroot."/core/modules/mailings/";
if (is_dir($dir)) if (is_dir($dir))
{ {

2
htdocs/comm/mailing/index.php
View File

@ -67,7 +67,7 @@ print "</table></form><br>\n";
print '<table class="noborder" width="100%">'; print '<table class="noborder" width="100%">';
print '<tr class="liste_titre"><td colspan="3">'.$langs->trans("TargetsStatistics").'</td></tr>'; print '<tr class="liste_titre"><td colspan="3">'.$langs->trans("TargetsStatistics").'</td></tr>';
$dir=DOL_DOCUMENT_ROOT."/includes/modules/mailings"; $dir=DOL_DOCUMENT_ROOT."/core/modules/mailings";
$handle=opendir($dir); $handle=opendir($dir);
$var=True; $var=True;

2
htdocs/comm/propal.php
View File

@ -30,7 +30,7 @@
require("../main.inc.php"); require("../main.inc.php");
require_once(DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.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.'/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.formother.class.php");
require_once(DOL_DOCUMENT_ROOT."/core/class/html.formfile.class.php"); require_once(DOL_DOCUMENT_ROOT."/core/class/html.formfile.class.php");

6
htdocs/comm/propal/class/propal.class.php
View File

@ -885,7 +885,7 @@ class Propal extends CommonObject
$objsoc->fetch($object->socid); $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'; $this->error='ErrorSetupNotComplete';
return -1; return -1;
@ -900,7 +900,7 @@ class Propal extends CommonObject
$object->ref_client = ''; $object->ref_client = '';
// Set ref // 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; $obj = $conf->global->PROPALE_ADDON;
$modPropale = new $obj; $modPropale = new $obj;
$object->ref = $modPropale->getNextValue($objsoc,$object); $object->ref = $modPropale->getNextValue($objsoc,$object);
@ -2275,7 +2275,7 @@ class Propal extends CommonObject
global $conf, $db, $langs; global $conf, $db, $langs;
$langs->load("propal"); $langs->load("propal");
$dir = DOL_DOCUMENT_ROOT . "/includes/modules/propale/"; $dir = DOL_DOCUMENT_ROOT . "/core/modules/propale/";
if (! empty($conf->global->PROPALE_ADDON)) if (! empty($conf->global->PROPALE_ADDON))
{ {

2
htdocs/commande/class/commande.class.php
View File

@ -126,7 +126,7 @@ class Commande extends CommonObject
global $db, $langs, $conf; global $db, $langs, $conf;
$langs->load("order"); $langs->load("order");
$dir = DOL_DOCUMENT_ROOT . "/includes/modules/commande"; $dir = DOL_DOCUMENT_ROOT . "/core/modules/commande";
if (! empty($conf->global->COMMANDE_ADDON)) if (! empty($conf->global->COMMANDE_ADDON))
{ {

6
htdocs/commande/fiche.php
View File

@ -30,7 +30,7 @@
require("../main.inc.php"); require("../main.inc.php");
require_once(DOL_DOCUMENT_ROOT."/core/class/html.formfile.class.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."/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.'/commande/class/commande.class.php');
require_once(DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.class.php'); require_once(DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.class.php');
require_once(DOL_DOCUMENT_ROOT."/core/lib/order.lib.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 * 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 // Sauvegarde le dernier modele choisi pour generer un document
@ -1285,7 +1285,7 @@ if ($action == 'create' && $user->rights->commande->creer)
print '<tr><td>'.$langs->trans('Model').'</td>'; print '<tr><td>'.$langs->trans('Model').'</td>';
print '<td colspan="2">'; print '<td colspan="2">';
// pdf // 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); $liste=ModelePDFCommandes::liste_modeles($db);
print $html->selectarray('model',$liste,$conf->global->COMMANDE_ADDON_PDF); print $html->selectarray('model',$liste,$conf->global->COMMANDE_ADDON_PDF);
print "</td></tr>"; print "</td></tr>";

2
htdocs/compta/dons/fiche.php
View File

@ -23,7 +23,7 @@
*/ */
require("../../main.inc.php"); 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.formfile.class.php");
require_once(DOL_DOCUMENT_ROOT."/core/class/html.formcompany.class.php"); require_once(DOL_DOCUMENT_ROOT."/core/class/html.formcompany.class.php");
require_once(DOL_DOCUMENT_ROOT."/compta/dons/class/don.class.php"); require_once(DOL_DOCUMENT_ROOT."/compta/dons/class/don.class.php");

4
htdocs/compta/facture.php
View File

@ -30,7 +30,7 @@
require('../main.inc.php'); require('../main.inc.php');
require_once(DOL_DOCUMENT_ROOT."/core/class/html.formfile.class.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."/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.'/compta/facture/class/facture.class.php');
require_once(DOL_DOCUMENT_ROOT.'/core/class/discount.class.php'); require_once(DOL_DOCUMENT_ROOT.'/core/class/discount.class.php');
require_once(DOL_DOCUMENT_ROOT.'/compta/paiement/class/paiement.class.php'); require_once(DOL_DOCUMENT_ROOT.'/compta/paiement/class/paiement.class.php');
@ -1722,7 +1722,7 @@ if ($action == 'create')
// Modele PDF // Modele PDF
print '<tr><td>'.$langs->trans('Model').'</td>'; print '<tr><td>'.$langs->trans('Model').'</td>';
print '<td>'; print '<td>';
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); $liste=ModelePDFFactures::liste_modeles($db);
print $html->selectarray('model',$liste,$conf->global->FACTURE_ADDON_PDF); print $html->selectarray('model',$liste,$conf->global->FACTURE_ADDON_PDF);
print "</td></tr>"; print "</td></tr>";

4
htdocs/compta/facture/class/facture.class.php
View File

@ -2557,7 +2557,7 @@ class Facture extends CommonObject
// Include file with class // Include file with class
foreach ($conf->file->dol_document_root as $dirroot) 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) // Load file with numbering class (if found)
$mybool|=@include_once($dir.$file); $mybool|=@include_once($dir.$file);
} }
@ -2570,7 +2570,7 @@ class Facture extends CommonObject
// Include file with class // Include file with class
foreach ($conf->file->dol_document_root as $dirroot) 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) // Load file with numbering class (if found)
$mybool|=@include_once($dir.$file); $mybool|=@include_once($dir.$file);
} }

2
htdocs/compta/paiement/cheque/class/remisecheque.class.php
View File

@ -479,7 +479,7 @@ class RemiseCheque extends CommonObject
dol_syslog("RemiseCheque::generatePdf model=".$model." id=".$this->id, LOG_DEBUG); 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 // Charge le modele
$file = "pdf_".$model.".class.php"; $file = "pdf_".$model.".class.php";

2
htdocs/compta/paiement/fiche.php
View File

@ -28,7 +28,7 @@
require("../../main.inc.php"); require("../../main.inc.php");
require_once(DOL_DOCUMENT_ROOT.'/compta/paiement/class/paiement.class.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.'/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'); if ($conf->banque->enabled) require_once(DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php');
$langs->load('bills'); $langs->load('bills');

2
htdocs/compta/paiement/rapport.php
View File

@ -23,7 +23,7 @@
*/ */
require("../../main.inc.php"); 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"); require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
// Security check // Security check

2
htdocs/compta/payment_sc/fiche.php
View File

@ -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/chargesociales.class.php");
require_once(DOL_DOCUMENT_ROOT."/compta/sociales/class/paymentsocialcontribution.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.'/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'); if ($conf->banque->enabled) require_once(DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php');
$langs->load('bills'); $langs->load('bills');

2
htdocs/compta/prelevement/demandes.php
View File

@ -23,7 +23,7 @@
* \brief Page to list withdraw requests * \brief Page to list withdraw requests
*/ */
require("../bank/pre.inc.php"); 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."/compta/facture/class/facture.class.php";
require_once DOL_DOCUMENT_ROOT."/societe/class/societe.class.php"; require_once DOL_DOCUMENT_ROOT."/societe/class/societe.class.php";

2
htdocs/conf/conf.php.example
View File

@ -156,7 +156,7 @@ $dolibarr_main_db_collation='latin1_swedish_ci';
# This parameter contains the way authentication is done. # This parameter contains the way authentication is done.
# If value "ldap" is used, you must also set parameters dolibarr_main_auth_ldap_* # If value "ldap" is used, you must also set parameters dolibarr_main_auth_ldap_*
# Default value: dolibarr # 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 # 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 # 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. # order defined into value. However, note that this can't work with all values.

2
htdocs/contrat/class/contrat.class.php
View File

@ -95,7 +95,7 @@ class Contrat extends CommonObject
global $db, $langs, $conf; global $db, $langs, $conf;
$langs->load("contract"); $langs->load("contract");
$dir = DOL_DOCUMENT_ROOT . "/includes/modules/contract"; $dir = DOL_DOCUMENT_ROOT . "/core/modules/contract";
if (empty($conf->global->CONTRACT_ADDON)) if (empty($conf->global->CONTRACT_ADDON))
{ {

2
htdocs/contrat/fiche.php
View File

@ -28,7 +28,7 @@
require ("../main.inc.php"); require ("../main.inc.php");
require_once(DOL_DOCUMENT_ROOT."/core/lib/date.lib.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.'/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->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->propal->enabled) require_once(DOL_DOCUMENT_ROOT."/comm/propal/class/propal.class.php");
if ($conf->contrat->enabled) require_once(DOL_DOCUMENT_ROOT."/contrat/class/contrat.class.php"); if ($conf->contrat->enabled) require_once(DOL_DOCUMENT_ROOT."/contrat/class/contrat.class.php");

4
htdocs/includes/boxes/box_actions.php → htdocs/core/boxes/box_actions.php
View File

@ -18,12 +18,12 @@
*/ */
/** /**
* \file htdocs/includes/boxes/box_actions.php * \file htdocs/core/boxes/box_actions.php
* \ingroup actions * \ingroup actions
* \brief Module to build boxe for events * \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 { class box_actions extends ModeleBoxes {

4
htdocs/includes/boxes/box_bookmarks.php → htdocs/core/boxes/box_bookmarks.php
View File

@ -16,11 +16,11 @@
*/ */
/** /**
* \file htdocs/includes/boxes/box_bookmarks.php * \file htdocs/core/boxes/box_bookmarks.php
* \ingroup bookmark * \ingroup bookmark
* \brief Module to generate box of bookmarks list * \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 { class box_bookmarks extends ModeleBoxes {

4
htdocs/includes/boxes/box_clients.php → htdocs/core/boxes/box_clients.php
View File

@ -18,12 +18,12 @@
*/ */
/** /**
* \file htdocs/includes/boxes/box_clients.php * \file htdocs/core/boxes/box_clients.php
* \ingroup societes * \ingroup societes
* \brief Module de generation de l'affichage de la box clients * \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 { class box_clients extends ModeleBoxes {

4
htdocs/includes/boxes/box_commandes.php → htdocs/core/boxes/box_commandes.php
View File

@ -18,12 +18,12 @@
*/ */
/** /**
* \file htdocs/includes/boxes/box_commandes.php * \file htdocs/core/boxes/box_commandes.php
* \ingroup commande * \ingroup commande
* \brief Module de generation de l'affichage de la box commandes * \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 { class box_commandes extends ModeleBoxes {

4
htdocs/includes/boxes/box_comptes.php → htdocs/core/boxes/box_comptes.php
View File

@ -18,11 +18,11 @@
*/ */
/** /**
* \file htdocs/includes/boxes/box_comptes.php * \file htdocs/core/boxes/box_comptes.php
* \ingroup banque * \ingroup banque
* \brief Module to generate box for bank accounts * \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"); include_once(DOL_DOCUMENT_ROOT."/compta/bank/class/account.class.php");

4
htdocs/includes/boxes/box_contacts.php → htdocs/core/boxes/box_contacts.php
View File

@ -18,12 +18,12 @@
*/ */
/** /**
* \file htdocs/includes/boxes/box_contacts.php * \file htdocs/core/boxes/box_contacts.php
* \ingroup societes * \ingroup societes
* \brief Module to show box of contacts * \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"); include_once(DOL_DOCUMENT_ROOT."/contact/class/contact.class.php");

4
htdocs/includes/boxes/box_contracts.php → htdocs/core/boxes/box_contracts.php
View File

@ -16,12 +16,12 @@
*/ */
/** /**
* \file htdocs/includes/boxes/box_contracts.php * \file htdocs/core/boxes/box_contracts.php
* \ingroup contracts * \ingroup contracts
* \brief Module de generation de l'affichage de la box 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 { class box_contracts extends ModeleBoxes {

4
htdocs/includes/boxes/box_external_rss.php → htdocs/core/boxes/box_external_rss.php
View File

@ -19,13 +19,13 @@
*/ */
/** /**
* \file htdocs/includes/boxes/box_external_rss.php * \file htdocs/core/boxes/box_external_rss.php
* \ingroup external_rss * \ingroup external_rss
* \brief Fichier de gestion d'une box pour le module 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."/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 { class box_external_rss extends ModeleBoxes {

4
htdocs/includes/boxes/box_factures.php → htdocs/core/boxes/box_factures.php
View File

@ -18,11 +18,11 @@
*/ */
/** /**
* \file htdocs/includes/boxes/box_factures.php * \file htdocs/core/boxes/box_factures.php
* \ingroup factures * \ingroup factures
* \brief Module de generation de l'affichage de la box 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 { class box_factures extends ModeleBoxes {

4
htdocs/includes/boxes/box_factures_fourn.php → htdocs/core/boxes/box_factures_fourn.php
View File

@ -18,11 +18,11 @@
*/ */
/** /**
* \file htdocs/includes/boxes/box_factures_fourn.php * \file htdocs/core/boxes/box_factures_fourn.php
* \ingroup supplier * \ingroup supplier
* \brief Fichier de gestion d'une box des factures fournisseurs * \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 { class box_factures_fourn extends ModeleBoxes {

4
htdocs/includes/boxes/box_factures_fourn_imp.php → htdocs/core/boxes/box_factures_fourn_imp.php
View File

@ -17,11 +17,11 @@
*/ */
/** /**
* \file htdocs/includes/boxes/box_factures_fourn_imp.php * \file htdocs/core/boxes/box_factures_fourn_imp.php
* \ingroup fournisseur * \ingroup fournisseur
* \brief Fichier de gestion d'une box des factures fournisseurs impayees * \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 { class box_factures_fourn_imp extends ModeleBoxes {

4
htdocs/includes/boxes/box_factures_imp.php → htdocs/core/boxes/box_factures_imp.php
View File

@ -18,12 +18,12 @@
*/ */
/** /**
* \file htdocs/includes/boxes/box_factures_imp.php * \file htdocs/core/boxes/box_factures_imp.php
* \ingroup factures * \ingroup factures
* \brief Module de generation de l'affichage de la box factures impayees * \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'); require_once(DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php');

4
htdocs/includes/boxes/box_fournisseurs.php → htdocs/core/boxes/box_fournisseurs.php
View File

@ -17,12 +17,12 @@
*/ */
/** /**
* \file htdocs/includes/boxes/box_fournisseurs.php * \file htdocs/core/boxes/box_fournisseurs.php
* \ingroup fournisseurs * \ingroup fournisseurs
* \brief Module to generate box of suppliers * \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 { class box_fournisseurs extends ModeleBoxes {

4
htdocs/includes/boxes/box_members.php → htdocs/core/boxes/box_members.php
View File

@ -18,12 +18,12 @@
*/ */
/** /**
* \file htdocs/includes/boxes/box_members.php * \file htdocs/core/boxes/box_members.php
* \ingroup societes * \ingroup societes
* \brief Module de generation de l'affichage de la box clients * \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 { class box_members extends ModeleBoxes {

4
htdocs/includes/boxes/box_osc_client.php → htdocs/core/boxes/box_osc_client.php
View File

@ -17,12 +17,12 @@
*/ */
/** /**
* \file htdocs/includes/boxes/box_osc_client.php * \file htdocs/core/boxes/box_osc_client.php
* \ingroup osc * \ingroup osc
* \brief Module to generate box of shop customers * \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 { class box_osc_clients extends ModeleBoxes {

4
htdocs/includes/boxes/box_produits.php → htdocs/core/boxes/box_produits.php
View File

@ -18,12 +18,12 @@
*/ */
/** /**
* \file htdocs/includes/boxes/box_produits.php * \file htdocs/core/boxes/box_produits.php
* \ingroup produits,services * \ingroup produits,services
* \brief Module to generate box of last products/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"); include_once(DOL_DOCUMENT_ROOT."/product/class/product.class.php");

4
htdocs/includes/boxes/box_propales.php → htdocs/core/boxes/box_propales.php
View File

@ -18,12 +18,12 @@
*/ */
/** /**
* \file htdocs/includes/boxes/box_propales.php * \file htdocs/core/boxes/box_propales.php
* \ingroup propales * \ingroup propales
* \brief Module de generation de l'affichage de la box 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 { class box_propales extends ModeleBoxes {

4
htdocs/includes/boxes/box_prospect.php → htdocs/core/boxes/box_prospect.php
View File

@ -18,13 +18,13 @@
*/ */
/** /**
* \file htdocs/includes/boxes/box_prospect.php * \file htdocs/core/boxes/box_prospect.php
* \ingroup societe * \ingroup societe
* \brief Module to generate the last prospects box. * \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"); include_once(DOL_DOCUMENT_ROOT."/comm/prospect/class/prospect.class.php");

4
htdocs/includes/boxes/box_services_vendus.php → htdocs/core/boxes/box_services_vendus.php
View File

@ -18,12 +18,12 @@
*/ */
/** /**
* \file htdocs/includes/boxes/box_services_vendus.php * \file htdocs/core/boxes/box_services_vendus.php
* \ingroup produits,services * \ingroup produits,services
* \brief Module de generation de l'affichage de la box services_vendus * \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 { class box_services_vendus extends ModeleBoxes {

2
htdocs/includes/boxes/modules_boxes.php → htdocs/core/boxes/modules_boxes.php
View File

@ -17,7 +17,7 @@
*/ */
/** /**
* \file htdocs/includes/boxes/modules_boxes.php * \file htdocs/core/boxes/modules_boxes.php
* \ingroup facture * \ingroup facture
* \brief Fichier contenant la classe mere des boites * \brief Fichier contenant la classe mere des boites
*/ */

6
htdocs/core/class/conf.class.php
View File

@ -90,7 +90,7 @@ class Conf
dol_syslog("Conf::setValues"); dol_syslog("Conf::setValues");
// Directory of core triggers // 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 // Avoid warning if not defined
if (empty($this->db->dolibarr_main_db_encryption)) $this->db->dolibarr_main_db_encryption=0; 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)) elseif (preg_match('/^MAIN_MODULE_([A-Z_]+)_TRIGGERS$/i',$key,$reg))
{ {
$modulename = strtolower($reg[1]); $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 // If this is constant for login method activated by a module
elseif (preg_match('/^MAIN_MODULE_([A-Z_]+)_LOGIN_METHOD$/i',$key,$reg)) elseif (preg_match('/^MAIN_MODULE_([A-Z_]+)_LOGIN_METHOD$/i',$key,$reg))
{ {
$modulename = strtolower($reg[1]); $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 : // 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)) elseif (preg_match('/^MAIN_MODULE_([A-Z_]+)_HOOKS$/i',$key,$reg))

2
htdocs/core/class/html.form.class.php
View File

@ -3188,7 +3188,7 @@ class Form
// Generate the date part, depending on the use or not of the javascript calendar // Generate the date part, depending on the use or not of the javascript calendar
if (empty($conf->global->MAIN_POPUP_CALENDAR) || $conf->global->MAIN_POPUP_CALENDAR == "eldy") if (empty($conf->global->MAIN_POPUP_CALENDAR) || $conf->global->MAIN_POPUP_CALENDAR == "eldy")
{ {
$base=DOL_URL_ROOT.'/lib/'; $base=DOL_URL_ROOT.'/core/lib/';
$reset_scripts .= 'resetDP(\''.$base.'\',\''.$prefix.'\',\''.$langs->trans("FormatDateShortJava").'\',\''.$langs->defaultlang.'\');'; $reset_scripts .= 'resetDP(\''.$base.'\',\''.$prefix.'\',\''.$langs->trans("FormatDateShortJava").'\',\''.$langs->defaultlang.'\');';
} }
else else

28
htdocs/core/class/html.formfile.class.php
View File

@ -221,7 +221,7 @@ class FormFile
if (is_array($genallowed)) $modellist=$genallowed; if (is_array($genallowed)) $modellist=$genallowed;
else 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); $modellist=ModeleThirdPartyDoc::liste_modeles($this->db);
} }
} }
@ -230,7 +230,7 @@ class FormFile
if (is_array($genallowed)) $modellist=$genallowed; if (is_array($genallowed)) $modellist=$genallowed;
else 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); $modellist=ModelePDFPropales::liste_modeles($this->db);
} }
} }
@ -239,7 +239,7 @@ class FormFile
if (is_array($genallowed)) $modellist=$genallowed; if (is_array($genallowed)) $modellist=$genallowed;
else 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); $modellist=ModelePDFCommandes::liste_modeles($this->db);
} }
} }
@ -248,7 +248,7 @@ class FormFile
if (is_array($genallowed)) $modellist=$genallowed; if (is_array($genallowed)) $modellist=$genallowed;
else 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); $modellist=ModelePDFExpedition::liste_modeles($this->db);
} }
} }
@ -257,7 +257,7 @@ class FormFile
if (is_array($genallowed)) $modellist=$genallowed; if (is_array($genallowed)) $modellist=$genallowed;
else 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); $modellist=ModelePDFDeliveryOrder::liste_modeles($this->db);
} }
} }
@ -266,7 +266,7 @@ class FormFile
if (is_array($genallowed)) $modellist=$genallowed; if (is_array($genallowed)) $modellist=$genallowed;
else 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); $modellist=ModelePDFFicheinter::liste_modeles($this->db);
} }
} }
@ -275,7 +275,7 @@ class FormFile
if (is_array($genallowed)) $modellist=$genallowed; if (is_array($genallowed)) $modellist=$genallowed;
else 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); $modellist=ModelePDFFactures::liste_modeles($this->db);
// This is to allow to join external files to invoices // This is to allow to join external files to invoices
@ -295,7 +295,7 @@ class FormFile
if (is_array($genallowed)) $modellist=$genallowed; if (is_array($genallowed)) $modellist=$genallowed;
else 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); $modellist=ModelePDFProjects::liste_modeles($this->db);
} }
} }
@ -304,7 +304,7 @@ class FormFile
if (is_array($genallowed)) $modellist=$genallowed; if (is_array($genallowed)) $modellist=$genallowed;
else 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); $modellist=ModeleExports::liste_modeles($this->db);
} }
} }
@ -313,7 +313,7 @@ class FormFile
if (is_array($genallowed)) $modellist=$genallowed; if (is_array($genallowed)) $modellist=$genallowed;
else 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); $modellist=ModelePDFSuppliersOrders::liste_modeles($this->db);
} }
} }
@ -322,7 +322,7 @@ class FormFile
if (is_array($genallowed)) $modellist=$genallowed; if (is_array($genallowed)) $modellist=$genallowed;
else 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); $modellist=ModelePDFSuppliersInvoices::liste_modeles($this->db);
} }
} }
@ -331,7 +331,7 @@ class FormFile
if (is_array($genallowed)) $modellist=$genallowed; if (is_array($genallowed)) $modellist=$genallowed;
else 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); $modellist=ModeleChequeReceipts::liste_modeles($this->db);
} }
} }
@ -340,7 +340,7 @@ class FormFile
if (is_array($genallowed)) $modellist=$genallowed; if (is_array($genallowed)) $modellist=$genallowed;
else 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); $modellist=ModeleDon::liste_modeles($this->db);
} }
} }
@ -351,7 +351,7 @@ class FormFile
else else
{ {
// Generic feature, for external modules // 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)) if (file_exists($file))
{ {
$res=include_once($file); $res=include_once($file);

2
htdocs/core/class/html.formother.class.php
View File

@ -417,7 +417,7 @@ class FormOther
/* /*
// No list of colors forced, we can suggest any color // No list of colors forced, we can suggest any color
print "\n".'<table class="nobordernopadding"><tr><td valign="middle">'; print "\n".'<table class="nobordernopadding"><tr><td valign="middle">';
print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/lib/lib_colorpicker.js"></script>'."\n"; print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/core/lib/lib_colorpicker.js"></script>'."\n";
print '<script type="text/javascript"> print '<script type="text/javascript">
window.onload = function() window.onload = function()
{ {

4
htdocs/core/class/interfaces.class.php
View File

@ -91,7 +91,7 @@ class Interfaces
if (in_array($modName,$modules)) if (in_array($modName,$modules))
{ {
$langs->load("errors"); $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; continue;
} }
@ -210,7 +210,7 @@ class Interfaces
if (in_array($modName,$modules)) if (in_array($modName,$modules))
{ {
$langs->load("errors"); $langs->load("errors");
print '<div class="error">'.$langs->trans("Error").' : '.$langs->trans("ErrorDuplicateTrigger",$modName,"/htdocs/includes/triggers/").'</div>'; print '<div class="error">'.$langs->trans("Error").' : '.$langs->trans("ErrorDuplicateTrigger",$modName,"/htdocs/core/triggers/").'</div>';
$objMod = new $modName($this->db); $objMod = new $modName($this->db);
$modules[$i] = $modName; $modules[$i] = $modName;

2
htdocs/core/class/translate.class.php
View File

@ -606,7 +606,7 @@ class Translate {
$newnumber=$number; $newnumber=$number;
foreach ($conf->file->dol_document_root as $dirroot) foreach ($conf->file->dol_document_root as $dirroot)
{ {
$dir=$dirroot."/includes/modules/substitutions"; $dir=$dirroot."/core/modules/substitutions";
$fonc='numberwords'; $fonc='numberwords';
if (file_exists($dir.'/functions_'.$fonc.'.lib.php')) if (file_exists($dir.'/functions_'.$fonc.'.lib.php'))
{ {

18
htdocs/core/lib/admin.lib.php
View File

@ -636,7 +636,7 @@ function Activate($value,$withdeps=1)
$found=false; $found=false;
foreach ($conf->file->dol_document_root as $type => $dirroot) foreach ($conf->file->dol_document_root as $type => $dirroot)
{ {
$modulesdir[] = $dirroot."/includes/modules/"; $modulesdir[] = $dirroot."/core/modules/";
if ($type == 'alt') 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) && 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); $num = count($objMod->depends);
for ($i = 0; $i < $num; $i++) 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]); Activate($objMod->depends[$i]);
} }
@ -716,7 +716,7 @@ function Activate($value,$withdeps=1)
$num = count($objMod->conflictwith); $num = count($objMod->conflictwith);
for ($i = 0; $i < $num; $i++) 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); UnActivate($objMod->conflictwith[$i],0);
} }
@ -751,7 +751,7 @@ function UnActivate($value, $requiredby=1)
$found=false; $found=false;
foreach ($conf->file->dol_document_root as $type => $dirroot) foreach ($conf->file->dol_document_root as $type => $dirroot)
{ {
$modulesdir[] = $dirroot."/includes/modules/"; $modulesdir[] = $dirroot."/core/modules/";
if ($type == 'alt') 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) && 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. $j = 0; // j is module number. Automatically affected if module number not defined.
foreach ($conf->file->dol_document_root as $dirroot) 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 // Load modules attributes in arrays (name, numero, orders) from dir directory
//print $dir."\n<br>"; //print $dir."\n<br>";

6
htdocs/core/lib/functions.lib.php
View File

@ -3815,11 +3815,11 @@ function complete_substitutions_array(&$substitutionarray,$outputlangs,$object='
require_once(DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'); require_once(DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php');
// Check if there is external substitution to do asked by plugins // 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. // By default, there is no such external plugins.
foreach ($conf->file->dol_document_root as $dirroot) 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) foreach($substitfiles as $substitfile)
{ {
if (preg_match('/functions_(.*)\.lib\.php/i',$substitfile['name'],$reg)) 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 if (! empty($conf->$module->enabled)) // If module enabled
{ {
dol_syslog("Library functions_".$module.".lib.php found into ".$dirroot); 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=$module."_completesubstitutionarray";
$function_name($substitutionarray,$outputlangs,$object); $function_name($substitutionarray,$outputlangs,$object);
} }

6
htdocs/core/lib/security.lib.php
View File

@ -101,7 +101,7 @@ function checkLoginPassEntity($usertotest,$passwordtotest,$entitytotest,$authmod
if ($test && $mode && ! $login) if ($test && $mode && ! $login)
{ {
$mode=trim($mode); $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); $result=include_once($authfile);
if ($result) if ($result)
{ {
@ -513,8 +513,8 @@ function getRandomPassword($generic=false)
{ {
$nomclass="modGeneratePass".ucfirst($conf->global->USER_PASSWORD_GENERATED); $nomclass="modGeneratePass".ucfirst($conf->global->USER_PASSWORD_GENERATED);
$nomfichier=$nomclass.".class.php"; $nomfichier=$nomclass.".class.php";
//print DOL_DOCUMENT_ROOT."/includes/modules/security/generate/".$nomclass; //print DOL_DOCUMENT_ROOT."/core/modules/security/generate/".$nomclass;
require_once(DOL_DOCUMENT_ROOT."/includes/modules/security/generate/".$nomfichier); require_once(DOL_DOCUMENT_ROOT."/core/modules/security/generate/".$nomfichier);
$genhandler=new $nomclass($db,$conf,$langs,$user); $genhandler=new $nomclass($db,$conf,$langs,$user);
$generated_password=$genhandler->getNewGeneratedPassword(); $generated_password=$genhandler->getNewGeneratedPassword();
unset($genhandler); unset($genhandler);

2
htdocs/includes/login/README.txt → htdocs/core/login/README.txt
View File

@ -1,6 +1,6 @@
README (english) README (english)
--------------------------------------------- ---------------------------------------------
Decription of htdocs/includes/login directory Decription of htdocs/core/login directory
--------------------------------------------- ---------------------------------------------
This directory contains files that handle way to validate passwords. This directory contains files that handle way to validate passwords.

2
htdocs/includes/login/functions_dolibarr.php → htdocs/core/login/functions_dolibarr.php
View File

@ -17,7 +17,7 @@
*/ */
/** /**
* \file htdocs/includes/login/functions_dolibarr.php * \file htdocs/core/login/functions_dolibarr.php
* \ingroup core * \ingroup core
* \brief Authentication functions for Dolibarr mode * \brief Authentication functions for Dolibarr mode
*/ */

2
htdocs/includes/login/functions_empty.php → htdocs/core/login/functions_empty.php
View File

@ -16,7 +16,7 @@
*/ */
/** /**
* \file htdocs/includes/login/functions_empty.php * \file htdocs/core/login/functions_empty.php
* \ingroup core * \ingroup core
* \brief Empty authentication functions for test * \brief Empty authentication functions for test
*/ */

2
htdocs/includes/login/functions_forceuser.php → htdocs/core/login/functions_forceuser.php
View File

@ -17,7 +17,7 @@
*/ */
/** /**
* \file htdocs/includes/login/functions_forceuser.php * \file htdocs/core/login/functions_forceuser.php
* \ingroup core * \ingroup core
* \brief Authentication functions for forceuser * \brief Authentication functions for forceuser
*/ */

2
htdocs/includes/login/functions_http.php → htdocs/core/login/functions_http.php
View File

@ -16,7 +16,7 @@
*/ */
/** /**
* \file htdocs/includes/login/functions_http.php * \file htdocs/core/login/functions_http.php
* \ingroup core * \ingroup core
* \brief Authentication functions for HTTP Basic * \brief Authentication functions for HTTP Basic
*/ */

2
htdocs/includes/login/functions_ldap.php → htdocs/core/login/functions_ldap.php
View File

@ -17,7 +17,7 @@
*/ */
/** /**
* \file htdocs/includes/login/functions_ldap.php * \file htdocs/core/login/functions_ldap.php
* \ingroup core * \ingroup core
* \brief Authentication functions for LDAP * \brief Authentication functions for LDAP
*/ */

2
htdocs/includes/login/functions_myopenid.php → htdocs/core/login/functions_myopenid.php
View File

@ -17,7 +17,7 @@
*/ */
/** /**
* \file htdocs/includes/login/functions_myopenid.php * \file htdocs/core/login/functions_myopenid.php
* \ingroup core * \ingroup core
* \brief Authentication functions for OpenId mode * \brief Authentication functions for OpenId mode
*/ */

0
htdocs/includes/menus/init_menu_auguria.sql → htdocs/core/menus/init_menu_auguria.sql
View File

0
htdocs/includes/menus/init_menu_smartphone.sql → htdocs/core/menus/init_menu_smartphone.sql
View File

2
htdocs/includes/menus/smartphone/smartphone.lib.php → htdocs/core/menus/smartphone/smartphone.lib.php
View File

@ -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 * \brief Library for file smartphone menus
*/ */

4
htdocs/includes/menus/smartphone/smartphone_backoffice.php → htdocs/core/menus/smartphone/smartphone_backoffice.php
View File

@ -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 * \brief Gestionnaire nomme smartphone du menu smartphone
*/ */
@ -50,7 +50,7 @@ class MenuSmart {
*/ */
function showmenu($limitmenuto) 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); print_smartphone_menu($this->db,$this->atarget,$this->hideifnotallowed,$limitmenuto);
} }

4
htdocs/includes/menus/smartphone/smartphone_frontoffice.php → htdocs/core/menus/smartphone/smartphone_frontoffice.php
View File

@ -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 * \brief Gestionnaire nomme smartphone du menu smartphone
*/ */
@ -51,7 +51,7 @@ class MenuSmart {
*/ */
function showmenu($limitmenuto) 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); print_smartphone_menu($this->db,$this->atarget,$this->hideifnotallowed,$limitmenuto);
} }

2
htdocs/includes/menus/standard/auguria.lib.php → htdocs/core/menus/standard/auguria.lib.php
View File

@ -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 * \brief Library for file auguria menus
*/ */

6
htdocs/includes/menus/standard/auguria_backoffice.php → htdocs/core/menus/standard/auguria_backoffice.php
View File

@ -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 * \brief Gestionnaire nomme Auguria du menu du haut
* *
* \remarks La construction d'un gestionnaire pour le menu du haut est simple: * \remarks La construction d'un gestionnaire pour le menu du haut est simple:
@ -56,7 +56,7 @@ class MenuTop {
*/ */
function showmenu() 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); print_auguria_menu($this->db,$this->atarget,$this->hideifnotallowed);
} }
@ -98,7 +98,7 @@ class MenuLeft {
*/ */
function showmenu() 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); $res=print_left_auguria_menu($this->db,$this->menu_array,$this->menu_array_after);

6
htdocs/includes/menus/standard/auguria_frontoffice.php → htdocs/core/menus/standard/auguria_frontoffice.php
View File

@ -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 * \brief Gestionnaire nomme Auguria du menu du haut
* *
* \remarks La construction d'un gestionnaire pour le menu du haut est simple: * \remarks La construction d'un gestionnaire pour le menu du haut est simple:
@ -57,7 +57,7 @@ class MenuTop {
*/ */
function showmenu() 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); print_auguria_menu($this->db,$this->atarget,$this->hideifnotallowed);
} }
@ -98,7 +98,7 @@ class MenuLeft {
*/ */
function showmenu() 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); $res=print_left_auguria_menu($this->db,$this->menu_array,$this->menu_array_after);

2
htdocs/includes/menus/standard/eldy.lib.php → htdocs/core/menus/standard/eldy.lib.php
View File

@ -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 * \brief Library for file eldy menus
*/ */

6
htdocs/includes/menus/standard/eldy_backoffice.php → htdocs/core/menus/standard/eldy_backoffice.php
View File

@ -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 * \brief Gestionnaire nomme eldy du menu du haut
* *
* \remarks La construction d'un gestionnaire pour le menu du haut est simple: * \remarks La construction d'un gestionnaire pour le menu du haut est simple:
@ -54,7 +54,7 @@ class MenuTop {
*/ */
function showmenu() 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); print_eldy_menu($this->db,$this->atarget,$this->hideifnotallowed);
} }
@ -95,7 +95,7 @@ class MenuLeft {
*/ */
function showmenu() 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); $res=print_left_eldy_menu($this->db,$this->menu_array,$this->menu_array_after);

6
htdocs/includes/menus/standard/eldy_frontoffice.php → htdocs/core/menus/standard/eldy_frontoffice.php
View File

@ -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 * \brief Gestionnaire nomme eldy du menu du haut
* *
* \remarks La construction d'un gestionnaire pour le menu du haut est simple: * \remarks La construction d'un gestionnaire pour le menu du haut est simple:
@ -54,7 +54,7 @@ class MenuTop {
*/ */
function showmenu() 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); print_eldy_menu($this->db,$this->atarget,$this->hideifnotallowed);
} }
@ -95,7 +95,7 @@ class MenuLeft {
*/ */
function showmenu() 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); $res=print_left_eldy_menu($this->db,$this->menu_array,$this->menu_array_after);

2
htdocs/includes/menus/standard/empty.php → htdocs/core/menus/standard/empty.php
View File

@ -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 * \brief This is an example of an empty top menu handler
*/ */

0
htdocs/includes/modules/.cvsignore → htdocs/core/modules/.cvsignore
View File

2
htdocs/includes/modules/DolibarrModules.class.php → htdocs/core/modules/DolibarrModules.class.php
View File

@ -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 * \brief Fichier de description et activation des modules Dolibarr
*/ */

2
htdocs/includes/modules/action/rapport.pdf.php → htdocs/core/modules/action/rapport.pdf.php
View File

@ -19,7 +19,7 @@
*/ */
/** /**
* \file htdocs/includes/modules/action/rapport.pdf.php * \file htdocs/core/modules/action/rapport.pdf.php
* \ingroup commercial * \ingroup commercial
* \brief File to build PDF with events * \brief File to build PDF with events
*/ */

4
htdocs/includes/modules/barcode/barcodecoder.modules.php → htdocs/core/modules/barcode/barcodecoder.modules.php
View File

@ -17,12 +17,12 @@
*/ */
/** /**
* \file htdocs/includes/modules/barcode/barcodecoder.modules.php * \file htdocs/core/modules/barcode/barcodecoder.modules.php
* \ingroup barcode * \ingroup barcode
* \brief Fichier contenant la classe du modele de generation code barre Barcode Coder * \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 * \class modBarcodeCoder

Some files were not shown because too many files have changed in this diff Show More