From a7c8200828c0a01fc6214067c182f816c093b74e Mon Sep 17 00:00:00 2001 From: Joel Grand-Guillaume Date: Thu, 17 Dec 2009 17:13:33 +0100 Subject: [PATCH] [FIX] Change the computation of _total_cost_calc for account_analytic_analysis bzr revid: joel.grandguillaume@camptocamp.com-20091217161333-zickpw2wyjf7fzx5 --- .../account_analytic_analysis.py | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/addons/account_analytic_analysis/account_analytic_analysis.py b/addons/account_analytic_analysis/account_analytic_analysis.py index bbd976f8c29..8876928caa6 100644 --- a/addons/account_analytic_analysis/account_analytic_analysis.py +++ b/addons/account_analytic_analysis/account_analytic_analysis.py @@ -171,9 +171,19 @@ class account_analytic_account(osv.osv): on account_analytic_line.journal_id = account_analytic_journal.id \ where account_analytic_line.account_id IN (%s) \ and amount<0 \ + and amount_currency=0.0 \ GROUP BY account_analytic_line.account_id"""%acc_set) for account_id, sum in cr.fetchall(): res[account_id] = round(sum,2) + cr.execute("""select account_analytic_line.account_id,COALESCE(sum(amount_currency),0.0) \ + from account_analytic_line \ + join account_analytic_journal \ + on account_analytic_line.journal_id = account_analytic_journal.id \ + where account_analytic_line.account_id IN (%s) \ + and amount_currency<0 \ + GROUP BY account_analytic_line.account_id"""%acc_set) + for account_id, sum in cr.fetchall(): + res[account_id] += round(sum,2) for obj_id in ids: res.setdefault(obj_id, 0.0) for child_id in self.search(cr, uid,