From 1075940e93fd2625ef8f2eb8e8d100910bd0f338 Mon Sep 17 00:00:00 2001
From: yassine belkaid <yassine.belkaid87@gmail.com>
Date: Sat, 5 Dec 2015 00:37:32 +0000
Subject: [PATCH 1/2] ignore conf/conf.php file

---
 htdocs/.gitignore | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/htdocs/.gitignore b/htdocs/.gitignore
index bf0c3b10ffa..bf6a1487ea6 100644
--- a/htdocs/.gitignore
+++ b/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

From 8c2227430077912eda24e613af52bec65038be83 Mon Sep 17 00:00:00 2001
From: yassine belkaid <yassine.belkaid87@gmail.com>
Date: Sat, 5 Dec 2015 00:41:00 +0000
Subject: [PATCH 2/2] Fixed assigning exceptional leave for a user

---
 htdocs/holiday/define_holiday.php | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/htdocs/holiday/define_holiday.php b/htdocs/holiday/define_holiday.php
index 62ad088a5ef..5147188872a 100644
--- a/htdocs/holiday/define_holiday.php
+++ b/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');
     }