[tryton-debian-vcs] tryton-modules-project-invoice branch upstream updated. upstream/3.6.0-1-g42bea1a

Mathias Behrle tryton-debian-vcs at alioth.debian.org
Wed Jul 15 14:21:50 UTC 2015


The following commit has been merged in the upstream branch:
https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi/?p=tryton/tryton-modules-project-invoice.git;a=commitdiff;h=upstream/3.6.0-1-g42bea1a

commit 42bea1ac65cfed560169027c908a61aa9b48bf7d
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Wed Jul 15 12:47:24 2015 +0200

    Adding upstream version 3.6.1.
    
    Signed-off-by: Mathias Behrle <mathiasb at m9s.biz>

diff --git a/CHANGELOG b/CHANGELOG
index f9c9c47..61b8263 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 3.6.1 - 2015-07-13
+* Bug fixes (see mercurial logs for details)
+
 Version 3.6.0 - 2015-04-20
 * Bug fixes (see mercurial logs for details)
 * Add support for PyPy
diff --git a/PKG-INFO b/PKG-INFO
index 80fa020..e070cc5 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: trytond_project_invoice
-Version: 3.6.0
+Version: 3.6.1
 Summary: Tryton module to invoice projects
 Home-page: http://www.tryton.org/
 Author: Tryton
diff --git a/tryton.cfg b/tryton.cfg
index 0c36ed3..1f87746 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
 [tryton]
-version=3.6.0
+version=3.6.1
 depends:
     ir
     project
diff --git a/trytond_project_invoice.egg-info/PKG-INFO b/trytond_project_invoice.egg-info/PKG-INFO
index bb84062..d531a83 100644
--- a/trytond_project_invoice.egg-info/PKG-INFO
+++ b/trytond_project_invoice.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: trytond-project-invoice
-Version: 3.6.0
+Version: 3.6.1
 Summary: Tryton module to invoice projects
 Home-page: http://www.tryton.org/
 Author: Tryton
diff --git a/work.py b/work.py
index 8734e22..b6684ab 100644
--- a/work.py
+++ b/work.py
@@ -229,7 +229,7 @@ class Work:
             values.update(method(m_works))
 
         default = getattr(cls, 'default_%s' % name)()
-        return cls.sum_tree(works, lambda w: values.get(w.id, default))
+        return cls.sum_tree(works, lambda w: values.get(w.id) or default)
 
     @classmethod
     @ModelView.button
-- 
tryton-modules-project-invoice



More information about the tryton-debian-vcs mailing list