Merge lp:~anybox/wms/burst-cancelled into lp:wms

[Georges Racinet]

See the linked bug.

[Christophe CHAUVET (christophe-chauvet)]

Hi Georges

Can you replace the browse by a read ?

Thanks,

Regards,

review: Needs Fixing

[Georges Racinet (gracinet)]

> Can you replace the browse by a read ?

Sorry, forgot to extract that as well (done).

[Christophe CHAUVET (christophe-chauvet)]

Georges

Have you push the last version for your branch ?

Regards,

Unmerged revisions

231. By Georges Racinet <gracinet@nlg> on 2011-08-10

[FIX] check state of move lines and special case for the cancelled ones.

=== modified file 'wms/__terp__.py'
--- wms/__terp__.py	2011-03-22 14:12:31 +0000
+++ wms/__terp__.py	2011-08-10 13:58:30 +0000
@@ -95,7 +95,8 @@
         'demo/picking_crossdock_one.xml',
         'demo/monday_round.xml',
         'demo/burst_in.xml',
-        'demo/burst_out.xml',
+        #'demo/burst_out.xml', NOCOMMIT (not in this branch)
+        'demo/burst_out_cancelled_line.xml',
         'demo/picking_product_reserved_1.xml',
     ],
     'installable': True,

=== added file 'wms/demo/burst_out_cancelled_line.xml'
--- wms/demo/burst_out_cancelled_line.xml	1970-01-01 00:00:00 +0000
+++ wms/demo/burst_out_cancelled_line.xml	2011-08-10 13:58:30 +0000
@@ -0,0 +1,85 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<openerp>
+ <data>
+  #
+  # Create stock picking with one cancelled line
+  #
+  <record model="stock.picking" id="stock_picking_burst_out_with_cancel">
+   <field name="name">Demo for burst out</field>
+   <field name="active" eval="True"/>
+   <field name="address_id" ref="base.res_partner_address_12"/>
+   <field name="invoice_state">none</field>
+   <field name="move_lines"/>
+   <field name="move_type">direct</field>
+   <field name="product_id" ref="product.product_product_pc1"/>
+   <field name="type">out</field>
+   <field name="warehouse_id" ref="stock.warehouse0"/>
+  </record>
+
+  <record model="stock.move" id="stock_move_burst_out_with_cancel_1">
+   <field name="location_dest_id" ref="stock.stock_location_customers"/>
+   <field name="location_id" ref="stock.stock_location_workshop"/>
+   <field name="name">[PC1] Basic PC</field>
+   <field name="picking_id" ref="stock_picking_burst_out_with_cancel"/>
+   <field name="priority">1</field>
+   <field name="product_id" ref="product.product_product_pc1"/>
+   <field name="product_qty" eval="10.0"/>
+   <field name="product_uom" ref="product.product_uom_unit"/>
+   <field name="product_uos_qty" eval="10.0"/>
+  </record>
+
+  <record model="stock.move" id="stock_move_burst_out_with_cancel_2">
+   <field name="location_dest_id" ref="stock.stock_location_customers"/>
+   <field name="location_id" ref="stock.stock_location_workshop"/>
+   <field name="name">[PC3] Medium PC</field>
+   <field name="picking_id" ref="stock_picking_burst_out_with_cancel"/>
+   <field name="priority">1</field>
+   <field name="product_id" ref="product.product_product_pc3"/>
+   <field name="product_qty" eval="25.0"/>
+   <field name="product_uom" ref="product.product_uom_unit"/>
+   <field name="product_uos_qty" eval="25.0"/>
+   <field name="state">cancel</field>
+  </record>
+
+  #
+  # Create stock burst 1 (without the cancelled line, of course)
+  #
+  <record model="stock.burst" id="stock_burst_out_with_cancel">
+   <field name="line_ids"/>
+   <field name="stock_picking_id" ref="stock_picking_burst_out_with_cancel"/>
+   <field name="type">out</field>
+  </record>
+  <record model="stock.burst.line" id="stock_burst_line_out_with_cancel_1">
+   <field name="burst_id" ref="stock_burst_out_with_cancel"/>
+   <field name="product_id" ref="product.product_product_pc1"/>
+   <field name="quantity" eval="10.0"/>
+   <field name="is_done" eval="False"/>
+  </record>
+
+  #
+  # Tests
+  #
+  <workflow action="button_confirm" model="stock.picking" ref="stock_picking_burst_out_with_cancel"/>
+
+  <function name="valid_done" model="stock.burst">
+   <value eval="[obj(ref('stock_burst_out_with_cancel')).id]" model="stock.burst"/>
+  </function>
+
+  <assert id="stock_picking_burst_out_with_cancel"
+	  model="stock.picking" severity="error"
+	  string="This picking has failed">
+   <!-- GR: reason not to check state : wkf is buggy in tests and
+	doesn't apply the activitiy properly (action_done) -->
+   <!--test expr="state">done</test-->
+   <test expr="len(move_lines) == 2"/>
+  </assert>
+
+  <assert id="stock_move_burst_out_with_cancel_2"
+	  model="stock.move" severity="error"
+	  string="This move line has been wrongly handled">
+   <test expr="state">cancel</test>
+  </assert>
+
+ </data>
+
+</openerp>
\ No newline at end of file

=== modified file 'wms/object/burst.py'
--- wms/object/burst.py	2011-07-18 12:24:41 +0000
+++ wms/object/burst.py	2011-08-10 13:58:30 +0000
@@ -208,10 +208,23 @@
         # Check for products not found in burst
         for p, (qty, move_id) in picking_moves.items():
             if p not in burst_lines.keys():
+                # GR perf-wise wrong (should at least be done once for all,
+                # ideally be available in picking_moves) but a non trivial
+                # refactor would be necessary in order to avoid that
+                try:
+                    missing_state = move_obj.browse(cr, uid, [move_id])[0].state
+                except IndexError:
+                    continue
+                # GR: functionnally meaningless. Risky to drop it ?
                 # Set quantity to 0
-                move_obj.write(cr, uid, [move_id], {'state': 'done', 'product_qty': 0}, context=context)
-                # Add to missing list
-                missing.append((move_id, qty))
+                if missing_state != 'cancel':
+                    missing_state = 'done'
+                move_obj.write(cr, uid, [move_id], {'state': missing_state,
+                                                    'product_qty': 0},
+                               context=context)
+                # Add to missing list GR: if not cancelled !
+                if missing_state != 'cancel':
+                    missing.append((move_id, qty))
 
         burst_type = self.read(cr, uid, ids, ['type'], context=context)[0]['type']
         wf_service = netsvc.LocalService("workflow")