From 05b7303ecdd78aa328847326dcc40a9c20083250 Mon Sep 17 00:00:00 2001 From: "sbh (Open ERP)" Date: Wed, 28 Jul 2010 12:37:05 +0530 Subject: [PATCH] [IMP] account :Rename the fuction bzr revid: sbh@tinyerp.com-20100728070705-exuywotl52kyp2ja --- addons/account/report/account_journal.py | 4 ++-- addons/account/report/account_journal.rml | 2 +- addons/account/report/central_journal.py | 4 ++-- addons/account/report/central_journal.rml | 12 ++++++------ addons/account/report/general_journal.py | 4 ++-- addons/account/report/general_journal.rml | 8 ++++---- 6 files changed, 17 insertions(+), 17 deletions(-) diff --git a/addons/account/report/account_journal.py b/addons/account/report/account_journal.py index 44927e1e51e..c072f59197c 100644 --- a/addons/account/report/account_journal.py +++ b/addons/account/report/account_journal.py @@ -50,7 +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, - 'get_currency':self._get_currency, + 'display_currency':self._display_currency, 'get_sortby': self._get_sortby, }) @@ -97,7 +97,7 @@ class journal_print(report_sxw.rml_parse, common_report_header): 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_currency(self, data): + def _display_currency(self, data): if data['model'] == 'account.journal.period': return True return data['form']['amount_currency'] diff --git a/addons/account/report/account_journal.rml b/addons/account/report/account_journal.rml index 18568cb79f0..37504869bb8 100644 --- a/addons/account/report/account_journal.rml +++ b/addons/account/report/account_journal.rml @@ -249,7 +249,7 @@ - [[ get_currency(data) == False or removeParentNode('blockTable') ]] + [[ display_currency(data) == False or removeParentNode('blockTable') ]] Date Voucher No diff --git a/addons/account/report/central_journal.py b/addons/account/report/central_journal.py index bb01a83b3b2..d9aeae99abd 100644 --- a/addons/account/report/central_journal.py +++ b/addons/account/report/central_journal.py @@ -48,7 +48,7 @@ class journal_print(report_sxw.rml_parse, common_report_header): 'get_sortby': self._get_sortby, 'get_start_date':self._get_start_date, 'get_end_date':self._get_end_date, - 'get_currency':self._get_currency, + 'display_currency':self._display_currency, }) def set_context(self, objects, data, ids, report_type=None): # Improve move to common default? @@ -89,7 +89,7 @@ class journal_print(report_sxw.rml_parse, common_report_header): 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_currency(self, data): + def _display_currency(self, data): if data['model']=='account.journal.period': return True return data['form']['amount_currency'] diff --git a/addons/account/report/central_journal.rml b/addons/account/report/central_journal.rml index 2e2c4892f12..2ac19381068 100644 --- a/addons/account/report/central_journal.rml +++ b/addons/account/report/central_journal.rml @@ -283,7 +283,7 @@ - [[ get_currency(data) == False or removeParentNode('blockTable') ]] + [[ display_currency(data) == False or removeParentNode('blockTable') ]] A/C No. Account Name @@ -292,7 +292,7 @@ Balance - [[ get_currency(data) or removeParentNode('blockTable') ]] + [[ display_currency(data) or removeParentNode('blockTable') ]] A/C No. Account Name @@ -305,7 +305,7 @@ - [[ get_currency(data) == False or removeParentNode('blockTable') ]] + [[ display_currency(data) == False or removeParentNode('blockTable') ]] Total: @@ -314,7 +314,7 @@ [[ formatLang( sum_credit(o.period_id.id, o.journal_id.id)-sum_credit(o.period_id.id, o.journal_id.id) ) ]] - [[ get_currency(data) or removeParentNode('blockTable') ]] + [[ display_currency(data) or removeParentNode('blockTable') ]] Total: @@ -329,7 +329,7 @@
[[ repeatIn(lines(o.period_id.id,o.journal_id.id),'line') ]] - [[ get_currency(data) == False or removeParentNode('blockTable') ]] + [[ display_currency(data) == False or removeParentNode('blockTable') ]] [[ line['code'] ]] [[ line['name'] ]] @@ -338,7 +338,7 @@ [[ formatLang(line['debit']-line['credit']) ]] - [[ get_currency(data) or removeParentNode('blockTable') ]] + [[ display_currency(data) or removeParentNode('blockTable') ]] [[ line['code'] ]] [[ line['name'] ]] diff --git a/addons/account/report/general_journal.py b/addons/account/report/general_journal.py index 044a97d9c8b..94178afa5c9 100644 --- a/addons/account/report/general_journal.py +++ b/addons/account/report/general_journal.py @@ -52,7 +52,7 @@ class journal_print(report_sxw.rml_parse, common_report_header): 'get_journal': self._get_journal, 'get_start_date':self._get_start_date, 'get_end_date':self._get_end_date, - 'get_currency':self._get_currency + 'display_currency':self._display_currency }) def set_context(self, objects, data, ids, report_type=None): # Improve move to common default? @@ -114,7 +114,7 @@ class journal_print(report_sxw.rml_parse, common_report_header): 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_currency(self, data): + def _display_currency(self, data): if data['model']=='account.journal.period': return True return data['form']['amount_currency'] diff --git a/addons/account/report/general_journal.rml b/addons/account/report/general_journal.rml index 371c0cae075..f600f4f0adf 100644 --- a/addons/account/report/general_journal.rml +++ b/addons/account/report/general_journal.rml @@ -264,7 +264,7 @@ - [[ get_currency(data)==False or removeParentNode('blockTable') ]] + [[ display_currency(data)==False or removeParentNode('blockTable') ]] Code Journal Name @@ -280,7 +280,7 @@ [[ formatLang( sum_debit()- sum_credit()) ]] - [[ get_currency(data) or removeParentNode('blockTable') ]] + [[ display_currency(data) or removeParentNode('blockTable') ]] Code Journal Name @@ -299,7 +299,7 @@
- [[ get_currency(data) == False or removeParentNode('blockTable') ]] + [[ display_currency(data) == False or removeParentNode('blockTable') ]] [[ repeatIn(lines(o.id),'line')]] [[ line['code'] ]] @@ -318,7 +318,7 @@ - [[ get_currency(data) or removeParentNode('blockTable') ]] + [[ display_currency(data) or removeParentNode('blockTable') ]] [[ repeatIn(lines(o.id),'line')]] [[ line['code'] ]] [[ line['name'] ]]