From 4bd332e92b95bff9226b2cfe483b993b604c2b4a Mon Sep 17 00:00:00 2001
From: "Apa (Open ERP)" <apa@tinyerp.com>
Date: Fri, 23 Jan 2009 12:52:19 +0530
Subject: [PATCH] set formatLang function: 	third_party_ledger 
 partner_balance 	tax_report

bzr revid: apa@tinyerp.com-20090123072219-bijgyafgiwzxbnt9
---
 addons/account/report/partner_balance.rml    | 28 ++++++++++----------
 addons/account/report/tax_report.rml         | 12 ++++-----
 addons/account/report/third_party_ledger.rml | 20 +++++++-------
 3 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/addons/account/report/partner_balance.rml b/addons/account/report/partner_balance.rml
index 1548831e22a..55947fa5654 100644
--- a/addons/account/report/partner_balance.rml
+++ b/addons/account/report/partner_balance.rml
@@ -321,16 +321,16 @@
           <para style="P8"></para>
         </td>
         <td>
-          <para style="P8"><u>[[ sum_debit(data) or '0.0' ]]</u></para>
+          <para style="P8"><u>[[ formatLang(sum_debit(data)) ]]</u></para>
         </td>
         <td>
-          <para style="P8"><u>[[ sum_credit(data) or '0.0' ]]</u></para>
+          <para style="P8"><u>[[ formatLang(sum_credit(data)) ]]</u></para>
         </td>
         <td>
-          <para style="P8"><u>[[ (solde_debit(data)-solde_credit(data)) or '0.0' ]]</u></para>
+          <para style="P8"><u>[[ formatLang((solde_debit(data)-solde_credit(data))) ]]</u></para>
         </td>
         <td>
-          <para style="P8"><u>[[ sum_litige(data) or '0.0' ]]</u></para>
+          <para style="P8"><u>[[ formatLang(sum_litige(data)) ]]</u></para>
         </td>
       </tr>
      <!-- <tr>
@@ -339,10 +339,10 @@
         </td><td>
         </td> <td>
         </td><td>
-          <para style="P8">[[ solde_debit(data) or '0.0' ]]</para>
+          <para style="P8">[[ formatLang(solde_debit(data)) ]]</para>
         </td>
         <td>
-          <para style="P8">[[ solde_credit(data) or '0.0' ]]</para>
+          <para style="P8">[[ formatLang(solde_credit(data)) ]]</para>
         </td>
         <td>
         </td>
@@ -356,26 +356,26 @@
         </td>
         <td>
           <para style="P4">
-          	<font><u>[[ (a['type']==3 or removeParentNode('font')) and setTag('para','para',{'fontName':'Helvetica-Bold'}) ]] [[ a['debit'] or '0.0' ]]</u></font>
-          	<font>[[ (a['type']!=3 or removeParentNode('font')) and setTag('para','para',{'fontName':'Helvetica'}) ]] [[ a['debit'] or '0.0' ]]</font>
+          	<font><u>[[ (a['type']==3 or removeParentNode('font')) and setTag('para','para',{'fontName':'Helvetica-Bold'}) ]] [[ formatLang(a['debit']) ]]</u></font>
+          	<font>[[ (a['type']!=3 or removeParentNode('font')) and setTag('para','para',{'fontName':'Helvetica'}) ]] [[ formatLang(a['debit']) ]]</font>
 		  </para>
         </td>
         <td>
           <para style="P4">
-          	<font><u>[[ (a['type']==3 or removeParentNode('font')) and setTag('para','para',{'fontName':'Helvetica-Bold'}) ]] [[ a['credit'] or '0.0' ]]</u></font>
-          	<font>[[ (a['type']!=3 or removeParentNode('font')) and setTag('para','para',{'fontName':'Helvetica'}) ]] [[ a['credit'] or '0.0' ]]</font>
+          	<font><u>[[ (a['type']==3 or removeParentNode('font')) and setTag('para','para',{'fontName':'Helvetica-Bold'}) ]] [[ formatLang(a['credit']) ]]</u></font>
+          	<font>[[ (a['type']!=3 or removeParentNode('font')) and setTag('para','para',{'fontName':'Helvetica'}) ]] [[ formatLang(a['credit']) ]]</font>
 		  </para>
         </td>
         <td>
           <para style="P4">
