[FIX] point_of_sale: Typo

[odoo/odoo.git] / addons / delivery / report / shipping.rml

diff --git a/addons/delivery/report/shipping.rml b/addons/delivery/report/shipping.rml
index 80dd4ab..5a3750e 100644 (file)
--- a/addons/delivery/report/shipping.rml
+++ b/addons/delivery/report/shipping.rml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
-<document filename="test.pdf">
-  <template pageSize="(595.0,842.0)" title="Delivery Order" author="OpenERP S.A. (sales@openerp.com)" allowSplitting="20">
+<document filename="Delivery Order.pdf">
+  <template title="Delivery Order" author="OpenERP S.A.(sales@openerp.com)" allowSplitting="20">
     <pageTemplate id="first">
       <frame id="first" x1="30.0" y1="27.0" width="508" height="815"/>
     </pageTemplate>
@@ -67,7 +67,6 @@
       <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"/>
-      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="3,-1" stop="3,-1"/>
     </blockTableStyle>
     <initialize>
       <paraStyle name="all" alignment="justify"/>
@@ -106,28 +105,37 @@
     <images/>
   </stylesheet>
   <story>
+  <pto>
+  <pto_header>
+    <blockTable colWidths="370.0,85.0,82.0" repeatRows="1" style="Table3">
+      <tr>
+        <td>
+          <para style="terp_tblheader_Details">Description</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details_Centre">Lot</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details_Right">Quantity</para>
+        </td>
+      </tr>
+    </blockTable>
+  </pto_header>
     <para style="terp_default_9">[[repeatIn(objects,'o')]]</para>
     <para style="terp_default_8">
       <font color="white"> </font>
     </para>
-    <para style="terp_default_9">[[ (not(o.sale_id) and o.type== 'out') and 'Error, no sale order attached to this picking !' or removeParentNode('para') ]]</para>
+
     <blockTable colWidths="287.0,254.0" repeatRows="1" style="Tableau1">
       <tr>
         <td>
           <para style="terp_default_Bold_9">Invoiced to</para>
           <para style="terp_default_9">[[ o.sale_id and o.sale_id.partner_invoice_id and o.sale_id.partner_invoice_id.name or '']]</para>
-          <para style="terp_default_9">[[ o.sale_id and o.sale_id.partner_invoice_id and o.sale_id.partner_invoice_id.street or '']]</para>
-          <para style="terp_default_9">[[ o.sale_id and o.sale_id.partner_invoice_id and o.sale_id.partner_invoice_id.zip or '']]</para>
-          <para style="terp_default_9">[[ o.sale_id and o.sale_id.partner_invoice_id and o.sale_id.partner_invoice_id.city or '' ]]</para>
-          <para style="terp_default_9">[[ o.sale_id and o.sale_id.partner_invoice_id and o.sale_id.partner_invoice_id.country_id and o.sale_id.partner_invoice_id.country_id.name or '']]</para>
+          <para style="terp_default_9">[[ o.sale_id and o.sale_id.partner_invoice_id and display_address(o.sale_id.partner_invoice_id) ]]</para>
         </td>
         <td>
-          <para style="terp_default_9">[[ o.address_id and o.address_id.partner_id and o.address_id.partner_id.name or '' ]]</para>
-          <para style="terp_default_9">[[ o.address_id and o.address_id.name or '']]</para>
-          <para style="terp_default_9">[[ o.address_id and o.address_id.street or '']]</para>
-          <para style="terp_default_9">[[ o.address_id and o.address_id.zip or '']]</para>
-          <para style="terp_default_9">[[ o.address_id and o.address_id.city or '']]</para>
-          <para style="terp_default_9">[[ o.address_id and o.address_id.country_id and o.address_id.country_id.name or '']]</para>
+          <para style="terp_default_9">[[ o.partner_id and o.partner_id and o.partner_id.name or '' ]]</para>
+          <para style="terp_default_9">[[ o.partner_id and o.partner_id and display_address(o.partner_id) ]]</para>
         </td>
       </tr>
     </blockTable>
@@ -179,7 +187,7 @@
     <blockTable colWidths="370.0,85.0,82.0" repeatRows="1" style="Table3">
       <tr>
         <td>
-          <para style="terp_tblheader_Details">Designation</para>
+          <para style="terp_tblheader_Details">Description</para>
         </td>
         <td>
           <para style="terp_tblheader_Details_Centre">Lot</para>
@@ -189,12 +197,9 @@
         </td>
       </tr>
     </blockTable>
-    <para style="terp_default_1">
-      <font color="white"> </font>
-    </para>
     <section>
-      <para style="terp_default_9">[[repeatIn(o.move_lines,'line')]]</para>
-      <blockTable colWidths="370.0,85.0,59.0,24.0" style="Table4">
+      <para style="terp_default_1">[[repeatIn(o.move_lines,'line')]]</para>
+      <blockTable colWidths="370.0,85.0,83.0" style="Table4">
         <tr>
           <td>
             <para style="terp_default_9">[[line.product_id.code ]] [[ line.product_id and line.product_id.name or '']]</para>
@@ -203,10 +208,7 @@
             <para style="terp_default_Centre_9">[[ (line.prodlot_id and (line.prodlot_id.name + (line.prodlot_id.ref and ('/' + line.prodlot_id.ref) or ''))) or ' ' ]]</para>
           </td>
           <td>
-            <para style="terp_default_Right_9">[[ formatLang(line.product_qty) ]]</para>
-          </td>
-          <td>
-            <para style="terp_default_Right_9">[[ line.product_uom and line.product_uom.name ]]</para>
+            <para style="terp_default_Right_9">[[ formatLang(line.product_qty) ]] [[ line.product_uom and line.product_uom.name ]]</para>
           </td>
         </tr>
       </blockTable>
@@ -214,8 +216,6 @@
         <font color="white"> </font>
       </para>
     </section>
-    <para style="Standard">
-      <font color="white"> </font>
-    </para>
+  </pto>
   </story>
-</document>
\ No newline at end of file
+</document>