diff --git a/addons/account/report/aged_trial_balance.rml b/addons/account/report/aged_trial_balance.rml
index 4fc50be7ae2..d3658c684c4 100644
--- a/addons/account/report/aged_trial_balance.rml
+++ b/addons/account/report/aged_trial_balance.rml
@@ -103,7 +103,7 @@
           <para style="P2">Partners</para>
         </td>
         <td>
-          <para style="P8">[[ data['form']['direction_selection'] == 'future' and 'Due' or 'Not due' ]] [[formatLang(data['form']['date1'],date=True) ]]</para>
+          <para style="P8">[[ data['form']['direction_selection'] == 'future' and 'Due' or 'Not due' ]] [[ formatLang(data['form']['date1'],date=True) ]]</para>
         </td>
         <td>
           <para style="P8">[[ data['form']['4']['name'] ]]</para>
@@ -134,31 +134,31 @@
         </td>
         <td>
         <para style="P9"><font color="white"> </font></para>
-          <para style="Total_right">[[ get_direction('6') ]] </para>
+          <para style="Total_right">[[ formatLang(get_direction('6') or 0.00) ]] </para>
         </td>
         <td>
         <para style="P9"><font color="white"> </font></para>
-          <para style="Total_right">[[ get_for_period('4') ]]</para>
+          <para style="Total_right">[[ formatLang(get_for_period('4') or 0.00) ]]</para>
         </td>
         <td>
         <para style="P9"><font color="white"> </font></para>
-          <para style="Total_right">[[ get_for_period('3') ]]</para>
+          <para style="Total_right">[[ formatLang(get_for_period('3') or 0.00) ]]</para>
         </td>
         <td>
         <para style="P9"><font color="white"> </font></para>
-          <para style="Total_right">[[ get_for_period('2') ]]</para>
+          <para style="Total_right">[[ formatLang(get_for_period('2') or 0.00) ]]</para>
         </td>
         <td>
         <para style="P9"><font color="white"> </font></para>
-          <para style="Total_right">[[ get_for_period('1') ]]</para>
+          <para style="Total_right">[[ formatLang(get_for_period('1') or 0.00) ]]</para>
         </td>
         <td>
         <para style="P9"><font color="white"> </font></para>
-          <para style="Total_right">[[ get_for_period('0') ]]</para>
+          <para style="Total_right">[[ formatLang(get_for_period('0') or 0.00) ]]</para>
         </td>
         <td>
         <para style="P9"><font color="white"> </font></para>
-          <para style="Total_right">[[ get_total('5') ]]</para>
+          <para style="Total_right">[[ formatLang(get_total('5') or 0.00) ]]</para>
         </td>
       </tr>
       
@@ -168,25 +168,25 @@
           <para style="P2_content">[[ partner['name'] ]]</para>
         </td>
         <td>
-          <para style="content">[[ (partner['direction']) or 0.0 ]] </para>
+          <para style="content">[[ formatLang(partner['direction'] or 0.00) ]] </para>
         </td>
         <td>
-          <para style="content">[[ (partner['4']) or 0.0 ]]</para>
+          <para style="content">[[ formatLang(partner['4'] or 0.00)]]</para>
         </td>
         <td>
-          <para style="content">[[ (partner['3']) or 0.0 ]]</para>
+          <para style="content">[[ formatLang(partner['3'] or 0.00)]]</para>
         </td>
         <td>
-          <para style="content">[[ (partner['2']) or 0.0 ]]</para>
+          <para style="content">[[ formatLang(partner['2'] or 0.00) ]]</para>
         </td>
         <td>
-          <para style="content">[[ (partner['1']) or 0.0  ]]</para>
+          <para style="content">[[ formatLang(partner['1'] or 0.00)  ]]</para>
         </td>
         <td>
-          <para style="content">[[ (partner['0']) or 0.0 ]]</para>
+          <para style="content">[[ formatLang(partner['0'] or 0.00) ]]</para>
         </td>
         <td>
-          <para style="content">[[ (partner['total']) or 0.0 ]]</para>
+          <para style="content">[[ formatLang(partner['total'] or 0.00 ) ]]</para>
         </td>
       </tr>
     </blockTable>
