Merge pull request #4159 from belyas/develop

addLogCP and updateSoledCP methodes throwing warnings when assigning leave for a user

htdocs/.gitignore

@@ -19,4 +19,5 @@
 /dolimed*
 /allscreens*
 /ecommerce/
-/cabinetmed*
\ No newline at end of file
+/cabinetmed*
+/conf/conf.php
\ No newline at end of file

htdocs/holiday/define_holiday.php

@@ -130,10 +130,15 @@ elseif($action == 'add_event')
         $add_holiday = $holiday->getValueEventCp($event);
         $new_holiday = $nb_holiday + $add_holiday;
 
-        // On ajoute la modification dans le LOG
-        $holiday->addLogCP($user->id,$userCP, $holiday->getNameEventCp($event),$new_holiday);
+        // add event to existing types of vacation
+        foreach ($typeleaves as $key => $leave) {
+        	$vacationTypeID = $leave['rowid'];
 
-        $holiday->updateSoldeCP($userCP,$new_holiday);
+	        // On ajoute la modification dans le LOG
+	        $holiday->addLogCP($user->id,$userCP, $holiday->getNameEventCp($event),$new_holiday, $vacationTypeID);
+
+	        $holiday->updateSoldeCP($userCP,$new_holiday, $vacationTypeID);
+        }
 
 		setEventMessages('AddEventToUserOkCP', '', 'mesgs');
     }