Merge lp:~openerp-dev/openobject-addons/trunk-bug-1085787-rma into lp:openobject-addons

[Randhir Mayatra (OpenERP)]

Hello Sir,
  I have fix the problem of delete employee in hr.

Thank you.

[Victor Tabuenca (OpenERP) (vta-openerp)]

Looking to the method's code:
  - I think it doesn't make sense to test the existence of the required field 'resource_id') and,
  - the definition of the field 'resource_id' ('ondelete=cascade')

In my opinion, unlinking the resource should be enough (just let the RDBS to do its job).

Although the patch kind of fixes the bug, because it returns before the call to unlink an employee already deleted by the RDBS (calling super is the cause of the traceback), I think it's more appropriate to fix the method's code in a more suitable manner.

I reject the proposal.

review: Disapprove

Unmerged revisions

8193. By Randhir Mayatra (OpenERP) on 2012-12-04

[FIX] solve the error while delete employee in hr

=== modified file 'hr/hr.py'
--- hr/hr.py	2012-11-13 15:03:37 +0000
+++ hr/hr.py	2012-12-04 09:31:23 +0000
@@ -229,7 +229,7 @@
             if resource:
                 resource_ids.append(resource.id)
         if resource_ids:
-            resource_obj.unlink(cr, uid, resource_ids, context=context)
+            return resource_obj.unlink(cr, uid, resource_ids, context=context)
         return super(hr_employee, self).unlink(cr, uid, ids, context=context)
 
     def onchange_address_id(self, cr, uid, ids, address, context=None):