Merge pull request #4362 from Dolibarr/revert-4354-patch-1

Revert "Debug of module leave requests "

htdocs/holiday/card.php

@@ -356,7 +356,7 @@ if ($action == 'confirm_send')
             if ($cp->getConfCP('AlertValidatorSolde'))
             {
             	$nbopenedday=num_open_day($cp->date_debut_gmt,$cp->date_fin_gmt,0,1,$cp->halfday);
-                if ($nbopenedday > $cp->getCPforUser($cp->fk_user, $cp->fk_type))
+                if ($nbopenedday > $cp->getCPforUser($cp->fk_user))
                 {
                     $message.= "\n";
                     $message.= $langs->transnoentities("HolidaysToValidateAlertSolde")."\n";
@@ -413,14 +413,14 @@ if ($action == 'confirm_valid')
             // Calculcate number of days consummed
             $nbopenedday=num_open_day($cp->date_debut_gmt,$cp->date_fin_gmt,0,1,$cp->halfday);
 
-            $soldeActuel = $cp->getCpforUser($cp->fk_user, $cp->fk_type);
+            $soldeActuel = $cp->getCpforUser($cp->fk_user);
             $newSolde = $soldeActuel - ($nbopenedday * $cp->getConfCP('nbHolidayDeducted'));
 
             // On ajoute la modification dans le LOG
-            $cp->addLogCP($user->id, $cp->fk_user, $langs->transnoentitiesnoconv("Holidays"), $newSolde, $cp->fk_type);
+            $cp->addLogCP($user->id, $cp->fk_user, $langs->transnoentitiesnoconv("Holidays"), $newSolde);
 
             // Mise à jour du solde
-            $cp->updateSoldeCP($cp->fk_user, $newSolde, $cp->fk_type);
+            $cp->updateSoldeCP($cp->fk_user, $newSolde);
 
             // To
             $destinataire = new User($db);
@@ -578,14 +578,14 @@ if ($action == 'confirm_cancel' && GETPOST('confirm') == 'yes')
         	// Calculcate number of days consummed
         	$nbopenedday=num_open_day($cp->date_debut_gmt,$cp->date_fin_gmt,0,1,$cp->halfday);
 
-        	$soldeActuel = $cp->getCpforUser($cp->fk_user, $cp->fk_type);
+        	$soldeActuel = $cp->getCpforUser($cp->fk_user);
         	$newSolde = $soldeActuel + ($nbopenedday * $cp->getConfCP('nbHolidayDeducted'));
 
         	// On ajoute la modification dans le LOG
-        	$result1=$cp->addLogCP($user->id, $cp->fk_user, $langs->transnoentitiesnoconv("HolidaysCancelation"), $newSolde, $cp->fk_type);
+        	$result1=$cp->addLogCP($user->id, $cp->fk_user, $langs->transnoentitiesnoconv("HolidaysCancelation"), $newSolde);
 
         	// Mise à jour du solde
-        	$result2=$cp->updateSoldeCP($cp->fk_user, $newSolde, $cp->fk_type);
+        	$result2=$cp->updateSoldeCP($cp->fk_user, $newSolde);
 
         	if ($result1 < 0 || $result2 < 0)
         	{
@@ -618,7 +618,7 @@ if ($action == 'confirm_cancel' && GETPOST('confirm') == 'yes')
 
             // From
             $expediteur = new User($db);
-            $expediteur->fetch($cp->fk_user_cancel);
+            $expediteur->fetch($cp->fk_validator);
             $emailFrom = $expediteur->email;
 
             // Subject

htdocs/holiday/class/holiday.class.php

@@ -819,11 +819,12 @@ class Holiday extends CommonObject
      *  @param	int		$fk_type	Filter on type
      *  @return string      		retourne la valeur du paramètre
      */
-    function getConfCP($name)
+    function getConfCP($name, $fk_type=0)
     {
         $sql = "SELECT value";
         $sql.= " FROM ".MAIN_DB_PREFIX."holiday_config";
         $sql.= " WHERE name = '".$name."'";
+        if ($fk_type > 0) $sql.=" AND fk_type = ".$fk_type;
 
         dol_syslog(get_class($this).'::getConfCP name='.$name.'', LOG_DEBUG);
         $result = $this->db->query($sql);

htdocs/langs/en_US/holiday.lang

@@ -26,7 +26,6 @@ MenuConfCP=Edit balance of leaves
 UpdateAllCP=Update the leaves
 SoldeCPUser=Leaves balance is <b>%s</b> days.
 ErrorEndDateCP=You must select an end date greater than the start date.
-ErrorFieldRequired=This field is required :
 ErrorSQLCreateCP=An SQL error occurred during the creation:
 ErrorIDFicheCP=An error has occurred, the leave request does not exist.
 ReturnCP=Return to previous page
@@ -41,7 +40,6 @@ DeleteCP=Delete
 ActionValidCP=Validate
 ActionRefuseCP=Refuse
 ActionCancelCP=Cancel
-UpdateButtonCP=Update
 StatutCP=Status
 SendToValidationCP=Send to validation
 TitleDeleteCP=Delete the leave request
@@ -82,10 +80,11 @@ alreadyCPexist=A leave request has already been done on this period.
 UserName=Name
 FirstDayOfHoliday=First day of vacation
 LastDayOfHoliday=Last day of vacation
-BoxTitleLastLeaveRequests=Last %s modified leave requests
+BoxTitleLastLeaveRequests=Last %s modified leave requests 
 HolidaysMonthlyUpdate=Monthly update
 ManualUpdate=Manual update
 HolidaysCancelation=Leave request cancelation
+
 ## Configuration du Module ##
 ConfCP=Configuration of leave request module
 DescOptionCP=Description of the option
@@ -141,4 +140,4 @@ HolidaysRefusedBody=Your leave request for %s to %s has been denied for the foll
 HolidaysCanceled=Canceled leaved request
 HolidaysCanceledBody=Your leave request for %s to %s has been canceled.
 NewByMonth=Added per month
-GoIntoDictionaryHolidayTypes=Go into <strong>Home - Setup - Dictionaries - Type of leaves</strong> to setup the different types of leaves.
+GoIntoDictionaryHolidayTypes=Go into <strong>Home - Setup - Dictionaries - Type of leaves</strong> to setup the different types of leaves.
\ No newline at end of file