Merge lp:~openerp-dev/openobject-addons/6.1-opw-578933-nep into lp:openobject-addons/6.1

[Nehal Panchal (OpenERP)]

Hello,

Unable to delete the employee.

Unlink() method of hr.employee is deleting a resource associated with an employee before deleting an employee. And so employee unlink() will work on resource which has already been deleted from database.

This fixes the issue.

Thanks.

[lp:~openerp-dev/openobject-addons/6.1-opw-578933-nep]

6986. By Launchpad Translations on behalf of openerp on 2012-09-12

Launchpad automatic translations update.

6987. By Launchpad Translations on behalf of openerp on 2012-09-13

Launchpad automatic translations update.

[Olivier Dony (Odoo) (odo-openerp)]

This patch looks very wrong, now the "if resource_ids" test will never pass as 'resource_ids' is initialized to an empty list in the previous line. Please review your patches before submitting such nonsense ;-)
If you'd like to delete the employees before the resources they inherit from you should simply put the call to resource.unlink() *after* the call to super().unlink().

review: Needs Fixing

[lp:~openerp-dev/openobject-addons/6.1-opw-578933-nep]

6988. By Olivier Dony (Odoo) on 2012-09-13

[FIX] account_analytic_analysis: reminder should report consumed hours using the correct field

As the hours_quantity field is used to flag an account
as `to renew`, it should be used as well when reporting
the consumed quantity.

6989. By Launchpad Translations on behalf of openerp on 2012-09-14

Launchpad automatic translations update.

6990. By Nehal Panchal (OpenERP) on 2012-09-14

[FIX] hr : Unable to delete an employee

[Stefan Rijnhart (Opener) (stefan-opener)]

Hi,

here is a superseding merge request that takes Olivier Dony's remarks into account: lp:~therp-nl/openobject-addons/6.1-lp1049199-delete_employees_before_resources

Cheers,
Stefan.

[Naresh(OpenERP) (nch-openerp)]

Rejecting this one as the mp given in above comment is more cleaner !

Thanks,
Naresh Soni

[Stefan Rijnhart (Opener) (stefan-opener)]

Hi Naresh,

thank you. It seems my comment looks a bit exaggerated as my branch and Nehal's only show a minimal difference now. I suspect that Nehal's had not been pushed to Launchpad yet when I proposed my version as it still looked quite different then.

Cheers,
Stefan.

Unmerged revisions

6990. By Nehal Panchal (OpenERP) on 2012-09-14

[FIX] hr : Unable to delete an employee

=== modified file 'hr/hr.py'
--- hr/hr.py	2012-01-31 13:36:57 +0000
+++ hr/hr.py	2012-09-14 11:10:23 +0000
@@ -180,13 +180,15 @@
     def unlink(self, cr, uid, ids, context=None):
         resource_obj = self.pool.get('resource.resource')
         resource_ids = []
+        unlink_status = False
         for employee in self.browse(cr, uid, ids, context=context):
             resource = employee.resource_id
             if resource:
                 resource_ids.append(resource.id)
+        unlink_status = 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 unlink_status
 
     def onchange_address_id(self, cr, uid, ids, address, context=None):
         if address: