merge
[odoo/odoo.git] / addons / sale / report / order.rml
index 68b6c28..ca7f5d8 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="34.0" y1="42.0" width="527" height="758"/>
+      <frame id="first" x1="15.0" y1="42.0" width="539" height="758"/>
     </pageTemplate>
   </template>
   <stylesheet>
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
     </blockTableStyle>
-    <blockTableStyle id="Tableau1">
+    <blockTableStyle id="AddressTable">
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
     </blockTableStyle>
-    <blockTableStyle id="Tableau2">
+    <blockTableStyle id="Table1">
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
-      <lineStyle kind="GRID" colorName="black"/>
-      <blockBackground colorName="#e6e6e6" start="0,0" stop="0,0"/>
-      <blockBackground colorName="#e6e6e6" start="1,0" stop="1,0"/>
-      <blockBackground colorName="#e6e6e6" start="2,0" stop="2,0"/>
-      <blockBackground colorName="#e6e6e6" start="3,0" stop="3,0"/>
-      <blockBackground colorName="#e6e6e6" start="4,0" stop="4,0"/>
-      <blockBackground colorName="#e6e6e6" start="5,0" stop="5,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="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="OrderTable">
       <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="Tableau5">
+    <blockTableStyle id="HeadingTable">
       <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="Tableau6">
+    <blockTableStyle id="Order_Desc_Table">
       <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"/>
     </blockTableStyle>
-    <blockTableStyle id="Tableau4">
+    <blockTableStyle id="Total_Table">
+      <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="LINEBEFORE" colorName="#ffffff" start="0,1" stop="0,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#ffffff" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#ffffff" start="0,2" stop="0,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#ffffff" start="0,-1" stop="0,-1"/>
+      <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="Partner_Note_Table">
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
     </blockTableStyle>
     <initialize>
       <paraStyle name="all" alignment="justify"/>
     </initialize>
-    <paraStyle name="P1" fontName="Times-Roman" fontSize="9.0" leading="11"/>
-    <paraStyle name="P2" fontName="Times-Bold" fontSize="9.0" leading="11"/>
-    <paraStyle name="P3" fontName="Times-Roman" fontSize="10.0" leading="13"/>
-    <paraStyle name="P4" fontName="Times-Roman" fontSize="10.0" leading="13"/>
-    <paraStyle name="P5" fontName="Times-Roman" fontSize="4.0" leading="5"/>
-    <paraStyle name="P6" fontName="Times-Bold" fontSize="9.0" leading="11"/>
-    <paraStyle name="P7" fontName="Times-Roman" fontSize="11.0" leading="14"/>
-    <paraStyle name="P8" fontName="Times-Roman" fontSize="11.0" leading="14"/>
-    <paraStyle name="P9" fontName="Times-Roman" fontSize="4.0" leading="5"/>
-    <paraStyle name="P10" fontName="Times-Roman"/>
-    <paraStyle name="P11" fontName="Times-Roman" fontSize="16.0" leading="20"/>
-    <paraStyle name="P12" fontName="Times-Roman" fontSize="11.0" leading="14"/>
-    <paraStyle name="P13" fontName="Times-Bold" fontSize="8.0" leading="10"/>
-    <paraStyle name="P14" fontName="Times-Bold" fontSize="8.0" leading="10" alignment="CENTER"/>
-    <paraStyle name="P15" fontName="Times-Bold" fontSize="8.0" leading="10" alignment="RIGHT"/>
-    <paraStyle name="P16" fontName="Times-BoldItalic" fontSize="6.0" leading="8" alignment="LEFT"/>
-    <paraStyle name="P17" fontName="Times-Roman" fontSize="9.0" leading="11" alignment="LEFT"/>
-    <paraStyle name="P18" fontName="Times-Roman" fontSize="9.0" leading="11" alignment="CENTER"/>
-    <paraStyle name="P19" fontName="Times-Roman" fontSize="9.0" leading="11" alignment="RIGHT"/>
-    <paraStyle name="P20" fontName="Times-BoldItalic" fontSize="9.0" leading="11" alignment="LEFT"/>
-    <paraStyle name="P21" fontName="Times-Italic" fontSize="9.0" leading="11" alignment="LEFT"/>
-    <paraStyle name="P22" fontName="Times-Roman" fontSize="7.0" leading="9"/>
-    <paraStyle name="P23" fontName="Times-Bold" fontSize="9.0" leading="11" alignment="RIGHT"/>
-    <paraStyle name="P24" fontName="Times-Roman" fontSize="7.0" leading="9"/>
-    <paraStyle name="P25" fontName="Times-Bold" fontSize="9.0" leading="11" alignment="RIGHT"/>
-    <paraStyle name="P26" fontName="Times-Bold" fontSize="9.0" leading="11"/>
-    <paraStyle name="P27" fontName="Times-Roman" alignment="LEFT"/>
-    <paraStyle name="P28" fontName="Times-Roman" alignment="LEFT"/>
+    <paraStyle name="P1" fontName="Helvetica-Oblique" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P2" fontName="Helvetica" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P3" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P4" rightIndent="0.0" leftIndent="14.0" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P5" rightIndent="0.0" leftIndent="11.0" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P6" rightIndent="0.0" leftIndent="-2.0" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P7" rightIndent="0.0" leftIndent="11.0" fontName="Helvetica-Oblique" fontSize="8.0" leading="10" 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="List" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="Heading" fontName="Helvetica" fontSize="8.0" leading="10" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="List" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
     <paraStyle name="Table Contents" fontName="Times-Roman"/>
     <paraStyle name="Table Heading" fontName="Times-Roman" alignment="CENTER"/>
     <paraStyle name="Caption" fontName="Times-Roman" fontSize="12.0" leading="15" spaceBefore="6.0" spaceAfter="6.0"/>
     <paraStyle name="Index" fontName="Times-Roman"/>
