[tryton-debian-vcs] tryton-modules-currency branch upstream-2.2 created. 4ef23506d92c5ea3c95a131cb1bf9c6948256d01

[Mathias Behrle]

The following commit has been merged in the upstream-2.2 branch:
https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi/?p=tryton/tryton-modules-currency.git;a=commitdiff;h=4ef23506d92c5ea3c95a131cb1bf9c6948256d01
commit 4ef23506d92c5ea3c95a131cb1bf9c6948256d01
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Thu Oct 17 12:41:44 2013 +0200

    Adding upstream version 2.2.2.

diff --git a/CHANGELOG b/CHANGELOG
index 78397d8..5ceafd2 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 2.2.2 - 2013-10-01
+* Bug fixes (see mercurial logs for details)
+
 Version 2.2.1 - 2011-12-26
 * Bug fixes (see mercurial logs for details)
 
diff --git a/COPYRIGHT b/COPYRIGHT
index 3d2324b..da9ef80 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
diff --git a/PKG-INFO b/PKG-INFO
index b4c5d3a..ab20bfc 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: trytond_currency
-Version: 2.2.1
+Version: 2.2.2
 Summary: Define currencies and exchange rate.
 Allow to customize the formatting of the currency amount.
 
diff --git a/__tryton__.py b/__tryton__.py
index 60d2a5a..b214cd4 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.2.1',
+    'version': '2.2.2',
     'author': 'B2CK',
     'email': 'info at b2ck.com',
     'website': 'http://www.tryton.org/',
diff --git a/currency.py b/currency.py
index dda2b52..95882b6 100644
--- a/currency.py
+++ b/currency.py
@@ -114,12 +114,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()
@@ -150,7 +150,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 = {}
diff --git a/trytond_currency.egg-info/PKG-INFO b/trytond_currency.egg-info/PKG-INFO
index e706a2a..a6af9ff 100644
--- a/trytond_currency.egg-info/PKG-INFO
+++ b/trytond_currency.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: trytond-currency
-Version: 2.2.1
+Version: 2.2.2
 Summary: Define currencies and exchange rate.
 Allow to customize the formatting of the currency amount.
 
-- 
tryton-modules-currency