From 91059bf71e73808032084516a4bf0910d3e2fb16 Mon Sep 17 00:00:00 2001 From: "Quentin (OpenERP)" Date: Thu, 19 May 2011 18:35:48 +0200 Subject: [PATCH] [FIX] account, partner ledger: report header improved in order to show 'unreconciled entries' option accordingly bzr revid: qdp-launchpad@openerp.com-20110519163548-45ee4nlru8g3hyfv --- addons/account/report/account_partner_ledger.py | 6 ++++++ addons/account/report/account_partner_ledger.rml | 4 ++-- addons/account/report/account_partner_ledger_other.rml | 4 ++-- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/addons/account/report/account_partner_ledger.py b/addons/account/report/account_partner_ledger.py index 09cb6e689da..ca0515c9f08 100644 --- a/addons/account/report/account_partner_ledger.py +++ b/addons/account/report/account_partner_ledger.py @@ -23,6 +23,7 @@ import time import re from report import report_sxw from common_report_header import common_report_header +from tools.translate import _ class third_party_ledger(report_sxw.rml_parse, common_report_header): @@ -53,6 +54,11 @@ class third_party_ledger(report_sxw.rml_parse, common_report_header): 'get_target_move': self._get_target_move, }) + def _get_filter(self, data): + if data['form']['filter'] == 'unreconciled': + return _('Unreconciled Entries') + return super(third_party_ledger, self)._get_filter(data) + def set_context(self, objects, data, ids, report_type=None): obj_move = self.pool.get('account.move.line') obj_partner = self.pool.get('res.partner') diff --git a/addons/account/report/account_partner_ledger.rml b/addons/account/report/account_partner_ledger.rml index 69faa977da1..c1ef9b22502 100644 --- a/addons/account/report/account_partner_ledger.rml +++ b/addons/account/report/account_partner_ledger.rml @@ -355,7 +355,7 @@ Journal - Filters By [[ get_filter(data)!='No Filter' and get_filter(data) ]] + Filters By [[ data['form']['filter'] not in ('filter_no','unreconciled') and get_filter(data) ]] Partner's @@ -377,7 +377,7 @@ [[', '.join([ lt or '' for lt in get_journal(data) ]) ]] - [[ get_filter(data)=='No Filter' and get_filter(data) or removeParentNode('para') ]] + [[ data['form']['filter'] in ('filter_no','unreconciled') and get_filter(data) or removeParentNode('para') ]] [[ get_filter(data)=='Date' or removeParentNode('blockTable') ]] diff --git a/addons/account/report/account_partner_ledger_other.rml b/addons/account/report/account_partner_ledger_other.rml index 22942e15c78..2f58fc8ec95 100644 --- a/addons/account/report/account_partner_ledger_other.rml +++ b/addons/account/report/account_partner_ledger_other.rml @@ -356,7 +356,7 @@ Journal - Filters By [[ get_filter(data)!='No Filter' and get_filter(data) ]] + Filters By [[ data['form']['filter'] not in ('filter_no','unreconciled') and get_filter(data) ]] Partner's @@ -378,7 +378,7 @@ [[', '.join([ lt or '' for lt in get_journal(data) ]) ]] - [[ get_filter(data)=='No Filter' and get_filter(data) or removeParentNode('para') ]] + [[ data['form']['filter'] in ('filter_no','unreconciled') and get_filter(data) or removeParentNode('para') ]] [[ get_filter(data)=='Date' or removeParentNode('blockTable') ]]