From aa6690f369e4de1ebe46387aa82ac2d8af9dc260 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=A9dric=20Krier?= <ced@b2ck.com>
Date: Thu, 3 Aug 2017 23:50:21 +0200
Subject: [PATCH] Do not check if canceled moves are packaged

issue6666
review39541002
---
 stock.py | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/stock.py b/stock.py
index 4f774f6089..5c5fa688f9 100644
--- a/stock.py
+++ b/stock.py
@@ -86,6 +86,7 @@ class Package(ModelSQL, ModelView):
         domain=[
             ('shipment', '=', Eval('shipment')),
             ('to_location.type', 'in', ['customer', 'supplier']),
+            ('state', '!=', 'cancel'),
             ],
         add_remove=[
             ('package', '=', None),
@@ -175,7 +176,7 @@ class PackageMixin(object):
             if not shipment.packages:
                 continue
             length = sum(len(p.moves) for p in shipment.packages)
-            if len(shipment.packages_moves) != length:
+            if len(list(shipment.packages_moves)) != length:
                 cls.raise_user_error('package_mismatch', shipment.rec_name)
 
     @property
@@ -211,7 +212,7 @@ class ShipmentOut(PackageMixin, object):
 
     @property
     def packages_moves(self):
-        return self.outgoing_moves
+        return (m for m in self.outgoing_moves if m.state != 'cancel')
 
 
 class ShipmentInReturn(PackageMixin, object):
@@ -235,7 +236,7 @@ class ShipmentInReturn(PackageMixin, object):
 
     @property
     def packages_moves(self):
-        return self.moves
+        return (m for m in self.moves if m.state != 'cancel')
 
 
 class PackageLabel(Report):