From 84e9c24e539df43e2ea560320d2088783d643448 Mon Sep 17 00:00:00 2001
From: apa-tiny <apa@tinyerp.com>
Date: Fri, 27 Aug 2010 14:44:13 +0530
Subject: [PATCH] [IMP]:Improved rml reports.

bzr revid: apa@tinyerp.com-20100827091413-yggrgit6chbj69ed
---
 .../report/attendance_errors.rml              |   4 +-
 addons/hr_payroll/report/payslip.rml          |   5 +-
 addons/mrp/report/bom_structure.py            |  10 +-
 addons/mrp/report/bom_structure.rml           |   4 +-
 addons/mrp/report/order.rml                   |  28 +-
 addons/point_of_sale/report/pos_details.py    |   6 +-
 addons/point_of_sale/report/pos_details.rml   | 644 ++++++++----------
 7 files changed, 324 insertions(+), 377 deletions(-)

diff --git a/addons/hr_attendance/report/attendance_errors.rml b/addons/hr_attendance/report/attendance_errors.rml
index 6df3084b862..1275677ee19 100644
--- a/addons/hr_attendance/report/attendance_errors.rml
+++ b/addons/hr_attendance/report/attendance_errors.rml
@@ -121,10 +121,10 @@
                 <para style="terp_default_Centre_9">[[ att['action']  ]]</para>
               </td>
               <td>
-                <para style="terp_default_Centre_9">[[  att['date']  ]]</para>
+                <para style="terp_default_Centre_9">[[  formatLang(att['date'],date_time=True)  ]]</para>
               </td>
               <td>
-                <para style="terp_default_Centre_9">[[ att['create_date'] ]]</para>
+                <para style="terp_default_Centre_9">[[ formatLang(att['create_date'],date_time=True) ]]</para>
               </td>
               <td>
                 <para style="terp_default_Centre_9">[[ att['delay']  ]]</para>
diff --git a/addons/hr_payroll/report/payslip.rml b/addons/hr_payroll/report/payslip.rml
index 30f20d167c6..f07c1109ac6 100755
--- a/addons/hr_payroll/report/payslip.rml
+++ b/addons/hr_payroll/report/payslip.rml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <document filename="test.pdf">
-  <template pageSize="(595.0,842.0)" title="Test" author="Martin Simon" allowSplitting="20">
+  <template pageSize="(595.0,842.0)" title="Pay Slip" author="Martin Simon" allowSplitting="20">
     <pageTemplate id="first">
       <frame id="first" x1="28.0" y1="28.0" width="539" height="786"/>
     </pageTemplate>
@@ -270,8 +270,7 @@
     <blockTable colWidths="539.0" style="Table2">
       <tr>
         <td>
-          <para style="terp_tblheader_General_Centre">Pay Slip </para>
-          <para style="terp_default_Centre_9">For the month of [[ get_month(o) ]]</para>
+          <para style="terp_header_Centre">Pay Slip</para>
         </td>
       </tr>
     </blockTable>
diff --git a/addons/mrp/report/bom_structure.py b/addons/mrp/report/bom_structure.py
index fa2f5835ae4..b38f2499c40 100644
--- a/addons/mrp/report/bom_structure.py
+++ b/addons/mrp/report/bom_structure.py
@@ -1,6 +1,6 @@
 ## -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
 #
@@ -15,7 +15,7 @@
 #    GNU Affero General Public License for more details.
 #
 #    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
@@ -52,12 +52,12 @@ class bom_structure(report_sxw.rml_parse):
                     if level>0 and level<6:
                         level -= 1
             return result
-        
+
         children = _get_rec(object,level)
-        
+
         return children
 
-report_sxw.report_sxw('report.bom.structure','mrp.bom','mrp/report/bom_structure.rml',parser=bom_structure)
+report_sxw.report_sxw('report.bom.structure','mrp.bom','mrp/report/bom_structure.rml',parser=bom_structure,header='internal')
 
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/mrp/report/bom_structure.rml b/addons/mrp/report/bom_structure.rml
index 527c26d1581..93f2db207bc 100644
--- a/addons/mrp/report/bom_structure.rml
+++ b/addons/mrp/report/bom_structure.rml
@@ -1,8 +1,8 @@
 <?xml version="1.0"?>
 <document filename="test.pdf">
-  <template pageSize="(612.0,792.0)" title="Test" author="Martin Simon" allowSplitting="20">
+  <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="498" height="678"/>
+      <frame id="first" x1="34.0" y1="42.0" width="527" height="758"/>
     </pageTemplate>
   </template>
   <stylesheet>
diff --git a/addons/mrp/report/order.rml b/addons/mrp/report/order.rml
index 5ed1af444f1..b394394bb31 100644
--- a/addons/mrp/report/order.rml
+++ b/addons/mrp/report/order.rml
@@ -20,12 +20,9 @@
       <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="1,0" stop="1,0"/>
       <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
       <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="2,0" stop="2,-1"/>
