[tryton-debian-vcs] tryton-modules-project-plan branch debian-jessie-3.0 updated. debian/3.0.0-3-6-gbd8bd8f

Mathias Behrle tryton-debian-vcs at alioth.debian.org
Mon May 12 16:09:29 UTC 2014


The following commit has been merged in the debian-jessie-3.0 branch:
https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi/?p=tryton/tryton-modules-project-plan.git;a=commitdiff;h=debian/3.0.0-3-6-gbd8bd8f

commit bd8bd8f58089cdc70d42c5d3edc8674b0296db90
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Mon May 12 15:52:54 2014 +0200

    Releasing debian version 3.0.1-1.

diff --git a/debian/changelog b/debian/changelog
index b5ee173..713ccc1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+tryton-modules-project-plan (3.0.1-1) unstable; urgency=medium
+
+  * Removing  LC_ALL=C.UTF-8 as build environment.
+  * Setting the branch in the watch file to the fixed version 3.0.
+  * Updating signing key while using now plain .asc files instead of .pgp
+    binaries.
+  * Merging upstream version 3.0.1.
+  * Updating copyright file.
+
+ -- Mathias Behrle <mathiasb at m9s.biz>  Mon, 12 May 2014 15:52:53 +0200
+
 tryton-modules-project-plan (3.0.0-3) unstable; urgency=medium
 
   * Updating year in debian copyright.
commit 2950eb8041ed738b51ff4089d43e3bf6d58fa62a
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Mon May 12 15:52:49 2014 +0200

    Updating copyright file.

diff --git a/debian/copyright b/debian/copyright
index e04848e..d53a8f6 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-2013 Cédric Krier
-           2009-2013 B2CK SPRL
+           2009-2014 Cédric Krier
+           2009-2014 B2CK SPRL
 License: GPL-3+
 
 Files: debian/*
commit b02095180f01368b4e0b0a33786663966cad4a1e
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Mon May 12 15:52:49 2014 +0200

    Merging upstream version 3.0.1.

diff --git a/CHANGELOG b/CHANGELOG
index aa80594..a9e9def 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 3.0.1 - 2014-05-07
+* Bug fixes (see mercurial logs for details)
+
 Version 3.0.0 - 2013-10-21
 * Bug fixes (see mercurial logs for details)
 
diff --git a/COPYRIGHT b/COPYRIGHT
index fa3aaf4..8b958cc 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,6 +1,6 @@
 Copyright (C) 2009-2013 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 9da5349..360cb1f 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: trytond_project_plan
-Version: 3.0.0
+Version: 3.0.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 07263a1..4c5100b 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
 [tryton]
-version=3.0.0
+version=3.0.1
 depends:
     ir
     company
diff --git a/trytond_project_plan.egg-info/PKG-INFO b/trytond_project_plan.egg-info/PKG-INFO
index 8880099..6d3dc0c 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.0.0
+Version: 3.0.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 824ccda..f964e9a 100644
--- a/work.py
+++ b/work.py
@@ -109,11 +109,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



More information about the tryton-debian-vcs mailing list