Purchase Order Completed.
[odoo/odoo.git] / addons / purchase / report / order.rml
index c645639..df7cdcb 100644 (file)
@@ -2,7 +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="42.0" y1="42.0" width="511" height="758"/>
+      <frame id="first" x1="18.0" y1="42.0" width="535" height="758"/>
     </pageTemplate>
   </template>
   <stylesheet>
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
     </blockTableStyle>
-    <blockTableStyle id="address_table">
+    <blockTableStyle id="Table_All_Address_Detail">
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
     </blockTableStyle>
-    <blockTableStyle id="RefTable">
+    <blockTableStyle id="Header_Order_Reference_Tbl">
       <blockAlignment value="LEFT"/>
-         <blockValign value="TOP"/>
-         <lineStyle kind="LINEABOVE" colorName="#e0e0e0" Thickness="1"/>
-         <lineStyle kind="LINEBELOW" colorName="#e0e0e0" />
-         <lineStyle kind="LINEAFTER" colorName="#e0e0e0" />
-         <lineStyle kind="LINEBEFORE" colorName="#e0e0e0" />
-         <blockBackground colorName="white" start="0,0" stop="-1,0"/>
+      <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="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="Tableau2">
-       <blockAlignment value="LEFT" start="0,0" stop="0,-1"/>
-               <blockAlignment value="CENTER" start="1,0" stop="-1,0"/>
-               <blockAlignment value="RIGHT" start="2,1" stop="-1,-1"/>
-               <blockValign value="TOP"/>
-               <lineStyle kind="LINEBELOW" colorName="#3b3131" start="0,0" stop="-1,0" />
-               <lineStyle kind="LINEBELOW" colorName="#e0e0e0"  start="0,1" stop="-1,-2" />
+    <blockTableStyle id="Content_Order_Reference_Table">
+      <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="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="Tableau3">
+    <blockTableStyle id="Table_Header_Pur_ord_Line">
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
+      <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"/>
     </blockTableStyle>
-    <blockTableStyle id="Tableau5">
+    <blockTableStyle id="Table_Order_Pur_line_Content">
       <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"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="3,-1" stop="3,-1"/>
+      <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"/>
+      <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"/>
+      <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="Tableau1">
+    <blockTableStyle id="Table_All_Total_Detail">
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
+      <lineStyle kind="LINEABOVE" colorName="#ffffff" start="0,0" stop="0,0"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="1,0" stop="1,0"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="2,0" stop="2,0"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="3,0" stop="3,0"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="1,2" stop="1,2"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="2,2" stop="2,2"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="3,2" stop="3,2"/>
     </blockTableStyle>
-    <blockTableStyle id="Tableau4">
+    <blockTableStyle id="Table_Outer_Notes">
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
     </blockTableStyle>
     <initialize>
       <paraStyle name="all" alignment="justify"/>
     </initialize>
-    <paraStyle name="P1" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P2" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P3" rightIndent="0.0" leftIndent="-4.0" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/>
-    <paraStyle name="P4" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P5" rightIndent="0.0" leftIndent="-31.0" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P6" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P1" rightIndent="0.0" leftIndent="12.0" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P2" rightIndent="0.0" leftIndent="15.0" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.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="Index" fontName="Times-Roman"/>
     <paraStyle name="Footer" fontName="Times-Roman"/>
     <paraStyle name="Horizontal Line" fontName="Times-Roman" fontSize="6.0" leading="8" spaceBefore="0.0" spaceAfter="14.0"/>
-    <paraStyle name="terp_header" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/>
+    <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-Bold" fontSize="9.0" leading="11" alignment="LEFT" 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"/>
-    <paraStyle name="terp_header_Centre" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="CENTER" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_header_Centre" fontName="Helvetica-Bold" fontSize="12.0" leading="15" 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_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_default_Bold_9" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" 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_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_Bold_9_Right" 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"/>
+    <paraStyle name="terp_default_2" fontName="Helvetica" fontSize="2.0" leading="3" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
   </stylesheet>
+  <images/>
   <story>
-    <para style="P5">[[ repeatIn(objects,'o') ]]</para>
-    <blockTable colWidths="275.0,275.0" style="address_table">
+    <para style="terp_default_8">[[ repeatIn(objects,'o') ]]</para>
+    <para style="terp_default_8">
+      <font color="white"> </font>
+    </para>
+    <blockTable colWidths="294.0,240.0" style="Table_All_Address_Detail">
       <tr>
         <td>
