From dc19c5561d1e159c2f03498bead9ef602ab62512 Mon Sep 17 00:00:00 2001 From: "sbh (Open ERP)" Date: Fri, 16 Jul 2010 16:19:39 +0530 Subject: [PATCH] [IMP] account: if secondary currency exist then disply bzr revid: sbh@tinyerp.com-20100716104939-zsmq2em1wwe3221a --- addons/account/report/central_journal.rml | 4 ++-- addons/account/report/general_journal.rml | 4 ++-- addons/account/report/general_ledger_landscape.rml | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/addons/account/report/central_journal.rml b/addons/account/report/central_journal.rml index 326f2369b21..9cd76c140eb 100644 --- a/addons/account/report/central_journal.rml +++ b/addons/account/report/central_journal.rml @@ -343,7 +343,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_credit(o.period_id.id, o.journal_id.id)-sum_credit(o.period_id.id, o.journal_id.id) ) ]] - [[formatLang(sum_currency_amount_account(o, data['form'])) ]] + [[ o.currency_id and formatLang(sum_currency_amount_account(o, data['form'])) +o.currency_id.code or '' ]] @@ -367,7 +367,7 @@ [[ formatLang(line['debit']) ]] [[ formatLang(line['credit'])]] [[ formatLang(line['debit']-line['credit']) ]] - [[ formatLang(line['amount_currency']) ]] [[ line['currency_code'] or '']] + [[ formatLang(line['amount_currency']) or '' ]] [[ line['currency_code'] or '']] diff --git a/addons/account/report/general_journal.rml b/addons/account/report/general_journal.rml index 9f1724e3dc9..5c2e625cbd1 100644 --- a/addons/account/report/general_journal.rml +++ b/addons/account/report/general_journal.rml @@ -319,7 +319,7 @@ [[ formatLang(sum_debit()) ]] [[ formatLang( sum_credit()) ]] [[ formatLang( sum_debit()- sum_credit()) ]] - [[formatLang(sum_currency_amount_account(o, data['form'])) ]] + [[ o.currency_id and formatLang(sum_currency_amount_account(o, data['form'])) +o.currency_id.code or '' ]] @@ -354,7 +354,7 @@ [[ formatLang(line['debit'] )]] [[ formatLang(line['credit']) ]] [[ formatLang(line['debit']-line['debit'] ) ]] - [[ formatLang(line['amount_currency'] ) ]] [[ line['currency_code'] ]] + [[ formatLang(line['amount_currency']) or '' ]] [[ line['currency_code'] or '' ]] diff --git a/addons/account/report/general_ledger_landscape.rml b/addons/account/report/general_ledger_landscape.rml index 4d71bd6f237..a35d63b6005 100644 --- a/addons/account/report/general_ledger_landscape.rml +++ b/addons/account/report/general_ledger_landscape.rml @@ -313,7 +313,7 @@ [[formatLang(sum_debit_account(o, data['form'])) ]] [[formatLang(sum_credit_account(o, data['form'])) ]] [[formatLang(sum_balance_account(o, data['form'])) ]] - [[sum_currency_amount_account(o, data['form']) ]] + [[ o.currency_id and sum_currency_amount_account(o, data['form']) +o.currency_id.code or '' ]]