Fix: Restore correct includes.

All entry pages must start with a require main.inc.php, except command
line script that start with master.inc.php.
To avoid errors into jenkins, we must exclude file common.inc.php.
All files ending *.inc.php must be excluded from jenkins because such
files are not "start/entry pages". That's the difference with
standard files *.php.
*.php

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('../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();

htdocs/holiday/fiche.php

@@ -22,12 +22,13 @@
  *		\brief      Form and file creation of paid holiday.
  */
 
-include 'common.inc.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");

htdocs/holiday/index.php

@@ -23,11 +23,12 @@
  *		\brief      List of holiday.
  */
 
-include 'common.inc.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();

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();

htdocs/holiday/view_log.php

@@ -23,8 +23,9 @@
  *  \ingroup    holiday
  */
 
-include 'common.inc.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();

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, <a href="./admin/holiday.php?leftmenu=setup&mainmenu=home" style="font-weight: normal; color: red; text-decoration: underline;"> click here </ a>.
 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 <b>% s day </ b> before them.
+DelayToRequestCP=Applications for holidays must be made at least <b>%s day(s)</b> before them.
 MenuConfCP=Define the holidays
 UpdateAllCP=Update the holidays
 SoldeCPUser=Your balance of holidays is <b>%s</b> days.

test/phpunit/jenkins_phpunittest.xml

@@ -45,6 +45,7 @@
     <file>../../htdocs/boutique/osc_master.inc.php</file>
     <file>../../htdocs/compta/bank/pre.inc.php</file>
     <file>../../htdocs/compta/paiement/cheque/pre.inc.php</file>
+    <file>../../htdocs/holiday/common.inc.php</file>
     <file>../../htdocs/ftp/pre.inc.php</file>
     </exclude>
   </whitelist>

test/phpunit/phpunittest.xml

@@ -47,6 +47,7 @@
     <file>../../htdocs/boutique/osc_master.inc.php</file>
     <file>../../htdocs/compta/bank/pre.inc.php</file>
     <file>../../htdocs/compta/paiement/cheque/pre.inc.php</file>
+    <file>../../htdocs/holiday/common.inc.php</file>
     <file>../../htdocs/ftp/pre.inc.php</file>
     </exclude>
   </whitelist>