From 90de06cbec8b8b73b16667c474cba919e836b8e8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Wed, 15 Aug 2012 18:12:46 +0200 Subject: [PATCH 1/9] Increase version number --- __tryton__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/__tryton__.py b/__tryton__.py index c681c6bdef..c9b4245276 100644 --- a/__tryton__.py +++ b/__tryton__.py @@ -6,7 +6,7 @@ 'name_de_DE': 'Lagerverwaltung Bestellwesen Produktion', 'name_es_ES': 'Abastecimiento de stock en producción', 'name_fr_FR': 'Gestion des approvisionnements de production', - 'version': '2.4.0', + 'version': '2.4.1', 'author': 'B2CK', 'email': 'info@b2ck.com', 'website': 'http://www.tryton.org/', From 98a1c8acc3359ee9444dbda79e987fec3b4dfb9c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Mon, 24 Sep 2012 18:27:07 +0200 Subject: [PATCH 2/9] Fix compute_request to use the bom id instead of the link id (transplanted from 3ac6556ec8e01c0d1eb958ca267863e84d165c9f) --- production.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/production.py b/production.py index c66f188407..9d72009e64 100644 --- a/production.py +++ b/production.py @@ -116,7 +116,7 @@ class Production(Model): 'warehouse': warehouse.id, 'location': warehouse.production_location.id, 'product': product.id, - 'bom': product.boms[0].id if product.boms else None, + 'bom': product.boms[0].bom.id if product.boms else None, 'uom': product.default_uom.id, 'quantity': quantity, 'state': 'request', From ec4e61ff442b4d84f8570d84c48c9ce12d7eb1bd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Mon, 5 Nov 2012 18:12:14 +0100 Subject: [PATCH 3/9] Prepare release 2.4.1 --- CHANGELOG | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index d347eb6141..f80b9be6bd 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,2 +1,5 @@ +Version 2.4.1 - 2012-11-05 +* Bug fixes (see mercurial logs for details) + Version 2.4.0 - 2012-08-15 * Initial release From 9f1a2a44f21febd468036376d6f77a515d622df4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Mon, 5 Nov 2012 18:12:15 +0100 Subject: [PATCH 4/9] Added tag 2.4.1 for changeset 0f195afe528b --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index 1db9a6ff30..7e15b578db 100644 --- a/.hgtags +++ b/.hgtags @@ -1 +1,2 @@ ec2752f736f671fea3f95f881fa19e7cbfcc88c2 2.4.0 +0f195afe528b115eb6a2c42700062a3953e1311f 2.4.1 From c764a8a2c948d2cff023b292d1c3956b91a11cbb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Mon, 5 Nov 2012 18:12:37 +0100 Subject: [PATCH 5/9] Increase version number --- __tryton__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/__tryton__.py b/__tryton__.py index c9b4245276..ba238bf8a0 100644 --- a/__tryton__.py +++ b/__tryton__.py @@ -6,7 +6,7 @@ 'name_de_DE': 'Lagerverwaltung Bestellwesen Produktion', 'name_es_ES': 'Abastecimiento de stock en producción', 'name_fr_FR': 'Gestion des approvisionnements de production', - 'version': '2.4.1', + 'version': '2.4.2', 'author': 'B2CK', 'email': 'info@b2ck.com', 'website': 'http://www.tryton.org/', From effde10a4c7216c5549ecb6243347f1193e83353 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 6/9] 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 | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/production.py b/production.py index 9d72009e64..22270051cc 100644 --- a/production.py +++ b/production.py @@ -68,9 +68,6 @@ class Production(Model): ('purchasable', '=', False), ]) products = product_obj.browse(product_ids) - # order product by supply period - products_period = sorted([(product_obj.get_supply_period(p), p) - for p in products]) # compute requests cursor = Transaction().cursor @@ -82,6 +79,11 @@ class Production(Model): stock_date_end=today): pbl = product_obj.products_by_location(warehouse_ids, product_ids, with_childs=True, skip_zero=False) + + # order product by supply period + products_period = sorted([(product_obj.get_supply_period(p), 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 3fdad10c66df8a696f2580ac3a82f1ef09896f5e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Sun, 23 Dec 2012 16:52:22 +0100 Subject: [PATCH 7/9] Prepare release 2.4.2 --- CHANGELOG | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index f80b9be6bd..a108e03355 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,6 @@ +Version 2.4.2 - 2012-12-23 +* Bug fixes (see mercurial logs for details) + Version 2.4.1 - 2012-11-05 * Bug fixes (see mercurial logs for details) From 41fa88eb37f3c89c2c0f5ffa0b44c157892d9898 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Sun, 23 Dec 2012 16:52:23 +0100 Subject: [PATCH 8/9] Added tag 2.4.2 for changeset e2a10cc218bf --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index 7e15b578db..b0e4dad08b 100644 --- a/.hgtags +++ b/.hgtags @@ -1,2 +1,3 @@ ec2752f736f671fea3f95f881fa19e7cbfcc88c2 2.4.0 0f195afe528b115eb6a2c42700062a3953e1311f 2.4.1 +e2a10cc218bf322d7b98eb488120ff6820c78928 2.4.2 From 753af440a3099b57b3745359bb959a2036dca507 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Sun, 23 Dec 2012 16:52:31 +0100 Subject: [PATCH 9/9] Increase version number --- __tryton__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/__tryton__.py b/__tryton__.py index ba238bf8a0..0153a82959 100644 --- a/__tryton__.py +++ b/__tryton__.py @@ -6,7 +6,7 @@ 'name_de_DE': 'Lagerverwaltung Bestellwesen Produktion', 'name_es_ES': 'Abastecimiento de stock en producción', 'name_fr_FR': 'Gestion des approvisionnements de production', - 'version': '2.4.2', + 'version': '2.4.3', 'author': 'B2CK', 'email': 'info@b2ck.com', 'website': 'http://www.tryton.org/',