From 5004d0011ec9a4b02969f23cf1a3fb47fcc7d0dc Mon Sep 17 00:00:00 2001 From: "sbh (Open ERP)" Date: Tue, 20 Jul 2010 14:38:11 +0530 Subject: [PATCH] [Fix] account: Improve the account_journal report bzr revid: sbh@tinyerp.com-20100720090811-t4ss2szosssmkxxe --- addons/account/report/account_journal.py | 12 ++++++- addons/account/report/account_journal.rml | 40 +++-------------------- 2 files changed, 15 insertions(+), 37 deletions(-) diff --git a/addons/account/report/account_journal.py b/addons/account/report/account_journal.py index 75d66ee099b..f2c5f37dbab 100644 --- a/addons/account/report/account_journal.py +++ b/addons/account/report/account_journal.py @@ -50,6 +50,7 @@ class journal_print(report_sxw.rml_parse, common_report_header): 'get_fiscalyear': self._get_fiscalyear, 'get_start_date':self._get_start_date, 'get_end_date':self._get_end_date, + 'print_data':self._print_data, }) @@ -98,12 +99,21 @@ class journal_print(report_sxw.rml_parse, common_report_header): else: currency_total = self.tot_currency = 0.0 return currency_total - + + def _get_fiscalyear(self, data): + if data['model']=='account.journal.period': + return self.pool.get('account.journal.period').browse(self.cr, self.uid, data['id']).fiscalyear_id.name + return super(journal_print ,self)._get_fiscalyear(data) + def _get_account(self, data): if data['model'] == 'account.journal.period': return self.pool.get('account.journal.period').browse(self.cr, self.uid, data['id']).company_id.name return super(journal_print ,self)._get_account(data) + def _print_data(self, data): + if data['model']=='account.journal.period': + return self.pool.get('account.journal.period').browse(self.cr, self.uid, data['id']).journal_id.currency or False + return data['form']['amount_currency'] report_sxw.report_sxw('report.account.journal.period.print', 'account.journal.period', 'addons/account/report/account_journal.rml', parser=journal_print, header='internal') # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: \ No newline at end of file diff --git a/addons/account/report/account_journal.rml b/addons/account/report/account_journal.rml index 5ebc311c5ac..178126e2c65 100644 --- a/addons/account/report/account_journal.rml +++ b/addons/account/report/account_journal.rml @@ -215,7 +215,7 @@ [[ get_account(data) or '' ]] - [[ get_fiscalyear(data) or data['model']=='account.journal.period' and o.fiscalyear_id.name ]] + [[ get_fiscalyear(data) or '' ]] [[o.journal_id.name ]] [[ get_filter(data)=='No Filter' and get_filter(data) or removeParentNode('para') ]] [[ get_filter(data)=='Date' or removeParentNode('blockTable') ]] @@ -249,7 +249,7 @@ - [[ data and 'form' in data and data['form']['amount_currency'] == False or removeParentNode('blockTable') ]] + [[ print_data(data) == False or removeParentNode('blockTable') ]] Date Voucher No @@ -282,40 +282,8 @@ - [[ data['model'] =='account.journal.period' or removeParentNode('blockTable') ]] - - Date - Voucher No - A/c No. - Third party - Entry label - Debit - Credit - Balance - - - [[o.period_id.name ]] - [[ o.journal_id.code ]] - - - - [[ formatLang(sum_debit(o.period_id.id, o.journal_id.id)) ]] - [[ formatLang(sum_credit(o.period_id.id, o.journal_id.id)) ]] - [[ formatLang((sum_debit(o.period_id.id, o.journal_id.id) - sum_credit(o.period_id.id, o.journal_id.id))) ]] - - - [[ repeatIn(lines(o.period_id.id, o.journal_id.id), 'line') ]][[ formatLang(line.date,date=True) ]] - [[ line.ref ]] - [[ line.account_id.code ]] - [[ line.partner_id and line.partner_id.name ]] - [[ line.name ]] - [[ formatLang(line.debit) ]] - [[ formatLang(line.credit) ]] - [[ formatLang(line.credit - line.debit) ]] - - - [[ data and 'form' in data and data['form']['amount_currency'] == True or removeParentNode('blockTable') ]] + [[ print_data(data) or removeParentNode('blockTable') ]] Date Voucher No @@ -336,7 +304,7 @@ [[ formatLang(sum_debit(o.period_id.id, o.journal_id.id)) ]] [[ formatLang(sum_credit(o.period_id.id, o.journal_id.id)) ]] [[ formatLang((sum_debit(o.period_id.id, o.journal_id.id) - sum_credit(o.period_id.id, o.journal_id.id))) ]] - [[ o.journal_id.currency and formatLang(sum_currency_amount_account(o, data['form'])) + o.journal_id.currency.code or '' ]] + [[ o.journal_id.currency and formatLang(sum_currency_amount_account(o,data)) + o.journal_id.currency.code or '' ]] [[ repeatIn(lines(o.period_id.id, o.journal_id.id), 'line') ]][[ formatLang(line.date,date=True) ]]