From cdc87602088153c5ebd993597372e485ff984899 Mon Sep 17 00:00:00 2001 From: "apa,saz" <> Date: Mon, 6 Sep 2010 11:28:32 +0530 Subject: [PATCH] [IMP]:Imprved reports. bzr revid: apa@tinyerp.com-20100906055832-qi0gbtz1aar4peh7 --- .../account/report/account_balance_sheet.rml | 14 +++--- .../account_balance_sheet_horizontal.rml | 16 +++---- .../report/account_central_journal.rml | 34 +++++++------- .../report/account_general_journal.rml | 46 +++++++++---------- addons/account/report/account_journal.rml | 36 +++++++-------- .../report/account_partner_balance.rml | 24 +++++----- .../account/report/account_partner_ledger.rml | 2 +- .../report/account_profit_horizontal.rml | 16 +++---- addons/account/report/account_profit_loss.rml | 10 ++-- addons/account/report/tax_report.rml | 6 +-- 10 files changed, 102 insertions(+), 102 deletions(-) diff --git a/addons/account/report/account_balance_sheet.rml b/addons/account/report/account_balance_sheet.rml index 79fbaed79e6..42e3913a473 100644 --- a/addons/account/report/account_balance_sheet.rml +++ b/addons/account/report/account_balance_sheet.rml @@ -197,8 +197,8 @@ End Date - [[ get_start_date(data)]] - [[get_end_date(data) ]] + [[ formatLang(get_start_date(data),date=True) ]] + [[ formatLang(get_end_date(data),date=True) ]] [[ get_filter(data)=='Periods' or removeParentNode('blockTable') ]] @@ -239,13 +239,13 @@ - [[ repeatIn(get_lines_another('liability'), 'a') ]][[ a['code'] ]][[ a['level']<4 and ( setTag('para','para',{'style':'terp_default_Bold_9'})) or removeParentNode('font') ]] + [[ repeatIn(get_lines_another('liability'), 'a') ]][[ a['code'] ]][[ a['level']<4 and ( setTag('para','para',{'style':'terp_default_Bold_9'})) or removeParentNode('font') ]] [[ '. '*(a['level']-1) ]][[ a['level']<4 and ( setTag('para','para',{'style':'terp_default_Bold_9'})) or removeParentNode('font') ]][[ a['name'] ]] - [[ a['balance'] and formatLang(abs(a['balance'])) or 0.0 ]] + [[ a['balance'] and formatLang(abs(a['balance'])) or 0.0 ]] [[ company.currency_id.symbol ]] @@ -255,7 +255,7 @@ Balance:([[ get_currency(data) ]]) - [[ formatLang(abs(sum_dr())) or 0.0 ]] + [[ formatLang(abs(sum_dr())) or 0.0 ]] [[ company.currency_id.symbol ]] @@ -283,7 +283,7 @@ [[ a['code'] ]][[ a['level']<4 and ( setTag('para','para',{'style':'terp_default_Bold_9'})) or removeParentNode('font') ]][[ a['name'] ]] - [[ a['balance'] and formatLang(abs(a['balance'])) or 0.0 ]] + [[ a['balance'] and formatLang(abs(a['balance'])) or 0.0 ]] [[ company.currency_id.symbol ]] @@ -293,7 +293,7 @@ Balance:([[ get_currency(data) ]]) - [[ formatLang(abs(sum_cr())) or 0.0 ]] + [[ formatLang(abs(sum_cr())) or 0.0 ]] [[ company.currency_id.symbol ]] diff --git a/addons/account/report/account_balance_sheet_horizontal.rml b/addons/account/report/account_balance_sheet_horizontal.rml index 2de52ddf134..39ca95412ea 100644 --- a/addons/account/report/account_balance_sheet_horizontal.rml +++ b/addons/account/report/account_balance_sheet_horizontal.rml @@ -217,8 +217,8 @@ End Date - [[ get_start_date(data)]] - [[get_end_date(data) ]] + [[ formatLang(get_start_date(data),date=True) ]] + [[ formatLang(get_end_date(data),date=True) ]] [[ get_filter(data)=='Periods' or removeParentNode('blockTable') ]] @@ -260,7 +260,7 @@ Assets - Total Amount([[ get_currency(data) ]]) + Total Amount([[ get_currency(data) ]]) @@ -272,7 +272,7 @@ [[ '. '*(a['level']-1) ]][[ a['level']<4 and ( setTag('para','para',{'style':'terp_default_Bold_9'})) or removeParentNode('font') ]][[ a['name'] ]] - [[ a['balance'] and formatLang(abs(a['balance'])) or '' ]] + [[ a['balance'] and formatLang(abs(a['balance'])) or 0.0 ]] [[ company.currency_id.symbol ]] [[ a['level']<4 and ( setTag('para','para',{'style':'terp_default_Bold_9'})) or removeParentNode('font') ]][[ a['code1'] ]] @@ -281,23 +281,23 @@ [[ '. '*(a['level1']-1) ]][[ a['level1']<4 and ( setTag('para','para',{'style':'terp_default_Bold_9'})) or removeParentNode('font') ]][[ a['name1'] ]] - [[ a['balance1'] and formatLang(abs(a['balance1'])) or 0.0 ]] + [[ a['balance1'] and formatLang(abs(a['balance1'])) or 0.0 ]] [[ company.currency_id.symbol ]] - Balance:([[ get_currency(data) ]]) + Balance:([[ get_currency(data) ]]) - [[ formatLang(abs(sum_dr())) or 0.0 ]] + [[ formatLang(abs(sum_dr())) or 0.0 ]] [[ company.currency_id.symbol ]] Balance:([[ get_currency(data) ]]) - [[ formatLang(abs(sum_cr())) or 0.0 ]] + [[ formatLang(abs(sum_cr())) or 0.0 ]] [[ company.currency_id.symbol ]] diff --git a/addons/account/report/account_central_journal.rml b/addons/account/report/account_central_journal.rml index a1d36fcdcc8..a32c13af31e 100644 --- a/addons/account/report/account_central_journal.rml +++ b/addons/account/report/account_central_journal.rml @@ -287,9 +287,9 @@ A/C No. Account Name - Debit - Credit - Balance + Debit([[ company.currency_id.code]]) + Credit([[ company.currency_id.code]]) + Balance([[ company.currency_id.code]]) [[ display_currency(data) or removeParentNode('blockTable') ]] @@ -304,20 +304,20 @@ [[ display_currency(data) == False or removeParentNode('blockTable') ]] - Total: + Total:([[ company.currency_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_credit(o.period_id.id, o.journal_id.id)-sum_debit(o.period_id.id, o.journal_id.id) ) ]] + [[ formatLang( sum_debit(o.period_id.id, o.journal_id.id)) ]] [[ company.currency_id.symbol ]] + [[ formatLang( sum_credit(o.period_id.id, o.journal_id.id)) ]] [[ company.currency_id.symbol ]] + [[ 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') ]] - Total: + Total:([[ company.currency_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_credit(o.period_id.id, o.journal_id.id)-sum_debit(o.period_id.id, o.journal_id.id) ) ]] + [[ formatLang( sum_debit(o.period_id.id, o.journal_id.id)) ]] [[ company.currency_id.symbol ]] + [[ formatLang( sum_credit(o.period_id.id, o.journal_id.id)) ]] [[ company.currency_id.symbol ]] + [[ 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 ]] @@ -327,18 +327,18 @@ [[ line['code'] ]] [[ line['name'] ]] - [[ formatLang(line['debit']) ]] - [[ formatLang(line['credit'])]] - [[ formatLang(line['credit']-line['debit']) ]] + [[ formatLang(line['debit']) ]] [[ company.currency_id.symbol ]] + [[ formatLang(line['credit'])]] [[ company.currency_id.symbol ]] + [[ formatLang(line['credit']-line['debit']) ]] [[ company.currency_id.symbol ]] [[ display_currency(data) or removeParentNode('blockTable') ]] [[ line['code'] ]] [[ line['name'] ]] - [[ formatLang(line['debit']) ]] - [[ formatLang(line['credit'])]] - [[ formatLang(line['credit']-line['debit']) ]] + [[ formatLang(line['debit']) ]] [[ company.currency_id.symbol ]] + [[ formatLang(line['credit'])]] [[ company.currency_id.symbol ]] + [[ 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 '']] diff --git a/addons/account/report/account_general_journal.rml b/addons/account/report/account_general_journal.rml index 7bdcf6e3ba3..209d4c8de6e 100644 --- a/addons/account/report/account_general_journal.rml +++ b/addons/account/report/account_general_journal.rml @@ -268,16 +268,16 @@ Code Journal Name - Debit - Credit - Balance + Debit([[ company.currency_id.code]]) + Credit([[ company.currency_id.code]]) + Balance([[ company.currency_id.code]]) - Total: + Total:([[ company.currency_id.code]]) - [[ formatLang(sum_debit()) ]] - [[ formatLang( sum_credit()) ]] - [[ formatLang( sum_debit()- sum_credit()) ]] + [[ formatLang(sum_debit()) ]] [[ company.currency_id.symbol ]] + [[ formatLang( sum_credit()) ]] [[ company.currency_id.symbol ]] + [[ formatLang( sum_debit()- sum_credit()) ]] [[ company.currency_id.symbol ]] [[ display_currency(data) or removeParentNode('blockTable') ]] @@ -290,11 +290,11 @@ Currency - Total: + Total:([[ company.currency_id.code]]) - [[ formatLang(sum_debit()) ]] - [[ formatLang( sum_credit()) ]] - [[ formatLang( sum_credit()- sum_debit()) ]] + [[ formatLang(sum_debit()) ]] [[ company.currency_id.symbol ]] + [[ formatLang( sum_credit()) ]] [[ company.currency_id.symbol ]] + [[ formatLang( sum_credit()- sum_debit()) ]] [[ company.currency_id.symbol ]] @@ -309,13 +309,13 @@ - [[ formatLang(sum_debit_period(o.id)) ]] + [[ formatLang(sum_debit_period(o.id)) ]] [[ company.currency_id.symbol ]] - [[ formatLang(sum_credit_period(o.id)) ]] + [[ formatLang(sum_credit_period(o.id)) ]] [[ company.currency_id.symbol ]] - [[ formatLang(sum_credit_period(o.id)-sum_debit_period(o.id)) ]] + [[ formatLang(sum_credit_period(o.id)-sum_debit_period(o.id)) ]] [[ company.currency_id.symbol ]] @@ -335,13 +335,13 @@ - [[ formatLang(sum_debit_period(o.id)) ]] + [[ formatLang(sum_debit_period(o.id)) ]] [[ company.currency_id.symbol ]] - [[ formatLang(sum_credit_period(o.id)) ]] + [[ formatLang(sum_credit_period(o.id)) ]] [[ company.currency_id.symbol ]] - [[ formatLang(sum_credit_period(o.id)-sum_debit_period(o.id)) ]] + [[ formatLang(sum_credit_period(o.id)-sum_debit_period(o.id)) ]] [[ company.currency_id.symbol ]] @@ -356,13 +356,13 @@ [[ line['name'] ]] - [[ formatLang(line['debit'] )]] + [[ formatLang(line['debit'] )]] [[ company.currency_id.symbol ]] - [[ formatLang(line['credit']) ]] + [[ formatLang(line['credit']) ]] [[ company.currency_id.symbol ]] - [[ formatLang(line['credit']-line['debit'] ) ]] + [[ formatLang(line['credit']-line['debit'] ) ]] [[ company.currency_id.symbol ]] @@ -373,9 +373,9 @@ [[ repeatIn(lines(o.id),'line')]] [[ line['code'] ]] [[ line['name'] ]] - [[ formatLang(line['debit'] )]] - [[ formatLang(line['credit']) ]] - [[ formatLang(line['credit']-line['debit'] ) ]] + [[ formatLang(line['debit'] )]] [[ company.currency_id.symbol ]] + [[ formatLang(line['credit']) ]] [[ company.currency_id.symbol ]] + [[ formatLang(line['credit']-line['debit'] ) ]] [[ company.currency_id.symbol ]] [[ line['currency_id'] and formatLang(line['amount_currency'] ) ]] [[ line['currency_code'] or '' ]] diff --git a/addons/account/report/account_journal.rml b/addons/account/report/account_journal.rml index 728afa2bbba..88b93e06429 100644 --- a/addons/account/report/account_journal.rml +++ b/addons/account/report/account_journal.rml @@ -253,9 +253,9 @@ A/c No. Partner Entry label - Debit - Credit - Balance + Debit([[ company.currency_id.code]]) + Credit([[ company.currency_id.code]]) + Balance([[ company.currency_id.code]]) [[o.period_id.name ]] @@ -263,9 +263,9 @@ - [[ 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_debit(o.period_id.id, o.journal_id.id))) ]] + [[ formatLang(sum_debit(o.period_id.id, o.journal_id.id)) ]] [[ company.currency_id.symbol ]] + [[ formatLang(sum_credit(o.period_id.id, o.journal_id.id)) ]] [[ company.currency_id.symbol ]] + [[ 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 ]] [[lines(o.period_id.id, o.journal_id.id) or removeParentNode('story') ]] @@ -274,9 +274,9 @@ [[ 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) ]] + [[ formatLang(line.debit) ]] [[ company.currency_id.symbol ]] + [[ formatLang(line.credit) ]] [[ company.currency_id.symbol ]] + [[ formatLang(line.credit - line.debit) ]] [[ company.currency_id.symbol ]] @@ -288,9 +288,9 @@ A/c No. Partner Entry label - Debit - Credit - Balance + Debit([[ company.currency_id.code]]) + Credit([[ company.currency_id.code]]) + Balance([[ company.currency_id.code]]) Currency @@ -299,9 +299,9 @@ - [[ 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))) ]] + [[ formatLang(sum_debit(o.period_id.id, o.journal_id.id)) ]] [[ company.currency_id.symbol ]] + [[ formatLang(sum_credit(o.period_id.id, o.journal_id.id)) ]] [[ company.currency_id.symbol ]] + [[ formatLang((sum_debit(o.period_id.id, o.journal_id.id) - sum_credit(o.period_id.id, o.journal_id.id))) ]] [[ company.currency_id.symbol ]] [[lines(o.period_id.id, o.journal_id.id) or removeParentNode('story') ]] @@ -310,9 +310,9 @@ [[ 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) ]] + [[ formatLang(line.debit) ]] [[ company.currency_id.symbol ]] + [[ formatLang(line.credit) ]] [[ company.currency_id.symbol ]] + [[ formatLang(line.credit - line.debit) ]] [[ company.currency_id.symbol ]] [[ line.currency_id and formatLang(line.amount_currency) or '' ]] [[ line.currency_id.code or '']] diff --git a/addons/account/report/account_partner_balance.rml b/addons/account/report/account_partner_balance.rml index 5c8d98a1a94..92adb65898e 100644 --- a/addons/account/report/account_partner_balance.rml +++ b/addons/account/report/account_partner_balance.rml @@ -237,24 +237,24 @@ Code (Account/Partner) Name - Debit - Credit - Balance - In dispute + Debit([[ company.currency_id.code]]) + Credi([[ company.currency_id.code]]) + Balance([[ company.currency_id.code]]) + In dispute([[ company.currency_id.code]]) - Grand total + Grand total([[ company.currency_id.code]]) - [[ formatLang(sum_debit()) ]] - [[ formatLang(sum_credit()) ]] - [[ formatLang((solde_debit()-solde_credit())) ]] - [[ formatLang(sum_litige()) ]] + [[ formatLang(sum_debit()) ]] [[ company.currency_id.symbol ]] + [[ formatLang(sum_credit()) ]] [[ company.currency_id.symbol ]] + [[ formatLang((solde_debit()-solde_credit())) ]] [[ company.currency_id.symbol ]] + [[ formatLang(sum_litige()) ]] [[ company.currency_id.symbol ]] - Balance + Balance([[ company.currency_id.code]]) - [[ formatLang(solde_debit()) ]] - [[ formatLang(solde_credit()) ]] + [[ formatLang(solde_debit()) ]] [[ company.currency_id.symbol ]] + [[ formatLang(solde_credit()) ]] [[ company.currency_id.symbol ]] diff --git a/addons/account/report/account_partner_ledger.rml b/addons/account/report/account_partner_ledger.rml index 23453145800..57ebc6f44e3 100644 --- a/addons/account/report/account_partner_ledger.rml +++ b/addons/account/report/account_partner_ledger.rml @@ -515,4 +515,4 @@ - \ No newline at end of file + diff --git a/addons/account/report/account_profit_horizontal.rml b/addons/account/report/account_profit_horizontal.rml index d22e2e18a20..6b48ab14014 100644 --- a/addons/account/report/account_profit_horizontal.rml +++ b/addons/account/report/account_profit_horizontal.rml @@ -274,7 +274,7 @@ - [[ a['balance'] and formatLang(abs(a['balance'])) or 0.0 ]] + [[ a['balance'] and formatLang(abs(a['balance'])) or 0.0 ]] [[ company.currency_id.symbol ]] @@ -287,7 +287,7 @@ - [[ a['balance1'] and formatLang(abs(a['balance1'])) or '' ]] + [[ a['balance1'] and formatLang(abs(a['balance1'])) or 0.0 ]] [[ company.currency_id.symbol ]] @@ -300,7 +300,7 @@ [[ final_result()['type'] == 'Net Profit C.F.B.L.' and final_result()['type'] or '' ]] - [[ final_result()['balance'] and final_result()['type'] == 'Net Profit C.F.B.L.' and formatLang(abs(final_result()['balance'])) or 0.0 ]] + [[ final_result()['balance'] and final_result()['type'] == 'Net Profit C.F.B.L.' and formatLang(abs(final_result()['balance'])) or 0.0 ]] [[ company.currency_id.symbol ]] @@ -309,7 +309,7 @@ [[ final_result()['type'] == 'Net Loss C.F.B.L.' and final_result()['type'] or '' ]] - [[ final_result()['balance'] and final_result()['type'] == 'Net Loss C.F.B.L.' and formatLang(abs(final_result()['balance'])) or 0.0 ]] + [[ final_result()['balance'] and final_result()['type'] == 'Net Loss C.F.B.L.' and formatLang(abs(final_result()['balance'])) or 0.0 ]] [[ company.currency_id.symbol ]] @@ -317,16 +317,16 @@ - Total:([[ get_currency(data['form']) ]]) + Total:([[ get_currency(data['form']) ]] [[ company.currency_id.code]] ) - [[ sum_dr() and formatLang(abs(sum_dr())) or 0.0 ]] + [[ sum_dr() and formatLang(abs(sum_dr())) or 0.0 ]] [[ company.currency_id.symbol ]] - Total:([[ get_currency(data['form']) ]]) + Total:([[ get_currency(data['form']) ]] [[ company.currency_id.code]]) - [[ sum_cr() and formatLang(abs(sum_cr())) or 0.0 ]] + [[ sum_cr() and formatLang(abs(sum_cr())) or 0.0 ]] [[ company.currency_id.symbol ]] diff --git a/addons/account/report/account_profit_loss.rml b/addons/account/report/account_profit_loss.rml index 316ffb1b795..5a9b81a82f6 100644 --- a/addons/account/report/account_profit_loss.rml +++ b/addons/account/report/account_profit_loss.rml @@ -267,7 +267,7 @@ - [[ a.balance and formatLang(abs(a.balance)) or 0.0 ]] + [[ a.balance and formatLang(abs(a.balance)) or 0.0 ]] [[ company.currency_id.symbol ]] @@ -280,7 +280,7 @@ [[ final_result()['type'] == 'Net Profit C.F.B.L.' and final_result()['type'] or removeParentNode('blockTable') ]] - [[ final_result()['balance'] and final_result()['type'] == 'Net Profit C.F.B.L.' and formatLang(abs(final_result()['balance'])) or 0.0 ]] + [[ final_result()['balance'] and final_result()['type'] == 'Net Profit C.F.B.L.' and formatLang(abs(final_result()['balance'])) or 0.0 ]] [[ company.currency_id.symbol ]] @@ -290,7 +290,7 @@ Total:([[ get_currency(data) ]]) - [[ sum_dr() and formatLang(abs(sum_dr())) or 0.0 ]] + [[ sum_dr() and formatLang(abs(sum_dr())) or 0.0 ]] [[ company.currency_id.symbol ]] @@ -322,7 +322,7 @@ - [[ a.balance and formatLang(abs(a.balance)) or 0.0 ]] + [[ a.balance and formatLang(abs(a.balance)) or 0.0 ]] [[ company.currency_id.symbol ]] @@ -345,7 +345,7 @@ Total:([[ get_currency(data) ]]) - [[ sum_cr() and formatLang(abs(sum_cr())) or 0.0 ]] + [[ sum_cr() and formatLang(abs(sum_cr())) or 0.0 ]] [[ company.currency_id.symbol ]] diff --git a/addons/account/report/tax_report.rml b/addons/account/report/tax_report.rml index 9a3926be67b..bbe7fd9e595 100644 --- a/addons/account/report/tax_report.rml +++ b/addons/account/report/tax_report.rml @@ -120,9 +120,9 @@ Tax Name - Debit - Credit - Tax Amount + Debit([[ company.currency_id.code]]) + Credit([[ company.currency_id.code]]) + Tax Amount([[ company.currency_id.code]]) [[ repeatIn(get_lines(data['form']['based_on'],data['form']['periods'],data['form']['company_id']), 'o') ]][[ (o['level']) ]] [[o['type']==1 and ( setTag('para','para',{'fontName':'Helvetica-Bold'}))]][[ o['code'] ]] [[ o['name'] ]]