From edb2b9c76e9a57f0e3873f5bdb7e154f74d2bd6a Mon Sep 17 00:00:00 2001
From: Stefan Rijnhart <stefan@therp.nl>
Date: Thu, 1 Aug 2013 20:33:09 +0200
Subject: [PATCH] [FIX] Don't print a zero amount on empty lines in the balance
 sheet 	Reformat the affected rml lines

[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     | 13 +++++++++----
 .../report/account_profit_horizontal.rml            | 10 ++++++++--
 2 files changed, 17 insertions(+), 6 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 9397d256..23436217 100644
--- a/account_financial_report_horizontal/report/account_balance_sheet_horizontal.rml
+++ b/account_financial_report_horizontal/report/account_balance_sheet_horizontal.rml
@@ -203,7 +203,10 @@
           <para style="terp_default_9"><font color="white">[[  '. '*(a['level1']-1) ]]</font><font>[[ a['level1']&lt;4 and ( setTag('para','para',{'style':'terp_default_Bold_9'})) or removeParentNode('font')  ]][[ a['name1'] ]]</font></para>
         </td>
         <td>
-          <para style="terp_default_Right_9"><font>[[ a['level1']&lt;4 and ( setTag('para','para',{'style':'terp_default_Right_9_Bold'})) or removeParentNode('font')  ]]</font><font>[[ formatLang(a['balance1']) ]] [[ company.currency_id.symbol ]]</font></para>
+          <para style="terp_default_Right_9">
+            <font>[[ a['level1']&lt;4 and ( setTag('para','para',{'style':'terp_default_Right_9_Bold'})) or removeParentNode('font')  ]]</font>
+            <font>[[ a['code1'] and formatLang(a['balance1']) or removeParentNode('font') ]] [[ company.currency_id.symbol ]]</font>
+          </para>
         </td>
         <td>
           <para style="terp_default_9"><font face="Times-Roman">[[ repeatIn(get_lines(), 'a') ]]</font> <font>[[ a['level']&lt;4 and ( setTag('para','para',{'style':'terp_default_Bold_9'})) or removeParentNode('font')  ]]</font><font>[[ a['code'] ]]</font><font>[[ a['name']=='Net Profit' and setTag('para','para',{'style':'terp_default_Bold_9'}) or removeParentNode('font') ]]</font></para>
@@ -212,9 +215,11 @@
           <para style="terp_default_9"><font color="white">[[  '. '*(a['level']-1) ]]</font><font>[[ a['level']&lt;4 and ( setTag('para','para',{'style':'terp_default_Bold_9'})) or removeParentNode('font')  ]][[ a['name'] ]]</font><font>[[ a['name']=='Net Profit' and setTag('para','para',{'style':'terp_default_Bold_9'}) or removeParentNode('font') ]]</font></para>
         </td>
         <td>
-          <para style="terp_default_Right_9"><font>[[ a['level1']&lt;4 and ( setTag('para','para',{'style':'terp_default_Right_9_Bold'})) or removeParentNode('font')  ]]</font>
-<font>[[ a['name']=='Net Profit' and setTag('para','para',{'style':'terp_default_Right_9_Bold'}) or removeParentNode('font') ]]</font>
-<font> [[(a['code'] and a['name']) and formatLang(a['balance']) or removeParentNode('font')]] [[ company.currency_id.symbol ]]</font></para>
+          <para style="terp_default_Right_9">
+            <font>[[ a['level1']&lt;4 and ( setTag('para','para',{'style':'terp_default_Right_9_Bold'})) or removeParentNode('font')  ]]</font>
+            <font>[[ a['name']=='Net Profit' and setTag('para','para',{'style':'terp_default_Right_9_Bold'}) or removeParentNode('font') ]]</font>
+            <font>[[ a['code'] and formatLang(a['balance']) or removeParentNode('font') ]] [[ company.currency_id.symbol ]]</font>
+          </para>
         </td>
      </tr>
      </blockTable>
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 @@
             </para>
           </td>
           <td>
-            <para style="terp_default_Right_9"><font>[[ a['level']&lt;4 and ( setTag('para','para',{'style':'terp_default_Right_9_Bold'})) or removeParentNode('font') ]]</font><font>[[ formatLang(a['balance']) ]] [[ company.currency_id.symbol ]]</font></para>
+            <para style="terp_default_Right_9">
+              <font>[[ a['level']&lt;4 and ( setTag('para','para',{'style':'terp_default_Right_9_Bold'})) or removeParentNode('font') ]]</font>
+              <font>[[ a['code'] and formatLang(a['balance']) or removeParentNode('font') ]] [[ company.currency_id.symbol ]]</font>
+            </para>
           </td>
           <td>
             <para style="terp_default_9">
@@ -235,7 +238,10 @@
             </para>
           </td>
           <td>
-            <para style="terp_default_Right_9"><font>[[ a['level']&lt;4 and ( setTag('para','para',{'style':'terp_default_Right_9_Bold'})) or removeParentNode('font') ]]</font><font>[[(a['code1'] and a['name1']) and  formatLang(a['balance1']) or removeParentNode('font') ]] [[ company.currency_id.symbol ]]</font></para>
+            <para style="terp_default_Right_9">
+              <font>[[ a['level1']&lt;4 and ( setTag('para','para',{'style':'terp_default_Right_9_Bold'})) or removeParentNode('font') ]]</font>
+              <font>[[ a['code1'] and formatLang(a['balance1']) or removeParentNode('font') ]] [[ company.currency_id.symbol ]]</font>
+            </para>
           </td>
         </tr>
       </blockTable>