[tryton-debian-vcs] tryton-modules-account branch upstream-3.4 updated. upstream/3.4.8-1-g1da397f
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.4 branch:
https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi/?p=tryton/tryton-modules-account.git;a=commitdiff;h=upstream/3.4.8-1-g1da397f
commit 1da397f08895975fc20b1928cc27fd78a1bf54a0
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Mon Dec 19 11:44:40 2016 +0100
Adding upstream version 3.4.9.
Signed-off-by: Mathias Behrle <mathiasb at m9s.biz>
diff --git a/CHANGELOG b/CHANGELOG
index 51e181d..61a9b25 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 3.4.9 - 2016-12-17
+* Bug fixes (see mercurial logs for details)
+
Version 3.4.8 - 2016-10-02
* Bug fixes (see mercurial logs for details)
diff --git a/PKG-INFO b/PKG-INFO
index 1fb809f..28565b4 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: trytond_account
-Version: 3.4.8
+Version: 3.4.9
Summary: Tryton module for accounting
Home-page: http://www.tryton.org/
Author: Tryton
diff --git a/move.py b/move.py
index d1eafc8..269669a 100644
--- a/move.py
+++ b/move.py
@@ -1067,6 +1067,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'] = \
@@ -1943,7 +1946,8 @@ class ReconcileShow(ModelView):
@fields.depends('account')
def on_change_with_currency_digits(self, name=None):
- return self.account.company.currency.digits
+ if self.account:
+ return self.account.company.currency.digits
class CancelMoves(Wizard):
diff --git a/tryton.cfg b/tryton.cfg
index 06a20c6..e0fcf8b 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
[tryton]
-version=3.4.8
+version=3.4.9
depends:
company
currency
diff --git a/trytond_account.egg-info/PKG-INFO b/trytond_account.egg-info/PKG-INFO
index 4e23970..265df07 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.4.8
+Version: 3.4.9
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