+    <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_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="Times-Roman"/>
+    <paraStyle name="Horizontal Line" fontName="Times-Roman" 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_Italic" fontName="Helvetica-Oblique" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="Preformatted Text" fontName="Times-Roman" fontSize="10.0" leading="13" spaceBefore="0.0" spaceAfter="0.0"/>
   </stylesheet>
+  <images/>
   <story>
-    <para style="P1">[[ repeatIn(objects,'o') ]] <font face="Times-Roman">[[ setLang(o.partner_id.lang) ]]</font></para>
-    <blockTable colWidths="257.0,50.0,220.0" style="Tableau1">
+    <para style="terp_default_8">[[ repeatIn(objects,'o') ]]</para>
+    <para style="terp_default_8">[[ setLang(o.partner_id.lang) ]]</para>
+    <blockTable colWidths="265.0,51.0,225.0" style="AddressTable">
       <tr>
         <td>
-          <para style="P2">Shipping address :</para>
-          <para style="P3">[[ o.partner_id.title or '' ]] [[ o.partner_id.name ]]</para>
-          <para style="P3">[[ o.partner_shipping_id.title or '' ]] [[ o.partner_shipping_id.name ]]</para>
-          <para style="P3">[[ o.partner_shipping_id.street ]]</para>
-          <para style="P3">[[ o.partner_shipping_id.street2 or '' ]]</para>
-          <para style="P4"><font face="Times-Roman">[[ o.partner_shipping_id.zip or '' ]]</font> [[ o.partner_shipping_id.city or '' ]]</para>
-          <para style="P4">[[ o.partner_shipping_id.state_id and o.partner_shipping_id.state_id.name or '' ]]</para>
-          <para style="P4">[[ o.partner_shipping_id.country_id and o.partner_shipping_id.country_id.name or '' ]]</para>
-          <para style="P5">
+          <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">[[ o.partner_shipping_id.title or '' ]] [[ o.partner_shipping_id.name ]]</para>
+          <para style="terp_default_9">[[ o.partner_shipping_id.street ]]</para>
+          <para style="terp_default_9">[[ o.partner_shipping_id.street2 or '' ]]</para>
+          <para style="terp_default_9">[[ o.partner_shipping_id.city or '' ]] [[ o.partner_shipping_id.zip or '' ]]</para>
+          <para style="terp_default_9">[[ o.partner_shipping_id.state_id and o.partner_shipping_id.state_id.name or '' ]] [[ o.partner_shipping_id.country_id and o.partner_shipping_id.country_id.name or '' ]]</para>
+          <para style="terp_default_9">
             <font color="white"> </font>
           </para>
