From 7d8d6010dac1466e11a10f13616eebafd5167f49 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Tue, 20 Oct 2009 19:49:23 +0200 Subject: [PATCH 01/20] Increase version number --- __tryton__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/__tryton__.py b/__tryton__.py index 64cb988581..53667b2aa0 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.4.0', + 'version': '1.4.1', 'author': 'B2CK', 'email': 'info@b2ck.com', 'website': 'http://www.tryton.org/', From 2c8f7bbb02e0b796531299fd13e0935efc571480 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Mon, 2 Nov 2009 19:21:45 +0100 Subject: [PATCH 02/20] Fix company context domain when company is not in context (transplanted from e4e4dc8609753b0f1cb6a86883656a53f6362f70) --- order_point.py | 3 ++- purchase_request.py | 4 +++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/order_point.py b/order_point.py index dffe659c98..4af056bfed 100644 --- a/order_point.py +++ b/order_point.py @@ -45,7 +45,8 @@ class OrderPoint(ModelSQL, ModelView): max_quantity = fields.Float('Maximal Quantity', required=True, digits="(16, unit_digits)", depends=['unit_digits']) company = fields.Many2One('company.company', 'Company', required=True, - domain=["('id', '=', context.get('company', 0))"]) + domain=["('id', 'company' in context and '=' or '!=', " \ + "context.get('company', 0))"]) unit = fields.Function('get_unit', type='many2one', relation='product.uom', string='Unit') unit_digits = fields.Function('get_unit_digits', type='integer', diff --git a/purchase_request.py b/purchase_request.py index f7a1580a07..8cb9cfd001 100644 --- a/purchase_request.py +++ b/purchase_request.py @@ -30,7 +30,9 @@ class PurchaseRequest(ModelSQL, ModelView): 'get_purchase', type='many2one', relation='purchase.purchase', string='Purchase') company = fields.Many2One('company.company', 'Company', required=True, - readonly=True, domain=["('id', '=', context.get('company', 0))"]) + readonly=True, domain=[ + "('id', 'company' in context and '=' or '!=', " \ + "context.get('company', 0))"]) origin = fields.Reference('Origin', selection='origin_get', readonly=True, required=True) state = fields.Function( From 54004d92f3b5783e2c35ff487f516f229009d9ae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Tue, 24 Nov 2009 18:27:33 +0100 Subject: [PATCH 03/20] Prepare release 1.4.1 --- CHANGELOG | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index b4765f1bc4..426ce1e3e1 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,6 @@ +Version 1.4.1 - 2009-11-24 +* Some bug fixes (see mercurial logs for details) + Version 1.4.0 - 2009-10-19 * Bug fixes (see mercurial logs for details) From 1097ee021e8cc274f13483458445d5b88137c041 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Tue, 24 Nov 2009 18:27:38 +0100 Subject: [PATCH 04/20] Added tag 1.4.1 for changeset 4874ddcd2a8b --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index c1d6985624..e4ee6f3884 100644 --- a/.hgtags +++ b/.hgtags @@ -1,3 +1,4 @@ bb2bb6af62f06218b0c8c689b24dd16f43307ca1 1.0.0 5b0a8261963f167230f23a1b97c8b38519428143 1.2.0 396ad2807deb26c6c353eb119dc50fd4fdcbb28a 1.4.0 +4874ddcd2a8bc72473df971db1f679359dd53a5a 1.4.1 From c6d8eea70347908cae796881074136ca2ebc7a85 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Tue, 24 Nov 2009 18:28:59 +0100 Subject: [PATCH 05/20] Increase version number --- __tryton__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/__tryton__.py b/__tryton__.py index 53667b2aa0..2ec2f5f5ac 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.4.1', + 'version': '1.4.2', 'author': 'B2CK', 'email': 'info@b2ck.com', 'website': 'http://www.tryton.org/', From 6b0a370efa7f7ef77b1e48e69df272b0a32fd7a4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Mon, 25 Jan 2010 09:35:57 +0100 Subject: [PATCH 06/20] Update COPYRIGHT --- COPYRIGHT | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/COPYRIGHT b/COPYRIGHT index 4451df972a..cca7db9317 100644 --- a/COPYRIGHT +++ b/COPYRIGHT @@ -1,6 +1,6 @@ -Copyright (C) 2008-2009 Cédric Krier. -Copyright (C) 2008-2009 Bertrand Chenal. -Copyright (C) 2008-2009 B2CK SPRL. +Copyright (C) 2008-2010 Cédric Krier. +Copyright (C) 2008-2010 Bertrand Chenal. +Copyright (C) 2008-2010 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 f0af549f9a1eafd571eff020078983a6069a8a10 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Thu, 13 May 2010 15:58:54 +0200 Subject: [PATCH 07/20] Don't include .pyc from tests (transplanted from 5c683cc9207a3d392b04020ca8882d6fa412709d) --- MANIFEST.in | 1 - 1 file changed, 1 deletion(-) diff --git a/MANIFEST.in b/MANIFEST.in index 8b45b8aa0d..dcb2afa6dc 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -8,4 +8,3 @@ include *.xml include *.odt include *.csv include doc/* -include tests/* From 7f552831637313936de62a545e9d1dd8148359e6 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 08/20] Fix wrong context for call of products_by_location for issue1645 (transplanted from 81fa6d523cb2207e06138045587bbeb430aaef45) --- purchase_request.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/purchase_request.py b/purchase_request.py index 8cb9cfd001..1b74835dfa 100644 --- a/purchase_request.py +++ b/purchase_request.py @@ -413,7 +413,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 57cc293a25e58066350f5032a0e90b14514c5caa Mon Sep 17 00:00:00 2001 From: Mathias Behrle Date: Tue, 2 Nov 2010 21:12:57 +0100 Subject: [PATCH 09/20] Prepare release 1.4.2 --- CHANGELOG | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index 426ce1e3e1..15c331fc47 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,6 @@ +Version 1.4.2 - 2010-11-02 +* Bug fixes (see mercurial logs for details) + Version 1.4.1 - 2009-11-24 * Some bug fixes (see mercurial logs for details) From cdc65d030c95f9b92f93f9775e8751479ec60232 Mon Sep 17 00:00:00 2001 From: Mathias Behrle Date: Tue, 2 Nov 2010 21:12:57 +0100 Subject: [PATCH 10/20] Added tag 1.4.2 for changeset e5771b917cb0 --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index e4ee6f3884..aa7040694c 100644 --- a/.hgtags +++ b/.hgtags @@ -2,3 +2,4 @@ bb2bb6af62f06218b0c8c689b24dd16f43307ca1 1.0.0 5b0a8261963f167230f23a1b97c8b38519428143 1.2.0 396ad2807deb26c6c353eb119dc50fd4fdcbb28a 1.4.0 4874ddcd2a8bc72473df971db1f679359dd53a5a 1.4.1 +e5771b917cb0887bbb8a4a2df4aed4ed2c75782b 1.4.2 From 7494dec3018fc7e1a6cc27081790021d21eb931f Mon Sep 17 00:00:00 2001 From: Mathias Behrle Date: Tue, 2 Nov 2010 21:12:58 +0100 Subject: [PATCH 11/20] Increase version number --- __tryton__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/__tryton__.py b/__tryton__.py index 2ec2f5f5ac..c93bf3bc1d 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.4.2', + 'version': '1.4.3', 'author': 'B2CK', 'email': 'info@b2ck.com', 'website': 'http://www.tryton.org/', From 023e7a309f01748ef051ba6e11210b9bf427c4cc 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 12/20] 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 1b74835dfa..d58f55d46f 100644 --- a/purchase_request.py +++ b/purchase_request.py @@ -157,8 +157,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 9c8996b5ab38d5f2b6c12a71fc3a56fd5d72e8e1 Mon Sep 17 00:00:00 2001 From: Mathias Behrle Date: Sat, 1 Oct 2011 13:51:37 +0200 Subject: [PATCH 13/20] 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 3f4119403e1e3ff98c16c60a53b855a9ec5807c4 Mon Sep 17 00:00:00 2001 From: Mathias Behrle Date: Sat, 1 Oct 2011 14:13:52 +0200 Subject: [PATCH 14/20] Prepare release 1.4.3 --- CHANGELOG | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index 15c331fc47..ae75d0e215 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,6 @@ +Version 1.4.3 - 2011-10-01 +* Bug fixes (see mercurial logs for details) + Version 1.4.2 - 2010-11-02 * Bug fixes (see mercurial logs for details) From 2280d565b7c4ba1a44c093422c623264aa5a15bd Mon Sep 17 00:00:00 2001 From: Mathias Behrle Date: Sat, 1 Oct 2011 14:13:52 +0200 Subject: [PATCH 15/20] Added tag 1.4.3 for changeset 4464cd83fb6f --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index aa7040694c..a53571f49f 100644 --- a/.hgtags +++ b/.hgtags @@ -3,3 +3,4 @@ bb2bb6af62f06218b0c8c689b24dd16f43307ca1 1.0.0 396ad2807deb26c6c353eb119dc50fd4fdcbb28a 1.4.0 4874ddcd2a8bc72473df971db1f679359dd53a5a 1.4.1 e5771b917cb0887bbb8a4a2df4aed4ed2c75782b 1.4.2 +4464cd83fb6f9844effc79bd5cfdbd0d4603aa59 1.4.3 From 02c1de4c5c20b3122218e60854ee0e227416bc45 Mon Sep 17 00:00:00 2001 From: Mathias Behrle Date: Sat, 1 Oct 2011 14:13:56 +0200 Subject: [PATCH 16/20] Increase version number --- __tryton__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/__tryton__.py b/__tryton__.py index c93bf3bc1d..b212b8d1a5 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.4.3', + 'version': '1.4.4', 'author': 'B2CK', 'email': 'info@b2ck.com', 'website': 'http://www.tryton.org/', From 9c777b15bca96bf1349792c0519e911b2f88b955 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 17/20] 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 d58f55d46f..7fd44e05b7 100644 --- a/purchase_request.py +++ b/purchase_request.py @@ -3,6 +3,7 @@ from trytond.model import ModelView, ModelSQL, fields from trytond.wizard import Wizard import datetime +from decimal import Decimal class PurchaseRequest(ModelSQL, ModelView): @@ -638,6 +639,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, @@ -655,6 +657,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 010181392a42d6b4f263c0aac98ec063421cc805 Mon Sep 17 00:00:00 2001 From: Mathias Behrle Date: Mon, 7 May 2012 11:03:11 +0200 Subject: [PATCH 18/20] Prepare release 1.4.4 --- CHANGELOG | 3 +++ COPYRIGHT | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index ae75d0e215..976c33cc07 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,6 @@ +Version 1.4.4 - 2012-05-07 +* Bug fixes (see mercurial logs for details) + Version 1.4.3 - 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 3f30cdfd0c328c94a708daa1cdfdfa19bb203269 Mon Sep 17 00:00:00 2001 From: Mathias Behrle Date: Mon, 7 May 2012 11:03:12 +0200 Subject: [PATCH 19/20] Added tag 1.4.4 for changeset 11a8c74ca356 --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index a53571f49f..a79cfdb501 100644 --- a/.hgtags +++ b/.hgtags @@ -4,3 +4,4 @@ bb2bb6af62f06218b0c8c689b24dd16f43307ca1 1.0.0 4874ddcd2a8bc72473df971db1f679359dd53a5a 1.4.1 e5771b917cb0887bbb8a4a2df4aed4ed2c75782b 1.4.2 4464cd83fb6f9844effc79bd5cfdbd0d4603aa59 1.4.3 +11a8c74ca3568e3e222aaacefcbc7a1797b80e56 1.4.4 From 045222cba08bd2bdb796d67d7953e2a8aa0130d1 Mon Sep 17 00:00:00 2001 From: Mathias Behrle Date: Mon, 7 May 2012 11:03:16 +0200 Subject: [PATCH 20/20] Increase version number --- __tryton__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/__tryton__.py b/__tryton__.py index b212b8d1a5..8b91450c00 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.4.4', + 'version': '1.4.5', 'author': 'B2CK', 'email': 'info@b2ck.com', 'website': 'http://www.tryton.org/',