[tryton-debian-vcs] tryton-modules-stock-product-location branch debian-wheezy-2.2 updated. debian/2.2.0-2-1-g1f95364

[Mathias Behrle]

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

commit 1f9536408555a9b9295ced54435a9d5eadd26126
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Mon Jan 20 18:41:26 2014 +0100

    Merging upstream version 2.2.1.

diff --git a/CHANGELOG b/CHANGELOG
index 46e887a..a51a5d9 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 2.2.1 - 2014-01-18
+* Bug fixes (see mercurial logs for details)
+
 Version 2.2.0 - 2011-10-25
 * Bug fixes (see mercurial logs for details)
 
diff --git a/PKG-INFO b/PKG-INFO
index 96fe5aa..c9decb2 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
-Metadata-Version: 1.0
+Metadata-Version: 1.1
 Name: trytond_stock_product_location
-Version: 2.2.0
+Version: 2.2.1
 Summary: Define default storage location by warehouse on product.
 Theses locations will be used by the supplier shipment for generating
 inventory moves.
diff --git a/__tryton__.py b/__tryton__.py
index 32ea51e..8c5b2e0 100644
--- a/__tryton__.py
+++ b/__tryton__.py
@@ -7,7 +7,7 @@
     "name_es_CO" : "Ubicación de existencias de producto",
     "name_es_ES" : "Ubicación de existencias de producto",
     "name_fr_FR" : "Emplacement de produit",
-    "version" : "2.2.0",
+    "version" : "2.2.1",
     "author" : "B2CK",
     'email': 'info at b2ck.com',
     'website': 'http://www.tryton.org/',
diff --git a/location.py b/location.py
index 711b053..de2121c 100644
--- a/location.py
+++ b/location.py
@@ -36,11 +36,12 @@ class ShipmentIn(ModelSQL, ModelView):
 
     def _get_inventory_moves(self, incoming_move):
         res = super(ShipmentIn, self)._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
 
 ShipmentIn()
diff --git a/trytond_stock_product_location.egg-info/PKG-INFO b/trytond_stock_product_location.egg-info/PKG-INFO
index d6c6296..dc26e24 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.0
+Metadata-Version: 1.1
 Name: trytond-stock-product-location
-Version: 2.2.0
+Version: 2.2.1
 Summary: Define default storage location by warehouse on product.
 Theses locations will be used by the supplier shipment for generating
 inventory moves.
-- 
tryton-modules-stock-product-location