[tryton-debian-vcs] tryton-modules-stock-product-location branch upstream-2.6 updated. upstream/2.6.1-1-ge4d3625

[Mathias Behrle]

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

commit e4d3625f1b5a480905dd358fd0a83e8eadea89f3
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Mon Jan 20 18:24:15 2014 +0100

    Adding upstream version 2.6.2.

diff --git a/CHANGELOG b/CHANGELOG
index 6ac306e..11d574e 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 2.6.2 - 2014-01-18
+* Bug fixes (see mercurial logs for details)
+
 Version 2.6.1 - 2013-10-01
 * Bug fixes (see mercurial logs for details)
 
diff --git a/PKG-INFO b/PKG-INFO
index d1b5dee..345479e 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: trytond_stock_product_location
-Version: 2.6.1
+Version: 2.6.2
 Summary: Tryton module to add default location on product
 Home-page: http://www.tryton.org/
 Author: Tryton
diff --git a/location.py b/location.py
index b6ed460..2ec7f2f 100644
--- a/location.py
+++ b/location.py
@@ -52,9 +52,10 @@ class ShipmentIn:
     @classmethod
     def _get_inventory_moves(cls, incoming_move):
         res = super(ShipmentIn, cls)._get_inventory_moves(incoming_move)
-        for product_location in incoming_move.product.locations:
-            if product_location.warehouse.id != \
-                    incoming_move.shipment_in.warehouse.id:
-                continue
-            res['to_location'] = product_location.location.id
+        if res:
+            for product_location in incoming_move.product.locations:
+                if product_location.warehouse.id != \
+                        incoming_move.shipment_in.warehouse.id:
+                    continue
+                res['to_location'] = product_location.location.id
         return res
diff --git a/tryton.cfg b/tryton.cfg
index e43c2ce..02a86ef 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
 [tryton]
-version=2.6.1
+version=2.6.2
 depends:
     ir
     product
diff --git a/trytond_stock_product_location.egg-info/PKG-INFO b/trytond_stock_product_location.egg-info/PKG-INFO
index 7e8ae23..2734db8 100644
--- a/trytond_stock_product_location.egg-info/PKG-INFO
+++ b/trytond_stock_product_location.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: trytond-stock-product-location
-Version: 2.6.1
+Version: 2.6.2
 Summary: Tryton module to add default location on product
 Home-page: http://www.tryton.org/
 Author: Tryton
-- 
tryton-modules-stock-product-location