[tryton-debian-vcs] tryton-modules-project-plan branch debian-stretch-4.2 updated. debian/4.2.0-1-5-ge36297d

[Mathias Behrle]

The following commit has been merged in the debian-stretch-4.2 branch:
https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi/?p=tryton/tryton-modules-project-plan.git;a=commitdiff;h=debian/4.2.0-1-5-ge36297d

commit e36297d41720475fc0c8b76106a2409fbc3d8813
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Thu Aug 17 12:04:54 2017 +0200

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

diff --git a/debian/changelog b/debian/changelog
index 857c057..cf42826 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+tryton-modules-project-plan (4.2.1-1) unstable; urgency=medium
+
+  * Add the actual upstream maintainer key to signing-key.asc.
+  * Setting the branch in the watch file to the fixed version 4.2.
+  * Merging upstream version 4.2.1.
+  * Updating copyright file.
+
+ -- Mathias Behrle <mathiasb at m9s.biz>  Thu, 17 Aug 2017 12:04:54 +0200
+
 tryton-modules-project-plan (4.2.0-1) unstable; urgency=medium
 
   * Updating to Standards-Version: 3.9.8, no changes needed.
commit 89b744e8d76165ea9ffb0588c0bc73ffbdf58ddf
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Thu Aug 17 12:04:53 2017 +0200

    Updating copyright file.

diff --git a/debian/copyright b/debian/copyright
index 65f0cf8..9248f7e 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-2016 Cédric Krier
-           2009-2016 B2CK SPRL
+           2009-2017 Cédric Krier
+           2009-2017 B2CK SPRL
 License: GPL-3+
 
 Files: debian/*
commit 5e60294dff64988097d62c058905d3dfcc025bdd
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Thu Aug 17 12:04:53 2017 +0200

    Merging upstream version 4.2.1.

diff --git a/CHANGELOG b/CHANGELOG
index 766d702..d3b7ea3 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 4.2.1 - 2017-08-08
+* Bug fixes (see mercurial logs for details)
+
 Version 4.2.0 - 2016-11-28
 * Bug fixes (see mercurial logs for details)
 
diff --git a/COPYRIGHT b/COPYRIGHT
index 2ec85a4..d768403 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,6 +1,6 @@
 Copyright (C) 2009-2013 Bertrand Chenal.
-Copyright (C) 2009-2016 Cédric Krier.
-Copyright (C) 2009-2016 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 08297a0..535a0e1 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: trytond_project_plan
-Version: 4.2.0
+Version: 4.2.1
 Summary: Tryton module to add planning capabilities on projects
 Home-page: http://www.tryton.org/
 Author: Tryton
diff --git a/allocation.py b/allocation.py
index 4bcb43a..5163680 100644
--- a/allocation.py
+++ b/allocation.py
@@ -10,7 +10,6 @@ __all__ = ['Allocation']
 class Allocation(ModelSQL, ModelView):
     'Allocation'
     __name__ = 'project.allocation'
-    _rec_name = 'employee'
     employee = fields.Many2One('company.employee', 'Employee', required=True,
             select=True, ondelete='CASCADE')
     work = fields.Many2One('project.work', 'Work', required=True,
@@ -32,6 +31,13 @@ class Allocation(ModelSQL, ModelView):
     def default_percentage():
         return 100
 
+    def get_rec_name(self, name):
+        return self.employee.rec_name
+
+    @classmethod
+    def search_rec_name(cls, name, clause):
+        return [('employee',) + tuple(clause[1:])]
+
     @classmethod
     def write(cls, *args):
         Work = Pool().get('project.work')
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 964cd56..00f920f 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
 [tryton]
-version=4.2.0
+version=4.2.1
 depends:
     ir
     company
diff --git a/trytond_project_plan.egg-info/PKG-INFO b/trytond_project_plan.egg-info/PKG-INFO
index 8281caa..2fcb0ed 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: 4.2.0
+Version: 4.2.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 f9ca0b9..e972c18 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