From 024a29981c10c1a073aaf7a5ace5f31650d810fb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Mon, 10 Aug 2009 12:22:57 +0200 Subject: [PATCH 01/15] Increase version number --- __tryton__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/__tryton__.py b/__tryton__.py index 85fa15a3cf..b28acbc3d1 100644 --- a/__tryton__.py +++ b/__tryton__.py @@ -6,7 +6,7 @@ 'name_de_DE': 'Lagerverwaltung Bedarfsermittlung', 'name_es_ES': 'Previsión de existencias', 'name_es_CO': 'Previsión de existencias', - 'version': '1.2.0', + 'version': '1.2.1', 'author': 'B2CK', 'email': 'info@b2ck.com', 'website': 'http://www.tryton.org/', From 6443144a32fee9d626fa0439400b4287ea712068 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Mon, 25 Jan 2010 09:46:57 +0100 Subject: [PATCH 02/15] 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 2496f93e0a0d978a30b1c686be7c9493e217fc9a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Fri, 12 Mar 2010 15:57:02 +0100 Subject: [PATCH 03/15] Add missing zip_safe and entry_points in setup.py (transplanted from cb5be2d48b7f7909d3cfd75f1e3f00e5b8f3525b) --- setup.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/setup.py b/setup.py index 88a74c83be..11f9a46488 100644 --- a/setup.py +++ b/setup.py @@ -48,4 +48,9 @@ setup(name='trytond_stock_forecast', ], license='GPL-3', install_requires=requires, + zip_safe=False, + entry_points=""" + [trytond.modules] + stock = trytond.modules.stock_forecast + """, ) From 832d35d016663bbc95a9cd657e11327a7c0c1d12 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Fri, 12 Mar 2010 15:58:50 +0100 Subject: [PATCH 04/15] Fix typo in entry_points (transplanted from ecadbe3e0f75a602978820b68b089533e04fa6b8) --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 11f9a46488..1c5e350000 100644 --- a/setup.py +++ b/setup.py @@ -51,6 +51,6 @@ setup(name='trytond_stock_forecast', zip_safe=False, entry_points=""" [trytond.modules] - stock = trytond.modules.stock_forecast + stock_forecast = trytond.modules.stock_forecast """, ) From abfbdb6bd8e885d46962092802c26b9868fc242d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Fri, 12 Mar 2010 18:07:48 +0100 Subject: [PATCH 05/15] Add missing on_change_uom to update unit_digits for issue1437 (transplanted from 3939c88b1a514cf28fb9429cc10cf634bbf6b00b) --- forecast.py | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/forecast.py b/forecast.py index c3f24245d4..aca5ce4039 100644 --- a/forecast.py +++ b/forecast.py @@ -166,7 +166,8 @@ class ForecastLine(ModelSQL, ModelView): domain=[('type', '=', 'stockable')], on_change=['product']) uom = fields.Many2One( 'product.uom', 'UOM', required=True, - domain="[('category', '=', (product, 'product.default_uom.category'))]") + domain="[('category', '=', (product, 'product.default_uom.category'))]", + on_change=['uom']) unit_digits = fields.Function('get_unit_digits', type='integer', string='Unit Digits') quantity = fields.Float('Quantity', digits="(16, unit_digits)", required=True) @@ -208,6 +209,15 @@ class ForecastLine(ModelSQL, ModelView): res['unit_digits'] = product.default_uom.digits return res + def on_change_uom(self, cursor, user, ids, vals, context=None): + uom_obj = self.pool.get('product.uom') + res = {} + res['unit_digits'] = 2 + if vals.get('uom'): + uom = uom_obj.browse(cursor, user, vals['uom'], context=context) + res['unit_digits'] = uom.digits + return res + def get_unit_digits(self, cursor, user, ids, name, arg, context=None): res = {} for line in self.browse(cursor, user, ids, context=context): From c358f45b49b26c04f98df5d272791e673822008e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Wed, 31 Mar 2010 15:43:20 +0200 Subject: [PATCH 06/15] Prepare release 1.2.1 --- CHANGELOG | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index 46e7dbaf4c..7af6ad56d4 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,2 +1,5 @@ +Version 1.2.1 - 2010-03-31 +* Some bug fixes (see mercurial logs for details) + Version 1.2.0 - 2009-08-10 * Initial release From 0b556d0ef29f347c4ab77e2477972f24824cd51d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Wed, 31 Mar 2010 15:43:24 +0200 Subject: [PATCH 07/15] Added tag 1.2.1 for changeset b98c22044022 --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index 6a3e6a98a8..85734af2e2 100644 --- a/.hgtags +++ b/.hgtags @@ -1 +1,2 @@ b9ba6291ff01f9f6ceaa7685324e385aaad70ed8 1.2.0 +b98c22044022c77e376de6a4ae6f3a21f4f6e353 1.2.1 From a11199b5f7994042827b48b66e0f9735fdcc4f48 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Wed, 31 Mar 2010 15:45:45 +0200 Subject: [PATCH 08/15] Increase version number --- __tryton__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/__tryton__.py b/__tryton__.py index b28acbc3d1..7c4c5c9b9d 100644 --- a/__tryton__.py +++ b/__tryton__.py @@ -6,7 +6,7 @@ 'name_de_DE': 'Lagerverwaltung Bedarfsermittlung', 'name_es_ES': 'Previsión de existencias', 'name_es_CO': 'Previsión de existencias', - 'version': '1.2.1', + 'version': '1.2.2', 'author': 'B2CK', 'email': 'info@b2ck.com', 'website': 'http://www.tryton.org/', From bb83b87a34bd15e3d7ceda696c9e1a8a3e66145b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Mon, 25 Jul 2011 16:15:16 +0200 Subject: [PATCH 09/15] Use id of currency instead of the BrowseRecord as value of create (transplanted from 2070ef01e8f68eafef48aa4b3787db9515beb1b9) --- forecast.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/forecast.py b/forecast.py index aca5ce4039..8afa300455 100644 --- a/forecast.py +++ b/forecast.py @@ -260,7 +260,7 @@ class ForecastLine(ModelSQL, ModelView): 'quantity': qty * line.minimal_quantity, 'planned_date': line.forecast.from_date + datetime.timedelta(day), 'company': line.forecast.company.id, - 'currency':line.forecast.company.currency, + 'currency':line.forecast.company.currency.id, 'unit_price': unit_price, }, context=context) From d49321acdfe61d0cd3740edc20d18ed8bc365a20 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Sun, 31 Jul 2011 17:13:46 +0200 Subject: [PATCH 10/15] Fix rowcount usage review68001 (transplanted from 14c066caee18aec33bf9710324aefe4559433b20) --- forecast.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/forecast.py b/forecast.py index 8afa300455..8d21d48bb0 100644 --- a/forecast.py +++ b/forecast.py @@ -95,7 +95,10 @@ class Forecast(ModelWorkflow, ModelSQL, ModelView): forecast.from_date, forecast.to_date, forecast.location.id, forecast.destination.id, forecast.id)) - if cursor.rowcount: + rowcount = cursor.rowcount + if rowcount == -1 or rowcount is None: + rowcount = len(cursor.fetchall()) + if rowcount: return False return True From e18ddd71a6525f2f71cb03f0274a042282d607e4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Sun, 31 Jul 2011 17:14:55 +0200 Subject: [PATCH 11/15] Add missing test on company review69001 (transplanted from 6b2d59dfa78ee995d382eb6c5aeef545cddceeb7) --- forecast.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/forecast.py b/forecast.py index 8d21d48bb0..f3dda4049a 100644 --- a/forecast.py +++ b/forecast.py @@ -89,12 +89,13 @@ class Forecast(ModelWorkflow, ModelSQL, ModelView): 'AND location = %s ' \ 'AND destination = %s ' \ 'AND state = \'done\' ' \ + 'AND company = %s ' 'AND id != %s', (forecast.from_date, forecast.from_date, forecast.to_date, forecast.to_date, forecast.from_date, forecast.to_date, forecast.location.id, forecast.destination.id, - forecast.id)) + forecast.company.id, forecast.id)) rowcount = cursor.rowcount if rowcount == -1 or rowcount is None: rowcount = len(cursor.fetchall()) From b004888bd6cc7028256efbf9259f0c75830406f9 Mon Sep 17 00:00:00 2001 From: Mathias Behrle Date: Sat, 1 Oct 2011 13:47:55 +0200 Subject: [PATCH 12/15] 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 7105f9f8b40b8c8aba54597a3fd890257fd56a85 Mon Sep 17 00:00:00 2001 From: Mathias Behrle Date: Sat, 1 Oct 2011 14:12:38 +0200 Subject: [PATCH 13/15] Prepare release 1.2.2 --- CHANGELOG | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index 7af6ad56d4..58990c12b2 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,6 @@ +Version 1.2.2 - 2011-10-01 +* Bug fixes (see mercurial logs for details) + Version 1.2.1 - 2010-03-31 * Some bug fixes (see mercurial logs for details) From 8b0066ec913064c88b6db03e2d9b69a089922e88 Mon Sep 17 00:00:00 2001 From: Mathias Behrle Date: Sat, 1 Oct 2011 14:12:38 +0200 Subject: [PATCH 14/15] Added tag 1.2.2 for changeset 26f07fb16ec4 --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index 85734af2e2..721c5a4d40 100644 --- a/.hgtags +++ b/.hgtags @@ -1,2 +1,3 @@ b9ba6291ff01f9f6ceaa7685324e385aaad70ed8 1.2.0 b98c22044022c77e376de6a4ae6f3a21f4f6e353 1.2.1 +26f07fb16ec4ea371b497c64100c5c2b61b8829e 1.2.2 From 5be9b50c26b56945afd9ebe4fe48efe49cd4ca76 Mon Sep 17 00:00:00 2001 From: Mathias Behrle Date: Sat, 1 Oct 2011 14:12:46 +0200 Subject: [PATCH 15/15] Increase version number --- __tryton__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/__tryton__.py b/__tryton__.py index 7c4c5c9b9d..30b3710447 100644 --- a/__tryton__.py +++ b/__tryton__.py @@ -6,7 +6,7 @@ 'name_de_DE': 'Lagerverwaltung Bedarfsermittlung', 'name_es_ES': 'Previsión de existencias', 'name_es_CO': 'Previsión de existencias', - 'version': '1.2.2', + 'version': '1.2.3', 'author': 'B2CK', 'email': 'info@b2ck.com', 'website': 'http://www.tryton.org/',