From 958fb6a4cecba5befab02581e62182a7fd6fa71c Mon Sep 17 00:00:00 2001
From: Najlaa <nel@silver>
Date: Fri, 10 Oct 2008 12:22:05 +0200
Subject: [PATCH] modif on purchase order

bzr revid: nel@silver-20081010102205-249p2t7up1m6wgp3
---
 addons/purchase/report/order.rml | 107 +++++++++++++++++++++----------
 1 file changed, 72 insertions(+), 35 deletions(-)

diff --git a/addons/purchase/report/order.rml b/addons/purchase/report/order.rml
index f46c47e6a6b..86fb8008807 100644
--- a/addons/purchase/report/order.rml
+++ b/addons/purchase/report/order.rml
@@ -10,7 +10,11 @@
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
     </blockTableStyle>
-    <blockTableStyle id="Table_All_Address_Detail">
+    <blockTableStyle id="Tableau1">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+    </blockTableStyle>
+    <blockTableStyle id="Tableau2">
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
     </blockTableStyle>
@@ -95,8 +99,11 @@
       <paraStyle name="all" alignment="justify"/>
     </initialize>
     <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="P3" rightIndent="0.0" leftIndent="12.0" fontName="Helvetica-Oblique" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P2" rightIndent="0.0" leftIndent="12.0" fontName="Helvetica-Oblique" fontSize="8.0" leading="10" 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="P4" fontName="Times-Roman" fontSize="9.0" leading="11"/>
+    <paraStyle name="P5" fontName="Times-Bold" fontSize="10.0" leading="13"/>
+    <paraStyle name="P6" fontName="Helvetica" 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"/>
@@ -133,40 +140,70 @@
   <images/>
   <story>
     <para style="terp_default_8">[[ repeatIn(objects,'o') ]]</para>
-    <para style="terp_default_8">
+    <para style="P6">
       <font color="white"> </font>
     </para>
-    <blockTable colWidths="294.0,240.0" style="Table_All_Address_Detail">
+    <blockTable colWidths="253.0,59.0,223.0" style="Tableau1">
       <tr>
         <td>
-          <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">[[ addr.partner_id.title or '' ]][[ addr.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="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">
+          <blockTable colWidths="253.0" style="Tableau2">
+            <tr>
+              <td>
+                <para style="P6">
+                  <font color="white"> </font>
+                </para>
+              </td>
+            </tr>
+            <tr>
+              <td>
+                <para style="P6">[[ repeatIn(o.dest_address_id and [o.dest_address_id] or [],'addr') ]]</para>
+                <para style="P5">Shipping address :</para>
+                <para style="P6">[[ o.partner_id.title or '' ]] [[ o.partner_id.name ]]</para>
+                <para style="P6">[[ addr.title or '' ]] [[ addr.name ]]</para>
+                <para style="P6">[[ addr.street ]]</para>
+                <para style="P6">[[ addr.street2 or '' ]]</para>
+                <para style="P6">[[ addr.zip or '' ]] [[ addr.city or '' ]]</para>
+                <para style="P6">[[ addr.state_id and addr.state_id.name or '' ]]</para>
+                <para style="P6">[[ addr.country_id and addr.country_id.name or '' ]]</para>
+              </td>
+            </tr>
+          </blockTable>
+          <para style="P6">
             <font color="white"> </font>
           </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>
+        <td>
+          <para style="P6">
+            <font color="white"> </font>
+          </para>
+        </td>
+        <td>
+          <para style="P6">[[ o.partner_id.title or '' ]] [[ o.partner_id.name ]]</para>
+          <para style="P6">[[ o.partner_address_id.title or '' ]] [[ o.partner_address_id.name ]]</para>
+          <para style="P6">[[ o.partner_address_id.street ]]</para>
+          <para style="P6">[[ o.partner_address_id.street2 or '' ]]</para>
+          <para style="P6">[[ o.partner_address_id.zip or '' ]] [[ o.partner_address_id.city or '' ]]</para>
+          <para style="P6">[[ o.partner_address_id.state_id and o.partner_address_id.state_id.name or '' ]]</para>
+          <para style="P6">[[ o.partner_address_id.country_id and o.partner_address_id.country_id.name or '' ]]</para>
+          <para style="P6">
+            <font color="white"> </font>
+          </para>
+          <para style="P6">Tel. : [[ o.partner_address_id.phone or '' ]]</para>
+          <para style="P6">Fax : [[ o.partner_address_id.fax or '' ]]</para>
+          <para style="P6">TVA : [[ o.partner_id.vat or '' ]]</para>
         </td>
       </tr>
     </blockTable>
