From 6578c17a613b959d8368a29cc9195b084c1116d9 Mon Sep 17 00:00:00 2001 From: apa-tiny Date: Mon, 3 Nov 2008 18:36:19 +0530 Subject: [PATCH] grand total prob solved bzr revid: patelamit2003@gmail.com-20081103130619-gogp0b41e4qmgpnm --- addons/account/report/partner_balance.py | 8 +++----- addons/account/report/partner_balance.rml | 4 ++-- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/addons/account/report/partner_balance.py b/addons/account/report/partner_balance.py index b1fa9ae24b0..4a749dd97d0 100644 --- a/addons/account/report/partner_balance.py +++ b/addons/account/report/partner_balance.py @@ -336,6 +336,7 @@ class partner_balance(report_sxw.rml_parse): # completearray.append(new_tot) + new_header['debit'] = tot_debit new_header['credit'] = tot_credit new_header['scredit'] = tot_scredit @@ -371,12 +372,9 @@ class partner_balance(report_sxw.rml_parse): r['type'] = 1 # r['balance'] = float(r['sdebit']) - float(r['scredit']) - tot_debit = r['debit'] - tot_credit = r['credit'] - tot_scredit = r['scredit'] - tot_sdebit = r['sdebit'] - tot_enlitige = (r['enlitige'] or 0.0) + # + completearray.append(r) if cleanarray[i]['account_id'] == cleanarray[i-1]['account_id']: diff --git a/addons/account/report/partner_balance.rml b/addons/account/report/partner_balance.rml index 2d94d131846..32cea05fc3a 100644 --- a/addons/account/report/partner_balance.rml +++ b/addons/account/report/partner_balance.rml @@ -327,13 +327,13 @@ [[ sum_credit(data) or '0.0' ]] - [[ (sum_scredit(data)-sum_sdebit(data)) or '0.0' ]] + [[ (solde_debit(data)-solde_credit(data)) or '0.0' ]] [[ sum_litige(data) or '0.0' ]] -