Merge lp:~openerp-dev/openobject-addons/6.1-opw-584716-dhs into lp:openobject-addons/6.1

Proposed by Dhruti Shastri(OpenERP)
Status: Needs review
Proposed branch: lp:~openerp-dev/openobject-addons/6.1-opw-584716-dhs
Merge into: lp:openobject-addons/6.1
Diff against target: 21 lines (+2/-7)
1 file modified
hr/hr.py (+2/-7)
To merge this branch: bzr merge lp:~openerp-dev/openobject-addons/6.1-opw-584716-dhs
Reviewer Review Type Date Requested Status
Naresh(OpenERP) Pending
Review via email: mp+144692@code.launchpad.net

Description of the change

This branch contains the fix described on Bug : https://bugs.launchpad.net/openobject-addons/+bug/1085787 back-ported from fix for 7.0

To post a comment you must log in.

Unmerged revisions

7134. By Dhruti Shastri(OpenERP)

[hr] : deletion of employee throwing error (case:584716)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'hr/hr.py'
2--- hr/hr.py 2012-01-31 13:36:57 +0000
3+++ hr/hr.py 2013-01-24 12:44:21 +0000
4@@ -178,15 +178,10 @@
5 }
6
7 def unlink(self, cr, uid, ids, context=None):
8- resource_obj = self.pool.get('resource.resource')
9 resource_ids = []
10 for employee in self.browse(cr, uid, ids, context=context):
11- resource = employee.resource_id
12- if resource:
13- resource_ids.append(resource.id)
14- if resource_ids:
15- resource_obj.unlink(cr, uid, resource_ids, context=context)
16- return super(hr_employee, self).unlink(cr, uid, ids, context=context)
17+ resource_ids.append(employee.resource_id.id)
18+ return self.pool.get('resource.resource').unlink(cr, uid, resource_ids, context=context)
19
20 def onchange_address_id(self, cr, uid, ids, address, context=None):
21 if address: