From 597e93e20fb8bdf9262ec60b97c5c4b8d1bfe580 Mon Sep 17 00:00:00 2001 From: apa-tiny Date: Wed, 24 Nov 2010 16:38:02 +0530 Subject: [PATCH] [IMP]:account:Improved Partner Ledger other for good alignment and also used strip_name function bzr revid: apa@tinyerp.com-20101124110802-i553clyzkszy3s4v --- .../report/account_partner_ledger_other.rml | 1067 ++++++++--------- 1 file changed, 515 insertions(+), 552 deletions(-) diff --git a/addons/account/report/account_partner_ledger_other.rml b/addons/account/report/account_partner_ledger_other.rml index 018152111e0..169f5083e98 100644 --- a/addons/account/report/account_partner_ledger_other.rml +++ b/addons/account/report/account_partner_ledger_other.rml @@ -2,7 +2,7 @@ @@ -10,196 +10,153 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + + + + + - + + + + + + + - + + + + + + + + - + @@ -211,32 +168,32 @@ - - - - - - - - - - - - - - - - - - - - - + - + + + + + + + + + + + + + + + + + + + + + @@ -249,454 +206,460 @@ - + - - - - - + - + - + + + + + - + - - - - - - - - - + + + + + + + + + - - - - - - - - - - - - + - - - - - + + + + - - + + - + - - + + - + - + - - - - - + + + - - - - + + - - - [[ display_currency(data) == False or removeParentNode('blockTable') ]] + + + + [[ display_currency(data) == False or removeParentNode('blockTable') ]] + + + Date + + + JNRL + + + Ref + + + Account + + + Entry Label + + + Debit + + + Credit + + + Balance + + + + + [[ display_currency(data) == True or removeParentNode('blockTable') ]] + + + Date + + + JNRL + + + Ref + + + Account + + + Entry Label + + + Debit + + + Credit + + + Balance + + + Currency + + + + + + + + + Partner Ledger + + + + - Date + Chart of Account - JNRL + Fiscal Year - Ref. + Journal - Account + Filters By [[ get_filter(data)!='No Filter' and get_filter(data) ]] - Entry Label + Partner's - Debit - - - Credit - - - Balance + Target Moves -[[ display_currency(data) == True or removeParentNode('blockTable') ]] + - Date + [[ get_account(data) or '' ]] - JNRL + [[ get_fiscalyear(data) or '' ]] - Ref. + [[', '.join([ lt or '' for lt in get_journal(data) ]) ]] - Account - - - Entry Label - - - Debit - - - Credit - - - Balance - - - Currency - - - - - - - - Partner Ledger - - - - - - - - - - - - - - - - - + [[ get_filter(data)=='No Filter' and get_filter(data) or removeParentNode('para') ]] + - Chart of Account + [[ get_filter(data)=='Date' or removeParentNode('blockTable') ]] Start Date - Fiscal Year - - - Journal - - - Filter By [[ get_filter(data)!='No Filter' and get_filter(data) ]] - - - Partner's - - - Target Moves - - - - - [[ 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 - - - - - [[ formatLang(get_start_date(data),date=True) ]] - - - [[ formatLang(get_end_date(data),date=True) ]] - - - - [[ 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() ]] - - - [[ get_target_move(data) ]] + End Date - + + + + [[ get_filter(data)=='Date' or removeParentNode('blockTable') ]] [[ formatLang(get_start_date(data),date=True) ]] + + + [[ formatLang(get_end_date(data),date=True) ]] + + + + + + + [[ get_filter(data)=='Periods' or removeParentNode('blockTable') ]] Start Period + + + End Period + + + + + + + [[ get_filter(data)=='Periods' or removeParentNode('blockTable') ]] [[ get_start_period(data) or removeParentNode('para') ]] + + + [[ get_end_period(data) or removeParentNode('para') ]] + + + + - - - - [[ display_currency(data) == False or removeParentNode('blockTable') ]] - - - Date - JNRL + [[ get_partners() ]] - Ref. - - - Account - - - Entry Label - - - Debit - - - Credit - - - Balance + [[ get_target_move(data) ]] -
- [[ repeatIn(objects, 'p') ]] [[ setLang(p.lang) ]] - [[ display_currency(data) == False or removeParentNode('blockTable') ]] - - - - [[ p.ref ]] - [[ p.name ]] - - - [[ formatLang((sum_debit_partner(p))) ]] - - - [[ formatLang((sum_credit_partner(p))) ]] - - - [[ formatLang((sum_debit_partner(p) - sum_credit_partner(p))) ]] [[ company.currency_id.symbol ]] - - - - [[ display_initial_balance(data) or removeParentNode('tr') ]] - Initial Balance - - - [[ formatLang(get_intial_balance(p)[0][0])]] - - - [[ formatLang(get_intial_balance(p)[0][1]) ]] - - - [[ formatLang(get_intial_balance(p)[0][2]) ]] [[ company.currency_id.symbol ]] - - - -
- [[ repeatIn(lines(p), 'line') ]] - [[ display_currency(data) == False or removeParentNode('blockTable') ]] + + + + + [[ display_currency(data) == False or removeParentNode('blockTable') ]] - [[ formatLang(line['date'],date=True) ]] + Date - [[ line['code'] ]] + JNRL - [[ line['move_name'] ]] + Ref - [[ line['a_code'] ]] + Account - [[ (line['ref'] or '') + ' ' + line['name'] ]] + Entry Label - [[ formatLang((line['debit'])) ]] + Debit - [[ formatLang((line['credit'])) ]] + Credit - [[ formatLang((line['progress'])) ]] [[ company.currency_id.symbol ]] + Balance -
-
- [[ display_currency(data) == True or removeParentNode('blockTable') ]] - - - Date - - - JNRL - - - Ref. - - - Account - - - Entry Label - - - Debit - - - Credit - - - Balance - - - Currency - - - -
- [[ repeatIn(objects, 'p') ]] [[ setLang(p.lang) ]] - [[ display_currency(data) == True or removeParentNode('blockTable') ]] - - - [[ p.ref ]] - [[ p.name ]] - - - [[ formatLang((sum_debit_partner(p))) ]] - - - [[ formatLang((sum_credit_partner(p))) ]] - - - [[ formatLang((sum_debit_partner(p) - sum_credit_partner(p))) ]] [[ company.currency_id.symbol ]] - - - - - - - - - [[ data['form']['initial_balance'] or removeParentNode('tr') ]] - Initial Balance - - - [[ formatLang(get_intial_balance(p)[0][0]) ]] - - - [[ formatLang(get_intial_balance(p)[0][1]) ]] - - - [[ formatLang(get_intial_balance(p)[0][2]) ]] [[ company.currency_id.symbol ]] - - - - - - -
- [[ repeatIn(lines(p), 'line') ]] - [[ display_currency(data) == True or removeParentNode('blockTable') ]] - - - [[ formatLang(line['date'],date=True) ]] - - - [[ line['code'] ]] - - - [[ line['move_name'] ]] - - - [[ line['a_code'] ]] - - - [[ (line['ref'] or '') + ' ' + line['name'] ]] - - - [[ formatLang((line['debit'])) ]] - - - [[ formatLang((line['credit'])) ]] - - - [[ formatLang((line['progress'])) ]] [[ company.currency_id.symbol ]] - - - [[ (line['currency_id']==None or line['amount_currency']==None) and removeParentNode('font') ]] [[ formatLang(line['amount_currency'] ) ]] [[ line['currency_code'] or '' ]] - - - -
+ [[ repeatIn(objects, 'p') ]] + [[ setLang(p.lang) ]] - + [[ display_currency(data) == False or removeParentNode('section') ]] + + + + + [[ p.ref ]] - [[ p.name ]] + + + [[ formatLang((sum_debit_partner(p))) ]] + + + [[ formatLang((sum_credit_partner(p))) ]] + + + [[ formatLang((sum_debit_partner(p) - sum_credit_partner(p))) ]] [[ company.currency_id.symbol ]] + + + +
+ + [[data['form']['initial_balance']==True or removeParentNode('section') ]] + + + + + Initial Balance + + + [[ formatLang(get_intial_balance(p)[0][0])]] + + + [[ formatLang(get_intial_balance(p)[0][1]) ]] + + + [[ formatLang(get_intial_balance(p)[0][2]) ]] [[ company.currency_id.symbol ]] + + + +
+
+ [[ repeatIn(lines(p), 'line') ]] + + + + [[ formatLang(line['date'],date=True) ]] + + + [[ line['code'] ]] + + + [[ line['move_name'] ]] + + + [[ line['a_code'] ]] + + + [[ strip_name(line['ref'],10) ]] - [[ strip_name(line['name'],15) ]] + + + [[ formatLang((line['debit'])) ]] + + + [[ formatLang((line['credit'])) ]] + + + [[ formatLang((line['progress'])) ]] [[ company.currency_id.symbol ]] + + + +
+
+ + [[ display_currency(data) == True or removeParentNode('blockTable') ]] + + + Date + + + JNRL + + + Ref + + + Account + + + Entry Label + + + Debit + + + Credit + + + Balance + + + Currency + + + +
+ [[ repeatIn(objects, 'p') ]] + [[ setLang(p.lang) ]] + + [[ display_currency(data) == True or removeParentNode('section') ]] + + + + + + [[ p.ref ]] - [[ p.name ]] + + + [[ formatLang((sum_debit_partner(p))) ]] + + + [[ formatLang((sum_credit_partner(p))) ]] + + + [[ formatLang((sum_debit_partner(p) - sum_credit_partner(p))) ]] [[ company.currency_id.symbol ]] + + + + + + + + +
+ [[ data['form']['initial_balance']==True or removeParentNode('section') ]] + + + + Initial Balance + + + [[ formatLang(get_intial_balance(p)[0][0])]] + + + [[ formatLang(get_intial_balance(p)[0][1]) ]] + + + [[ formatLang(get_intial_balance(p)[0][2]) ]] [[ company.currency_id.symbol ]] + + + + + + + + +
+
+ [[ repeatIn(lines(p), 'line') ]] + + + + [[ formatLang(line['date'],date=True) ]] + + + [[ line['code'] ]] + + + [[ line['move_name'] ]] + + + [[ line['a_code'] ]] + + + [[ strip_name(line['ref'],5) ]] - [[ strip_name(line['name'],5) ]] + + + [[ formatLang((line['debit'])) ]] + + + [[ formatLang((line['credit'])) ]] + + + [[ formatLang((line['progress'])) ]] [[ company.currency_id.symbol ]] + + + + [[ (line['currency_id']==None or line['amount_currency']==None) and removeParentNode('font') ]] [[ formatLang(line['amount_currency'] ) ]] [[ line['currency_code'] or '' ]] + + + + +
-
+ \ No newline at end of file