+      <lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="2,0" stop="2,-1"/>
       <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="2,0" stop="2,0"/>
       <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="2,-1" stop="2,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="3,0" stop="3,-1"/>
-      <lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="3,0" stop="3,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="3,0" stop="3,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="3,-1" stop="3,-1"/>
     </blockTableStyle>
     <blockTableStyle id="Table5">
       <blockAlignment value="LEFT"/>
@@ -37,12 +34,9 @@
       <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="1,0" stop="1,0"/>
       <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
       <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="2,0" stop="2,-1"/>
+      <lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="2,0" stop="2,-1"/>
       <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="2,0" stop="2,0"/>
       <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="2,-1" stop="2,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="3,0" stop="3,-1"/>
-      <lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="3,0" stop="3,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="3,0" stop="3,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="3,-1" stop="3,-1"/>
     </blockTableStyle>
     <blockTableStyle id="Table1">
       <blockAlignment value="LEFT"/>
@@ -189,7 +183,7 @@
     <para style="terp_default_8">
       <font color="white"> </font>
     </para>
-    <blockTable colWidths="193.0,83.0,122.0,129.0" style="Table3">
+    <blockTable colWidths="193.0,93.0,242.0" style="Table3">
       <tr>
         <td>
           <para style="terp_tblheader_General_Centre">Product </para>
@@ -197,24 +191,18 @@
         <td>
           <para style="terp_tblheader_General_Centre">Quantity</para>
         </td>
-        <td>
-          <para style="terp_tblheader_General_Centre">Priority</para>
-        </td>
         <td>
           <para style="terp_tblheader_General_Centre">Note</para>
         </td>
       </tr>
     </blockTable>
-    <blockTable colWidths="193.0,83.0,122.0,129.0" style="Table5">
+    <blockTable colWidths="193.0,93.0,242.0" style="Table5">
       <tr>
         <td>
           <para style="terp_default_Centre_8">[[ o.product_id.code ]] [[ o.product_id.name ]]</para>
         </td>
         <td>
-          <para style="terp_default_Centre_8">[[formatLang(o.product_qty) ]]</para>
-        </td>
-        <td>
-          <para style="terp_default_Centre_8">[[o.priority or '']]</para>
+          <para style="terp_default_Centre_8">[[formatLang(o.product_qty) ]] [[ o.product_uom.name ]]</para>
         </td>
         <td>
           <para style="terp_default_Centre_8">[[ o.product_id.description or '' ]]</para>
@@ -224,7 +212,7 @@
     <para style="terp_default_8">
       <font color="white"> </font>
     </para>
-    <blockTable colWidths="193.0,83.0,122.0,129.0" repeatRows="1" style="Table1">
+    <blockTable colWidths="193.0,92.0,114.0,129.0" repeatRows="1" style="Table1">
       <tr>
         <td>
           <para style="terp_tblheader_General_Centre">Planned Date</para>
@@ -241,7 +229,7 @@
       </tr>
     </blockTable>
     <section>
-      <blockTable colWidths="193.0,83.0,122.0,129.0" style="Table2">
+      <blockTable colWidths="193.0,92.0,114.0,129.0" style="Table2">
         <tr>
           <td>
             <para style="terp_default_Centre_8">[[ formatLang(o.date_planned, date_time = True) ]]</para>
@@ -386,4 +374,4 @@
       </para>
     </section>
   </story>
-</document>
+</document>
\ No newline at end of file
diff --git a/addons/point_of_sale/report/pos_details.py b/addons/point_of_sale/report/pos_details.py
index 7715f1b78be..44b73be6570 100644
--- a/addons/point_of_sale/report/pos_details.py
+++ b/addons/point_of_sale/report/pos_details.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
 #
@@ -15,7 +15,7 @@
 #    GNU Affero General Public License for more details.
 #
 #    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
@@ -207,7 +207,7 @@ class pos_details(report_sxw.rml_parse):
             'getinvoice':self._get_invoice,
         })
 
-report_sxw.report_sxw('report.pos.details', 'pos.order', 'addons/point_of_sale_singer/report/pos_details.rml', parser=pos_details, header=None)
+report_sxw.report_sxw('report.pos.details', 'pos.order', 'addons/point_of_sale_singer/report/pos_details.rml', parser=pos_details, header='external')
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/point_of_sale/report/pos_details.rml b/addons/point_of_sale/report/pos_details.rml
index 10bfb2435dc..a86460116da 100644
--- a/addons/point_of_sale/report/pos_details.rml
+++ b/addons/point_of_sale/report/pos_details.rml
@@ -1,53 +1,57 @@
 <?xml version="1.0"?>
 <document filename="test.pdf">
