From 83bff9050d6eca6bb1d836d33149eaad0b88e88c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Thu, 13 May 2010 16:12:19 +0200 Subject: [PATCH 01/18] Increase version number --- __tryton__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/__tryton__.py b/__tryton__.py index c4d1e25003..74495ec860 100644 --- a/__tryton__.py +++ b/__tryton__.py @@ -6,7 +6,7 @@ 'name_es_CO': 'Gestión de pedidos de inventario', 'name_es_ES': 'Gestión de suministro de existencias', 'name_fr_FR': 'Gestion des approvisionnements de stock', - 'version': '1.6.0', + 'version': '1.6.1', 'author': 'B2CK', 'email': 'info@b2ck.com', 'website': 'http://www.tryton.org/', From 723339f594ada60ac6712394aacf043390322b2a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Sat, 21 Aug 2010 12:36:54 +0200 Subject: [PATCH 02/18] Fix wrong context for call of products_by_location for issue1645 --- purchase_request.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/purchase_request.py b/purchase_request.py index 8dd0577208..17a18e32f7 100644 --- a/purchase_request.py +++ b/purchase_request.py @@ -409,7 +409,7 @@ class PurchaseRequest(ModelSQL, ModelView): res = product_obj.products_by_location( cursor, user, [location_id], [product_id], with_childs=True, skip_zero=False, - context=context) + context=local_context) for qty in res.itervalues(): current_qty += qty if current_date == datetime.date.max: From a8a6e65efad473c2a735dee22733a627310c6122 Mon Sep 17 00:00:00 2001 From: Mathias Behrle Date: Tue, 2 Nov 2010 21:13:30 +0100 Subject: [PATCH 03/18] Prepare release 1.6.1 --- CHANGELOG | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index e36b38aec7..26abb5ed33 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,6 @@ +Version 1.6.1 - 2010-11-02 +* Bug fixes (see mercurial logs for details) + Version 1.6.0 - 2010-05-13 * Bug fixes (see mercurial logs for details) From 9ac04646b5481ed4894fe4780a188498a81b2d70 Mon Sep 17 00:00:00 2001 From: Mathias Behrle Date: Tue, 2 Nov 2010 21:13:31 +0100 Subject: [PATCH 04/18] Added tag 1.6.1 for changeset 07d4275c5d15 --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index 22e53947ac..1c4731fd18 100644 --- a/.hgtags +++ b/.hgtags @@ -2,3 +2,4 @@ bb2bb6af62f06218b0c8c689b24dd16f43307ca1 1.0.0 5b0a8261963f167230f23a1b97c8b38519428143 1.2.0 396ad2807deb26c6c353eb119dc50fd4fdcbb28a 1.4.0 b44aa993ce24453fdb2362187e201a9375bcaa09 1.6.0 +07d4275c5d154932d86ff0341ea7357ac2b3d7b2 1.6.1 From 5a01b2de51a5439ca6b4c584cc192b52969d5056 Mon Sep 17 00:00:00 2001 From: Mathias Behrle Date: Tue, 2 Nov 2010 21:13:32 +0100 Subject: [PATCH 05/18] Increase version number --- __tryton__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/__tryton__.py b/__tryton__.py index 74495ec860..0cd5adaa0c 100644 --- a/__tryton__.py +++ b/__tryton__.py @@ -6,7 +6,7 @@ 'name_es_CO': 'Gestión de pedidos de inventario', 'name_es_ES': 'Gestión de suministro de existencias', 'name_fr_FR': 'Gestion des approvisionnements de stock', - 'version': '1.6.1', + 'version': '1.6.2', 'author': 'B2CK', 'email': 'info@b2ck.com', 'website': 'http://www.tryton.org/', From 5f072a42092bcd67f1b7a5c0324da181ed5c2fdc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Sun, 21 Aug 2011 11:16:20 +0200 Subject: [PATCH 06/18] Use the warehouse quantity to compute requests review88001 (transplanted from 79574743abba802e8de00f93fc0c66520390c504) --- purchase_request.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/purchase_request.py b/purchase_request.py index 17a18e32f7..6ba9315895 100644 --- a/purchase_request.py +++ b/purchase_request.py @@ -153,8 +153,7 @@ class PurchaseRequest(ModelSQL, ModelView): for min_date in date2products: product_ids = [x[0].id for x in date2products[min_date]] local_context.update( - {'stock_date_end': min_date or datetime.date.max, - 'stock_skip_warehouse': True}) + {'stock_date_end': min_date or datetime.date.max}) pbl = product_obj.products_by_location( cursor, user, warehouse_ids, product_ids, with_childs=True, skip_zero=False, context=local_context) From cd6ce46bd524c0fdd2ffaec9e784f8514fd581e5 Mon Sep 17 00:00:00 2001 From: Mathias Behrle Date: Sat, 1 Oct 2011 13:52:04 +0200 Subject: [PATCH 07/18] Update COPYRIGHT --- COPYRIGHT | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/COPYRIGHT b/COPYRIGHT index cca7db9317..3d2324bfb3 100644 --- a/COPYRIGHT +++ b/COPYRIGHT @@ -1,6 +1,6 @@ -Copyright (C) 2008-2010 Cédric Krier. -Copyright (C) 2008-2010 Bertrand Chenal. -Copyright (C) 2008-2010 B2CK SPRL. +Copyright (C) 2008-2011 Cédric Krier. +Copyright (C) 2008-2011 Bertrand Chenal. +Copyright (C) 2008-2011 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 ed36487552f8bcf91d22eb1f93e56894745e6214 Mon Sep 17 00:00:00 2001 From: Mathias Behrle Date: Sat, 1 Oct 2011 14:15:14 +0200 Subject: [PATCH 08/18] Prepare release 1.6.2 --- CHANGELOG | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index 26abb5ed33..5bff2265d7 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,6 @@ +Version 1.6.2 - 2011-10-01 +* Bug fixes (see mercurial logs for details) + Version 1.6.1 - 2010-11-02 * Bug fixes (see mercurial logs for details) From 0c31db6e30d66ea8a06d7f752429df63fced01cc Mon Sep 17 00:00:00 2001 From: Mathias Behrle Date: Sat, 1 Oct 2011 14:15:14 +0200 Subject: [PATCH 09/18] Added tag 1.6.2 for changeset e1a322c41e7f --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index 1c4731fd18..0c87ca90e4 100644 --- a/.hgtags +++ b/.hgtags @@ -3,3 +3,4 @@ bb2bb6af62f06218b0c8c689b24dd16f43307ca1 1.0.0 396ad2807deb26c6c353eb119dc50fd4fdcbb28a 1.4.0 b44aa993ce24453fdb2362187e201a9375bcaa09 1.6.0 07d4275c5d154932d86ff0341ea7357ac2b3d7b2 1.6.1 +e1a322c41e7fe6ecceb3f56713a6321314af7961 1.6.2 From fb07b44cb415a86c233cf783d20eef2fb8083731 Mon Sep 17 00:00:00 2001 From: Mathias Behrle Date: Sat, 1 Oct 2011 14:15:19 +0200 Subject: [PATCH 10/18] Increase version number --- __tryton__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/__tryton__.py b/__tryton__.py index 0cd5adaa0c..017336cf5f 100644 --- a/__tryton__.py +++ b/__tryton__.py @@ -6,7 +6,7 @@ 'name_es_CO': 'Gestión de pedidos de inventario', 'name_es_ES': 'Gestión de suministro de existencias', 'name_fr_FR': 'Gestion des approvisionnements de stock', - 'version': '1.6.2', + 'version': '1.6.3', 'author': 'B2CK', 'email': 'info@b2ck.com', 'website': 'http://www.tryton.org/', From 1f434d5fc75da8d8bb44a54367d86b3870cc25af Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Sun, 29 Jan 2012 16:33:00 +0100 Subject: [PATCH 11/18] Round get_purchase_price according to unit_price digits issue2094 review226007 (transplanted from 4d47bbcd5826e49339fbf0e31ec85af141671445) --- purchase_request.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/purchase_request.py b/purchase_request.py index 6ba9315895..875055da12 100644 --- a/purchase_request.py +++ b/purchase_request.py @@ -4,6 +4,7 @@ from trytond.model import ModelView, ModelSQL, fields from trytond.wizard import Wizard from trytond.pyson import If, In, Eval, Get import datetime +from decimal import Decimal class PurchaseRequest(ModelSQL, ModelView): @@ -634,6 +635,7 @@ class CreatePurchase(Wizard): party_obj = self.pool.get('party.party') product_obj = self.pool.get('product.product') tax_rule_obj = self.pool.get('account.tax.rule') + line_obj = self.pool.get('purchase.line') line = { 'product': request.product.id, @@ -651,6 +653,8 @@ class CreatePurchase(Wizard): product_price = product_obj.get_purchase_price( cursor, user, [request.product.id], request.quantity, context=local_context)[request.product.id] + product_price = product_price.quantize( + Decimal(1) / 10 ** line_obj.unit_price.digits[1]) if not product_price: self.raise_user_error( From f65aaa7083ac93f5b834d32fe3fca8bb283bcafb Mon Sep 17 00:00:00 2001 From: Mathias Behrle Date: Mon, 7 May 2012 11:04:33 +0200 Subject: [PATCH 12/18] Prepare release 1.6.3 --- CHANGELOG | 3 +++ COPYRIGHT | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 5bff2265d7..5ef073a68d 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,6 @@ +Version 1.6.3 - 2012-05-07 +* Bug fixes (see mercurial logs for details) + Version 1.6.2 - 2011-10-01 * Bug fixes (see mercurial logs for details) diff --git a/COPYRIGHT b/COPYRIGHT index 3d2324bfb3..26f578f363 100644 --- a/COPYRIGHT +++ b/COPYRIGHT @@ -1,6 +1,6 @@ -Copyright (C) 2008-2011 Cédric Krier. +Copyright (C) 2008-2012 Cédric Krier. Copyright (C) 2008-2011 Bertrand Chenal. -Copyright (C) 2008-2011 B2CK SPRL. +Copyright (C) 2008-2012 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 60c43340b5b6084eafecb8944ca9ec86977ea46e Mon Sep 17 00:00:00 2001 From: Mathias Behrle Date: Mon, 7 May 2012 11:04:33 +0200 Subject: [PATCH 13/18] Added tag 1.6.3 for changeset 2ba0304b2183 --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index 0c87ca90e4..e802316525 100644 --- a/.hgtags +++ b/.hgtags @@ -4,3 +4,4 @@ bb2bb6af62f06218b0c8c689b24dd16f43307ca1 1.0.0 b44aa993ce24453fdb2362187e201a9375bcaa09 1.6.0 07d4275c5d154932d86ff0341ea7357ac2b3d7b2 1.6.1 e1a322c41e7fe6ecceb3f56713a6321314af7961 1.6.2 +2ba0304b2183a35ec9dbc9a14d0580ab7ba9ec7c 1.6.3 From 1963fadad6b162b5cc7e03f3986abe17b9db335c Mon Sep 17 00:00:00 2001 From: Mathias Behrle Date: Mon, 7 May 2012 11:04:37 +0200 Subject: [PATCH 14/18] Increase version number --- __tryton__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/__tryton__.py b/__tryton__.py index 017336cf5f..4fd6bf86ba 100644 --- a/__tryton__.py +++ b/__tryton__.py @@ -6,7 +6,7 @@ 'name_es_CO': 'Gestión de pedidos de inventario', 'name_es_ES': 'Gestión de suministro de existencias', 'name_fr_FR': 'Gestion des approvisionnements de stock', - 'version': '1.6.3', + 'version': '1.6.4', 'author': 'B2CK', 'email': 'info@b2ck.com', 'website': 'http://www.tryton.org/', From 8527e80ae8ead91b858856eac6a3c44d81347b69 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 15/18] 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 875055da12..4bdd29dce1 100644 --- a/purchase_request.py +++ b/purchase_request.py @@ -669,11 +669,11 @@ class CreatePurchase(Wizard): if request.party and request.party.supplier_tax_rule: pattern = self._get_tax_rule_pattern(cursor, user, request, context=context) - tax_id = tax_rule_obj.apply(cursor, user, + tax_ids = tax_rule_obj.apply(cursor, user, request.party.supplier_tax_rule, tax, pattern, context=context) - if tax_id: - taxes.append(tax_id) + if tax_ids: + taxes.extend(tax_ids) continue taxes.append(tax.id) line['taxes'] = [('add', taxes)] From 51250502a5b3f4a8958d38175c8b1c53ee754088 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Sun, 2 Sep 2012 16:58:38 +0200 Subject: [PATCH 16/18] Prepare release 1.6.4 --- CHANGELOG | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index 5ef073a68d..56d738bf04 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,6 @@ +Version 1.6.4 - 2012-09-02 +* Bug fixes (see mercurial logs for details) + Version 1.6.3 - 2012-05-07 * Bug fixes (see mercurial logs for details) From bfd07a8a8d99a1a42eba4185755988ba3f152c33 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Sun, 2 Sep 2012 16:58:39 +0200 Subject: [PATCH 17/18] Added tag 1.6.4 for changeset 8c94c6071c90 --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index e802316525..c17ff47ba5 100644 --- a/.hgtags +++ b/.hgtags @@ -5,3 +5,4 @@ b44aa993ce24453fdb2362187e201a9375bcaa09 1.6.0 07d4275c5d154932d86ff0341ea7357ac2b3d7b2 1.6.1 e1a322c41e7fe6ecceb3f56713a6321314af7961 1.6.2 2ba0304b2183a35ec9dbc9a14d0580ab7ba9ec7c 1.6.3 +8c94c6071c902e87878e080cea2b32d6d43cf82a 1.6.4 From ad130c6e15f46fa51b0604a901718c794b721196 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Sun, 2 Sep 2012 16:58:46 +0200 Subject: [PATCH 18/18] Increase version number --- __tryton__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/__tryton__.py b/__tryton__.py index 4fd6bf86ba..9e9c72d776 100644 --- a/__tryton__.py +++ b/__tryton__.py @@ -6,7 +6,7 @@ 'name_es_CO': 'Gestión de pedidos de inventario', 'name_es_ES': 'Gestión de suministro de existencias', 'name_fr_FR': 'Gestion des approvisionnements de stock', - 'version': '1.6.4', + 'version': '1.6.5', 'author': 'B2CK', 'email': 'info@b2ck.com', 'website': 'http://www.tryton.org/',