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

[Dhruti Shastri(OpenERP)]

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

Unmerged revisions

7134. By Dhruti Shastri(OpenERP) on 2013-01-24

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

=== modified file 'hr/hr.py'
--- hr/hr.py	2012-01-31 13:36:57 +0000
+++ hr/hr.py	2013-01-24 12:44:21 +0000
@@ -178,15 +178,10 @@
     }
 
     def unlink(self, cr, uid, ids, context=None):
-        resource_obj = self.pool.get('resource.resource')
         resource_ids = []
         for employee in self.browse(cr, uid, ids, context=context):
-            resource = employee.resource_id
-            if resource:
-                resource_ids.append(resource.id)
-        if resource_ids:
-            resource_obj.unlink(cr, uid, resource_ids, context=context)
-        return super(hr_employee, self).unlink(cr, uid, ids, context=context)
+            resource_ids.append(employee.resource_id.id)
+        return self.pool.get('resource.resource').unlink(cr, uid, resource_ids, context=context)
 
     def onchange_address_id(self, cr, uid, ids, address, context=None):
         if address: