From 1e4b9639c6399832f65a6bc70fcb4f865e22b3f2 Mon Sep 17 00:00:00 2001
From: "psi (Open ERP)" <psi@tinyerp.co.in>
Date: Tue, 25 May 2010 10:45:55 +0530
Subject: [PATCH] [IMP] hr_holidays:Improve Search view of reports

bzr revid: psi@tinyerp.co.in-20100525051555-lpb7tfbs53m71w9c
---
 .../hr_holidays/report/available_holidays.py  |  2 +-
 .../report/available_holidays_view.xml        | 19 ++++++++++++-------
 .../report/hr_holidays_report_view.xml        | 16 +++++++++-------
 3 files changed, 22 insertions(+), 15 deletions(-)

diff --git a/addons/hr_holidays/report/available_holidays.py b/addons/hr_holidays/report/available_holidays.py
index e9832c7e1e4..5949e527f6a 100644
--- a/addons/hr_holidays/report/available_holidays.py
+++ b/addons/hr_holidays/report/available_holidays.py
@@ -31,7 +31,7 @@ class available_holidays_report(osv.osv):
         'month':fields.selection([('01','January'), ('02','February'), ('03','March'), ('04','April'),
             ('05','May'), ('06','June'), ('07','July'), ('08','August'), ('09','September'),
             ('10','October'), ('11','November'), ('12','December')], 'Month',readonly=True),
-        'employee_id': fields.many2one ('hr.employee', 'Employee', readonly=True),
+        'employee_id': fields.many2one ('hr.employee', "Employee's Name", readonly=True),
         'category_id' : fields.many2one('hr.employee.category', "Category's Name", readonly=True),
         'holiday_status_id': fields.many2one('hr.holidays.status', 'Leave Type', readonly=True),
         'max_leave': fields.float('Allocated Leaves', readonly=True),
diff --git a/addons/hr_holidays/report/available_holidays_view.xml b/addons/hr_holidays/report/available_holidays_view.xml
index 0f773a87138..bbd9a8db47e 100644
--- a/addons/hr_holidays/report/available_holidays_view.xml
+++ b/addons/hr_holidays/report/available_holidays_view.xml
@@ -10,9 +10,9 @@
             <field name="type">tree</field>
             <field name="arch" type="xml">
                <tree string="Available Holidays">
-                    <field name="employee_id" invisible="1"/>
-                    <field name="category_id" invisible="1"/>
-                    <field name="holiday_status_id" invisible="1"/>
+                    <field name="employee_id"/>
+                    <field name="category_id"/>
+                    <field name="holiday_status_id"/>
                     <field name="department_id" invisible="1"/>
                     <field name="max_leave" sum="Allocated Leaves"/>
                     <field name="taken_leaves" sum="Taken Leaves"/>
@@ -48,6 +48,13 @@
 	        <field name="arch" type="xml">
 	            <search string="Leaves">
 	            	<group>
+	                    <filter icon="terp-hr" string="Employee"
+	                            domain="[('category_id', '=', False)]"
+	                            help="Leaves by empolyee"/>
+	                    <filter icon="terp-hr" string="Category"
+	                            domain="[('employee_id', '=', False)]"
+	                            help="Leaves by category"/>
+                        <separator orientation="vertical"/>
 		            	<filter icon="terp-hr" string="This Year"
 			                    domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')),('date','&gt;',(datetime.date.today()-datetime.timedelta(days=365)).strftime('%%Y-%%m-%%d'))]"
 			                    help="Leaves in this year"/>
@@ -61,13 +68,11 @@
 		                    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="employee_id" widget="selection"/>
 		                <field name="user_id" widget="selection"/>
 	                </group>
 	                <newline/>
 	                <group expand="1" string="Group By..." colspan="10" col="12">
-	                    <filter string="Employee" icon="terp-hr" domain="[('category_id', '=', False)]" context="{'group_by':'employee_id'}"/>
-	                    <filter string="Category" icon="terp-hr" domain="[('employee_id', '=', False)]" context="{'group_by':'category_id'}"/>
 	                    <filter string="User" name="User" icon="terp-hr" context="{'group_by':'user_id'}"/>
 	                    <separator orientation="vertical"/>
 	                    <filter string="Type" icon="terp-hr" context="{'group_by':'holiday_status_id'}"/>
@@ -88,7 +93,7 @@
             <field name="res_model">available.holidays.report</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,graph</field>
-            <field name="context">{'search_default_month':1,'search_default_User':1,'group_by_no_leaf':1,'group_by':[], "search_default_user_id": uid}</field>
+            <field name="context">{'search_default_month':1,'search_default_User':1,'group_by':[], "search_default_user_id": uid}</field>
             <field name="view_id" ref="view_hr_available_holidays_report_search"/>
 
         </record>
diff --git a/addons/hr_holidays/report/hr_holidays_report_view.xml b/addons/hr_holidays/report/hr_holidays_report_view.xml
index cc3f92f624d..a04e5f0dd2c 100644
--- a/addons/hr_holidays/report/hr_holidays_report_view.xml
+++ b/addons/hr_holidays/report/hr_holidays_report_view.xml
@@ -44,6 +44,13 @@
         <field name="arch" type="xml">
             <search string="Leaves">
             	<group>
+                    <filter icon="terp-hr" string="Employee"
+                            domain="[('category_id', '=', False)]"
+                            help="Leaves by empolyee"/>
+                    <filter icon="terp-hr" string="Category"
+                            domain="[('employee_id', '=', False)]"
+                            help="Leaves by category"/>
+	            	<separator orientation="vertical"/>
 	            	<filter icon="terp-hr" string="This Year"
 		                    domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')),('date','&gt;',(datetime.date.today()-datetime.timedelta(days=365)).strftime('%%Y-%%m-%%d'))]"
 		                    help="Leaves in this year"/>
@@ -70,17 +77,12 @@
 	               		domain="[('state','=','validate')]"
 	               		help = "Pending Leaves"/>
 					<separator orientation="vertical"/>
-					<field name="employee_id"/>
+					<field name="employee_id" widget="selection"/>
 	                <field name="user_id" widget="selection">
-	                    <filter icon="terp-hr"
-	                        string="My Leaves"
-	                        domain="[('user_id','=',uid)]"/>
 	                </field>
 	            </group>
                 <newline/>
                 <group expand="1" string="Group By..." colspan="10" col="12">
-                    <filter string="Employee" name="Employee" domain="[('category_id', '=', False)]" icon="terp-hr" context="{'group_by':'employee_id'}"/>
-                    <filter string="Category" name="category" domain="[('employee_id', '=', False)]" icon="terp-hr" context="{'group_by':'category_id'}"/>
                     <filter string="User" name="User" icon="terp-hr" context="{'group_by':'user_id'}"/>
                     <separator orientation="vertical"/>
                     <filter string="Type" icon="terp-hr" context="{'group_by':'holiday_status_id'}"/>
@@ -119,7 +121,7 @@
         <field name="res_model">hr.holidays.report</field>
         <field name="view_type">form</field>
         <field name="view_mode">tree,graph</field>
-        <field name="context">{"search_default_user_id": uid, 'search_default_month':1,'search_default_Employee':1,'group_by_no_leaf':1,'group_by':[]}</field>
+        <field name="context">{"search_default_user_id": uid, 'search_default_month':1,'search_default_Employee':1,'group_by':[]}</field>
         <field name="search_view_id" ref="view_hr_holidays_report_search"/>
     </record>