diff --git a/addons/account/report/central_journal.rml b/addons/account/report/central_journal.rml
index 92ed232beff..8ebc61c86e1 100644
--- a/addons/account/report/central_journal.rml
+++ b/addons/account/report/central_journal.rml
@@ -2,31 +2,7 @@
 <document filename="test.pdf">
   <template pageSize="(595.0,842.0)" title="Test" author="Martin Simon" allowSplitting="20">
     <pageTemplate id="first">
-      <frame id="first" x1="57.0" y1="57.0" width="481" height="728"/>
-      <header>
-			<pageGraphics>
-				<setFont name="Helvetica-Bold" size="9"/>
-
-
-				<!--COL 1-->
-				<drawString x="1.0cm" y="28.1cm">[[ company.name ]]</drawString>
-				<drawRightString x="20cm" y="28.1cm">Central Journal - [[ company.currency_id.name ]]</drawRightString>
-				
-				<!-- Header -->
-				
-				
-				<setFont name="Helvetica" size="9"/>
-				<drawString x="1.0cm" y="1cm"> [[ time.strftime("%Y-%m-%d %H:%M", time.localtime()) ]]</drawString>
-				<drawString x="19.0cm" y="1cm">Page <pageNumber/></drawString>
-				<!--<drawRightString x="19.8cm" y="28cm">[[ company.rml_header1 ]]</drawRightString>-->
-				
-
-			    <lineMode width="0.7"/>
-				<lines>1cm 27.7cm 20cm 27.7cm</lines>
-				<setFont name="Helvetica" size="8"/>
-			
-			</pageGraphics>
-		</header>   
+      <frame id="first" x1="28.0" y1="42.0" width="539" height="758"/>
     </pageTemplate>
   </template>
   <stylesheet>
@@ -69,7 +45,10 @@
     <blockTableStyle id="Table_Account_detail_Title">
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
-      <lineStyle kind="LINEBELOW" colorName="#000000" start="0,0" stop="-1,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="2,-1" stop="2,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="3,-1" stop="3,-1"/>
     </blockTableStyle>
     <blockTableStyle id="Table_Final_Total">
       <blockAlignment value="LEFT"/>
@@ -103,13 +82,13 @@
     <paraStyle name="terp_header" fontName="Helvetica-Bold" fontSize="12.0" leading="15" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/>
     <paraStyle name="Heading 9" fontName="Helvetica-Bold" fontSize="75%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
     <paraStyle name="terp_tblheader_General" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/>
-    <paraStyle name="terp_tblheader_Details" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_tblheader_Details" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/>
     <paraStyle name="terp_default_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="terp_default_Bold_8" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="terp_tblheader_General_Centre" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
     <paraStyle name="terp_tblheader_General_Right" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="6.0" spaceAfter="6.0"/>
-    <paraStyle name="terp_tblheader_Details_Centre" fontName="Helvetica" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
-    <paraStyle name="terp_tblheader_Details_Right" fontName="Helvetica" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_tblheader_Details_Centre" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_tblheader_Details_Right" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="6.0" spaceAfter="6.0"/>
     <paraStyle name="terp_default_Right_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="terp_default_Centre_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="terp_header_Right" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/>
@@ -124,7 +103,17 @@
   </stylesheet>
   <images/>
   <story>
-    <!--blockTable colWidths="180.0,180.0,180.0" style="Table_header_Content">
+    <para style="terp_default_8">
+      <font color="white"> </font>
+    </para>
+    <para style="terp_default_8">
+      <font color="white"> </font>
+    </para>
+    <para style="terp_default_8">
+      <font color="white"> </font>
+    </para>
+    <para style="terp_default_8">[[ repeatIn(objects, 'o') ]]</para>
+    <blockTable colWidths="180.0,180.0,180.0" style="Table_header_Content">
       <tr>
         <td>
           <para style="terp_header">[[ company.name ]]</para>
@@ -138,14 +127,10 @@
           <para style="terp_header">Central Journal-[[ company.currency_id.name ]]</para>
         </td>
       </tr>
-    </blockTable-->
+    </blockTable>
     <para style="terp_default_8">
       <font color="white"> </font>
     </para>
-    <para style="terp_default_8">
-      <font color="white"> </font>
-    </para>
-    <para style="terp_default_8">[[ repeatIn(objects, 'o') ]]</para>
     <blockTable colWidths="180.0,180.0,180.0" style="Table_Sub_Header_Content">
       <tr>
         <td>
