From 948d1daa0f0422f8d267919bf84d04e4cd4a3706 Mon Sep 17 00:00:00 2001
From: apa-tiny <apa@tinyerp.com>
Date: Wed, 14 Jul 2010 18:28:15 +0530
Subject: [PATCH] [IMP]:mrp:improved production order report.

bzr revid: apa@tinyerp.com-20100714125815-qeh4oeu2ielj6ixg
---
 addons/mrp/report/order.rml | 103 +++++++++++++-----------------------
 1 file changed, 36 insertions(+), 67 deletions(-)

diff --git a/addons/mrp/report/order.rml b/addons/mrp/report/order.rml
index 3db5396d444..0f08d368900 100644
--- a/addons/mrp/report/order.rml
+++ b/addons/mrp/report/order.rml
@@ -118,7 +118,7 @@
       <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="4,0" stop="4,0"/>
       <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="4,-1" stop="4,-1"/>
     </blockTableStyle>
-    <blockTableStyle id="Table8">
+    <blockTableStyle id="Table11">
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
       <lineStyle kind="LINEBELOW" colorName="#000000" start="0,-1" stop="0,-1"/>
@@ -126,7 +126,7 @@
       <lineStyle kind="LINEBELOW" colorName="#000000" start="2,-1" stop="2,-1"/>
       <lineStyle kind="LINEBELOW" colorName="#000000" start="3,-1" stop="3,-1"/>
     </blockTableStyle>
-    <blockTableStyle id="Table9">
+    <blockTableStyle id="Table12">
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
       <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
@@ -135,15 +135,7 @@
       <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="3,-1" stop="3,-1"/>
       <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="4,-1" stop="4,-1"/>
     </blockTableStyle>
-    <blockTableStyle id="Table7">
-      <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"/>
-    </blockTableStyle>
-    <blockTableStyle id="Table10">
+    <blockTableStyle id="Table13">
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
       <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
@@ -186,10 +178,9 @@
     <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_2" fontName="Helvetica" fontSize="2.0" leading="3" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="terp_default_space" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="6.0" spaceAfter="0.0"/>
+    <images/>
   </stylesheet>
-  <images/>
   <story>
-   <section>
     <para style="terp_default_8">[[ repeatIn(objects,'o') ]] </para>
     <para style="terp_default_8">
       <font color="white"> </font>
@@ -204,7 +195,7 @@
     <para style="terp_default_space">
       <font color="white"> </font>
     </para>
-    <blockTable colWidths="193.0,106.0,96.0,132.0" style="Table3">
+    <blockTable colWidths="193.0,83.0,122.0,129.0" style="Table3">
       <tr>
         <td>
           <para style="terp_tblheader_General_Centre">Product </para>
@@ -220,7 +211,7 @@
         </td>
       </tr>
     </blockTable>
-    <blockTable colWidths="193.0,106.0,96.0,132.0" style="Table5">
+    <blockTable colWidths="193.0,83.0,122.0,129.0" style="Table5">
       <tr>
         <td>
           <para style="terp_default_Centre_8">[[ o.product_id.code ]] [[ o.product_id.name ]]</para>
@@ -236,16 +227,16 @@
         </td>
       </tr>
     </blockTable>
-    <para style="terp_default_space">
+    <para style="terp_default_8">
       <font color="white"> </font>
     </para>
-    <blockTable colWidths="118.0,147.0,132.0,131.0" repeatRows="1" style="Table1">
+    <blockTable colWidths="193.0,83.0,122.0,129.0" repeatRows="1" style="Table1">
       <tr>
         <td>
-          <para style="terp_tblheader_General_Centre">Printing date</para>
+          <para style="terp_tblheader_General_Centre">Planned Date</para>
         </td>
         <td>
-          <para style="terp_tblheader_General_Centre">Planned Date </para>
+          <para style="terp_tblheader_General_Centre">Printing date</para>
         </td>
         <td>
           <para style="terp_tblheader_General_Centre">Partner Ref</para>
@@ -256,31 +247,31 @@
       </tr>
     </blockTable>
     <section>
-      <blockTable colWidths="118.0,147.0,132.0,131.0" style="Table2">
+      <blockTable colWidths="193.0,83.0,122.0,129.0" style="Table2">
         <tr>
-          <td>
-            <para style="terp_default_Centre_8">[[ formatLang(time.strftime('%Y-%m-%d'),date = True) ]]</para>
-          </td>
           <td>
             <para style="terp_default_Centre_8">[[ formatLang(o.date_planned, date_time = True) ]]</para>
           </td>
           <td>
-            <para style="terp_default_Centre_8">[[ 'sale_ref' in o._columns.keys() and o.sale_ref or removeParentNode('para') ]]</para>
+            <para style="terp_default_Centre_8">[[ formatLang(time.strftime('%Y-%m-%d'),date = True) ]]</para>
           </td>
           <td>