-    <template pageSize="(595.0,842.0)" title="Test" author="Martin Simon" allowSplitting="20">
-        <pageTemplate id="first">
-            <frame id="first" x1="5.0" y1="57.0" width="590" height="828"/>
-        </pageTemplate>
-    </template>
-    <stylesheet>
+  <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"/>
+    </pageTemplate>
+  </template>
+  <stylesheet>
+    <blockTableStyle id="Standard_Outline">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table1">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="0,0" stop="0,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="0,0" stop="0,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="1,0" stop="1,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="1,0" stop="1,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="2,0" stop="2,-1"/>
+      <lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="2,0" stop="2,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="2,0" stop="2,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="2,-1" stop="2,-1"/>
+    </blockTableStyle>
     <blockTableStyle id="Table2">
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
-      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="0,0" stop="-1,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,0" stop="-1,-1"/>
-      <lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="0,0" stop="-1,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="0,0" stop="-1,-1"/>
-    </blockTableStyle>
-    <blockTableStyle id="Table3">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="0,0" stop="-1,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,0" stop="-1,-1"/>
-      <lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="0,0" stop="-1,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="0,0" stop="-1,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="0,0" stop="0,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="0,0" stop="0,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="1,0" stop="1,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="1,0" stop="1,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="2,0" stop="2,-1"/>
+      <lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="2,0" stop="2,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="2,0" stop="2,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="2,-1" stop="2,-1"/>
     </blockTableStyle>
     <blockTableStyle id="Table4">
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
-      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="0,0" stop="-1,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,0" stop="-1,-1"/>
-      <lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="0,0" stop="-1,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="0,0" stop="-1,-1"/>
-
-    </blockTableStyle>
-
-    <blockTableStyle id="Table5">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,0" stop="-1,-1"/>
-
+      <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"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="5,-1" stop="5,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="6,-1" stop="6,-1"/>
     </blockTableStyle>
     <blockTableStyle id="Table6">
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
-
-    </blockTableStyle>
-
-	<blockTableStyle id="Tableau7">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
       <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
       <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
       <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="2,-1" stop="2,-1"/>
@@ -55,342 +59,298 @@
       <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="4,-1" stop="4,-1"/>
       <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="5,-1" stop="5,-1"/>
       <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="6,-1" stop="6,-1"/>
-
     </blockTableStyle>
-    <blockTableStyle id="Table7">
+    <blockTableStyle id="Table3">
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
-      <lineStyle kind="LINEBELOW" colorName="#000000" start="0,-1" stop="0,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#000000" start="0,0" stop="-1,-1"/>
-	  <lineStyle kind="LINEBELOW" colorName="#000000" start="0,0" stop="1,0"/>
-
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="0,0" stop="0,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="0,0" stop="0,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="1,0" stop="1,-1"/>
+      <lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="1,0" stop="1,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="1,0" stop="1,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="0,1" stop="0,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="1,1" stop="1,-1"/>
+      <lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="1,1" stop="1,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table5">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="0,0" stop="0,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="0,0" stop="0,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="1,0" stop="1,-1"/>
+      <lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="1,0" stop="1,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="1,0" stop="1,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="0,1" stop="0,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="1,1" stop="1,-1"/>
+      <lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="1,1" stop="1,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
     </blockTableStyle>
     <blockTableStyle id="Table8">
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
-      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,0" stop="-1,-1"/>
-	  <lineStyle kind="LINEABOVE" colorName="#000000" start="0,-1" stop="-1,-1"/>
-
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="1,-1" stop="1,-1"/>
     </blockTableStyle>
