From bfa2a2fc5b349804bc5abf7d890900de1d8a074c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Wed, 12 May 2010 20:03:18 +0200 Subject: [PATCH 1/8] Increase version number --- __tryton__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/__tryton__.py b/__tryton__.py index 93b6fe0e2e..6eaf696db5 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.6.0', + 'version': '1.6.1', 'author': 'B2CK', 'email': 'info@b2ck.com', 'website': 'http://www.tryton.org/', From ca8f1815513d8e776a5e8c0c8cfae0a1be268944 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 2/8] 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 8c780ae0e1..21fd05cb25 100644 --- a/forecast.py +++ b/forecast.py @@ -273,7 +273,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 9b17304a3acc0bc1166fe5b9dc80d5cb7f26adad 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 3/8] 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 21fd05cb25..044604f363 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 6beba4944689d670404c331de22773da5f039dfc 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 4/8] 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 044604f363..8c2ea007f0 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 8137afd118ea5918d174e98a9d0f68e83605e70a Mon Sep 17 00:00:00 2001 From: Mathias Behrle Date: Sat, 1 Oct 2011 13:49:29 +0200 Subject: [PATCH 5/8] 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 238f0f5be8acb4912869acec0930b851a3d76877 Mon Sep 17 00:00:00 2001 From: Mathias Behrle Date: Sat, 1 Oct 2011 14:15:08 +0200 Subject: [PATCH 6/8] Prepare release 1.6.1 --- CHANGELOG | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index df6494ecab..3744333d6a 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,6 @@ +Version 1.6.1 - 2011-10-01 +* Bug fixes (see mercurial logs for details) + Version 1.6.0 - 2010-05-12 * Bug fixes (see mercurial logs for details) * Add default search value on forecast From fdf7b9ba35edcae0968bc15b9c9c48a00e88d725 Mon Sep 17 00:00:00 2001 From: Mathias Behrle Date: Sat, 1 Oct 2011 14:15:08 +0200 Subject: [PATCH 7/8] Added tag 1.6.1 for changeset f36ec07e8578 --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index b615737cd5..003b201509 100644 --- a/.hgtags +++ b/.hgtags @@ -1,3 +1,4 @@ b9ba6291ff01f9f6ceaa7685324e385aaad70ed8 1.2.0 ddd1eccfec75e5a7c29f1679e68987ec16c4079b 1.4.0 ec15c191467d843cee84661735d8e6b1a614e87f 1.6.0 +f36ec07e8578bd37c0e9f065cf9511d7fa8aa795 1.6.1 From 7c746d8ab58ed5915dc9ccbb07704364d4d52dd7 Mon Sep 17 00:00:00 2001 From: Mathias Behrle Date: Sat, 1 Oct 2011 14:15:14 +0200 Subject: [PATCH 8/8] Increase version number --- __tryton__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/__tryton__.py b/__tryton__.py index 6eaf696db5..f8ffbd5e8c 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.6.1', + 'version': '1.6.2', 'author': 'B2CK', 'email': 'info@b2ck.com', 'website': 'http://www.tryton.org/',