From 7b0f6be6acba7b3b03eb29bd74cd662486ba09d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Mon, 21 Oct 2013 17:41:20 +0200 Subject: [PATCH 1/5] Increase version number --- tryton.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tryton.cfg b/tryton.cfg index 2fb72e741e..a6b634dcfc 100644 --- a/tryton.cfg +++ b/tryton.cfg @@ -1,5 +1,5 @@ [tryton] -version=3.0.0 +version=3.0.1 depends: ir product From 5c8619e9e4365a01381bbfd205b2c92b4afee539 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/5] Test move from _get_inventory_moves before setting location issue3530 review2011002 (transplanted from 1a68309d3de62a024703eaa2ae7a3aca79f208e6) --- location.py | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/location.py b/location.py index 1634a50371..cd442e8f7b 100644 --- a/location.py +++ b/location.py @@ -57,11 +57,12 @@ class ShipmentIn: @classmethod def _get_inventory_moves(cls, incoming_move): move = super(ShipmentIn, cls)._get_inventory_moves(incoming_move) - for product_location in incoming_move.product.locations: - if product_location.warehouse.id != \ - incoming_move.shipment.warehouse.id: - continue - move.to_location = product_location.location + if move: + for product_location in incoming_move.product.locations: + if product_location.warehouse.id != \ + incoming_move.shipment.warehouse.id: + continue + move.to_location = product_location.location return move @@ -72,8 +73,9 @@ class ShipmentOutReturn: def _get_inventory_moves(cls, incoming_move): move = super(ShipmentOutReturn, cls)._get_inventory_moves( incoming_move) - for product_location in incoming_move.product.locations: - if (product_location.warehouse - == incoming_move.shipment.warehouse): - move.to_location = product_location.location + if move: + for product_location in incoming_move.product.locations: + if (product_location.warehouse + == incoming_move.shipment.warehouse): + move.to_location = product_location.location return move From e9f3bb739f1bfc257a72be00b623f30ab9d7d0d5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Sat, 18 Jan 2014 20:41:58 +0100 Subject: [PATCH 3/5] Prepare release 3.0.1 --- CHANGELOG | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index a88b689715..59947755cb 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,6 @@ +Version 3.0.1 - 2014-01-18 +* Bug fixes (see mercurial logs for details) + Version 3.0.0 - 2013-10-21 * Bug fixes (see mercurial logs for details) From e43230acb0d86c24cc63d881f205e8655ff44e08 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Sat, 18 Jan 2014 20:41:59 +0100 Subject: [PATCH 4/5] Added tag 3.0.1 for changeset e12f96ffadd6 --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index 2584eadfb2..756472834e 100644 --- a/.hgtags +++ b/.hgtags @@ -8,3 +8,4 @@ ab792b3468742c3a1f777165f8bdde4ebc96c1fd 1.8.0 b8e5502b8bd42741c92695a6540fade63bffbd43 2.6.0 010a427751135ecb84ce3d7c13791ecf37edde23 2.8.0 0dc520d1c9eeb9e242d5fb61fe2263ac28f5903f 3.0.0 +e12f96ffadd6691dbdce63fb3c543acde6ed3cec 3.0.1 From 0305b01e9ac12e3a52452e22e224ffb4cffebe7c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Sat, 18 Jan 2014 20:42:10 +0100 Subject: [PATCH 5/5] Increase version number --- tryton.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tryton.cfg b/tryton.cfg index a6b634dcfc..d88f80c092 100644 --- a/tryton.cfg +++ b/tryton.cfg @@ -1,5 +1,5 @@ [tryton] -version=3.0.1 +version=3.0.2 depends: ir product