From f00277f0302b3e71b82f82ee73fba5ab9061d73a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Mon, 22 Apr 2013 12:27:33 +0200 Subject: [PATCH 1/6] Increase version number --- tryton.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tryton.cfg b/tryton.cfg index ca800af6aa..319cde516b 100644 --- a/tryton.cfg +++ b/tryton.cfg @@ -1,5 +1,5 @@ [tryton] -version=2.8.0 +version=2.8.1 depends: account ir From 453d412c3c84110ee44c8e3f1f36ae9a4f5d4322 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Thu, 23 May 2013 19:06:21 +0200 Subject: [PATCH 2/6] Fix creation of internal shipment from order point review837003 (transplanted from b495bb2ca2257cbb8a5f5799fbf8cbf0d0a17785) --- shipment.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/shipment.py b/shipment.py index c21553f32f..dad1f39f78 100644 --- a/shipment.py +++ b/shipment.py @@ -59,8 +59,8 @@ class ShipmentInternal(ModelSQL, ModelView): for op in order_points: qty = pbl.get((op.storage_location.id, op.product.id), 0) if qty < op.min_quantity: - key = (op.storage_location.id, - op.provisioning_location.id, + key = (op.provisioning_location.id, + op.storage_location.id, op.product.id) moves[key] = op.max_quantity - qty @@ -74,8 +74,8 @@ class ShipmentInternal(ModelSQL, ModelView): ]) for shipment in shipments: for move in shipment.moves: - key = (shipment.to_location.id, - shipment.from_location.id, + key = (shipment.from_location.id, + shipment.to_location.id, move.product.id) if key not in moves: continue From 8e46cb6ace29f23c8887385606c2c249b2d8a47f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Sun, 9 Jun 2013 22:59:12 +0200 Subject: [PATCH 3/6] Prepare release 2.8.1 --- CHANGELOG | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index 58589746bf..85acf080dd 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,6 @@ +Version 2.8.1 - 2013-06-09 +* Bug fixes (see mercurial logs for details) + Version 2.8.0 - 2013-04-22 * Bug fixes (see mercurial logs for details) * find_best_supplier doesn't optimize anymore on the delivery delay From 603101595753d14db15935fa774033c3392c9774 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Sun, 9 Jun 2013 22:59:13 +0200 Subject: [PATCH 4/6] Added tag 2.8.1 for changeset 7587df2b0b7a --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index 8611893893..059cbf32e1 100644 --- a/.hgtags +++ b/.hgtags @@ -8,3 +8,4 @@ f76056df60f581f803c7a7e4cec81397e4bbbb9c 1.8.0 5eb0f23e5774dddbf43cafe34bf527e1cd78d619 2.4.0 6cd5f943826cb858bc34d20074bfd81b715114f8 2.6.0 69f57817f6f0ed6ee0788cfab959a9321fcb45bb 2.8.0 +7587df2b0b7ae2a876a3367a14b3ccc966715436 2.8.1 From af705205c9426690a4722c6328d6846a886af1b2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Sun, 9 Jun 2013 22:59:22 +0200 Subject: [PATCH 5/6] Increase version number --- tryton.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tryton.cfg b/tryton.cfg index 319cde516b..e358f58af6 100644 --- a/tryton.cfg +++ b/tryton.cfg @@ -1,5 +1,5 @@ [tryton] -version=2.8.1 +version=2.8.2 depends: account ir From 2a70d2fa463a0e7aef1c22f32b48d097e32af3a6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=B6ftner?= Date: Wed, 22 Jan 2014 15:00:29 +0100 Subject: [PATCH 6/6] check for same product in constraint for internal oderpoints issue3591 review2721002 (transplanted from 203cecdea47d9daf7e53bf7d7070a3aa60806004) --- order_point.py | 1 + 1 file changed, 1 insertion(+) diff --git a/order_point.py b/order_point.py index 75ff205038..7f36b991fa 100644 --- a/order_point.py +++ b/order_point.py @@ -139,6 +139,7 @@ class OrderPoint(ModelSQL, ModelView): query = ['OR'] for op in internals: arg = ['AND', + ('product', '=', op.product.id), ('provisioning_location', '=', op.storage_location.id), ('storage_location', '=', op.provisioning_location.id), ('company', '=', op.company.id),