From 0876c348936a4b691c6f57d97bd3b19cae641ee4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Mon, 22 Apr 2013 12:27:31 +0200 Subject: [PATCH 1/9] Increase version number --- tryton.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tryton.cfg b/tryton.cfg index 4ab7723217..c3ef6ee98e 100644 --- a/tryton.cfg +++ b/tryton.cfg @@ -1,5 +1,5 @@ [tryton] -version=2.8.0 +version=2.8.1 depends: ir product From 7caaa3a66acc0ecc0325d51f783d09b7afbe4344 Mon Sep 17 00:00:00 2001 From: resteve Date: Mon, 8 Jul 2013 12:54:15 +0200 Subject: [PATCH 2/9] Default locations depends on type review975002 issue3289 (transplanted from 77b6eb28abfb3cabd168ae2cb3e6257ce7f50216) --- product.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/product.py b/product.py index 49a5a96c10..5072162e81 100644 --- a/product.py +++ b/product.py @@ -13,4 +13,5 @@ class Product: locations = fields.One2Many('stock.product.location', 'product', 'Default Locations', states={ 'invisible': ~Eval('type').in_(['goods', 'assets']), - }) + }, + depends=['type']) From 93938fa3234d66d42ec3c1a9f65051906b090629 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Tue, 1 Oct 2013 21:57:14 +0200 Subject: [PATCH 3/9] Prepare release 2.8.1 --- CHANGELOG | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index 17ff3b7f36..1cadb732b2 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,6 @@ +Version 2.8.1 - 2013-10-01 +* Bug fixes (see mercurial logs for details) + Version 2.8.0 - 2013-04-22 * Bug fixes (see mercurial logs for details) From 01f1458c228a4847f0ace83c110f9d5b8b7eab2c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Tue, 1 Oct 2013 21:57:15 +0200 Subject: [PATCH 4/9] Added tag 2.8.1 for changeset fc875e563b67 --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index bfed7cc88e..e0da0ba5d3 100644 --- a/.hgtags +++ b/.hgtags @@ -7,3 +7,4 @@ ab792b3468742c3a1f777165f8bdde4ebc96c1fd 1.8.0 1922c46f7101f9397889c59c908bdd1e4489f70b 2.4.0 b8e5502b8bd42741c92695a6540fade63bffbd43 2.6.0 010a427751135ecb84ce3d7c13791ecf37edde23 2.8.0 +fc875e563b67257b002e4f81062fa2a63ea5408c 2.8.1 From a5286b66e7066324f4322265ddc82965338bbad6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Tue, 1 Oct 2013 21:57:49 +0200 Subject: [PATCH 5/9] Increase version number --- tryton.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tryton.cfg b/tryton.cfg index c3ef6ee98e..d734cc5724 100644 --- a/tryton.cfg +++ b/tryton.cfg @@ -1,5 +1,5 @@ [tryton] -version=2.8.1 +version=2.8.2 depends: ir product From 8b5ede8a58ecdae46c4fa94ceef5b943512b335f 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 6/9] 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 639776230c..59e451364b 100644 --- a/location.py +++ b/location.py @@ -52,11 +52,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 @@ -67,8 +68,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 eee7c899c61dc65c8f26b02965d341b731042755 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Sat, 18 Jan 2014 20:42:34 +0100 Subject: [PATCH 7/9] Prepare release 2.8.2 --- CHANGELOG | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index 1cadb732b2..1e3c67540b 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,6 @@ +Version 2.8.2 - 2014-01-18 +* Bug fixes (see mercurial logs for details) + Version 2.8.1 - 2013-10-01 * Bug fixes (see mercurial logs for details) From 3f5d66def13e2b7db5266f9b67f0a43264f6400a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Sat, 18 Jan 2014 20:42:35 +0100 Subject: [PATCH 8/9] Added tag 2.8.2 for changeset 9161f7791813 --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index e0da0ba5d3..50375db0fc 100644 --- a/.hgtags +++ b/.hgtags @@ -8,3 +8,4 @@ ab792b3468742c3a1f777165f8bdde4ebc96c1fd 1.8.0 b8e5502b8bd42741c92695a6540fade63bffbd43 2.6.0 010a427751135ecb84ce3d7c13791ecf37edde23 2.8.0 fc875e563b67257b002e4f81062fa2a63ea5408c 2.8.1 +9161f779181300f13ccaa43212517e0d48703138 2.8.2 From e24f5287fcfc0263fe6ca4d3eaf8f801099a7ecc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Sat, 18 Jan 2014 20:42:48 +0100 Subject: [PATCH 9/9] Increase version number --- tryton.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tryton.cfg b/tryton.cfg index d734cc5724..1facf75727 100644 --- a/tryton.cfg +++ b/tryton.cfg @@ -1,5 +1,5 @@ [tryton] -version=2.8.2 +version=2.8.3 depends: ir product