Merge lp:~openerp-dev/openobject-addons/7.0-opw-603094-rha into lp:openobject-addons/7.0

[Rifakat Husen (OpenERP)]

When there is a move(upstream) chained with another move(downstream), and we split the upstream move into several moves in the picking(using Serial Number split wizard). The downstream move should be triggered when we process the last move among the upstream moves, but currently this is not working. Processing last upstream move does not trigger the downstream move, so downstream move always be in state "Waiting Another Move" even if all upstream moves/picking is validated.

Steps to reproduce:
* Create chaining for location, Stock -> Quality Control(Chaining Type:Manual Operation)
* Create incoming shipment for 10 unit of "USB Adapter", Supplier -> Stock. Confirm it.
* It will create chained internal picking. Stock -> Quality Control.
* For Incoming Shipment, Split move for Serial Number with 5 qty. so you will have 2 moves with 5 qty each.
* When we validate shipment with these 2 (upstream)moves together with full qty, it should mark internal picking(downstream move) as "Ready to Transfer". But it doesn't. Downstream move remain as "Waiting Another Move".

Problem:
When action_done() for stock.move is called for all the upstream moves, logic is to trigger(confirm) downstream move while last upstream move is validated. Logic for checking the last upstream move is not working because, those moves are still inside action_done() and their state is not marked as 'done' while loop execution.

Solution:
Instead of checking upstream moves and state=done, it created a dict which keeps information of processed upstream moves.

[Paulius Sladkevičius @ hbee (komsas)]

I've tested this patch and it looks it solved my issue, an infinitive loop that I've faced in the procurement cron job.

review: Approve (test)

Unmerged revisions

9782. By Rifakat Husen (OpenERP) on 2014-01-22

[FIX] stock: when several moves shares the same downstream move(move_dest_id) then
downstream move should be trigerred only when the last upstream move is reached and others are already processed

=== modified file 'stock/stock.py'
--- stock/stock.py	2014-01-22 13:38:22 +0000
+++ stock/stock.py	2014-01-27 06:21:43 +0000
@@ -2385,6 +2385,7 @@
         """
         picking_ids = []
         move_ids = []
+        checked_upstream_moves = {}
         wf_service = netsvc.LocalService("workflow")
         if context is None:
             context = {}
@@ -2401,14 +2402,20 @@
             if move.state in ['done','cancel']:
                 continue
             move_ids.append(move.id)
-
+            
             if move.picking_id:
                 picking_ids.append(move.picking_id.id)
-            if move.move_dest_id.id and (move.state != 'done'):
+            if move.move_dest_id.id:
+                # Build a dict to save the info for which upsteam moves has been checked over the downstream move
+                if not move.move_dest_id.id in checked_upstream_moves:
+                    move_dest_id = move.move_dest_id.id 
+                    checked_upstream_moves.update({move_dest_id:[move.id]})
+                else:
+                    checked_upstream_moves[move.move_dest_id.id].append(move.id)
                 # Downstream move should only be triggered if this move is the last pending upstream move
                 other_upstream_move_ids = self.search(cr, uid, [('id','!=',move.id),('state','not in',['done','cancel']),
                                             ('move_dest_id','=',move.move_dest_id.id)], context=context)
-                if not other_upstream_move_ids:
+                if not other_upstream_move_ids or set(other_upstream_move_ids) <= set(checked_upstream_moves[move.move_dest_id.id]):
                     self.write(cr, uid, [move.id], {'move_history_ids': [(4, move.move_dest_id.id)]})
                     if move.move_dest_id.state in ('waiting', 'confirmed'):
                         self.force_assign(cr, uid, [move.move_dest_id.id], context=context)