From fe94e4d6c5e61bfc4e3daf4d28e997a1bc954d98 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Wed, 27 Apr 2011 23:48:46 +0200 Subject: [PATCH 01/11] Increase version number --- __tryton__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/__tryton__.py b/__tryton__.py index 0aae814503..bea216c1e7 100644 --- a/__tryton__.py +++ b/__tryton__.py @@ -7,7 +7,7 @@ 'name_es_CO': 'Previsión de existencias', 'name_es_ES': 'Previsión de existencias', 'name_fr_FR': 'Prévision de stock', - 'version': '2.0.0', + 'version': '2.0.1', 'author': 'B2CK', 'email': 'info@b2ck.com', 'website': 'http://www.tryton.org/', From 79e5940a6f75539ea8d0e57bfde7c53c585c43d1 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 02/11] 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 311fb741fb..0eaad0c3da 100644 --- a/forecast.py +++ b/forecast.py @@ -268,7 +268,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, }) moves.append(('add',mid)) From 9b64cd7501604a1b5f324f5cddb1480303f7cc3e 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 03/11] 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 0eaad0c3da..698162fe49 100644 --- a/forecast.py +++ b/forecast.py @@ -106,7 +106,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 647ba4f2c70d060f7bc89334144165bce6efab9f 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 04/11] 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 698162fe49..6909623819 100644 --- a/forecast.py +++ b/forecast.py @@ -100,12 +100,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 6f416944c58c634b9789712fe8bdd7ca99039913 Mon Sep 17 00:00:00 2001 From: Mathias Behrle Date: Sat, 1 Oct 2011 14:18:07 +0200 Subject: [PATCH 05/11] Prepare release 2.0.1 --- CHANGELOG | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index 663b1f802b..f4c91abf00 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,6 @@ +Version 2.0.1 - 2011-10-01 +* Bug fixes (see mercurial logs for details) + Version 2.0.0 - 2011-04-27 * Bug fixes (see mercurial logs for details) From 19bdf2f46e09e0dc5af21b23402025939e12abdd Mon Sep 17 00:00:00 2001 From: Mathias Behrle Date: Sat, 1 Oct 2011 14:18:07 +0200 Subject: [PATCH 06/11] Added tag 2.0.1 for changeset aa5a096e654f --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index 49a19480e0..a8fa8c3863 100644 --- a/.hgtags +++ b/.hgtags @@ -3,3 +3,4 @@ ddd1eccfec75e5a7c29f1679e68987ec16c4079b 1.4.0 ec15c191467d843cee84661735d8e6b1a614e87f 1.6.0 3e2d602a2d7bef0d69b99daa0c2c82bc98bbe3f0 1.8.0 a0bef2c542a5d734e6a7f9d7984e945156cf5be2 2.0.0 +aa5a096e654fe30ee3754acd76007710093139d1 2.0.1 From bb77cd22e6b4e18529205abdc167ae77801fd3c4 Mon Sep 17 00:00:00 2001 From: Mathias Behrle Date: Sat, 1 Oct 2011 14:18:11 +0200 Subject: [PATCH 07/11] Increase version number --- __tryton__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/__tryton__.py b/__tryton__.py index bea216c1e7..c95ae00d9f 100644 --- a/__tryton__.py +++ b/__tryton__.py @@ -7,7 +7,7 @@ 'name_es_CO': 'Previsión de existencias', 'name_es_ES': 'Previsión de existencias', 'name_fr_FR': 'Prévision de stock', - 'version': '2.0.1', + 'version': '2.0.2', 'author': 'B2CK', 'email': 'info@b2ck.com', 'website': 'http://www.tryton.org/', From 2fc0608fcf0f943316d0502fe2adc2126bd764bd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Sun, 24 Feb 2013 16:21:33 +0100 Subject: [PATCH 08/11] Add missing download_url in setup.py (transplanted from f7a0b0abea90b891003fc69c7ce7b58ddb247383) --- setup.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/setup.py b/setup.py index 5fa9e7cc6f..d2c35133d1 100644 --- a/setup.py +++ b/setup.py @@ -25,6 +25,8 @@ setup(name='trytond_stock_forecast', author=info.get('author', ''), author_email=info.get('email', ''), url=info.get('website', ''), + download_url=("http://downloads.tryton.org/" + + info.get('version', '0.0.1').rsplit('.', 1)[0] + '/'), package_dir={'trytond.modules.stock_forecast': '.'}, packages=[ 'trytond.modules.stock_forecast', From 85d49436fe61f408298359020c645d52cd2cede0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Thu, 2 May 2013 09:57:52 +0200 Subject: [PATCH 09/11] Prepare release 2.0.2 --- CHANGELOG | 3 +++ COPYRIGHT | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index f4c91abf00..5d3549de2c 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,6 @@ +Version 2.0.2 - 2013-05-02 +* Bug fixes (see mercurial logs for details) + Version 2.0.1 - 2011-10-01 * Bug fixes (see mercurial logs for details) diff --git a/COPYRIGHT b/COPYRIGHT index 3d2324bfb3..da9ef80516 100644 --- a/COPYRIGHT +++ b/COPYRIGHT @@ -1,6 +1,6 @@ -Copyright (C) 2008-2011 Cédric Krier. +Copyright (C) 2008-2013 Cédric Krier. Copyright (C) 2008-2011 Bertrand Chenal. -Copyright (C) 2008-2011 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 f067db99da83431d0228ce525f996c5230a7aad9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Thu, 2 May 2013 09:57:53 +0200 Subject: [PATCH 10/11] Added tag 2.0.2 for changeset 2047abaea006 --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index a8fa8c3863..6be823b558 100644 --- a/.hgtags +++ b/.hgtags @@ -4,3 +4,4 @@ ec15c191467d843cee84661735d8e6b1a614e87f 1.6.0 3e2d602a2d7bef0d69b99daa0c2c82bc98bbe3f0 1.8.0 a0bef2c542a5d734e6a7f9d7984e945156cf5be2 2.0.0 aa5a096e654fe30ee3754acd76007710093139d1 2.0.1 +2047abaea006dc721c423d4fb66f1c4ce18e38fc 2.0.2 From 69dfbf326a4feaf68a328893518086f600f5e346 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Thu, 2 May 2013 09:58:03 +0200 Subject: [PATCH 11/11] Increase version number --- __tryton__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/__tryton__.py b/__tryton__.py index c95ae00d9f..a9db7f919a 100644 --- a/__tryton__.py +++ b/__tryton__.py @@ -7,7 +7,7 @@ 'name_es_CO': 'Previsión de existencias', 'name_es_ES': 'Previsión de existencias', 'name_fr_FR': 'Prévision de stock', - 'version': '2.0.2', + 'version': '2.0.3', 'author': 'B2CK', 'email': 'info@b2ck.com', 'website': 'http://www.tryton.org/',