From cce9ee87fe6dfe4b44eb2dc7180b0a66ff9d685b Mon Sep 17 00:00:00 2001 From: apa-tiny Date: Mon, 13 Sep 2010 11:41:10 +0530 Subject: [PATCH] Accounting/Reporting/Generic Reporting/Partner Accounts/ Print Partner Ledger * With Includes Initial Balance * float format is not ok.(0.0 instaed of 0.00) * Without Currency * The currency code and symbol is missing on the value (from the company) * With Currency * remove currency code with column currency * The currency code and symbol is missing on the value (from the company) bzr revid: apa@tinyerp.com-20100913061110-6b1pr441m7oy4a7t --- .../account/report/account_partner_ledger.rml | 56 +++++++++---------- .../report/account_partner_ledger_other.rml | 56 +++++++++---------- 2 files changed, 53 insertions(+), 59 deletions(-) diff --git a/addons/account/report/account_partner_ledger.rml b/addons/account/report/account_partner_ledger.rml index 57ebc6f44e3..c945e1a656e 100644 --- a/addons/account/report/account_partner_ledger.rml +++ b/addons/account/report/account_partner_ledger.rml @@ -304,13 +304,13 @@ Balance Brought Forward - [[ formatLang((sum_debit())) ]] + [[ formatLang((sum_debit())) ]] [[ company.currency_id.symbol ]] - [[ formatLang((sum_credit())) ]] + [[ formatLang((sum_credit())) ]] [[ company.currency_id.symbol ]] - [[ formatLang((sum_debit() - sum_credit())) ]] + [[ formatLang((sum_debit() - sum_credit())) ]] [[ company.currency_id.symbol ]] @@ -324,13 +324,13 @@ [[ p.ref ]] - [[ p.name ]] - [[ formatLang((sum_debit_partner(p))) ]] + [[ formatLang((sum_debit_partner(p))) ]] [[ company.currency_id.symbol ]] - [[ formatLang((sum_credit_partner(p))) ]] + [[ formatLang((sum_credit_partner(p))) ]] [[ company.currency_id.symbol ]] - [[ formatLang((sum_debit_partner(p) - sum_credit_partner(p))) ]] + [[ formatLang((sum_debit_partner(p) - sum_credit_partner(p))) ]] [[ company.currency_id.symbol ]] @@ -338,13 +338,13 @@ Initial Balance - [[ get_intial_balance(p)[0][0] or 0.0 ]] + [[ formatLang(get_intial_balance(p)[0][0])]] [[ company.currency_id.symbol ]] - [[ get_intial_balance(p)[0][1] or 0.0 ]] + [[ formatLang(get_intial_balance(p)[0][1]) ]] [[ company.currency_id.symbol ]] - [[ get_intial_balance(p)[0][2] or 0.0 ]] + [[ formatLang(get_intial_balance(p)[0][2]) ]] [[ company.currency_id.symbol ]] @@ -368,13 +368,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['progress'])) ]] + [[ formatLang((line['progress'])) ]] [[ company.currency_id.symbol ]] @@ -382,10 +382,10 @@ - [[ display_currency(data) == True or removeParentNode('blockTable') ]] + [[ display_currency(data) == True or removeParentNode('blockTable') ]] - Date + Datefff JNRL @@ -403,10 +403,10 @@ Credit([[ get_currency(data) ]]) - Balance ([[ get_currency(data) ]]) + Balance([[ get_currency(data) ]]) - Currency ([[ get_currency(data) ]]) + Currency @@ -419,13 +419,13 @@ Balance Brought Forward - [[ formatLang((sum_debit())) ]] + [[ formatLang((sum_debit())) ]] [[ company.currency_id.symbol ]] - [[ formatLang((sum_credit())) ]] + [[ formatLang((sum_credit())) ]] [[ company.currency_id.symbol ]] - [[ formatLang((sum_debit() - sum_credit())) ]] + [[ formatLang((sum_debit() - sum_credit())) ]] [[ company.currency_id.symbol ]] @@ -441,13 +441,13 @@ [[ p.ref ]] - [[ p.name ]] - [[ formatLang((sum_debit_partner(p))) ]] + [[ formatLang((sum_debit_partner(p))) ]] [[ company.currency_id.symbol ]] - [[ formatLang((sum_credit_partner(p))) ]] + [[ formatLang((sum_credit_partner(p))) ]] [[ company.currency_id.symbol ]] - [[ formatLang((sum_debit_partner(p) - sum_credit_partner(p))) ]] + [[ formatLang((sum_debit_partner(p) - sum_credit_partner(p))) ]] [[ company.currency_id.symbol ]] @@ -460,13 +460,13 @@ Initial Balance - [[ get_intial_balance(p)[0][0] or 0.0 ]] + [[ formatLang(get_intial_balance(p)[0][0]) ]] [[ company.currency_id.symbol ]] - [[ get_intial_balance(p)[0][1] or 0.0 ]] + [[ formatLang(get_intial_balance(p)[0][1]) ]] [[ company.currency_id.symbol ]] - [[ get_intial_balance(p)[0][2] or 0.0 ]] + [[ formatLang(get_intial_balance(p)[0][2]) ]] [[ company.currency_id.symbol ]] @@ -493,13 +493,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['progress'])) ]] + [[ formatLang((line['progress'])) ]] [[ company.currency_id.symbol ]] [[ formatLang(line['amount_currency'] or '') ]] [[ line['currency_code'] or '' ]] diff --git a/addons/account/report/account_partner_ledger_other.rml b/addons/account/report/account_partner_ledger_other.rml index 1869144cfc9..1df14631ca4 100644 --- a/addons/account/report/account_partner_ledger_other.rml +++ b/addons/account/report/account_partner_ledger_other.rml @@ -324,12 +324,6 @@ - - - - - - @@ -462,13 +456,13 @@ Balance Brought Forward - [[ formatLang((sum_debit())) ]] + [[ formatLang((sum_debit())) ]] [[ company.currency_id.symbol ]] - [[ formatLang((sum_credit())) ]] + [[ formatLang((sum_credit())) ]] [[ company.currency_id.symbol ]] - [[ formatLang((sum_debit() - sum_credit())) ]] + [[ formatLang((sum_debit() - sum_credit())) ]] [[ company.currency_id.symbol ]] @@ -482,13 +476,13 @@ [[ p.ref ]] - [[ p.name ]] - [[ formatLang((sum_debit_partner(p))) ]] + [[ formatLang((sum_debit_partner(p))) ]] [[ company.currency_id.symbol ]] - [[ formatLang((sum_credit_partner(p))) ]] + [[ formatLang((sum_credit_partner(p))) ]] [[ company.currency_id.symbol ]] - [[ formatLang((sum_debit_partner(p) - sum_credit_partner(p))) ]] + [[ formatLang((sum_debit_partner(p) - sum_credit_partner(p))) ]] [[ company.currency_id.symbol ]] @@ -496,13 +490,13 @@ Initial Balance - [[ get_intial_balance(p)[0][0] or 0.0 ]] + [[ formatLang(get_intial_balance(p)[0][0])]] [[ company.currency_id.symbol ]] - [[ get_intial_balance(p)[0][1] or 0.0 ]] + [[ formatLang(get_intial_balance(p)[0][1]) ]] [[ company.currency_id.symbol ]] - [[ get_intial_balance(p)[0][2] or 0.0 ]] + [[ formatLang(get_intial_balance(p)[0][2]) ]] [[ company.currency_id.symbol ]] @@ -523,13 +517,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['progress'])) ]] + [[ formatLang((line['progress'])) ]] [[ company.currency_id.symbol ]] @@ -559,7 +553,7 @@ Balance([[ get_currency(data) ]]) - Currency ([[ get_currency(data) ]]) + Currency @@ -570,13 +564,13 @@ Balance Brought Forward - [[ formatLang((sum_debit())) ]] + [[ formatLang((sum_debit())) ]] [[ company.currency_id.symbol ]] - [[ formatLang((sum_credit())) ]] + [[ formatLang((sum_credit())) ]] [[ company.currency_id.symbol ]] - [[ formatLang((sum_debit() - sum_credit())) ]] + [[ formatLang((sum_debit() - sum_credit())) ]] [[ company.currency_id.symbol ]] @@ -594,13 +588,13 @@ [[ p.ref ]] - [[ p.name ]] - [[ formatLang((sum_debit_partner(p))) ]] + [[ formatLang((sum_debit_partner(p))) ]] [[ company.currency_id.symbol ]] - [[ formatLang((sum_credit_partner(p))) ]] + [[ formatLang((sum_credit_partner(p))) ]] [[ company.currency_id.symbol ]] - [[ formatLang((sum_debit_partner(p) - sum_credit_partner(p))) ]] + [[ formatLang((sum_debit_partner(p) - sum_credit_partner(p))) ]] [[ company.currency_id.symbol ]] @@ -613,13 +607,13 @@ Initial Balance - [[ get_intial_balance(p)[0][0] or 0.0 ]] + [[ formatLang(get_intial_balance(p)[0][0]) ]] [[ company.currency_id.symbol ]] - [[ get_intial_balance(p)[0][1] or 0.0 ]] + [[ formatLang(get_intial_balance(p)[0][1]) ]] [[ company.currency_id.symbol ]] - [[ get_intial_balance(p)[0][2] or 0.0 ]] + [[ formatLang(get_intial_balance(p)[0][2]) ]] [[ company.currency_id.symbol ]] @@ -643,13 +637,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['progress'])) ]] + [[ formatLang((line['progress'])) ]] [[ company.currency_id.symbol ]] [[ formatLang(line['amount_currency'] or '') ]] [[ line['currency_code'] or '' ]]