-          <para style="P2">[[ repeatIn(o.dest_address_id and [o.dest_address_id] or [],'addr') ]]</para>
-          <para style="P6">Shipping address :</para>
-          <para style="P2">[[ o.partner_id.title or '' ]] [[ o.partner_id.name ]]</para>
-          <para style="P2">[[ addr.title or '' ]] [[ addr.name ]]</para>
-          <para style="P2">[[ addr.street ]]</para>
-          <para style="P2">[[ addr.street2 or '' ]]</para>
-          <para style="P2"><font face="Times-Roman">[[ addr.zip or '' ]]</font> [[ addr.city or '' ]]</para>
-          <para style="P2">[[ addr.state_id and addr.state_id.name or '' ]]</para>
-          <para style="P1">[[ addr.country_id and addr.country_id.name or '' ]]</para>
+          <para style="terp_default_9">[[ repeatIn(o.dest_address_id and [o.dest_address_id] or [],'addr') ]]</para>
+          <para style="terp_default_Bold_9">Shipping address :</para>
+          <para style="terp_default_9">[[ o.partner_id.title or '' ]][[ o.partner_id.name ]]</para>
+          <para style="terp_default_9">[[ addr.title or '' ]][[ addr.name  ]]</para>
+          <para style="terp_default_9">[[ addr.street ]]</para>
+          <para style="terp_default_9">[[ addr.street2 or '' ]]</para>
+          <para style="terp_default_9"><font face="Times-Roman">[[ addr.zip or '' ]]</font>[[ addr.city or ''  ]]</para>
+          <para style="terp_default_9">[[ addr.state_id and addr.state_id.name or ''  ]]</para>
+          <para style="terp_default_9">[[ addr.country_id and addr.country_id.name or '' ]]</para>
         </td>
         <td>
-          <para style="P2">[[ o.partner_id.title or '' ]] [[ o.partner_id.name ]]</para>
-          <para style="P2">[[ o.partner_address_id.title or '' ]] [[ o.partner_address_id.name ]]</para>
-          <para style="P2">[[ o.partner_address_id.street ]]</para>
-          <para style="P2">[[ o.partner_address_id.street2 or '' ]]</para>
-          <para style="P2">[[ o.partner_address_id.zip or '' ]] [[ o.partner_address_id.city or '' ]]</para>
-          <para style="P2">[[ o.partner_address_id.state_id and o.partner_address_id.state_id.name or '' ]]</para>
-          <para style="P2">[[ o.partner_address_id.country_id and o.partner_address_id.country_id.name or '' ]]</para>
-          <para style="P4">
+          <para style="terp_default_9">[[ o.partner_id.title or '' ]][[ o.partner_id.name ]]</para>
+          <para style="terp_default_9">[[ o.partner_address_id.title or '' ]][[ o.partner_address_id.name ]]</para>
+          <para style="terp_default_9">[[ o.partner_address_id.street ]]</para>
+          <para style="terp_default_9">[[ o.partner_address_id.street2 or '' ]]</para>
+          <para style="terp_default_9">[[ o.partner_address_id.zip or ''  ]][[ o.partner_address_id.city or '' ]]</para>
+          <para style="terp_default_9">[[ o.partner_address_id.state_id and o.partner_address_id.state_id.name or ''  ]]</para>
+          <para style="terp_default_9">[[ o.partner_address_id.country_id and o.partner_address_id.country_id.name or '' ]]</para>
+          <para style="terp_default_9">
             <font color="white"> </font>
           </para>
-          <para style="P2">Tél. : [[ o.partner_address_id.phone or '' ]]</para>
-          <para style="P2">Fax : [[ o.partner_address_id.fax or '' ]]</para>
-          <para style="P1">TVA : [[ o.partner_id.vat or '' ]]</para>
+          <para style="terp_default_9">Tél. : [[ o.partner_address_id.phone or '' ]]</para>
+          <para style="terp_default_9">Fax : [[ o.partner_address_id.fax or '' ]]</para>
+          <para style="terp_default_9">TVA :[[ o.partner_id.vat or ''  ]]</para>
         </td>
       </tr>
     </blockTable>
-    <para style="terp_default_8">
-      <font color="white"> </font>
-    </para>
-    <para style="terp_default_8">
-      <font color="white"> </font>
-    </para>
-    <para style="P3">
-      Request for Quotation [[ (o.state=='draft' or removeParentNode('font')) and '' ]]
-      Order [[ (o.state&lt;&gt;'draft' or removeParentNode('font')) and '' ]]
-      N° : [[ o.name ]]
-    </para>
-    <blockTable colWidths="128.0,128.0,128.0,128.0" style="RefTable">
+    <para style="terp_header">Request for Quotation [[ (o.state=='draft' or removeParentNode('font')) and ''  ]] Order [[ (o.state&lt;&gt;'draft' or removeParentNode('font')) and '' ]] N° :[[ o.name ]]</para>
+    <blockTable colWidths="136.0,132.0,133.0,133.0" style="Header_Order_Reference_Tbl">
       <tr>
         <td>
