From 4fca70b0b2f54d4d9af1f37ffbc959d542bde3b6 Mon Sep 17 00:00:00 2001 From: "Quentin (OpenERP)" Date: Tue, 26 Mar 2013 18:04:56 +0100 Subject: [PATCH] [FIX] account_analytic_analysis: wrong computation of remaining to invoice field (should not take into consideration lines for which it exists a draft invoice) bzr revid: qdp-launchpad@openerp.com-20130326170456-p4j54ar9272n05no --- .../account_analytic_analysis.py | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/addons/account_analytic_analysis/account_analytic_analysis.py b/addons/account_analytic_analysis/account_analytic_analysis.py index 64912213520..a187f9452f5 100644 --- a/addons/account_analytic_analysis/account_analytic_analysis.py +++ b/addons/account_analytic_analysis/account_analytic_analysis.py @@ -299,11 +299,10 @@ class account_analytic_account(osv.osv): res[account.id] = 0.0 sale_ids = sale_obj.search(cr, uid, [('project_id','=', account.id), ('state', '=', 'manual')], context=context) for sale in sale_obj.browse(cr, uid, sale_ids, context=context): - if not sale.invoiced: - res[account.id] += sale.amount_untaxed - for invoice in sale.invoice_ids: - if invoice.state not in ('draft', 'cancel'): - res[account.id] -= invoice.amount_untaxed + res[account.id] += sale.amount_untaxed + for invoice in sale.invoice_ids: + if invoice.state != 'cancel': + res[account.id] -= invoice.amount_untaxed return res def _timesheet_ca_invoiced_calc(self, cr, uid, ids, name, arg, context=None):