From fc0cd75d507bd4922e9649b25cad937a86c278d6 Mon Sep 17 00:00:00 2001 From: "sbh (Open ERP)" Date: Mon, 26 Jul 2010 12:40:13 +0530 Subject: [PATCH] [IMP] account: Improve the third_party_ledger report bzr revid: sbh@tinyerp.com-20100726071013-3zz5t9mqs5ybie37 --- .../report/third_party_ledger_other.rml | 631 ++++++++++++------ 1 file changed, 422 insertions(+), 209 deletions(-) diff --git a/addons/account/report/third_party_ledger_other.rml b/addons/account/report/third_party_ledger_other.rml index e99a0baf5a8..030e6340ebe 100644 --- a/addons/account/report/third_party_ledger_other.rml +++ b/addons/account/report/third_party_ledger_other.rml @@ -2,7 +2,7 @@ @@ -10,59 +10,150 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - s - - - - - - - - - + @@ -89,16 +180,43 @@ - + + - + - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -110,24 +228,69 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + - - - + + + + + + + + + - - - - - - + + + + + + + @@ -136,7 +299,7 @@ - + @@ -147,68 +310,96 @@ - - + + + + + + - - - - - Third Party Ledger - - - - - - - - - Chart of Account - Fiscal Year - Journal - Filters By - Partner's - Printing Date - - - [[ get_account(data) or '' ]] - [[ get_fiscalyear(data) or '' ]] - [[', '.join([ lt or '' for lt in get_journal(data) ]) ]] - [[ get_filter(data)=='No Filter' and get_filter(data) or removeParentNode('para') ]] - [[ get_filter(data)=='Date' or removeParentNode('blockTable') ]] - - Start Date - End Date - - - [[ get_start_date(data) ]] - [[ get_end_date(data) ]] - - - [[ get_filter(data)=='Periods' or removeParentNode('blockTable') ]] - - Start Period - End Period - - - [[ get_start_period(data) or removeParentNode('para') ]] - [[ get_end_period(data) or removeParentNode('para') ]] - - - - [[ get_partners(data) ]] - [[ formatLang(time.strftime('%Y-%m-%d %H:%M:%S'), date_time = True) ]] - - - - - - - - - [[ data['form']['amount_currency'] == False or removeParentNode('blockTable') ]] + Third Party Ledger + + + + Chart of Account + + + Fiscal Year + + + Journal + + + Filters By + + + Partner's + + + Printing Date + + + + + [[ get_account(data) or '' ]] + + + [[ get_fiscalyear(data) or '' ]] + + [[', '.join([ lt or '' for lt in get_journal(data) ]) ]] + + [[ get_filter(data)=='Date' or removeParentNode('blockTable') ]] + + + Start Date + + + End Date + + + + + [[ get_start_date(data) ]] + + + [[ get_end_date(data) ]] + + + + [[ get_filter(data)=='Periods' or removeParentNode('blockTable') ]] + + + Start Period + + + End Period + + + + + [[ get_start_period(data) or removeParentNode('para') ]] + + + [[ get_end_period(data) or removeParentNode('para') ]] + + + + + + [[ get_partners(data) ]] + + + [[ formatLang(time.strftime('%Y-%m-%d %H:%M:%S'), date_time = True) ]] + + + + + + + [[ repeatIn(objects, 'p') ]] [[ setLang(p.lang) ]] + [[ data['form']['amount_currency'] == False or removeParentNode('blockTable') ]] Date @@ -233,8 +424,10 @@ - - [[ data['form']['amount_currency'] == False or removeParentNode('blockTable') ]] + + + + [[ data['form']['amount_currency'] == False or removeParentNode('blockTable') ]] Balance Brought Forward @@ -250,63 +443,67 @@ - + + + + [[ data['form']['amount_currency'] == False 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(objects, 'p') ]] [[ setLang(p.lang) ]] - [[ data['form']['amount_currency'] == False or removeParentNode('blockTable') ]] + [[ repeatIn(lines(p,data), 'line') ]] + [[ data['form']['amount_currency'] == False or removeParentNode('blockTable') ]] - [[ p.ref ]] - [[ p.name ]] + [[ formatLang(line['date'],date=True) ]] - [[ formatLang((sum_debit_partner(p,data))) ]] + [[ line['code'] ]] - [[ formatLang((sum_credit_partner(p,data))) ]] + [[ line['ref'] ]] - [[ formatLang((sum_debit_partner(p,data) - sum_credit_partner(p,data))) ]] + [[ line['name'] ]] + + + [[ formatLang((line['debit'])) ]] + + + [[ formatLang((line['credit'])) ]] + + + [[ formatLang((line['progress'])) ]] -
- [[ repeatIn(lines(p,data), 'line') ]] - [[ data['form']['amount_currency'] == False or removeParentNode('blockTable') ]] - - - [[ formatLang(line['date'],date=True) ]] - - - [[ line['code'] ]] - - - [[ line['ref'] ]] - - - [[ line['name'] ]] - - - [[ formatLang((line['debit'])) ]] - - - [[ formatLang((line['credit'])) ]] - - - [[ formatLang((line['progress'])) ]] - - - - - - -
- - - [[ data['form']['amount_currency'] == True or removeParentNode('blockTable') ]] + + + + + + + [[ repeatIn(objects, 'p') ]] [[ setLang(p.lang) ]] + [[ data['form']['amount_currency'] == True or removeParentNode('blockTable') ]] Date @@ -334,8 +531,8 @@ - - [[ data['form']['amount_currency'] == True or removeParentNode('blockTable') ]] + + [[ data['form']['amount_currency'] == True or removeParentNode('blockTable') ]] Balance Brought Forward @@ -349,57 +546,73 @@ [[ 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(objects, 'p') ]] [[ setLang(p.lang) ]] - [[ data['form']['amount_currency'] == True or removeParentNode('blockTable') ]] + [[ repeatIn(lines(p,data), 'line') ]] + [[ data['form']['amount_currency'] == True or removeParentNode('blockTable') ]] - [[ p.ref ]] - [[ p.name ]] + [[ formatLang(line['date'],date=True) ]] - [[ formatLang((sum_debit_partner(p,data))) ]] + [[ line['code'] ]] - [[ formatLang((sum_credit_partner(p,data))) ]] + [[ line['ref'] ]] - [[ formatLang((sum_debit_partner(p,data) - sum_credit_partner(p,data))) ]] + [[ line['name'] ]] + + + [[ formatLang((line['debit'])) ]] + + + [[ formatLang((line['credit'])) ]] + + + [[ formatLang((line['progress'])) ]] + + + [[ formatLang(line['amount_currency'] or 0.00) ]] [[ line['conrency_code' or '' ]] - -
- [[ 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['currency_code'] or '']] - - -
+ + +
\ No newline at end of file