From fbdfb3ff392369baa9d10807690fd48aba818a03 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=A9dric=20Krier?= <ced@b2ck.com>
Date: Sat, 24 Jun 2017 10:34:21 +0200
Subject: [PATCH] Assign only move that requires assignation

issue6436
review32241002
---
 shipment.py | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/shipment.py b/shipment.py
index a78f10bb35..712db4f6f2 100644
--- a/shipment.py
+++ b/shipment.py
@@ -833,8 +833,9 @@ class ShipmentInReturn(Workflow, ModelSQL, ModelView):
     def assign_try(cls, shipments):
         pool = Pool()
         Move = pool.get('stock.move')
-        if Move.assign_try([m for s in shipments for m in s.moves],
-                with_childs=False):
+        to_assign = [m for s in shipments for m in s.moves
+            if m.assignation_required]
+        if Move.assign_try(to_assign, with_childs=False):
             cls.assign(shipments)
             return True
         else:
@@ -1425,8 +1426,9 @@ class ShipmentOut(Workflow, ModelSQL, ModelView):
     @ModelView.button
     def assign_try(cls, shipments):
         Move = Pool().get('stock.move')
-        if Move.assign_try([m for s in shipments
-                    for m in s.inventory_moves]):
+        to_assign = [m for s in shipments for m in s.inventory_moves
+            if m.assignation_required]
+        if Move.assign_try(to_assign):
             cls.assign(shipments)
             return True
         else:
@@ -2417,7 +2419,7 @@ class ShipmentInternal(Workflow, ModelSQL, ModelView):
     def assign_try(cls, shipments):
         Move = Pool().get('stock.move')
         to_assign = [m for s in shipments for m in s.outgoing_moves
-            if m.from_location.type != 'lost_found']
+            if m.assignation_required]
         if not to_assign or Move.assign_try(to_assign):
             cls.assign(shipments)
             return True