[tryton-debian-vcs] tryton-modules-stock-package branch upstream updated. upstream/4.4.0-1-g5d6801b

[Mathias Behrle]

The following commit has been merged in the upstream branch:
https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi/?p=tryton/tryton-modules-stock-package.git;a=commitdiff;h=upstream/4.4.0-1-g5d6801b

commit 5d6801becdad2e6e4f13e83246feea7218090504
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Thu Oct 5 11:31:25 2017 +0200

    Adding upstream version 4.4.1.
    
    Signed-off-by: Mathias Behrle <mathiasb at m9s.biz>

diff --git a/CHANGELOG b/CHANGELOG
index 6f48157..e90fec6 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 4.4.1 - 2017-10-04
+* Bug fixes (see mercurial logs for details)
+
 Version 4.4.0 - 2017-05-01
 * Bug fixes (see mercurial logs for details)
 * Check package also when packing shipment
diff --git a/PKG-INFO b/PKG-INFO
index 0688428..90782c6 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: trytond_stock_package
-Version: 4.4.0
+Version: 4.4.1
 Summary: Tryton module for stock packaging
 Home-page: http://www.tryton.org/
 Author: Tryton
diff --git a/setup.cfg b/setup.cfg
index 861a9f5..8bfd5a1 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,5 +1,4 @@
 [egg_info]
 tag_build = 
 tag_date = 0
-tag_svn_revision = 0
 
diff --git a/stock.py b/stock.py
index 4f774f6..5c5fa68 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):
diff --git a/tryton.cfg b/tryton.cfg
index f847396..5d0c796 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
 [tryton]
-version=4.4.0
+version=4.4.1
 depends:
     ir
     res
diff --git a/trytond_stock_package.egg-info/PKG-INFO b/trytond_stock_package.egg-info/PKG-INFO
index dd3bb3d..a3080c7 100644
--- a/trytond_stock_package.egg-info/PKG-INFO
+++ b/trytond_stock_package.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: trytond-stock-package
-Version: 4.4.0
+Version: 4.4.1
 Summary: Tryton module for stock packaging
 Home-page: http://www.tryton.org/
 Author: Tryton
-- 
tryton-modules-stock-package