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

[task #216] Move lib in core directory

Browse Source
This commit is contained in:
Regis Houssin 2011-10-24 10:45:06 +02:00
parent 00fd96a8d2
commit c65238b773
106 changed files with 117 additions and 117 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/adherents/class/adherent.class.php
View File

@ -28,7 +28,7 @@
require_once(DOL_DOCUMENT_ROOT."/core/class/commonobject.class.php"); require_once(DOL_DOCUMENT_ROOT."/core/class/commonobject.class.php");
require_once(DOL_DOCUMENT_ROOT."/adherents/class/cotisation.class.php"); require_once(DOL_DOCUMENT_ROOT."/adherents/class/cotisation.class.php");
require_once(DOL_DOCUMENT_ROOT."/lib/functions2.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/functions2.lib.php");
require_once(DOL_DOCUMENT_ROOT."/lib/date.lib.php"); require_once(DOL_DOCUMENT_ROOT."/lib/date.lib.php");

6
htdocs/adherents/fiche.php
View File

@ -27,8 +27,8 @@
require("../main.inc.php"); require("../main.inc.php");
require_once(DOL_DOCUMENT_ROOT."/lib/member.lib.php"); require_once(DOL_DOCUMENT_ROOT."/lib/member.lib.php");
require_once(DOL_DOCUMENT_ROOT."/lib/company.lib.php"); require_once(DOL_DOCUMENT_ROOT."/lib/company.lib.php");
require_once(DOL_DOCUMENT_ROOT."/lib/images.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/images.lib.php");
require_once(DOL_DOCUMENT_ROOT."/lib/functions2.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/functions2.lib.php");
require_once(DOL_DOCUMENT_ROOT."/adherents/class/adherent.class.php"); require_once(DOL_DOCUMENT_ROOT."/adherents/class/adherent.class.php");
require_once(DOL_DOCUMENT_ROOT."/adherents/class/adherent_type.class.php"); require_once(DOL_DOCUMENT_ROOT."/adherents/class/adherent_type.class.php");
require_once(DOL_DOCUMENT_ROOT."/core/class/extrafields.class.php"); require_once(DOL_DOCUMENT_ROOT."/core/class/extrafields.class.php");
@ -1078,7 +1078,7 @@ if ($rowid && $action != 'edit')
if (empty($login)) if (empty($login))
{ {
// Full firstname and name separated with a dot : firstname.name // Full firstname and name separated with a dot : firstname.name
include_once(DOL_DOCUMENT_ROOT.'/lib/functions2.lib.php'); include_once(DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php');
$login=dol_buildlogin($object->nom,$object->prenom); $login=dol_buildlogin($object->nom,$object->prenom);
} }
if (empty($login)) $login=strtolower(substr($object->prenom, 0, 4)) . strtolower(substr($object->nom, 0, 4)); if (empty($login)) $login=strtolower(substr($object->prenom, 0, 4)) . strtolower(substr($object->nom, 0, 4));

2
htdocs/adherents/info.php
View File

@ -23,7 +23,7 @@
*/ */
require("../main.inc.php"); require("../main.inc.php");
require_once(DOL_DOCUMENT_ROOT."/lib/functions2.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/functions2.lib.php");
require_once(DOL_DOCUMENT_ROOT."/adherents/class/adherent.class.php"); require_once(DOL_DOCUMENT_ROOT."/adherents/class/adherent.class.php");
require_once(DOL_DOCUMENT_ROOT."/lib/member.lib.php"); require_once(DOL_DOCUMENT_ROOT."/lib/member.lib.php");

2
htdocs/adherents/info_subscription.php
View File

@ -23,7 +23,7 @@
*/ */
require("../main.inc.php"); require("../main.inc.php");
require_once(DOL_DOCUMENT_ROOT."/lib/functions2.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/functions2.lib.php");
require_once(DOL_DOCUMENT_ROOT."/adherents/class/adherent.class.php"); require_once(DOL_DOCUMENT_ROOT."/adherents/class/adherent.class.php");
require_once(DOL_DOCUMENT_ROOT."/lib/member.lib.php"); require_once(DOL_DOCUMENT_ROOT."/lib/member.lib.php");
require_once(DOL_DOCUMENT_ROOT."/adherents/class/cotisation.class.php"); require_once(DOL_DOCUMENT_ROOT."/adherents/class/cotisation.class.php");

4
htdocs/admin/company.php
View File

@ -28,8 +28,8 @@ require("../main.inc.php");
require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php"); require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php");
require_once(DOL_DOCUMENT_ROOT."/lib/company.lib.php"); require_once(DOL_DOCUMENT_ROOT."/lib/company.lib.php");
require_once(DOL_DOCUMENT_ROOT."/lib/date.lib.php"); require_once(DOL_DOCUMENT_ROOT."/lib/date.lib.php");
require_once(DOL_DOCUMENT_ROOT."/lib/images.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/images.lib.php");
require_once(DOL_DOCUMENT_ROOT."/lib/functions2.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/functions2.lib.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.formcompany.class.php"); require_once(DOL_DOCUMENT_ROOT."/core/class/html.formcompany.class.php");

2
htdocs/admin/ihm.php
View File

@ -25,7 +25,7 @@
require("../main.inc.php"); require("../main.inc.php");
require_once(DOL_DOCUMENT_ROOT."/lib/usergroups.lib.php"); require_once(DOL_DOCUMENT_ROOT."/lib/usergroups.lib.php");
require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php"); require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php");
require_once(DOL_DOCUMENT_ROOT."/lib/functions2.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/functions2.lib.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.formadmin.class.php"); require_once(DOL_DOCUMENT_ROOT."/core/class/html.formadmin.class.php");

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

@ -25,7 +25,7 @@
require("../../main.inc.php"); require("../../main.inc.php");
require_once(DOL_DOCUMENT_ROOT."/core/class/html.formadmin.class.php"); require_once(DOL_DOCUMENT_ROOT."/core/class/html.formadmin.class.php");
require_once(DOL_DOCUMENT_ROOT."/lib/treeview.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/treeview.lib.php");
$langs->load("other"); $langs->load("other");
$langs->load("admin"); $langs->load("admin");

2
htdocs/admin/pdf.php
View File

@ -25,7 +25,7 @@
require("../main.inc.php"); require("../main.inc.php");
require_once(DOL_DOCUMENT_ROOT."/lib/usergroups.lib.php"); require_once(DOL_DOCUMENT_ROOT."/lib/usergroups.lib.php");
require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php"); require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php");
require_once(DOL_DOCUMENT_ROOT."/lib/functions2.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/functions2.lib.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.formadmin.class.php"); require_once(DOL_DOCUMENT_ROOT."/core/class/html.formadmin.class.php");

2
htdocs/admin/system/dolibarr.php
View File

@ -22,7 +22,7 @@
*/ */
require("../../main.inc.php"); require("../../main.inc.php");
require_once(DOL_DOCUMENT_ROOT."/lib/memory.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/memory.lib.php");
require_once(DOL_DOCUMENT_ROOT."/lib/date.lib.php"); require_once(DOL_DOCUMENT_ROOT."/lib/date.lib.php");
$langs->load("admin"); $langs->load("admin");

2
htdocs/admin/system/index.php
View File

@ -23,7 +23,7 @@
*/ */
require("../../main.inc.php"); require("../../main.inc.php");
require_once(DOL_DOCUMENT_ROOT."/lib/functions2.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/functions2.lib.php");
$langs->load("admin"); $langs->load("admin");
$langs->load("user"); $langs->load("user");

2
htdocs/admin/system/os.php
View File

@ -22,7 +22,7 @@
*/ */
require("../../main.inc.php"); require("../../main.inc.php");
require_once(DOL_DOCUMENT_ROOT."/lib/functions2.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/functions2.lib.php");
$langs->load("admin"); $langs->load("admin");

2
htdocs/asterisk/wrapper.php
View File

@ -62,7 +62,7 @@ function llxFooter()
require_once("../main.inc.php"); require_once("../main.inc.php");
require_once(DOL_DOCUMENT_ROOT."/lib/functions.lib.php"); require_once(DOL_DOCUMENT_ROOT."/lib/functions.lib.php");
require_once(DOL_DOCUMENT_ROOT."/lib/functions2.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/functions2.lib.php");
// Security check // Security check

2
htdocs/boxes.php
View File