-          <para style="P6">Invoice address :</para>
-          <para style="P4">[[ o.partner_invoice_id.street ]][[ o.partner_invoice_id.street2 and ', %s' % o.partner_invoice_id.street2 or '' ]]</para>
-          <para style="P4">[[ o.partner_invoice_id.zip or '' ]] [[ o.partner_invoice_id.city or '' ]] [[ ', %s' % (o.partner_invoice_id.country_id and o.partner_invoice_id.country_id.name or '') ]]</para>
+          <para style="terp_default_Bold_9">Invoice address :[[ o.partner_id.property_payment_term and o.partner_id.property_payment_term.name or '' ]]</para>
+          <para style="terp_default_9">[[ o.partner_invoice_id.street ]] [[ o.partner_invoice_id.street2 and (', %s' % o.partner_invoice_id.street2 or '') ]]</para>
+          <para style="terp_default_9">[[ o.partner_invoice_id.zip or '' ]] [[ o.partner_invoice_id.city or '' ]] [[ o.partner_invoice_id.country_id and (', %s' % (o.partner_invoice_id.country_id and o.partner_invoice_id.country_id.name or '')) ]]</para>
         </td>
         <td>
-          <para style="P7">
+          <para style="terp_default_8">
             <font color="white"> </font>
           </para>
         </td>
         <td>
-          <para style="P8">[[ o.partner_id.title or '' ]] [[ o.partner_id.name ]]</para>
-          <para style="P8">[[ o.partner_order_id.title or '' ]] [[ o.partner_order_id.name ]]</para>
-          <para style="P8">[[ o.partner_order_id.street ]]</para>
-          <para style="P8">[[ o.partner_order_id.street2 or '' ]]</para>
-          <para style="P8">[[ o.partner_order_id.zip or '' ]] [[ o.partner_order_id.city or '' ]]</para>
-          <para style="P8">[[ o.partner_order_id.state_id and o.partner_order_id.state_id.name or '' ]]</para>
-          <para style="P8">[[ o.partner_order_id.country_id and o.partner_order_id.country_id.name or '' ]]</para>
-          <para style="P9">
+          <para style="terp_default_9">[[ o.partner_id.title or '' ]] [[ o.partner_id.name ]]</para>
+          <para style="terp_default_9">[[ o.partner_order_id.title or '' ]] [[ o.partner_order_id.name ]]</para>
+          <para style="terp_default_9">[[ o.partner_order_id.street ]]</para>
+          <para style="terp_default_9">[[ o.partner_order_id.street2 or '' ]]</para>
+          <para style="terp_default_9">[[ o.partner_order_id.zip or '' ]] [[ o.partner_order_id.city or '' ]]</para>
+          <para style="terp_default_9">[[ o.partner_order_id.state_id and o.partner_order_id.state_id.name or '' ]] [[ o.partner_order_id.country_id and o.partner_order_id.country_id.name or '' ]]</para>
+          <para style="terp_default_9">
+            <font color="white"> </font>
+          </para>
+          <para style="terp_default_9">Tel. : [[ o.partner_order_id.phone or removeParentNode('para') ]]</para>
+          <para style="terp_default_9">Fax : [[ o.partner_order_id.fax or removeParentNode('para') ]]</para>
+          <para style="terp_default_9">TVA : [[ o.partner_id.vat or removeParentNode('para') ]]</para>
+          <para style="terp_default_9">
             <font color="white"> </font>
           </para>
-          <para style="P3">Tel. : [[ o.partner_order_id.phone or '' ]]</para>
-          <para style="P3">Fax : [[ o.partner_order_id.fax or '' ]]</para>
-          <para style="P3">VAT : [[ o.partner_id.vat or '' ]]</para>
         </td>
       </tr>
     </blockTable>
-    <para style="P10">
+    <para style="terp_default_8">
       <font color="white"> </font>
     </para>
-    <para style="P11">[[ o.state=='draft' and 'Quotation ' or 'Order ' ]] N° : [[ o.name ]]</para>
-    <para style="P11">
+    <para style="terp_header">[[ o.state&lt;&gt;'draft' and removeParentNode('para') ]] Quotation N° [[ o.name ]]</para>
+    <para style="terp_header">[[ o.state=='draft' and removeParentNode('para') ]] Order N° [[ o.name ]]</para>
+    <para style="terp_default_8">
       <font color="white"> </font>
     </para>
