Move core lib files in /core/lib
This commit is contained in:
parent
b1271a5398
commit
ecc5519a4e
@ -417,7 +417,7 @@ function form_constantes($tableau)
|
|||||||
{
|
{
|
||||||
print '<td>';
|
print '<td>';
|
||||||
// List of possible labels (defined into $_Avery_Labels variable set into format_cards.lib.php)
|
// List of possible labels (defined into $_Avery_Labels variable set into format_cards.lib.php)
|
||||||
require_once(DOL_DOCUMENT_ROOT.'/lib/format_cards.lib.php');
|
require_once(DOL_DOCUMENT_ROOT.'/core/lib/format_cards.lib.php');
|
||||||
$arrayoflabels=array();
|
$arrayoflabels=array();
|
||||||
foreach(array_keys($_Avery_Labels) as $codecards)
|
foreach(array_keys($_Avery_Labels) as $codecards)
|
||||||
{
|
{
|
||||||
|
|||||||
@ -23,7 +23,7 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
require("../../main.inc.php");
|
require("../../main.inc.php");
|
||||||
require_once(DOL_DOCUMENT_ROOT."/lib/trip.lib.php");
|
require_once(DOL_DOCUMENT_ROOT."/core/lib/trip.lib.php");
|
||||||
require_once(DOL_DOCUMENT_ROOT."/compta/deplacement/class/deplacement.class.php");
|
require_once(DOL_DOCUMENT_ROOT."/compta/deplacement/class/deplacement.class.php");
|
||||||
require_once(DOL_DOCUMENT_ROOT."/core/class/html.formfile.class.php");
|
require_once(DOL_DOCUMENT_ROOT."/core/class/html.formfile.class.php");
|
||||||
if ($conf->projet->enabled)
|
if ($conf->projet->enabled)
|
||||||
|
|||||||
@ -23,7 +23,7 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
require("../../main.inc.php");
|
require("../../main.inc.php");
|
||||||
require_once(DOL_DOCUMENT_ROOT."/lib/trip.lib.php");
|
require_once(DOL_DOCUMENT_ROOT."/core/lib/trip.lib.php");
|
||||||
require_once(DOL_DOCUMENT_ROOT."/lib/functions2.lib.php");
|
require_once(DOL_DOCUMENT_ROOT."/lib/functions2.lib.php");
|
||||||
require_once(DOL_DOCUMENT_ROOT."/compta/deplacement/class/deplacement.class.php");
|
require_once(DOL_DOCUMENT_ROOT."/compta/deplacement/class/deplacement.class.php");
|
||||||
|
|
||||||
|
|||||||
@ -23,7 +23,7 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
require("../../main.inc.php");
|
require("../../main.inc.php");
|
||||||
require_once(DOL_DOCUMENT_ROOT."/lib/trip.lib.php");
|
require_once(DOL_DOCUMENT_ROOT."/core/lib/trip.lib.php");
|
||||||
require_once(DOL_DOCUMENT_ROOT."/compta/deplacement/class/deplacement.class.php");
|
require_once(DOL_DOCUMENT_ROOT."/compta/deplacement/class/deplacement.class.php");
|
||||||
|
|
||||||
$langs->load("companies");
|
$langs->load("companies");
|
||||||
|
|||||||
@ -18,7 +18,7 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* \file htdocs/lib/ajax.lib.php
|
* \file htdocs/core/lib/ajax.lib.php
|
||||||
* \brief Page called by Ajax request for produts
|
* \brief Page called by Ajax request for produts
|
||||||
*/
|
*/
|
||||||
|
|
||||||
@ -19,7 +19,7 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* \file htdocs/lib/format_cards.lib.php
|
* \file htdocs/core/lib/format_cards.lib.php
|
||||||
* \brief Set of functions used for cards generation
|
* \brief Set of functions used for cards generation
|
||||||
* \ingroup core
|
* \ingroup core
|
||||||
*/
|
*/
|
||||||
@ -17,7 +17,7 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* \file htdocs/lib/functions_ch.lib.php
|
* \file htdocs/core/lib/functions_ch.lib.php
|
||||||
* \brief A set of swiss functions for Dolibarr
|
* \brief A set of swiss functions for Dolibarr
|
||||||
* This file contains rare functions.
|
* This file contains rare functions.
|
||||||
*/
|
*/
|
||||||
@ -17,7 +17,7 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* \file htdocs/lib/trip.lib.php
|
* \file htdocs/core/lib/trip.lib.php
|
||||||
* \brief Ensemble de fonctions de base pour les deplacements
|
* \brief Ensemble de fonctions de base pour les deplacements
|
||||||
*/
|
*/
|
||||||
|
|
||||||
@ -63,7 +63,7 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
require_once(DOL_DOCUMENT_ROOT.'/lib/pdf.lib.php');
|
require_once(DOL_DOCUMENT_ROOT.'/lib/pdf.lib.php');
|
||||||
require_once(DOL_DOCUMENT_ROOT.'/lib/format_cards.lib.php');
|
require_once(DOL_DOCUMENT_ROOT.'/core/lib/format_cards.lib.php');
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
@ -63,7 +63,7 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
require_once(DOL_DOCUMENT_ROOT.'/lib/pdf.lib.php');
|
require_once(DOL_DOCUMENT_ROOT.'/lib/pdf.lib.php');
|
||||||
require_once(DOL_DOCUMENT_ROOT.'/lib/format_cards.lib.php');
|
require_once(DOL_DOCUMENT_ROOT.'/core/lib/format_cards.lib.php');
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
@ -227,7 +227,7 @@ if (! empty($conf->file->main_force_https))
|
|||||||
// Chargement des includes complementaires de presentation
|
// Chargement des includes complementaires de presentation
|
||||||
if (! defined('NOREQUIREMENU')) require_once(DOL_DOCUMENT_ROOT ."/core/class/menu.class.php"); // Need 10ko memory (11ko in 2.2)
|
if (! defined('NOREQUIREMENU')) require_once(DOL_DOCUMENT_ROOT ."/core/class/menu.class.php"); // Need 10ko memory (11ko in 2.2)
|
||||||
if (! defined('NOREQUIREHTML')) require_once(DOL_DOCUMENT_ROOT ."/core/class/html.form.class.php"); // Need 660ko memory (800ko in 2.2)
|
if (! defined('NOREQUIREHTML')) require_once(DOL_DOCUMENT_ROOT ."/core/class/html.form.class.php"); // Need 660ko memory (800ko in 2.2)
|
||||||
if (! defined('NOREQUIREAJAX') && $conf->use_javascript_ajax) require_once(DOL_DOCUMENT_ROOT.'/lib/ajax.lib.php'); // Need 22ko memory
|
if (! defined('NOREQUIREAJAX') && $conf->use_javascript_ajax) require_once(DOL_DOCUMENT_ROOT.'/core/lib/ajax.lib.php'); // Need 22ko memory
|
||||||
//dol_stopwithmem();
|
//dol_stopwithmem();
|
||||||
|
|
||||||
// If install or upgrade process not done or not completely finished, we call the install page.
|
// If install or upgrade process not done or not completely finished, we call the install page.
|
||||||
@ -904,7 +904,7 @@ function top_htmlhead($head, $title='', $disablejs=0, $disablehead=0, $arrayofjs
|
|||||||
if (! $disablejs && $conf->use_javascript_ajax)
|
if (! $disablejs && $conf->use_javascript_ajax)
|
||||||
{
|
{
|
||||||
// Other external js
|
// Other external js
|
||||||
require_once DOL_DOCUMENT_ROOT.'/lib/ajax.lib.php';
|
require_once DOL_DOCUMENT_ROOT.'/core/lib/ajax.lib.php';
|
||||||
|
|
||||||
$ext='.js';
|
$ext='.js';
|
||||||
if (isset($conf->global->MAIN_OPTIMIZE_SPEED) && ($conf->global->MAIN_OPTIMIZE_SPEED & 0x01)) { $ext='.jgz'; } // mini='_mini', ext='.gz'
|
if (isset($conf->global->MAIN_OPTIMIZE_SPEED) && ($conf->global->MAIN_OPTIMIZE_SPEED & 0x01)) { $ext='.jgz'; } // mini='_mini', ext='.gz'
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user