diff --git a/addons/account/report/partner_balance.py b/addons/account/report/partner_balance.py index 4411271d5b0..1a24c1fb263 100644 --- a/addons/account/report/partner_balance.py +++ b/addons/account/report/partner_balance.py @@ -47,6 +47,9 @@ class partner_balance(report_sxw.rml_parse, common_report_header): 'comma_me' : self.comma_me, 'get_fiscalyear': self._get_fiscalyear, 'get_periods':self.get_periods, + 'get_journal': self._get_journal, + 'get_filter': self._get_filter, + 'get_account': self._get_account, }) ## Compute account list one time # @@ -427,6 +430,6 @@ class partner_balance(report_sxw.rml_parse, common_report_header): def _get_currency(self, form): return pooler.get_pool(self.cr.dbname).get('res.company').browse(self.cr, self.uid, form['company_id']).currency_id.name -report_sxw.report_sxw('report.account.partner.balance', 'res.partner', 'account/report/partner_balance.rml',parser=partner_balance, header=False) +report_sxw.report_sxw('report.account.partner.balance', 'res.partner', 'account/report/partner_balance.rml',parser=partner_balance, header="internal") # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: \ No newline at end of file diff --git a/addons/account/report/partner_balance.rml b/addons/account/report/partner_balance.rml index f14fba6749c..629bebb9c8b 100644 --- a/addons/account/report/partner_balance.rml +++ b/addons/account/report/partner_balance.rml @@ -108,6 +108,39 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -161,7 +194,9 @@ - + + + @@ -179,58 +214,47 @@ - + - - Partner - - - Fiscal Year - - - Start Date - - - End Date - - - Periods - - - Printing Date - - + Chat Account + Fiscal Year + Journals + Filters By [[ get_filter(data)!='No Filter' and '' or removeParentNode('font') ]][[ get_filter(data) ]] + Partners + Printing Date - - - - - [[ data['form']['result_selection'] ]] - - - [[ get_fiscalyear(data['form']) ]] - - - [[ data['form']['date1'] ]] - - - [[ data['form']['date2'] ]] - - - [[data['form']['periods'] and get_periods(data['form']) or '']] - - - [[ formatLang(time.strftime('%Y-%m-%d %H:%M:%S'),date_time = True) ]] - - - + + [[ get_account(data) or removeParentNode('para') ]] + [[ get_fiscalyear(data) or removeParentNode('para') ]] + [[', '.join([ lt or '' for lt in get_journal(data['form']['journal_ids']) ]) ]] + + [[ 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') ]] + + + + [[ data['form']['result_selection'] ]] + [[ formatLang(time.strftime('%Y-%m-%d %H:%M:%S'), date_time = True) ]] + + - - - - - -