[tryton-debian-vcs] tryton-modules-project-plan branch upstream-3.6 updated. upstream/3.6.1-1-g2ce32ce

[Mathias Behrle]

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

commit 2ce32ce110ba74c96ac636857dbc2cb13d345bf6
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Thu Aug 17 11:58:51 2017 +0200

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

diff --git a/CHANGELOG b/CHANGELOG
index 41a2017..000b951 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 3.6.2 - 2017-08-08
+* Bug fixes (see mercurial logs for details)
+
 Version 3.6.1 - 2015-05-22
 * Bug fixes (see mercurial logs for details)
 
diff --git a/COPYRIGHT b/COPYRIGHT
index 431debe..d768403 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,6 +1,6 @@
 Copyright (C) 2009-2013 Bertrand Chenal.
-Copyright (C) 2009-2015 Cédric Krier.
-Copyright (C) 2009-2015 B2CK SPRL.
+Copyright (C) 2009-2017 Cédric Krier.
+Copyright (C) 2009-2017 B2CK SPRL.
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
diff --git a/PKG-INFO b/PKG-INFO
index d658e62..ca2a144 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: trytond_project_plan
-Version: 3.6.1
+Version: 3.6.2
 Summary: Tryton module to add planning capabilities on projects
 Home-page: http://www.tryton.org/
 Author: Tryton
diff --git a/setup.cfg b/setup.cfg
index 861a9f5..8bfd5a1 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,5 +1,4 @@
 [egg_info]
 tag_build = 
 tag_date = 0
-tag_svn_revision = 0
 
diff --git a/tryton.cfg b/tryton.cfg
index b42a669..680f575 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
 [tryton]
-version=3.6.1
+version=3.6.2
 depends:
     ir
     company
diff --git a/trytond_project_plan.egg-info/PKG-INFO b/trytond_project_plan.egg-info/PKG-INFO
index 0880806..d2b4ab2 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.1
+Version: 3.6.2
 Summary: Tryton module to add planning capabilities on projects
 Home-page: http://www.tryton.org/
 Author: Tryton
diff --git a/trytond_project_plan.egg-info/requires.txt b/trytond_project_plan.egg-info/requires.txt
index 4684d71..cb20b89 100644
--- a/trytond_project_plan.egg-info/requires.txt
+++ b/trytond_project_plan.egg-info/requires.txt
@@ -1,4 +1,4 @@
 trytond_company >= 3.6, < 3.7
 trytond_project >= 3.6, < 3.7
 trytond_timesheet >= 3.6, < 3.7
-trytond >= 3.6, < 3.7
\ No newline at end of file
+trytond >= 3.6, < 3.7
diff --git a/work.py b/work.py
index 4837206..967db3b 100644
--- a/work.py
+++ b/work.py
@@ -110,14 +110,14 @@ class Work:
                     leafs.add(work.id)
 
                 total_allocation = 0
+                effort = work.effort_duration or datetime.timedelta()
                 if not work.allocations:
-                    durations[work.id] = (work.effort_duration
-                        or datetime.timedelta())
+                    durations[work.id] = effort
                     continue
                 for allocation in work.allocations:
                     total_allocation += allocation.percentage
                 durations[work.id] = datetime.timedelta(
-                    seconds=work.effort_duration.total_seconds()
+                    seconds=effort.total_seconds()
                     / (total_allocation / 100.0))
 
             while leafs:
-- 
tryton-modules-project-plan