-            <para style="terp_default_Centre_8">[[ 'sale_name' in o._columns.keys() and o.sale_name or removeParentNode('para') ]]</para>
+            <para style="terp_default_Centre_8">[[ ('sale_ref' in o._columns.keys() and o.sale_ref) or '' ]]</para>
+          </td>
+          <td>
+            <para style="terp_default_Centre_8">[[ ('sale_name' in o._columns.keys() and o.sale_name) or '' ]]</para>
           </td>
         </tr>
       </blockTable>
     </section>
-    <para style="terp_default_space">
+    <para style="terp_default_Bold_8">
       <font color="white"> </font>
     </para>
     <para style="terp_default_Bold_8">Work Orders</para>
-    <para style="terp_default_8">
+    <para style="terp_default_Bold_8">
       <font color="white"> </font>
     </para>
-    <blockTable colWidths="81.0,155.0,125.0,84.0,83.0" style="Table6">
+    <blockTable colWidths="74.0,203.0,121.0,66.0,64.0" style="Table6">
       <tr>
         <td>
           <para style="terp_tblheader_General_Centre">Sequence</para>
@@ -301,7 +292,7 @@
     </blockTable>
     <section>
       <para style="terp_default_8">[[ repeatIn(o.workcenter_lines,'line2') ]]</para>
-      <blockTable colWidths="81.0,155.0,125.0,84.0,83.0" style="Table4">
+      <blockTable colWidths="74.0,203.0,121.0,66.0,64.0" style="Table4">
         <tr>
           <td>
             <para style="terp_default_Centre_8">[[ line2.sequence ]]</para>
@@ -324,17 +315,19 @@
         <font color="white"> </font>
       </para>
     </section>
-    <para style="terp_default_space">
+    <para style="terp_default_8">
       <font color="white"> </font>
     </para>
     <para style="terp_default_Bold_9">Bill Of Material </para>
     <para style="terp_default_8">
       <font color="white"> </font>
     </para>
-    <section>
-    <para style="terp_default_Bold_9">Products to Consume</para>
-    <blockTable colWidths="235.0,82.0,107.0,104.0" style="Table8">
-	  <para> <font color="white"> [[ o.move_lines ==[] and removeParentNode('section')]]</font></para>    
+    <para style="terp_default_Bold_9">Consumed Products [[ o.move_lines2 ==[] and removeParentNode('para')]]</para>
+    <para style="terp_default_Bold_9">Products to Consume [[ o.move_lines ==[] and removeParentNode('para')]]</para>
+    <para style="terp_default_8">
+      <font color="white"> </font>
+    </para>
+    <blockTable colWidths="250.0,66.0,107.0,104.0" style="Table11">
       <tr>
         <td>
           <para style="terp_tblheader_Details">Product </para>
@@ -350,10 +343,9 @@
         </td>
       </tr>
     </blockTable>
-    </section>
     <section>
-      <blockTable colWidths="235.0,47.0,34.0,108.0,104.0" style="Table9">
-       <para style="terp_default_8">[[ repeatIn(o.move_lines,'line') ]]</para>
+      <para style="terp_default_8">[[ repeatIn(o.move_lines,'line') ]]</para>
+      <blockTable colWidths="250.0,42.0,23.0,109.0,104.0" style="Table12">
         <tr>
           <td>
             <para style="terp_default_9">[[ line.product_id.code ]] [[ line.product_id.name ]]</para>
@@ -372,34 +364,10 @@
           </td>
         </tr>
       </blockTable>
-      </section>
-	  <para style="terp_default_space">
-      <font color="white"> </font>
-    </para>
+    </section>
     <section>
-    <para style="terp_default_Bold_9">Consumed Products</para>
-	   
-      <blockTable colWidths="235.0,82.0,107.0,104.0" style="Table7">
-      <para> <font color="white"> [[ o.move_lines2 ==[] and removeParentNode('section')]]</font></para>
-        <tr>
-          <td>
-            <para style="terp_tblheader_Details">Product </para>
-          </td>
-          <td>
-            <para style="terp_tblheader_Details_Centre">Quantity</para>
-          </td>
-          <td>
-            <para style="terp_tblheader_Details_Centre">Source Location</para>
-          </td>
-          <td>
-            <para style="terp_tblheader_Details_Centre">Destination Location</para>
-          </td>
-        </tr>
-      </blockTable>
-      </section>
-      <section>
-      <blockTable colWidths="235.0,47.0,34.0,108.0,104.0" style="Table10">
-	  <para style="terp_default_8">[[ repeatIn(o.move_lines2,'line2') ]]</para>      
+      <para style="terp_default_8">[[ repeatIn(o.move_lines2,'line2') ]]</para>
+      <blockTable colWidths="251.0,41.0,23.0,109.0,104.0" style="Table13">
         <tr>
           <td>
             <para style="terp_default_9">[[ line2.product_id.code ]] [[ line2.product_id.name ]]</para>
@@ -418,8 +386,9 @@
           </td>
         </tr>
       </blockTable>
-    
+      <para style="terp_default_2">
+        <font color="white"> </font>
+      </para>
     </section>
-     </section>
   </story>
-</document>
\ No newline at end of file
+</document>