From 423b422f5eb2c9dc8c71679a188c4347bf00763e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Tue, 24 Apr 2012 12:19:38 +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 50a29f2608..8d654798dd 100644 --- a/__tryton__.py +++ b/__tryton__.py @@ -9,7 +9,7 @@ "name_es_CO": "Ubicación de existencias de producto", "name_es_ES": "Ubicación de stock de producto", "name_fr_FR": "Emplacement de produit", - "version": "2.4.0", + "version": "2.4.1", "author": "B2CK", 'email': 'info@b2ck.com', 'website': 'http://www.tryton.org/', From 421de52d125d12789f7d9634bab5979dca0b52cf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= 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 984fd1a1c8..2950f22839 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 8b996b10aa083620b1f9a6bac53935b5df50dde0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Sat, 18 Jan 2014 20:44:04 +0100 Subject: [PATCH 3/4] Prepare release 2.4.1 --- CHANGELOG | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index 27c02844e6..9d25a820e5 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,6 @@ +Version 2.4.1 - 2014-01-18 +* Bug fixes (see mercurial logs for details) + Version 2.4.0 - 2012-04-24 * Bug fixes (see mercurial logs for details) From f6784b5f002522e6a100763944297d32c74fb6e7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Sat, 18 Jan 2014 20:44:05 +0100 Subject: [PATCH 4/4] Added tag 2.4.1 for changeset 0b95cd505e63 --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index 2e03ab6473..7ecc934ce4 100644 --- a/.hgtags +++ b/.hgtags @@ -5,3 +5,4 @@ ab792b3468742c3a1f777165f8bdde4ebc96c1fd 1.8.0 67d1514d90ff98a12865eaa025269914b15082b8 2.0.0 53b4739836b0d10620038cce567d4d935f1a1363 2.2.0 1922c46f7101f9397889c59c908bdd1e4489f70b 2.4.0 +0b95cd505e631cb7431ae1b6024f718effa84b18 2.4.1