From c4814844107d6dd11b8f46de16118c116682bbc1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Tue, 24 Apr 2012 12:19:39 +0200 Subject: [PATCH 01/19] Increase version number --- __tryton__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/__tryton__.py b/__tryton__.py index 5d5c069834..cfac736f74 100644 --- a/__tryton__.py +++ b/__tryton__.py @@ -9,7 +9,7 @@ 'name_es_CO': 'Gestión de pedidos de inventario', 'name_es_ES': 'Gestión del abastecimiento de stock', 'name_fr_FR': 'Gestion des approvisionnements de stock', - 'version': '2.4.0', + 'version': '2.4.1', 'author': 'B2CK', 'email': 'info@b2ck.com', 'website': 'http://www.tryton.org/', From 3976fb080f149fc57ef0a52f14a7b0487a903e9e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Tue, 29 May 2012 17:24:13 +0200 Subject: [PATCH 02/19] Tax rule apply method return a list of tax ids (transplanted from 228576b60e223e126580b46020fa913e7b01a6c8) --- purchase_request.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/purchase_request.py b/purchase_request.py index e54cad996a..a91f83b367 100644 --- a/purchase_request.py +++ b/purchase_request.py @@ -721,10 +721,10 @@ class CreatePurchase(Wizard): for tax in request.product.supplier_taxes_used: if request.party and request.party.supplier_tax_rule: pattern = self._get_tax_rule_pattern(request) - tax_id = tax_rule_obj.apply(request.party.supplier_tax_rule, + tax_ids = tax_rule_obj.apply(request.party.supplier_tax_rule, tax, pattern) - if tax_id: - taxes.append(tax_id) + if tax_ids: + taxes.extend(tax_ids) continue taxes.append(tax.id) line['taxes'] = [('add', taxes)] From 131770fc7f0b5a111578b79d790d8856f891aeb1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Tue, 29 May 2012 17:21:38 +0200 Subject: [PATCH 03/19] Fix test on product_price product_price may be zero (transplanted from 446fca61b612cbcb5f0ae49c24758a26eb3872ff) --- purchase_request.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/purchase_request.py b/purchase_request.py index a91f83b367..cd7ca91cbf 100644 --- a/purchase_request.py +++ b/purchase_request.py @@ -712,7 +712,7 @@ class CreatePurchase(Wizard): product_price = product_price.quantize( Decimal(1) / 10 ** line_obj.unit_price.digits[1]) - if not product_price: + if product_price is None: self.raise_user_error('missing_price', (request.product.name, request.product.id), 'please_update') line['unit_price'] = product_price From 6356c718c6b62513964deea158e204d6decab8d0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Sun, 2 Sep 2012 16:56:00 +0200 Subject: [PATCH 04/19] Prepare release 2.4.1 --- CHANGELOG | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index b832be7f59..3fb25d2e39 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,6 @@ +Version 2.4.1 - 2012-09-02 +* Bug fixes (see mercurial logs for details) + Version 2.4.0 - 2012-04-24 * Bug fixes (see mercurial logs for details) * Warehouse is not always required From 210e309767443c135232a0e1f8220d0c3520fef9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Sun, 2 Sep 2012 16:56:01 +0200 Subject: [PATCH 05/19] Added tag 2.4.1 for changeset f12e77f68a5f --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index 7f4833d491..5976d4fa38 100644 --- a/.hgtags +++ b/.hgtags @@ -6,3 +6,4 @@ f76056df60f581f803c7a7e4cec81397e4bbbb9c 1.8.0 354dfc672c4b3ee2609a4051f6d8d431dd087231 2.0.0 0881ad5cb82f3f00ec1eea276fa100a957691982 2.2.0 5eb0f23e5774dddbf43cafe34bf527e1cd78d619 2.4.0 +f12e77f68a5f88255ce4fff2a94c5abe81ef52b3 2.4.1 From 50fc0ea081cfe01879c594bddeb1b05ca19b8535 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Sun, 2 Sep 2012 16:56:09 +0200 Subject: [PATCH 06/19] Increase version number --- __tryton__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/__tryton__.py b/__tryton__.py index cfac736f74..05d19c0f1f 100644 --- a/__tryton__.py +++ b/__tryton__.py @@ -9,7 +9,7 @@ 'name_es_CO': 'Gestión de pedidos de inventario', 'name_es_ES': 'Gestión del abastecimiento de stock', 'name_fr_FR': 'Gestion des approvisionnements de stock', - 'version': '2.4.1', + 'version': '2.4.2', 'author': 'B2CK', 'email': 'info@b2ck.com', 'website': 'http://www.tryton.org/', From 0fb74fd7ffb4c17ec637ccb0c71e5a38862ad381 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Thu, 20 Sep 2012 16:16:56 +0200 Subject: [PATCH 07/19] Don't modify uom object from the pool in unittest (transplanted from bd39479d70b4a6ea1a33a011bf54f691e6d552bb) --- tests/test_stock_supply.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/test_stock_supply.py b/tests/test_stock_supply.py index ce44ec0f7d..eef317f3c9 100644 --- a/tests/test_stock_supply.py +++ b/tests/test_stock_supply.py @@ -37,7 +37,7 @@ class StockSupplyTestCase(unittest.TestCase): def setUp(self): trytond.tests.test_tryton.install_module('stock_supply') self.uom = POOL.get('product.uom') - self.uom.category = POOL.get('product.uom.category') + self.uom_category = POOL.get('product.uom.category') self.category = POOL.get('product.category') self.product = POOL.get('product.product') self.company = POOL.get('company.company') @@ -93,7 +93,7 @@ class StockSupplyTestCase(unittest.TestCase): :param delivery_time: time in days needed to supply :return: the id of the Product Supplier ''' - uom_category_id = self.uom.category.create({'name': 'Test'}) + uom_category_id = self.uom_category.create({'name': 'Test'}) uom_id = self.uom.create({ 'name': 'Test', 'symbol': 'T', From 9e71f1f1c350cda9ce73cd661a6c49d5e1e543ce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Mon, 5 Nov 2012 18:10:05 +0100 Subject: [PATCH 08/19] Prepare release 2.4.2 --- CHANGELOG | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index 3fb25d2e39..8e2c8ad37c 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,6 @@ +Version 2.4.2 - 2012-11-05 +* Bug fixes (see mercurial logs for details) + Version 2.4.1 - 2012-09-02 * Bug fixes (see mercurial logs for details) From c608059623c4d02b9e6c38e7ecc5aff054fbed89 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Mon, 5 Nov 2012 18:10:06 +0100 Subject: [PATCH 09/19] Added tag 2.4.2 for changeset 21906f5334da --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index 5976d4fa38..62f69210c9 100644 --- a/.hgtags +++ b/.hgtags @@ -7,3 +7,4 @@ f76056df60f581f803c7a7e4cec81397e4bbbb9c 1.8.0 0881ad5cb82f3f00ec1eea276fa100a957691982 2.2.0 5eb0f23e5774dddbf43cafe34bf527e1cd78d619 2.4.0 f12e77f68a5f88255ce4fff2a94c5abe81ef52b3 2.4.1 +21906f5334da5b7d8fb58ae0ca9d4c44af009f02 2.4.2 From 22e31ad7eaf0e7914c6f908405bf8b874bf7ebdd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Mon, 5 Nov 2012 18:10:15 +0100 Subject: [PATCH 10/19] Increase version number --- __tryton__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/__tryton__.py b/__tryton__.py index 05d19c0f1f..861f83ba80 100644 --- a/__tryton__.py +++ b/__tryton__.py @@ -9,7 +9,7 @@ 'name_es_CO': 'Gestión de pedidos de inventario', 'name_es_ES': 'Gestión del abastecimiento de stock', 'name_fr_FR': 'Gestion des approvisionnements de stock', - 'version': '2.4.2', + 'version': '2.4.3', 'author': 'B2CK', 'email': 'info@b2ck.com', 'website': 'http://www.tryton.org/', From d7125b81c21a40e682233955221169933c773f13 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Tue, 26 Mar 2013 11:57:15 +0100 Subject: [PATCH 11/19] ProductSupplier is linked to template not product --- tests/test_stock_supply.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/test_stock_supply.py b/tests/test_stock_supply.py index eef317f3c9..f3172fb1ac 100644 --- a/tests/test_stock_supply.py +++ b/tests/test_stock_supply.py @@ -128,8 +128,9 @@ class StockSupplyTestCase(unittest.TestCase): 'account_receivable': receivable_id, 'account_payable': payable_id, }) + product = self.product.browse(product_id) product_supplier_id = self.product_supplier.create({ - 'product': product_id, + 'product': product.template.id, 'company': company_id, 'party': supplier_id, 'delivery_time': delivery_time, From 9b2963f80ae347de5fc78e86422f8a1d323a9848 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Thu, 2 May 2013 10:18:31 +0200 Subject: [PATCH 12/19] Prepare release 2.4.3 --- CHANGELOG | 3 +++ COPYRIGHT | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 8e2c8ad37c..cd2322c75b 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,6 @@ +Version 2.4.3 - 2013-05-02 +* Bug fixes (see mercurial logs for details) + Version 2.4.2 - 2012-11-05 * Bug fixes (see mercurial logs for details) 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 a9f848d8d059a5789a8ba7ee5b1f464c2264c5cd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Thu, 2 May 2013 10:18:32 +0200 Subject: [PATCH 13/19] Added tag 2.4.3 for changeset d91879ee3150 --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index 62f69210c9..2e2712eefd 100644 --- a/.hgtags +++ b/.hgtags @@ -8,3 +8,4 @@ f76056df60f581f803c7a7e4cec81397e4bbbb9c 1.8.0 5eb0f23e5774dddbf43cafe34bf527e1cd78d619 2.4.0 f12e77f68a5f88255ce4fff2a94c5abe81ef52b3 2.4.1 21906f5334da5b7d8fb58ae0ca9d4c44af009f02 2.4.2 +d91879ee3150e5cb8c79155bf87c691495cf8d4a 2.4.3 From f2756d61530ed6aa1c2159478365cc4c41054ae7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Thu, 2 May 2013 10:18:40 +0200 Subject: [PATCH 14/19] Increase version number --- __tryton__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/__tryton__.py b/__tryton__.py index 861f83ba80..23d8ef7c53 100644 --- a/__tryton__.py +++ b/__tryton__.py @@ -9,7 +9,7 @@ 'name_es_CO': 'Gestión de pedidos de inventario', 'name_es_ES': 'Gestión del abastecimiento de stock', 'name_fr_FR': 'Gestion des approvisionnements de stock', - 'version': '2.4.3', + 'version': '2.4.4', 'author': 'B2CK', 'email': 'info@b2ck.com', 'website': 'http://www.tryton.org/', From 0efe2e521416e065e20081bb8277fca93bc5a23f 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 15/19] 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 c726e3226e..61de467f16 100644 --- a/shipment.py +++ b/shipment.py @@ -54,8 +54,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 @@ -69,8 +69,8 @@ class ShipmentInternal(ModelSQL, ModelView): ]) for shipment in self.browse(shipment_ids): 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 333b9475f8ee575e2049f8d4d9b13f1e313deab1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Sun, 9 Jun 2013 22:46:00 +0200 Subject: [PATCH 16/19] Prepare release 2.4.4 --- CHANGELOG | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index cd2322c75b..9589bcd6f4 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,6 @@ +Version 2.4.4 - 2013-06-09 +* Bug fixes (see mercurial logs for details) + Version 2.4.3 - 2013-05-02 * Bug fixes (see mercurial logs for details) From 7ac07db8a0753502ebcf72163c714e1a2ca8392e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Sun, 9 Jun 2013 22:46:01 +0200 Subject: [PATCH 17/19] Added tag 2.4.4 for changeset 07324d4eaa9d --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index 2e2712eefd..a25bc1bb2f 100644 --- a/.hgtags +++ b/.hgtags @@ -9,3 +9,4 @@ f76056df60f581f803c7a7e4cec81397e4bbbb9c 1.8.0 f12e77f68a5f88255ce4fff2a94c5abe81ef52b3 2.4.1 21906f5334da5b7d8fb58ae0ca9d4c44af009f02 2.4.2 d91879ee3150e5cb8c79155bf87c691495cf8d4a 2.4.3 +07324d4eaa9dd5ebe81f43f50e427b75e577f603 2.4.4 From 2acd8051c8675939d52b4fda4610acd7afca8c3a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Sun, 9 Jun 2013 22:46:10 +0200 Subject: [PATCH 18/19] Increase version number --- __tryton__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/__tryton__.py b/__tryton__.py index 23d8ef7c53..7494db2095 100644 --- a/__tryton__.py +++ b/__tryton__.py @@ -9,7 +9,7 @@ 'name_es_CO': 'Gestión de pedidos de inventario', 'name_es_ES': 'Gestión del abastecimiento de stock', 'name_fr_FR': 'Gestion des approvisionnements de stock', - 'version': '2.4.4', + 'version': '2.4.5', 'author': 'B2CK', 'email': 'info@b2ck.com', 'website': 'http://www.tryton.org/', From a4be93faee358d6166a680cf6db9cb2546176f00 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 19/19] 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 1140d5de75..e14ae75606 100644 --- a/order_point.py +++ b/order_point.py @@ -141,6 +141,7 @@ class OrderPoint(ModelSQL, ModelView): query = ['OR'] for op in self.browse(internal_ids): arg = ['AND', + ('product', '=', op.product.id), ('provisioning_location', '=', op.storage_location.id), ('storage_location', '=', op.provisioning_location.id), ('company', '=', op.company.id),