[task #216] Move lib in core directory
This commit is contained in:
parent
1c86e6b526
commit
56d6cbe56f
@ -26,7 +26,7 @@ set_include_path($_SERVER['DOCUMENT_ROOT'].'/htdocs');
|
|||||||
|
|
||||||
require_once("../master.inc.php");
|
require_once("../master.inc.php");
|
||||||
require_once(NUSOAP_PATH.'/nusoap.php'); // Include SOAP
|
require_once(NUSOAP_PATH.'/nusoap.php'); // Include SOAP
|
||||||
require_once(DOL_DOCUMENT_ROOT."/lib/ws.lib.php");
|
require_once(DOL_DOCUMENT_ROOT."/core/lib/ws.lib.php");
|
||||||
require_once(DOL_DOCUMENT_ROOT."/skeleton/class/skeleton.class.php");
|
require_once(DOL_DOCUMENT_ROOT."/skeleton/class/skeleton.class.php");
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@ -36,7 +36,7 @@ if (substr($sapi_type, 0, 3) == 'cgi') {
|
|||||||
|
|
||||||
// Include Dolibarr environment
|
// Include Dolibarr environment
|
||||||
require_once($path.'../../htdocs/master.inc.php');
|
require_once($path.'../../htdocs/master.inc.php');
|
||||||
require_once($path.'../../htdocs/lib/files.lib.php');
|
require_once($path.'../../htdocs/core/lib/files.lib.php');
|
||||||
// After this $db is an opened handler to database. We close it at end of file.
|
// After this $db is an opened handler to database. We close it at end of file.
|
||||||
|
|
||||||
// Load main language strings
|
// Load main language strings
|
||||||
|
|||||||
@ -29,7 +29,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."/lib/member.lib.php");
|
require_once(DOL_DOCUMENT_ROOT."/core/lib/member.lib.php");
|
||||||
|
|
||||||
$langs->load("admin");
|
$langs->load("admin");
|
||||||
$langs->load("members");
|
$langs->load("members");
|
||||||
|
|||||||
@ -24,7 +24,7 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
require("../../main.inc.php");
|
require("../../main.inc.php");
|
||||||
require_once(DOL_DOCUMENT_ROOT."/lib/member.lib.php");
|
require_once(DOL_DOCUMENT_ROOT."/core/lib/member.lib.php");
|
||||||
require_once(DOL_DOCUMENT_ROOT."/core/class/extrafields.class.php");
|
require_once(DOL_DOCUMENT_ROOT."/core/class/extrafields.class.php");
|
||||||
|
|
||||||
$langs->load("members");
|
$langs->load("members");
|
||||||
|
|||||||
@ -27,7 +27,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."/core/lib/company.lib.php");
|
require_once(DOL_DOCUMENT_ROOT."/core/lib/company.lib.php");
|
||||||
require_once(DOL_DOCUMENT_ROOT."/lib/member.lib.php");
|
require_once(DOL_DOCUMENT_ROOT."/core/lib/member.lib.php");
|
||||||
|
|
||||||
$langs->load("members");
|
$langs->load("members");
|
||||||
$langs->load("admin");
|
$langs->load("admin");
|
||||||
|
|||||||
@ -24,7 +24,7 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
require("../main.inc.php");
|
require("../main.inc.php");
|
||||||
require_once(DOL_DOCUMENT_ROOT."/lib/member.lib.php");
|
require_once(DOL_DOCUMENT_ROOT."/core/lib/member.lib.php");
|
||||||
require_once(DOL_DOCUMENT_ROOT."/core/lib/date.lib.php");
|
require_once(DOL_DOCUMENT_ROOT."/core/lib/date.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");
|
||||||
@ -372,7 +372,7 @@ if ($user->rights->adherent->cotisation->creer && $action == 'cotisation' && ! $
|
|||||||
{
|
{
|
||||||
require_once(DOL_DOCUMENT_ROOT.'/compta/paiement/class/paiement.class.php');
|
require_once(DOL_DOCUMENT_ROOT.'/compta/paiement/class/paiement.class.php');
|
||||||
require_once(DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php');
|
require_once(DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php');
|
||||||
require_once(DOL_DOCUMENT_ROOT.'/lib/functions.lib.php');
|
require_once(DOL_DOCUMENT_ROOT.'/core/lib/functions.lib.php');
|
||||||
|
|
||||||
// Creation de la ligne paiement
|
// Creation de la ligne paiement
|
||||||
$amounts[$invoice->id] = price2num($cotisation);
|
$amounts[$invoice->id] = price2num($cotisation);
|
||||||
|
|||||||
@ -23,7 +23,7 @@
|
|||||||
* \brief Page to output members business cards
|
* \brief Page to output members business cards
|
||||||
*/
|
*/
|
||||||
require("../../main.inc.php");
|
require("../../main.inc.php");
|
||||||
require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php");
|
require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
|
||||||
require_once(DOL_DOCUMENT_ROOT."/adherents/class/adherent.class.php");
|
require_once(DOL_DOCUMENT_ROOT."/adherents/class/adherent.class.php");
|
||||||
require_once(DOL_DOCUMENT_ROOT."/includes/modules/member/cards/modules_cards.php");
|
require_once(DOL_DOCUMENT_ROOT."/includes/modules/member/cards/modules_cards.php");
|
||||||
require_once(DOL_DOCUMENT_ROOT."/includes/modules/member/labels/modules_labels.php");
|
require_once(DOL_DOCUMENT_ROOT."/includes/modules/member/labels/modules_labels.php");
|
||||||
|
|||||||
@ -25,8 +25,8 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
require("../main.inc.php");
|
require("../main.inc.php");
|
||||||
require_once(DOL_DOCUMENT_ROOT."/lib/member.lib.php");
|
require_once(DOL_DOCUMENT_ROOT."/core/lib/member.lib.php");
|
||||||
require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php");
|
require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
|
||||||
require_once(DOL_DOCUMENT_ROOT."/core/class/html.formfile.class.php");
|
require_once(DOL_DOCUMENT_ROOT."/core/class/html.formfile.class.php");
|
||||||
require_once(DOL_DOCUMENT_ROOT."/adherents/class/adherent.class.php");
|
require_once(DOL_DOCUMENT_ROOT."/adherents/class/adherent.class.php");
|
||||||
require_once(DOL_DOCUMENT_ROOT."/adherents/class/adherent_type.class.php");
|
require_once(DOL_DOCUMENT_ROOT."/adherents/class/adherent_type.class.php");
|
||||||
@ -67,7 +67,7 @@ $upload_dir = $conf->adherent->dir_output . "/" . get_exdir($id,2,0,1) . '/' . $
|
|||||||
// Envoie fichier
|
// Envoie fichier
|
||||||
if ( $_POST["sendit"] && ! empty($conf->global->MAIN_UPLOAD_DOC))
|
if ( $_POST["sendit"] && ! empty($conf->global->MAIN_UPLOAD_DOC))
|
||||||
{
|
{
|
||||||
require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php");
|
require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
|
||||||
|
|
||||||
if (create_exdir($upload_dir) >= 0)
|
if (create_exdir($upload_dir) >= 0)
|
||||||
{
|
{
|
||||||
|
|||||||
@ -25,7 +25,7 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
require("../main.inc.php");
|
require("../main.inc.php");
|
||||||
require_once(DOL_DOCUMENT_ROOT."/lib/member.lib.php");
|
require_once(DOL_DOCUMENT_ROOT."/core/lib/member.lib.php");
|
||||||
require_once(DOL_DOCUMENT_ROOT."/core/lib/company.lib.php");
|
require_once(DOL_DOCUMENT_ROOT."/core/lib/company.lib.php");
|
||||||
require_once(DOL_DOCUMENT_ROOT."/core/lib/images.lib.php");
|
require_once(DOL_DOCUMENT_ROOT."/core/lib/images.lib.php");
|
||||||
require_once(DOL_DOCUMENT_ROOT."/core/lib/functions2.lib.php");
|
require_once(DOL_DOCUMENT_ROOT."/core/lib/functions2.lib.php");
|
||||||
@ -206,7 +206,7 @@ if ($_REQUEST["action"] == 'confirm_sendinfo' && $_REQUEST["confirm"] == 'yes')
|
|||||||
|
|
||||||
if ($_REQUEST["action"] == 'update' && ! $_POST["cancel"] && $user->rights->adherent->creer)
|
if ($_REQUEST["action"] == 'update' && ! $_POST["cancel"] && $user->rights->adherent->creer)
|
||||||
{
|
{
|
||||||
require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php");
|
require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
|
||||||
|
|
||||||
$datenaiss='';
|
$datenaiss='';
|
||||||
if (isset($_POST["naissday"]) && $_POST["naissday"]
|
if (isset($_POST["naissday"]) && $_POST["naissday"]
|
||||||
|
|||||||
@ -22,7 +22,7 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
require("../main.inc.php");
|
require("../main.inc.php");
|
||||||
require_once(DOL_DOCUMENT_ROOT."/lib/member.lib.php");
|
require_once(DOL_DOCUMENT_ROOT."/core/lib/member.lib.php");
|
||||||
require_once(DOL_DOCUMENT_ROOT."/adherents/class/adherent.class.php");
|
require_once(DOL_DOCUMENT_ROOT."/adherents/class/adherent.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."/compta/bank/class/account.class.php");
|
require_once(DOL_DOCUMENT_ROOT."/compta/bank/class/account.class.php");
|
||||||
|
|||||||
@ -25,7 +25,7 @@
|
|||||||
require("../main.inc.php");
|
require("../main.inc.php");
|
||||||
require_once(DOL_DOCUMENT_ROOT."/core/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."/core/lib/member.lib.php");
|
||||||
|
|
||||||
$langs->load("companies");
|
$langs->load("companies");
|
||||||
$langs->load("bills");
|
$langs->load("bills");
|
||||||
|
|||||||
@ -25,7 +25,7 @@
|
|||||||
require("../main.inc.php");
|
require("../main.inc.php");
|
||||||
require_once(DOL_DOCUMENT_ROOT."/core/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."/core/lib/member.lib.php");
|
||||||
require_once(DOL_DOCUMENT_ROOT."/adherents/class/cotisation.class.php");
|
require_once(DOL_DOCUMENT_ROOT."/adherents/class/cotisation.class.php");
|
||||||
|
|
||||||
$langs->load("companies");
|
$langs->load("companies");
|
||||||
|
|||||||
@ -23,7 +23,7 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
require("../main.inc.php");
|
require("../main.inc.php");
|
||||||
require_once(DOL_DOCUMENT_ROOT."/lib/member.lib.php");
|
require_once(DOL_DOCUMENT_ROOT."/core/lib/member.lib.php");
|
||||||
require_once(DOL_DOCUMENT_ROOT."/core/lib/ldap.lib.php");
|
require_once(DOL_DOCUMENT_ROOT."/core/lib/ldap.lib.php");
|
||||||
require_once(DOL_DOCUMENT_ROOT."/core/class/ldap.class.php");
|
require_once(DOL_DOCUMENT_ROOT."/core/class/ldap.class.php");
|
||||||
require_once(DOL_DOCUMENT_ROOT."/adherents/class/adherent.class.php");
|
require_once(DOL_DOCUMENT_ROOT."/adherents/class/adherent.class.php");
|
||||||
|
|||||||
@ -23,7 +23,7 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
require("../main.inc.php");
|
require("../main.inc.php");
|
||||||
require_once(DOL_DOCUMENT_ROOT.'/lib/member.lib.php');
|
require_once(DOL_DOCUMENT_ROOT.'/core/lib/member.lib.php');
|
||||||
require_once(DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php');
|
require_once(DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php');
|
||||||
require_once(DOL_DOCUMENT_ROOT."/adherents/class/adherent_type.class.php");
|
require_once(DOL_DOCUMENT_ROOT."/adherents/class/adherent_type.class.php");
|
||||||
|
|
||||||
|
|||||||
@ -23,7 +23,7 @@
|
|||||||
|
|
||||||
require("../../main.inc.php");
|
require("../../main.inc.php");
|
||||||
require_once(DOL_DOCUMENT_ROOT."/core/class/dolgraph.class.php");
|
require_once(DOL_DOCUMENT_ROOT."/core/class/dolgraph.class.php");
|
||||||
require_once(DOL_DOCUMENT_ROOT."/lib/member.lib.php");
|
require_once(DOL_DOCUMENT_ROOT."/core/lib/member.lib.php");
|
||||||
|
|
||||||
$graphwidth = 700;
|
$graphwidth = 700;
|
||||||
$mapratio = 0.5;
|
$mapratio = 0.5;
|
||||||
|
|||||||
@ -26,7 +26,7 @@
|
|||||||
require("../../main.inc.php");
|
require("../../main.inc.php");
|
||||||
require_once(DOL_DOCUMENT_ROOT."/adherents/class/adherentstats.class.php");
|
require_once(DOL_DOCUMENT_ROOT."/adherents/class/adherentstats.class.php");
|
||||||
require_once(DOL_DOCUMENT_ROOT."/core/class/dolgraph.class.php");
|
require_once(DOL_DOCUMENT_ROOT."/core/class/dolgraph.class.php");
|
||||||
require_once(DOL_DOCUMENT_ROOT."/lib/member.lib.php");
|
require_once(DOL_DOCUMENT_ROOT."/core/lib/member.lib.php");
|
||||||
|
|
||||||
$WIDTH=500;
|
$WIDTH=500;
|
||||||
$HEIGHT=200;
|
$HEIGHT=200;
|
||||||
|
|||||||
@ -47,7 +47,7 @@ accessforbidden();
|
|||||||
if ( (isset($_POST["action"]) && $_POST["action"] == 'update' && empty($_POST["cancel"]))
|
if ( (isset($_POST["action"]) && $_POST["action"] == 'update' && empty($_POST["cancel"]))
|
||||||
|| (isset($_POST["action"]) && $_POST["action"] == 'updateedit') )
|
|| (isset($_POST["action"]) && $_POST["action"] == 'updateedit') )
|
||||||
{
|
{
|
||||||
require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php");
|
require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
|
||||||
|
|
||||||
$new_pays_id=$_POST["pays_id"];
|
$new_pays_id=$_POST["pays_id"];
|
||||||
$new_pays_code=getCountry($new_pays_id,2);
|
$new_pays_code=getCountry($new_pays_id,2);
|
||||||
@ -201,7 +201,7 @@ if ($_GET["action"] == 'addthumb')
|
|||||||
|
|
||||||
if ($_GET["action"] == 'removelogo')
|
if ($_GET["action"] == 'removelogo')
|
||||||
{
|
{
|
||||||
require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php");
|
require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
|
||||||
|
|
||||||
$logofile=$conf->mycompany->dir_output.'/logos/'.$mysoc->logo;
|
$logofile=$conf->mycompany->dir_output.'/logos/'.$mysoc->logo;
|
||||||
dol_delete_file($logofile);
|
dol_delete_file($logofile);
|
||||||
|
|||||||
@ -23,7 +23,7 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
require("../main.inc.php");
|
require("../main.inc.php");
|
||||||
require_once(DOL_DOCUMENT_ROOT."/lib/usergroups.lib.php");
|
require_once(DOL_DOCUMENT_ROOT."/core/lib/usergroups.lib.php");
|
||||||
require_once(DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php");
|
require_once(DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php");
|
||||||
require_once(DOL_DOCUMENT_ROOT."/core/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");
|
||||||
|
|||||||
@ -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."/lib/price.lib.php");
|
require_once(DOL_DOCUMENT_ROOT."/core/lib/price.lib.php");
|
||||||
|
|
||||||
$langs->load("companies");
|
$langs->load("companies");
|
||||||
$langs->load("products");
|
$langs->load("products");
|
||||||
|
|||||||
@ -23,7 +23,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."/lib/files.lib.php");
|
require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
|
||||||
|
|
||||||
$langs->load("companies");
|
$langs->load("companies");
|
||||||
$langs->load("products");
|
$langs->load("products");
|
||||||
@ -74,7 +74,7 @@ if (isset($_POST["action"]) && $_POST["action"] == 'update' && empty($_POST["can
|
|||||||
*/
|
*/
|
||||||
if ($_POST['addfile'] || $_POST['addfilehtml'])
|
if ($_POST['addfile'] || $_POST['addfilehtml'])
|
||||||
{
|
{
|
||||||
require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php");
|
require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
|
||||||
|
|
||||||
// Set tmp user directory
|
// Set tmp user directory
|
||||||
$vardir=$conf->user->dir_output."/".$user->id;
|
$vardir=$conf->user->dir_output."/".$user->id;
|
||||||
|
|||||||
@ -35,7 +35,7 @@ if (! defined('NOREQUIREAJAX')) define('NOREQUIREAJAX','1');
|
|||||||
session_cache_limiter(FALSE);
|
session_cache_limiter(FALSE);
|
||||||
|
|
||||||
require_once("../../master.inc.php");
|
require_once("../../master.inc.php");
|
||||||
require_once(DOL_DOCUMENT_ROOT."/lib/functions.lib.php");
|
require_once(DOL_DOCUMENT_ROOT."/core/lib/functions.lib.php");
|
||||||
|
|
||||||
// Define css type
|
// Define css type
|
||||||
header('Content-type: application/javascript');
|
header('Content-type: application/javascript');
|
||||||
|
|||||||
@ -23,7 +23,7 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
require("../main.inc.php");
|
require("../main.inc.php");
|
||||||
require_once(DOL_DOCUMENT_ROOT."/lib/usergroups.lib.php");
|
require_once(DOL_DOCUMENT_ROOT."/core/lib/usergroups.lib.php");
|
||||||
require_once(DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php");
|
require_once(DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php");
|
||||||
require_once(DOL_DOCUMENT_ROOT."/core/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");
|
||||||
|
|||||||
@ -41,7 +41,7 @@ $upload_dir=$conf->admin->dir_temp;
|
|||||||
|
|
||||||
if ($_POST["sendit"] && ! empty($conf->global->MAIN_UPLOAD_DOC))
|
if ($_POST["sendit"] && ! empty($conf->global->MAIN_UPLOAD_DOC))
|
||||||
{
|
{
|
||||||
require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php");
|
require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
|
||||||
|
|
||||||
$result=create_exdir($upload_dir); // Create dir if not exists
|
$result=create_exdir($upload_dir); // Create dir if not exists
|
||||||
if ($result >= 0)
|
if ($result >= 0)
|
||||||
|
|||||||
@ -22,7 +22,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."/lib/files.lib.php");
|
require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
|
||||||
require_once(DOL_DOCUMENT_ROOT."/core/class/html.formfile.class.php");
|
require_once(DOL_DOCUMENT_ROOT."/core/class/html.formfile.class.php");
|
||||||
|
|
||||||
$what=$_REQUEST["what"];
|
$what=$_REQUEST["what"];
|
||||||
|
|||||||
@ -21,7 +21,7 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
require("../../main.inc.php");
|
require("../../main.inc.php");
|
||||||
include_once(DOL_DOCUMENT_ROOT.'/lib/files.lib.php');
|
include_once(DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php');
|
||||||
|
|
||||||
$langs->load("admin");
|
$langs->load("admin");
|
||||||
|
|
||||||
|
|||||||
@ -22,7 +22,7 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
require("../../main.inc.php");
|
require("../../main.inc.php");
|
||||||
include_once $dolibarr_main_document_root."/lib/files.lib.php";
|
include_once $dolibarr_main_document_root."/core/lib/files.lib.php";
|
||||||
|
|
||||||
$langs->load("admin");
|
$langs->load("admin");
|
||||||
$langs->load("other");
|
$langs->load("other");
|
||||||
|
|||||||
@ -61,7 +61,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."/core/lib/functions.lib.php");
|
||||||
require_once(DOL_DOCUMENT_ROOT."/core/lib/functions2.lib.php");
|
require_once(DOL_DOCUMENT_ROOT."/core/lib/functions2.lib.php");
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@ -12,7 +12,7 @@ index.php
|
|||||||
main.inc.php
|
main.inc.php
|
||||||
master.inc.php
|
master.inc.php
|
||||||
filefunc.inc.php
|
filefunc.inc.php
|
||||||
lib/functions.lib.php
|
core/lib/functions.lib.php
|
||||||
|
|
||||||
# The NETWORK section contains the path to a folder to ensure that requests
|
# The NETWORK section contains the path to a folder to ensure that requests
|
||||||
# to load resources contained under /api will bypass the cache and always fetch the resource from the server.
|
# to load resources contained under /api will bypass the cache and always fetch the resource from the server.
|
||||||
|
|||||||
@ -17,7 +17,7 @@
|
|||||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
include_once(DOL_DOCUMENT_ROOT.'/lib/price.lib.php');
|
include_once(DOL_DOCUMENT_ROOT.'/core/lib/price.lib.php');
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
@ -284,7 +284,7 @@ else if ($id || $ref)
|
|||||||
/*
|
/*
|
||||||
* Fiche categorie de produit
|
* Fiche categorie de produit
|
||||||
*/
|
*/
|
||||||
require_once(DOL_DOCUMENT_ROOT."/lib/product.lib.php");
|
require_once(DOL_DOCUMENT_ROOT."/core/lib/product.lib.php");
|
||||||
require_once(DOL_DOCUMENT_ROOT."/product/class/product.class.php");
|
require_once(DOL_DOCUMENT_ROOT."/product/class/product.class.php");
|
||||||
|
|
||||||
// Produit
|
// Produit
|
||||||
@ -339,7 +339,7 @@ else if ($id || $ref)
|
|||||||
/*
|
/*
|
||||||
* Fiche categorie d'adherent
|
* Fiche categorie d'adherent
|
||||||
*/
|
*/
|
||||||
require_once(DOL_DOCUMENT_ROOT."/lib/member.lib.php");
|
require_once(DOL_DOCUMENT_ROOT."/core/lib/member.lib.php");
|
||||||
require_once(DOL_DOCUMENT_ROOT."/adherents/class/adherent.class.php");
|
require_once(DOL_DOCUMENT_ROOT."/adherents/class/adherent.class.php");
|
||||||
require_once(DOL_DOCUMENT_ROOT."/adherents/class/adherent_type.class.php");
|
require_once(DOL_DOCUMENT_ROOT."/adherents/class/adherent_type.class.php");
|
||||||
|
|
||||||
|
|||||||
@ -1201,7 +1201,7 @@ class Categorie
|
|||||||
*/
|
*/
|
||||||
function add_photo($sdir, $file, $maxWidth = 160, $maxHeight = 120)
|
function add_photo($sdir, $file, $maxWidth = 160, $maxHeight = 120)
|
||||||
{
|
{
|
||||||
require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php");
|
require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
|
||||||
|
|
||||||
$dir = $sdir .'/'. get_exdir($this->id,2) . $this->id ."/";
|
$dir = $sdir .'/'. get_exdir($this->id,2) . $this->id ."/";
|
||||||
$dir .= "photos/";
|
$dir .= "photos/";
|
||||||
@ -1306,7 +1306,7 @@ class Categorie
|
|||||||
*/
|
*/
|
||||||
function delete_photo($file)
|
function delete_photo($file)
|
||||||
{
|
{
|
||||||
require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php");
|
require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
|
||||||
|
|
||||||
$dir = dirname($file).'/'; // Chemin du dossier contenant l'image d'origine
|
$dir = dirname($file).'/'; // Chemin du dossier contenant l'image d'origine
|
||||||
$dirthumb = $dir.'/thumbs/'; // Chemin du dossier contenant la vignette
|
$dirthumb = $dir.'/thumbs/'; // Chemin du dossier contenant la vignette
|
||||||
|
|||||||
@ -665,7 +665,7 @@ class ActionComm extends CommonObject
|
|||||||
{
|
{
|
||||||
global $conf,$langs,$dolibarr_main_url_root,$mysoc;
|
global $conf,$langs,$dolibarr_main_url_root,$mysoc;
|
||||||
|
|
||||||
require_once (DOL_DOCUMENT_ROOT ."/lib/xcal.lib.php");
|
require_once (DOL_DOCUMENT_ROOT ."/core/lib/xcal.lib.php");
|
||||||
require_once (DOL_DOCUMENT_ROOT ."/core/lib/date.lib.php");
|
require_once (DOL_DOCUMENT_ROOT ."/core/lib/date.lib.php");
|
||||||
|
|
||||||
dol_syslog(get_class($this)."::build_exportfile Build export file format=".$format.", type=".$type.", cachedelay=".$cachedelay.", filename=".$filename.", filters size=".count($filters), LOG_DEBUG);
|
dol_syslog(get_class($this)."::build_exportfile Build export file format=".$format.", type=".$type.", cachedelay=".$cachedelay.", filename=".$filename.", filters size=".count($filters), LOG_DEBUG);
|
||||||
@ -695,7 +695,7 @@ class ActionComm extends CommonObject
|
|||||||
if ($cachedelay)
|
if ($cachedelay)
|
||||||
{
|
{
|
||||||
$nowgmt = dol_now();
|
$nowgmt = dol_now();
|
||||||
include_once(DOL_DOCUMENT_ROOT.'/lib/files.lib.php');
|
include_once(DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php');
|
||||||
if (dol_filemtime($outputfile) > ($nowgmt - $cachedelay))
|
if (dol_filemtime($outputfile) > ($nowgmt - $cachedelay))
|
||||||
{
|
{
|
||||||
dol_syslog(get_class($this)."::build_exportfile file ".$outputfile." is not older than now - cachedelay (".$nowgmt." - ".$cachedelay."). Build is canceled");
|
dol_syslog(get_class($this)."::build_exportfile file ".$outputfile." is not older than now - cachedelay (".$nowgmt." - ".$cachedelay."). Build is canceled");
|
||||||
|
|||||||
@ -30,7 +30,7 @@ require_once(DOL_DOCUMENT_ROOT."/core/lib/agenda.lib.php");
|
|||||||
require_once(DOL_DOCUMENT_ROOT."/contact/class/contact.class.php");
|
require_once(DOL_DOCUMENT_ROOT."/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");
|
||||||
require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php");
|
require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
|
||||||
require_once(DOL_DOCUMENT_ROOT."/core/class/html.formfile.class.php");
|
require_once(DOL_DOCUMENT_ROOT."/core/class/html.formfile.class.php");
|
||||||
if ($conf->projet->enabled) require_once(DOL_DOCUMENT_ROOT."/projet/class/project.class.php");
|
if ($conf->projet->enabled) require_once(DOL_DOCUMENT_ROOT."/projet/class/project.class.php");
|
||||||
|
|
||||||
@ -67,7 +67,7 @@ if (! $sortfield) $sortfield="name";
|
|||||||
*/
|
*/
|
||||||
if ( $_POST["sendit"] && ! empty($conf->global->MAIN_UPLOAD_DOC))
|
if ( $_POST["sendit"] && ! empty($conf->global->MAIN_UPLOAD_DOC))
|
||||||
{
|
{
|
||||||
require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php");
|
require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
|
||||||
|
|
||||||
// Creation repertoire si n'existe pas
|
// Creation repertoire si n'existe pas
|
||||||
$upload_dir = $conf->agenda->dir_output.'/'.dol_sanitizeFileName($objectid);
|
$upload_dir = $conf->agenda->dir_output.'/'.dol_sanitizeFileName($objectid);
|
||||||
|
|||||||
@ -33,7 +33,7 @@ require_once(DOL_DOCUMENT_ROOT."/comm/action/class/cactioncomm.class.php");
|
|||||||
require_once(DOL_DOCUMENT_ROOT."/comm/action/class/actioncomm.class.php");
|
require_once(DOL_DOCUMENT_ROOT."/comm/action/class/actioncomm.class.php");
|
||||||
require_once(DOL_DOCUMENT_ROOT."/core/class/html.formactions.class.php");
|
require_once(DOL_DOCUMENT_ROOT."/core/class/html.formactions.class.php");
|
||||||
require_once(DOL_DOCUMENT_ROOT."/projet/class/project.class.php");
|
require_once(DOL_DOCUMENT_ROOT."/projet/class/project.class.php");
|
||||||
require_once(DOL_DOCUMENT_ROOT."/lib/project.lib.php");
|
require_once(DOL_DOCUMENT_ROOT."/core/lib/project.lib.php");
|
||||||
|
|
||||||
$langs->load("companies");
|
$langs->load("companies");
|
||||||
$langs->load("commercial");
|
$langs->load("commercial");
|
||||||
|
|||||||
@ -31,7 +31,7 @@ require_once(DOL_DOCUMENT_ROOT."/contact/class/contact.class.php");
|
|||||||
require_once(DOL_DOCUMENT_ROOT."/comm/action/class/actioncomm.class.php");
|
require_once(DOL_DOCUMENT_ROOT."/comm/action/class/actioncomm.class.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/agenda.lib.php");
|
require_once(DOL_DOCUMENT_ROOT."/core/lib/agenda.lib.php");
|
||||||
if ($conf->projet->enabled) require_once(DOL_DOCUMENT_ROOT."/lib/project.lib.php");
|
if ($conf->projet->enabled) require_once(DOL_DOCUMENT_ROOT."/core/lib/project.lib.php");
|
||||||
|
|
||||||
$filter=GETPOST("filter");
|
$filter=GETPOST("filter");
|
||||||
$filtera = GETPOST("userasked","int")?GETPOST("userasked","int"):GETPOST("filtera","int");
|
$filtera = GETPOST("userasked","int")?GETPOST("userasked","int"):GETPOST("filtera","int");
|
||||||
|
|||||||
@ -29,7 +29,7 @@ require_once(DOL_DOCUMENT_ROOT."/contact/class/contact.class.php");
|
|||||||
require_once(DOL_DOCUMENT_ROOT."/comm/action/class/actioncomm.class.php");
|
require_once(DOL_DOCUMENT_ROOT."/comm/action/class/actioncomm.class.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/agenda.lib.php");
|
require_once(DOL_DOCUMENT_ROOT."/core/lib/agenda.lib.php");
|
||||||
if ($conf->projet->enabled) require_once(DOL_DOCUMENT_ROOT."/lib/project.lib.php");
|
if ($conf->projet->enabled) require_once(DOL_DOCUMENT_ROOT."/core/lib/project.lib.php");
|
||||||
|
|
||||||
$langs->load("companies");
|
$langs->load("companies");
|
||||||
$langs->load("agenda");
|
$langs->load("agenda");
|
||||||
|
|||||||
@ -25,7 +25,7 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
require("../../../main.inc.php");
|
require("../../../main.inc.php");
|
||||||
require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php");
|
require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
|
||||||
require_once(DOL_DOCUMENT_ROOT."/contact/class/contact.class.php");
|
require_once(DOL_DOCUMENT_ROOT."/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."/includes/modules/action/rapport.pdf.php");
|
||||||
|
|||||||
@ -31,7 +31,7 @@ require_once(DOL_DOCUMENT_ROOT.'/includes/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");
|
||||||
require_once(DOL_DOCUMENT_ROOT.'/lib/project.lib.php');
|
require_once(DOL_DOCUMENT_ROOT.'/core/lib/project.lib.php');
|
||||||
}
|
}
|
||||||
|
|
||||||
$langs->load("propal");
|
$langs->load("propal");
|
||||||
|
|||||||
@ -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/emailing.lib.php");
|
require_once(DOL_DOCUMENT_ROOT."/core/lib/emailing.lib.php");
|
||||||
require_once(DOL_DOCUMENT_ROOT."/core/class/CMailFile.class.php");
|
require_once(DOL_DOCUMENT_ROOT."/core/class/CMailFile.class.php");
|
||||||
require_once(DOL_DOCUMENT_ROOT."/core/lib/functions2.lib.php");
|
require_once(DOL_DOCUMENT_ROOT."/core/lib/functions2.lib.php");
|
||||||
|
|
||||||
|
|||||||
@ -23,8 +23,8 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
require("../../main.inc.php");
|
require("../../main.inc.php");
|
||||||
require_once(DOL_DOCUMENT_ROOT."/lib/emailing.lib.php");
|
require_once(DOL_DOCUMENT_ROOT."/core/lib/emailing.lib.php");
|
||||||
require_once(DOL_DOCUMENT_ROOT.'/lib/files.lib.php');
|
require_once(DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php');
|
||||||
require_once(DOL_DOCUMENT_ROOT."/core/class/CMailFile.class.php");
|
require_once(DOL_DOCUMENT_ROOT."/core/class/CMailFile.class.php");
|
||||||
require_once(DOL_DOCUMENT_ROOT."/core/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");
|
||||||
@ -450,7 +450,7 @@ if (! empty($_POST["removedfileid"]))
|
|||||||
// Action update emailing
|
// Action update emailing
|
||||||
if ($_POST["action"] == 'update' && empty($_POST["removedfile"]) && empty($_POST["cancel"]))
|
if ($_POST["action"] == 'update' && empty($_POST["removedfile"]) && empty($_POST["cancel"]))
|
||||||
{
|
{
|
||||||
require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php");
|
require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
|
||||||
|
|
||||||
$mil = new Mailing($db);
|
$mil = new Mailing($db);
|
||||||
$mil->fetch($_POST["id"]);
|
$mil->fetch($_POST["id"]);
|
||||||
|
|||||||
@ -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."/core/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."/core/lib/emailing.lib.php");
|
||||||
|
|
||||||
$langs->load("mails");
|
$langs->load("mails");
|
||||||
|
|
||||||
|
|||||||
@ -34,7 +34,7 @@ require_once(DOL_DOCUMENT_ROOT."/includes/modules/propale/modules_propale.php");
|
|||||||
require_once(DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.class.php');
|
require_once(DOL_DOCUMENT_ROOT.'/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."/core/lib/propal.lib.php");
|
||||||
require_once(DOL_DOCUMENT_ROOT."/core/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');
|
||||||
|
|
||||||
@ -399,7 +399,7 @@ if (GETPOST('action') == 'setstatut' && $user->rights->propale->cloturer)
|
|||||||
*/
|
*/
|
||||||
if ($_POST['addfile'])
|
if ($_POST['addfile'])
|
||||||
{
|
{
|
||||||
require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php");
|
require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
|
||||||
|
|
||||||
// Set tmp user directory TODO Use a dedicated directory for temp mails files
|
// Set tmp user directory TODO Use a dedicated directory for temp mails files
|
||||||
$vardir=$conf->user->dir_output."/".$user->id;
|
$vardir=$conf->user->dir_output."/".$user->id;
|
||||||
@ -416,7 +416,7 @@ if ($_POST['addfile'])
|
|||||||
*/
|
*/
|
||||||
if (! empty($_POST['removedfile']))
|
if (! empty($_POST['removedfile']))
|
||||||
{
|
{
|
||||||
require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php");
|
require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
|
||||||
|
|
||||||
// Set tmp user directory
|
// Set tmp user directory
|
||||||
$vardir=$conf->user->dir_output."/".$user->id;
|
$vardir=$conf->user->dir_output."/".$user->id;
|
||||||
|
|||||||
@ -26,8 +26,8 @@
|
|||||||
|
|
||||||
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."/lib/propal.lib.php");
|
require_once(DOL_DOCUMENT_ROOT."/core/lib/propal.lib.php");
|
||||||
require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php");
|
require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
|
||||||
if ($conf->projet->enabled) require_once(DOL_DOCUMENT_ROOT."/projet/class/project.class.php");
|
if ($conf->projet->enabled) require_once(DOL_DOCUMENT_ROOT."/projet/class/project.class.php");
|
||||||
|
|
||||||
$langs->load('propal');
|
$langs->load('propal');
|
||||||
|
|||||||
@ -209,7 +209,7 @@ class Propal extends CommonObject
|
|||||||
{
|
{
|
||||||
global $langs;
|
global $langs;
|
||||||
|
|
||||||
include_once(DOL_DOCUMENT_ROOT.'/lib/price.lib.php');
|
include_once(DOL_DOCUMENT_ROOT.'/core/lib/price.lib.php');
|
||||||
include_once(DOL_DOCUMENT_ROOT.'/core/class/discount.class.php');
|
include_once(DOL_DOCUMENT_ROOT.'/core/class/discount.class.php');
|
||||||
|
|
||||||
$this->db->begin();
|
$this->db->begin();
|
||||||
@ -306,7 +306,7 @@ class Propal extends CommonObject
|
|||||||
global $conf;
|
global $conf;
|
||||||
|
|
||||||
dol_syslog("Propal::Addline propalid=$propalid, desc=$desc, pu_ht=$pu_ht, qty=$qty, txtva=$txtva, fk_product=$fk_product, remise_except=$remise_percent, price_base_type=$price_base_type, pu_ttc=$pu_ttc, info_bits=$info_bits, type=$type");
|
dol_syslog("Propal::Addline propalid=$propalid, desc=$desc, pu_ht=$pu_ht, qty=$qty, txtva=$txtva, fk_product=$fk_product, remise_except=$remise_percent, price_base_type=$price_base_type, pu_ttc=$pu_ttc, info_bits=$info_bits, type=$type");
|
||||||
include_once(DOL_DOCUMENT_ROOT.'/lib/price.lib.php');
|
include_once(DOL_DOCUMENT_ROOT.'/core/lib/price.lib.php');
|
||||||
|
|
||||||
// Clean parameters
|
// Clean parameters
|
||||||
if (empty($remise_percent)) $remise_percent=0;
|
if (empty($remise_percent)) $remise_percent=0;
|
||||||
@ -453,7 +453,7 @@ class Propal extends CommonObject
|
|||||||
global $conf,$user,$langs;
|
global $conf,$user,$langs;
|
||||||
|
|
||||||
dol_syslog("Propal::UpdateLine $rowid, $pu, $qty, $remise_percent, $txtva, $desc, $price_base_type, $info_bits");
|
dol_syslog("Propal::UpdateLine $rowid, $pu, $qty, $remise_percent, $txtva, $desc, $price_base_type, $info_bits");
|
||||||
include_once(DOL_DOCUMENT_ROOT.'/lib/price.lib.php');
|
include_once(DOL_DOCUMENT_ROOT.'/core/lib/price.lib.php');
|
||||||
|
|
||||||
// Clean parameters
|
// Clean parameters
|
||||||
$remise_percent=price2num($remise_percent);
|
$remise_percent=price2num($remise_percent);
|
||||||
@ -1734,7 +1734,7 @@ class Propal extends CommonObject
|
|||||||
function delete($user, $notrigger=0)
|
function delete($user, $notrigger=0)
|
||||||
{
|
{
|
||||||
global $conf,$langs;
|
global $conf,$langs;
|
||||||
require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php");
|
require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
|
||||||
|
|
||||||
$error=0;
|
$error=0;
|
||||||
|
|
||||||
|
|||||||
@ -25,7 +25,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."/contact/class/contact.class.php");
|
require_once(DOL_DOCUMENT_ROOT."/contact/class/contact.class.php");
|
||||||
require_once(DOL_DOCUMENT_ROOT."/lib/propal.lib.php");
|
require_once(DOL_DOCUMENT_ROOT."/core/lib/propal.lib.php");
|
||||||
require_once(DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php');
|
require_once(DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php');
|
||||||
|
|
||||||
$langs->load("facture");
|
$langs->load("facture");
|
||||||
|
|||||||
@ -26,8 +26,8 @@
|
|||||||
|
|
||||||
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."/lib/propal.lib.php");
|
require_once(DOL_DOCUMENT_ROOT."/core/lib/propal.lib.php");
|
||||||
require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php");
|
require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
|
||||||
require_once(DOL_DOCUMENT_ROOT."/core/class/html.formfile.class.php");
|
require_once(DOL_DOCUMENT_ROOT."/core/class/html.formfile.class.php");
|
||||||
|
|
||||||
$langs->load('compta');
|
$langs->load('compta');
|
||||||
|
|||||||
@ -26,7 +26,7 @@
|
|||||||
require("../../main.inc.php");
|
require("../../main.inc.php");
|
||||||
require_once(DOL_DOCUMENT_ROOT."/core/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."/core/lib/propal.lib.php");
|
||||||
|
|
||||||
$langs->load('propal');
|
$langs->load('propal');
|
||||||
$langs->load('compta');
|
$langs->load('compta');
|
||||||
|
|||||||
@ -26,7 +26,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."/lib/propal.lib.php");
|
require_once(DOL_DOCUMENT_ROOT."/core/lib/propal.lib.php");
|
||||||
|
|
||||||
$langs->load('propal');
|
$langs->load('propal');
|
||||||
$langs->load('compta');
|
$langs->load('compta');
|
||||||
|
|||||||
@ -25,8 +25,8 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
require("../main.inc.php");
|
require("../main.inc.php");
|
||||||
require_once(DOL_DOCUMENT_ROOT."/lib/order.lib.php");
|
require_once(DOL_DOCUMENT_ROOT."/core/lib/order.lib.php");
|
||||||
require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php");
|
require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
|
||||||
require_once(DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php');
|
require_once(DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php');
|
||||||
if ($conf->propal->enabled) require_once(DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php');
|
if ($conf->propal->enabled) require_once(DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php');
|
||||||
if ($conf->projet->enabled) require_once(DOL_DOCUMENT_ROOT."/projet/class/project.class.php");
|
if ($conf->projet->enabled) require_once(DOL_DOCUMENT_ROOT."/projet/class/project.class.php");
|
||||||
|
|||||||
@ -174,7 +174,7 @@ class Commande extends CommonObject
|
|||||||
function valid($user)
|
function valid($user)
|
||||||
{
|
{
|
||||||
global $conf,$langs;
|
global $conf,$langs;
|
||||||
require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php");
|
require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
|
||||||
|
|
||||||
$error=0;
|
$error=0;
|
||||||
|
|
||||||
@ -975,7 +975,7 @@ class Commande extends CommonObject
|
|||||||
{
|
{
|
||||||
dol_syslog("Commande::addline commandeid=$commandeid, desc=$desc, pu_ht=$pu_ht, qty=$qty, txtva=$txtva, fk_product=$fk_product, remise_percent=$remise_percent, info_bits=$info_bits, fk_remise_except=$fk_remise_except, price_base_type=$price_base_type, pu_ttc=$pu_ttc, date_start=$date_start, date_end=$date_end, type=$type", LOG_DEBUG);
|
dol_syslog("Commande::addline commandeid=$commandeid, desc=$desc, pu_ht=$pu_ht, qty=$qty, txtva=$txtva, fk_product=$fk_product, remise_percent=$remise_percent, info_bits=$info_bits, fk_remise_except=$fk_remise_except, price_base_type=$price_base_type, pu_ttc=$pu_ttc, date_start=$date_start, date_end=$date_end, type=$type", LOG_DEBUG);
|
||||||
|
|
||||||
include_once(DOL_DOCUMENT_ROOT.'/lib/price.lib.php');
|
include_once(DOL_DOCUMENT_ROOT.'/core/lib/price.lib.php');
|
||||||
|
|
||||||
// Clean parameters
|
// Clean parameters
|
||||||
if (empty($remise_percent)) $remise_percent=0;
|
if (empty($remise_percent)) $remise_percent=0;
|
||||||
@ -1320,7 +1320,7 @@ class Commande extends CommonObject
|
|||||||
{
|
{
|
||||||
global $langs;
|
global $langs;
|
||||||
|
|
||||||
include_once(DOL_DOCUMENT_ROOT.'/lib/price.lib.php');
|
include_once(DOL_DOCUMENT_ROOT.'/core/lib/price.lib.php');
|
||||||
include_once(DOL_DOCUMENT_ROOT.'/core/class/discount.class.php');
|
include_once(DOL_DOCUMENT_ROOT.'/core/class/discount.class.php');
|
||||||
|
|
||||||
$this->db->begin();
|
$this->db->begin();
|
||||||
@ -2173,7 +2173,7 @@ class Commande extends CommonObject
|
|||||||
global $conf;
|
global $conf;
|
||||||
|
|
||||||
dol_syslog("CustomerOrder::UpdateLine $rowid, $desc, $pu, $qty, $remise_percent, $txtva, $txlocaltax1, $txlocaltax2, $price_base_type, $info_bits, $date_start, $date_end, $type");
|
dol_syslog("CustomerOrder::UpdateLine $rowid, $desc, $pu, $qty, $remise_percent, $txtva, $txlocaltax1, $txlocaltax2, $price_base_type, $info_bits, $date_start, $date_end, $type");
|
||||||
include_once(DOL_DOCUMENT_ROOT.'/lib/price.lib.php');
|
include_once(DOL_DOCUMENT_ROOT.'/core/lib/price.lib.php');
|
||||||
|
|
||||||
if ($this->brouillon)
|
if ($this->brouillon)
|
||||||
{
|
{
|
||||||
@ -2290,7 +2290,7 @@ class Commande extends CommonObject
|
|||||||
function delete($user)
|
function delete($user)
|
||||||
{
|
{
|
||||||
global $conf, $langs;
|
global $conf, $langs;
|
||||||
require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php");
|
require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
|
||||||
|
|
||||||
$err = 0;
|
$err = 0;
|
||||||
|
|
||||||
|
|||||||
@ -26,7 +26,7 @@
|
|||||||
require("../main.inc.php");
|
require("../main.inc.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."/contact/class/contact.class.php");
|
require_once(DOL_DOCUMENT_ROOT."/contact/class/contact.class.php");
|
||||||
require_once(DOL_DOCUMENT_ROOT."/lib/order.lib.php");
|
require_once(DOL_DOCUMENT_ROOT."/core/lib/order.lib.php");
|
||||||
require_once(DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php');
|
require_once(DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php');
|
||||||
|
|
||||||
$langs->load("orders");
|
$langs->load("orders");
|
||||||
|
|||||||
@ -25,8 +25,8 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
require("../main.inc.php");
|
require("../main.inc.php");
|
||||||
require_once(DOL_DOCUMENT_ROOT.'/lib/order.lib.php');
|
require_once(DOL_DOCUMENT_ROOT.'/core/lib/order.lib.php');
|
||||||
require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php");
|
require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
|
||||||
require_once(DOL_DOCUMENT_ROOT."/core/class/html.formfile.class.php");
|
require_once(DOL_DOCUMENT_ROOT."/core/class/html.formfile.class.php");
|
||||||
require_once(DOL_DOCUMENT_ROOT ."/commande/class/commande.class.php");
|
require_once(DOL_DOCUMENT_ROOT ."/commande/class/commande.class.php");
|
||||||
|
|
||||||
|
|||||||
@ -33,10 +33,10 @@ require_once(DOL_DOCUMENT_ROOT."/core/class/html.formorder.class.php");
|
|||||||
require_once(DOL_DOCUMENT_ROOT."/includes/modules/commande/modules_commande.php");
|
require_once(DOL_DOCUMENT_ROOT."/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."/core/lib/order.lib.php");
|
||||||
require_once(DOL_DOCUMENT_ROOT."/core/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.'/core/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');
|
||||||
|
|
||||||
if (!$user->rights->commande->lire) accessforbidden();
|
if (!$user->rights->commande->lire) accessforbidden();
|
||||||
@ -892,7 +892,7 @@ if ($action == 'remove_file')
|
|||||||
{
|
{
|
||||||
if ($object->fetch($id))
|
if ($object->fetch($id))
|
||||||
{
|
{
|
||||||
require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php");
|
require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
|
||||||
|
|
||||||
$upload_dir = $conf->commande->dir_output;
|
$upload_dir = $conf->commande->dir_output;
|
||||||
$file = $upload_dir . '/' . $_GET['file'];
|
$file = $upload_dir . '/' . $_GET['file'];
|
||||||
@ -906,7 +906,7 @@ if ($action == 'remove_file')
|
|||||||
*/
|
*/
|
||||||
if ($_POST['addfile'])
|
if ($_POST['addfile'])
|
||||||
{
|
{
|
||||||
require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php");
|
require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
|
||||||
|
|
||||||
// Set tmp user directory TODO Use a dedicated directory for temp mails files
|
// Set tmp user directory TODO Use a dedicated directory for temp mails files
|
||||||
$vardir=$conf->user->dir_output."/".$user->id;
|
$vardir=$conf->user->dir_output."/".$user->id;
|
||||||
@ -922,7 +922,7 @@ if ($_POST['addfile'])
|
|||||||
*/
|
*/
|
||||||
if (! empty($_POST['removedfile']))
|
if (! empty($_POST['removedfile']))
|
||||||
{
|
{
|
||||||
require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php");
|
require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
|
||||||
|
|
||||||
// Set tmp user directory
|
// Set tmp user directory
|
||||||
$vardir=$conf->user->dir_output."/".$user->id;
|
$vardir=$conf->user->dir_output."/".$user->id;
|
||||||
|
|||||||
@ -25,7 +25,7 @@
|
|||||||
require("../main.inc.php");
|
require("../main.inc.php");
|
||||||
require_once(DOL_DOCUMENT_ROOT."/core/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."/core/lib/order.lib.php");
|
||||||
|
|
||||||
if (!$user->rights->commande->lire) accessforbidden();
|
if (!$user->rights->commande->lire) accessforbidden();
|
||||||
|
|
||||||
|
|||||||
@ -24,7 +24,7 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
require("../main.inc.php");
|
require("../main.inc.php");
|
||||||
require_once(DOL_DOCUMENT_ROOT.'/lib/order.lib.php');
|
require_once(DOL_DOCUMENT_ROOT.'/core/lib/order.lib.php');
|
||||||
require_once(DOL_DOCUMENT_ROOT ."/commande/class/commande.class.php");
|
require_once(DOL_DOCUMENT_ROOT ."/commande/class/commande.class.php");
|
||||||
|
|
||||||
$socid=isset($_GET["socid"])?$_GET["socid"]:isset($_POST["socid"])?$_POST["socid"]:"";
|
$socid=isset($_GET["socid"])?$_GET["socid"]:isset($_POST["socid"])?$_POST["socid"]:"";
|
||||||
|
|||||||
@ -28,7 +28,7 @@ require_once(DOL_DOCUMENT_ROOT."/compta/deplacement/class/deplacement.class.php"
|
|||||||
require_once(DOL_DOCUMENT_ROOT."/core/class/html.formfile.class.php");
|
require_once(DOL_DOCUMENT_ROOT."/core/class/html.formfile.class.php");
|
||||||
if ($conf->projet->enabled)
|
if ($conf->projet->enabled)
|
||||||
{
|
{
|
||||||
require_once(DOL_DOCUMENT_ROOT."/lib/project.lib.php");
|
require_once(DOL_DOCUMENT_ROOT."/core/lib/project.lib.php");
|
||||||
require_once(DOL_DOCUMENT_ROOT."/projet/class/project.class.php");
|
require_once(DOL_DOCUMENT_ROOT."/projet/class/project.class.php");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -28,7 +28,7 @@ require_once(DOL_DOCUMENT_ROOT."/core/class/html.formfile.class.php");
|
|||||||
require_once(DOL_DOCUMENT_ROOT."/core/class/html.formcompany.class.php");
|
require_once(DOL_DOCUMENT_ROOT."/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");
|
||||||
require_once(DOL_DOCUMENT_ROOT."/compta/paiement/class/paiement.class.php");
|
require_once(DOL_DOCUMENT_ROOT."/compta/paiement/class/paiement.class.php");
|
||||||
if ($conf->projet->enabled) require_once(DOL_DOCUMENT_ROOT.'/lib/project.lib.php');
|
if ($conf->projet->enabled) require_once(DOL_DOCUMENT_ROOT.'/core/lib/project.lib.php');
|
||||||
|
|
||||||
$langs->load("companies");
|
$langs->load("companies");
|
||||||
$langs->load("donations");
|
$langs->load("donations");
|
||||||
|
|||||||
@ -35,10 +35,10 @@ require_once(DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php');
|
|||||||
require_once(DOL_DOCUMENT_ROOT.'/core/class/discount.class.php');
|
require_once(DOL_DOCUMENT_ROOT.'/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."/core/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.'/core/lib/invoice.lib.php');
|
||||||
require_once(DOL_DOCUMENT_ROOT."/core/lib/date.lib.php");
|
require_once(DOL_DOCUMENT_ROOT."/core/lib/date.lib.php");
|
||||||
if ($conf->projet->enabled) require_once(DOL_DOCUMENT_ROOT.'/projet/class/project.class.php');
|
if ($conf->projet->enabled) require_once(DOL_DOCUMENT_ROOT.'/projet/class/project.class.php');
|
||||||
if ($conf->projet->enabled) require_once(DOL_DOCUMENT_ROOT.'/lib/project.lib.php');
|
if ($conf->projet->enabled) require_once(DOL_DOCUMENT_ROOT.'/core/lib/project.lib.php');
|
||||||
|
|
||||||
$langs->load('bills');
|
$langs->load('bills');
|
||||||
//print 'ee'.$langs->trans('BillsCustomer');exit;
|
//print 'ee'.$langs->trans('BillsCustomer');exit;
|
||||||
@ -1177,7 +1177,7 @@ if ($action == 'down' && $user->rights->facture->creer)
|
|||||||
*/
|
*/
|
||||||
if ($_POST['addfile'])
|
if ($_POST['addfile'])
|
||||||
{
|
{
|
||||||
require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php");
|
require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
|
||||||
|
|
||||||
// Set tmp user directory
|
// Set tmp user directory
|
||||||
$vardir=$conf->user->dir_output."/".$user->id;
|
$vardir=$conf->user->dir_output."/".$user->id;
|
||||||
@ -1193,7 +1193,7 @@ if ($_POST['addfile'])
|
|||||||
*/
|
*/
|
||||||
if (! empty($_POST['removedfile']))
|
if (! empty($_POST['removedfile']))
|
||||||
{
|
{
|
||||||
require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php");
|
require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
|
||||||
|
|
||||||
// Set tmp user directory
|
// Set tmp user directory
|
||||||
$vardir=$conf->user->dir_output."/".$user->id;
|
$vardir=$conf->user->dir_output."/".$user->id;
|
||||||
|
|||||||
@ -27,8 +27,8 @@
|
|||||||
|
|
||||||
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.'/lib/invoice.lib.php');
|
require_once(DOL_DOCUMENT_ROOT.'/core/lib/invoice.lib.php');
|
||||||
require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php");
|
require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
|
||||||
if ($conf->projet->enabled) require_once(DOL_DOCUMENT_ROOT."/projet/class/project.class.php");
|
if ($conf->projet->enabled) require_once(DOL_DOCUMENT_ROOT."/projet/class/project.class.php");
|
||||||
|
|
||||||
$langs->load("bills");
|
$langs->load("bills");
|
||||||
|
|||||||
@ -409,7 +409,7 @@ class FactureRec extends Facture
|
|||||||
function addline($facid, $desc, $pu_ht, $qty, $txtva, $fk_product=0, $remise_percent=0, $price_base_type='HT', $info_bits=0, $fk_remise_except='', $pu_ttc=0, $type=0, $rang=-1, $special_code=0)
|
function addline($facid, $desc, $pu_ht, $qty, $txtva, $fk_product=0, $remise_percent=0, $price_base_type='HT', $info_bits=0, $fk_remise_except='', $pu_ttc=0, $type=0, $rang=-1, $special_code=0)
|
||||||
{
|
{
|
||||||
dol_syslog("FactureRec::addline facid=$facid,desc=$desc,pu_ht=$pu_ht,qty=$qty,txtva=$txtva,fk_product=$fk_product,remise_percent=$remise_percent,date_start=$date_start,date_end=$date_end,ventil=$ventil,info_bits=$info_bits,fk_remise_except=$fk_remise_except,price_base_type=$price_base_type,pu_ttc=$pu_ttc,type=$type", LOG_DEBUG);
|
dol_syslog("FactureRec::addline facid=$facid,desc=$desc,pu_ht=$pu_ht,qty=$qty,txtva=$txtva,fk_product=$fk_product,remise_percent=$remise_percent,date_start=$date_start,date_end=$date_end,ventil=$ventil,info_bits=$info_bits,fk_remise_except=$fk_remise_except,price_base_type=$price_base_type,pu_ttc=$pu_ttc,type=$type", LOG_DEBUG);
|
||||||
include_once(DOL_DOCUMENT_ROOT.'/lib/price.lib.php');
|
include_once(DOL_DOCUMENT_ROOT.'/core/lib/price.lib.php');
|
||||||
|
|
||||||
// Check parameters
|
// Check parameters
|
||||||
if ($type < 0) return -1;
|
if ($type < 0) return -1;
|
||||||
|
|||||||
@ -1044,7 +1044,7 @@ class Facture extends CommonObject
|
|||||||
{
|
{
|
||||||
global $langs;
|
global $langs;
|
||||||
|
|
||||||
include_once(DOL_DOCUMENT_ROOT.'/lib/price.lib.php');
|
include_once(DOL_DOCUMENT_ROOT.'/core/lib/price.lib.php');
|
||||||
include_once(DOL_DOCUMENT_ROOT.'/core/class/discount.class.php');
|
include_once(DOL_DOCUMENT_ROOT.'/core/class/discount.class.php');
|
||||||
|
|
||||||
$this->db->begin();
|
$this->db->begin();
|
||||||
@ -1488,7 +1488,7 @@ class Facture extends CommonObject
|
|||||||
function validate($user, $force_number='')
|
function validate($user, $force_number='')
|
||||||
{
|
{
|
||||||
global $conf,$langs;
|
global $conf,$langs;
|
||||||
require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php");
|
require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
|
||||||
|
|
||||||
$error=0;
|
$error=0;
|
||||||
|
|
||||||
@ -1790,7 +1790,7 @@ class Facture extends CommonObject
|
|||||||
function addline($facid, $desc, $pu_ht, $qty, $txtva, $txlocaltax1=0, $txlocaltax2=0, $fk_product=0, $remise_percent=0, $date_start='', $date_end='', $ventil=0, $info_bits=0, $fk_remise_except='', $price_base_type='HT', $pu_ttc=0, $type=0, $rang=-1, $special_code=0, $origin='', $origin_id=0, $fk_parent_line=0)
|
function addline($facid, $desc, $pu_ht, $qty, $txtva, $txlocaltax1=0, $txlocaltax2=0, $fk_product=0, $remise_percent=0, $date_start='', $date_end='', $ventil=0, $info_bits=0, $fk_remise_except='', $price_base_type='HT', $pu_ttc=0, $type=0, $rang=-1, $special_code=0, $origin='', $origin_id=0, $fk_parent_line=0)
|
||||||
{
|
{
|
||||||
dol_syslog("Facture::Addline facid=$facid,desc=$desc,pu_ht=$pu_ht,qty=$qty,txtva=$txtva, txlocaltax1=$txlocaltax1, txlocaltax2=$txlocaltax2, fk_product=$fk_product,remise_percent=$remise_percent,date_start=$date_start,date_end=$date_end,ventil=$ventil,info_bits=$info_bits,fk_remise_except=$fk_remise_except,price_base_type=$price_base_type,pu_ttc=$pu_ttc,type=$type", LOG_DEBUG);
|
dol_syslog("Facture::Addline facid=$facid,desc=$desc,pu_ht=$pu_ht,qty=$qty,txtva=$txtva, txlocaltax1=$txlocaltax1, txlocaltax2=$txlocaltax2, fk_product=$fk_product,remise_percent=$remise_percent,date_start=$date_start,date_end=$date_end,ventil=$ventil,info_bits=$info_bits,fk_remise_except=$fk_remise_except,price_base_type=$price_base_type,pu_ttc=$pu_ttc,type=$type", LOG_DEBUG);
|
||||||
include_once(DOL_DOCUMENT_ROOT.'/lib/price.lib.php');
|
include_once(DOL_DOCUMENT_ROOT.'/core/lib/price.lib.php');
|
||||||
|
|
||||||
// Clean parameters
|
// Clean parameters
|
||||||
if (empty($remise_percent)) $remise_percent=0;
|
if (empty($remise_percent)) $remise_percent=0;
|
||||||
@ -1947,7 +1947,7 @@ class Facture extends CommonObject
|
|||||||
*/
|
*/
|
||||||
function updateline($rowid, $desc, $pu, $qty, $remise_percent=0, $date_start, $date_end, $txtva, $txlocaltax1=0, $txlocaltax2=0,$price_base_type='HT', $info_bits=0, $type=0, $fk_parent_line=0, $skip_update_total=0)
|
function updateline($rowid, $desc, $pu, $qty, $remise_percent=0, $date_start, $date_end, $txtva, $txlocaltax1=0, $txlocaltax2=0,$price_base_type='HT', $info_bits=0, $type=0, $fk_parent_line=0, $skip_update_total=0)
|
||||||
{
|
{
|
||||||
include_once(DOL_DOCUMENT_ROOT.'/lib/price.lib.php');
|
include_once(DOL_DOCUMENT_ROOT.'/core/lib/price.lib.php');
|
||||||
|
|
||||||
dol_syslog("Facture::UpdateLine $rowid, $desc, $pu, $qty, $remise_percent, $date_start, $date_end, $txtva, $txlocaltax1, $txlocaltax2, $price_base_type, $info_bits, $type", LOG_DEBUG);
|
dol_syslog("Facture::UpdateLine $rowid, $desc, $pu, $qty, $remise_percent, $date_start, $date_end, $txtva, $txlocaltax1, $txlocaltax2, $price_base_type, $info_bits, $type", LOG_DEBUG);
|
||||||
|
|
||||||
|
|||||||
@ -26,7 +26,7 @@ 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."/contact/class/contact.class.php");
|
require_once(DOL_DOCUMENT_ROOT."/contact/class/contact.class.php");
|
||||||
require_once(DOL_DOCUMENT_ROOT.'/core/class/discount.class.php');
|
require_once(DOL_DOCUMENT_ROOT.'/core/class/discount.class.php');
|
||||||
require_once(DOL_DOCUMENT_ROOT.'/lib/invoice.lib.php');
|
require_once(DOL_DOCUMENT_ROOT.'/core/lib/invoice.lib.php');
|
||||||
require_once(DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php');
|
require_once(DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php');
|
||||||
|
|
||||||
$langs->load("bills");
|
$langs->load("bills");
|
||||||
|
|||||||
@ -27,8 +27,8 @@
|
|||||||
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/invoice.lib.php");
|
require_once(DOL_DOCUMENT_ROOT."/core/lib/invoice.lib.php");
|
||||||
require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php");
|
require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
|
||||||
require_once(DOL_DOCUMENT_ROOT."/core/class/html.formfile.class.php");
|
require_once(DOL_DOCUMENT_ROOT."/core/class/html.formfile.class.php");
|
||||||
|
|
||||||
$langs->load('propal');
|
$langs->load('propal');
|
||||||
|
|||||||
@ -28,8 +28,8 @@ 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."/compta/facture/class/facture.class.php");
|
require_once(DOL_DOCUMENT_ROOT."/compta/facture/class/facture.class.php");
|
||||||
require_once(DOL_DOCUMENT_ROOT."/compta/paiement/class/paiement.class.php");
|
require_once(DOL_DOCUMENT_ROOT."/compta/paiement/class/paiement.class.php");
|
||||||
require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php");
|
require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
|
||||||
require_once(DOL_DOCUMENT_ROOT.'/lib/pdf.lib.php');
|
require_once(DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php');
|
||||||
|
|
||||||
|
|
||||||
$langs->load("bills");
|
$langs->load("bills");
|
||||||
|
|||||||
@ -26,7 +26,7 @@ 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."/core/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.'/core/lib/invoice.lib.php');
|
||||||
|
|
||||||
$langs->load("bills");
|
$langs->load("bills");
|
||||||
|
|
||||||
|
|||||||
@ -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/invoice.lib.php');
|
require_once(DOL_DOCUMENT_ROOT.'/core/lib/invoice.lib.php');
|
||||||
|
|
||||||
$socid=isset($_GET["socid"])?$_GET["socid"]:isset($_POST["socid"])?$_POST["socid"]:"";
|
$socid=isset($_GET["socid"])?$_GET["socid"]:isset($_POST["socid"])?$_POST["socid"]:"";
|
||||||
|
|
||||||
|
|||||||
@ -25,7 +25,7 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
require("../../main.inc.php");
|
require("../../main.inc.php");
|
||||||
require_once(DOL_DOCUMENT_ROOT.'/lib/invoice.lib.php');
|
require_once(DOL_DOCUMENT_ROOT.'/core/lib/invoice.lib.php');
|
||||||
require_once(DOL_DOCUMENT_ROOT."/compta/facture/class/facture.class.php");
|
require_once(DOL_DOCUMENT_ROOT."/compta/facture/class/facture.class.php");
|
||||||
require_once(DOL_DOCUMENT_ROOT."/compta/prelevement/class/bon-prelevement.class.php");
|
require_once(DOL_DOCUMENT_ROOT."/compta/prelevement/class/bon-prelevement.class.php");
|
||||||
require_once(DOL_DOCUMENT_ROOT.'/core/class/discount.class.php');
|
require_once(DOL_DOCUMENT_ROOT.'/core/class/discount.class.php');
|
||||||
|
|||||||
@ -23,7 +23,7 @@
|
|||||||
* \brief Page with purchases journal
|
* \brief Page with purchases journal
|
||||||
*/
|
*/
|
||||||
require("../../main.inc.php");
|
require("../../main.inc.php");
|
||||||
require_once(DOL_DOCUMENT_ROOT."/lib/report.lib.php");
|
require_once(DOL_DOCUMENT_ROOT."/core/lib/report.lib.php");
|
||||||
require_once(DOL_DOCUMENT_ROOT."/core/lib/date.lib.php");
|
require_once(DOL_DOCUMENT_ROOT."/core/lib/date.lib.php");
|
||||||
require_once(DOL_DOCUMENT_ROOT."/fourn/class/fournisseur.facture.class.php");
|
require_once(DOL_DOCUMENT_ROOT."/fourn/class/fournisseur.facture.class.php");
|
||||||
|
|
||||||
|
|||||||
@ -23,7 +23,7 @@
|
|||||||
* \brief Page with sells journal
|
* \brief Page with sells journal
|
||||||
*/
|
*/
|
||||||
require("../../main.inc.php");
|
require("../../main.inc.php");
|
||||||
require_once(DOL_DOCUMENT_ROOT."/lib/report.lib.php");
|
require_once(DOL_DOCUMENT_ROOT."/core/lib/report.lib.php");
|
||||||
require_once(DOL_DOCUMENT_ROOT."/core/lib/date.lib.php");
|
require_once(DOL_DOCUMENT_ROOT."/core/lib/date.lib.php");
|
||||||
require_once(DOL_DOCUMENT_ROOT."/compta/facture/class/facture.class.php");
|
require_once(DOL_DOCUMENT_ROOT."/compta/facture/class/facture.class.php");
|
||||||
|
|
||||||
|
|||||||
@ -24,7 +24,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."/includes/modules/rapport/pdf_paiement.class.php");
|
||||||
require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php");
|
require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
|
||||||
|
|
||||||
// Security check
|
// Security check
|
||||||
if (! $user->rights->facture->lire)
|
if (! $user->rights->facture->lire)
|
||||||
|
|||||||
@ -24,8 +24,8 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
require("../bank/pre.inc.php");
|
require("../bank/pre.inc.php");
|
||||||
require_once(DOL_DOCUMENT_ROOT."/lib/prelevement.lib.php");
|
require_once(DOL_DOCUMENT_ROOT."/core/lib/prelevement.lib.php");
|
||||||
require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php");
|
require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
|
||||||
require_once DOL_DOCUMENT_ROOT."/compta/prelevement/class/bon-prelevement.class.php";
|
require_once DOL_DOCUMENT_ROOT."/compta/prelevement/class/bon-prelevement.class.php";
|
||||||
|
|
||||||
$langs->load("bills");
|
$langs->load("bills");
|
||||||
|
|||||||
@ -80,7 +80,7 @@ $bprev = new BonPrelevement($db);
|
|||||||
|
|
||||||
llxHeader('', $langs->trans("NewStandingOrder"));
|
llxHeader('', $langs->trans("NewStandingOrder"));
|
||||||
|
|
||||||
require_once(DOL_DOCUMENT_ROOT."/lib/prelevement.lib.php");
|
require_once(DOL_DOCUMENT_ROOT."/core/lib/prelevement.lib.php");
|
||||||
if (prelevement_check_config() < 0)
|
if (prelevement_check_config() < 0)
|
||||||
{
|
{
|
||||||
$langs->load("errors");
|
$langs->load("errors");
|
||||||
|
|||||||
@ -25,7 +25,7 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
require("../bank/pre.inc.php");
|
require("../bank/pre.inc.php");
|
||||||
require_once(DOL_DOCUMENT_ROOT."/lib/prelevement.lib.php");
|
require_once(DOL_DOCUMENT_ROOT."/core/lib/prelevement.lib.php");
|
||||||
require_once(DOL_DOCUMENT_ROOT."/compta/prelevement/class/bon-prelevement.class.php");
|
require_once(DOL_DOCUMENT_ROOT."/compta/prelevement/class/bon-prelevement.class.php");
|
||||||
require_once(DOL_DOCUMENT_ROOT."/compta/prelevement/class/rejet-prelevement.class.php");
|
require_once(DOL_DOCUMENT_ROOT."/compta/prelevement/class/rejet-prelevement.class.php");
|
||||||
require_once(DOL_DOCUMENT_ROOT."/compta/paiement/class/paiement.class.php");
|
require_once(DOL_DOCUMENT_ROOT."/compta/paiement/class/paiement.class.php");
|
||||||
|
|||||||
@ -24,7 +24,7 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
require("../bank/pre.inc.php");
|
require("../bank/pre.inc.php");
|
||||||
require_once(DOL_DOCUMENT_ROOT."/lib/prelevement.lib.php");
|
require_once(DOL_DOCUMENT_ROOT."/core/lib/prelevement.lib.php");
|
||||||
require_once(DOL_DOCUMENT_ROOT."/compta/prelevement/class/bon-prelevement.class.php");
|
require_once(DOL_DOCUMENT_ROOT."/compta/prelevement/class/bon-prelevement.class.php");
|
||||||
require_once(DOL_DOCUMENT_ROOT."/compta/prelevement/class/rejet-prelevement.class.php");
|
require_once(DOL_DOCUMENT_ROOT."/compta/prelevement/class/rejet-prelevement.class.php");
|
||||||
require_once(DOL_DOCUMENT_ROOT."/compta/paiement/class/paiement.class.php");
|
require_once(DOL_DOCUMENT_ROOT."/compta/paiement/class/paiement.class.php");
|
||||||
|
|||||||
@ -23,7 +23,7 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
require("../bank/pre.inc.php");
|
require("../bank/pre.inc.php");
|
||||||
require_once(DOL_DOCUMENT_ROOT."/lib/prelevement.lib.php");
|
require_once(DOL_DOCUMENT_ROOT."/core/lib/prelevement.lib.php");
|
||||||
require_once(DOL_DOCUMENT_ROOT."/compta/prelevement/class/bon-prelevement.class.php");
|
require_once(DOL_DOCUMENT_ROOT."/compta/prelevement/class/bon-prelevement.class.php");
|
||||||
require_once(DOL_DOCUMENT_ROOT."/compta/prelevement/class/ligne-prelevement.class.php");
|
require_once(DOL_DOCUMENT_ROOT."/compta/prelevement/class/ligne-prelevement.class.php");
|
||||||
|
|
||||||
|
|||||||
@ -24,7 +24,7 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
require("../bank/pre.inc.php");
|
require("../bank/pre.inc.php");
|
||||||
require_once(DOL_DOCUMENT_ROOT."/lib/prelevement.lib.php");
|
require_once(DOL_DOCUMENT_ROOT."/core/lib/prelevement.lib.php");
|
||||||
require_once(DOL_DOCUMENT_ROOT."/compta/prelevement/class/bon-prelevement.class.php");
|
require_once(DOL_DOCUMENT_ROOT."/compta/prelevement/class/bon-prelevement.class.php");
|
||||||
|
|
||||||
if (!$user->rights->prelevement->bons->lire)
|
if (!$user->rights->prelevement->bons->lire)
|
||||||
@ -58,7 +58,7 @@ if ( $action == 'confirm_credite' && GETPOST("confirm") == 'yes')
|
|||||||
|
|
||||||
if ($action == 'infotrans' && $user->rights->prelevement->bons->send)
|
if ($action == 'infotrans' && $user->rights->prelevement->bons->send)
|
||||||
{
|
{
|
||||||
require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php");
|
require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
|
||||||
|
|
||||||
$bon = new BonPrelevement($db,"");
|
$bon = new BonPrelevement($db,"");
|
||||||
$bon->fetch($id);
|
$bon->fetch($id);
|
||||||
|
|||||||
@ -49,7 +49,7 @@ $result = restrictedArea($user, 'prelevement','','');
|
|||||||
|
|
||||||
llxHeader('',$langs->trans("CustomersStandingOrdersArea"));
|
llxHeader('',$langs->trans("CustomersStandingOrdersArea"));
|
||||||
|
|
||||||
require_once(DOL_DOCUMENT_ROOT."/lib/prelevement.lib.php");
|
require_once(DOL_DOCUMENT_ROOT."/core/lib/prelevement.lib.php");
|
||||||
if (prelevement_check_config() < 0)
|
if (prelevement_check_config() < 0)
|
||||||
{
|
{
|
||||||
$langs->load("errors");
|
$langs->load("errors");
|
||||||
|
|||||||
@ -24,7 +24,7 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
require("../bank/pre.inc.php");
|
require("../bank/pre.inc.php");
|
||||||
require_once(DOL_DOCUMENT_ROOT."/lib/prelevement.lib.php");
|
require_once(DOL_DOCUMENT_ROOT."/core/lib/prelevement.lib.php");
|
||||||
require_once(DOL_DOCUMENT_ROOT."/compta/prelevement/class/bon-prelevement.class.php");
|
require_once(DOL_DOCUMENT_ROOT."/compta/prelevement/class/bon-prelevement.class.php");
|
||||||
require_once(DOL_DOCUMENT_ROOT."/compta/prelevement/class/ligne-prelevement.class.php");
|
require_once(DOL_DOCUMENT_ROOT."/compta/prelevement/class/ligne-prelevement.class.php");
|
||||||
require_once(DOL_DOCUMENT_ROOT."/compta/prelevement/class/rejet-prelevement.class.php");
|
require_once(DOL_DOCUMENT_ROOT."/compta/prelevement/class/rejet-prelevement.class.php");
|
||||||
|
|||||||
@ -30,7 +30,7 @@ require('../main.inc.php');
|
|||||||
require_once(DOL_DOCUMENT_ROOT."/core/class/html.formfile.class.php");
|
require_once(DOL_DOCUMENT_ROOT."/core/class/html.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."/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."/core/lib/propal.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->commande->enabled) require_once(DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php');
|
if ($conf->commande->enabled) require_once(DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php');
|
||||||
|
|
||||||
|
|||||||
@ -25,8 +25,8 @@
|
|||||||
require('../../main.inc.php');
|
require('../../main.inc.php');
|
||||||
require_once(DOL_DOCUMENT_ROOT."/compta/tva/class/tva.class.php");
|
require_once(DOL_DOCUMENT_ROOT."/compta/tva/class/tva.class.php");
|
||||||
require_once(DOL_DOCUMENT_ROOT."/compta/sociales/class/chargesociales.class.php");
|
require_once(DOL_DOCUMENT_ROOT."/compta/sociales/class/chargesociales.class.php");
|
||||||
require_once(DOL_DOCUMENT_ROOT."/lib/report.lib.php");
|
require_once(DOL_DOCUMENT_ROOT."/core/lib/report.lib.php");
|
||||||
require_once(DOL_DOCUMENT_ROOT."/lib/tax.lib.php");
|
require_once(DOL_DOCUMENT_ROOT."/core/lib/tax.lib.php");
|
||||||
require_once(DOL_DOCUMENT_ROOT."/core/lib/date.lib.php");
|
require_once(DOL_DOCUMENT_ROOT."/core/lib/date.lib.php");
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@ -23,7 +23,7 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
require('../../main.inc.php');
|
require('../../main.inc.php');
|
||||||
require_once(DOL_DOCUMENT_ROOT."/lib/report.lib.php");
|
require_once(DOL_DOCUMENT_ROOT."/core/lib/report.lib.php");
|
||||||
|
|
||||||
|
|
||||||
$year_start=isset($_GET["year_start"])?$_GET["year_start"]:$_POST["year_start"];
|
$year_start=isset($_GET["year_start"])?$_GET["year_start"]:$_POST["year_start"];
|
||||||
|
|||||||
@ -23,8 +23,8 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
require('../../main.inc.php');
|
require('../../main.inc.php');
|
||||||
require_once(DOL_DOCUMENT_ROOT."/lib/report.lib.php");
|
require_once(DOL_DOCUMENT_ROOT."/core/lib/report.lib.php");
|
||||||
require_once(DOL_DOCUMENT_ROOT."/lib/tax.lib.php");
|
require_once(DOL_DOCUMENT_ROOT."/core/lib/tax.lib.php");
|
||||||
require_once(DOL_DOCUMENT_ROOT."/core/lib/date.lib.php");
|
require_once(DOL_DOCUMENT_ROOT."/core/lib/date.lib.php");
|
||||||
|
|
||||||
// Security check
|
// Security check
|
||||||
|
|||||||
@ -24,8 +24,8 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
require('../../main.inc.php');
|
require('../../main.inc.php');
|
||||||
require_once(DOL_DOCUMENT_ROOT."/lib/report.lib.php");
|
require_once(DOL_DOCUMENT_ROOT."/core/lib/report.lib.php");
|
||||||
require_once(DOL_DOCUMENT_ROOT."/lib/tax.lib.php");
|
require_once(DOL_DOCUMENT_ROOT."/core/lib/tax.lib.php");
|
||||||
require_once(DOL_DOCUMENT_ROOT."/core/lib/date.lib.php");
|
require_once(DOL_DOCUMENT_ROOT."/core/lib/date.lib.php");
|
||||||
|
|
||||||
$langs->load("companies");
|
$langs->load("companies");
|
||||||
|
|||||||
@ -23,7 +23,7 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
require('../../main.inc.php');
|
require('../../main.inc.php');
|
||||||
require_once(DOL_DOCUMENT_ROOT."/lib/report.lib.php");
|
require_once(DOL_DOCUMENT_ROOT."/core/lib/report.lib.php");
|
||||||
|
|
||||||
|
|
||||||
$year_start=isset($_GET["year_start"])?$_GET["year_start"]:$_POST["year_start"];
|
$year_start=isset($_GET["year_start"])?$_GET["year_start"]:$_POST["year_start"];
|
||||||
|
|||||||
@ -25,8 +25,8 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
require('../../main.inc.php');
|
require('../../main.inc.php');
|
||||||
require_once(DOL_DOCUMENT_ROOT."/lib/report.lib.php");
|
require_once(DOL_DOCUMENT_ROOT."/core/lib/report.lib.php");
|
||||||
require_once(DOL_DOCUMENT_ROOT."/lib/tax.lib.php");
|
require_once(DOL_DOCUMENT_ROOT."/core/lib/tax.lib.php");
|
||||||
require_once(DOL_DOCUMENT_ROOT."/core/lib/date.lib.php");
|
require_once(DOL_DOCUMENT_ROOT."/core/lib/date.lib.php");
|
||||||
require_once(DOL_DOCUMENT_ROOT."/compta/tva/class/tva.class.php");
|
require_once(DOL_DOCUMENT_ROOT."/compta/tva/class/tva.class.php");
|
||||||
|
|
||||||
|
|||||||
@ -24,7 +24,7 @@
|
|||||||
* \brief Index page of VAT reports
|
* \brief Index page of VAT reports
|
||||||
*/
|
*/
|
||||||
require('../../main.inc.php');
|
require('../../main.inc.php');
|
||||||
require_once(DOL_DOCUMENT_ROOT."/lib/tax.lib.php");
|
require_once(DOL_DOCUMENT_ROOT."/core/lib/tax.lib.php");
|
||||||
require_once(DOL_DOCUMENT_ROOT."/compta/tva/class/tva.class.php");
|
require_once(DOL_DOCUMENT_ROOT."/compta/tva/class/tva.class.php");
|
||||||
require_once(DOL_DOCUMENT_ROOT."/core/lib/date.lib.php");
|
require_once(DOL_DOCUMENT_ROOT."/core/lib/date.lib.php");
|
||||||
|
|
||||||
|
|||||||
@ -26,8 +26,8 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
require('../../main.inc.php');
|
require('../../main.inc.php');
|
||||||
require_once(DOL_DOCUMENT_ROOT."/lib/report.lib.php");
|
require_once(DOL_DOCUMENT_ROOT."/core/lib/report.lib.php");
|
||||||
require_once(DOL_DOCUMENT_ROOT."/lib/tax.lib.php");
|
require_once(DOL_DOCUMENT_ROOT."/core/lib/tax.lib.php");
|
||||||
require_once(DOL_DOCUMENT_ROOT."/core/lib/date.lib.php");
|
require_once(DOL_DOCUMENT_ROOT."/core/lib/date.lib.php");
|
||||||
require_once(DOL_DOCUMENT_ROOT."/compta/tva/class/tva.class.php");
|
require_once(DOL_DOCUMENT_ROOT."/compta/tva/class/tva.class.php");
|
||||||
require_once(DOL_DOCUMENT_ROOT."/compta/facture/class/facture.class.php");
|
require_once(DOL_DOCUMENT_ROOT."/compta/facture/class/facture.class.php");
|
||||||
|
|||||||
@ -24,7 +24,7 @@
|
|||||||
|
|
||||||
require("../main.inc.php");
|
require("../main.inc.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."/core/lib/contact.lib.php");
|
||||||
|
|
||||||
$langs->load("companies");
|
$langs->load("companies");
|
||||||
|
|
||||||
|
|||||||
@ -28,7 +28,7 @@
|
|||||||
require("../main.inc.php");
|
require("../main.inc.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."/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."/core/lib/contact.lib.php");
|
||||||
require_once(DOL_DOCUMENT_ROOT."/core/lib/company.lib.php");
|
require_once(DOL_DOCUMENT_ROOT."/core/lib/company.lib.php");
|
||||||
require_once(DOL_DOCUMENT_ROOT."/core/class/html.formcompany.class.php");
|
require_once(DOL_DOCUMENT_ROOT."/core/class/html.formcompany.class.php");
|
||||||
|
|
||||||
|
|||||||
@ -25,7 +25,7 @@
|
|||||||
require("../main.inc.php");
|
require("../main.inc.php");
|
||||||
require_once(DOL_DOCUMENT_ROOT."/core/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."/core/lib/contact.lib.php");
|
||||||
|
|
||||||
$langs->load("companies");
|
$langs->load("companies");
|
||||||
|
|
||||||
|
|||||||
@ -24,7 +24,7 @@
|
|||||||
|
|
||||||
require("../main.inc.php");
|
require("../main.inc.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."/core/lib/contact.lib.php");
|
||||||
require_once(DOL_DOCUMENT_ROOT."/core/class/ldap.class.php");
|
require_once(DOL_DOCUMENT_ROOT."/core/class/ldap.class.php");
|
||||||
require_once(DOL_DOCUMENT_ROOT."/core/lib/ldap.lib.php");
|
require_once(DOL_DOCUMENT_ROOT."/core/lib/ldap.lib.php");
|
||||||
|
|
||||||
|
|||||||
@ -24,7 +24,7 @@
|
|||||||
|
|
||||||
require("../main.inc.php");
|
require("../main.inc.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."/core/lib/contact.lib.php");
|
||||||
|
|
||||||
$langs->load("companies");
|
$langs->load("companies");
|
||||||
$langs->load("other");
|
$langs->load("other");
|
||||||
|
|||||||
@ -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."/product/class/product.class.php");
|
require_once(DOL_DOCUMENT_ROOT."/product/class/product.class.php");
|
||||||
require_once(DOL_DOCUMENT_ROOT."/lib/price.lib.php");
|
require_once(DOL_DOCUMENT_ROOT."/core/lib/price.lib.php");
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
@ -23,7 +23,7 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
require ("../main.inc.php");
|
require ("../main.inc.php");
|
||||||
require_once(DOL_DOCUMENT_ROOT.'/lib/contract.lib.php');
|
require_once(DOL_DOCUMENT_ROOT.'/core/lib/contract.lib.php');
|
||||||
require_once(DOL_DOCUMENT_ROOT."/contrat/class/contrat.class.php");
|
require_once(DOL_DOCUMENT_ROOT."/contrat/class/contrat.class.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.'/core/class/html.formcompany.class.php');
|
require_once(DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php');
|
||||||
|
|||||||
@ -26,9 +26,9 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
require ("../main.inc.php");
|
require ("../main.inc.php");
|
||||||
require_once(DOL_DOCUMENT_ROOT."/lib/contract.lib.php");
|
require_once(DOL_DOCUMENT_ROOT."/core/lib/contract.lib.php");
|
||||||
require_once(DOL_DOCUMENT_ROOT."/contrat/class/contrat.class.php");
|
require_once(DOL_DOCUMENT_ROOT."/contrat/class/contrat.class.php");
|
||||||
require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php");
|
require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
|
||||||
require_once(DOL_DOCUMENT_ROOT."/core/class/html.formfile.class.php");
|
require_once(DOL_DOCUMENT_ROOT."/core/class/html.formfile.class.php");
|
||||||
|
|
||||||
$langs->load("other");
|
$langs->load("other");
|
||||||
@ -69,7 +69,7 @@ $modulepart='contract';
|
|||||||
*/
|
*/
|
||||||
if ($_POST["sendit"] && ! empty($conf->global->MAIN_UPLOAD_DOC))
|
if ($_POST["sendit"] && ! empty($conf->global->MAIN_UPLOAD_DOC))
|
||||||
{
|
{
|
||||||
require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php");
|
require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
|
||||||
|
|
||||||
if (create_exdir($upload_dir) >= 0)
|
if (create_exdir($upload_dir) >= 0)
|
||||||
{
|
{
|
||||||
|
|||||||
@ -27,12 +27,12 @@
|
|||||||
|
|
||||||
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.'/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."/includes/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");
|
||||||
if ($conf->projet->enabled) require_once(DOL_DOCUMENT_ROOT."/lib/project.lib.php");
|
if ($conf->projet->enabled) require_once(DOL_DOCUMENT_ROOT."/core/lib/project.lib.php");
|
||||||
|
|
||||||
$langs->load("contracts");
|
$langs->load("contracts");
|
||||||
$langs->load("orders");
|
$langs->load("orders");
|
||||||
|
|||||||
@ -23,7 +23,7 @@
|
|||||||
|
|
||||||
require ("../main.inc.php");
|
require ("../main.inc.php");
|
||||||
require_once(DOL_DOCUMENT_ROOT."/core/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.'/core/lib/contract.lib.php');
|
||||||
require_once(DOL_DOCUMENT_ROOT."/contrat/class/contrat.class.php");
|
require_once(DOL_DOCUMENT_ROOT."/contrat/class/contrat.class.php");
|
||||||
|
|
||||||
$langs->load("contracts");
|
$langs->load("contracts");
|
||||||
|
|||||||
@ -23,7 +23,7 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
require ("../main.inc.php");
|
require ("../main.inc.php");
|
||||||
require_once(DOL_DOCUMENT_ROOT.'/lib/contract.lib.php');
|
require_once(DOL_DOCUMENT_ROOT.'/core/lib/contract.lib.php');
|
||||||
if ($conf->contrat->enabled) require_once(DOL_DOCUMENT_ROOT."/contrat/class/contrat.class.php");
|
if ($conf->contrat->enabled) require_once(DOL_DOCUMENT_ROOT."/contrat/class/contrat.class.php");
|
||||||
|
|
||||||
$socid=isset($_GET["socid"])?$_GET["socid"]:isset($_POST["socid"])?$_POST["socid"]:"";
|
$socid=isset($_GET["socid"])?$_GET["socid"]:isset($_POST["socid"])?$_POST["socid"]:"";
|
||||||
|
|||||||
@ -35,7 +35,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."/core/lib/files.lib.php");
|
||||||
require_once(DOL_DOCUMENT_ROOT."/core/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);
|
||||||
|
|||||||
@ -1122,7 +1122,7 @@ abstract class CommonObject
|
|||||||
*/
|
*/
|
||||||
function update_price($exclspec=0,$roundingadjust=-1)
|
function update_price($exclspec=0,$roundingadjust=-1)
|
||||||
{
|
{
|
||||||
include_once(DOL_DOCUMENT_ROOT.'/lib/price.lib.php');
|
include_once(DOL_DOCUMENT_ROOT.'/core/lib/price.lib.php');
|
||||||
|
|
||||||
if ($roundingadjust < 0 && isset($conf->global->MAIN_ROUNDOFTOTAL_NOT_TOTALOFROUND)) $roundingadjust=$conf->global->MAIN_ROUNDOFTOTAL_NOT_TOTALOFROUND;
|
if ($roundingadjust < 0 && isset($conf->global->MAIN_ROUNDOFTOTAL_NOT_TOTALOFROUND)) $roundingadjust=$conf->global->MAIN_ROUNDOFTOTAL_NOT_TOTALOFROUND;
|
||||||
if ($roundingadjust < 0) $roundingadjust=0;
|
if ($roundingadjust < 0) $roundingadjust=0;
|
||||||
|
|||||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user