@@ -162,26 +147,23 @@
     <blockTable colWidths="180.0,180.0,180.0" style="Table_Subheader_Content_detail">
       <tr>
         <td>
-          <para style="terp_default_Centre_8">[[ o.journal_id.code or '' ]]</para>
+          <para style="terp_tblheader_General_Centre">[[ o.journal_id.code or '' ]]</para>
         </td>
         <td>
-          <para style="terp_default_Centre_8">[[ o.journal_id.name ]]</para>
+          <para style="terp_tblheader_General_Centre">[[ o.journal_id.name ]]</para>
         </td>
         <td>
-          <para style="terp_default_Centre_8">[[ time.strftime('%Y-%m-%d') ]] at [[ time.strftime('%H:%M:%S') ]]</para>
+          <para style="terp_tblheader_General_Centre">[[ formatLang(time.strftime('%Y-%m-%d %H:%M:%S'),date_time = True) ]] </para>
         </td>
       </tr>
     </blockTable>
     <para style="terp_default_8">
       <font color="white"> </font>
     </para>
-    <para style="terp_default_8">
-      <font color="white"> </font>
-    </para>
-    <blockTable colWidths="83.0,272.0,95.0,89.0" style="Table_Account_detail_Title" repeatRows="1">
+    <blockTable colWidths="83.0,269.0,95.0,92.0" style="Table_Account_detail_Title">
       <tr>
         <td>
-          <para style="terp_tblheader_Details_Centre">Account Num.</para>
+          <para style="terp_tblheader_Details">Account Num.</para>
         </td>
         <td>
           <para style="terp_tblheader_Details">Account Name</para>
@@ -193,52 +175,53 @@
           <para style="terp_tblheader_Details_Right">Credit</para>
         </td>
       </tr>
-      
+    </blockTable>
+    <para style="terp_default_2">
+      <font color="white"> </font>
+    </para>
+    <blockTable colWidths="83.0,269.0,94.0,92.0" style="Table_Final_Total">
       <tr>
-      <td>
-	    <blockTable colWidths="80.0,272.0,94.0,87.0" style="Table_Final_Total">
-	      <tr>
-	        <td>
-	          <para style="terp_default_Bold_9">Total:</para>
-	        </td>
-	        <td>
-	          <para style="terp_default_Bold_9">
-	          <font color="white"> </font>
-	          </para>
-	        </td>
-	        <td>
-	          <para style="terp_default_Bold_9_Right">[[ '%.2f' % sum_debit(o.period_id.id, o.journal_id.id) ]]</para>
-	        </td>
-	        <td>
-	          <para style="terp_default_Bold_9_Right">[[ '%.2f' % sum_credit(o.period_id.id, o.journal_id.id) ]]</para>
-	        </td>
-	      </tr>
-	    </blockTable>
-      </td>
+        <td>
+          <para style="terp_default_Bold_9">Total:</para>
+        </td>
+        <td>
+          <para style="terp_default_Bold_9">
+            <font color="white"> </font>
+          </para>
+        </td>
+        <td>
+          <para style="terp_default_Bold_9_Right">[[ formatLang( sum_debit(o.period_id.id, o.journal_id.id)) ]]</para>
+        </td>
+        <td>
+          <para style="terp_default_Bold_9_Right">[[ formatLang( sum_credit(o.period_id.id, o.journal_id.id)) ]]</para>
+        </td>
       </tr>
-      
-      <tr>
-      <td>
-	      <para style="terp_default_8">[[ repeatIn(lines(o.period_id.id,o.journal_id.id),'line') ]]</para>
-	      <blockTable colWidths="80.0,272.0,94.0,87.0" style="Table_Journal_Line_Content">
-	        <tr>
-	          <td>
-	            <para style="terp_default_9">[[ line['code'] ]]</para>
-	          </td>
-	          <td>
-	            <para style="terp_default_9">[[ line['name'] ]]</para>
-	          </td>
-	          <td>
-	            <para style="terp_default_Right_9">[[ formatLang(line['debit']) and '%.2f' % line['debit'] or '0.00' ]]</para>
-	          </td>
-	          <td>
-	            <para style="terp_default_Right_9">[[ formatLang(line['credit']) and '%.2f' % line['credit'] or '0.00' ]]</para>
-	          </td>
-	        </tr>
-	      </blockTable>
-   	  </td>
-   	  </tr>
-   	 </blockTable>   
+    </blockTable>
+    <para style="terp_default_2">
+      <font color="white"> </font>
+    </para>
+    <section>
+      <para style="terp_default_8">[[ repeatIn(lines(o.period_id.id,o.journal_id.id),'line') ]]</para>
+      <blockTable colWidths="83.0,269.0,94.0,92.0" style="Table_Journal_Line_Content">
+        <tr>
+          <td>
+            <para style="terp_default_9">[[ line['code'] ]]</para>
+          </td>
+          <td>
+            <para style="terp_default_9">[[ line['name'] ]]</para>
+          </td>
+          <td>
+            <para style="terp_default_Right_9">[[ formatLang(line['debit']) ]]</para>
+          </td>
+          <td>
+            <para style="terp_default_Right_9">[[ formatLang(line['credit'])]]</para>
+          </td>
+        </tr>
+      </blockTable>
+      <para style="terp_default_2">
+        <font color="white"> </font>
+      </para>
+    </section>
     <para style="terp_default_8">
       <font color="white"> </font>
     </para>
