[tryton-debian-vcs] tryton-modules-project-plan branch upstream-3.8 updated. upstream/3.8.0-1-g60d0d28

Mathias Behrle tryton-debian-vcs at alioth.debian.org
Thu Aug 17 12:37:53 UTC 2017


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

commit 60d0d282c0acbbaad6d6c127e2cb32f99f027bf0
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Thu Aug 17 12:00:51 2017 +0200

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

diff --git a/CHANGELOG b/CHANGELOG
index 5e43553..a697ed0 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 3.8.1 - 2017-08-08
+* Bug fixes (see mercurial logs for details)
+
 Version 3.8.0 - 2015-11-02
 * 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 b47dbe9..150721c 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: trytond_project_plan
-Version: 3.8.0
+Version: 3.8.1
 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 ab8f7b3..b46ea85 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
 [tryton]
-version=3.8.0
+version=3.8.1
 depends:
     ir
     company
diff --git a/trytond_project_plan.egg-info/PKG-INFO b/trytond_project_plan.egg-info/PKG-INFO
index 57255e0..b6ec589 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.8.0
+Version: 3.8.1
 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 a963a0a..f9fe2e3 100644
--- a/trytond_project_plan.egg-info/requires.txt
+++ b/trytond_project_plan.egg-info/requires.txt
@@ -1,4 +1,4 @@
 trytond_company >= 3.8, < 3.9
 trytond_project >= 3.8, < 3.9
 trytond_timesheet >= 3.8, < 3.9
-trytond >= 3.8, < 3.9
\ No newline at end of file
+trytond >= 3.8, < 3.9
diff --git a/work.py b/work.py
index 509bdb6..215c0a9 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



More information about the tryton-debian-vcs mailing list