From 66cb0068f52332925426b2d8c3a4348c73d94ef7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Tue, 26 Apr 2011 21:37:36 +0200 Subject: [PATCH 01/10] Increase version number --- __tryton__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/__tryton__.py b/__tryton__.py index 1069ef09ad..ca8e1d5adc 100644 --- a/__tryton__.py +++ b/__tryton__.py @@ -7,7 +7,7 @@ 'name_es_CO': 'Moneda', 'name_es_ES': 'Divisa', 'name_fr_FR': 'Devise', - 'version': '2.0.0', + 'version': '2.0.1', 'author': 'B2CK', 'email': 'info@b2ck.com', 'website': 'http://www.tryton.org/', From 9adf1a0b63c1b029d74f761212d16ac5852b2edb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Tue, 26 Apr 2011 21:36:54 +0200 Subject: [PATCH 02/10] Add missing icons (transplanted from b5e5675e2c00e83c20c663339952e0474765209b) --- icons/__init__.py | 0 setup.py | 2 ++ 2 files changed, 2 insertions(+) create mode 100644 icons/__init__.py diff --git a/icons/__init__.py b/icons/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/setup.py b/setup.py index f18a8a1b8a..d322711f74 100644 --- a/setup.py +++ b/setup.py @@ -31,10 +31,12 @@ setup(name='trytond_currency', packages=[ 'trytond.modules.currency', 'trytond.modules.currency.tests', + 'trytond.modules.currency.icons', ], package_data={ 'trytond.modules.currency': info.get('xml', []) \ + info.get('translation', []), + 'trytond.modules.currency.icons': ['tryton-currency.svg'], }, classifiers=[ 'Development Status :: 5 - Production/Stable', From c2d074316452803396ec3bc34cd63ec5f24b6a14 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Tue, 26 Apr 2011 21:38:52 +0200 Subject: [PATCH 03/10] Prepare release 2.0.1 --- CHANGELOG | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index 26e92a8545..7518ac1be7 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,6 @@ +Version 2.0.1 - 2011-04-26 +* Add missing icons + Version 2.0.0 - 2011-04-26 * Bug fixes (see mercurial logs for details) From 2b67a9541ea2c2fb72df5208ec1edb6a6fa63dbd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Tue, 26 Apr 2011 21:38:57 +0200 Subject: [PATCH 04/10] Added tag 2.0.1 for changeset 125d44f97cfa --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index 8c725a231d..b862c6a880 100644 --- a/.hgtags +++ b/.hgtags @@ -4,3 +4,4 @@ c1f124674fbc1c5e6555c12dadf3ac5e751a5d62 1.4.0 24460c6a7edddd95e3eccd7b5f4dac02f53b7067 1.6.0 35322c65837422ed3c108b002502c28067817246 1.8.0 ed5c39f1c94205aaea8803f634ae848f4328bf4e 2.0.0 +125d44f97cfa66ee873fa1a216a0f60fd95a9ae5 2.0.1 From 32a68675a4c14dab859f1befd1dad0e586781c08 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Wed, 27 Apr 2011 23:48:20 +0200 Subject: [PATCH 05/10] Increase version number --- __tryton__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/__tryton__.py b/__tryton__.py index ca8e1d5adc..d3edabe73b 100644 --- a/__tryton__.py +++ b/__tryton__.py @@ -7,7 +7,7 @@ 'name_es_CO': 'Moneda', 'name_es_ES': 'Divisa', 'name_fr_FR': 'Devise', - 'version': '2.0.1', + 'version': '2.0.2', 'author': 'B2CK', 'email': 'info@b2ck.com', 'website': 'http://www.tryton.org/', From ec228b54882b06331eefa1afa27ce5b060b679bb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Mon, 29 Jul 2013 10:31:28 +0200 Subject: [PATCH 06/10] get_rate must always return a Decimal or int as value issue3311 review987002 (transplanted from c816c3b544a82bfa339d93f6e41d5e6e35e084bb) --- currency.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/currency.py b/currency.py index fbe9d7af7a..09260388e6 100644 --- a/currency.py +++ b/currency.py @@ -149,7 +149,7 @@ class Currency(ModelSQL, ModelView): if rate_ids: res[currency_id] = rate_ids[0] else: - res[currency_id] = 0.0 + res[currency_id] = 0 rate_ids = [x for x in res.values() if x] rates = rate_obj.browse(rate_ids) id2rate = {} From 7232dc1cc6b1e0d9ab42f979057afe13b5009dd6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Thu, 8 Aug 2013 01:45:17 +0200 Subject: [PATCH 07/10] Fix domain concatenation between list and tuple (transplanted from 5c429f621acd3697ac967bf783867cf0dc28553e) --- currency.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/currency.py b/currency.py index 09260388e6..15bba074f7 100644 --- a/currency.py +++ b/currency.py @@ -113,12 +113,12 @@ class Currency(ModelSQL, ModelView): ids = [] field = None for field in ('code', 'numeric_code'): - ids = self.search([(field,) + clause[1:]], limit=1) + ids = self.search([(field,) + tuple(clause[1:])], limit=1) if ids: break if ids: - return [(field,) + clause[1:]] - return [(self._rec_name,) + clause[1:]] + return [(field,) + tuple(clause[1:])] + return [(self._rec_name,) + tuple(clause[1:])] def on_change_with_rate(self, vals): now = datetime.date.today() From 92a8ab8964b3f7ae8575f4ff76569c3fd39f5396 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Tue, 1 Oct 2013 21:28:40 +0200 Subject: [PATCH 08/10] Prepare release 2.0.2 --- CHANGELOG | 3 +++ COPYRIGHT | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 7518ac1be7..322d458b3c 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,6 @@ +Version 2.0.2 - 2013-10-01 +* Bug fixes (see mercurial logs for details) + Version 2.0.1 - 2011-04-26 * Add missing icons 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 e8fa0b3c82e210b0a2dc6d67d81e0f060d620297 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Tue, 1 Oct 2013 21:28:41 +0200 Subject: [PATCH 09/10] Added tag 2.0.2 for changeset 955ea504954c --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index b862c6a880..e67f274eba 100644 --- a/.hgtags +++ b/.hgtags @@ -5,3 +5,4 @@ c1f124674fbc1c5e6555c12dadf3ac5e751a5d62 1.4.0 35322c65837422ed3c108b002502c28067817246 1.8.0 ed5c39f1c94205aaea8803f634ae848f4328bf4e 2.0.0 125d44f97cfa66ee873fa1a216a0f60fd95a9ae5 2.0.1 +955ea504954c234fab0267056c2274687f013f29 2.0.2 From 88709d28b6543dd77e55069a3260965f9158726c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Tue, 1 Oct 2013 21:28:55 +0200 Subject: [PATCH 10/10] Increase version number --- __tryton__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/__tryton__.py b/__tryton__.py index d3edabe73b..6631d8112e 100644 --- a/__tryton__.py +++ b/__tryton__.py @@ -7,7 +7,7 @@ 'name_es_CO': 'Moneda', 'name_es_ES': 'Divisa', 'name_fr_FR': 'Devise', - 'version': '2.0.2', + 'version': '2.0.3', 'author': 'B2CK', 'email': 'info@b2ck.com', 'website': 'http://www.tryton.org/',