[tryton-debian-vcs] tryton-modules-account branch debian-stretch-4.0 updated. debian/4.0.5-1-3-g4dc135d

Mathias Behrle tryton-debian-vcs at alioth.debian.org
Mon Dec 19 18:40:38 UTC 2016


The following commit has been merged in the debian-stretch-4.0 branch:
https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi/?p=tryton/tryton-modules-account.git;a=commitdiff;h=debian/4.0.5-1-3-g4dc135d

commit 4dc135d55f443a9b2b3a5687e4002c7677fc387d
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Mon Dec 19 11:48:15 2016 +0100

    Releasing debian version 4.0.6-1.
    
    Signed-off-by: Mathias Behrle <mathiasb at m9s.biz>

diff --git a/debian/changelog b/debian/changelog
index 703f933..cbc4f71 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+tryton-modules-account (4.0.6-1) unstable; urgency=medium
+
+  * Setting the branch in the watch file to the fixed version 4.0.
+  * Merging upstream version 4.0.6.
+
+ -- Mathias Behrle <mathiasb at m9s.biz>  Mon, 19 Dec 2016 11:48:15 +0100
+
 tryton-modules-account (4.0.5-1) unstable; urgency=medium
 
   * Merging upstream version 4.0.5.
commit 55076138a3f03f05a7790286a01af2abb5c93a17
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Mon Dec 19 11:48:14 2016 +0100

    Merging upstream version 4.0.6.

diff --git a/CHANGELOG b/CHANGELOG
index 0924166..fe50e88 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 4.0.6 - 2016-12-17
+* Bug fixes (see mercurial logs for details)
+
 Version 4.0.5 - 2016-11-06
 * Bug fixes (see mercurial logs for details)
 
diff --git a/PKG-INFO b/PKG-INFO
index cd61239..7f2a8ee 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: trytond_account
-Version: 4.0.5
+Version: 4.0.6
 Summary: Tryton module for accounting
 Home-page: http://www.tryton.org/
 Author: Tryton
diff --git a/move.py b/move.py
index aaaf038..0fcfbfa 100644
--- a/move.py
+++ b/move.py
@@ -1106,6 +1106,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'):
                         self.credit = \
@@ -2014,7 +2017,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 57bce33..d576d9f 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
 [tryton]
-version=4.0.5
+version=4.0.6
 depends:
     company
     currency
diff --git a/trytond_account.egg-info/PKG-INFO b/trytond_account.egg-info/PKG-INFO
index d34ced0..7fc27bc 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: 4.0.5
+Version: 4.0.6
 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