-        <blockTableStyle id="Standard_Outline">
-            <blockAlignment value="LEFT"/>
-            <blockValign value="TOP"/>
-        </blockTableStyle>
-        <blockTableStyle id="Tableau8">
-            <blockAlignment value="LEFT"/>
-            <blockValign value="TOP"/>
-            <lineStyle kind="GRID" colorName="black"/>
-            <blockBackground colorName="#dddddd" start="0,0" stop="-1,0"/>
-        </blockTableStyle>
-        <blockTableStyle id="Tableau6">
-            <blockAlignment value="LEFT"/>
-            <blockValign value="TOP"/>
-            <lineStyle kind="GRID" colorName="grey"/>
-            <blockBackground colorName="#e6e6e6" start="0,-1" stop="-1,-1"/>
-        </blockTableStyle>
-
-        <blockTableStyle id="Table1">
-            <blockAlignment value="LEFT"/>
-            <blockValign value="TOP"/>
-        </blockTableStyle>
-        <blockTableStyle id="tmpTable1">
-            <blockAlignment value="LEFT"/>
-            <blockValign value="TOP"/>
-        </blockTableStyle>
-        <blockTableStyle id="tmpTable2">
-            <blockAlignment value="CENTER"/>
-            <blockValign value="TOP"/>
-        </blockTableStyle>
-        <blockTableStyle id="tmpTable3">
-            <blockAlignment value="LEFT"/>
-            <blockValign value="TOP"/>
-            <lineStyle kind="GRID" colorName="black"/>
-        </blockTableStyle>
-        <blockTableStyle id="tmpTable4">
-            <blockAlignment value="LEFT"/>
-            <blockValign value="TOP"/>
-            <lineStyle kind="GRID" colorName="black"/>
-        </blockTableStyle>
-        <initialize>
-            <paraStyle name="all" alignment="justify"/>
-        </initialize>
-        <paraStyle name="terp_tblheader_Details_Center" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="Center" spaceBefore="6.0" spaceAfter="6.0"/>
-        <paraStyle name="terp_default_Right_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.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_header_Centre" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="CENTER" spaceBefore="12.0" spaceAfter="6.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_header" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="LEFT" spaceBefore="12.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_Centre_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
-        <paraStyle name="terp_default_Left_9_Bold" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-        <paraStyle name="terp_default_Right_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.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_Centre_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
-    	<paraStyle name="terp_default_Right_9_bold" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
-    	<paraStyle name="terp_default_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-        <paraStyle name="P1" fontName="Times-Roman" fontSize="11.0" leading="14"/>
-        <paraStyle name="P2" fontName="Times-Roman" fontSize="11.0" leading="14" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
-        <paraStyle name="P3" fontName="Times-Roman" fontSize="8.0" leading="14" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
-        <paraStyle name="P4" fontName="Times-Roman" fontSize="8.0" leading="14" spaceBefore="0.0" spaceAfter="6.0"/>
-        <paraStyle name="P5" fontName="Times-Roman" fontSize="8.0" leading="14" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/>
-        <paraStyle name="P6" fontName="Times-Roman" fontSize="11.0" leading="14" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
-        <paraStyle name="P7" fontName="Times-Roman" fontSize="11.0" leading="14" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
-        <paraStyle name="P16" fontName="Times-Roman" fontSize="8.0" leading="14" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
-        <paraStyle name="P17" fontName="Times-Bold" fontSize="8.0" leading="14" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
-        <paraStyle name="P8" fontName="Times-Roman" fontSize="8.0" leading="10" spaceBefore="0.0" spaceAfter="0.0"/>
-        <paraStyle name="P9" fontName="Times-Roman" fontSize="6.0" leading="8" spaceBefore="0.0" spaceAfter="6.0"/>
-        <paraStyle name="P10" fontName="Times-Roman" fontSize="11.0" leading="14" spaceBefore="0.0" spaceAfter="6.0"/>
-        <paraStyle name="P11" fontName="Times-Roman" fontSize="11.0" leading="14" spaceBefore="0.0" spaceAfter="6.0"/>
-        <paraStyle name="P12" fontName="Times-Roman" fontSize="11.0" leading="14" spaceBefore="0.0" spaceAfter="6.0"/>
-        <paraStyle name="P13" fontName="Times-Bold" fontSize="10.0" leading="13" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
-        <paraStyle name="Standard" fontName="Times-Roman"/>
-        <paraStyle name="Text body" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
-        <paraStyle name="Heading" fontName="Helvetica" fontSize="14.0" leading="17" spaceBefore="12.0" spaceAfter="6.0"/>
-        <paraStyle name="Heading1" fontName="Helvetica" alignment="CENTER" fontSize="14.0" leading="15" spaceBefore="10.0" spaceAfter="6.0"/>
-        <paraStyle name="List" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
-        <paraStyle name="Table Contents" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
-        <paraStyle name="Table Heading" fontName="Times-Roman" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
-        <paraStyle name="Caption" fontName="Times-Italic" fontSize="14.0" leading="18" spaceBefore="10.0" spaceAfter="6.0"/>
-        <paraStyle name="Index" fontName="Times-Roman"/>
-    </stylesheet>
-    <story>
-    <para style="terp_default_8">
-            <font color="white"> </font>
-          </para>
-	<para style="terp_default_8">
-            <font color="white"> </font>
-          </para>
-     <para style="terp_header"> Detail of Sales </para>
-     <para style="terp_default_8">
-            <font color="white"> </font>
-          </para>
-     <blockTable colWidths="178.0,178.0,178.0" style="Table2">
+    <blockTableStyle id="Table7">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="0,0" stop="0,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="1,0" stop="1,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
+    </blockTableStyle>
+    <initialize>
+      <paraStyle name="all" alignment="justify"/>
+    </initialize>
+    <paraStyle name="Standard" fontName="Helvetica"/>
+    <paraStyle name="Heading" fontName="Helvetica" fontSize="14.0" leading="17" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="Text body" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="List" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="Caption" fontName="Helvetica" fontSize="12.0" leading="15" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="Index" fontName="Helvetica"/>
+    <paraStyle name="terp_header" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="LEFT" spaceBefore="12.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="Table Contents" fontName="Helvetica"/>
+    <paraStyle name="Table Heading" fontName="Helvetica" alignment="CENTER"/>
+    <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_default_Bold_9" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.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_General_Centre" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.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_tblheader_Details" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="Footer" fontName="Helvetica"/>
+    <paraStyle name="Horizontal Line" fontName="Helvetica" fontSize="6.0" leading="8" spaceBefore="0.0" spaceAfter="14.0"/>
+    <paraStyle name="Heading 9" fontName="Helvetica-Bold" fontSize="75%" leading="NaN" spaceBefore="12.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-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_header_Right" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_header_Centre" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="CENTER" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_default_address" fontName="Helvetica" fontSize="10.0" leading="13" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Centre_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Right_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_1" fontName="Helvetica" fontSize="2.0" leading="3" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Right_9_Bold" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_8_Italic" fontName="Helvetica-Oblique" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <images/>
+  </stylesheet>
+  <story>
+    <para style="terp_header_Centre">Details of Sales</para>
+    <blockTable colWidths="161.0,161.0,161.0" style="Table1">
       <tr>
         <td>
