[tryton-debian-vcs] tryton-modules-stock-package branch upstream-3.6 updated. upstream/3.6.0-1-gf88ae4d

[Mathias Behrle]

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

commit f88ae4dd8001dd1a416f004a0843a83d73cd9f26
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Wed Dec 23 14:45:54 2015 +0100

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

diff --git a/CHANGELOG b/CHANGELOG
index 24733d1..36007f3 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 3.6.1 - 2015-12-22
+* Bug fixes (see mercurial logs for details)
+
 Version 3.6.0 - 2015-04-20
 * Bug fixes (see mercurial logs for details)
 * Add support for PyPy
diff --git a/PKG-INFO b/PKG-INFO
index 8c1cccd..a1b97ef 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: trytond_stock_package
-Version: 3.6.0
+Version: 3.6.1
 Summary: Tryton module for stock packaging
 Home-page: http://www.tryton.org/
 Author: Tryton
diff --git a/stock.py b/stock.py
index 50ac5d4..1b8df7f 100644
--- a/stock.py
+++ b/stock.py
@@ -161,7 +161,7 @@ class ShipmentInReturn(object, PackageMixin):
         for shipment in shipments:
             if not shipment.packages:
                 continue
-            if (len(shipment.outgoing_moves)
+            if (len(shipment.moves)
                     != sum(len(p.moves) for p in shipment.packages)):
                 cls.raise_user_error('package_mismatch', shipment.rec_name)
 
diff --git a/tryton.cfg b/tryton.cfg
index 4955439..91ba0c1 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
 [tryton]
-version=3.6.0
+version=3.6.1
 depends:
     ir
     res
diff --git a/trytond_stock_package.egg-info/PKG-INFO b/trytond_stock_package.egg-info/PKG-INFO
index f1c7a38..9e192f9 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: 3.6.0
+Version: 3.6.1
 Summary: Tryton module for stock packaging
 Home-page: http://www.tryton.org/
 Author: Tryton
-- 
tryton-modules-stock-package