[tryton-debian-vcs] tryton-modules-analytic-account branch upstream updated. upstream/3.2.0-1-gf6ddc51

[Mathias Behrle]

The following commit has been merged in the upstream branch:
https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi/?p=tryton/tryton-modules-analytic-account.git;a=commitdiff;h=upstream/3.2.0-1-gf6ddc51

commit f6ddc518d57348091f9a919d5962897a26a6e949
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Thu Jul 3 14:35:15 2014 +0200

    Adding upstream version 3.2.1.

diff --git a/CHANGELOG b/CHANGELOG
index 9aabff0..32b259c 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 3.2.1 - 2014-07-02
+* Bug fixes (see mercurial logs for details)
+
 Version 3.2.0 - 2014-04-21
 * Bug fixes (see mercurial logs for details)
 
diff --git a/PKG-INFO b/PKG-INFO
index acbe699..3b767d5 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: trytond_analytic_account
-Version: 3.2.0
+Version: 3.2.1
 Summary: Tryton module for analytic accounting
 Home-page: http://www.tryton.org/
 Author: Tryton
diff --git a/account.py b/account.py
index d984948..acb1061 100644
--- a/account.py
+++ b/account.py
@@ -162,6 +162,9 @@ class Account(ModelSQL, ModelView):
         id2currency = {}
         for account_id, sum, currency_id in cursor.fetchall():
             account_sum.setdefault(account_id, Decimal('0.0'))
+            # SQLite uses float for SUM
+            if not isinstance(sum, Decimal):
+                sum = Decimal(str(sum))
             if currency_id != id2account[account_id].currency.id:
                 currency = None
                 if currency_id in id2currency:
@@ -235,6 +238,9 @@ class Account(ModelSQL, ModelView):
 
         id2currency = {}
         for account_id, sum, currency_id in cursor.fetchall():
+            # SQLite uses float for SUM
+            if not isinstance(sum, Decimal):
+                sum = Decimal(str(sum))
             if currency_id != id2account[account_id].currency.id:
                 currency = None
                 if currency_id in id2currency:
diff --git a/tryton.cfg b/tryton.cfg
index f96fb75..9bc8e4d 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
 [tryton]
-version=3.2.0
+version=3.2.1
 depends:
     account
     company
diff --git a/trytond_analytic_account.egg-info/PKG-INFO b/trytond_analytic_account.egg-info/PKG-INFO
index eb192f4..1588944 100644
--- a/trytond_analytic_account.egg-info/PKG-INFO
+++ b/trytond_analytic_account.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: trytond-analytic-account
-Version: 3.2.0
+Version: 3.2.1
 Summary: Tryton module for analytic accounting
 Home-page: http://www.tryton.org/
 Author: Tryton
-- 
tryton-modules-analytic-account