-    <para style="P12">Your order reference : [[ o.client_order_ref or '' ]]</para>
-    <para style="P12">Date ordered : [[ time.strftime('%d/%m/%Y', time.strptime(o.date_order, '%Y-%m-%d')) ]]</para>
-    <para style="P12">Our salesman : [[ o.user_id.name ]]</para>
-    <para style="P10">
+    <blockTable colWidths="132.0,134.0,135.0,135.0" style="Table1">
+      <tr>
+        <td>
+          <para style="terp_tblheader_General_Centre">Your Reference </para>
+        </td>
+        <td>
+          <para style="terp_tblheader_General_Centre">Date Ordered </para>
+        </td>
+        <td>
+          <para style="terp_tblheader_General_Centre">Our Salesman </para>
+        </td>
+        <td>
+          <para style="terp_tblheader_General_Centre">Payment Terms</para>
+        </td>
+      </tr>
+    </blockTable>
+    <blockTable colWidths="132.0,134.0,135.0,135.0" style="OrderTable">
+      <tr>
+        <td>
+          <para style="terp_default_Centre_8">[[ o.name ]]</para>
+        </td>
+        <td>
+          <para style="terp_default_Centre_8">[[ o.date_order ]]</para>
+        </td>
+        <td>
+          <para style="terp_default_Centre_8">[[ o.user_id.name ]]</para>
+        </td>
+        <td>
+          <para style="terp_default_Centre_8">[[ o.partner_id.property_payment_term['name'] ]]</para>
+        </td>
+      </tr>
+    </blockTable>
+    <para style="terp_default_8">
       <font color="white"> </font>
     </para>
-    <blockTable colWidths="270.0,63.0,56.0,32.0,52.0,55.0" repeatRows="1" style="Tableau2">
+    <blockTable colWidths="208.0,99.0,64.0,59.0,43.0,65.0" repeatRows="1" style="HeadingTable">
       <tr>
         <td>
-          <para style="P13">Product Description</para>
+          <para style="terp_tblheader_Details">Description</para>
         </td>
         <td>
-          <para style="P14">Applicable Taxes</para>
+          <para style="terp_tblheader_Details_Centre">VAT</para>
         </td>
         <td>
-          <para style="P15">Qty</para>
+          <para style="terp_tblheader_Details_Centre">Quantity</para>
         </td>
         <td>
-          <para style="P13">Disc.</para>
+          <para style="terp_tblheader_Details_Right">Unit Price</para>
         </td>
         <td>
-          <para style="P13">Unit Price</para>
+          <para style="terp_tblheader_Details_Right">Disc.(%)</para>
         </td>
         <td>
-          <para style="P13">Net Price</para>
+          <para style="terp_tblheader_Details_Right">Price</para>
         </td>
       </tr>
     </blockTable>
     <section>
-      <para style="P16">[[ repeatIn(o.order_line,'line') ]]</para>
-      <blockTable colWidths="270.0,63.0,56.0,32.0,52.0,54.0" style="Tableau3">
+      <para style="terp_default_1">[[ repeatIn(o.order_line,'line') ]]</para>
+      <blockTable colWidths="208.0,99.0,43.0,21.0,59.0,43.0,65.0" style="Order_Desc_Table">
         <tr>
           <td>
-            <para style="P17">[[ line.name ]]</para>
+            <para style="terp_default_9">[[ line.name ]]</para>
           </td>
           <td>
-            <para style="P18">[[ ', '.join(map(lambda x: x.name, line.tax_id))]]</para>
+            <para style="terp_default_Centre_9">[[ ', '.join(map(lambda x: x.name, line.tax_id)) ]]</para>
           </td>
           <td>
-            <para style="P19">[[ '%.2f' % line.product_uos_qty or '%.2f' % line.product_uom_qty ]] [[ line.product_uos and line.product_uos.name or line.product_uom.name ]]</para>
+            <para style="terp_default_Right_9">[[ line.product_uos and line.product_uos_qty or line.product_uom_qty ]] </para>
           </td>
           <td>
