[FIX] hr_holidays: can not refuse an approved holidays => due to case_id was char
authorMustufa Rangwala <mra@mra-laptop>
Mon, 31 Jan 2011 06:48:45 +0000 (12:18 +0530)
committerMustufa Rangwala <mra@mra-laptop>
Mon, 31 Jan 2011 06:48:45 +0000 (12:18 +0530)
lp bug: https://launchpad.net/bugs/709130 fixed

bzr revid: mra@mra-laptop-20110131064845-2joefqn4oqh1gob1

addons/hr_holidays/hr_holidays.py

index 3e7a4a1..a7d9a11 100644 (file)
@@ -111,7 +111,7 @@ class hr_holidays(osv.osv):
 
     _columns = {
         'name': fields.char('Description', required=True, size=64),
-        'state': fields.selection([('draft', 'Draft'), ('confirm', 'Waiting Approval'), ('refuse', 'Refused'), 
+        'state': fields.selection([('draft', 'Draft'), ('confirm', 'Waiting Approval'), ('refuse', 'Refused'),
             ('validate1', 'Waiting Second Approval'), ('validate', 'Approved'), ('cancel', 'Cancelled')],
             'State', readonly=True, help='When the holiday request is created the state is \'Draft\'.\n It is confirmed by the user and request is sent to admin, the state is \'Waiting Approval\'.\
             If the admin accepts it, the state is \'Approved\'. If it is refused, the state is \'Refused\'.'),
@@ -290,7 +290,7 @@ class hr_holidays(osv.osv):
         for record in self.browse(cr, uid, ids):
             # Delete the meeting
             if record.case_id:
-                obj_crm_meeting.unlink(cr, uid, [record.case_id])
+                obj_crm_meeting.unlink(cr, uid, [int(record.case_id)])
 
             # If a category that created several holidays, cancel all related
             wf_service = netsvc.LocalService("workflow")