[tryton-debian-vcs] tryton-modules-project branch debian-stretch-3.6 updated. debian/3.6.0-1-6-g9b794dc

Mathias Behrle tryton-debian-vcs at alioth.debian.org
Wed Dec 23 16:53:24 UTC 2015


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

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

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

diff --git a/debian/changelog b/debian/changelog
index 7dd7953..2310694 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+tryton-modules-project (3.6.1-1) unstable; urgency=medium
+
+  * Updating year of debian copyright.
+  * Adapting section naming in gbp.conf to current git-buildpackage.
+  * Improving description why we can not run the module test suites.
+  * Setting the branch in the watch file to the fixed version 3.6.
+  * Merging upstream version 3.6.1.
+
+ -- Mathias Behrle <mathiasb at m9s.biz>  Wed, 23 Dec 2015 15:25:40 +0100
+
 tryton-modules-project (3.6.0-1) unstable; urgency=medium
 
   * Wrapping and sorting control files (wrap-and-sort -bts).
commit f4f367a71d07163ff4e1f286c0132fe588aca9c5
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Wed Dec 23 15:25:39 2015 +0100

    Merging upstream version 3.6.1.

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



More information about the tryton-debian-vcs mailing list