Merge lp:~openerp-dev/openobject-addons/7.0-OPW-605016-dhs into lp:openobject-addons/7.0

[Dhruti Shastri(OpenERP)]

Install hr_holidays :

Create Employee A, having related user different from 'admin'.

Create Allocation Request with Leave Type : Legal Leaves, for Employee A, approve it.

Generate 2-3 different Leave Request for this employee.

Issue Leave counter doesn't work properly.

Unmerged revisions

10030. By Dhruti Shastri(OpenERP) on 2014-05-02

[FIX][hr_holidays] : Leave counter doesn't display correct number of leaves(case : 605016)

=== modified file 'hr_holidays/hr_holidays.py'
--- hr_holidays/hr_holidays.py	2013-04-15 15:06:55 +0000
+++ hr_holidays/hr_holidays.py	2014-05-02 13:30:37 +0000
@@ -96,6 +96,11 @@
         if not ids:
             return []
         res = []
+        emp_id = context.get('employee_id',False)
+        if not emp_id:
+            res = super(hr_holidays_status, self).name_get(cr, uid, ids, context=context)
+            return res
+
         for record in self.browse(cr, uid, ids, context=context):
             name = record.name
             if not record.limit:

=== modified file 'hr_holidays/hr_holidays_view.xml'
--- hr_holidays/hr_holidays_view.xml	2013-06-11 11:57:00 +0000
+++ hr_holidays/hr_holidays_view.xml	2014-05-02 13:30:37 +0000
@@ -64,7 +64,7 @@
                     <group>
                         <group>
                             <field name="name" attrs="{'readonly':[('state','!=','draft'),('state','!=','confirm')]}"/>
-                            <field name="holiday_status_id" context="{'employee_id':employee_id}"/>
+                            <field name="holiday_status_id" context="{'employee_id':employee_id}" options='{"always_reload": True}'/>
                             <label for="number_of_days_temp" string="Duration" help="The default duration interval between the start date and the end date is 8 hours.  Feel free to adapt it to your needs."/>
                             <div>
                                 <group col="3">
@@ -109,7 +109,7 @@
                     <group>
                         <group>
                             <field name="name" required="1" attrs="{'readonly':[('state','!=','draft'),('state','!=','confirm')]}"/>
-                            <field name="holiday_status_id" context="{'employee_id':employee_id}"/>
+                            <field name="holiday_status_id" context="{'employee_id':employee_id}" options='{"always_reload": True}' />
                             <label for="number_of_days_temp"/>
                             <div>
                                 <field name="number_of_days_temp" class="oe_inline"/> days