-          <para style="terp_tblheader_General_Centre">Company </para>
+          <para style="terp_tblheader_General_Centre">Company</para>
         </td>
         <td>
-          <para style="terp_tblheader_General_Centre">Print Date </para>
+          <para style="terp_tblheader_General_Centre">Print Date</para>
         </td>
         <td>
-          <para style="terp_tblheader_General_Centre">Period </para>
+          <para style="terp_tblheader_General_Centre">Period</para>
         </td>
       </tr>
     </blockTable>
-    <blockTable colWidths="178.0,178.0,178.0" style="Table3">
+    <blockTable colWidths="161.0,161.0,161.0" style="Table2">
       <tr>
         <td>
           <para style="terp_default_Centre_8">[[ company.name ]]</para>
         </td>
         <td>
-          <para style="terp_default_Centre_8">[[ formatLang(time.strftime('%Y-%m-%d %H:%M:%S'),date_time = True) ]]</para>
+          <para style="terp_default_Centre_8">[[ formatLang(time.strftime('%Y-%m-%d'),date=True) ]]</para>
         </td>
         <td>
           <para style="terp_default_Centre_8">[[ formatLang(getperiod(data['form']),date = True) ]] - [[ formatLang(getperiod2(data['form']),date = True) ]] </para>
         </td>
-
       </tr>
     </blockTable>
-	  <para style="terp_default_8">
+    <para style="Text body">
+      <font color="white"> </font>
+    </para>
+    <blockTable colWidths="88.0,38.0,168.0,52.0,35.0,33.0,69.0" style="Table4">
+      <tr>
+        <td>
+          <para style="terp_tblheader_Details">Date</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details">Code</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details">Product</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details_Right">Price</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details_Right">Qty</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details_Right">Disc</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details_Centre">Invoiced</para>
+        </td>
+      </tr>
+    </blockTable>
+    <blockTable colWidths="88.0,38.0,168.0,52.0,35.0,33.0,69.0" style="Table6">
+      <tr>
+        <td>
+          <para style="terp_default_9">[[ pos_sales_details(data['form'],user) and '' or removeParentNode('blockTable') ]]</para>
+          <para style="terp_default_9">[[ repeatIn(pos_sales_details(data['form'],user), 'line_ids') ]] [[ formatLang(line_ids['date_order'],date_time = True) ]]</para>
+        </td>
+        <td>
+          <para style="terp_default_9">[[ line_ids['pos_name'] ]]</para>
+        </td>
+        <td>
+          <para style="terp_default_9">[[ line_ids['name'] ]]</para>
+        </td>
+        <td>
+          <para style="terp_default_Right_9">[[ formatLang(line_ids['price_unit']) ]]</para>
+        </td>
+        <td>
+          <para style="terp_default_Right_9">[[ formatLang(line_ids['qty']) ]]</para>
+        </td>
+        <td>
+          <para style="terp_default_Right_9">[[ formatLang(line_ids['discount']) ]]</para>
+        </td>
+        <td>
+          <para style="terp_default_Right_9">[[ getinvoice(line_ids['invoice_id'],user) or removeParentNode('font') ]]</para>
+        </td>
+      </tr>
+    </blockTable>
+    <para style="terp_header">
+      <font color="white"> </font>
+    </para>
+    <blockTable colWidths="241.0,241.0" style="Table3">
+      <tr>
+        <td>
+          <para style="terp_tblheader_Details">Mode of Taxes</para>
+        </td>
+        <td>
+          <para style="terp_default_Bold_8">
             <font color="white"> </font>
           </para>
-        <para style="terp_default_8">
+        </td>
+      </tr>
+      <tr>
+        <td>
+          <para style="terp_default_9"><font face="Helvetica" size="6.0">[[ repeatIn(gettaxamount(data['form'],user), 'p') ]]</font><font face="Helvetica" size="6.0"/>[[ p['name'] or removeParentNode('tr') ]]</para>
+        </td>
+        <td>
+          <para style="terp_default_Right_9">[[ formatLang(p['amount']) or removeParentNode('font') ]]</para>
+        </td>
+      </tr>
+    </blockTable>
+    <blockTable colWidths="241.0,241.0" style="Table5">
+      <tr>
+        <td>
+          <para style="terp_tblheader_Details">Mode of Payment</para>
+        </td>
+        <td>
+          <para style="terp_default_9">
             <font color="white"> </font>
           </para>
-
-      <!--<blockTable colWidths="95,42,180,40,27,37,37,40,40"  style="Table7" rowHeights="0.5cm">
-
-            <tr>
-                <td> <para style="terp_tblheader_Details">Date</para> </td>
-                <td> <para style="terp_tblheader_Details">Code</para> </td>
-                <td> <para style="terp_tblheader_Details">Product</para> </td>
-                <td> <para style="terp_tblheader_Details">Price</para> </td>
-                <td> <para style="terp_tblheader_Details">Qty</para> </td>
-                <td> <para style="terp_tblheader_Details">Disc</para> </td>
-                <td> <para style="terp_tblheader_Details">VAT(%)</para> </td>
-                <td> <para style="terp_tblheader_Details">VAT</para> </td>
-                <td> <para style="terp_tblheader_Details">Invoiced</para> </td>
-            </tr>
-        </blockTable> -->
-        <blockTable colWidths="100,52,170,60,34,37,85"  style="Table7" rowHeights="0.5cm">
-
-            <tr>
-                <td> <para style="terp_tblheader_Details">Date</para> </td>
-                <td> <para style="terp_tblheader_Details">Code</para> </td>
-                <td> <para style="terp_tblheader_Details">Product</para> </td>
-                <td> <para style="terp_tblheader_Details_Right">Price</para> </td>
-                <td> <para style="terp_tblheader_Details_Right">Qty</para> </td>
-                <td> <para style="terp_tblheader_Details_Right">Disc</para> </td>
-                <td> <para style="terp_tblheader_Details_Center">Invoiced</para> </td>
-            </tr>
-        </blockTable>
-        <section>
-        <para style="terp_default_8">[[ repeatIn(pos_sales_details(data['form'],user), 'line_ids') ]]</para>
-			<blockTable colWidths="100,52,170,60,34,37,85" style="Tableau7">
-	        <tr>
-	          <td>
-	            <para style="terp_default_9">[[ formatLang(line_ids['date_order'],date_time = True) ]]</para>
-	          </td>
-	          <td>
-	            <para style="terp_default_9">[[ line_ids['pos_name'] ]]</para>
-	          </td>
-	          <td>
-	            <para style="terp_default_9">[[ line_ids['name'] ]]</para>
-	          </td>
-	          <td>
-	            <para style="terp_default_Right_9">[[ formatLang(line_ids['price_unit']) ]]</para>
-	          </td>
-	           <td>
-	            <para style="terp_default_Right_9">[[ formatLang(line_ids['qty']) ]]</para>
-	          </td>
-	          <td>
-	            <para style="terp_default_Right_9">[[ formatLang(line_ids['discount']) ]]</para>
-	          </td>
-			  <td>
-			  <para style="terp_default_Right_9"><font>[[ getinvoice(line_ids['invoice_id'],user) or removeParentNode('font') ]]</font></para>
-	            <!--<para style="terp_default_Right_9">[[ line_ids['invoice_id'] ]]</para-->
-	          </td>
-	        </tr>
-	      </blockTable>
-	      </section>
-
-        <!--<section>
-            [[ repeatIn(objects,'o') ]]
-            <blockTable colWidths="95,42,180,40,27,37,37,40,40" style="Table8" rowHeights="0.5cm">
-                <tr>
-                    <td>[[ repeatIn(o.lines,'line') ]]<para style="terp_default_9">[[line.create_date ]]</para> </td>
-                    <td> </td>
-                    <td> <para style="terp_default_9"> [[strip_name(line.product_id.name, 32) ]] </para></td>
-                    <td> <para style="terp_default_Right_9"> [[ '%.2f' % (line.price_subtotal,) ]]</para></td>
-                    <td> <para style="terp_default_Right_9"> [[ '%d' % line.qty ]]</para></td>
-                    <td> <para style="terp_default_Right_9"> [[ '%d%%' % (line.discount) ]]</para></td>
-                    <td> <para style="terp_default_Right_9"> [[ len(line.product_id.taxes_id) > 0 and ('%d%%' % (line.product_id.taxes_id[0].amount * 100)) or '' ]] </para></td>
-                    <td></td>
-                    <td></td>
-                </tr>
-                <tr>
-                    <td> <para style="terp_default_9">[[ o.date_order ]] </para></td>
-                    <td> <para style="terp_default_9">[[ o.name ]] </para></td>
-                    <td> <para style="terp_default_9">[[ o.user_id.name ]] </para></td>
-                    <td> <para style="terp_default_Right_9">[[ '%.2f' % (o.amount_total,) ]]</para></td>
-                    <td></td>
-                    <td></td>
-                    <td></td>
-                    <td><para style="terp_default_Right_9">[[ o.amount_tax ]] </para></td>
-                    <td><para style="terp_default_Right_9">[[ o.invoice_id and o.invoice_id.number or '']]</para></td>
-                </tr>
-            </blockTable>
-        </section>-->
-        <para>
-            <font color="white"> </font>
-        </para>
-        <para>
-            <font color="white"> </font>
-        </para>
-        <blockTable colWidths="267.0,267.0" style="Table4">
-                        <tr>
-                            <td>
-                                <para style="terp_tblheader_Details">
-                                    <font face="Helvetica-Bold" size="10.0">Mode of Taxes</font>
-                                </para>
-                            </td>
-                            <td></td>
-                        </tr>
-                        <tr><para>[[ repeatIn(gettaxamount(data['form'],user), 'p') ]]</para>
-                            <td>[[ p['name'] or removeParentNode('tr') ]]</td>
-                            <td><para style="terp_default_Right_9"><font>[[  formatLang(p['amount']) or removeParentNode('font') ]]</font></para></td>
-                        </tr>
-       </blockTable>
-
-       <blockTable colWidths="267.0,267.0" style="Table4">
-                        <tr>
-                            <td>
-                                <para style="terp_tblheader_Details">
-                                    <font face="Helvetica-Bold" size="10.0">Mode of payment</font>
-                                </para>
-                            </td>
-                            <td></td>
-                        </tr>
-                        <tr>[[ repeatIn(getpayments(data['form'],user), 'p') ]]
-                            <td>[[ p['name'] or removeParentNode('tr') ]]</td>
-                            <td><para style="terp_default_Right_9">[[ formatLang(p['sum']) or removeParentNode('tr') ]]</para></td>
-                            <!--<td>[[ p.statement_id.journal_id.name ]]</td>
-                            <td><para style="terp_default_Right_9">[[ formatLang(p.amount) ]]</para></td>-->
-                        </tr>
-                    </blockTable>
-
-		<para style="terp_default_8">
-            <font color="white"> </font>
-    	</para>
-    	<para style="terp_default_8">
+        </td>
+      </tr>
+      <tr>
+        <td>
+          <para style="terp_default_9"><font face="Helvetica" size="6.0">[[ repeatIn(getpayments(data['form'],user), 'p') ]] </font>[[ p['name'] or removeParentNode('tr') ]]</para>
+        </td>
+        <td>
+          <para style="terp_default_Right_9">[[ formatLang(p['sum']) or removeParentNode('tr') ]]</para>
+        </td>
+      </tr>
+    </blockTable>
+    <para style="terp_default_9">
+      <font color="white"> </font>
+    </para>
+    <para style="terp_default_9">
+      <font color="white"> </font>
+    </para>
+    <para style="terp_default_9">
+      <font color="white"> </font>
+    </para>
+    <blockTable colWidths="241.0,241.0" style="Table8">
+      <tr>
+        <td>
+          <para style="terp_default_Bold_9">Summary</para>
+        </td>
+        <td>
+          <para style="terp_default_9">
             <font color="white"> </font>
           </para>
