From 1cd06d36cd280796adbb4c300306b8afde96bb6f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Tue, 2 Nov 2010 13:43:06 +0100 Subject: [PATCH 01/12] Increase version number --- __tryton__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/__tryton__.py b/__tryton__.py index da5c7caff9..42a6f8b256 100644 --- a/__tryton__.py +++ b/__tryton__.py @@ -6,7 +6,7 @@ 'name_es_CO': 'Previsión de existencias', 'name_es_ES': 'Previsión de existencias', 'name_fr_FR': 'Prévision de stock', - 'version': '1.8.0', + 'version': '1.8.1', 'author': 'B2CK', 'email': 'info@b2ck.com', 'website': 'http://www.tryton.org/', From a2a2c2dc1167b3b9a53f496f03b53c8fb6c6b688 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/12] 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 87595d6a74e7efd8a9a709d1e3c0ec0811b7c81e 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/12] 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 57e4c1a11896edb4ed27c0638ee060cbabea4048 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/12] 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 de04a7996410577148e47a66b6b6a9e1bf5e622b Mon Sep 17 00:00:00 2001 From: Mathias Behrle Date: Sat, 1 Oct 2011 13:50:20 +0200 Subject: [PATCH 05/12] 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 56ee9fb5c87756a84851e69cbd92d39ccf239aa4 Mon Sep 17 00:00:00 2001 From: Mathias Behrle Date: Sat, 1 Oct 2011 14:16:39 +0200 Subject: [PATCH 06/12] Prepare release 1.8.1 --- CHANGELOG | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index 8f6a910162..7704fecad2 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,6 @@ +Version 1.8.1 - 2011-10-01 +* Bug fixes (see mercurial logs for details) + Version 1.8.0 - 2010-11-01 * Bug fixes (see mercurial logs for details) From 26826f1bece0608c5f5493c14c35948703590de5 Mon Sep 17 00:00:00 2001 From: Mathias Behrle Date: Sat, 1 Oct 2011 14:16:39 +0200 Subject: [PATCH 07/12] Added tag 1.8.1 for changeset 4036025cf972 --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index 1c5732907d..128cc257e3 100644 --- a/.hgtags +++ b/.hgtags @@ -2,3 +2,4 @@ b9ba6291ff01f9f6ceaa7685324e385aaad70ed8 1.2.0 ddd1eccfec75e5a7c29f1679e68987ec16c4079b 1.4.0 ec15c191467d843cee84661735d8e6b1a614e87f 1.6.0 3e2d602a2d7bef0d69b99daa0c2c82bc98bbe3f0 1.8.0 +4036025cf972af179d80f547c0db5346282d202e 1.8.1 From 1046bf454b5784d56a225f169e0dde6094930d52 Mon Sep 17 00:00:00 2001 From: Mathias Behrle Date: Sat, 1 Oct 2011 14:16:43 +0200 Subject: [PATCH 08/12] Increase version number --- __tryton__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/__tryton__.py b/__tryton__.py index 42a6f8b256..6031045c08 100644 --- a/__tryton__.py +++ b/__tryton__.py @@ -6,7 +6,7 @@ 'name_es_CO': 'Previsión de existencias', 'name_es_ES': 'Previsión de existencias', 'name_fr_FR': 'Prévision de stock', - 'version': '1.8.1', + 'version': '1.8.2', 'author': 'B2CK', 'email': 'info@b2ck.com', 'website': 'http://www.tryton.org/', From d7492ae98272fdfd5b67560b3542a30349462405 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 09/12] 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 f3642e5fa6..cef012ad5e 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 4c952a4fa8a5b3709a761a9a56a24e2fbbe92a10 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Thu, 2 May 2013 09:51:41 +0200 Subject: [PATCH 10/12] Prepare release 1.8.2 --- CHANGELOG | 3 +++ COPYRIGHT | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 7704fecad2..dce564ed0a 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,6 @@ +Version 1.8.2 - 2013-05-02 +* Bug fixes (see mercurial logs for details) + Version 1.8.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 ae415a140e5a2f1faa1f2d146ed1fbbe75094a39 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Thu, 2 May 2013 09:51:42 +0200 Subject: [PATCH 11/12] Added tag 1.8.2 for changeset 1f5720980c0a --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index 128cc257e3..896f58e961 100644 --- a/.hgtags +++ b/.hgtags @@ -3,3 +3,4 @@ ddd1eccfec75e5a7c29f1679e68987ec16c4079b 1.4.0 ec15c191467d843cee84661735d8e6b1a614e87f 1.6.0 3e2d602a2d7bef0d69b99daa0c2c82bc98bbe3f0 1.8.0 4036025cf972af179d80f547c0db5346282d202e 1.8.1 +1f5720980c0a8538aa247be3061e96f928b98f56 1.8.2 From a0aced628c6be6e7dfa016d3153cdb821b3bf269 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Thu, 2 May 2013 09:51:51 +0200 Subject: [PATCH 12/12] Increase version number --- __tryton__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/__tryton__.py b/__tryton__.py index 6031045c08..2e5313f9b9 100644 --- a/__tryton__.py +++ b/__tryton__.py @@ -6,7 +6,7 @@ 'name_es_CO': 'Previsión de existencias', 'name_es_ES': 'Previsión de existencias', 'name_fr_FR': 'Prévision de stock', - 'version': '1.8.2', + 'version': '1.8.3', 'author': 'B2CK', 'email': 'info@b2ck.com', 'website': 'http://www.tryton.org/',