[tryton-debian-vcs] tryton-modules-project-plan branch debian-stretch-3.8 updated. debian/3.8.0-2-6-g932fcb6

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


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

commit 932fcb6589104a2e0b8199cc315b453101cd803c
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Thu Aug 17 12:00:52 2017 +0200

    Releasing debian version 3.8.1-1.
    
    Signed-off-by: Mathias Behrle <mathiasb at m9s.biz>

diff --git a/debian/changelog b/debian/changelog
index 12295f7..2fbad74 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+tryton-modules-project-plan (3.8.1-1) unstable; urgency=medium
+
+  * Updating signing-key.asc with the actual upstream maintainer keys.
+  * Setting the branch in the watch file to the fixed version 3.8.
+  * Add the actual upstream maintainer key to signing-key.asc.
+  * Merging upstream version 3.8.1.
+  * Updating copyright file.
+
+ -- Mathias Behrle <mathiasb at m9s.biz>  Thu, 17 Aug 2017 12:00:52 +0200
+
 tryton-modules-project-plan (3.8.0-2) unstable; urgency=medium
 
   * Updating to standards version 3.9.7, no changes needed.
commit faa8843cf4e334a9d3150f3966cec6792813e4bc
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Thu Aug 17 12:00:51 2017 +0200

    Updating copyright file.

diff --git a/debian/copyright b/debian/copyright
index 2252a19..989e886 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -2,8 +2,8 @@ Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 
 Files: *
 Copyright: 2009-2013 Bertrand Chenal
-           2009-2015 Cédric Krier
-           2009-2015 B2CK SPRL
+           2009-2017 Cédric Krier
+           2009-2017 B2CK SPRL
 License: GPL-3+
 
 Files: debian/*
commit 8de96196ca11e49173dbbafa683f5efebb594ce3
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Thu Aug 17 12:00:51 2017 +0200

    Merging upstream version 3.8.1.

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