diff --git a/addons/account/report/general_journal.rml b/addons/account/report/general_journal.rml
index d7775dd3cbb..365967e47e5 100644
--- a/addons/account/report/general_journal.rml
+++ b/addons/account/report/general_journal.rml
@@ -2,31 +2,7 @@
 <document filename="test.pdf">
   <template pageSize="(596.0,842.0)" title="Test" author="Martin Simon" allowSplitting="20">
     <pageTemplate id="first">
-     <frame id="first" x1="57.0" y1="57.0" width="481" height="728"/>
-      <header>
-			<pageGraphics>
-				<setFont name="Helvetica-Bold" size="9"/>
-
-
-				<!--COL 1-->
-				<drawString x="1.0cm" y="28.1cm">[[ company.name ]]</drawString>
-				<drawRightString x="20cm" y="28.1cm">General Journal - [[ company.currency_id.name ]]</drawRightString>
-				
-				<!-- Header -->
-				
-				
-				<setFont name="Helvetica" size="9"/>
-				<drawString x="1.0cm" y="1cm"> [[ time.strftime("%Y-%m-%d %H:%M", time.localtime()) ]]</drawString>
-				<drawString x="19.0cm" y="1cm">Page <pageNumber/></drawString>
-				<!--<drawRightString x="19.8cm" y="28cm">[[ company.rml_header1 ]]</drawRightString>-->
-				
-
-			    <lineMode width="0.7"/>
-				<lines>1cm 27.7cm 20cm 27.7cm</lines>
-				<setFont name="Helvetica" size="8"/>
-			
-			</pageGraphics>
-		</header>   
+      <frame id="first" x1="28.0" y1="42.0" width="540" height="758"/>
     </pageTemplate>
   </template>
   <stylesheet>
@@ -45,7 +21,11 @@
     <blockTableStyle id="Table_Journal_Title">
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
-      <lineStyle kind="LINEBELOW" colorName="#000000" start="0,0" stop="-1,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="2,-1" stop="2,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="3,-1" stop="3,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="4,-1" stop="4,-1"/>
     </blockTableStyle>
     <blockTableStyle id="Table_Final_Total">
       <blockAlignment value="LEFT"/>
@@ -59,8 +39,9 @@
     <blockTableStyle id="Table_Sub_Total">
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
-      <lineStyle kind="LINEBELOW" colorName="#b3b3b3" start="0,0" stop="2,2"/>
-      <lineStyle kind="LINEBELOW" colorName="white" start="0,1" stop="-1,1"/>
+      <lineStyle kind="LINEBELOW" colorName="#b3b3b3" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#b3b3b3" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#b3b3b3" start="2,-1" stop="2,-1"/>
     </blockTableStyle>
     <blockTableStyle id="Table_Journal_Detail">
       <blockAlignment value="LEFT"/>
@@ -82,13 +63,13 @@
     <paraStyle name="terp_header" fontName="Helvetica-Bold" fontSize="12.0" leading="15" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/>
     <paraStyle name="Heading 9" fontName="Helvetica-Bold" fontSize="75%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
     <paraStyle name="terp_tblheader_General" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/>
-    <paraStyle name="terp_tblheader_Details" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_tblheader_Details" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/>
     <paraStyle name="terp_default_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="terp_default_Bold_8" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="terp_tblheader_General_Centre" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
     <paraStyle name="terp_tblheader_General_Right" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="6.0" spaceAfter="6.0"/>
