openerp-dev-web team mailing list archive

["Ashvin Rathod \(OpenERP\)" <ara@xxxxxxxxxxx>]

Ashvin Rathod (OpenERP) has proposed merging lp:~openerp-dev/openobject-addons/trunk-bug-732419-ara into lp:openobject-addons.

Requested reviews:
  OpenERP Core Team (openerp)
Related bugs:
  Bug #732419 in OpenERP Addons: "[trunk] hr_holidays: Second validation"
  https://bugs.launchpad.net/openobject-addons/+bug/732419

For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-bug-732419-ara/+merge/54314

Hello,

Fix: #732419 [trunk] hr_holidays: Second validation 

Thanks,
ara
-- 
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-bug-732419-ara/+merge/54314
Your team OpenERP R&D Team is subscribed to branch lp:~openerp-dev/openobject-addons/trunk-bug-732419-ara.

=== 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-03-22 10:07:33 +0000
@@ -214,6 +214,7 @@
         self.write(cr, uid, ids, {
             'state': 'draft',
             'manager_id': False,
+            'manager_id2': False,
         })
         wf_service = netsvc.LocalService("workflow")
         for id in ids:
@@ -232,9 +233,11 @@
         obj_emp = self.pool.get('hr.employee')
         ids2 = obj_emp.search(cr, uid, [('user_id', '=', uid)])
         manager = ids2 and ids2[0] or False
-        self.write(cr, uid, ids, {'state':'validate', 'manager_id2': manager})
+        self.write(cr, uid, ids, {'state':'validate'})
         data_holiday = self.browse(cr, uid, ids)
         for record in data_holiday:
+            if record.holiday_status_id.double_validation:
+                self.write(cr, uid, ids, {'manager_id2': manager})
             if record.holiday_type == 'employee' and record.type == 'remove':
                 meeting_obj = self.pool.get('crm.meeting')
                 vals = {
@@ -281,7 +284,7 @@
         obj_emp = self.pool.get('hr.employee')
         ids2 = obj_emp.search(cr, uid, [('user_id', '=', uid)])
         manager = ids2 and ids2[0] or False
-        self.write(cr, uid, ids, {'state': 'refuse', 'manager_id2': manager})
+        self.write(cr, uid, ids, {'state': 'refuse', 'manager_id': manager})
         self.holidays_cancel(cr, uid, ids)
         return True
 

=== modified file 'hr_holidays/hr_holidays_workflow.xml'
--- hr_holidays/hr_holidays_workflow.xml	2011-01-14 00:11:01 +0000
+++ hr_holidays/hr_holidays_workflow.xml	2011-03-22 10:07:33 +0000
@@ -83,7 +83,6 @@
     <record model="workflow.transition" id="t8">
         <field name="act_from" ref="act_validate" />
         <field name="act_to" ref="act_validate1" />
-        <field name="group_id" ref="base.group_hr_user"/>
         <field name="signal">second_validate</field>
         <field name="group_id" ref="base.group_hr_user"/>
     </record>