From a6c8dce90e45e9f132b0792b9732c349e353ca59 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Mon, 22 Oct 2012 23:00:25 +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 2de3f0ad12..bd107d5f05 100644 --- a/tryton.cfg +++ b/tryton.cfg @@ -1,5 +1,5 @@ [tryton] -version=2.6.0 +version=2.6.1 depends: ir product From 75532d2fca752b55d3a6f45836bde8d78692d795 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Wed, 5 Dec 2012 13:38:59 +0100 Subject: [PATCH 2/5] Compute products_period only for current products get_shortage expect to receive products_period only for product_ids. issue2905 review595005 (transplanted from 3efb32b663dd9bef2bc528b06991968ac32f5343) --- production.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/production.py b/production.py index 0871d1948f..b55704dfb6 100644 --- a/production.py +++ b/production.py @@ -70,10 +70,6 @@ class Production: ('consumable', '=', False), ('purchasable', '=', False), ]) - # order product by supply period - products_period = sorted([(p.get_supply_period(), p) - for p in products]) - # compute requests cursor = Transaction().cursor today = Date.today() @@ -84,6 +80,11 @@ class Production: stock_date_end=today): pbl = Product.products_by_location(warehouse_ids, product_ids, with_childs=True, skip_zero=False) + + # order product by supply period + products_period = sorted([(p.get_supply_period(), p) + for p in products[i:i + cursor.IN_MAX]]) + for warehouse in warehouses: quantities = dict((x, pbl.pop((warehouse.id, x))) for x in product_ids) From 14bee22262a8a1aaf67032f4d10a2c806d21de2e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Sun, 23 Dec 2012 16:46:06 +0100 Subject: [PATCH 3/5] Prepare release 2.6.1 --- CHANGELOG | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index 4ea939253b..ea0e50a121 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,6 @@ +Version 2.6.1 - 2012-12-23 +* Bug fixes (see mercurial logs for details) + Version 2.6.0 - 2012-10-22 * Bug fixes (see mercurial logs for details) From 997c920993dd6dc5e87207cf117d2fdadb65c6ff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Sun, 23 Dec 2012 16:46:07 +0100 Subject: [PATCH 4/5] Added tag 2.6.1 for changeset 1ec12b3daf96 --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index 5af9599001..6b0ad3b06d 100644 --- a/.hgtags +++ b/.hgtags @@ -1,2 +1,3 @@ ec2752f736f671fea3f95f881fa19e7cbfcc88c2 2.4.0 4541105a8fc9586b5c65f581d70dd6906c41a730 2.6.0 +1ec12b3daf962d7cce095fe39cda68ad105a0917 2.6.1 From 0806c5f4accb6abf388759ec40ac03f4fb536ea4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Sun, 23 Dec 2012 16:46:15 +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 bd107d5f05..7ae057c839 100644 --- a/tryton.cfg +++ b/tryton.cfg @@ -1,5 +1,5 @@ [tryton] -version=2.6.1 +version=2.6.2 depends: ir product