Merge lp:~openerp-dev/openobject-addons/trunk-bug-872245-bde into lp:openobject-addons

[Bharat Devnani (Open ERP)]

Hello Sir,

I have added category_id field in tree view of hr.holidays in hr_holidays/hr_holidays_view.xml.

Thanks & Regards,
Devnani Bharat R.

[Raphael Collet (OpenERP) (rco-openerp)]

Good. I made it invisible when merging, to avoid cluttering the list.

Thanks,
Raphael

review: Approve

=== modified file 'hr_holidays/hr_holidays_view.xml'
--- hr_holidays/hr_holidays_view.xml	2011-10-11 14:03:35 +0000
+++ hr_holidays/hr_holidays_view.xml	2011-10-14 05:59:25 +0000
@@ -203,6 +203,7 @@
                     <field name="department_id" invisible="1"/>
                     <field name="type"/>
                     <field name="name"/>
+                    <field name="category_id"/>
                     <field name="number_of_days" string="Number of Days" sum="Remaining Days"/>
                     <field name="date_from"/>
                     <field name="date_to"/>
@@ -427,9 +428,9 @@
 
     <!--  Shortcuts -->
         <act_window name="Leaves" domain="[('type','=','remove')]" context="{'search_default_employee_id': [active_id], 'default_employee_id': active_id}" res_model="hr.holidays" src_model="hr.employee" view_id="view_holiday" id="act_hr_employee_holiday_request"/>
-            
+
        <!--  Assing leave       -->
-        
+
         <record id="hr_holidays_leaves_assign_tree_view" model="ir.ui.view">
             <field name="name">hr.employee.leave.tree</field>
             <field name="model">hr.employee</field>
@@ -440,7 +441,7 @@
                     <field name="remaining_leaves" string="Remaining Legal Leaves"/>
                 </tree>
             </field>
-        </record>  
+        </record>
 
         <record model="ir.actions.act_window" id="hr_holidays_leaves_assign_legal">
            <field name="name">Allocate Leaves for Employees</field>
@@ -458,7 +459,7 @@
        </record>
 
         <!-- Hr employee inherit Legal Leaves -->
-    
+
         <record id="view_employee_form_leave_inherit" model="ir.ui.view">
             <field name="name">hr.employee.leave.form.inherit</field>
             <field name="model">hr.employee</field>