From b71aa291ba1e21bc186a56eeddfa7092577a7d2e Mon Sep 17 00:00:00 2001
From: "ARA (OpenERP)" <ara@tinyerp.com>
Date: Tue, 22 Mar 2011 15:34:47 +0530
Subject: [PATCH] [FIX] hr_holidays: Second validation

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

bzr revid: ara@tinyerp.com-20110322100447-ey5tkdusd3l76at5
---
 addons/hr_holidays/hr_holidays.py           | 7 +++++--
 addons/hr_holidays/hr_holidays_workflow.xml | 1 -
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/addons/hr_holidays/hr_holidays.py b/addons/hr_holidays/hr_holidays.py
index 131d38d7001..2ed44bc75c7 100644
--- a/addons/hr_holidays/hr_holidays.py
+++ b/addons/hr_holidays/hr_holidays.py
@@ -214,6 +214,7 @@ class hr_holidays(osv.osv):
         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 @@ class hr_holidays(osv.osv):
         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 @@ class hr_holidays(osv.osv):
         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
 
diff --git a/addons/hr_holidays/hr_holidays_workflow.xml b/addons/hr_holidays/hr_holidays_workflow.xml
index 888b3dd629d..8443ddb68d9 100644
--- a/addons/hr_holidays/hr_holidays_workflow.xml
+++ b/addons/hr_holidays/hr_holidays_workflow.xml
@@ -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>