From 45d56c2332b897e1cbf2375e208e52f2cb035562 Mon Sep 17 00:00:00 2001 From: "sbh (Open ERP)" Date: Wed, 28 Jul 2010 12:31:43 +0530 Subject: [PATCH] [IMP] account: Improve the third_party_ledger report bzr revid: sbh@tinyerp.com-20100728070143-4v8cv3f2hokwrvw3 --- addons/account/report/third_party_ledger.rml | 176 ++++++++++++++++-- .../report/third_party_ledger_other.rml | 11 +- 2 files changed, 159 insertions(+), 28 deletions(-) diff --git a/addons/account/report/third_party_ledger.rml b/addons/account/report/third_party_ledger.rml index e247b1c078d..a1a3909aa73 100644 --- a/addons/account/report/third_party_ledger.rml +++ b/addons/account/report/third_party_ledger.rml @@ -84,7 +84,45 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -161,8 +199,8 @@ [[ get_filter(data)=='No Filter' and get_filter(data) or removeParentNode('para') ]] [[ get_filter(data)=='Date' or removeParentNode('blockTable') ]] - Start Date - End Date + Start Date + End Date [[ get_start_date(data) ]] @@ -171,8 +209,8 @@ [[ get_filter(data)=='Periods' or removeParentNode('blockTable') ]] - Start Period - End Period + Start Period + End Period [[ get_start_period(data) or removeParentNode('para') ]] @@ -184,19 +222,10 @@ [[ formatLang(time.strftime('%Y-%m-%d %H:%M:%S'), date_time = True) ]] - - - - - - - - - - + [[ data['form']['amount_currency'] == False or removeParentNode('blockTable') ]] Date @@ -224,7 +253,7 @@ - + [[ data['form']['amount_currency'] == False or removeParentNode('blockTable') ]] Balance Brought Forward @@ -243,7 +272,7 @@ - + [[ data['form']['amount_currency'] == False or removeParentNode('blockTable') ]] [[ p.ref ]] - [[ p.name ]] @@ -264,7 +293,7 @@
[[ repeatIn(lines(p,data), 'line') ]] - + [[ data['form']['amount_currency'] == False or removeParentNode('blockTable') ]] [[ formatLang(line['date'],date=True) ]] @@ -293,6 +322,117 @@
+ [[ data['form']['amount_currency'] == True or removeParentNode('blockTable') ]] + + + Date + + + JNRL + + + Ref. + + + Entry Label + + + Debit + + + Credit + + + Balance + + + Currency + + + + + + + [[ data['form']['amount_currency'] == True or removeParentNode('blockTable') ]] + + + Balance Brought Forward + + + [[ formatLang((sum_debit(data))) ]] + + + [[ formatLang((sum_credit(data))) ]] + + + [[ formatLang((sum_debit(data) - sum_credit(data))) ]] + + + + + + + + + [[ data['form']['amount_currency'] == True or removeParentNode('blockTable') ]] + + + [[ p.ref ]] - [[ p.name ]] + + + [[ formatLang((sum_debit_partner(p,data))) ]] + + + [[ formatLang((sum_credit_partner(p,data))) ]] + + + [[ formatLang((sum_debit_partner(p,data) - sum_credit_partner(p,data))) ]] + + + + + + + + + + + +
+ [[ repeatIn(lines(p,data), 'line') ]] + [[ data['form']['amount_currency'] == True or removeParentNode('blockTable') ]] + + + [[ formatLang(line['date'],date=True) ]] + + + [[ line['code'] ]] + + + [[ line['ref'] ]] + + + [[ line['name'] ]] + + + [[ formatLang((line['debit'])) ]] + + + [[ formatLang((line['credit'])) ]] + + + [[ formatLang((line['progress'])) ]] + + + [[ formatLang(line['amount_currency'] or '') ]] [[ line['conrency_code' or '' ]] + + + + + + +
+ diff --git a/addons/account/report/third_party_ledger_other.rml b/addons/account/report/third_party_ledger_other.rml index 47cb159bc89..e959fcf2a96 100644 --- a/addons/account/report/third_party_ledger_other.rml +++ b/addons/account/report/third_party_ledger_other.rml @@ -492,16 +492,7 @@ - - - - - - - - - [[ repeatIn(objects, 'p') ]] [[ setLang(p.lang) ]] [[ data['form']['amount_currency'] == True or removeParentNode('blockTable') ]] @@ -606,7 +597,7 @@ [[ formatLang((line['progress'])) ]] - [[ formatLang(line['amount_currency'] or 0.00) ]] [[ line['conrency_code' or '' ]] + [[ formatLang(line['amount_currency'] or '') ]] [[ line['conrency_code' or '' ]]