[IMP] stock module : picking report.

bzr revid: vra@tinyerp.com-20090618115517-6i57an8cxenwx1g0

diff --git a/addons/stock/report/picking.rml b/addons/stock/report/picking.rml
index 3dec126..f27d95b 100644 (file)
--- a/addons/stock/report/picking.rml
+++ b/addons/stock/report/picking.rml
@@ -213,7 +213,7 @@
     <para style="terp_default_5cm_Above_Space">
       <font color="white"> </font>
     </para>
-    <blockTable colWidths="276.0,51.0,56.0,80.0,55.0" repeatRows="1" style="Move_Line_Header">
+    <blockTable colWidths="256.0,58.0,61.0,73.0,70.0" repeatRows="1" style="Move_Line_Header">
       <tr>
         <td>
           <para style="terp_tblheader_Details">Description</para>
@@ -222,20 +222,25 @@
           <para style="terp_tblheader_Details_Centre">Lot</para>
         </td>
         <td>
-          <para style="terp_tblheader_Details_Right">State</para>
+          <para style="terp_tblheader_Details">State</para>
         </td>
         <td>
-          <para style="terp_tblheader_Details_Centre">Qty</para>
+          <para style="terp_tblheader_Details_Centre">Quantity</para>
         </td>
         <td>
-          <para style="terp_tblheader_Details_Centre">Location</para>
+          <para style="terp_tblheader_Details">Location</para>
         </td>
       </tr>
     </blockTable>
-    <para style="terp_default_2"/>
+    <para style="terp_default_2">
+      <font color="white"> </font>
+    </para>
+    <para style="terp_default_2">
+      <font color="white"> </font>
+    </para>
     <section>
       <para style="terp_default_8">[[ repeatIn([line for line in picking.move_lines if (line.state == 'assigned' )],'move_lines') ]]</para>
-      <blockTable colWidths="277.0,51.0,56.0,55.0,23.0,59.0" style="Move_Line_Contect_Assign_State">
+      <blockTable colWidths="257.0,58.0,61.0,46.0,26.0,74.0" style="Move_Line_Contect_Assign_State">
         <tr>
           <td>
             <para style="terp_default_9">[ [[ move_lines.product_id.default_code ]] ] [[ move_lines.product_id.name ]]</para>
@@ -244,7 +249,7 @@
             <para style="terp_default_9">[[ (move_lines.prodlot_id and move_lines.prodlot_id.name) or '' ]]</para>
           </td>
           <td>
-            <para style="terp_default_Right_9">[[ move_lines.state ]]</para>
+            <para style="terp_default_9">[[ move_lines.state ]]</para>
           </td>
           <td>
             <para style="terp_default_Right_9">[[ move_lines.product_qty ]] </para>
@@ -253,7 +258,7 @@
             <para style="terp_default_9">[[ move_lines.product_uom.name ]]</para>
           </td>
           <td>
-            <para style="terp_default_Centre_9">[[ (move_lines.location_id and move_lines.location_id.name) or '' ]]</para>
+            <para style="terp_default_9">[[ (move_lines.location_id and move_lines.location_id.name) or '' ]]</para>
           </td>
         </tr>
       </blockTable>
@@ -261,16 +266,12 @@
         <font color="white"> </font>
       </para>
     </section>
-    <para style="terp_default_5cm_Above_Space">
-      <font color="white"> </font>
-    </para>
-    <para style="terp_default_Bold_9">Non Assigned Products: [[ (line.state == 'assigned') and removeParentNode('para') ]]</para>
-    <para style="terp_default_1cm_above_space">
-      <font color="white"> </font>
-    </para>
+    <para style="terp_default_5cm_Above_Space">[[ (line.state == 'done' or line.state == 'confirmed') and removeParentNode('para') ]]</para>
+    <para style="terp_default_Bold_9">Non Assigned Products: [[ ( line.state == 'assigned' or line.state == 'done' or line.state == 'confirmed' ) and removeParentNode('para') ]]</para>
+    <para style="terp_default_1cm_above_space">[[ (line.state == 'done' or line.state == 'confirmed') and removeParentNode('para') ]]</para>
     <section>
       <para style="terp_default_8">[[ repeatIn([line for line in picking.move_lines if (line.state != 'assigned' )],'move_lines') ]]</para>
-      <blockTable colWidths="277.0,51.0,56.0,55.0,23.0,59.0" style="Move_Line_Content_Other_State">
+      <blockTable colWidths="257.0,57.0,62.0,46.0,26.0,74.0" style="Move_Line_Content_Other_State">
         <tr>
           <td>
             <para style="terp_default_9">[ [[ move_lines.product_id.default_code ]] ] [[ move_lines.product_id.name ]]</para>
@@ -279,7 +280,7 @@
             <para style="terp_default_9">[[ (move_lines.prodlot_id and move_lines.prodlot_id.name) or '' ]]</para>
           </td>
           <td>
-            <para style="terp_default_Right_9">[[ move_lines.state ]]</para>
+            <para style="terp_default_9">[[ move_lines.state ]]</para>
           </td>
           <td>
             <para style="terp_default_Right_9">[[ move_lines.product_qty ]] </para>
@@ -288,7 +289,7 @@
             <para style="terp_default_9">[[ move_lines.product_uom.name ]]</para>
           </td>
           <td>
-            <para style="terp_default_Centre_9">[[ (move_lines.location_id and move_lines.location_id.name) or '' ]]</para>
+            <para style="terp_default_9">[[ (move_lines.location_id and move_lines.location_id.name) or '' ]]</para>
           </td>
         </tr>
       </blockTable>