Merge lp:~therp-nl/therp-backports/server-6.1-lp923645-unlink_timesheet_lines_fails into lp:therp-backports

[Stefan Rijnhart (Opener)]

This is a backport of the (as yet unreviewed) OPW fix, but only the code and not the updated record rules.\

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

Sorry, this is actually a merge proposal on the addons branch, in spite of the name of this branch.

[Holger Brunn (Therp) (hbrunn)]

review: Approve

[Ronald Portier (Therp) (rportier1962)]

As the modified unlink does not call super(), it will result in the unlink not working any more at all.

review: Needs Fixing

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

It looks trickier than it is. The hr.analytic.timesheet model inherits account.analytic.line. Upon unlinking of account.analytic.line, the hr.analytic.timesheet that inherits it is unlinked as per cascade. So I stand by this version of the fix.

[Ronald Portier (Therp) (rportier1962)]

Approve, explanation by Stefan is clear enough.

Just wondering why in the original code toremove is not simply an array that is filled with all id's to remove, but a dictionary that is later reduced to an array with the keys() method....

review: Approve

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

Good point ;-)

=== modified file 'hr_timesheet/hr_timesheet.py'
--- hr_timesheet/hr_timesheet.py	2012-02-14 12:25:20 +0000
+++ hr_timesheet/hr_timesheet.py	2012-12-18 11:24:33 +0000
@@ -74,8 +74,7 @@
         toremove = {}
         for obj in self.browse(cr, uid, ids, context=context):
             toremove[obj.line_id.id] = True
-        self.pool.get('account.analytic.line').unlink(cr, uid, toremove.keys(), context=context)
-        return super(hr_analytic_timesheet, self).unlink(cr, uid, ids, context=context)
+        return self.pool.get('account.analytic.line').unlink(cr, uid, toremove.keys(), context=context)
 
 
     def on_change_unit_amount(self, cr, uid, id, prod_id, unit_amount, company_id, unit=False, journal_id=False, context=None):