From 17a30e204c4350b31043b00ec366c0fe8d6da56e Mon Sep 17 00:00:00 2001
From: "Jay (Open ERP)" <jvo@tinyerp.com>
Date: Wed, 26 May 2010 10:59:21 +0530
Subject: [PATCH] [FIX] Resolved a committed conflict

bzr revid: jvo@tinyerp.com-20100526052921-6k18mel3o6u6mcr3
---
 .../hr_holidays/report/available_holidays_view.xml  | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/addons/hr_holidays/report/available_holidays_view.xml b/addons/hr_holidays/report/available_holidays_view.xml
index dca6e6e20f6..5d6cc41a730 100644
--- a/addons/hr_holidays/report/available_holidays_view.xml
+++ b/addons/hr_holidays/report/available_holidays_view.xml
@@ -60,8 +60,17 @@
 		                    domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')), ('date','&gt;',(datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d'))]"
 		                    help="Leaves during last 7 days"/>
 		                <separator orientation="vertical"/>
-		                <field name="employee_id"/>
-		                <field name="user_id" widget="selection"/>
+						<field name="employee_id"/>
+		                <field name="user_id" widget="selection">
+		                    <filter icon="terp-hr"
+		                        string="My Leaves"
+		                        domain="[('user_id','=',uid)]"/>
+		                </field>
+		            </group>
+		            <newline/>
+	                <group expand="0" string="Extended options..." colspan="10" col="12">
+	                    <field name="holiday_status_id" widget="selection"/>
+	                	<field name="department_id" widget="selection"/>
 	                </group>
 	                <newline/>
 	                <group expand="1" string="Group By..." colspan="10" col="12">