-          <para style="terp_tblheader_General_Centre">Our order reference</para>
+          <para style="terp_tblheader_General_Centre">Our Order Reference</para>
         </td>
         <td>
-          <para style="terp_tblheader_General_Centre">Your order reference</para>
+          <para style="terp_tblheader_General_Centre">Your Order Reference</para>
         </td>
         <td>
-          <para style="terp_tblheader_General_Centre">Date ordered</para>
+          <para style="terp_tblheader_General_Centre">Date Ordered</para>
         </td>
         <td>
-          <para style="terp_tblheader_General_Centre">Validated by</para>
+          <para style="terp_tblheader_General_Centre">Validated By</para>
         </td>
       </tr>
+    </blockTable>
+    <blockTable colWidths="136.0,132.0,133.0,133.0" style="Content_Order_Reference_Table">
       <tr>
         <td>
-          <para style="terp_default_Centre_8">[[ o.ref or '' ]]</para>
+          <para style="terp_default_Centre_9">[[ o.name or '' ]]</para>
         </td>
         <td>
-          <para style="terp_default_Centre_8">[[ o.partner_ref or '' ]]</para>
+          <para style="terp_default_Centre_9">[[ o.partner_ref or ''  ]]</para>
         </td>
         <td>
-          <para style="terp_default_Centre_8">[[ time.strftime('%d/%m/%Y', time.strptime(o.date_order, '%Y-%m-%d')) ]]</para>
+          <para style="terp_default_Centre_9">[[ time.strftime('%d/%m/%Y', time.strptime(o.date_order, '%Y-%m-%d')) ]]</para>
         </td>
         <td>
-          <para style="terp_default_Centre_8">[[ o.validator and o.validator.name or '' ]]</para>
+          <para style="terp_default_Centre_9">[[ o.validator and o.validator.name or ''  ]]</para>
         </td>
       </tr>
     </blockTable>
-    <para style="terp_default_8">
+    <para style="terp_default_9">
       <font color="white"> </font>
     </para>
-    <para style="terp_default_9"/>
-    <blockTable colWidths="195.0,65.0,52.0,65.0,65.0,69.0" repeatRows="1" style="Tableau2">
+    <blockTable colWidths="253.0,52.0,57.0,44.0,58.0,70.0" repeatRows="1" style="Table_Header_Pur_ord_Line">
       <tr>
         <td>
-          <para style="terp_tblheader_Details">Product Description</para>
+          <para style="terp_tblheader_Details">Description</para>
         </td>
         <td>
-          <para style="terp_tblheader_Details">Applicable Taxes</para>
+          <para style="terp_tblheader_Details">Taxes</para>
         </td>
         <td>
-          <para style="terp_tblheader_Details">Date Requested</para>
+          <para style="terp_tblheader_Details_Centre">Date Req.</para>
         </td>
         <td>
-          <para style="terp_tblheader_Details">Qty</para>
+          <para style="terp_tblheader_Details_Centre">Qty</para>
         </td>
         <td>
           <para style="terp_tblheader_Details_Right">Unit Price</para>
     </blockTable>
     <section>
       <para style="terp_default_8">[[ repeatIn(o.order_line,'line') ]]</para>
-      <blockTable colWidths="193.0,65.0,52.0,65.0,64.0,69.0" style="Tableau3">
+      <blockTable colWidths="254.0,52.0,57.0,24.0,20.0,57.0,71.0" style="Table_Order_Pur_line_Content">
         <tr>
           <td>
-            <para style="terp_default_9">[[ line.product_id and get_product_code(line.product_id.id, o.partner_id.id) or '' ]]</para>
             <para style="terp_default_9">[[ line.name ]]</para>
           </td>
           <td>
-            <para style="terp_default_9">[[ ', '.join(map(lambda x: x.name, line.taxes_id))]]</para>
+            <para style="terp_default_9">[[ ', '.join(map(lambda x: x.name, line.taxes_id)) ]]</para>
+          </td>
+          <td>
+            <para style="terp_default_Centre_9">[[ time.strftime('%d/%m/%Y', time.strptime( line.date_planned, '%Y-%m-%d')) ]]</para>
           </td>
           <td>
-            <para style="terp_default_9">[[ time.strftime('%d/%m/%Y', time.strptime( line.date_planned, '%Y-%m-%d')) ]]</para>
+            <para style="terp_default_Right_9">[[ line.product_qty ]]</para>
           </td>
           <td>