-    <paraStyle name="terp_tblheader_Details_Centre" fontName="Helvetica" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
-    <paraStyle name="terp_tblheader_Details_Right" fontName="Helvetica" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_tblheader_Details_Centre" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_tblheader_Details_Right" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="6.0" spaceAfter="6.0"/>
     <paraStyle name="terp_default_Right_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="terp_default_Centre_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="terp_header_Right" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/>
@@ -106,7 +87,13 @@
     <para style="terp_default_8">
       <font color="white"> </font>
     </para>
-    <!--blockTable colWidths="180.0,180.0,180.0" style="Table_Header_Title">
+    <para style="terp_default_8">
+      <font color="white"> </font>
+    </para>
+    <para style="terp_default_8">
+      <font color="white"> </font>
+    </para>
+    <blockTable colWidths="180.0,180.0,180.0" style="Table_Header_Title">
       <tr>
         <td>
           <para style="terp_header">[[ company.name ]]</para>
@@ -120,17 +107,17 @@
           <para style="terp_header">General Journal - [[ company.currency_id.name ]]</para>
         </td>
       </tr>
-    </blockTable-->
+    </blockTable>
     <para style="terp_default_8">
       <font color="white"> </font>
     </para>
-    <blockTable colWidths="75.0,465.0" style="Table_Print_Current_datetime">
+    <blockTable colWidths="68.0,471.0" style="Table_Print_Current_datetime">
       <tr>
         <td>
           <para style="terp_default_Bold_9">Printing Date :</para>
         </td>
         <td>
-          <para style="terp_default_9">[[ time.strftime('%Y-%m-%d') ]] at [[ time.strftime('%H:%M:%S') ]]</para>
+          <para style="terp_default_Bold_9">[[ formatLang(time.strftime('%Y-%m-%d %H:%M:%S'),date_time=True) ]] </para>
         </td>
       </tr>
     </blockTable>
@@ -140,11 +127,10 @@
     <para style="terp_default_8">
       <font color="white"> </font>
     </para>
-    <section>
-    <blockTable colWidths="61.0,228.0,95.0,80.0,73.0" style="Table_Journal_Title" repeatRows="1">
+    <blockTable colWidths="72.0,218.0,89.0,83.0,77.0" style="Table_Journal_Title">
       <tr>
         <td>
-          <para style="terp_tblheader_Details">Jrl Code</para>
+          <para style="terp_tblheader_Details">Code</para>
         </td>
         <td>
           <para style="terp_tblheader_Details">Journal Name</para>
@@ -159,87 +145,86 @@
           <para style="terp_tblheader_Details_Right">Credit Trans.</para>
         </td>
       </tr>
-      
+    </blockTable>
+    <para style="terp_default_2">
+      <font color="white"> </font>
+    </para>
+    <blockTable colWidths="71.0,219.0,89.0,83.0,77.0" style="Table_Final_Total">
       <tr>
