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

Fix: for avoid phpunit errors

Browse Source
This commit is contained in:
Regis Houssin 2012-09-06 08:24:29 +02:00
parent 8787a703a0
commit 0b057a071a
7 changed files with 27 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
htdocs/holiday/admin/holiday.php
View File

@ -25,15 +25,11 @@
* \brief Page module configuration paid holiday.
*/
$res=0;
if (! $res && file_exists("../main.inc.php")) $res=@include("../main.inc.php"); // For root directory
if (! $res && file_exists("../../main.inc.php")) $res=@include("../../main.inc.php"); // For "custom" directory
if (! $res) die("Include of main fails");
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");
require '../main.inc.php';
require DOL_DOCUMENT_ROOT.'/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');

3
htdocs/holiday/common.inc.php
View File

@ -23,7 +23,8 @@
* \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("other");

5
htdocs/holiday/define_holiday.php
View File

@ -25,9 +25,8 @@
* \author dmouillard@teclib.com <Dimitri Mouillard>
*/
require('../main.inc.php');
require_once(DOL_DOCUMENT_ROOT. "/user/class/user.class.php");
require_once(DOL_DOCUMENT_ROOT. "/holiday/common.inc.php");
require DOL_DOCUMENT_ROOT. '/holiday/common.inc.php';
require_once DOL_DOCUMENT_ROOT. '/user/class/user.class.php';
// Protection if external user
if ($user->societe_id > 0) accessforbidden();

16
htdocs/holiday/fiche.php
View File

@ -20,18 +20,14 @@
* \file fiche.php
* \ingroup 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_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. "/core/class/html.formfile.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. "/holiday/common.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. '/user/class/usergroup.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/html.formmail.class.php';
// Get parameters
$myparam = GETPOST("myparam");

11
htdocs/holiday/index.php
View File

@ -23,12 +23,11 @@
* \brief List of holiday.
*/
require('../main.inc.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. "/user/class/user.class.php");
require_once(DOL_DOCUMENT_ROOT. "/user/class/usergroup.class.php");
require_once(DOL_DOCUMENT_ROOT. "/holiday/common.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.formother.class.php';
require_once DOL_DOCUMENT_ROOT. '/user/class/user.class.php';
require_once DOL_DOCUMENT_ROOT. '/user/class/usergroup.class.php';
// Protection if external user
if ($user->societe_id > 0) accessforbidden();

13
htdocs/holiday/month_report.php
View File

@ -20,15 +20,12 @@
* \file month_report.php
* \ingroup 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_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. "/holiday/common.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.'/core/class/html.form.class.php';
require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
// Protection if external user
if ($user->societe_id > 0) accessforbidden();

5
htdocs/holiday/view_log.php
View File

@ -23,9 +23,8 @@
* \ingroup holiday
*/
require('../main.inc.php');
require_once(DOL_DOCUMENT_ROOT. "/user/class/user.class.php");
require_once(DOL_DOCUMENT_ROOT. "/holiday/common.inc.php");
require DOL_DOCUMENT_ROOT. '/holiday/common.inc.php';
require_once DOL_DOCUMENT_ROOT. '/user/class/user.class.php';
// Protection if external user
if ($user->societe_id > 0) accessforbidden();