-			<section>
-
-         <blockTable colWidths="267.0,267.0" style="Table5">
-         	<tr>
-            	<td colspan="2">
-                	<para style="terp_default_Left_9_Bold"><font face="Helvetica-Bold" size="10.0">Summary</font></para></td>
-            </tr>
-                        <tr>
-                            <td><para style="terp_tblheader_Details">Sales total</para></td>
-
-                            <td><para style="terp_default_Right_9_bold">[[ formatLang(getsalestotal2(data['form'],user)) ]]</para></td>
-                        </tr>
-                        <tr>
-                            <td><para style="terp_tblheader_Details">Qty of product</para></td>
-                            <td><para style="terp_default_Right_9_bold">[[ formatLang(getqtytotal2(data['form'],user)) ]]</para></td>
-                        </tr>
-                        <tr>
-                            <td><para style="terp_tblheader_Details">Total invoiced</para></td>
-                            <td><para style="terp_default_Right_9_bold">[[ formatLang(getsuminvoice2(data['form'],user)) ]]</para></td>
-                        </tr>
-                        <!--<tr>
-                            <td><para style="terp_tblheader_Details">Total discount</para></td>
-                            <td><para style="terp_default_Right_9_bold">[[  formatLang(getsumdisc(objects)) ]]</para></td>
-                        </tr>-->
-                        <tr>
-                            <td><para style="terp_tblheader_Details">Total paid</para></td>
-                            <td><para style="terp_default_Right_9_bold">[[ formatLang(getpaidtotal2(data['form'],user))  ]]</para></td>
-                        </tr>
-                        <tr>
-                            <td><para style="terp_tblheader_Details">Total of the day</para></td>
-                            <td><para style="terp_default_Right_9_bold">[[ formatLang(gettotalofthaday(data['form'])) ]]</para></td>
-                        </tr>
-                    </blockTable>
-                    </section>
-         <!--<blockTable colWidths="267.0,267.0" style="Table5">
-         	<tr>
-            	<td colspan="2">
-                	<para style="terp_default_Left_9_Bold"><font face="Helvetica-Bold" size="10.0">Summary</font></para></td>
-            </tr>
-                        <tr>
-                            <td><para style="terp_tblheader_Details">Sales total</para></td>
-                            terp_tblheader_Details
-                            <td><para style="terp_default_Right_9_bold">[[ '%d' % getsalestotal(objects) ]]</para></td>
-                        </tr>
-                        <tr>
-                            <td><para style="terp_tblheader_Details">Qty of product</para></td>
-                            <td><para style="terp_default_Right_9_bold">[[ '%d' % getqtytotal(objects) ]]</para></td>
-                        </tr>
-                        <tr>
-                            <td><para style="terp_tblheader_Details">Total invoiced</para></td>
-                            <td><para style="terp_default_Right_9_bold">[[ '%.2f' % getsuminvoice(objects) ]]</para></td>
-                        </tr>
-                        <tr>
-                            <td><para style="terp_tblheader_Details">Total discount</para></td>
-                            <td><para style="terp_default_Right_9_bold">[[ '%.2f' % getsumdisc(objects) ]]</para></td>
-                        </tr>
-                        <tr>
-                            <td><para style="terp_tblheader_Details">Total paid</para></td>
-                            <td><para style="terp_default_Right_9_bold">[[ '%.2f' % getpaidtotal(objects) ]]</para></td>
-                        </tr>
-                        <tr>
-                            <td><para style="terp_tblheader_Details">Total of the day</para></td>
-                            <td><para style="terp_default_Right_9_bold">[[ '%.2f' % gettotalofthaday(objects) ]]</para></td>
-                        </tr>
-                    </blockTable> -->
-    </story>
-</document>
-
+        </td>
+      </tr>
+    </blockTable>
+    <blockTable colWidths="241.0,241.0" style="Table7">
+      <tr>
+        <td>
+          <para style="terp_default_Bold_9">Sales total</para>
+        </td>
+        <td>
+          <para style="terp_default_Right_9">[[ formatLang(getsalestotal2(data['form'],user)) ]]</para>
+        </td>
+      </tr>
+      <tr>
+        <td>
+          <para style="terp_default_Bold_9">Qty of product</para>
+        </td>
+        <td>
+          <para style="terp_default_Right_9">[[ formatLang(getqtytotal2(data['form'],user)) ]]</para>
+        </td>
+      </tr>
+      <tr>
+        <td>
+          <para style="terp_default_Bold_9">Total invoiced</para>
+        </td>
+        <td>
+          <para style="terp_default_Right_9">[[ formatLang(getsuminvoice2(data['form'],user)) ]]</para>
+        </td>
+      </tr>
+      <tr>
+        <td>
+          <para style="terp_default_Bold_9">Total discount</para>
+        </td>
+        <td>
+          <para style="terp_default_Right_9">[[ formatLang(getsumdisc(objects)) ]]</para>
+        </td>
+      </tr>
+      <tr>
+        <td>
+          <para style="terp_default_Bold_9">Total paid</para>
+        </td>
+        <td>
+          <para style="terp_default_Right_9">[[ formatLang(getpaidtotal2(data['form'],user)) ]]</para>
+        </td>
+      </tr>
+      <tr>
+        <td>
+          <para style="terp_default_Bold_9">Total of the day</para>
+        </td>
+        <td>
+          <para style="terp_default_Right_9">[[ formatLang(gettotalofthaday(data['form'])) ]]</para>
+        </td>
+      </tr>
+    </blockTable>
+    <para style="terp_default_9">
+      <font color="white"> </font>
+    </para>
+  </story>
+</document>
\ No newline at end of file