Merge lp:~unifield-team/unifield-wm/us-493 into lp:unifield-wm

[jftempo]

Unmerged revisions

2578. By Quentin THEURET @Amaris on 2015-08-06

US-493 [FIX] Don't take care of the canceled PACK to validate a shipment. Canceled PACK are always empty

=== modified file 'msf_outgoing/msf_outgoing.py'
--- msf_outgoing/msf_outgoing.py	2015-08-04 11:45:10 +0000
+++ msf_outgoing/msf_outgoing.py	2015-08-20 14:25:37 +0000
@@ -1506,7 +1506,10 @@
             # all object of a given picking object, he is set to Done and still belong to the same shipment_id
             # another possibility would be to unlink the picking object from the shipment, set shipment_id to False
             # but in this case the returned pack families would not be displayed anymore in the shipment
-            packing_ids = pick_obj.search(cr, uid, [('shipment_id', '=', shipment.id), ('state', '!=', 'done'), ], context=context)
+            packing_ids = pick_obj.search(cr, uid, [
+                ('shipment_id', '=', shipment.id),
+                ('state', 'not in', ['done', 'cancel']),
+            ], context=context)
 
             for packing in pick_obj.browse(cr, uid, packing_ids, context=context):
                 assert packing.subtype == 'packing' and packing.state == 'assigned'