Merge lp:~therp-nl/openobject-addons/6.1-lp1049199-delete_employees_before_resources into lp:openobject-addons/6.1

[Stefan Rijnhart (Opener)]

This is a modified version of revision 6990 of
lp:~openerp-dev/openobject-addons/6.1-opw-578933-nep with comments by Olivier Dony taken into account.

[Naresh(OpenERP) (nch-openerp)]

Hello,

This bug was qualified as Not Reproducible on Trunk. If this Merge Proposal could not be merged in v6.1 at the release of v7.0, it will be closed.

Thanks,
Naresh Soni

[Naresh(OpenERP) (nch-openerp)]

based on https://code.launchpad.net/~openerp-dev/openobject-addons/6.1-opw-578933-nep/+merge/123733

[Cristian Salamea (ovnicraft)]

Hello, this will merged ?
Its a locking bug.

Unmerged revisions

7043. By Stefan Rijnhart (Opener) on 2012-10-25

[FIX] Unlink employees before unlinking the associated resources

=== modified file 'hr/hr.py'
--- hr/hr.py	2012-01-31 13:36:57 +0000
+++ hr/hr.py	2012-10-25 07:19:48 +0000
@@ -184,9 +184,10 @@
             resource = employee.resource_id
             if resource:
                 resource_ids.append(resource.id)
+        res = super(hr_employee, self).unlink(cr, uid, ids, context=context)
         if resource_ids:
             resource_obj.unlink(cr, uid, resource_ids, context=context)
-        return super(hr_employee, self).unlink(cr, uid, ids, context=context)
+        return res
 
     def onchange_address_id(self, cr, uid, ids, address, context=None):
         if address: