From 97f1c7fe178e5feb09237edbb5ff76d253492002 Mon Sep 17 00:00:00 2001 From: "sbh (Open ERP)" Date: Thu, 15 Jul 2010 19:07:24 +0530 Subject: [PATCH] [IMP]: Imporve the account_balance report bzr revid: sbh@tinyerp.com-20100715133724-lqa7vhtzm68s90r5 --- addons/account/report/account_balance.py | 3 + addons/account/report/account_balance.rml | 111 +++++++++++++--------- addons/account/report/general_ledger.rml | 1 + 3 files changed, 71 insertions(+), 44 deletions(-) diff --git a/addons/account/report/account_balance.py b/addons/account/report/account_balance.py index 3fa3df061b0..79fdbdaf85e 100644 --- a/addons/account/report/account_balance.py +++ b/addons/account/report/account_balance.py @@ -50,6 +50,9 @@ class account_balance(report_sxw.rml_parse, common_report_header): 'sum_credit': self._sum_credit, 'get_fiscalyear':self._get_fiscalyear, 'get_periods':self.get_periods, + 'get_filter': self._get_filter, + 'get_start_period': self.get_start_period, + 'get_end_period': self.get_end_period }) self.context = context diff --git a/addons/account/report/account_balance.rml b/addons/account/report/account_balance.rml index 9629c5a3095..f719382debc 100644 --- a/addons/account/report/account_balance.rml +++ b/addons/account/report/account_balance.rml @@ -56,6 +56,38 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -64,6 +96,7 @@ + @@ -132,7 +165,7 @@ - + @@ -187,51 +220,41 @@ - + - - Fiscal Year - - - Start Date - - - End Date - - - Display Account - - - Periods - - - Printing Date - + Fiscal Year + Display Account + Filters By [[ get_filter(data)!='No Filter' and '' or removeParentNode('font') ]][[ get_filter(data) ]] + Printing Date - - - - - [[ get_fiscalyear(data) ]] - - - [[ data['form']['date_from'] ]] - - - [[ data['form']['date_to'] ]] - - - [[ (data['form']['display_account']=='bal_all' and 'All') or (data['form']['display_account']=='bal_mouvement' and 'With movements') or 'With balance is not equal to 0']] - - - [[data['form']['periods'] and get_periods(data['form']) or '']] - - - [[ formatLang(time.strftime('%Y-%m-%d %H:%M:%S'),date_time=True) ]] - - - - + + [[ get_fiscalyear(data) or removeParentNode('para') ]] + [[ (data['form']['display_account']=='bal_all' and 'All') or (data['form']['display_account']=='bal_mouvement' and 'With movements') or 'With balance is not equal to 0']] + [[ get_filter(data)=='No Filter' and get_filter(data) or removeParentNode('para') ]] + [[ get_filter(data)=='Date' or removeParentNode('blockTable') ]] + + Start Date + End Date + + + [[ data['form']['date_from'] ]] + [[ data['form']['date_to'] ]] + + + [[ get_filter(data)=='Periods' or removeParentNode('blockTable') ]] + + Start Period + End Period + + + [[ get_start_period(data) or removeParentNode('para') ]] + [[ get_end_period(data) or removeParentNode('para') ]] + + + + [[ formatLang(time.strftime('%Y-%m-%d %H:%M:%S'), date_time = True) ]] + + diff --git a/addons/account/report/general_ledger.rml b/addons/account/report/general_ledger.rml index 97baad1d263..56f85c6cda3 100644 --- a/addons/account/report/general_ledger.rml +++ b/addons/account/report/general_ledger.rml @@ -201,6 +201,7 @@ +