-            <para style="P17">[[ (line.discount and str(line.discount)+'%')or '' ]]</para>
+            <para style="terp_default_Right_9">[[ line.product_uos and line.product_uos.name or line.product_uom.name ]]</para>
           </td>
           <td>
-            <para style="P19">[[ '%.2f' % line.price_unit ]]</para>
+            <para style="terp_default_Right_9">[[ line.price_unit ]]</para>
           </td>
           <td>
-            <para style="P19">[[ '%.2f' % line.price_subtotal ]]</para>
+            <para style="terp_default_Right_9">[[ line.discount and str(line.discount) or '' ]]</para>
+          </td>
+          <td>
+            <para style="terp_default_Right_9">[[ line.price_subtotal ]]</para>
           </td>
         </tr>
-      </blockTable>
-      <blockTable colWidths="52.0,366.0,110.0" style="Tableau5">
         <tr>
           <td>
-            <para style="P20">[[ repeatIn((line.notes and [line.notes]) or [], 'l') ]]</para>
+            <para style="P7">[[ format(line.notes or removeParentNode('tr')) ]]</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="P21">[[ l ]] [[ setTag('para','xpre') ]]</para>
+            <para style="terp_default_Right_9">
+              <font color="white"> </font>
+            </para>
           </td>
           <td>
-            <para style="P20">
+            <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>
-    <blockTable colWidths="349.0,69.0,110.0" style="Tableau6">
+    <blockTable colWidths="384.0,67.0,64.0,22.0" style="Total_Table">
       <tr>
         <td>
-          <para style="P22">
+          <para style="terp_default_9">
             <font color="white"> </font>
           </para>
         </td>
         <td>
-          <para style="P23">Net Total :</para>
+          <para style="P6">Net Total :</para>
         </td>
         <td>
-          <para style="P23">[[ '%.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="P2">[[ o.pricelist_id.currency_id.name ]]</para>
         </td>
       </tr>
       <tr>
         <td>
-          <para style="P22">
+          <para style="terp_default_9">
             <font color="white"> </font>
           </para>
         </td>
         <td>
-          <para style="P23">Taxes :</para>
+          <para style="P5">Taxes :</para>
+        </td>
+        <td>
+          <para style="terp_default_Right_9">[[ o.amount_tax ]]</para>
         </td>
         <td>
-          <para style="P23">[[ '%.2f' % o.amount_tax ]] [[ o.pricelist_id.currency_id.name ]]</para>
+          <para style="P2">[[ o.pricelist_id.currency_id.name ]]</para>
         </td>
       </tr>
       <tr>
         <td>
-          <para style="P24">
+          <para style="terp_default_9">
             <font color="white"> </font>
           </para>
         </td>
         <td>
-          <para style="P25">TOTAL :</para>
+          <para style="P4">Total :</para>
+        </td>
+        <td>
+          <para style="terp_default_Right_9_Bold">[[ o.amount_total ]] </para>
         </td>
         <td>
-          <para style="P25">[[ '%.2f' % o.amount_total ]] [[ o.pricelist_id.currency_id.name ]]</para>
+          <para style="P3">[[ o.pricelist_id.currency_id.name ]]</para>
         </td>
       </tr>
     </blockTable>
-    <para style="P26">
+    <para style="terp_default_8">
       <font color="white"> </font>
     </para>
-    <blockTable colWidths="527.0" style="Tableau4">
+    <blockTable colWidths="534.0" style="Partner_Note_Table">
       <tr>
         <td>
-          <para style="P27">[[ o.note or '' ]] [[ setTag('para','xpre') ]]</para>
+          <para style="terp_default_9">[[ format(o.note or '') ]]</para>
         </td>
       </tr>
       <tr>
         <td>
-          <para style="P27">[[ 'xpre' and o.partner_id.property_payment_term and o.partner_id.property_payment_term[1] ]] [[ setTag('para','xpre') ]]</para>
+          <para style="terp_default_9">[[ format((o.partner_id.property_payment_term and o.partner_id.property_payment_term.note) or '') ]]</para>
         </td>
       </tr>
     </blockTable>
-    <para style="P28">
+    <para style="P1">
       <font color="white"> </font>
     </para>
   </story>
 </document>
-