[tryton-debian-vcs] tryton-modules-currency branch upstream-2.6 created. 86b4df6cadc72dbeaaa0a5467324b8beb212d270

[Mathias Behrle]

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

    Adding upstream version 2.6.2.

diff --git a/CHANGELOG b/CHANGELOG
index 0f9464e..87b6b87 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 2.6.2 - 2013-10-01
+* Bug fixes (see mercurial logs for details)
+
 Version 2.6.1 - 2012-11-05
 * Bug fixes (see mercurial logs for details)
 
diff --git a/COPYRIGHT b/COPYRIGHT
index 2057c72..d7165c7 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,6 +1,6 @@
-Copyright (C) 2008-2012 Cédric Krier.
+Copyright (C) 2008-2013 Cédric Krier.
 Copyright (C) 2008-2012 Bertrand Chenal.
-Copyright (C) 2008-2012 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 c34ac53..659f2dc 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: trytond_currency
-Version: 2.6.1
+Version: 2.6.2
 Summary: Tryton module with currencies
 Home-page: http://www.tryton.org/
 Author: Tryton
diff --git a/currency.py b/currency.py
index 618bd8e..9413411 100644
--- a/currency.py
+++ b/currency.py
@@ -132,12 +132,12 @@ class Currency(ModelSQL, ModelView):
         currencies = None
         field = None
         for field in ('code', 'numeric_code'):
-            currencies = cls.search([(field,) + clause[1:]], limit=1)
+            currencies = cls.search([(field,) + tuple(clause[1:])], limit=1)
             if currencies:
                 break
         if currencies:
-            return [(field,) + clause[1:]]
-        return [(cls._rec_name,) + clause[1:]]
+            return [(field,) + tuple(clause[1:])]
+        return [(cls._rec_name,) + tuple(clause[1:])]
 
     def on_change_with_rate(self):
         now = datetime.date.today()
@@ -169,7 +169,7 @@ class Currency(ModelSQL, ModelView):
             if rates:
                 res[currency.id] = rates[0].id
             else:
-                res[currency.id] = 0.0
+                res[currency.id] = 0
         rate_ids = [x for x in res.values() if x]
         rates = Rate.browse(rate_ids)
         id2rate = {}
diff --git a/tryton.cfg b/tryton.cfg
index d5cade1..dba7ce6 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
 [tryton]
-version=2.6.1
+version=2.6.2
 depends:
     ir
     res
diff --git a/trytond_currency.egg-info/PKG-INFO b/trytond_currency.egg-info/PKG-INFO
index f70d1d8..483c337 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.6.1
+Version: 2.6.2
 Summary: Tryton module with currencies
 Home-page: http://www.tryton.org/
 Author: Tryton
-- 
tryton-modules-currency