[tryton-debian-vcs] tryton-modules-analytic-account branch upstream-2.6 updated. upstream/2.6.1-1-g4c386df

[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-analytic-account.git;a=commitdiff;h=upstream/2.6.1-1-g4c386df

commit 4c386df40a1da265187b56214e8ae7385881f5ab
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Thu Jul 3 14:38:17 2014 +0200

    Adding upstream version 2.6.2.

diff --git a/CHANGELOG b/CHANGELOG
index 52c49ed..b3fb07a 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 2.6.2 - 2014-07-02
+* Bug fixes (see mercurial logs for details)
+
 Version 2.6.1 - 2013-12-04
 * Bug fixes (see mercurial logs for details)
 
diff --git a/COPYRIGHT b/COPYRIGHT
index ede3fac..c552c67 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,6 +1,6 @@
-Copyright (C) 2008-2012 Cédric Krier.
+Copyright (C) 2008-2014 Cédric Krier.
 Copyright (C) 2008-2012 Bertrand Chenal.
-Copyright (C) 2008-2012 B2CK SPRL.
+Copyright (C) 2008-2014 B2CK SPRL.
 Copyright (C) 2004-2008 Tiny SPRL.
 
 This program is free software: you can redistribute it and/or modify
diff --git a/PKG-INFO b/PKG-INFO
index 921bc32..a4d5376 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: trytond_analytic_account
-Version: 2.6.1
+Version: 2.6.2
 Summary: Tryton module for analytic accounting
 Home-page: http://www.tryton.org/
 Author: Tryton
diff --git a/account.py b/account.py
index fbddff3..ad83d88 100644
--- a/account.py
+++ b/account.py
@@ -152,6 +152,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:
@@ -220,6 +223,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 a1bd271..6637eb6 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
 [tryton]
-version=2.6.1
+version=2.6.2
 depends:
     account
     company
diff --git a/trytond_analytic_account.egg-info/PKG-INFO b/trytond_analytic_account.egg-info/PKG-INFO
index 3f30ce7..8a4b131 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: 2.6.1
+Version: 2.6.2
 Summary: Tryton module for analytic accounting
 Home-page: http://www.tryton.org/
 Author: Tryton
-- 
tryton-modules-analytic-account