From bcbccd8eb8cf6602546bf2292b698d1d2692703f Mon Sep 17 00:00:00 2001
From: "pso (OpenERP)" <pso@tinyerp.com>
Date: Tue, 26 Apr 2011 11:07:14 +0530
Subject: [PATCH] [FIX] hr_holidays: Wrong allocation request created when
 allocating holidays per category of employee

lp bug: https://launchpad.net/bugs/767238 fixed

bzr revid: pso@tinyerp.com-20110426053714-i0jpn1fh620mk1j4
---
 addons/hr_holidays/hr_holidays.py       | 2 ++
 addons/hr_holidays/hr_holidays_view.xml | 4 ++++
 2 files changed, 6 insertions(+)

diff --git a/addons/hr_holidays/hr_holidays.py b/addons/hr_holidays/hr_holidays.py
index 131d38d7001..8cb2845f81b 100644
--- a/addons/hr_holidays/hr_holidays.py
+++ b/addons/hr_holidays/hr_holidays.py
@@ -167,6 +167,8 @@ class hr_holidays(osv.osv):
                 result['value'] = {
                     'employee_id': ids_employee[0]
                 }
+        else:
+            result['value'] = {'employee_id': False}
         return result
 
     # TODO: can be improved using resource calendar method
diff --git a/addons/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml
index f49b2ab388a..f7705da0eef 100644
--- a/addons/hr_holidays/hr_holidays_view.xml
+++ b/addons/hr_holidays/hr_holidays_view.xml
@@ -36,6 +36,7 @@
                     </group>
                     <newline />
                     <group expand="0" string="Group By...">
+                    	<filter name="group_category" string="Category" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'category_id'}"/>
                         <filter name="group_employee" string="Employee" icon="terp-personal" domain="[]" context="{'group_by':'employee_id'}"/>
                         <filter string="Manager" icon="terp-personal" domain="[]" context="{'group_by':'manager_id'}"/>
                         <filter string="Department" icon="terp-personal+" domain="[]" context="{'group_by':'department_id','set_visible':True}"/>
@@ -153,7 +154,9 @@
             <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree colors="red:state in ('refuse');blue:state in ('draft');black:state in ('confirm','validate','validate1')" string="Leaves" >
+                	<field name="holiday_type"/>
                     <field name="employee_id"/>
+                    <field name="category_id"/>
                     <field name="department_id" invisible="1"/>
                     <field name="holiday_status_id"/>
                     <field name="name"/>
@@ -232,6 +235,7 @@
             <field name="arch" type="xml">
                 <tree colors="red:state in ('refuse');blue:state in (' draft');black:state in ('confirm','validate','validate1')">
                     <field name="employee_id"/>
+                    <field name="category_id"/>
                     <field name="department_id" invisible="not context.get('set_visible',False)"/>
                     <field name="holiday_status_id"/>
                     <field name="name"/>