Skip to content
Snippets Groups Projects
Commit 0b057a07 authored by Regis Houssin's avatar Regis Houssin
Browse files

Fix: for avoid phpunit errors

parent 8787a703
No related branches found
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
htdocs/holiday/admin/holiday.php
+ 5
− 9
View file @ 0b057a07
...@@ -25,15 +25,11 @@ ...@@ -25,15 +25,11 @@
* \brief Page module configuration paid holiday. * \brief Page module configuration paid holiday.
*/ */
$res=0; require '../main.inc.php';
if (! $res && file_exists("../main.inc.php")) $res=@include("../main.inc.php"); // For root directory require DOL_DOCUMENT_ROOT.'/holiday/class/holiday.class.php';
if (! $res && file_exists("../../main.inc.php")) $res=@include("../../main.inc.php"); // For "custom" directory require_once DOL_DOCUMENT_ROOT. '/core/class/html.form.class.php';
if (! $res) die("Include of main fails"); require_once DOL_DOCUMENT_ROOT. '/user/class/user.class.php';
require_once DOL_DOCUMENT_ROOT. '/user/class/usergroup.class.php';
dol_include_once("/holiday/class/holiday.class.php");
require_once(DOL_DOCUMENT_ROOT. "/core/class/html.form.class.php");
require_once(DOL_DOCUMENT_ROOT. "/user/class/user.class.php");
require_once(DOL_DOCUMENT_ROOT. "/user/class/usergroup.class.php");
$action=GETPOST('action'); $action=GETPOST('action');
......
htdocs/holiday/common.inc.php
+ 2
− 1
View file @ 0b057a07
...@@ -23,7 +23,8 @@ ...@@ -23,7 +23,8 @@
* \brief Common load of data * \brief Common load of data
*/ */
require_once(DOL_DOCUMENT_ROOT. "/holiday/class/holiday.class.php"); require '../main.inc.php' ;
require DOL_DOCUMENT_ROOT. '/holiday/class/holiday.class.php';
$langs->load("user"); $langs->load("user");
$langs->load("other"); $langs->load("other");
......
htdocs/holiday/define_holiday.php
+ 2
− 3
View file @ 0b057a07
...@@ -25,9 +25,8 @@ ...@@ -25,9 +25,8 @@
* \author dmouillard@teclib.com <Dimitri Mouillard> * \author dmouillard@teclib.com <Dimitri Mouillard>
*/ */
require('../main.inc.php'); require DOL_DOCUMENT_ROOT. '/holiday/common.inc.php';
require_once(DOL_DOCUMENT_ROOT. "/user/class/user.class.php"); require_once DOL_DOCUMENT_ROOT. '/user/class/user.class.php';
require_once(DOL_DOCUMENT_ROOT. "/holiday/common.inc.php");
// Protection if external user // Protection if external user
if ($user->societe_id > 0) accessforbidden(); if ($user->societe_id > 0) accessforbidden();
......
htdocs/holiday/fiche.php
+ 6
− 10
View file @ 0b057a07
...@@ -20,18 +20,14 @@ ...@@ -20,18 +20,14 @@
* \file fiche.php * \file fiche.php
* \ingroup holiday * \ingroup holiday
* \brief Form and file creation of paid holiday. * \brief Form and file creation of paid holiday.
* \version $Id: fiche.php,v 1.16 2011/09/15 11:00:00 dmouillard Exp $
* \author dmouillard@teclib.com <Dimitri Mouillard>
* \remarks Form and file creation of paid holiday.
*/ */
require('../main.inc.php'); require DOL_DOCUMENT_ROOT. '/holiday/common.inc.php';
require_once(DOL_DOCUMENT_ROOT. "/core/class/html.form.class.php"); require_once DOL_DOCUMENT_ROOT. '/core/class/html.form.class.php';
require_once(DOL_DOCUMENT_ROOT. "/user/class/usergroup.class.php"); require_once DOL_DOCUMENT_ROOT. '/user/class/usergroup.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. "/core/class/CMailFile.class.php"); require_once DOL_DOCUMENT_ROOT. '/core/class/CMailFile.class.php';
require_once(DOL_DOCUMENT_ROOT. "/core/class/html.formmail.class.php"); require_once DOL_DOCUMENT_ROOT. '/core/class/html.formmail.class.php';
require_once(DOL_DOCUMENT_ROOT. "/holiday/common.inc.php");
// Get parameters // Get parameters
$myparam = GETPOST("myparam"); $myparam = GETPOST("myparam");
......
htdocs/holiday/index.php
+ 5
− 6
View file @ 0b057a07
...@@ -23,12 +23,11 @@ ...@@ -23,12 +23,11 @@
* \brief List of holiday. * \brief List of holiday.
*/ */
require('../main.inc.php'); require DOL_DOCUMENT_ROOT. '/holiday/common.inc.php';
require_once(DOL_DOCUMENT_ROOT. "/core/class/html.form.class.php"); require_once DOL_DOCUMENT_ROOT. '/core/class/html.form.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. "/user/class/user.class.php"); require_once DOL_DOCUMENT_ROOT. '/user/class/user.class.php';
require_once(DOL_DOCUMENT_ROOT. "/user/class/usergroup.class.php"); require_once DOL_DOCUMENT_ROOT. '/user/class/usergroup.class.php';
require_once(DOL_DOCUMENT_ROOT. "/holiday/common.inc.php");
// Protection if external user // Protection if external user
if ($user->societe_id > 0) accessforbidden(); if ($user->societe_id > 0) accessforbidden();
......
htdocs/holiday/month_report.php
+ 5
− 8
View file @ 0b057a07
...@@ -20,15 +20,12 @@ ...@@ -20,15 +20,12 @@
* \file month_report.php * \file month_report.php
* \ingroup holiday * \ingroup holiday
* \brief Monthly report of paid holiday. * \brief Monthly report of paid holiday.
* \version $Id: month_report.php,v 1.00 2011/09/15 11:00:00 flegastelois Exp $
* \author flegastelois@teclib.com <François Legastelois>
* \remarks Monthly report of paid holiday.
*/ */
require('../main.inc.php');
require_once(DOL_DOCUMENT_ROOT.'/user/class/user.class.php'); require DOL_DOCUMENT_ROOT. '/holiday/common.inc.php';
require_once(DOL_DOCUMENT_ROOT.'/core/class/html.form.class.php'); require_once DOL_DOCUMENT_ROOT.'/user/class/user.class.php';
require_once(DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php'); require_once DOL_DOCUMENT_ROOT.'/core/class/html.form.class.php';
require_once(DOL_DOCUMENT_ROOT. "/holiday/common.inc.php"); require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
// Protection if external user // Protection if external user
if ($user->societe_id > 0) accessforbidden(); if ($user->societe_id > 0) accessforbidden();
......
htdocs/holiday/view_log.php
+ 2
− 3
View file @ 0b057a07
...@@ -23,9 +23,8 @@ ...@@ -23,9 +23,8 @@
* \ingroup holiday * \ingroup holiday
*/ */
require('../main.inc.php'); require DOL_DOCUMENT_ROOT. '/holiday/common.inc.php';
require_once(DOL_DOCUMENT_ROOT. "/user/class/user.class.php"); require_once DOL_DOCUMENT_ROOT. '/user/class/user.class.php';
require_once(DOL_DOCUMENT_ROOT. "/holiday/common.inc.php");
// Protection if external user // Protection if external user
if ($user->societe_id > 0) accessforbidden(); if ($user->societe_id > 0) accessforbidden();
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment