From a1f11cf0cd19a9599bfe6a7e9a5e05bd0380d423 Mon Sep 17 00:00:00 2001
From: Stefan Rijnhart <stefan@therp.nl>
Date: Mon, 11 Mar 2013 14:24:33 +0100
Subject: [PATCH] [FIX] pto in invoice template should not cover the whole
 document

lp bug: https://launchpad.net/bugs/971713 fixed

bzr revid: stefan@therp.nl-20130311132433-rfz85yz831u1o1s9
---
 .../account/report/account_print_invoice.rml  | 28 +++++-----
 addons/sale/report/sale_order.rml             | 52 +++++++++----------
 2 files changed, 40 insertions(+), 40 deletions(-)

diff --git a/addons/account/report/account_print_invoice.rml b/addons/account/report/account_print_invoice.rml
index 4ffa7a33f9d..579b6f0c10a 100644
--- a/addons/account/report/account_print_invoice.rml
+++ b/addons/account/report/account_print_invoice.rml
@@ -138,21 +138,8 @@
     <images/>
   </stylesheet>
   <story>
-  <pto>
     <para style="terp_default_8">[[ repeatIn(objects,'o') ]]</para>
     <para style="terp_default_8">[[ setLang(o.partner_id.lang) ]]</para>
-    <pto_header><!-- Must be after setLang() -->
-    <blockTable colWidths="202.0,87.0,71.0,57.0,42.0,71.0" style="Table7">
-    <tr>
-        <td> <para style="terp_tblheader_Details">Description</para> </td>
-        <td> <para style="terp_tblheader_Details_Centre">Taxes</para> </td>
-        <td> <para style="terp_tblheader_Details_Centre">Quantity</para> </td>
-        <td> <para style="terp_tblheader_Details_Right">Unit Price </para> </td>
-        <td> <para style="terp_tblheader_Details_Right">Disc.(%)</para> </td>
-        <td> <para style="terp_tblheader_Details_Right">Price</para> </td>
-    </tr>
-    </blockTable>
-    </pto_header>
     <blockTable colWidths="297.0,233.0" style="Table_Partner_Address">
       <tr>
         <td>
@@ -217,6 +204,19 @@
     <para style="terp_default_8">
       <font color="white"> </font>
     </para>
+    <pto>
+    <pto_header>
+        <blockTable colWidths="185.0,70.0,80.0,60.0,50.0,85.0" style="Table7">
+        <tr>
+            <td> <para style="terp_tblheader_Details">Description</para> </td>
+            <td> <para style="terp_tblheader_Details_Centre">Taxes</para> </td>
+            <td> <para style="terp_tblheader_Details_Centre">Quantity</para> </td>
+            <td> <para style="terp_tblheader_Details_Right">Unit Price </para> </td>
+            <td> <para style="terp_tblheader_Details_Right">Disc.(%)</para> </td>
+            <td> <para style="terp_tblheader_Details_Right">Price</para> </td>
+        </tr>
+        </blockTable>
+    </pto_header>
     <blockTable colWidths="185.0,70.0,80.0,60.0,50.0,85.0" style="Table7">
       <tr>
         <td>
@@ -264,6 +264,7 @@
         </tr>
       </blockTable>
     </section>
+    </pto>
     <blockTable colWidths="385.0,60.0,85.0" style="Table10">
       <tr>
         <td>
@@ -371,6 +372,5 @@
     <para style="terp_default_2">
       <font color="white"> </font>
     </para>
-  </pto>
   </story>
 </document>
diff --git a/addons/sale/report/sale_order.rml b/addons/sale/report/sale_order.rml
index a00d2d4e3ef..43e517394e5 100644
--- a/addons/sale/report/sale_order.rml
+++ b/addons/sale/report/sale_order.rml
@@ -126,33 +126,8 @@
     <images/>
   </stylesheet>
   <story>
-  <pto>
   <para style="terp_default_8">[[repeatIn(objects,'o')]]</para>
   <para style="terp_default_8">[[ setLang(o.partner_id.lang) ]]</para>
-  <pto_header>
-    <blockTable colWidths="181.0,70.0,80.0,70.0,50.0,85.0" repeatRows="1" style="Table4">
-      <tr>
-        <td>
-          <para style="terp_tblheader_Details">Description</para>
-        </td>
-        <td>
-          <para style="terp_tblheader_Details_Centre">Tax</para>
-        </td>
-        <td>
-          <para style="terp_tblheader_Details_Right">Quantity</para>
-        </td>
-        <td>
-          <para style="terp_tblheader_Details_Right">Unit Price</para>
-        </td>
-        <td>
-          <para style="terp_tblheader_Details_Centre">Disc.(%)</para>
-        </td>
-        <td>
-          <para style="terp_tblheader_Details_Right">Price</para>
-        </td>
-      </tr>
-    </blockTable>
-  </pto_header>
     <para style="terp_default_8">
       <font color="white"> </font>
     </para>
@@ -236,6 +211,31 @@
     <para style="terp_default_8">
       <font color="white"> </font>
     </para>
+    <pto>
+    <pto_header>
+      <blockTable colWidths="181.0,70.0,80.0,70.0,50.0,85.0" repeatRows="1" style="Table4">
+        <tr>
+          <td>
+            <para style="terp_tblheader_Details">Description</para>
+         </td>
+         <td>
+            <para style="terp_tblheader_Details_Centre">VAT</para>
+         </td>
+         <td>
+           <para style="terp_tblheader_Details_Right">Quantity</para>
+         </td>
+         <td>
+           <para style="terp_tblheader_Details_Right">Unit Price</para>
+         </td>
+         <td>
+           <para style="terp_tblheader_Details_Centre">Disc.(%)</para>
+         </td>
+         <td>
+           <para style="terp_tblheader_Details_Right">Price</para>
+         </td>
+        </tr>
+      </blockTable>
+    </pto_header>
     <blockTable colWidths="181.0,70.0,80.0,70.0,50.0,85.0" repeatRows="1" style="Table4">
       <tr>
         <td>
@@ -283,6 +283,7 @@
         </tr>
       </blockTable>
     </section>
+    </pto>
     <blockTable colWidths="381.0,60.0,93.0" style="Table6">
       <tr>
         <td>
@@ -338,6 +339,5 @@
     <para style="terp_default_8">
       <font color="white"> </font>
     </para>
-  </pto>
   </story>
 </document>