From 6ab52ca29ce1dee3f82e266dbcd72e80bf07714d Mon Sep 17 00:00:00 2001 From: apa-tiny Date: Wed, 24 Nov 2010 19:02:59 +0530 Subject: [PATCH] [IMP]:account:Improved General Ledger (Non Landscape) for good alignment and also used strip_name function and also same as sxw file. bzr revid: apa@tinyerp.com-20101124133259-3t3yy0zce40tlag1 --- .../account/report/account_general_ledger.rml | 895 +++++++++++------- 1 file changed, 578 insertions(+), 317 deletions(-) diff --git a/addons/account/report/account_general_ledger.rml b/addons/account/report/account_general_ledger.rml index fb37c9bea42..ae47873a294 100644 --- a/addons/account/report/account_general_ledger.rml +++ b/addons/account/report/account_general_ledger.rml @@ -2,363 +2,624 @@ - - - - - - + + - - - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - + + + + + + + + + + + + + + + + + + + + + + + + + + - - - [[data['form']['amount_currency'] == False or removeParentNode('blockTable')]] - - Date - Partner - Ref - Move - Entry Label - Debit - Credit - Balance - - - [[ data['form']['amount_currency'] == True or removeParentNode('blockTable') ]] - - Date - Partner - Ref - Move - Entry Label - Debit - Credit - Balance - Currency - - - - + + + [[ data['form']['amount_currency'] == False or removeParentNode('blockTable') ]] + + + Date + + + JNRL + + + Partner + + + Ref + + + Move + + + Entry Label + + + Counterpart + + + Debit + + + Credit + + + Balance + + + + [[data['form']['amount_currency'] == True or removeParentNode('blockTable')]] + + + Date + + + JNRL + + + Partner + + + Ref + + + Move + + + Entry Label + + + Counterpart + + + Debit + + + Credit + + + Balance + + + Currency + + + + + [[ repeatIn(objects, 'a') ]] + General Ledger + + + + - General Ledger + Chart of Account + + + Fiscal Year + + + Journal + + + Filters By [[ get_filter(data)!='No Filter' and get_filter(data) ]] + + + Partner's + + + Target Moves - - - - [[ repeatIn(objects, 'a') ]] - + - Chart of Account - Fiscal Year - Journals - Display Account - Filter By [[ get_filter(data)!='No Filter' and get_filter(data) ]] - Entries Sorted By - Target Moves - - - [[ get_account(data) or removeParentNode('para') ]] - [[ get_fiscalyear(data) or '' ]] - [[', '.join([ lt or '' for lt in get_journal(data) ]) ]] - [[ (data['form']['display_account']=='bal_all' and 'All') or (data['form']['display_account']=='bal_movement' and 'With movements') or 'With balance is not equal to 0']] - [[ get_filter(data)=='No Filter' and get_filter(data) or removeParentNode('para') ]] - [[ get_filter(data)=='Date' or removeParentNode('blockTable') ]] - - Start Date - End 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') ]] - [[ formatLang(get_start_date(data),date=True) ]] - [[ formatLang(get_end_date(data),date=True) ]] + + Start Date + + + End Date + - [[ get_filter(data)=='Periods' or removeParentNode('blockTable') ]] - - Start Period - End Period - + [[ get_filter(data)=='Date' or removeParentNode('blockTable') ]] - [[ get_start_period(data) or removeParentNode('para') ]] - [[ get_end_period(data) or removeParentNode('para') ]] + + [[ formatLang(get_start_date(data),date=True) ]] + + + [[ formatLang(get_end_date(data),date=True) ]] + - - - [[ get_sortby(data) ]] - [[ get_target_move(data) ]] - - - - - - - - - - - [[data['form']['amount_currency'] == False or removeParentNode('blockTable')]] - - Date - Partner - Ref - Move - Entry Label - Debit - Credit - Balance - - -
- [[ repeatIn(get_children_accounts(a), 'o') ]] - [[ data['form']['amount_currency'] == False or removeParentNode('blockTable') ]] - - - - - [[ '..'*(o.level-1) ]][[ o.code or '']] [[ o.name or '']] - - [[formatLang(sum_debit_account(o)) ]] - [[formatLang(sum_credit_account(o)) ]] - [[ formatLang(sum_balance_account(o)) ]] [[ company.currency_id.symbol ]] + + [[ 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') ]] + + + + + + + + + [[ get_partners() ]] + + + [[ get_target_move(data) ]] + - - - - - - - - - - - - [[ repeatIn(lines(o), 'line') ]] [[ formatLang(line['ldate'],date=True) ]] - [[ line['partner'] or '']] - [[ line['lref'] or '']] - [[ line['move'] or '']] - [[ line['lname'] or '' ]] - [[ formatLang(line['debit']) ]] - [[ formatLang(line['credit']) ]] - [[ formatLang(line['progress']) ]] [[ company.currency_id.symbol ]] - -
- - [[ data['form']['amount_currency'] == True or removeParentNode('blockTable') ]] - - Date - Partner - Ref - Move - Entry Label - Debit - Credit - Balance - Currency - - -
- [[ repeatIn(get_children_accounts(a), 'o') ]] - [[ data['form']['amount_currency'] == True or removeParentNode('blockTable') ]] - - - - - [[ '..'*(o.level-1) ]][[ o.code or '' ]] [[ o.name or '' ]] - - [[formatLang(sum_debit_account(o)) ]] - [[formatLang(sum_credit_account(o)) ]] - [[formatLang(sum_balance_account(o)) ]] [[ company.currency_id.symbol ]] - [[ o.currency_id and sum_currency_amount_account(o) +o.currency_id.symbol or '' ]] - - - - - - - - - - - + + + + [[data['form']['amount_currency'] == True or removeParentNode('blockTable')]] + + + Date + + + JNRL + + + Partner + + + Ref + + + Move + + + Entry Label + + + Counterpart + + + Debit + + + Credit + + + Balance + + + Currency + - - [[ repeatIn(lines(o), 'line') ]] [[ formatLang(line['ldate'],date=True) ]] - [[ line['partner'] or '' ]] - [[ line['lref'] or '']] - [[ line['move'] or '' ]] - [[ line['lname'] or '' ]] - [[ formatLang(line['debit']) ]] - [[ formatLang(line['credit']) ]] - [[ formatLang(line['progress']) ]] [[ company.currency_id.symbol ]] - [[ (line.has_key('currency_id') and line['currency_id']==None or line['amount_currency']==None) and removeParentNode('font') ]] [[ formatLang(line['amount_currency'])]] [[ line['currency_code'] or '']] - - -
- + +
+ [[ repeatIn(get_children_accounts(a), 'o') ]] + [[data['form']['amount_currency'] == True or removeParentNode('blockTable')]] + + + [[ '..'*(o.level-1) ]][[ o.code ]] [[ o.name ]] + + + [[ formatLang(sum_debit_account(o), digits=get_digits(dp='Account')) ]] + + + [[ formatLang(sum_credit_account(o), digits=get_digits(dp='Account')) ]] + + + [[ formatLang(sum_balance_account(o), digits=get_digits(dp='Account')) ]] [[ company.currency_id.symbol ]] + + + [[ o.currency_id and formatLang(sum_currency_amount_account(o), digits=get_digits(dp='Account')) + o.currency_id.code or '' ]] + + + +
+ [[ repeatIn(lines(o), 'line') ]] + [[data['form']['amount_currency'] == True or removeParentNode('blockTable')]] + + + [[ formatLang(line['ldate'],date=True) ]] + + + [[ line['lcode'] ]] + + + [[ strip_name(line['partner_name'],10) ]] + + + [[ strip_name(line['lref'],9) ]] + + + [[ strip_name(line['move'],9) ]] + + + [[ strip_name(line['lname'],10) ]] + + + [[ strip_name(line['line_corresp'].replace(', ',','),10) ]] + + + [[ formatLang(line['debit'], digits=get_digits(dp='Account')) ]] + + + [[ formatLang(line['credit'], digits=get_digits(dp='Account')) ]] + + + [[ formatLang(line['progress'], digits=get_digits(dp='Account')) ]] [[ company.currency_id.symbol ]] + + + [[ (line.has_key('currency_id') and line['currency_id']==None or line['amount_currency']==None) and removeParentNode('font') ]] [[ formatLang(line['amount_currency'])]] [[ line['currency_code'] or '']] + + + +
+
+ [[ data['form']['amount_currency'] == False or removeParentNode('blockTable') ]] + + + Date + + + JNRL + + + Partner + + + Ref + + + Move + + + Entry Label + + + Counterpart + + + Debit + + + Credit + + + Balance + + + +
+ [[ repeatIn(get_children_accounts(a), 'o') ]] + [[ data['form']['amount_currency'] == False or removeParentNode('blockTable') ]] + + + [[ '..'*(o.level-1) ]][[ o.code ]] [[ o.name ]] + + + [[ formatLang(sum_debit_account(o), digits=get_digits(dp='Account')) ]] + + + [[ formatLang(sum_credit_account(o), digits=get_digits(dp='Account')) ]] + + + [[ formatLang(sum_balance_account(o), digits=get_digits(dp='Account')) ]] [[ company.currency_id.symbol ]] + + + +
+ [[ repeatIn(lines(o), 'line') ]] + [[ data['form']['amount_currency'] == False or removeParentNode('blockTable') ]] + + + [[ formatLang(line['ldate'],date=True) ]] + + + [[ line['lcode'] ]] + + + [[ strip_name(line['partner_name'],20) ]] + + + [[ strip_name(line['lref'],9) ]] + + + [[ strip_name(line['move'],9) ]] + + + [[ strip_name(line['lname'],18) ]] + + + [[ strip_name(line['line_corresp'].replace(', ',','),20) ]] + + + [[ formatLang(line['debit'], digits=get_digits(dp='Account')) ]] + + + [[ formatLang(line['credit'], digits=get_digits(dp='Account')) ]] + + + [[ formatLang(line['progress'], digits=get_digits(dp='Account')) ]] [[ company.currency_id.symbol ]] + + + +
+
+ - + \ No newline at end of file