Merge lp:~avanzosc/ocb-addons/6.1 into lp:ocb-addons/6.1

[Daniel Campos (Avanzosc)]

Fix proposed for Bug #948876 - Invoice tasks creates new tasks to invoice

[Pedro Manuel Baeza (pedro.baeza)]

Hi, Daniel,

We need that the changes are exactly the same as the proposed fix for official branch (https://code.launchpad.net/~openerp-dev/openobject-addons/6.1-opw-573448-ksa/+merge/101068), because in case this patch will be merged on core, to assure there's no conflict when merging upstream revisions.

Another thing: please link this branch to the bug report and add ocb-addons project on it.

Thanks for your efforts.

Regards.

review: Needs Fixing

[Daniel Campos (Avanzosc) (dani-ds)]

Hi Pedro, I have done the changes you need. And thanks for your patience.

[Pedro Manuel Baeza (pedro.baeza)]

Thank you very much for the changes!

review: Approve (code review)

[Yann Papouin (yann-papouin)]

Thanks for this backport

review: Approve

[Holger Brunn (Therp) (hbrunn)]

review: Approve (code review)

[lp:~avanzosc/ocb-addons/6.1]

6831. By <email address hidden> on 2014-02-03

[FIX] invoice tasks creates new tasks to invoice

=== modified file 'hr_timesheet_invoice/hr_timesheet_invoice.py'
--- hr_timesheet_invoice/hr_timesheet_invoice.py	2012-01-03 12:33:39 +0000
+++ hr_timesheet_invoice/hr_timesheet_invoice.py	2014-01-22 14:56:18 +0000
@@ -193,10 +193,13 @@
         res = super(account_move_line, self).create_analytic_lines(cr, uid, ids,context=context)
         analytic_line_obj = self.pool.get('account.analytic.line')
         for move_line in self.browse(cr, uid, ids, context=context):
+            #For customer invoice, link analytic line to the invoice so it is not proposed for invoicing in Bill Tasks Work
+            invoice_id = move_line.invoice and move_line.invoice.type in ('out_invoice','out_refund') and move_line.invoice.id or False
             for line in move_line.analytic_lines:
-                toinv = line.account_id.to_invoice.id
-                if toinv:
-                    analytic_line_obj.write(cr, uid, line.id, {'to_invoice': toinv})
+                analytic_line_obj.write(cr, uid, line.id, {
+                    'invoice_id': invoice_id,
+                    'to_invoice': line.account_id.to_invoice and line.account_id.to_invoice.id or False
+                    }, context=context)
         return res
 
 account_move_line()