[tryton-debian-vcs] tryton-modules-project branch upstream-3.6 updated. upstream/3.6.0-1-gf465802

[Mathias Behrle]

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

commit f4658023fc35ff55f096008f816cbe52c759299d
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Wed Dec 23 15:25:38 2015 +0100

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

diff --git a/CHANGELOG b/CHANGELOG
index 549e5ad..8dd6a17 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 3.6.1 - 2015-12-22
+* Bug fixes (see mercurial logs for details)
+
 Version 3.6.0 - 2015-04-20
 * Bug fixes (see mercurial logs for details)
 * Add support for PyPy
diff --git a/PKG-INFO b/PKG-INFO
index 9d17fcf..d574da0 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: trytond_project
-Version: 3.6.0
+Version: 3.6.1
 Summary: Tryton module with projects
 Home-page: http://www.tryton.org/
 Author: Tryton
diff --git a/tryton.cfg b/tryton.cfg
index ce2f54c..a0414aa 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
 [tryton]
-version=3.6.0
+version=3.6.1
 depends:
     company_work_time
     ir
diff --git a/trytond_project.egg-info/PKG-INFO b/trytond_project.egg-info/PKG-INFO
index 60b68b4..a5b2578 100644
--- a/trytond_project.egg-info/PKG-INFO
+++ b/trytond_project.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: trytond-project
-Version: 3.6.0
+Version: 3.6.1
 Summary: Tryton module with projects
 Home-page: http://www.tryton.org/
 Author: Tryton
diff --git a/work.py b/work.py
index 1044a23..4461333 100644
--- a/work.py
+++ b/work.py
@@ -156,6 +156,12 @@ class Work(ModelSQL, ModelView):
                             'child': child.rec_name,
                             })
 
+    @property
+    def effort_hours(self):
+        if not self.effort_duration:
+            return 0
+        return self.effort_duration.total_seconds() / 60 / 60
+
     def get_rec_name(self, name):
         return self.work.name
 
-- 
tryton-modules-project