diff --git a/addons/account/report/central_journal.py b/addons/account/report/central_journal.py index 1029872c2ab..1b587ee411a 100644 --- a/addons/account/report/central_journal.py +++ b/addons/account/report/central_journal.py @@ -49,6 +49,7 @@ class journal_print(report_sxw.rml_parse, common_report_header): 'sum_currency_amount_account': self._sum_currency_amount_account, 'get_start_date':self._get_start_date, 'get_end_date':self._get_end_date, + 'print_data':self._print_data, }) def set_context(self, objects, data, ids, report_type=None): # Improve move to common default? @@ -90,6 +91,21 @@ class journal_print(report_sxw.rml_parse, common_report_header): else: currency_total = self.tot_currency = 0.0 return currency_total -report_sxw.report_sxw('report.account.central.journal', 'account.journal.period', 'addons/account/report/central_journal.rml', parser=journal_print, header=False) + + 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 _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 _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.central.journal', 'account.journal.period', 'addons/account/report/central_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/central_journal.rml b/addons/account/report/central_journal.rml index 49460408996..1294f0e52fd 100644 --- a/addons/account/report/central_journal.rml +++ b/addons/account/report/central_journal.rml @@ -267,10 +267,11 @@ - Chat Account + Company [[ data['model']=='account.journal.period' or removeParentNode('para') ]] + Chart of Account [[ data['model']=='ir.ui.menu' or removeParentNode('para') ]] Fiscal Year Journal - Filters By [[ get_filter(data)!='No Filter' and '' or removeParentNode('font') ]][[ get_filter(data)]] + Filters By Printing Date @@ -305,7 +306,7 @@ - [[ data['form']['amount_currency'] == False or removeParentNode('blockTable') ]] + [[ print_data(data) == False or removeParentNode('blockTable') ]] A/C No. Account Name @@ -314,7 +315,7 @@ Balance - [[ data['form']['amount_currency'] == True or removeParentNode('blockTable') ]] + [[ print_data(data) or removeParentNode('blockTable') ]] A/C No. Account Name @@ -327,7 +328,7 @@ - [[ data['form']['amount_currency'] == False or removeParentNode('blockTable') ]] + [[ print_data(data) == False or removeParentNode('blockTable') ]] Total: @@ -336,7 +337,7 @@ [[ formatLang( sum_credit(o.period_id.id, o.journal_id.id)-sum_credit(o.period_id.id, o.journal_id.id) ) ]] - [[ data['form']['amount_currency'] == True or removeParentNode('blockTable') ]] + [[ print_data(data) or removeParentNode('blockTable') ]] Total: @@ -351,7 +352,7 @@
[[ repeatIn(lines(o.period_id.id,o.journal_id.id),'line') ]] - [[ data['form']['amount_currency'] == False or removeParentNode('blockTable') ]] + [[ print_data(data) == False or removeParentNode('blockTable') ]] [[ line['code'] ]] [[ line['name'] ]] @@ -360,7 +361,7 @@ [[ formatLang(line['debit']-line['credit']) ]] - [[ data['form']['amount_currency'] == True or removeParentNode('blockTable') ]] + [[ print_data(data) or removeParentNode('blockTable') ]] [[ line['code'] ]] [[ line['name'] ]]