[tryton-debian-vcs] tryton-modules-project-plan branch upstream updated. upstream/3.6.0-1-g00decb0

[Mathias Behrle]

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-plan.git;a=commitdiff;h=upstream/3.6.0-1-g00decb0

commit 00decb01023ba882be52249c929ddb973c8d11a9
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Sat May 23 21:15:47 2015 +0200

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

diff --git a/CHANGELOG b/CHANGELOG
index de0c3b1..41a2017 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 3.6.1 - 2015-05-22
+* 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 475fa64..d658e62 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: trytond_project_plan
-Version: 3.6.0
+Version: 3.6.1
 Summary: Tryton module to add planning capabilities on projects
 Home-page: http://www.tryton.org/
 Author: Tryton
diff --git a/tryton.cfg b/tryton.cfg
index b373e9d..b42a669 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
 [tryton]
-version=3.6.0
+version=3.6.1
 depends:
     ir
     company
diff --git a/trytond_project_plan.egg-info/PKG-INFO b/trytond_project_plan.egg-info/PKG-INFO
index 185d3f0..0880806 100644
--- a/trytond_project_plan.egg-info/PKG-INFO
+++ b/trytond_project_plan.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: trytond-project-plan
-Version: 3.6.0
+Version: 3.6.1
 Summary: Tryton module to add planning capabilities on projects
 Home-page: http://www.tryton.org/
 Author: Tryton
diff --git a/work.py b/work.py
index 7656ecc..4837206 100644
--- a/work.py
+++ b/work.py
@@ -110,8 +110,9 @@ class Work:
                     leafs.add(work.id)
 
                 total_allocation = 0
-                if not work.allocations or not work.effort_duration:
-                    durations[work.id] = work.effort_duration
+                if not work.allocations:
+                    durations[work.id] = (work.effort_duration
+                        or datetime.timedelta())
                     continue
                 for allocation in work.allocations:
                     total_allocation += allocation.percentage
-- 
tryton-modules-project-plan