-          	<font><u>[[ (a['type']==3 or removeParentNode('font')) and setTag('para','para',{'fontName':'Helvetica-Bold'}) ]] [[ a['balance'] or '0.0' ]]</u></font>
-          	<font>[[ (a['type']!=3 or removeParentNode('font')) and setTag('para','para',{'fontName':'Helvetica'}) ]] [[ a['balance'] or '0.0' ]]</font>
+          	<font><u>[[ (a['type']==3 or removeParentNode('font')) and setTag('para','para',{'fontName':'Helvetica-Bold'}) ]] [[ formatLang(a['balance']) ]]</u></font>
+          	<font>[[ (a['type']!=3 or removeParentNode('font')) and setTag('para','para',{'fontName':'Helvetica'}) ]] [[ formatLang(a['balance'])  ]]</font>
 		  </para>
         </td>
         <td>
           <para style="P4">
-          	<font><u>[[ (a['type']==3 or removeParentNode('font')) and setTag('para','para',{'fontName':'Helvetica-Bold'}) ]] [[ a['enlitige'] or '0.0' ]]</u></font>
-          	<font>[[ (a['type']!=3 or removeParentNode('font')) and setTag('para','para',{'fontName':'Helvetica'}) ]] [[ a['enlitige'] or '0.0' ]]</font>
+          	<font><u>[[ (a['type']==3 or removeParentNode('font')) and setTag('para','para',{'fontName':'Helvetica-Bold'}) ]] [[ formatLang(a['enlitige'] or 0.00) ]]</u></font>
+          	<font>[[ (a['type']!=3 or removeParentNode('font')) and setTag('para','para',{'fontName':'Helvetica'}) ]] [[ formatLang(a['enlitige'] or 0.00) ]]</font>
 		  </para>
         </td>
       </tr>
diff --git a/addons/account/report/tax_report.rml b/addons/account/report/tax_report.rml
index c0140c67708..aa2f25bc85f 100644
--- a/addons/account/report/tax_report.rml
+++ b/addons/account/report/tax_report.rml
@@ -150,19 +150,19 @@
            <td>
         
 				          
-            	<para style="P6"> <font><u><b>[[ len(o['level'])&gt;3 and removeParentNode('font') ]][[ formatLang(o['debit']) and '%.2f'%o['debit'] or '0.00' ]]</b></u></font>
-				          <font>[[ len(o['level'])&lt;4 and removeParentNode('font') ]][[ formatLang(o['debit']) and '%.2f'%o['debit'] or '0.00' ]]</font>
+            	<para style="P6"> <font><u><b>[[ len(o['level'])&gt;3 and removeParentNode('font') ]][[ formatLang(o['debit']) ]]</b></u></font>
+				          <font>[[ len(o['level'])&lt;4 and removeParentNode('font') ]][[ formatLang(o['debit']) ]]</font>
             	</para>
            </td>
            <td>
-           		<para style="P6"> <font><u><b>[[ len(o['level'])&gt;3 and removeParentNode('font') ]][[ formatLang(o['credit']) and '%.2f'%o['credit'] or '0.00' ]]</b></u></font>
-				          <font>[[ len(o['level'])&lt;4 and removeParentNode('font') ]][[ formatLang(o['credit']) and '%.2f'%o['credit'] or '0.00' ]]</font>
+           		<para style="P6"> <font><u><b>[[ len(o['level'])&gt;3 and removeParentNode('font') ]][[ formatLang(o['credit'])]]</b></u></font>
+				          <font>[[ len(o['level'])&lt;4 and removeParentNode('font') ]][[ formatLang(o['credit'])]]</font>
             	</para>
             	
            </td>
            <td>
