[tryton-debian-vcs] tryton-modules-analytic-account branch debian-jessie-3.0 updated. debian/3.0.0-3-6-g8ab9ae6

[Mathias Behrle]

The following commit has been merged in the debian-jessie-3.0 branch:
https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi/?p=tryton/tryton-modules-analytic-account.git;a=commitdiff;h=debian/3.0.0-3-6-g8ab9ae6

commit 8ab9ae60509fa0e9590d19cc73ecf8e7871e1e55
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Thu Jul 3 14:43:53 2014 +0200

    Releasing debian version 3.0.1-1.

diff --git a/debian/changelog b/debian/changelog
index 77b7eb2..bdf2382 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+tryton-modules-analytic-account (3.0.1-1) unstable; urgency=medium
+
+  * Removing  LC_ALL=C.UTF-8 as build environment.
+  * Setting the branch in the watch file to the fixed version 3.0.
+  * Updating signing key while using now plain .asc files instead of .pgp
+    binaries.
+  * Merging upstream version 3.0.1.
+  * Updating copyright file.
+
+ -- Mathias Behrle <mathiasb at m9s.biz>  Thu, 03 Jul 2014 14:43:52 +0200
+
 tryton-modules-analytic-account (3.0.0-3) unstable; urgency=medium
 
   * Updating year in debian copyright.
commit 79e03b645c780b70acda5816077171fe9ff492a5
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Thu Jul 3 14:43:49 2014 +0200

    Updating copyright file.

diff --git a/debian/copyright b/debian/copyright
index 9776a5f..1585a99 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,9 +1,9 @@
 Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 
 Files: *
-Copyright: 2008-2013 Cédric Krier
+Copyright: 2008-2014 Cédric Krier
            2008-2013 Bertrand Chenal
-           2008-2013 B2CK SPRL
+           2008-2014 B2CK SPRL
            2004-2008 Tiny SPRL
 License: GPL-3+
 
commit e72aa9305de68463ec8beda85aab5b3609102447
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Thu Jul 3 14:43:49 2014 +0200

    Merging upstream version 3.0.1.

diff --git a/CHANGELOG b/CHANGELOG
index 8921297..359efe4 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 3.0.1 - 2014-07-02
+* Bug fixes (see mercurial logs for details)
+
 Version 3.0.0 - 2013-10-21
 * Bug fixes (see mercurial logs for details)
 
diff --git a/COPYRIGHT b/COPYRIGHT
index 5d422e0..77715d8 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,6 +1,6 @@
-Copyright (C) 2008-2013 Cédric Krier.
+Copyright (C) 2008-2014 Cédric Krier.
 Copyright (C) 2008-2013 Bertrand Chenal.
-Copyright (C) 2008-2013 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 b804a2b..6b2a4fd 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: trytond_analytic_account
-Version: 3.0.0
+Version: 3.0.1
 Summary: Tryton module for analytic accounting
 Home-page: http://www.tryton.org/
 Author: Tryton
diff --git a/account.py b/account.py
index 05c388f..4a36963 100644
--- a/account.py
+++ b/account.py
@@ -161,6 +161,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:
@@ -234,6 +237,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 8c89ebe..87f7808 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
 [tryton]
-version=3.0.0
+version=3.0.1
 depends:
     account
     company
diff --git a/trytond_analytic_account.egg-info/PKG-INFO b/trytond_analytic_account.egg-info/PKG-INFO
index 08871ff..c210f20 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.0.0
+Version: 3.0.1
 Summary: Tryton module for analytic accounting
 Home-page: http://www.tryton.org/
 Author: Tryton
-- 
tryton-modules-analytic-account