From 2d4e2e0943c893f48b885973c4d4df06a162eed3 Mon Sep 17 00:00:00 2001 From: "sbh (Open ERP)" Date: Thu, 22 Jul 2010 16:04:55 +0530 Subject: [PATCH] [IMP] account: Improve the balance sheet report bzr revid: sbh@tinyerp.com-20100722103455-5xdyzk11zku88c6c --- .../account/report/report_balance_sheet.rml | 6 + .../report_balance_sheet_horizontal.rml | 110 ++++++++++++++---- 2 files changed, 96 insertions(+), 20 deletions(-) diff --git a/addons/account/report/report_balance_sheet.rml b/addons/account/report/report_balance_sheet.rml index ccec29531f6..dbc440438dd 100644 --- a/addons/account/report/report_balance_sheet.rml +++ b/addons/account/report/report_balance_sheet.rml @@ -233,6 +233,12 @@ [[ formatLang(time.strftime('%Y-%m-%d %H:%M:%S'), date_time = True) ]] + + + + + + diff --git a/addons/account/report/report_balance_sheet_horizontal.rml b/addons/account/report/report_balance_sheet_horizontal.rml index df772d6cfe7..6ea15502ca2 100644 --- a/addons/account/report/report_balance_sheet_horizontal.rml +++ b/addons/account/report/report_balance_sheet_horizontal.rml @@ -105,6 +105,40 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -156,18 +190,54 @@ - + + [[ get_data(data) or removeParentNode('para') ]] + + - - From : [[ formatLang(data['form']['date_from'],date=True) ]] To: [[ formatLang(data['form']['date_to'], date=True) ]] - + Chart of Account + Fiscal Year + Journals + Filters By [[ get_filter(data)!='No Filter' and '' or removeParentNode('font') ]] + Display Account + Printing Date - - - [[ get_data(data['form']) ]] - - - + + [[ get_account(data) or removeParentNode('para') ]] + [[ get_fiscalyear(data) or removeParentNode('para') ]] + [[', '.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') ]] + + + + [[ (data['form']['display_account']=='bal_all' and 'All') or (data['form']['display_account']=='bal_mouvement' and 'With movements') or 'With balance is not equal to 0']] + [[ formatLang(time.strftime('%Y-%m-%d %H:%M:%S'), date_time = True) ]] + + + + + + + + @@ -177,7 +247,7 @@ Liabilities - Total Amount([[ get_currency(data['form']) ]]) + Total Amount([[ get_currency(data) ]]) Code @@ -186,27 +256,27 @@ Assets - Total Amount([[ get_currency(data['form']) ]]) + Total Amount([[ get_currency(data) ]]) - [[ repeatIn(get_lines(), 'a') ]] [[ a['level']<4 and ( setTag('para','para',{'style':'terp_default_Bold_9'})) ]][[ a['code'] ]] + [[ repeatIn(get_lines(), 'a') ]] [[ a['level']<4 and ( setTag('para','para',{'style':'terp_default_Bold_9'})) or removeParentNode('font') ]][[ a['code'] ]] - [[ '. '*(a['level']-1) ]][[ a['level']<4 and ( setTag('para','para',{'style':'terp_default_Bold_9'})) ]][[ a['name'] ]] + [[ '. '*(a['level']-1) ]][[ a['level']<4 and ( setTag('para','para',{'style':'terp_default_Bold_9'})) or removeParentNode('font') ]][[ a['name'] ]] - [[ a['balance'] and formatLang(abs(a['balance'])) or 0.0 ]] + [[ a['balance'] and formatLang(a['balance']) or 0.0 ]] - [[ a['level']<4 and ( setTag('para','para',{'style':'terp_default_Bold_9'})) ]][[ a['code1'] ]] + [[ a['level']<4 and ( setTag('para','para',{'style':'terp_default_Bold_9'})) or removeParentNode('font') ]][[ a['code1'] ]] - [[ '. '*(a['level1']-1) ]][[ a['level1']<4 and ( setTag('para','para',{'style':'terp_default_Bold_9'})) ]][[ a['name1'] ]] + [[ '. '*(a['level1']-1) ]][[ a['level1']<4 and ( setTag('para','para',{'style':'terp_default_Bold_9'})) or removeParentNode('font') ]][[ a['name1'] ]] - [[ a['balance1'] and formatLang(abs(a['balance1'])) or 0.0 ]] + [[ a['balance1'] and formatLang(a['balance1']) or 0.0 ]] @@ -216,13 +286,13 @@ Balance:([[ get_currency(data['form']) ]]) - [[ sum_dr() and formatLang(abs(sum_dr())) or 0.0 ]] + [[ sum_dr() and formatLang(sum_dr()) or 0.0 ]] Balance:([[ get_currency(data['form']) ]]) - [[ sum_cr() and formatLang(abs(sum_cr())) or 0.0 ]] + [[ sum_cr() and formatLang(sum_cr()) or 0.0 ]]