diff --git a/htdocs/holiday/define_holiday.php b/htdocs/holiday/define_holiday.php index a37207eddaa..04938436d69 100644 --- a/htdocs/holiday/define_holiday.php +++ b/htdocs/holiday/define_holiday.php @@ -24,8 +24,9 @@ * \brief File that defines the balance of paid holiday of users. */ -include 'common.inc.php'; -require_once DOL_DOCUMENT_ROOT. '/user/class/user.class.php'; +require('../main.inc.php'); +require_once DOL_DOCUMENT_ROOT.'/user/class/user.class.php'; +require_once DOL_DOCUMENT_ROOT.'/holiday/common.inc.php'; // Protection if external user if ($user->societe_id > 0) accessforbidden(); diff --git a/htdocs/holiday/fiche.php b/htdocs/holiday/fiche.php index 6f32fff0b15..4c6e0799053 100644 --- a/htdocs/holiday/fiche.php +++ b/htdocs/holiday/fiche.php @@ -22,12 +22,13 @@ * \brief Form and file creation of paid holiday. */ -include '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'; +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'; // Get parameters $myparam = GETPOST("myparam"); diff --git a/htdocs/holiday/index.php b/htdocs/holiday/index.php index 61a6e4318df..ce466d1807a 100644 --- a/htdocs/holiday/index.php +++ b/htdocs/holiday/index.php @@ -23,11 +23,12 @@ * \brief List of holiday. */ -include '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'; +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'; // Protection if external user if ($user->societe_id > 0) accessforbidden(); diff --git a/htdocs/holiday/month_report.php b/htdocs/holiday/month_report.php index 36a3212c0d1..1349ef1e364 100644 --- a/htdocs/holiday/month_report.php +++ b/htdocs/holiday/month_report.php @@ -22,10 +22,11 @@ * \brief Monthly report of paid holiday. */ -include 'common.inc.php'; +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'; // Protection if external user if ($user->societe_id > 0) accessforbidden(); diff --git a/htdocs/holiday/view_log.php b/htdocs/holiday/view_log.php index ffe000bf04d..ef21ee4cde1 100644 --- a/htdocs/holiday/view_log.php +++ b/htdocs/holiday/view_log.php @@ -23,8 +23,9 @@ * \ingroup holiday */ -include 'common.inc.php'; -require_once DOL_DOCUMENT_ROOT. '/user/class/user.class.php'; +require('../main.inc.php'); +require_once DOL_DOCUMENT_ROOT.'/user/class/user.class.php'; +require_once DOL_DOCUMENT_ROOT.'/holiday/common.inc.php'; // Protection if external user if ($user->societe_id > 0) accessforbidden(); diff --git a/htdocs/langs/en_US/holiday.lang b/htdocs/langs/en_US/holiday.lang index 46c9e7d941e..85b9854eb07 100755 --- a/htdocs/langs/en_US/holiday.lang +++ b/htdocs/langs/en_US/holiday.lang @@ -3,7 +3,7 @@ CHARSET= UTF-8 CPTitreMenu=Holidays MenuReportMonth=Monthly statement -MenuAddCP=Demand for holidays +MenuAddCP=Apply for holidays NotActiveModCP=You must enable the module holidays to view this page. NotConfigModCP=You must configure the module holidays to view this page. To do this, click here . NoCPforUser=You don't have a demand for holidays. @@ -23,7 +23,7 @@ ListeCP=List of holidays ValidateByCP=Will be validated by DescCP=Description SendRequestCP=Creating demand for holidays -DelayToRequestCP=Applications for holidays must be made at least % s day before them. +DelayToRequestCP=Applications for holidays must be made at least %s day(s) before them. MenuConfCP=Define the holidays UpdateAllCP=Update the holidays SoldeCPUser=Your balance of holidays is %s days. diff --git a/test/phpunit/jenkins_phpunittest.xml b/test/phpunit/jenkins_phpunittest.xml index 9e29f2f9650..ccdd46bf5d8 100644 --- a/test/phpunit/jenkins_phpunittest.xml +++ b/test/phpunit/jenkins_phpunittest.xml @@ -45,6 +45,7 @@ ../../htdocs/boutique/osc_master.inc.php ../../htdocs/compta/bank/pre.inc.php ../../htdocs/compta/paiement/cheque/pre.inc.php + ../../htdocs/holiday/common.inc.php ../../htdocs/ftp/pre.inc.php diff --git a/test/phpunit/phpunittest.xml b/test/phpunit/phpunittest.xml index 13d0d7e4154..5900b5f322e 100644 --- a/test/phpunit/phpunittest.xml +++ b/test/phpunit/phpunittest.xml @@ -47,6 +47,7 @@ ../../htdocs/boutique/osc_master.inc.php ../../htdocs/compta/bank/pre.inc.php ../../htdocs/compta/paiement/cheque/pre.inc.php + ../../htdocs/holiday/common.inc.php ../../htdocs/ftp/pre.inc.php