set formatlang finction in :

  sale_delivery_report/report/shipping.rml
  sale_delivery_report/report/shipping.sxw

bzr revid: apa@tinyerp.com-20090128064757-cob9mu2f0obnh1h8

diff --git a/addons/sale_delivery_report/report/shipping.rml b/addons/sale_delivery_report/report/shipping.rml
index f7af0da..eb293c2 100644 (file)
--- a/addons/sale_delivery_report/report/shipping.rml
+++ b/addons/sale_delivery_report/report/shipping.rml
@@ -72,9 +72,6 @@
     <initialize>
       <paraStyle name="all" alignment="justify"/>
     </initialize>
-    <paraStyle name="P1" rightIndent="0.0" leftIndent="-5.0" fontName="Helvetica-Bold" fontSize="12.0" leading="15" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/>
-    <paraStyle name="P2" rightIndent="0.0" leftIndent="-28.0" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P3" 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="Footer" fontName="Times-Roman"/>
@@ -109,33 +106,31 @@
   </stylesheet>
   <images/>
   <story>
-    <para style="terp_default_9">[[ repeatIn(objects,'o') ]]</para>
+    <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.origin) and 'Error, no sale order attached to this picking !' or '' ]]</para>
+    <para style="terp_default_9">[[ not(o.sale_id) and 'Error, no sale order attached to this picking !' or '' ]]</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">[[ repeatIn(get_address(o),'add') ]]</para>
-          <para style="terp_default_9">[[ add['name2'] ]]</para>
-          <para style="terp_default_9">[[ add['street'] ]]</para>
-          <para style="terp_default_9">[[ add['city'] ]]</para>
-          <para style="terp_default_9">[[ add['country'] ]]</para>
-
+          <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>
         </td>
         <td>
-                 <para style="terp_default_Bold_9">Shipping To</para>
-          <para style="terp_default_9">[[ repeatIn(get_address_ship(o),'ship') ]]</para>
-          <para style="terp_default_9">[[ ship['name2'] ]]</para>
-          <para style="terp_default_9">[[ ship['street'] ]]</para>
-          <para style="terp_default_9">[[ ship['city'] ]]</para>
-          <para style="terp_default_9">[[ ship['country'] ]]</para>
+          <para style="terp_default_9">[[ o.sale_id and o.sale_id.partner_shipping_id and o.sale_id.partner_shipping_id.name or '']]</para>
+          <para style="terp_default_9">[[ o.sale_id and o.sale_id.partner_shipping_id and o.sale_id.partner_shipping_id.street or '']]</para>
+          <para style="terp_default_9">[[ o.sale_id and o.sale_id.partner_shipping_id and o.sale_id.partner_shipping_id.zip or '']]</para>
+          <para style="terp_default_9">[[ o.sale_id and o.sale_id.partner_shipping_id and o.sale_id.partner_shipping_id.city or '']]</para>
+          <para style="terp_default_9">[[ o.sale_id and o.sale_id.partner_shipping_id and o.sale_id.partner_shipping_id.country_id and o.sale_id.partner_shipping_id.country_id.name or '']]</para>
         </td>
       </tr>
     </blockTable>
-    <para style="P1">Delivery Order : [[ o.name ]]</para>
+    <para style="terp_header">Delivery Order : [[ o.name ]]</para>
     <para style="terp_default_8">
       <font color="white"> </font>
     </para>
@@ -161,19 +156,19 @@
     <blockTable colWidths="126.0,103.0,103.0,103.0,103.0" style="Table2">
       <tr>
         <td>
-          <para style="terp_default_Centre_8">[[ o.origin ]]</para>
+          <para style="terp_default_Centre_8">[[ o.sale_id and o.sale_id.name ]]</para>
         </td>
         <td>
-          <para style="terp_default_Centre_8">[[ o.sale_id and o.sale_id.date_order or '']]</para>
+          <para style="terp_default_Centre_8">[[ formatLang(o.sale_id and o.sale_id.date_order,date = True) ]]</para>
         </td>
         <td>
-          <para style="terp_default_Centre_8">[[ o.min_date ]]</para>
+          <para style="terp_default_Centre_8">[[ formatLang(o.min_date,date_time = True) ]]</para>
         </td>
         <td>
           <para style="terp_default_Centre_8">[[ o.carrier_id and o.carrier_id.name or '' ]]</para>
         </td>
         <td>
-          <para style="terp_default_Centre_8">[[ o.weight ]]</para>
+          <para style="terp_default_Centre_8">[[ formatLang(o.weight) ]]</para>
         </td>
       </tr>
     </blockTable>
@@ -197,7 +192,7 @@
       <font color="white"> </font>
     </para>
     <section>
-      <para style="P2">[[ repeatIn(o.move_lines,'line') ]]</para>
+      <para style="terp_default_9">[[repeatIn(o.move_lines,'line')]]</para>
       <blockTable colWidths="370.0,85.0,59.0,24.0" style="Table4">
         <tr>
           <td>
@@ -207,7 +202,7 @@
             <para style="terp_default_Centre_9">[[ (line.prodlot_id and line.prodlot_id.name) or ' ' ]]</para>
           </td>
           <td>
-            <para style="terp_default_Right_9">[[ line.product_qty ]]</para>
+            <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>