-           		<para style="P6"> <font><u><b>[[ len(o['level'])&gt;3 and removeParentNode('font') ]][[ formatLang(o['tax_amount']) and '%.2f'%o['tax_amount'] or '0.00' ]]</b></u></font>
-				          <font>[[ len(o['level'])&lt;4 and removeParentNode('font') ]][[ formatLang(o['tax_amount']) and '%.2f'%o['tax_amount'] or '0.00' ]]</font>
+           		<para style="P6"> <font><u><b>[[ len(o['level'])&gt;3 and removeParentNode('font') ]][[ formatLang(o['tax_amount']) ]]</b></u></font>
+				          <font>[[ len(o['level'])&lt;4 and removeParentNode('font') ]][[ formatLang(o['tax_amount']) ]]</font>
             	</para>
             	
            </td>
diff --git a/addons/account/report/third_party_ledger.rml b/addons/account/report/third_party_ledger.rml
index 8f2f399155f..d4cfd537bd8 100644
--- a/addons/account/report/third_party_ledger.rml
+++ b/addons/account/report/third_party_ledger.rml
@@ -166,13 +166,13 @@
 	        	<para style="Balance">Balance brought forward</para>
 	        </td>
 	        <td>
-	        	<para style="P8"><u>[[ formatLang((sum_debit(data)) or 0.00) ]]</u></para>
+	        	<para style="P8"><u>[[ formatLang((sum_debit(data))) ]]</u></para>
 	        </td>
 	        <td>
-	        	<para style="P8"><u>[[ formatLang((sum_credit(data)) or 0.00) ]]</u></para>
+	        	<para style="P8"><u>[[ formatLang((sum_credit(data))) ]]</u></para>
 	        </td>
 	        <td>
-	        	<para style="P8"><u>[[ formatLang((sum_debit(data) - sum_credit(data)) or 0.0) ]]</u></para>
+	        	<para style="P8"><u>[[ formatLang((sum_debit(data) - sum_credit(data))) ]]</u></para>
 	        </td>
 	     </tr>
 	    </blockTable>
@@ -193,20 +193,20 @@
 			        <para style="total"></para>
 		        </td>
 		        <td>
-		            <para style="P9b"><u>[[ formatLang((sum_debit_partner(p,data)) or 0.00) ]]</u></para>
+		            <para style="P9b"><u>[[ formatLang((sum_debit_partner(p,data))) ]]</u></para>
 		        </td>
 		        <td>
-		            <para style="P9b"><u>[[ formatLang((sum_credit_partner(p,data)) or 0.00) ]]</u></para>
+		            <para style="P9b"><u>[[ formatLang((sum_credit_partner(p,data))) ]]</u></para>
 		        </td>
 		        <td>
-		            <para style="P9b"><u>[[ formatLang((sum_debit_partner(p,data) - sum_credit_partner(p,data)) or 0.00) ]]</u></para>
+		            <para style="P9b"><u>[[ formatLang((sum_debit_partner(p,data) - sum_credit_partner(p,data))) ]]</u></para>
 		        </td>
 		     </tr>
 		    </blockTable>
 		    <blockTable colWidths="45.0,30.0,262.0,0.0,69.0,72.0,63.0" style="Table2">
 		     <tr>
 			     <td>
-		    	 	<para style="P15"><font face="Helvetica">[[ repeatIn(lines(p,data), 'line') ]]</font>[[ line['date'] ]]</para>
+		    	 	<para style="P15"><font face="Helvetica">[[ repeatIn(lines(p,data), 'line') ]]</font>[[ formatLang(line['date'],date=True) ]]</para>
 		         </td>
 		         <td>
 		         	<para style="P3">[[ line['code'] ]]</para>
@@ -218,13 +218,13 @@
 		           	<para style="P4"></para>
 		         </td>
 		         <td>
-		           	<para style="P5">[[ formatLang((line['debit']) or 0.00) ]]</para>
+		           	<para style="P5">[[ formatLang((line['debit'])) ]]</para>
 		         </td>
 		         <td>
-		           	<para style="P5">[[ formatLang((line['credit']) or 0.00) ]]</para>
+		           	<para style="P5">[[ formatLang((line['credit'])) ]]</para>
 		         </td>
 		         <td>
-		           	<para style="P5">[[ formatLang((line['progress'])  or 0.00) ]]</para>
+		           	<para style="P5">[[ formatLang((line['progress'])) ]]</para>
 		         </td>
 		     </tr>
 		    </blockTable>