From b355730549e5b50d7213fb1b0b58b7068d808a19 Mon Sep 17 00:00:00 2001 From: Bertrand Chenal Date: Fri, 26 Jun 2009 00:28:33 +0200 Subject: [PATCH 01/17] Update doc to reflect packing>shipment renaming --- doc/index.rst | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/doc/index.rst b/doc/index.rst index 48cfd7d9d7..fb872ef0c9 100644 --- a/doc/index.rst +++ b/doc/index.rst @@ -53,7 +53,7 @@ can be: An Internal order point is defined on a Storage location, it also define a provisioning location. If the minimum quantity is reached - it will result in the creation of an internal packing between the + it will result in the creation of an internal shipment between the provisioning location and the Storage location. * Purchase @@ -62,8 +62,8 @@ can be: minimal quantity is reached on the warehouse it will result in a purchase request. -The internal packings and purchase requests are created by schedulers -with respect to stock levels and existing packings and requests. The +The internal shipments and purchase requests are created by schedulers +with respect to stock levels and existing shipments and requests. The stock levels are computed between the next two supply dates. If the stock level of a product without order point on the given warehouse is below zero, a purchase request is also created. From bc64c3d9e82a84a3ddf644c10ef0d0b748b91426 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Tue, 7 Jul 2009 11:21:01 +0200 Subject: [PATCH 02/17] Increase version number --- __tryton__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/__tryton__.py b/__tryton__.py index b67c651962..5c44d7c5c1 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 pedidos de inventario', 'name_fr_FR': 'Gestion des approvisionnements de stock', - 'version': '1.2.0', + 'version': '1.2.1', 'author': 'B2CK', 'email': 'info@b2ck.com', 'website': 'http://www.tryton.org/', From 97f446c9ee08048df21436d62de4825a917d28cd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Mon, 27 Jul 2009 16:49:37 +0200 Subject: [PATCH 03/17] Remove version from INSTALL, it is in setup.py --- INSTALL | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/INSTALL b/INSTALL index 3c5d515656..1134d9d736 100644 --- a/INSTALL +++ b/INSTALL @@ -5,7 +5,7 @@ Prerequisites ------------- * Python 2.4 or later (http://www.python.org/) - * trytond 1.1.x (http://www.tryton.org/) + * trytond (http://www.tryton.org/) * trytond_party (http://www.tryton.org/) * trytond_product (http://www.tryton.org/) * trytond_stock (http://www.tryton.org/) From c3ac965e4bfb436e76995301fee4e6331c07e378 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 04/17] 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 2472908541..27999214d9 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 5bc704d846..a140745d89 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 4966bdd52d1f0c8bb3d6786af79ea0243ad45304 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Tue, 24 Nov 2009 18:30:07 +0100 Subject: [PATCH 05/17] Prepare release 1.2.1 --- CHANGELOG | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index d28f483b7f..6318106c47 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,6 @@ +Version 1.2.1 - 2009-11-24 +* Some bug fixes (see mercurial logs for details) + Version 1.2.0 - 2009-04-20 * Bug fixes (see mercurial logs for details) * Allow egg installation From 30e790269b8fd786ff0d427948d258e4223255d1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Tue, 24 Nov 2009 18:30:11 +0100 Subject: [PATCH 06/17] Added tag 1.2.1 for changeset 4eafc03f0834 --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index 8494a06f17..b33e3a2f75 100644 --- a/.hgtags +++ b/.hgtags @@ -1,2 +1,3 @@ bb2bb6af62f06218b0c8c689b24dd16f43307ca1 1.0.0 5b0a8261963f167230f23a1b97c8b38519428143 1.2.0 +4eafc03f0834a1e26cef9174b66bf00fbd6b83ba 1.2.1 From 95897c85a5552289e335dc974961d2c727df7c6e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Tue, 24 Nov 2009 18:31:23 +0100 Subject: [PATCH 07/17] Increase version number --- __tryton__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/__tryton__.py b/__tryton__.py index 5c44d7c5c1..1bfa1dec2f 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 pedidos de inventario', 'name_fr_FR': 'Gestion des approvisionnements de stock', - 'version': '1.2.1', + 'version': '1.2.2', 'author': 'B2CK', 'email': 'info@b2ck.com', 'website': 'http://www.tryton.org/', From 073d30fa6e7d9b05610b499aea53e5c97bf6310f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Mon, 25 Jan 2010 09:48:02 +0100 Subject: [PATCH 08/17] 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 cfde328721226ac14ff39c041c6b6aedc6bb73af 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 09/17] 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 a140745d89..46e747f512 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 f2127426ad33a7a3db28ff6b73cd8a1aac3d64b5 Mon Sep 17 00:00:00 2001 From: Mathias Behrle Date: Tue, 2 Nov 2010 21:12:01 +0100 Subject: [PATCH 10/17] Prepare release 1.2.2 --- CHANGELOG | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index 6318106c47..b88fe72598 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,6 @@ +Version 1.2.2 - 2010-11-02 +* Bug fixes (see mercurial logs for details) + Version 1.2.1 - 2009-11-24 * Some bug fixes (see mercurial logs for details) From 6741afb9515475f275941fdc415ef6f6d1151f4a Mon Sep 17 00:00:00 2001 From: Mathias Behrle Date: Tue, 2 Nov 2010 21:12:02 +0100 Subject: [PATCH 11/17] Added tag 1.2.2 for changeset 71be729de0a7 --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index b33e3a2f75..47ff902329 100644 --- a/.hgtags +++ b/.hgtags @@ -1,3 +1,4 @@ bb2bb6af62f06218b0c8c689b24dd16f43307ca1 1.0.0 5b0a8261963f167230f23a1b97c8b38519428143 1.2.0 4eafc03f0834a1e26cef9174b66bf00fbd6b83ba 1.2.1 +71be729de0a7cb0bd53a6063fe7be3d1664efb97 1.2.2 From edefb08c298ae7a1b5014e247cfa79f7751a4f2c Mon Sep 17 00:00:00 2001 From: Mathias Behrle Date: Tue, 2 Nov 2010 21:12:03 +0100 Subject: [PATCH 12/17] Increase version number --- __tryton__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/__tryton__.py b/__tryton__.py index 1bfa1dec2f..99794ec0b9 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 pedidos de inventario', 'name_fr_FR': 'Gestion des approvisionnements de stock', - 'version': '1.2.2', + 'version': '1.2.3', 'author': 'B2CK', 'email': 'info@b2ck.com', 'website': 'http://www.tryton.org/', From 11ff21125c737c9e2763fcdea542d3eda29f47f1 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 13/17] 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 46e747f512..064dd056e4 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 a60456edf4608bc790e3bb052648031107391f7d Mon Sep 17 00:00:00 2001 From: Mathias Behrle Date: Sat, 1 Oct 2011 13:51:06 +0200 Subject: [PATCH 14/17] 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 4d45b6787bf5e90fc91d822297a8f661efce086c Mon Sep 17 00:00:00 2001 From: Mathias Behrle Date: Sat, 1 Oct 2011 14:12:46 +0200 Subject: [PATCH 15/17] Prepare release 1.2.3 --- CHANGELOG | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index b88fe72598..58154b9a89 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,6 @@ +Version 1.2.3 - 2011-10-01 +* Bug fixes (see mercurial logs for details) + Version 1.2.2 - 2010-11-02 * Bug fixes (see mercurial logs for details) From 068211013a8cf3819240026563edf0918e3540c9 Mon Sep 17 00:00:00 2001 From: Mathias Behrle Date: Sat, 1 Oct 2011 14:12:47 +0200 Subject: [PATCH 16/17] Added tag 1.2.3 for changeset ca48a9a46aeb --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index 47ff902329..a2870636e4 100644 --- a/.hgtags +++ b/.hgtags @@ -2,3 +2,4 @@ bb2bb6af62f06218b0c8c689b24dd16f43307ca1 1.0.0 5b0a8261963f167230f23a1b97c8b38519428143 1.2.0 4eafc03f0834a1e26cef9174b66bf00fbd6b83ba 1.2.1 71be729de0a7cb0bd53a6063fe7be3d1664efb97 1.2.2 +ca48a9a46aebc64f1706fb0a0d6373ea368b9d48 1.2.3 From 0d8ba9bc889854f51e6ec7dfde9bda333a39d7ad Mon Sep 17 00:00:00 2001 From: Mathias Behrle Date: Sat, 1 Oct 2011 14:12:52 +0200 Subject: [PATCH 17/17] Increase version number --- __tryton__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/__tryton__.py b/__tryton__.py index 99794ec0b9..7ec83d5bc9 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 pedidos de inventario', 'name_fr_FR': 'Gestion des approvisionnements de stock', - 'version': '1.2.3', + 'version': '1.2.4', 'author': 'B2CK', 'email': 'info@b2ck.com', 'website': 'http://www.tryton.org/',