From bb45d0e76dca656f3380861703c1d786a850f939 Mon Sep 17 00:00:00 2001 From: "Quentin (OpenERP)" Date: Fri, 10 Jun 2011 18:01:36 +0200 Subject: [PATCH] [IMP] account: p&l report improvements bzr revid: qdp-launchpad@openerp.com-20110610160136-upjan1kqqq8mgmby --- addons/account/report/account_profit_loss.rml | 102 +++++++++--------- 1 file changed, 53 insertions(+), 49 deletions(-) diff --git a/addons/account/report/account_profit_loss.rml b/addons/account/report/account_profit_loss.rml index d83a39f6757..2b29f479478 100644 --- a/addons/account/report/account_profit_loss.rml +++ b/addons/account/report/account_profit_loss.rml @@ -24,9 +24,8 @@ - + - @@ -41,17 +40,6 @@ - - - - - - - - - - - @@ -136,7 +124,38 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -156,7 +175,7 @@ Chart of Account Fiscal Year Filter By [[ get_filter(data)!='No Filter' and get_filter(data) ]] - Display Account + Display Account Target Moves @@ -191,35 +210,26 @@ - - - + Expenses Code - Expenses + Account Balance - - - - [[ repeatIn(get_lines_another('expense'),'a' ) ]] [[ a.code ]][[ a.level<4 and ( setTag('para','para',{'style':'terp_default_Bold_9'})) or removeParentNode('font') ]] - - - - - [[ '. '*(a.level-1) ]][[ a.level<4 and ( setTag('para','para',{'style':'terp_default_Bold_9'})) or removeParentNode('font') ]][[ a.name ]] - - - - [[ a.level<4 and ( setTag('para','para',{'style':'terp_default_Right_9_Bold'})) or removeParentNode('font') ]][[ formatLang(a.balance) ]] [[ company.currency_id.symbol ]] - + + [[ repeatIn(get_lines_another('expense'),'a' ) ]] + [[ setTag('tr','tr',{'style': 'Table'+str(min(3,a.level))}) ]] + [[ (a.type =='view' and a.level >= 3) and setTag('para','para',{'style': 'terp_level_3_code_bold'}) or setTag('para','para',{'style': 'terp_level_'+str(min(3,a.level))+'_code'}) ]][[ a.code ]] + [[ (a.type =='view' and a.level >= 3) and setTag('para','para',{'style': 'terp_level_'+str(min(3,a.level))+'_name_bold'}) or setTag('para','para',{'style': 'terp_level_'+str(min(4,a.level))+'_name'}) ]][[ a.name ]] + [[ (a.level <>2) or removeParentNode('td') ]][[ (a.type =='view' and a.level >= 3) and setTag('para','para',{'style': 'terp_level_3_balance_bold'}) or setTag('para','para',{'style': 'terp_level_'+str(min(3,a.level))+'_balance'}) ]][[ formatLang(a.balance) ]] [[company.currency_id.symbol ]] + [[ a.level == 2 or removeParentNode('td') ]][[ formatLang(a.balance) ]] [[company.currency_id.symbol ]] @@ -249,32 +259,26 @@ - + Incomes + Code - Incomes + Account Balance - - - - [[ repeatIn(get_lines_another('income'),'a') ]] [[ a.code ]][[ a.level<4 and ( setTag('para','para',{'style':'terp_default_Bold_9'})) or removeParentNode('font') ]] - - - - - [[ '. '*(a.level-1) ]][[ a.level<4 and ( setTag('para','para',{'style':'terp_default_Bold_9'})) or removeParentNode('font') ]][[ a.name ]] - - - - [[ a.level<4 and ( setTag('para','para',{'style':'terp_default_Right_9_Bold'})) or removeParentNode('font') ]][[ formatLang(a.balance) ]] [[ company.currency_id.symbol ]] - + + [[ repeatIn(get_lines_another('income'),'a' ) ]] + [[ setTag('tr','tr',{'style': 'Table'+str(min(3,a.level))}) ]] + [[ (a.type =='view' and a.level >= 3) and setTag('para','para',{'style': 'terp_level_3_code_bold'}) or setTag('para','para',{'style': 'terp_level_'+str(min(3,a.level))+'_code'}) ]][[ a.code ]] + [[ (a.type =='view' and a.level >= 3) and setTag('para','para',{'style': 'terp_level_'+str(min(3,a.level))+'_name_bold'}) or setTag('para','para',{'style': 'terp_level_'+str(min(4,a.level))+'_name'}) ]][[ a.name ]] + [[ (a.level <>2) or removeParentNode('td') ]][[ (a.type =='view' and a.level >= 3) and setTag('para','para',{'style': 'terp_level_3_balance_bold'}) or setTag('para','para',{'style': 'terp_level_'+str(min(3,a.level))+'_balance'}) ]][[ formatLang(a.balance) ]] [[company.currency_id.symbol ]] + [[ a.level == 2 or removeParentNode('td') ]][[ formatLang(a.balance) ]] [[company.currency_id.symbol ]]