[tryton-debian-vcs] tryton-modules-project-plan branch upstream-2.6 updated. upstream/2.6.3-1-g5614abc

[Mathias Behrle]

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

commit 5614abc2ee06d271812c1ec95ccbcf4d29c056d8
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Mon May 12 15:47:39 2014 +0200

    Adding upstream version 2.6.4.

diff --git a/CHANGELOG b/CHANGELOG
index 650678d..3ec893e 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 2.6.4 - 2014-05-07
+* Bug fixes (see mercurial logs for details)
+
 Version 2.6.3 - 2013-07-22
 * Bug fixes (see mercurial logs for details)
 
diff --git a/COPYRIGHT b/COPYRIGHT
index ff31dda..f809fc6 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,6 +1,6 @@
 Copyright (C) 2009-2012 Bertrand Chenal.
-Copyright (C) 2009-2013 Cédric Krier.
-Copyright (C) 2009-2013 B2CK SPRL.
+Copyright (C) 2009-2014 Cédric Krier.
+Copyright (C) 2009-2014 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 e606a68..3125fa4 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: trytond_project_plan
-Version: 2.6.3
+Version: 2.6.4
 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 06847d9..90c0317 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
 [tryton]
-version=2.6.3
+version=2.6.4
 depends:
     ir
     company
diff --git a/trytond_project_plan.egg-info/PKG-INFO b/trytond_project_plan.egg-info/PKG-INFO
index 5512798..5c54178 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: 2.6.3
+Version: 2.6.4
 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 cd39fc2..e31dfc4 100644
--- a/work.py
+++ b/work.py
@@ -131,11 +131,12 @@ class Work:
 
                 total_allocation = 0
                 if not work.allocations:
-                    durations[work.id] = work.effort
+                    durations[work.id] = (work.effort or 0)
                     continue
                 for allocation in work.allocations:
                     total_allocation += allocation.percentage
-                durations[work.id] = work.effort / (total_allocation / 100.0)
+                durations[work.id] = ((work.effort or 0)
+                    / (total_allocation / 100.0))
 
             while leafs:
                 for work_id in leafs:
-- 
tryton-modules-project-plan