-            <para style="terp_default_9">[[ '%.2f' % line.product_qty ]] [[ line.product_uom.name ]]</para>
+            <para style="terp_default_Right_9">[[ line.product_uom.name ]]</para>
           </td>
           <td>
-            <para style="terp_default_Right_9">[[ '%.2f' % line.price_unit ]]</para>
+            <para style="terp_default_Right_9">[[ line.price_unit ]]</para>
           </td>
           <td>
-            <para style="terp_default_Right_9">[[ '%.2f' % line.price_subtotal ]]</para>
+            <para style="terp_default_Right_9">[[ line.price_subtotal ]]</para>
           </td>
         </tr>
-      </blockTable>
-      <blockTable colWidths="43.0,468.0" style="Tableau5">
         <tr>
           <td>
-            <para style="terp_default_9">[[ repeatIn((line.notes and line.notes.splitlines()) or [], 'l') ]]</para>
+            <para style="terp_default_2">[[ repeatIn((line.notes and line.notes.splitlines()) or [], 'l') ]]</para>
+            <para style="terp_default_8_Italic">[[ l or removeParentNode('table') ]]</para>
           </td>
           <td>
-            <para style="terp_default_9">[[ l or removeParentNode('table') ]]</para>
+            <para style="terp_default_9">
+              <font color="white"> </font>
+            </para>
+          </td>
+          <td>
+            <para style="terp_default_Centre_9">
+              <font color="white"> </font>
+            </para>
+          </td>
+          <td>
+            <para style="terp_default_Right_9">
+              <font color="white"> </font>
+            </para>
+          </td>
+          <td>
+            <para style="terp_default_Right_9">
+              <font color="white"> </font>
+            </para>
+          </td>
+          <td>
+            <para style="terp_default_Right_9">
+              <font color="white"> </font>
+            </para>
+          </td>
+          <td>
+            <para style="terp_default_Right_9">
+              <font color="white"> </font>
+            </para>
           </td>
         </tr>
       </blockTable>
     </section>
-    <para style="terp_default_8">
-      <font color="white"> </font>
-    </para>
-    <blockTable colWidths="376.0,65.0,69.0" style="Tableau1">
+    <blockTable colWidths="415.0,57.0,42.0,20.0" style="Table_All_Total_Detail">
       <tr>
         <td>
           <para style="terp_default_9">
           </para>
         </td>
         <td>
-          <para style="terp_default_Bold_9">Net Total :</para>
+          <para style="terp_default_9">Net Total :</para>
         </td>
         <td>
-          <para style="terp_default_Right_9">[[ '%.2f' % o.amount_untaxed ]] [[ o.pricelist_id.currency_id.name ]]</para>
+          <para style="terp_default_Right_9">[[ o.amount_untaxed ]]</para>
+        </td>
+        <td>
+          <para style="terp_default_Right_9">[[ o.pricelist_id.currency_id.name  ]]</para>
         </td>
       </tr>
       <tr>
           </para>
         </td>
         <td>
-          <para style="terp_default_Bold_9">Taxes :</para>
+          <para style="P1">Taxes :</para>
         </td>
         <td>
-          <para style="terp_default_Right_9">[[ '%.2f' % o.amount_tax ]] [[ o.pricelist_id.currency_id.name ]]</para>
+          <para style="terp_default_Right_9">[[ o.amount_tax ]]</para>
+        </td>
+        <td>
+          <para style="terp_default_Right_9">[[ o.pricelist_id.currency_id.name  ]]</para>
         </td>
       </tr>
       <tr>
           </para>
         </td>
         <td>
-          <para style="terp_default_Bold_9">TOTAL :</para>
+          <para style="P2">Total :</para>
+        </td>
+        <td>
+          <para style="terp_default_Bold_9_Right">[[ o.amount_total ]]</para>
         </td>
         <td>
-          <para style="terp_default_Right_9">[[ '%.2f' % o.amount_total ]] [[ o.pricelist_id.currency_id.name ]]</para>
+          <para style="terp_default_Bold_9_Right">[[ o.pricelist_id.currency_id.name ]]</para>
         </td>
       </tr>
     </blockTable>
     <para style="terp_default_8">
       <font color="white"> </font>
     </para>
-    <blockTable colWidths="510.0" style="Tableau4">
+    <blockTable colWidths="535.0" style="Table_Outer_Notes">
       <tr>
         <td>
-          <para style="terp_default_8">[[ format(o.notes or '') ]]</para>
+          <para style="terp_default_9">[[ format(o.notes or '') ]]</para>
         </td>
       </tr>
     </blockTable>
-    <para style="terp_default_8">
+    <para style="terp_default_9">
       <font color="white"> </font>
     </para>
   </story>
 </document>
-