From c6d60694dc2cee44f72f4a29e9759b4834c9ec13 Mon Sep 17 00:00:00 2001 From: apa-tiny Date: Mon, 11 Oct 2010 12:38:19 +0530 Subject: [PATCH] improve bzr revid: apa@tinyerp.com-20101011070819-co8p6lneh3nbosvn --- addons/account/report/account_central_journal.rml | 18 ++++++++---------- addons/account/report/account_general_journal.rml | 2 +- addons/account/report/account_general_ledger.py | 2 +- addons/account/report/account_general_ledger.rml | 2 +- .../report/account_general_ledger_landscape.rml | 2 +- 5 files changed, 12 insertions(+), 14 deletions(-) diff --git a/addons/account/report/account_central_journal.rml b/addons/account/report/account_central_journal.rml index 7516ae8..1cdf1e8 100644 --- a/addons/account/report/account_central_journal.rml +++ b/addons/account/report/account_central_journal.rml @@ -283,7 +283,7 @@ Balance - [[ display_currency(data) or removeParentNode('blockTable') ]] + [[ display_currency(data) or removeParentNode('blockTable') ]] A/C No. Account Name @@ -293,7 +293,7 @@ Currency - [[ display_currency(data) == False or removeParentNode('blockTable') ]] + [[ display_currency(data) == False or removeParentNode('blockTable') ]] Total: @@ -302,7 +302,7 @@ [[ formatLang( sum_credit(o.period_id.id, o.journal_id.id)-sum_debit(o.period_id.id, o.journal_id.id) ) ]] [[ company.currency_id.symbol ]] - [[ display_currency(data) or removeParentNode('blockTable') ]] + [[ display_currency(data) or removeParentNode('blockTable') ]] Total: @@ -314,7 +314,7 @@
[[ repeatIn(lines(o.period_id.id,o.journal_id.id),'line') ]] - [[ display_currency(data) == False or removeParentNode('blockTable') ]] + [[ display_currency(data) == False or removeParentNode('blockTable') ]] [[ line['code'] ]] [[ line['name'] ]] @@ -323,19 +323,17 @@ [[ formatLang(line['credit']-line['debit']) ]] [[ company.currency_id.symbol ]] - [[ display_currency(data) or removeParentNode('blockTable') ]] + [[ display_currency(data) or removeParentNode('blockTable') ]] [[ line['code'] ]] [[ line['name'] ]] [[ formatLang(line['debit']) ]] [[ formatLang(line['credit'])]] - [[ formatLang(line['credit']-line['debit']) ]] [[ company.currency_id.symbol ]] - [[ line['currency_id'] and formatLang(line['amount_currency'] or '') ]] [[ line['currency_id'] and line['currency_code'] or '']] + [[ formatLang(line['credit']-line['debit']) ]] [[ company.currency_id.symbol ]] + [[ (line['currency_id']==None or line['amount_currency']==None) and removeParentNode('font') ]] [[ formatLang(line['amount_currency'] ) ]] [[ line['currency_code'] or '' ]]
- - - + diff --git a/addons/account/report/account_general_journal.rml b/addons/account/report/account_general_journal.rml index 6111321..76ff805 100644 --- a/addons/account/report/account_general_journal.rml +++ b/addons/account/report/account_general_journal.rml @@ -373,7 +373,7 @@ [[ formatLang(line['debit'] )]] [[ formatLang(line['credit']) ]] [[ formatLang(line['credit']-line['debit'] ) ]] [[ company.currency_id.symbol ]] - [[ line['currency_id'] and formatLang(line['amount_currency'] ) ]] [[ line['currency_code'] or '' ]] + [[ (line['currency_id']==None or line['amount_currency']==None) and removeParentNode('font') ]] [[ formatLang(line['amount_currency'] ) ]] [[ line['currency_code'] or '' ]] diff --git a/addons/account/report/account_general_ledger.py b/addons/account/report/account_general_ledger.py index 80a7ff4..d9920ba 100644 --- a/addons/account/report/account_general_ledger.py +++ b/addons/account/report/account_general_ledger.py @@ -160,7 +160,7 @@ class general_ledger(rml_parse.rml_parse, common_report_header): else: sql_sort='l.date' sql = """ - SELECT l.id AS lid, l.date AS ldate, j.code AS lcode, l.amount_currency,l.ref AS lref, l.name AS lname, COALESCE(l.debit,0) AS debit, COALESCE(l.credit,0) AS credit, l.period_id AS lperiod_id, l.partner_id AS lpartner_id, + SELECT l.id AS lid, l.date AS ldate, j.code AS lcode, l.currency_id,l.amount_currency,l.ref AS lref, l.name AS lname, COALESCE(l.debit,0) AS debit, COALESCE(l.credit,0) AS credit, l.period_id AS lperiod_id, l.partner_id AS lpartner_id, m.name AS move_name, m.id AS mmove_id, c.symbol AS currency_code, i.id AS invoice_id, i.type AS invoice_type, i.number AS invoice_number, diff --git a/addons/account/report/account_general_ledger.rml b/addons/account/report/account_general_ledger.rml index 7ded268..00e9350 100644 --- a/addons/account/report/account_general_ledger.rml +++ b/addons/account/report/account_general_ledger.rml @@ -334,7 +334,7 @@ [[ formatLang(line['debit']) ]] [[ formatLang(line['credit']) ]] [[ formatLang(line['progress']) ]] [[ company.currency_id.symbol ]] - [[ formatLang(line['amount_currency'] or '') ]] [[ line['currency_code'] or '']] + [[ (line['currency_id']==None or line['amount_currency']==None) and removeParentNode('font') ]] [[ formatLang(line['amount_currency'])]] [[ line['currency_code'] or '']] diff --git a/addons/account/report/account_general_ledger_landscape.rml b/addons/account/report/account_general_ledger_landscape.rml index ec205f5..4f7205a 100644 --- a/addons/account/report/account_general_ledger_landscape.rml +++ b/addons/account/report/account_general_ledger_landscape.rml @@ -295,7 +295,7 @@ [[ formatLang(line['debit'], dp='Account') ]] [[ formatLang(line['credit'], dp='Account') ]] [[ formatLang(line['progress'], dp='Account') ]] [[ company.currency_id.symbol ]] - [[ formatLang(line['amount_currency'] or '')]] [[ line['currency_code'] or '' ]] + [[ (line['currency_id']==None or line['amount_currency']==None) and removeParentNode('font') ]] [[ formatLang(line['amount_currency'])]] [[ line['currency_code'] or '']] -- 1.7.10.4