-      <td>
-	    <blockTable colWidths="64.0,226.0,82.0,82.0,76.0" style="Table_Final_Total">
-	      <tr>
-	        <td>
-	          <para style="terp_default_Bold_9">Total:</para>
-	        </td>
-	        <td>
-	          <para style="terp_default_Bold_9">
-	            <font color="white"> </font>
-	          </para>
-	        </td>
-	        <td>
-	          <para style="terp_default_Bold_9">
-	            <font color="white"> </font>
-	          </para>
-	        </td>
-	        <td>
-	          <para style="terp_default_Bold_9_Right"><u>[[ '%.2f' % sum_debit() ]]</u></para>
-	        </td>
-	        <td>
-	          <para style="terp_default_Bold_9_Right"><u>[[ '%.2f' % sum_credit() ]]</u></para>
-	        </td>
-	      </tr>
-	    </blockTable>
-	   </td>
-	   </tr>
-	   
-	   <tr>
-	   <td>
-	      <para style="terp_default_8">[[ repeatIn( periods(objects), 'o') ]]</para>
-	      <blockTable colWidths="175.0,115.0,82.0,82.0,75.0" style="Table_Sub_Total">
-	        <tr>
-	          <td>
-	            <para style="terp_default_Bold_9">[[ o.name ]] :</para>
-	          </td>
-	          <td>
-	            <para style="terp_default_Bold_9">
-	              <font color="white"> </font>
-	            </para>
-	          </td>
-	          <td>
-	            <para style="terp_default_Bold_9">
-	              <font color="white"> </font>
-	            </para>
-	          </td>
-	          <td>
-	            <para style="terp_default_Bold_9_Right"><u>[[ '%.2f' % sum_debit_period(o.id) ]]</u></para>
-	          </td>
-	          <td>
-	            <para style="terp_default_Bold_9_Right"><u>[[ '%.2f' % sum_credit_period(o.id) ]]</u></para>
-	          </td>
-	        </tr>
-			 <tr>
-			 <td>
-			      <blockTable colWidths="60.0,219.0,88.0,80.0,76.0" style="Table_Journal_Detail">
-			        <tr>
-			          <td>
-			            <para style="terp_default_9"><font>[[ repeatIn(lines(o.id),'line')]]</font>[[ line['code'] ]]</para>
-			          </td>
-			          <td>
-			            <para style="terp_default_9">[[ line['name'] ]]</para>
-			          </td>
-			          <td>
-			            <para style="terp_default_9">[[ o.name ]]</para>
-			          </td>
-			          <td>
-			            <para style="terp_default_Right_9">[[ line['debit'] and ('%.2f' % line['debit']) or '' ]]</para>
-			          </td>
-			          <td>
-			            <para style="terp_default_Right_9">[[ line['credit'] and ('%.2f' % line['credit']) or '' ]]</para>
-			          </td>
-			        </tr>
-			      </blockTable>
-			  </td>
-			  </tr>
-			  </blockTable>
-		</td>
-		</tr>
-	  </blockTable>
+        <td>
+          <para style="terp_default_Bold_9">Total:</para>
+        </td>
+        <td>
+          <para style="terp_default_Bold_9">
+            <font color="white"> </font>
+          </para>
+        </td>
+        <td>
+          <para style="terp_default_Bold_9">
+            <font color="white"> </font>
+          </para>
+        </td>
+        <td>
+          <para style="terp_default_Bold_9_Right">[[ formatLang(sum_debit()) ]]</para>
+        </td>
+        <td>
+          <para style="terp_default_Bold_9_Right">[[ formatLang( sum_credit()) ]]</para>
+        </td>
+      </tr>
+    </blockTable>
+    <para style="terp_default_2">
+      <font color="white"> </font>
+    </para>
+    <section>
+      <para style="terp_default_8">[[ repeatIn( periods(objects), 'o') ]]</para>
+      <blockTable colWidths="176.0,115.0,89.0,83.0,76.0" style="Table_Sub_Total">
+        <tr>
+          <td>
+            <para style="terp_default_Bold_9">[[ o.name ]] :</para>
+          </td>
+          <td>
+            <para style="terp_default_Bold_9">
+              <font color="white"> </font>
+            </para>
+          </td>
+          <td>
+            <para style="terp_default_Bold_9">
+              <font color="white"> </font>
+            </para>
+          </td>
+          <td>
+            <para style="terp_default_Bold_9_Right">[[ formatLang(sum_debit_period(o.id)) ]]</para>
+          </td>
+          <td>
+            <para style="terp_default_Bold_9_Right">[[ formatLang(sum_credit_period(o.id)) ]]</para>
+          </td>
+        </tr>
+      </blockTable>
+      <para style="terp_default_2">
+        <font color="white"> </font>
+      </para>
+      <blockTable colWidths="71.0,219.0,91.0,83.0,76.0" style="Table_Journal_Detail">
+        <tr>
+          <td>
+            <para style="terp_default_9"><font face="Times-Roman">[[ repeatIn(lines(o.id),'line')]]</font> [[ line['code'] ]]</para>
+          </td>
+          <td>
+            <para style="terp_default_9">[[ line['name'] ]]</para>
+          </td>
+          <td>
+            <para style="terp_default_9">[[ o.name ]]</para>
+          </td>
+          <td>
+            <para style="terp_default_Right_9">[[ formatLang(line['debit'] )]]</para>
+          </td>
+          <td>
+            <para style="terp_default_Right_9">[[ formatLang(line['credit']) ]]</para>
+          </td>
+        </tr>
+      </blockTable>
+      <para style="terp_default_2">
+        <font color="white"> </font>
+      </para>
     </section>
     <para style="terp_default_8">
       <font color="white"> </font>