From 239689ca36db3856b138ec08179e6a9896b8b5e8 Mon Sep 17 00:00:00 2001 From: "sbh (Open ERP)" Date: Wed, 21 Jul 2010 17:00:16 +0530 Subject: [PATCH] [IMP] account: Improve the report bzr revid: sbh@tinyerp.com-20100721113016-2v00207ht862fud7 --- .../report/report_pl_account_horizontal.rml | 115 ++++++++++++++---- 1 file changed, 91 insertions(+), 24 deletions(-) diff --git a/addons/account/report/report_pl_account_horizontal.rml b/addons/account/report/report_pl_account_horizontal.rml index 9f5ee58430e..a7876f23ad9 100644 --- a/addons/account/report/report_pl_account_horizontal.rml +++ b/addons/account/report/report_pl_account_horizontal.rml @@ -120,6 +120,39 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -169,18 +202,52 @@ - + [[ 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) ]] + + + + + + + + @@ -190,7 +257,7 @@ Perticular - Total Amount([[ get_currency(data['form'])]]) + Total Amount([[ get_currency(data) ]]) Code @@ -199,35 +266,35 @@ Perticular - Total Amount([[ get_currency(data['form'])]]) + Total Amount([[ get_currency(data) ]]) - [[ repeatIn(get_lines(),'a' ) ]] [[ a['code'] ]][[ a['level']<3 and ( setTag('para','para',{'style':'terp_default_Bold_9'})) ]] + [[ repeatIn(get_lines(),'a' ) ]] [[ a['code'] ]][[ a['level']<3 and ( setTag('para','para',{'style':'terp_default_Bold_9'})) or removeParentNode('font') ]] - [[ '. '*(a['level']-1) ]][[ a['level']<3 and ( setTag('para','para',{'style':'terp_default_Bold_9'})) ]][[ a['name'] ]] + [[ '. '*(a['level']-1) ]][[ a['level']<3 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['code1'] ]][[ a['level1']<3 and ( setTag('para','para',{'style':'terp_default_Bold_9'})) ]] + [[ a['code1'] ]][[ a['level1']<3 and ( setTag('para','para',{'style':'terp_default_Bold_9'})) or removeParentNode('font') ]] - [[ '. '*(a['level1']-1) ]][[ a['level1']<3 and ( setTag('para','para',{'style':'terp_default_Bold_9'})) ]][[ a['name1'] ]] + [[ '. '*(a['level1']-1) ]][[ a['level1']<3 and ( setTag('para','para',{'style':'terp_default_Bold_9'})) or removeParentNode('font') ]][[ a['name1'] ]] - [[ a['balance1'] and formatLang(abs(a['balance1'])) or 0.0 ]] + [[ formatLang(a['balance1']) or 0.0 ]] @@ -240,7 +307,7 @@ [[ final_result()['type'] == 'Net Profit C.F.B.L.' and final_result()['type'] or '' ]] - [[ final_result()['balance'] and final_result()['type'] == 'Net Profit C.F.B.L.' and formatLang(abs(final_result()['balance'])) or 0.0 ]] + [[ final_result()['balance'] and final_result()['type'] == 'Net Profit C.F.B.L.' and formatLang(final_result()['balance']) or 0.0 ]] @@ -249,7 +316,7 @@ [[ final_result()['type'] == 'Net Loss C.F.B.L.' and final_result()['type'] or '' ]] - [[ final_result()['balance'] and final_result()['type'] == 'Net Loss C.F.B.L.' and formatLang(abs(final_result()['balance'])) or 0.0 ]] + [[ final_result()['balance'] and final_result()['type'] == 'Net Loss C.F.B.L.' and formatLang(final_result()['balance']) or 0.0 ]] @@ -257,16 +324,16 @@ - Total:([[ get_currency(data['form']) ]]) + Total:([[ get_currency(data) ]]) - [[ sum_dr() and formatLang(abs(sum_dr())) or 0.0 ]] + [[ sum_dr() and formatLang(sum_dr()) or 0.0 ]] - Total:([[ get_currency(data['form']) ]]) + Total:([[ get_currency(data) ]]) - [[ sum_cr() and formatLang(abs(sum_cr())) or 0.0 ]] + [[ sum_cr() and formatLang(sum_cr()) or 0.0 ]]