-    <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>
+    <para style="P6">
+      <font color="white"> </font>
+    </para>
+    <para style="terp_default_8">
+      <font color="white"> </font>
+    </para>
+    <para style="Standard">
+      <font color="white"> </font>
+    </para>
+    <para style="terp_header"> [[ (o.state=='draft' or removeParentNode('font')) and 'Request for Quotation' ]] [[ (o.state&lt;&gt;'draft' or removeParentNode('font')) and 'Purchase Order Confirmation' ]] N&#176; [[ o.name ]]</para>
     <para style="terp_default_8">
       <font color="white"> </font>
     </para>
@@ -198,7 +235,7 @@
           <para style="terp_default_Centre_9">[[ o.partner_ref or '' ]]</para>
         </td>
         <td>
-          <para style="terp_default_Centre_9">[[ time.strftime('%d/%m/%Y', time.strptime(o.date_order, '%Y-%m-%d')) ]]</para>
+          <para style="Standard">[[ time.strftime('%d/%m/%Y', time.strptime(line.date_planned, '%Y-%m-%d %H:%M:%S')) ]]</para>
         </td>
         <td>
           <para style="terp_default_Centre_9">[[ o.validator and o.validator.name or '' ]]</para>
@@ -208,7 +245,7 @@
     <para style="terp_default_9">
       <font color="white"> </font>
     </para>
-    <blockTable colWidths="253.0,52.0,57.0,44.0,58.0,70.0" repeatRows="1" style="Table_Header_Pur_ord_Line">
+    <blockTable colWidths="253.0,52.0,49.0,58.0,58.0,70.0" repeatRows="1" style="Table_Header_Pur_ord_Line">
       <tr>
         <td>
           <para style="terp_tblheader_Details">Description</para>
@@ -232,7 +269,7 @@
     </blockTable>
     <section>
       <para style="terp_default_8">[[ repeatIn(o.order_line,'line') ]]</para>
-      <blockTable colWidths="254.0,52.0,57.0,24.0,20.0,57.0,71.0" style="Table_Order_Pur_line_Content">
+      <blockTable colWidths="254.0,52.0,57.0,34.0,20.0,57.0,70.0" style="Table_Order_Pur_line_Content">
         <tr>
           <td>
             <para style="terp_default_9">[[ line.name ]]</para>
@@ -241,7 +278,7 @@
             <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 %H:%M:%S')) ]]</para>
+            <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_Right_9">[[ line.product_qty ]] </para>
@@ -258,7 +295,7 @@
         </tr>
         <tr>
           <td>
-            <para style="P3">[[ line.notes or removeParentNode('tr') ]]</para>
+            <para style="P2">[[ line.notes or removeParentNode('tr') ]]</para>
           </td>
           <td>
             <para style="terp_default_9">
@@ -293,7 +330,7 @@
         </tr>
       </blockTable>
     </section>
-    <blockTable colWidths="415.0,57.0,42.0,20.0" style="Table_All_Total_Detail">
+    <blockTable colWidths="415.0,57.0,52.0,20.0" style="Table_All_Total_Detail">
       <tr>
         <td>
           <para style="terp_default_9">
@@ -333,7 +370,7 @@
           </para>
         </td>
         <td>
-          <para style="P2">Total :</para>
+          <para style="P3">Total :</para>
         </td>
         <td>
           <para style="terp_default_Bold_9_Right">[[ o.amount_total ]]</para>