diff -Nru tryton-modules-analytic-account-2.8.1/account.py tryton-modules-analytic-account-2.8.3/account.py --- tryton-modules-analytic-account-2.8.1/account.py 2013-10-11 19:13:36.000000000 +0000 +++ tryton-modules-analytic-account-2.8.3/account.py 2014-07-02 22:11:04.000000000 +0000 @@ -151,6 +151,9 @@ 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: @@ -219,6 +222,9 @@ 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 -Nru tryton-modules-analytic-account-2.8.1/CHANGELOG tryton-modules-analytic-account-2.8.3/CHANGELOG --- tryton-modules-analytic-account-2.8.1/CHANGELOG 2013-12-04 16:25:38.000000000 +0000 +++ tryton-modules-analytic-account-2.8.3/CHANGELOG 2015-03-01 14:52:59.000000000 +0000 @@ -1,3 +1,9 @@ +Version 2.8.3 - 2015-03-01 +* Bug fixes (see mercurial logs for details) + +Version 2.8.2 - 2014-07-02 +* Bug fixes (see mercurial logs for details) + Version 2.8.1 - 2013-12-04 * Bug fixes (see mercurial logs for details) diff -Nru tryton-modules-analytic-account-2.8.1/COPYRIGHT tryton-modules-analytic-account-2.8.3/COPYRIGHT --- tryton-modules-analytic-account-2.8.1/COPYRIGHT 2013-12-04 16:25:37.000000000 +0000 +++ tryton-modules-analytic-account-2.8.3/COPYRIGHT 2015-03-01 14:52:57.000000000 +0000 @@ -1,6 +1,6 @@ -Copyright (C) 2008-2013 Cédric Krier. +Copyright (C) 2008-2015 Cédric Krier. Copyright (C) 2008-2013 Bertrand Chenal. -Copyright (C) 2008-2013 B2CK SPRL. +Copyright (C) 2008-2015 B2CK SPRL. Copyright (C) 2004-2008 Tiny SPRL. This program is free software: you can redistribute it and/or modify diff -Nru tryton-modules-analytic-account-2.8.1/debian/changelog tryton-modules-analytic-account-2.8.3/debian/changelog --- tryton-modules-analytic-account-2.8.1/debian/changelog 2014-06-26 15:50:45.000000000 +0000 +++ tryton-modules-analytic-account-2.8.3/debian/changelog 2015-04-24 08:59:26.000000000 +0000 @@ -1,8 +1,22 @@ -tryton-modules-analytic-account (2.8.1-1ubuntu0~ppa2~precise) precise; urgency=low +tryton-modules-analytic-account (2.8.3-1ubuntu0~ppa1~precise) precise; urgency=low * Ubuntu build - -- Ilya Melnikov Thu, 26 Jun 2014 21:22:31 +0600 + -- Ilya Melnikov Fri, 24 Apr 2015 12:54:00 +0500 + +tryton-modules-analytic-account (2.8.3-1) unstable; urgency=medium + + * Merging upstream version 2.8.3. + * Updating copyright file. + + -- Mathias Behrle Tue, 03 Mar 2015 21:27:40 +0100 + +tryton-modules-analytic-account (2.8.2-1) unstable; urgency=medium + + * Merging upstream version 2.8.2. + * Updating copyright file. + + -- Mathias Behrle Thu, 03 Jul 2014 14:41:05 +0200 tryton-modules-analytic-account (2.8.1-1) unstable; urgency=low diff -Nru tryton-modules-analytic-account-2.8.1/debian/copyright tryton-modules-analytic-account-2.8.3/debian/copyright --- tryton-modules-analytic-account-2.8.1/debian/copyright 2014-06-26 14:44:27.000000000 +0000 +++ tryton-modules-analytic-account-2.8.3/debian/copyright 2015-04-24 07:45:50.000000000 +0000 @@ -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-2015 Cédric Krier 2008-2013 Bertrand Chenal - 2008-2013 B2CK SPRL + 2008-2015 B2CK SPRL 2004-2008 Tiny SPRL License: GPL-3+ diff -Nru tryton-modules-analytic-account-2.8.1/PKG-INFO tryton-modules-analytic-account-2.8.3/PKG-INFO --- tryton-modules-analytic-account-2.8.1/PKG-INFO 2013-12-04 16:25:42.000000000 +0000 +++ tryton-modules-analytic-account-2.8.3/PKG-INFO 2015-03-01 14:53:04.000000000 +0000 @@ -1,6 +1,6 @@ Metadata-Version: 1.1 Name: trytond_analytic_account -Version: 2.8.1 +Version: 2.8.3 Summary: Tryton module for analytic accounting Home-page: http://www.tryton.org/ Author: Tryton diff -Nru tryton-modules-analytic-account-2.8.1/tryton.cfg tryton-modules-analytic-account-2.8.3/tryton.cfg --- tryton-modules-analytic-account-2.8.1/tryton.cfg 2013-04-22 10:23:42.000000000 +0000 +++ tryton-modules-analytic-account-2.8.3/tryton.cfg 2014-07-02 22:11:28.000000000 +0000 @@ -1,5 +1,5 @@ [tryton] -version=2.8.1 +version=2.8.3 depends: account company diff -Nru tryton-modules-analytic-account-2.8.1/trytond_analytic_account.egg-info/PKG-INFO tryton-modules-analytic-account-2.8.3/trytond_analytic_account.egg-info/PKG-INFO --- tryton-modules-analytic-account-2.8.1/trytond_analytic_account.egg-info/PKG-INFO 2013-12-04 16:25:41.000000000 +0000 +++ tryton-modules-analytic-account-2.8.3/trytond_analytic_account.egg-info/PKG-INFO 2015-03-01 14:53:03.000000000 +0000 @@ -1,6 +1,6 @@ Metadata-Version: 1.1 Name: trytond-analytic-account -Version: 2.8.1 +Version: 2.8.3 Summary: Tryton module for analytic accounting Home-page: http://www.tryton.org/ Author: Tryton diff -Nru tryton-modules-analytic-account-2.8.1/trytond_analytic_account.egg-info/SOURCES.txt tryton-modules-analytic-account-2.8.3/trytond_analytic_account.egg-info/SOURCES.txt --- tryton-modules-analytic-account-2.8.1/trytond_analytic_account.egg-info/SOURCES.txt 2013-12-04 16:25:41.000000000 +0000 +++ tryton-modules-analytic-account-2.8.3/trytond_analytic_account.egg-info/SOURCES.txt 2015-03-01 14:53:03.000000000 +0000 @@ -11,9 +11,31 @@ tryton.cfg ./__init__.py ./account.py +./account.xml +./analytic_account.xml ./line.py +./line.xml +./tryton.cfg +./locale/bg_BG.po +./locale/ca_ES.po +./locale/cs_CZ.po +./locale/de_DE.po +./locale/es_AR.po +./locale/es_CO.po +./locale/es_ES.po +./locale/fr_FR.po +./locale/nl_NL.po +./locale/ru_RU.po ./tests/__init__.py ./tests/test_analytic_account.py +./view/account_form.xml +./view/account_list.xml +./view/account_tree.xml +./view/account_tree2.xml +./view/line_form.xml +./view/line_tree.xml +./view/move_line_form.xml +./view/open_chart_start_form.xml locale/bg_BG.po locale/ca_ES.po locale/cs_CZ.po