From 02f256b60e43d6446379f319d0004b8fb572be8f Mon Sep 17 00:00:00 2001 From: Stefan Rijnhart Date: Thu, 1 Aug 2013 20:45:09 +0200 Subject: [PATCH] [FIX] Don't print a zero amount on empty lines in the P/L report Reformat the affected rml lines [FIX] Remove leftover parenthesis from previous commit --- .../report/account_balance_sheet_horizontal.rml | 2 +- .../report/account_profit_horizontal.rml | 10 ++++++++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/account_financial_report_horizontal/report/account_balance_sheet_horizontal.rml b/account_financial_report_horizontal/report/account_balance_sheet_horizontal.rml index a20ab628..23436217 100644 --- a/account_financial_report_horizontal/report/account_balance_sheet_horizontal.rml +++ b/account_financial_report_horizontal/report/account_balance_sheet_horizontal.rml @@ -218,7 +218,7 @@ [[ a['level1']<4 and ( setTag('para','para',{'style':'terp_default_Right_9_Bold'})) or removeParentNode('font') ]] [[ a['name']=='Net Profit' and setTag('para','para',{'style':'terp_default_Right_9_Bold'}) or removeParentNode('font') ]] - [[(a['code'] and formatLang(a['balance']) or removeParentNode('font')]] [[ company.currency_id.symbol ]] + [[ a['code'] and formatLang(a['balance']) or removeParentNode('font') ]] [[ company.currency_id.symbol ]] diff --git a/account_financial_report_horizontal/report/account_profit_horizontal.rml b/account_financial_report_horizontal/report/account_profit_horizontal.rml index 33c553a5..c5846931 100644 --- a/account_financial_report_horizontal/report/account_profit_horizontal.rml +++ b/account_financial_report_horizontal/report/account_profit_horizontal.rml @@ -222,7 +222,10 @@ - [[ a['level']<4 and ( setTag('para','para',{'style':'terp_default_Right_9_Bold'})) or removeParentNode('font') ]][[ formatLang(a['balance']) ]] [[ company.currency_id.symbol ]] + + [[ a['level']<4 and ( setTag('para','para',{'style':'terp_default_Right_9_Bold'})) or removeParentNode('font') ]] + [[ a['code'] and formatLang(a['balance']) or removeParentNode('font') ]] [[ company.currency_id.symbol ]] + @@ -235,7 +238,10 @@ - [[ a['level']<4 and ( setTag('para','para',{'style':'terp_default_Right_9_Bold'})) or removeParentNode('font') ]][[(a['code1'] and a['name1']) and formatLang(a['balance1']) or removeParentNode('font') ]] [[ company.currency_id.symbol ]] + + [[ a['level1']<4 and ( setTag('para','para',{'style':'terp_default_Right_9_Bold'})) or removeParentNode('font') ]] + [[ a['code1'] and formatLang(a['balance1']) or removeParentNode('font') ]] [[ company.currency_id.symbol ]] +