[tryton-debian-vcs] tryton-modules-account branch upstream-3.2 updated. upstream/3.2.11-1-g78d7a34
Mathias Behrle
tryton-debian-vcs at alioth.debian.org
Mon Dec 19 18:40:40 UTC 2016
The following commit has been merged in the upstream-3.2 branch:
https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi/?p=tryton/tryton-modules-account.git;a=commitdiff;h=upstream/3.2.11-1-g78d7a34
commit 78d7a34b956b4816a04be7604e788e1ca2587f2d
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Mon Dec 19 11:43:29 2016 +0100
Adding upstream version 3.2.12.
Signed-off-by: Mathias Behrle <mathiasb at m9s.biz>
diff --git a/CHANGELOG b/CHANGELOG
index 104eaa3..f2b370f 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 3.2.12 - 2016-12-17
+* Bug fixes (see mercurial logs for details)
+
Version 3.2.11 - 2016-10-02
* Bug fixes (see mercurial logs for details)
diff --git a/PKG-INFO b/PKG-INFO
index d33dd87..3091ada 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: trytond_account
-Version: 3.2.11
+Version: 3.2.12
Summary: Tryton module for accounting
Home-page: http://www.tryton.org/
Author: Tryton
diff --git a/move.py b/move.py
index 528f258..afc6abd 100644
--- a/move.py
+++ b/move.py
@@ -994,6 +994,9 @@ class Line(ModelSQL, ModelView):
where=where
& (table.account == self.party.account_payable.id)))
amount = cursor.fetchone()[0]
+ # SQLite uses float for SUM
+ if not isinstance(amount, Decimal):
+ amount = Decimal(str(amount))
if not self.party.account_payable.currency.is_zero(amount):
if amount > Decimal('0.0'):
res['credit'] = \
diff --git a/tryton.cfg b/tryton.cfg
index f0d9fe1..bc28ee7 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
[tryton]
-version=3.2.11
+version=3.2.12
depends:
company
currency
diff --git a/trytond_account.egg-info/PKG-INFO b/trytond_account.egg-info/PKG-INFO
index cbed230..601b6a1 100644
--- a/trytond_account.egg-info/PKG-INFO
+++ b/trytond_account.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: trytond-account
-Version: 3.2.11
+Version: 3.2.12
Summary: Tryton module for accounting
Home-page: http://www.tryton.org/
Author: Tryton
--
tryton-modules-account
More information about the tryton-debian-vcs
mailing list