@ -323,7 +323,7 @@ class InfoBox
{ {
global $conf; global $conf;
require_once(DOL_DOCUMENT_ROOT."/lib/functions2.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/functions2.lib.php");
dol_syslog("InfoBoxes::saveboxorder zone=".$zone." user=".$userid); dol_syslog("InfoBoxes::saveboxorder zone=".$zone." user=".$userid);

2
htdocs/categories/class/categorie.class.php
View File

@ -1236,7 +1236,7 @@ class Categorie
*/ */
function add_thumb($file, $maxWidth = 160, $maxHeight = 120) function add_thumb($file, $maxWidth = 160, $maxHeight = 120)
{ {
require_once(DOL_DOCUMENT_ROOT ."/lib/images.lib.php"); require_once(DOL_DOCUMENT_ROOT ."/core/lib/images.lib.php");
if (file_exists($file)) if (file_exists($file))
{ {

2
htdocs/categories/index.php
View File

@ -27,7 +27,7 @@
require("../main.inc.php"); require("../main.inc.php");
require_once(DOL_DOCUMENT_ROOT."/categories/class/categorie.class.php"); require_once(DOL_DOCUMENT_ROOT."/categories/class/categorie.class.php");
require_once(DOL_DOCUMENT_ROOT."/lib/treeview.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/treeview.lib.php");
$type=(GETPOST('type') ? GETPOST('type') : 0); $type=(GETPOST('type') ? GETPOST('type') : 0);

2
htdocs/comm/action/info.php
View File

@ -24,7 +24,7 @@
require("../../main.inc.php"); require("../../main.inc.php");
require_once(DOL_DOCUMENT_ROOT."/lib/agenda.lib.php"); require_once(DOL_DOCUMENT_ROOT."/lib/agenda.lib.php");
require_once(DOL_DOCUMENT_ROOT."/lib/functions2.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/functions2.lib.php");
require_once(DOL_DOCUMENT_ROOT."/contact/class/contact.class.php"); require_once(DOL_DOCUMENT_ROOT."/contact/class/contact.class.php");
require_once(DOL_DOCUMENT_ROOT."/comm/action/class/cactioncomm.class.php"); require_once(DOL_DOCUMENT_ROOT."/comm/action/class/cactioncomm.class.php");
require_once(DOL_DOCUMENT_ROOT."/comm/action/class/actioncomm.class.php"); require_once(DOL_DOCUMENT_ROOT."/comm/action/class/actioncomm.class.php");

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

@ -27,7 +27,7 @@ require("../../main.inc.php");
require_once(DOL_DOCUMENT_ROOT."/comm/mailing/class/mailing.class.php"); require_once(DOL_DOCUMENT_ROOT."/comm/mailing/class/mailing.class.php");
require_once(DOL_DOCUMENT_ROOT."/lib/emailing.lib.php"); require_once(DOL_DOCUMENT_ROOT."/lib/emailing.lib.php");
require_once(DOL_DOCUMENT_ROOT."/core/class/CMailFile.class.php"); require_once(DOL_DOCUMENT_ROOT."/core/class/CMailFile.class.php");
require_once(DOL_DOCUMENT_ROOT."/lib/functions2.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/functions2.lib.php");
$langs->load("mails"); $langs->load("mails");

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

@ -26,7 +26,7 @@ require("../../main.inc.php");
require_once(DOL_DOCUMENT_ROOT."/lib/emailing.lib.php"); require_once(DOL_DOCUMENT_ROOT."/lib/emailing.lib.php");
require_once(DOL_DOCUMENT_ROOT.'/lib/files.lib.php'); require_once(DOL_DOCUMENT_ROOT.'/lib/files.lib.php');
require_once(DOL_DOCUMENT_ROOT."/core/class/CMailFile.class.php"); require_once(DOL_DOCUMENT_ROOT."/core/class/CMailFile.class.php");
require_once(DOL_DOCUMENT_ROOT."/lib/functions2.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/functions2.lib.php");
require_once(DOL_DOCUMENT_ROOT."/comm/mailing/class/mailing.class.php"); require_once(DOL_DOCUMENT_ROOT."/comm/mailing/class/mailing.class.php");
require_once(DOL_DOCUMENT_ROOT."/core/class/html.formother.class.php"); require_once(DOL_DOCUMENT_ROOT."/core/class/html.formother.class.php");

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

@ -25,7 +25,7 @@
require("../../main.inc.php"); require("../../main.inc.php");
require_once(DOL_DOCUMENT_ROOT ."/comm/mailing/class/mailing.class.php"); require_once(DOL_DOCUMENT_ROOT ."/comm/mailing/class/mailing.class.php");
require_once(DOL_DOCUMENT_ROOT."/lib/functions2.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/functions2.lib.php");
$langs->load("commercial"); $langs->load("commercial");
$langs->load("orders"); $langs->load("orders");

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

@ -24,7 +24,7 @@
require("../../main.inc.php"); require("../../main.inc.php");
require_once(DOL_DOCUMENT_ROOT ."/comm/mailing/class/mailing.class.php"); require_once(DOL_DOCUMENT_ROOT ."/comm/mailing/class/mailing.class.php");
require_once(DOL_DOCUMENT_ROOT."/lib/functions2.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/functions2.lib.php");
require_once(DOL_DOCUMENT_ROOT."/lib/emailing.lib.php"); require_once(DOL_DOCUMENT_ROOT."/lib/emailing.lib.php");
$langs->load("mails"); $langs->load("mails");

2
htdocs/comm/propal.php
View File

@ -35,7 +35,7 @@ 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");
require_once(DOL_DOCUMENT_ROOT."/lib/propal.lib.php"); require_once(DOL_DOCUMENT_ROOT."/lib/propal.lib.php");
require_once(DOL_DOCUMENT_ROOT."/lib/functions2.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/functions2.lib.php");
if ($conf->projet->enabled) require_once(DOL_DOCUMENT_ROOT.'/projet/class/project.class.php'); if ($conf->projet->enabled) require_once(DOL_DOCUMENT_ROOT.'/projet/class/project.class.php');
$langs->load('companies'); $langs->load('companies');

2
htdocs/comm/propal/info.php
View File

@ -24,7 +24,7 @@
*/ */
require("../../main.inc.php"); require("../../main.inc.php");
require_once(DOL_DOCUMENT_ROOT."/lib/functions2.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/functions2.lib.php");
require_once(DOL_DOCUMENT_ROOT."/comm/propal/class/propal.class.php"); require_once(DOL_DOCUMENT_ROOT."/comm/propal/class/propal.class.php");
require_once(DOL_DOCUMENT_ROOT."/lib/propal.lib.php"); require_once(DOL_DOCUMENT_ROOT."/lib/propal.lib.php");

2
htdocs/commande/fiche.php
View File

@ -34,7 +34,7 @@ require_once(DOL_DOCUMENT_ROOT."/includes/modules/commande/modules_commande.php"
require_once(DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php'); require_once(DOL_DOCUMENT_ROOT.'/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."/lib/order.lib.php"); require_once(DOL_DOCUMENT_ROOT."/lib/order.lib.php");
require_once(DOL_DOCUMENT_ROOT."/lib/functions2.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/functions2.lib.php");
if ($conf->projet->enabled) require_once(DOL_DOCUMENT_ROOT.'/projet/class/project.class.php'); if ($conf->projet->enabled) require_once(DOL_DOCUMENT_ROOT.'/projet/class/project.class.php');
if ($conf->projet->enabled) require_once(DOL_DOCUMENT_ROOT.'/lib/project.lib.php'); if ($conf->projet->enabled) require_once(DOL_DOCUMENT_ROOT.'/lib/project.lib.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');

2
htdocs/commande/info.php
View File

@ -23,7 +23,7 @@
*/ */
require("../main.inc.php"); require("../main.inc.php");
require_once(DOL_DOCUMENT_ROOT."/lib/functions2.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/functions2.lib.php");
require_once(DOL_DOCUMENT_ROOT."/commande/class/commande.class.php"); require_once(DOL_DOCUMENT_ROOT."/commande/class/commande.class.php");
require_once(DOL_DOCUMENT_ROOT."/lib/order.lib.php"); require_once(DOL_DOCUMENT_ROOT."/lib/order.lib.php");

2
htdocs/compta/bank/info.php
View File

@ -22,7 +22,7 @@
*/ */
require("./pre.inc.php"); require("./pre.inc.php");
require_once(DOL_DOCUMENT_ROOT."/lib/functions2.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/functions2.lib.php");
require_once(DOL_DOCUMENT_ROOT."/compta/paiement/class/paiement.class.php"); require_once(DOL_DOCUMENT_ROOT."/compta/paiement/class/paiement.class.php");
$langs->load("banks"); $langs->load("banks");

2
htdocs/compta/deplacement/info.php
View File

@ -24,7 +24,7 @@
require("../../main.inc.php"); require("../../main.inc.php");
require_once(DOL_DOCUMENT_ROOT."/core/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."/core/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");
$langs->load("trips"); $langs->load("trips");

2
htdocs/compta/facture.php
View File

@ -34,7 +34,7 @@ require_once(DOL_DOCUMENT_ROOT.'/includes/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');
require_once(DOL_DOCUMENT_ROOT."/lib/functions2.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/functions2.lib.php");
require_once(DOL_DOCUMENT_ROOT.'/lib/invoice.lib.php'); require_once(DOL_DOCUMENT_ROOT.'/lib/invoice.lib.php');
require_once(DOL_DOCUMENT_ROOT."/lib/date.lib.php"); require_once(DOL_DOCUMENT_ROOT."/lib/date.lib.php");
if ($conf->projet->enabled) require_once(DOL_DOCUMENT_ROOT.'/projet/class/project.class.php'); if ($conf->projet->enabled) require_once(DOL_DOCUMENT_ROOT.'/projet/class/project.class.php');

2
htdocs/compta/facture/info.php
View File

@ -25,7 +25,7 @@
require("../../main.inc.php"); require("../../main.inc.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."/lib/functions2.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/functions2.lib.php");
require_once(DOL_DOCUMENT_ROOT.'/lib/invoice.lib.php'); require_once(DOL_DOCUMENT_ROOT.'/lib/invoice.lib.php');
$langs->load("bills"); $langs->load("bills");

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

@ -23,7 +23,7 @@
*/ */
require("../../main.inc.php"); require("../../main.inc.php");
require_once(DOL_DOCUMENT_ROOT."/lib/functions2.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/functions2.lib.php");
require_once(DOL_DOCUMENT_ROOT."/compta/paiement/class/paiement.class.php"); require_once(DOL_DOCUMENT_ROOT."/compta/paiement/class/paiement.class.php");
$langs->load("bills"); $langs->load("bills");

2
htdocs/contact/canvas/actions_contactcard_common.class.php
View File

@ -394,7 +394,7 @@ abstract class ActionsContactCardCommon
if ($action == 'create_user') if ($action == 'create_user')
{ {
// Full firstname and name separated with a dot : firstname.name // Full firstname and name separated with a dot : firstname.name
include_once(DOL_DOCUMENT_ROOT.'/lib/functions2.lib.php'); include_once(DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php');
$login=dol_buildlogin($this->object->nom, $this->object->prenom); $login=dol_buildlogin($this->object->nom, $this->object->prenom);
$generated_password=''; $generated_password='';

2
htdocs/contact/fiche.php
View File

@ -711,7 +711,7 @@ else
if ($action == 'create_user') if ($action == 'create_user')
{ {
// Full firstname and name separated with a dot : firstname.name // Full firstname and name separated with a dot : firstname.name
include_once(DOL_DOCUMENT_ROOT.'/lib/functions2.lib.php'); include_once(DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php');
$login=dol_buildlogin($object->nom,$object->prenom); $login=dol_buildlogin($object->nom,$object->prenom);
$generated_password=''; $generated_password='';

2
htdocs/contact/info.php
View File

@ -23,7 +23,7 @@
*/ */
require("../main.inc.php"); require("../main.inc.php");
require_once(DOL_DOCUMENT_ROOT."/lib/functions2.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/functions2.lib.php");
require_once(DOL_DOCUMENT_ROOT."/contact/class/contact.class.php"); require_once(DOL_DOCUMENT_ROOT."/contact/class/contact.class.php");
require_once(DOL_DOCUMENT_ROOT."/lib/contact.lib.php"); require_once(DOL_DOCUMENT_ROOT."/lib/contact.lib.php");

2
htdocs/contrat/info.php
View File

@ -22,7 +22,7 @@
*/ */
require ("../main.inc.php"); require ("../main.inc.php");
require_once(DOL_DOCUMENT_ROOT."/lib/functions2.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/functions2.lib.php");
require_once(DOL_DOCUMENT_ROOT.'/lib/contract.lib.php'); require_once(DOL_DOCUMENT_ROOT.'/lib/contract.lib.php');
require_once(DOL_DOCUMENT_ROOT."/contrat/class/contrat.class.php"); require_once(DOL_DOCUMENT_ROOT."/contrat/class/contrat.class.php");

2
htdocs/core/ajaxfileupload.php
View File

@ -36,7 +36,7 @@ if (! defined('NOREQUIREHTML')) define('NOREQUIREHTML','1'); // If we don't nee
require("../main.inc.php"); require("../main.inc.php");
require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php"); require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php");
require_once(DOL_DOCUMENT_ROOT."/lib/images.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/images.lib.php");
error_reporting(E_ALL | E_STRICT); error_reporting(E_ALL | E_STRICT);

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

@ -562,7 +562,7 @@ class FormFile
$nboffiles=count($filearray); $nboffiles=count($filearray);
if ($nboffiles > 0) include_once(DOL_DOCUMENT_ROOT.'/lib/images.lib.php'); if ($nboffiles > 0) include_once(DOL_DOCUMENT_ROOT.'/core/lib/images.lib.php');
$var=true; $var=true;
foreach($filearray as $key => $file) // filearray must be only files here foreach($filearray as $key => $file) // filearray must be only files here

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

@ -295,7 +295,7 @@ class SMTPs
$host=preg_replace('@ssl://@i','',$host); // Remove prefix $host=preg_replace('@ssl://@i','',$host); // Remove prefix
// DOL_CHANGE LDR // DOL_CHANGE LDR
include_once(DOL_DOCUMENT_ROOT.'/lib/functions2.lib.php'); include_once(DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php');
if ( (! is_ip($host)) && ((gethostbyname ( $host )) == $host) ) if ( (! is_ip($host)) && ((gethostbyname ( $host )) == $host) )
{ {

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

@ -227,7 +227,7 @@ class Translate {
{ {
//dol_syslog('Translate::Load we will cache result into usecachekey '.$usecachekey); //dol_syslog('Translate::Load we will cache result into usecachekey '.$usecachekey);
require_once(DOL_DOCUMENT_ROOT ."/lib/memory.lib.php"); require_once(DOL_DOCUMENT_ROOT ."/core/lib/memory.lib.php");
$tmparray=dol_getcache($usecachekey); $tmparray=dol_getcache($usecachekey);
if (is_array($tmparray) && count($tmparray)) if (is_array($tmparray) && count($tmparray))
{ {

2
htdocs/lib/functions2.lib.php → htdocs/core/lib/functions2.lib.php
View File

@ -18,7 +18,7 @@
*/ */
/** /**
* \file htdocs/lib/functions2.lib.php * \file htdocs/core/lib/functions2.lib.php
* \brief A set of functions for Dolibarr * \brief A set of functions for Dolibarr
* This file contains all rare functions. * This file contains all rare functions.
*/ */

6
htdocs/lib/images.lib.php → htdocs/core/lib/images.lib.php
View File

@ -18,7 +18,7 @@
*/ */
/** /**
* \file htdocs/lib/images.lib.php * \file htdocs/core/lib/images.lib.php
* \brief Set of function for manipulating images * \brief Set of function for manipulating images
*/ */
@ -94,7 +94,7 @@ function dol_getImageSize($file)
*/ */
function dol_imageResizeOrCrop($file, $mode, $newWidth, $newHeight, $src_x=0, $src_y=0) function dol_imageResizeOrCrop($file, $mode, $newWidth, $newHeight, $src_x=0, $src_y=0)
{ {
require_once(DOL_DOCUMENT_ROOT."/lib/functions2.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/functions2.lib.php");
global $conf,$langs; global $conf,$langs;
@ -297,7 +297,7 @@ function dol_imageResizeOrCrop($file, $mode, $newWidth, $newHeight, $src_x=0, $s
*/ */
function vignette($file, $maxWidth = 160, $maxHeight = 120, $extName='_small', $quality=50, $outdir='thumbs', $targetformat=0) function vignette($file, $maxWidth = 160, $maxHeight = 120, $extName='_small', $quality=50, $outdir='thumbs', $targetformat=0)
{ {
require_once(DOL_DOCUMENT_ROOT."/lib/functions2.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/functions2.lib.php");
global $conf,$langs; global $conf,$langs;

2
htdocs/lib/memory.lib.php → htdocs/core/lib/memory.lib.php
View File

@ -17,7 +17,7 @@
*/ */
/** /**
* \file htdocs/lib/memory.lib.php * \file htdocs/core/lib/memory.lib.php
* \brief Set of function for memory/cache management * \brief Set of function for memory/cache management
*/ */

2
htdocs/lib/security.lib.php → htdocs/core/lib/security.lib.php
View File

@ -18,7 +18,7 @@
*/ */
/** /**
* \file htdocs/lib/security.lib.php * \file htdocs/core/lib/security.lib.php
* \ingroup core * \ingroup core
* \brief Set of function used for dolibarr security. * \brief Set of function used for dolibarr security.
* Warning, this file must not depends on other library files, except function.lib.php * Warning, this file must not depends on other library files, except function.lib.php

2
htdocs/lib/treeview.lib.php → htdocs/core/lib/treeview.lib.php
View File

@ -17,7 +17,7 @@
*/ */
/** /**
* \file htdocs/lib/treeview.lib.php * \file htdocs/core/lib/treeview.lib.php
* \ingroup core * \ingroup core
* \brief Libraries for tree views * \brief Libraries for tree views
*/ */

2
htdocs/core/photos_resize.php
View File

@ -35,7 +35,7 @@
require("../main.inc.php"); require("../main.inc.php");
require_once(DOL_DOCUMENT_ROOT."/lib/product.lib.php"); require_once(DOL_DOCUMENT_ROOT."/lib/product.lib.php");
require_once(DOL_DOCUMENT_ROOT."/lib/images.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/images.lib.php");
require_once(DOL_DOCUMENT_ROOT."/product/class/product.class.php"); require_once(DOL_DOCUMENT_ROOT."/product/class/product.class.php");
$langs->load("products"); $langs->load("products");

2
htdocs/ecm/index.php
View File

@ -29,7 +29,7 @@ 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."/lib/ecm.lib.php"); require_once(DOL_DOCUMENT_ROOT."/lib/ecm.lib.php");
require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php"); require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php");
require_once(DOL_DOCUMENT_ROOT."/lib/treeview.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/treeview.lib.php");
require_once(DOL_DOCUMENT_ROOT."/ecm/class/ecmdirectory.class.php"); require_once(DOL_DOCUMENT_ROOT."/ecm/class/ecmdirectory.class.php");
// Load traductions files // Load traductions files

2
htdocs/ecm/search.php
View File

@ -27,7 +27,7 @@ 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."/lib/ecm.lib.php"); require_once(DOL_DOCUMENT_ROOT."/lib/ecm.lib.php");
require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php"); require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php");
require_once(DOL_DOCUMENT_ROOT."/lib/treeview.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/treeview.lib.php");
require_once(DOL_DOCUMENT_ROOT."/ecm/class/ecmdirectory.class.php"); require_once(DOL_DOCUMENT_ROOT."/ecm/class/ecmdirectory.class.php");
// Load traductions files // Load traductions files

2
htdocs/fichinter/info.php
View File

@ -24,7 +24,7 @@
*/ */
require("../main.inc.php"); require("../main.inc.php");
require_once(DOL_DOCUMENT_ROOT."/lib/functions2.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/functions2.lib.php");
require_once(DOL_DOCUMENT_ROOT."/fichinter/class/fichinter.class.php"); require_once(DOL_DOCUMENT_ROOT."/fichinter/class/fichinter.class.php");
require_once(DOL_DOCUMENT_ROOT."/lib/fichinter.lib.php"); require_once(DOL_DOCUMENT_ROOT."/lib/fichinter.lib.php");

2
htdocs/filefunc.inc.php
View File

@ -213,7 +213,7 @@ if (! file_exists(DOL_DOCUMENT_ROOT ."/lib/functions.lib.php"))
} }
include_once(DOL_DOCUMENT_ROOT ."/lib/functions.lib.php"); // Need 970ko memory (1.1 in 2.2) include_once(DOL_DOCUMENT_ROOT ."/lib/functions.lib.php"); // Need 970ko memory (1.1 in 2.2)
include_once(DOL_DOCUMENT_ROOT ."/lib/security.lib.php"); // Include by default include_once(DOL_DOCUMENT_ROOT ."/core/lib/security.lib.php"); // Include by default
// If password is encoded, we decode it // If password is encoded, we decode it
if (preg_match('/crypted:/i',$dolibarr_main_db_pass) || ! empty($dolibarr_main_db_encrypted_pass)) if (preg_match('/crypted:/i',$dolibarr_main_db_pass) || ! empty($dolibarr_main_db_encrypted_pass))

2
htdocs/fourn/commande/fiche.php
View File

@ -35,7 +35,7 @@ require_once DOL_DOCUMENT_ROOT."/fourn/class/fournisseur.commande.class.php";
require_once DOL_DOCUMENT_ROOT."/fourn/class/fournisseur.product.class.php"; require_once DOL_DOCUMENT_ROOT."/fourn/class/fournisseur.product.class.php";
require_once DOL_DOCUMENT_ROOT."/product/class/product.class.php"; require_once DOL_DOCUMENT_ROOT."/product/class/product.class.php";
require_once DOL_DOCUMENT_ROOT."/lib/fourn.lib.php"; require_once DOL_DOCUMENT_ROOT."/lib/fourn.lib.php";
require_once(DOL_DOCUMENT_ROOT."/lib/functions2.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/functions2.lib.php");
if ($conf->projet->enabled) require_once(DOL_DOCUMENT_ROOT.'/projet/class/project.class.php'); if ($conf->projet->enabled) require_once(DOL_DOCUMENT_ROOT.'/projet/class/project.class.php');
$langs->load('orders'); $langs->load('orders');

2
htdocs/fourn/facture/info.php
View File

@ -26,7 +26,7 @@
require("../../main.inc.php"); require("../../main.inc.php");
require_once(DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.class.php'); require_once(DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.class.php');
require_once(DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php'); require_once(DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php');
require_once(DOL_DOCUMENT_ROOT."/lib/functions2.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/functions2.lib.php");
require_once(DOL_DOCUMENT_ROOT.'/lib/fourn.lib.php'); require_once(DOL_DOCUMENT_ROOT.'/lib/fourn.lib.php');
$langs->load('bills'); $langs->load('bills');

2
htdocs/fourn/paiement/info.php
View File

@ -23,7 +23,7 @@
*/ */
require("../../main.inc.php"); require("../../main.inc.php");
require_once(DOL_DOCUMENT_ROOT."/lib/functions2.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/functions2.lib.php");
require_once(DOL_DOCUMENT_ROOT."/fourn/class/paiementfourn.class.php"); require_once(DOL_DOCUMENT_ROOT."/fourn/class/paiementfourn.class.php");
$langs->load("bills"); $langs->load("bills");

2
htdocs/ftp/index.php
View File

@ -26,7 +26,7 @@
require("./pre.inc.php"); // We use pre.inc.php to have a dynamic menu require("./pre.inc.php"); // We use pre.inc.php to have a dynamic menu
require_once(DOL_DOCUMENT_ROOT."/core/class/html.formfile.class.php"); require_once(DOL_DOCUMENT_ROOT."/core/class/html.formfile.class.php");
require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php"); require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php");
require_once(DOL_DOCUMENT_ROOT."/lib/treeview.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/treeview.lib.php");
// Load traductions files // Load traductions files
$langs->load("ftp"); $langs->load("ftp");

2
htdocs/includes/modules/cheque/pdf/modules_chequereceipts.php
View File

@ -49,7 +49,7 @@ abstract class ModeleChequeReceipts extends CommonDocGenerator
$type='chequereceipt'; $type='chequereceipt';
$liste=array(); $liste=array();
include_once(DOL_DOCUMENT_ROOT.'/lib/functions2.lib.php'); include_once(DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php');
$liste=getListOfModels($db,$type,''); $liste=getListOfModels($db,$type,'');
// TODO Remove this to use getListOfModels only // TODO Remove this to use getListOfModels only
$liste = array('blochet'=>'blochet'); $liste = array('blochet'=>'blochet');

2
htdocs/includes/modules/commande/mod_commande_saphir.php
View File

@ -105,7 +105,7 @@ class mod_commande_saphir extends ModeleNumRefCommandes
{ {
global $db,$conf; global $db,$conf;
require_once(DOL_DOCUMENT_ROOT ."/lib/functions2.lib.php"); require_once(DOL_DOCUMENT_ROOT ."/core/lib/functions2.lib.php");
// We get cursor rule // We get cursor rule
$mask=$conf->global->COMMANDE_SAPHIR_MASK; $mask=$conf->global->COMMANDE_SAPHIR_MASK;

2
htdocs/includes/modules/commande/modules_commande.php
View File

@ -52,7 +52,7 @@ abstract class ModelePDFCommandes extends CommonDocGenerator
$type='order'; $type='order';
$liste=array(); $liste=array();
include_once(DOL_DOCUMENT_ROOT.'/lib/functions2.lib.php'); include_once(DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php');
$liste=getListOfModels($db,$type,''); $liste=getListOfModels($db,$type,'');
return $liste; return $liste;

2
htdocs/includes/modules/commande/pdf_einstein.modules.php
View File

@ -29,7 +29,7 @@
require_once(DOL_DOCUMENT_ROOT ."/includes/modules/commande/modules_commande.php"); require_once(DOL_DOCUMENT_ROOT ."/includes/modules/commande/modules_commande.php");
require_once(DOL_DOCUMENT_ROOT."/product/class/product.class.php"); require_once(DOL_DOCUMENT_ROOT."/product/class/product.class.php");
require_once(DOL_DOCUMENT_ROOT."/lib/company.lib.php"); require_once(DOL_DOCUMENT_ROOT."/lib/company.lib.php");
require_once(DOL_DOCUMENT_ROOT."/lib/functions2.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/functions2.lib.php");
require_once(DOL_DOCUMENT_ROOT.'/lib/pdf.lib.php'); require_once(DOL_DOCUMENT_ROOT.'/lib/pdf.lib.php');

2
htdocs/includes/modules/contract/mod_contract_magre.php
View File

@ -98,7 +98,7 @@ class mod_contract_magre extends ModelNumRefContracts
{ {
global $db,$conf; global $db,$conf;
require_once(DOL_DOCUMENT_ROOT ."/lib/functions2.lib.php"); require_once(DOL_DOCUMENT_ROOT ."/core/lib/functions2.lib.php");
$mask=$conf->global->CONTRACT_MAGRE_MASK; $mask=$conf->global->CONTRACT_MAGRE_MASK;

2
htdocs/includes/modules/dons/modules_don.php
View File

@ -48,7 +48,7 @@ abstract class ModeleDon extends CommonDocGenerator
$type='donation'; $type='donation';
$liste=array(); $liste=array();
include_once(DOL_DOCUMENT_ROOT.'/lib/functions2.lib.php'); include_once(DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php');
$liste=getListOfModels($db,$type,''); $liste=getListOfModels($db,$type,'');
return $liste; return $liste;

2
htdocs/includes/modules/expedition/methode_expedition.modules.php
View File

@ -52,7 +52,7 @@ class ModeleShippingMethod
$type='???'; $type='???';
$liste=array(); $liste=array();
include_once(DOL_DOCUMENT_ROOT.'/lib/functions2.lib.php'); include_once(DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php');
$liste=getListOfModels($db,$type,''); $liste=getListOfModels($db,$type,'');
return $liste; return $liste;

2
htdocs/includes/modules/expedition/mod_expedition_ribera.php
View File

@ -98,7 +98,7 @@ class mod_expedition_ribera extends ModelNumRefExpedition
{ {
global $db,$conf; global $db,$conf;
require_once(DOL_DOCUMENT_ROOT ."/lib/functions2.lib.php"); require_once(DOL_DOCUMENT_ROOT ."/core/lib/functions2.lib.php");
$mask=$conf->global->EXPEDITION_RIBERA_MASK; $mask=$conf->global->EXPEDITION_RIBERA_MASK;

2
htdocs/includes/modules/expedition/pdf/ModelePdfExpedition.class.php
View File

@ -46,7 +46,7 @@ abstract class ModelePdfExpedition extends CommonDocGenerator
$type='shipping'; $type='shipping';
$liste=array(); $liste=array();
include_once(DOL_DOCUMENT_ROOT.'/lib/functions2.lib.php'); include_once(DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php');
$liste=getListOfModels($db,$type,''); $liste=getListOfModels($db,$type,'');
return $liste; return $liste;

2
htdocs/includes/modules/facture/doc/doc_generic_invoice_odt.modules.php
View File

@ -26,7 +26,7 @@
require_once(DOL_DOCUMENT_ROOT."/includes/modules/facture/modules_facture.php"); require_once(DOL_DOCUMENT_ROOT."/includes/modules/facture/modules_facture.php");
require_once(DOL_DOCUMENT_ROOT."/product/class/product.class.php"); require_once(DOL_DOCUMENT_ROOT."/product/class/product.class.php");
require_once(DOL_DOCUMENT_ROOT."/lib/company.lib.php"); require_once(DOL_DOCUMENT_ROOT."/lib/company.lib.php");
require_once(DOL_DOCUMENT_ROOT."/lib/functions2.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/functions2.lib.php");
require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php"); require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php");

2
htdocs/includes/modules/facture/doc/pdf_crabe.modules.php
View File

@ -29,7 +29,7 @@
require_once(DOL_DOCUMENT_ROOT."/includes/modules/facture/modules_facture.php"); require_once(DOL_DOCUMENT_ROOT."/includes/modules/facture/modules_facture.php");
require_once(DOL_DOCUMENT_ROOT."/product/class/product.class.php"); require_once(DOL_DOCUMENT_ROOT."/product/class/product.class.php");
require_once(DOL_DOCUMENT_ROOT."/lib/company.lib.php"); require_once(DOL_DOCUMENT_ROOT."/lib/company.lib.php");
require_once(DOL_DOCUMENT_ROOT."/lib/functions2.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/functions2.lib.php");
require_once(DOL_DOCUMENT_ROOT.'/lib/pdf.lib.php'); require_once(DOL_DOCUMENT_ROOT.'/lib/pdf.lib.php');

2
htdocs/includes/modules/facture/mod_facture_mercure.php
View File

@ -113,7 +113,7 @@ class mod_facture_mercure extends ModeleNumRefFactures
{ {
global $db,$conf; global $db,$conf;
require_once(DOL_DOCUMENT_ROOT ."/lib/functions2.lib.php"); require_once(DOL_DOCUMENT_ROOT ."/core/lib/functions2.lib.php");
// Get Mask value // Get Mask value
$mask = ''; $mask = '';

2
htdocs/includes/modules/facture/modules_facture.php
View File

@ -50,7 +50,7 @@ abstract class ModelePDFFactures extends CommonDocGenerator
$type='invoice'; $type='invoice';
$liste=array(); $liste=array();
include_once(DOL_DOCUMENT_ROOT.'/lib/functions2.lib.php'); include_once(DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php');
$liste=getListOfModels($db,$type,''); $liste=getListOfModels($db,$type,'');
return $liste; return $liste;

2
htdocs/includes/modules/fichinter/mod_arctic.php
View File

@ -109,7 +109,7 @@ class mod_arctic extends ModeleNumRefFicheinter
{ {
global $db,$conf; global $db,$conf;
require_once(DOL_DOCUMENT_ROOT ."/lib/functions2.lib.php"); require_once(DOL_DOCUMENT_ROOT ."/core/lib/functions2.lib.php");
// On d<>fini critere recherche compteur // On d<>fini critere recherche compteur
$mask=$conf->global->FICHINTER_ARTIC_MASK; $mask=$conf->global->FICHINTER_ARTIC_MASK;

2
htdocs/includes/modules/fichinter/modules_fichinter.php
View File

@ -48,7 +48,7 @@ abstract class ModelePDFFicheinter extends CommonDocGenerator
$type='ficheinter'; $type='ficheinter';
$liste=array(); $liste=array();
include_once(DOL_DOCUMENT_ROOT.'/lib/functions2.lib.php'); include_once(DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php');
$liste=getListOfModels($db,$type,''); $liste=getListOfModels($db,$type,'');
return $liste; return $liste;

2
htdocs/includes/modules/livraison/mod_livraison_saphir.php
View File

@ -103,7 +103,7 @@ class mod_livraison_saphir extends ModeleNumRefDeliveryOrder
{ {
global $db,$conf; global $db,$conf;
require_once(DOL_DOCUMENT_ROOT ."/lib/functions2.lib.php"); require_once(DOL_DOCUMENT_ROOT ."/core/lib/functions2.lib.php");
// On d<>fini critere recherche compteur // On d<>fini critere recherche compteur
$mask=$conf->global->LIVRAISON_SAPHIR_MASK; $mask=$conf->global->LIVRAISON_SAPHIR_MASK;

2
htdocs/includes/modules/livraison/modules_livraison.php
View File

@ -48,7 +48,7 @@ abstract class ModelePDFDeliveryOrder extends CommonDocGenerator
$type='delivery'; $type='delivery';
$liste=array(); $liste=array();
include_once(DOL_DOCUMENT_ROOT.'/lib/functions2.lib.php'); include_once(DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php');
$liste=getListOfModels($db,$type,''); $liste=getListOfModels($db,$type,'');
return $liste; return $liste;

2
htdocs/includes/modules/mailings/peche.modules.php
View File

@ -22,7 +22,7 @@
* \brief File of class to offer a selector of emailing targets with Rule 'Peche'. * \brief File of class to offer a selector of emailing targets with Rule 'Peche'.
*/ */
include_once DOL_DOCUMENT_ROOT.'/includes/modules/mailings/modules_mailings.php'; include_once DOL_DOCUMENT_ROOT.'/includes/modules/mailings/modules_mailings.php';
require_once(DOL_DOCUMENT_ROOT."/lib/functions2.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/functions2.lib.php");
/** /**

2
htdocs/includes/modules/mailings/thirdparties_services_expired.modules.php
View File

@ -14,7 +14,7 @@
* \brief File of class to offer a selector of emailing targets with Rule 'services expired'. * \brief File of class to offer a selector of emailing targets with Rule 'services expired'.
*/ */
include_once DOL_DOCUMENT_ROOT.'/includes/modules/mailings/modules_mailings.php'; include_once DOL_DOCUMENT_ROOT.'/includes/modules/mailings/modules_mailings.php';
require_once(DOL_DOCUMENT_ROOT."/lib/functions2.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/functions2.lib.php");
/** /**

2
htdocs/includes/modules/member/cards/modules_cards.php
View File

@ -49,7 +49,7 @@ class ModelePDFCards
$type='members_card'; $type='members_card';
$liste=array(); $liste=array();
include_once(DOL_DOCUMENT_ROOT.'/lib/functions2.lib.php'); include_once(DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php');
$liste=getListOfModels($db,$type,''); $liste=getListOfModels($db,$type,'');
return $liste; return $liste;

2
htdocs/includes/modules/member/labels/modules_labels.php
View File

@ -50,7 +50,7 @@ class ModelePDFLabels
$type='members_labels'; $type='members_labels';
$liste=array(); $liste=array();
include_once(DOL_DOCUMENT_ROOT.'/lib/functions2.lib.php'); include_once(DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php');
$liste=getListOfModels($db,$type,''); $liste=getListOfModels($db,$type,'');
return $liste; return $liste;

2
htdocs/includes/modules/project/mod_project_universal.php
View File

@ -106,7 +106,7 @@ class mod_project_universal extends ModeleNumRefProjects
{ {
global $db,$conf; global $db,$conf;
require_once(DOL_DOCUMENT_ROOT ."/lib/functions2.lib.php"); require_once(DOL_DOCUMENT_ROOT ."/core/lib/functions2.lib.php");
// On defini critere recherche compteur // On defini critere recherche compteur
$mask=$conf->global->PROJECT_UNIVERSAL_MASK; $mask=$conf->global->PROJECT_UNIVERSAL_MASK;

2
htdocs/includes/modules/project/modules_project.php
View File

@ -45,7 +45,7 @@ abstract class ModelePDFProjects extends CommonDocGenerator
$type='project'; $type='project';
$liste=array(); $liste=array();
include_once(DOL_DOCUMENT_ROOT.'/lib/functions2.lib.php'); include_once(DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php');
$liste=getListOfModels($db,$type,''); $liste=getListOfModels($db,$type,'');
return $liste; return $liste;

2
htdocs/includes/modules/propale/mod_propale_saphir.php
View File

@ -105,7 +105,7 @@ class mod_propale_saphir extends ModeleNumRefPropales
{ {
global $db,$conf; global $db,$conf;
require_once(DOL_DOCUMENT_ROOT ."/lib/functions2.lib.php"); require_once(DOL_DOCUMENT_ROOT ."/core/lib/functions2.lib.php");
// On defini critere recherche compteur // On defini critere recherche compteur
$mask=$conf->global->PROPALE_SAPHIR_MASK; $mask=$conf->global->PROPALE_SAPHIR_MASK;

2
htdocs/includes/modules/propale/modules_propale.php
View File

@ -49,7 +49,7 @@ abstract class ModelePDFPropales extends CommonDocGenerator
$type='propal'; $type='propal';
$liste=array(); $liste=array();
include_once(DOL_DOCUMENT_ROOT.'/lib/functions2.lib.php'); include_once(DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php');
$liste=getListOfModels($db,$type,''); $liste=getListOfModels($db,$type,'');
return $liste; return $liste;

2
htdocs/includes/modules/propale/pdf_propale_azur.modules.php
View File

@ -28,7 +28,7 @@
require_once(DOL_DOCUMENT_ROOT."/includes/modules/propale/modules_propale.php"); require_once(DOL_DOCUMENT_ROOT."/includes/modules/propale/modules_propale.php");
require_once(DOL_DOCUMENT_ROOT."/product/class/product.class.php"); require_once(DOL_DOCUMENT_ROOT."/product/class/product.class.php");
require_once(DOL_DOCUMENT_ROOT."/lib/company.lib.php"); require_once(DOL_DOCUMENT_ROOT."/lib/company.lib.php");
require_once(DOL_DOCUMENT_ROOT."/lib/functions2.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/functions2.lib.php");
require_once(DOL_DOCUMENT_ROOT.'/lib/pdf.lib.php'); require_once(DOL_DOCUMENT_ROOT.'/lib/pdf.lib.php');

2
htdocs/includes/modules/propale/pdf_propale_jaune.modules.php
View File

@ -28,7 +28,7 @@
require_once(DOL_DOCUMENT_ROOT."/includes/modules/propale/modules_propale.php"); require_once(DOL_DOCUMENT_ROOT."/includes/modules/propale/modules_propale.php");
require_once(DOL_DOCUMENT_ROOT."/product/class/product.class.php"); require_once(DOL_DOCUMENT_ROOT."/product/class/product.class.php");
require_once(DOL_DOCUMENT_ROOT."/lib/company.lib.php"); require_once(DOL_DOCUMENT_ROOT."/lib/company.lib.php");
require_once(DOL_DOCUMENT_ROOT."/lib/functions2.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/functions2.lib.php");
require_once(DOL_DOCUMENT_ROOT.'/lib/pdf.lib.php'); require_once(DOL_DOCUMENT_ROOT.'/lib/pdf.lib.php');

4
htdocs/includes/modules/societe/mod_codeclient_elephant.php
View File

@ -158,7 +158,7 @@ class mod_codeclient_elephant extends ModeleThirdPartyCode
{ {
global $db,$conf; global $db,$conf;
require_once(DOL_DOCUMENT_ROOT ."/lib/functions2.lib.php"); require_once(DOL_DOCUMENT_ROOT ."/core/lib/functions2.lib.php");
// Get Mask value // Get Mask value
$mask = ''; $mask = '';
@ -227,7 +227,7 @@ class mod_codeclient_elephant extends ModeleThirdPartyCode
{ {
global $conf; global $conf;
require_once(DOL_DOCUMENT_ROOT ."/lib/functions2.lib.php"); require_once(DOL_DOCUMENT_ROOT ."/core/lib/functions2.lib.php");
$result=0; $result=0;
$code = strtoupper(trim($code)); $code = strtoupper(trim($code));

2
htdocs/includes/modules/societe/modules_societe.class.php
View File

@ -47,7 +47,7 @@ abstract class ModeleThirdPartyDoc extends CommonDocGenerator
$type='company'; $type='company';
$liste=array(); $liste=array();
include_once(DOL_DOCUMENT_ROOT.'/lib/functions2.lib.php'); include_once(DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php');
$liste=getListOfModels($db,$type,$maxfilenamelength); $liste=getListOfModels($db,$type,$maxfilenamelength);
return $liste; return $liste;

2
htdocs/includes/modules/supplier_invoice/modules_facturefournisseur.php
View File

@ -45,7 +45,7 @@ abstract class ModelePDFSuppliersInvoices extends CommonDocGenerator
$type='invoice_supplier'; $type='invoice_supplier';
$liste=array(); $liste=array();
include_once(DOL_DOCUMENT_ROOT.'/lib/functions2.lib.php'); include_once(DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php');
$liste=getListOfModels($db,$type,''); $liste=getListOfModels($db,$type,'');
return $liste; return $liste;

2
htdocs/includes/modules/supplier_order/mod_commande_fournisseur_orchidee.php
View File

@ -105,7 +105,7 @@ class mod_commande_fournisseur_orchidee extends ModeleNumRefSuppliersOrders
{ {
global $db,$conf; global $db,$conf;
require_once(DOL_DOCUMENT_ROOT ."/lib/functions2.lib.php"); require_once(DOL_DOCUMENT_ROOT ."/core/lib/functions2.lib.php");
// On defini critere recherche compteur // On defini critere recherche compteur
$mask=$conf->global->COMMANDE_FOURNISSEUR_ORCHIDEE_MASK; $mask=$conf->global->COMMANDE_FOURNISSEUR_ORCHIDEE_MASK;

2
htdocs/includes/modules/supplier_order/modules_commandefournisseur.php
View File

@ -51,7 +51,7 @@ abstract class ModelePDFSuppliersOrders extends CommonDocGenerator
$type='order_supplier'; $type='order_supplier';
$liste=array(); $liste=array();
include_once(DOL_DOCUMENT_ROOT.'/lib/functions2.lib.php'); include_once(DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php');
$liste=getListOfModels($db,$type,''); $liste=getListOfModels($db,$type,'');
return $liste; return $liste;

2
htdocs/install/etape5.php
View File

@ -117,7 +117,7 @@ if ($action == "set" || preg_match('/upgrade/i',$action))
// If password is encoded, we decode it // If password is encoded, we decode it
if (preg_match('/crypted:/i',$dolibarr_main_db_pass) || ! empty($dolibarr_main_db_encrypted_pass)) if (preg_match('/crypted:/i',$dolibarr_main_db_pass) || ! empty($dolibarr_main_db_encrypted_pass))
{ {
require_once($dolibarr_main_document_root."/lib/security.lib.php"); require_once($dolibarr_main_document_root."/core/lib/security.lib.php");
if (preg_match('/crypted:/i',$dolibarr_main_db_pass)) if (preg_match('/crypted:/i',$dolibarr_main_db_pass))
{ {
$dolibarr_main_db_pass = preg_replace('/crypted:/i', '', $dolibarr_main_db_pass); $dolibarr_main_db_pass = preg_replace('/crypted:/i', '', $dolibarr_main_db_pass);

2
htdocs/install/repair.php
View File

@ -76,7 +76,7 @@ $error=0;
// If password is encoded, we decode it // If password is encoded, we decode it
if (preg_match('/crypted:/i',$dolibarr_main_db_pass) || ! empty($dolibarr_main_db_encrypted_pass)) if (preg_match('/crypted:/i',$dolibarr_main_db_pass) || ! empty($dolibarr_main_db_encrypted_pass))
{ {
require_once($dolibarr_main_document_root."/lib/security.lib.php"); require_once($dolibarr_main_document_root."/core/lib/security.lib.php");
if (preg_match('/crypted:/i',$dolibarr_main_db_pass)) if (preg_match('/crypted:/i',$dolibarr_main_db_pass))
{ {
$dolibarr_main_db_pass = preg_replace('/crypted:/i', '', $dolibarr_main_db_pass); $dolibarr_main_db_pass = preg_replace('/crypted:/i', '', $dolibarr_main_db_pass);

2
htdocs/install/upgrade.php
View File

@ -87,7 +87,7 @@ if (! GETPOST("action") || preg_match('/upgrade/i',GETPOST('action')))
// If password is encoded, we decode it // If password is encoded, we decode it
if (preg_match('/crypted:/i',$dolibarr_main_db_pass) || ! empty($dolibarr_main_db_encrypted_pass)) if (preg_match('/crypted:/i',$dolibarr_main_db_pass) || ! empty($dolibarr_main_db_encrypted_pass))
{ {
require_once($dolibarr_main_document_root."/lib/security.lib.php"); require_once($dolibarr_main_document_root."/core/lib/security.lib.php");
if (preg_match('/crypted:/i',$dolibarr_main_db_pass)) if (preg_match('/crypted:/i',$dolibarr_main_db_pass))
{ {
$dolibarr_main_db_pass = preg_replace('/crypted:/i', '', $dolibarr_main_db_pass); $dolibarr_main_db_pass = preg_replace('/crypted:/i', '', $dolibarr_main_db_pass);

2
htdocs/install/upgrade2.php
View File

@ -87,7 +87,7 @@ if (! GETPOST("action") || preg_match('/upgrade/i',GETPOST('action')))
// If password is encoded, we decode it // If password is encoded, we decode it
if (preg_match('/crypted:/i',$dolibarr_main_db_pass) || ! empty($dolibarr_main_db_encrypted_pass)) if (preg_match('/crypted:/i',$dolibarr_main_db_pass) || ! empty($dolibarr_main_db_encrypted_pass))
{ {
require_once($dolibarr_main_document_root."/lib/security.lib.php"); require_once($dolibarr_main_document_root."/core/lib/security.lib.php");
if (preg_match('/crypted:/i',$dolibarr_main_db_pass)) if (preg_match('/crypted:/i',$dolibarr_main_db_pass))
{ {
$dolibarr_main_db_pass = preg_replace('/crypted:/i', '', $dolibarr_main_db_pass); $dolibarr_main_db_pass = preg_replace('/crypted:/i', '', $dolibarr_main_db_pass);

4
htdocs/lib/pdf.lib.php
View File

@ -41,7 +41,7 @@ function pdf_getFormat()
if (empty($conf->global->MAIN_PDF_FORMAT)) if (empty($conf->global->MAIN_PDF_FORMAT))
{ {
include_once(DOL_DOCUMENT_ROOT.'/lib/functions2.lib.php'); include_once(DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php');
$pdfformat=dol_getDefaultFormat(); $pdfformat=dol_getDefaultFormat();
} }
else $pdfformat=$conf->global->MAIN_PDF_FORMAT; else $pdfformat=$conf->global->MAIN_PDF_FORMAT;
@ -1077,7 +1077,7 @@ function pdf_getlineqty_keeptoship($object,$i,$outputlangs,$hidedetails=0,$hookm
*/ */
function pdf_getlineremisepercent($object,$i,$outputlangs,$hidedetails=0,$hookmanager=false) function pdf_getlineremisepercent($object,$i,$outputlangs,$hidedetails=0,$hookmanager=false)
{ {
include_once(DOL_DOCUMENT_ROOT."/lib/functions2.lib.php"); include_once(DOL_DOCUMENT_ROOT."/core/lib/functions2.lib.php");
if ($object->lines[$i]->special_code != 3) if ($object->lines[$i]->special_code != 3)
{ {

4
htdocs/product/class/product.class.php
View File

@ -2491,7 +2491,7 @@ class Product extends CommonObject
*/ */
function add_thumb($file, $maxWidth = 160, $maxHeight = 120) function add_thumb($file, $maxWidth = 160, $maxHeight = 120)
{ {
require_once(DOL_DOCUMENT_ROOT ."/lib/images.lib.php"); require_once(DOL_DOCUMENT_ROOT ."/core/lib/images.lib.php");
$file_osencoded=dol_osencode($file); $file_osencoded=dol_osencode($file);
if (file_exists($file_osencoded)) if (file_exists($file_osencoded))
@ -2586,7 +2586,7 @@ class Product extends CommonObject
global $conf,$user,$langs; global $conf,$user,$langs;
include_once(DOL_DOCUMENT_ROOT ."/lib/files.lib.php"); include_once(DOL_DOCUMENT_ROOT ."/lib/files.lib.php");
include_once(DOL_DOCUMENT_ROOT ."/lib/images.lib.php"); include_once(DOL_DOCUMENT_ROOT ."/core/lib/images.lib.php");
$pdir = get_exdir($this->id,2) . $this->id ."/photos/"; $pdir = get_exdir($this->id,2) . $this->id ."/photos/";
$dir = $sdir . '/'. $pdir; $dir = $sdir . '/'. $pdir;

2
htdocs/product/stock/info.php
View File

@ -23,7 +23,7 @@
require("../../main.inc.php"); require("../../main.inc.php");
require_once(DOL_DOCUMENT_ROOT."/product/stock/class/entrepot.class.php"); require_once(DOL_DOCUMENT_ROOT."/product/stock/class/entrepot.class.php");
require_once(DOL_DOCUMENT_ROOT."/lib/functions2.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/functions2.lib.php");
require_once(DOL_DOCUMENT_ROOT."/lib/stock.lib.php"); require_once(DOL_DOCUMENT_ROOT."/lib/stock.lib.php");
$langs->load("stocks"); $langs->load("stocks");

2
htdocs/product/traduction.php
View File

@ -26,7 +26,7 @@
require("../main.inc.php"); require("../main.inc.php");
require_once(DOL_DOCUMENT_ROOT."/lib/product.lib.php"); require_once(DOL_DOCUMENT_ROOT."/lib/product.lib.php");
require_once(DOL_DOCUMENT_ROOT."/lib/functions2.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/functions2.lib.php");
require_once(DOL_DOCUMENT_ROOT."/product/class/product.class.php"); require_once(DOL_DOCUMENT_ROOT."/product/class/product.class.php");
require_once(DOL_DOCUMENT_ROOT."/core/class/html.formadmin.class.php"); require_once(DOL_DOCUMENT_ROOT."/core/class/html.formadmin.class.php");

2
htdocs/public/donations/therm.php
View File

@ -26,7 +26,7 @@ define("NOLOGIN",1); // This means this output page does not require to be logg
define("NOCSRFCHECK",1); // We accept to go on this page from external web site. define("NOCSRFCHECK",1); // We accept to go on this page from external web site.
require("../../main.inc.php"); require("../../main.inc.php");
require_once(DOL_DOCUMENT_ROOT."/lib/images.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/images.lib.php");
require_once(DOL_DOCUMENT_ROOT."/compta/dons/class/don.class.php"); require_once(DOL_DOCUMENT_ROOT."/compta/dons/class/don.class.php");
// Security check // Security check

2
htdocs/public/paybox/newpayment.php
View File

@ -30,7 +30,7 @@ define("NOCSRFCHECK",1); // We accept to go on this page from external web site.
require("../../main.inc.php"); require("../../main.inc.php");
require_once(DOL_DOCUMENT_ROOT."/paybox/lib/paybox.lib.php"); require_once(DOL_DOCUMENT_ROOT."/paybox/lib/paybox.lib.php");
require_once(DOL_DOCUMENT_ROOT."/lib/company.lib.php"); require_once(DOL_DOCUMENT_ROOT."/lib/company.lib.php");
require_once(DOL_DOCUMENT_ROOT."/lib/functions2.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/functions2.lib.php");
require_once(DOL_DOCUMENT_ROOT."/product/class/product.class.php"); require_once(DOL_DOCUMENT_ROOT."/product/class/product.class.php");
// Security check // Security check

2
htdocs/public/paypal/newpayment.php
View File

@ -31,7 +31,7 @@ require("../../main.inc.php");
require_once(DOL_DOCUMENT_ROOT."/paypal/lib/paypal.lib.php"); require_once(DOL_DOCUMENT_ROOT."/paypal/lib/paypal.lib.php");
require_once(DOL_DOCUMENT_ROOT."/paypal/lib/paypalfunctions.lib.php"); require_once(DOL_DOCUMENT_ROOT."/paypal/lib/paypalfunctions.lib.php");
require_once(DOL_DOCUMENT_ROOT."/lib/company.lib.php"); require_once(DOL_DOCUMENT_ROOT."/lib/company.lib.php");
require_once(DOL_DOCUMENT_ROOT."/lib/functions2.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/functions2.lib.php");
require_once(DOL_DOCUMENT_ROOT."/product/class/product.class.php"); require_once(DOL_DOCUMENT_ROOT."/product/class/product.class.php");
// Security check // Security check

4
htdocs/societe/canvas/actions_card_common.class.php
View File

@ -119,7 +119,7 @@ abstract class ActionsCardCommon
if ((! $_POST["getcustomercode"] && ! $_POST["getsuppliercode"]) if ((! $_POST["getcustomercode"] && ! $_POST["getsuppliercode"])
&& ($action == 'add' || $action == 'update')) && ($action == 'add' || $action == 'update'))
{ {
require_once(DOL_DOCUMENT_ROOT."/lib/functions2.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/functions2.lib.php");
$error=0; $error=0;
if (GETPOST("private") == 1) if (GETPOST("private") == 1)
@ -572,7 +572,7 @@ abstract class ActionsCardCommon
if ($conf->global->MAIN_MULTILANGS) if ($conf->global->MAIN_MULTILANGS)
{ {
require_once(DOL_DOCUMENT_ROOT."/lib/functions2.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/functions2.lib.php");
//$s=picto_from_langcode($this->default_lang); //$s=picto_from_langcode($this->default_lang);
//print ($s?$s.' ':''); //print ($s?$s.' ':'');
$langs->load("languages"); $langs->load("languages");

2
htdocs/societe/checkvat/checkVatPopup.php
View File

@ -61,7 +61,7 @@ else
// Set the WebService URL // Set the WebService URL
dol_syslog("Create nusoap_client for URL=".$WS_DOL_URL." WSDL=".$WS_DOL_URL_WSDL); dol_syslog("Create nusoap_client for URL=".$WS_DOL_URL." WSDL=".$WS_DOL_URL_WSDL);
require_once(DOL_DOCUMENT_ROOT.'/lib/functions2.lib.php'); require_once(DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php');
$params=getSoapParams(); $params=getSoapParams();
//ini_set('default_socket_timeout', $params['response_timeout']); //ini_set('default_socket_timeout', $params['response_timeout']);
//$soapclient = new SoapClient($WS_DOL_URL_WSDL,$params); //$soapclient = new SoapClient($WS_DOL_URL_WSDL,$params);

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

@ -376,7 +376,7 @@ class Societe extends CommonObject
*/ */
function update($id, $user='', $call_trigger=1, $allowmodcodeclient=0, $allowmodcodefournisseur=0, $action='update') function update($id, $user='', $call_trigger=1, $allowmodcodeclient=0, $allowmodcodefournisseur=0, $action='update')
{ {
require_once(DOL_DOCUMENT_ROOT."/lib/functions2.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/functions2.lib.php");
global $langs,$conf; global $langs,$conf;

2
htdocs/societe/document.php
View File

@ -27,7 +27,7 @@
require("../main.inc.php"); require("../main.inc.php");
require_once(DOL_DOCUMENT_ROOT."/lib/company.lib.php"); require_once(DOL_DOCUMENT_ROOT."/lib/company.lib.php");
require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php"); require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php");
require_once(DOL_DOCUMENT_ROOT."/lib/images.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/images.lib.php");
require_once(DOL_DOCUMENT_ROOT."/core/class/html.formfile.class.php"); require_once(DOL_DOCUMENT_ROOT."/core/class/html.formfile.class.php");
$langs->load("companies"); $langs->load("companies");

2
htdocs/societe/info.php
View File

@ -23,7 +23,7 @@
*/ */
require("../main.inc.php"); require("../main.inc.php");
require_once(DOL_DOCUMENT_ROOT."/lib/functions2.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/functions2.lib.php");
require_once(DOL_DOCUMENT_ROOT."/lib/company.lib.php"); require_once(DOL_DOCUMENT_ROOT."/lib/company.lib.php");
require_once(DOL_DOCUMENT_ROOT."/societe/class/societe.class.php"); require_once(DOL_DOCUMENT_ROOT."/societe/class/societe.class.php");

6
htdocs/societe/soc.php
View File

@ -29,7 +29,7 @@
require("../main.inc.php"); require("../main.inc.php");
require_once(DOL_DOCUMENT_ROOT."/lib/company.lib.php"); require_once(DOL_DOCUMENT_ROOT."/lib/company.lib.php");
require_once(DOL_DOCUMENT_ROOT."/lib/images.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/images.lib.php");
require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php"); require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php");
require_once(DOL_DOCUMENT_ROOT."/core/class/html.formadmin.class.php"); require_once(DOL_DOCUMENT_ROOT."/core/class/html.formadmin.class.php");
require_once(DOL_DOCUMENT_ROOT."/core/class/html.formcompany.class.php"); require_once(DOL_DOCUMENT_ROOT."/core/class/html.formcompany.class.php");
@ -100,7 +100,7 @@ if (empty($reshook))
if ((! $_POST["getcustomercode"] && ! $_POST["getsuppliercode"]) if ((! $_POST["getcustomercode"] && ! $_POST["getsuppliercode"])
&& ($action == 'add' || $action == 'update') && $user->rights->societe->creer) && ($action == 'add' || $action == 'update') && $user->rights->societe->creer)
{ {
require_once(DOL_DOCUMENT_ROOT."/lib/functions2.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/functions2.lib.php");
if ($action == 'update') $object->fetch($socid); if ($action == 'update') $object->fetch($socid);
else $object->canvas=$canvas; else $object->canvas=$canvas;
@ -1700,7 +1700,7 @@ else
// Default language // Default language
if ($conf->global->MAIN_MULTILANGS) if ($conf->global->MAIN_MULTILANGS)
{ {
require_once(DOL_DOCUMENT_ROOT."/lib/functions2.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/functions2.lib.php");
print '<tr><td>'.$langs->trans("DefaultLang").'</td><td colspan="3">'; print '<tr><td>'.$langs->trans("DefaultLang").'</td><td colspan="3">';
//$s=picto_from_langcode($object->default_lang); //$s=picto_from_langcode($object->default_lang);
//print ($s?$s.' ':''); //print ($s?$s.' ':'');

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