openerp-dev-web team mailing list archive

["Priyesh \(Open ERP\)" <pso@xxxxxxxxxxx>]

Priyesh (Open ERP) has proposed merging lp:~openerp-dev/openobject-addons/trunk-bug-767238-pso into lp:openobject-addons.

Requested reviews:
  OpenERP Core Team (openerp)
Related bugs:
  Bug #767238 in OpenERP Addons: "[PS] Wrong allocation request created when allocating holidays per category of employee"
  https://bugs.launchpad.net/openobject-addons/+bug/767238

For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-bug-767238-pso/+merge/59017

Fixed bug: 767238 (https://bugs.launchpad.net/openobject-addons/+bug/767238)
Improved tree and search view for Leave and Allocation Request
-- 
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-bug-767238-pso/+merge/59017
Your team OpenERP R&D Team is subscribed to branch lp:~openerp-dev/openobject-addons/trunk-bug-767238-pso.

=== modified file 'hr_holidays/hr_holidays.py'
--- hr_holidays/hr_holidays.py	2011-03-10 09:54:32 +0000
+++ hr_holidays/hr_holidays.py	2011-04-26 05:48:35 +0000
@@ -167,6 +167,8 @@
                 result['value'] = {
                     'employee_id': ids_employee[0]
                 }
+        else:
+            result['value'] = {'employee_id': False}
         return result
 
     # TODO: can be improved using resource calendar method

=== modified file 'hr_holidays/hr_holidays_view.xml'
--- hr_holidays/hr_holidays_view.xml	2011-04-20 11:54:41 +0000
+++ hr_holidays/hr_holidays_view.xml	2011-04-26 05:48:35 +0000
@@ -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"/>