From 9be73e60442fa81facfa0f6d2e564c1bf0e36f91 Mon Sep 17 00:00:00 2001 From: "sbh (Open ERP)" Date: Thu, 29 Jul 2010 17:46:42 +0530 Subject: [PATCH] [IMP] account : Improve the report bzr revid: sbh@tinyerp.com-20100729121642-xg3v8e6f3i5nu17v --- addons/account/report/third_party_ledger.rml | 64 ++++++++++--------- .../report/third_party_ledger_other.rml | 64 ++++++++++--------- 2 files changed, 66 insertions(+), 62 deletions(-) diff --git a/addons/account/report/third_party_ledger.rml b/addons/account/report/third_party_ledger.rml index dc66cd57031..0c95db6fce9 100644 --- a/addons/account/report/third_party_ledger.rml +++ b/addons/account/report/third_party_ledger.rml @@ -275,20 +275,7 @@ [[ display_currency(data) == False or removeParentNode('blockTable') ]] - - [[ data['form']['initial_balance'] or removeParentNode('tr') ]] - Initial Balance - - - [[ get_intial_balance(p,data)[0][0] or 0.0 ]] - - - [[ get_intial_balance(p,data)[0][1] or 0.0 ]] - - - [[ get_intial_balance(p,data)[0][2] or 0.0 ]] - - + [[ p.ref ]] - [[ p.name ]] @@ -303,6 +290,20 @@ [[ formatLang((sum_debit_partner(p,data) - sum_credit_partner(p,data))) ]] + + [[ data['form']['initial_balance'] or removeParentNode('tr') ]] + Initial Balance + + + [[ get_intial_balance(p,data)[0][0] or 0.0 ]] + + + [[ get_intial_balance(p,data)[0][1] or 0.0 ]] + + + [[ get_intial_balance(p,data)[0][2] or 0.0 ]] + + @@ -391,23 +392,7 @@ [[ display_currency(data) == True or removeParentNode('blockTable') ]] - - [[display_initial_balance(data) or removeParentNode('tr') ]] - Initial Balance - - - [[ get_intial_balance(p,data)[0][0] or 0.0 ]] - - - [[ get_intial_balance(p,data)[0][1] or 0.0 ]] - - - [[ get_intial_balance(p,data)[0][2] or 0.0 ]] - - - - - + [[ p.ref ]] - [[ p.name ]] @@ -427,6 +412,23 @@ + + [[display_initial_balance(data) or removeParentNode('tr') ]] + Initial Balance + + + [[ get_intial_balance(p,data)[0][0] or 0.0 ]] + + + [[ get_intial_balance(p,data)[0][1] or 0.0 ]] + + + [[ get_intial_balance(p,data)[0][2] or 0.0 ]] + + + + + diff --git a/addons/account/report/third_party_ledger_other.rml b/addons/account/report/third_party_ledger_other.rml index 8be4c0f2e9b..aa3252a8eb5 100644 --- a/addons/account/report/third_party_ledger_other.rml +++ b/addons/account/report/third_party_ledger_other.rml @@ -455,20 +455,7 @@
[[ repeatIn(objects, 'p') ]] [[ setLang(p.lang) ]] [[ display_currency(data) == False or removeParentNode('blockTable') ]] - - [[ display_initial_balance(data) or removeParentNode('tr') ]] - Initial Balance - - - [[ get_intial_balance(p,data)[0][0] or 0.0 ]] - - - [[ get_intial_balance(p,data)[0][1] or 0.0 ]] - - - [[ get_intial_balance(p,data)[0][2] or 0.0 ]] - - + [[ p.ref ]] - [[ p.name ]] @@ -483,6 +470,20 @@ [[ formatLang((sum_debit_partner(p,data) - sum_credit_partner(p,data))) ]] + + [[ display_initial_balance(data) or removeParentNode('tr') ]] + Initial Balance + + + [[ get_intial_balance(p,data)[0][0] or 0.0 ]] + + + [[ get_intial_balance(p,data)[0][1] or 0.0 ]] + + + [[ get_intial_balance(p,data)[0][2] or 0.0 ]] + +
[[ repeatIn(lines(p,data), 'line') ]] @@ -566,23 +567,7 @@
[[ repeatIn(objects, 'p') ]] [[ setLang(p.lang) ]] [[ display_currency(data) == True or removeParentNode('blockTable') ]] - - [[ data['form']['initial_balance'] or removeParentNode('tr') ]] - Initial Balance - - - [[ get_intial_balance(p,data)[0][0] or 0.0 ]] - - - [[ get_intial_balance(p,data)[0][1] or 0.0 ]] - - - [[ get_intial_balance(p,data)[0][2] or 0.0 ]] - - - - - + [[ p.ref ]] - [[ p.name ]] @@ -602,6 +587,23 @@ + + [[ data['form']['initial_balance'] or removeParentNode('tr') ]] + Initial Balance + + + [[ get_intial_balance(p,data)[0][0] or 0.0 ]] + + + [[ get_intial_balance(p,data)[0][1] or 0.0 ]] + + + [[ get_intial_balance(p,data)[0][2] or 0.0 ]] + + + + +
[[ repeatIn(lines(p,data), 'line') ]]