From 3e29eba031b7a0f2d8f67c039a69cd327789a88b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Mon, 22 Oct 2012 23:00:19 +0200 Subject: [PATCH 1/7] Increase version number --- tryton.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tryton.cfg b/tryton.cfg index c016a8190b..4084498421 100644 --- a/tryton.cfg +++ b/tryton.cfg @@ -1,5 +1,5 @@ [tryton] -version=2.6.0 +version=2.6.1 depends: account ir From 6ac3cba632e98e4bab6c31029608c4b4adfd9855 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Tue, 26 Mar 2013 11:55:46 +0100 Subject: [PATCH 2/7] ProductSupplier is linked to template not product --- tests/test_stock_supply.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/test_stock_supply.py b/tests/test_stock_supply.py index 0dde8fbc8c..a2bb45a5af 100644 --- a/tests/test_stock_supply.py +++ b/tests/test_stock_supply.py @@ -123,7 +123,7 @@ class StockSupplyTestCase(unittest.TestCase): 'account_payable': payable.id, }) product_supplier = self.product_supplier.create({ - 'product': product.id, + 'product': product.template.id, 'company': company.id, 'party': supplier.id, 'delivery_time': delivery_time, From 43e4270d675f420fb01ae71249d639a8963ed089 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 3/7] 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 a9d5f7f593..57784201a1 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 4e47c615edf8f11816941f8dd2350181cb59b3b9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Sun, 9 Jun 2013 22:51:29 +0200 Subject: [PATCH 4/7] Prepare release 2.6.1 --- CHANGELOG | 3 +++ COPYRIGHT | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 0a733df29f..7d043f23f1 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,6 @@ +Version 2.6.1 - 2013-06-09 +* Bug fixes (see mercurial logs for details) + Version 2.6.0 - 2012-10-22 * Bug fixes (see mercurial logs for details) * Generate also purchase requests for assets diff --git a/COPYRIGHT b/COPYRIGHT index 2057c724d0..d7165c7ec9 100644 --- a/COPYRIGHT +++ b/COPYRIGHT @@ -1,6 +1,6 @@ -Copyright (C) 2008-2012 Cédric Krier. +Copyright (C) 2008-2013 Cédric Krier. Copyright (C) 2008-2012 Bertrand Chenal. -Copyright (C) 2008-2012 B2CK SPRL. +Copyright (C) 2008-2013 B2CK SPRL. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by From 743c88f817c739bc7072bb2b59968bb769075fcb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Sun, 9 Jun 2013 22:51:30 +0200 Subject: [PATCH 5/7] Added tag 2.6.1 for changeset daf29edb33f7 --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index f0703d6091..33a62ff3fc 100644 --- a/.hgtags +++ b/.hgtags @@ -7,3 +7,4 @@ f76056df60f581f803c7a7e4cec81397e4bbbb9c 1.8.0 0881ad5cb82f3f00ec1eea276fa100a957691982 2.2.0 5eb0f23e5774dddbf43cafe34bf527e1cd78d619 2.4.0 6cd5f943826cb858bc34d20074bfd81b715114f8 2.6.0 +daf29edb33f783c2db30010cb653dd54068d49c7 2.6.1 From 91fc5980f2860939df1d6ede29657d685a63db3b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Sun, 9 Jun 2013 22:51:38 +0200 Subject: [PATCH 6/7] Increase version number --- tryton.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tryton.cfg b/tryton.cfg index 4084498421..c5f26822a3 100644 --- a/tryton.cfg +++ b/tryton.cfg @@ -1,5 +1,5 @@ [tryton] -version=2.6.1 +version=2.6.2 depends: account ir From 9f3ac77d7e5db14a1eaf8026719128c6e659bf66 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 7/7] 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 59c8cf8d69..9afe764509 100644 --- a/order_point.py +++ b/order_point.py @@ -137,6 +137,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),