From f3d14cd792daaa9a466e49798baad4ded51ca0f7 Mon Sep 17 00:00:00 2001 From: Mustufa Rangwala Date: Fri, 29 Oct 2010 16:02:11 +0530 Subject: [PATCH] [FIX] Account: Partner ledger report => If i have one invoice with Date and period with January-2010 (old) and it is already recoiled/paid. - Now i print the report with Include initial balance option ticked and filter by periods + include Reconciled entries Ticked - Start period => Sep-2010 - End period => Dec-2010 - If i look in the report -> i can not found that reconciled amount for the partner on Initial balance row. bzr revid: mra@mra-laptop-20101029103211-puynyojr919lnsfy --- addons/account/report/account_partner_ledger.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/addons/account/report/account_partner_ledger.py b/addons/account/report/account_partner_ledger.py index 52e012e4460..06475311bf3 100644 --- a/addons/account/report/account_partner_ledger.py +++ b/addons/account/report/account_partner_ledger.py @@ -164,6 +164,10 @@ class third_party_ledger(rml_parse.rml_parse, common_report_header): move_state = ['draft','posted'] if self.target_move == 'posted': move_state = ['posted'] + if self.reconcil: + RECONCILE_TAG = " " + else: + RECONCILE_TAG = "AND l.reconcile_id IS NULL" self.cr.execute( "SELECT COALESCE(SUM(l.debit),0.0), COALESCE(SUM(l.credit),0.0), COALESCE(sum(debit-credit), 0.0) " \ @@ -173,7 +177,7 @@ class third_party_ledger(rml_parse.rml_parse, common_report_header): "AND m.id = l.move_id " \ "AND m.state IN %s " "AND account_id IN %s" \ - "AND reconcile_id IS NULL " \ + " " + RECONCILE_TAG + " "\ "AND " + self.init_query + " ", (partner.id, tuple(move_state), tuple(self.account_ids))) return self.cr.fetchall()