← Back to team overview

openerp-wms-expert team mailing list archive

[Merge] lp:~numerigraphe/openobject-addons/trunk-stock-report-packs into lp:openobject-addons

 

Numérigraphe has proposed merging lp:~numerigraphe/openobject-addons/trunk-stock-report-packs into lp:openobject-addons.

Requested reviews:
  OpenERP WMS Expert (openerp-wms-expert)
  OpenERP Core Team (openerp)
Related bugs:
  Bug #676873 in OpenERP Addons: "Packing list should be detailed by Pack"
  https://bugs.launchpad.net/openobject-addons/+bug/676873

For more details, see:
https://code.launchpad.net/~numerigraphe/openobject-addons/trunk-stock-report-packs/+merge/92542

This proposal adds the packing references to the packing list report.
This should provide a minimal fix to Bug #676873, an improvement that was judged "a good idea" even it was erroneously marked "won't fix".
Please note that I couldn't update the SXW file because it's been outdated for some time (Bug #930261).
Lionel Sausin.
-- 
https://code.launchpad.net/~numerigraphe/openobject-addons/trunk-stock-report-packs/+merge/92542
Your team OpenERP WMS Expert is requested to review the proposed merge of lp:~numerigraphe/openobject-addons/trunk-stock-report-packs into lp:openobject-addons.
=== modified file 'stock/report/picking.rml'
--- stock/report/picking.rml	2011-12-22 15:17:58 +0000
+++ stock/report/picking.rml	2012-02-10 17:56:41 +0000
@@ -69,6 +69,7 @@
       <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="Move_Line_Contect_Assign_State">
       <blockAlignment value="LEFT"/>
@@ -78,6 +79,7 @@
       <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"/>
     </blockTableStyle>
     <blockTableStyle id="Table1">
       <blockAlignment value="LEFT"/>
@@ -87,6 +89,7 @@
       <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"/>
     </blockTableStyle>
     <blockTableStyle id="Table2">
       <blockAlignment value="LEFT"/>
@@ -231,9 +234,12 @@
     <para style="terp_default_5cm_Above_Space">
       <font color="white"> </font>
     </para>
-    <blockTable colWidths="256.0,73.0,59.0,59.0,71.0" repeatRows="1" style="Move_Line_Header">
+    <blockTable colWidths="54.0,269.0,54.0,54.0,54.0,54.0" repeatRows="1" style="Move_Line_Header">
       <tr>
         <td>
+          <para style="terp_tblheader_Details">Pack</para>
+        </td>
+        <td>
           <para style="terp_tblheader_Details">Description</para>
         </td>
         <td>
@@ -253,9 +259,12 @@
     <section>
       <para style="terp_default_2">[[ repeatIn([line for line in picking.move_lines if ((line.state == 'confirmed' or line.state=='done' or line.state=='assigned') and not line.scrapped)],'move_lines') ]]</para>
       <para style="terp_default_2">[[ (picking.move_lines!=[] and removeParentNode('para')) or removeParentNode('section')]]</para>
-      <blockTable colWidths="256.0,74.0,58.0,60.0,73.0" style="Move_Line_Contect_Assign_State">
+      <blockTable colWidths="54.0,269.0,54.0,54.0,54.0,54.0" style="Move_Line_Contect_Assign_State">
         <tr>
           <td>
+            <para style="terp_default_9">[[ move_lines.tracking_id and move_lines.tracking_id.name or '' ]]</para>
+          </td>
+          <td>
             <para style="terp_default_9"><font face="Helvetica" size="9.0">[ [[ (move_lines.product_id.default_code) or removeParentNode('font') ]] ]</font> [[ move_lines.product_id.name ]] [[ move_lines.product_id.variants or '']] </para>
           </td>
           <td>
@@ -278,9 +287,12 @@
     <section>
       <para style="terp_default_2">[[ repeatIn([line for line in picking.move_lines if (line.state == 'draft' or line.state=='waiting')],'move_lines') ]]</para>
       <para style="terp_default_2">[[ (picking.move_lines!=[] and removeParentNode('para')) or removeParentNode('section')]]</para>
-      <blockTable colWidths="256.0,74.0,57.0,61.0,72.0" style="Table1">
+      <blockTable colWidths="54.0,269.0,54.0,54.0,54.0,54.0" style="Table1">
         <tr>
           <td>
+            <para style="terp_default_9">[[ move_lines.tracking_id and move_lines.tracking_id.name or '' ]]</para>
+          </td>
+          <td>
             <para style="terp_default_9"><font face="Helvetica" size="9.0">[ [[ (move_lines.product_id.default_code) or removeParentNode('font') ]] ]</font> [[ move_lines.product_id.name ]] [[ move_lines.product_id.variants or '']]</para>
           </td>
           <td>
@@ -298,7 +310,7 @@
         </tr>
       </blockTable>
     </section>
-    <blockTable colWidths="388.0,56.0,77.0" style="Table2">
+    <blockTable colWidths="430.0,54.0,54.0" style="Table2">
       <tr>
         <td>
           <para style="terp_default_9">

=== modified file 'stock/report/picking.sxw'
Binary files stock/report/picking.sxw	2011-01-14 00:11:01 +0000 and stock/report/picking.sxw	2012-02-10 17:56:41 +0000 differ

Follow ups