From 12c38e251a6a5f34f5c6d82b4abd80c6267ab6a2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=A9dric=20Krier?= <ced@b2ck.com>
Date: Tue, 25 Oct 2011 11:14:30 +0200
Subject: [PATCH 1/4] Increase version number

---
 __tryton__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/__tryton__.py b/__tryton__.py
index 32ea51ee54..8c5b2e0966 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@b2ck.com',
     'website': 'http://www.tryton.org/',

From 6596766eaf4a39d66661c96cfb83c4683fc49359 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=A9dric=20Krier?= <ced@b2ck.com>
Date: Thu, 12 Dec 2013 13:31:21 +0100
Subject: [PATCH 2/4] Test move from _get_inventory_moves before setting
 location

issue3530
review2011002
(transplanted from 1a68309d3de62a024703eaa2ae7a3aca79f208e6)
---
 location.py | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/location.py b/location.py
index 711b053798..de2121cf8d 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()

From 7bb20c0783bdabe534feb2aacfcdeb68c22c827d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=A9dric=20Krier?= <ced@b2ck.com>
Date: Sat, 18 Jan 2014 20:44:51 +0100
Subject: [PATCH 3/4] Prepare release 2.2.1

---
 CHANGELOG | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/CHANGELOG b/CHANGELOG
index 46e887a64a..a51a5d9cbe 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)
 

From 59467d850528fd0b01e79df0692592226c242497 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=A9dric=20Krier?= <ced@b2ck.com>
Date: Sat, 18 Jan 2014 20:44:52 +0100
Subject: [PATCH 4/4] Added tag 2.2.1 for changeset 13144e9586a4

---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index 17f3461a5a..fdb83b02ba 100644
--- a/.hgtags
+++ b/.hgtags
@@ -4,3 +4,4 @@ c560e70b18afce2d136cfbcc9f1ebf5756761882 1.6.0
 ab792b3468742c3a1f777165f8bdde4ebc96c1fd 1.8.0
 67d1514d90ff98a12865eaa025269914b15082b8 2.0.0
 53b4739836b0d10620038cce567d4d935f1a1363 2.2.0
+13144e9586a4f3d56f72006f79ee93b78d5598a5 2.2.1