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

Mathias Behrle tryton-debian-vcs at alioth.debian.org
Sun Jun 11 22:37:17 UTC 2017


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-invoice.git;a=commitdiff;h=debian/4.2.0-1-5-gb81d254

commit b81d25405d8543ce9aba9c5eb83cf02161c576a6
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Sun Jun 11 23:11:20 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 fa0d5bf..78ec49a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+tryton-modules-project-invoice (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>  Sun, 11 Jun 2017 23:11:20 +0200
+
 tryton-modules-project-invoice (4.2.0-1) unstable; urgency=medium
 
   * Merging upstream version 4.2.0.
commit 1b4b00149af568dcfffd713e9b30d96020033374
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Sun Jun 11 23:11:19 2017 +0200

    Updating copyright file.

diff --git a/debian/copyright b/debian/copyright
index 5585219..b63abf7 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,8 +1,8 @@
 Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 
 Files: *
-Copyright: 2013-2016 Cédric Krier
-           2013-2016 B2CK SPRL
+Copyright: 2013-2017 Cédric Krier
+           2013-2017 B2CK SPRL
 License: GPL-3+
 
 Files: debian/*
commit 24acad283ad05891587c072b846521e7eb1d8771
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Sun Jun 11 23:11:19 2017 +0200

    Merging upstream version 4.2.1.

diff --git a/CHANGELOG b/CHANGELOG
index 48cab07..7d56498 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 4.2.1 - 2017-06-06
+* 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 20bd036..4d643a0 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,5 +1,5 @@
-Copyright (C) 2013-2016 Cédric Krier.
-Copyright (C) 2013-2016 B2CK SPRL.
+Copyright (C) 2013-2017 Cédric Krier.
+Copyright (C) 2013-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 d3a01df..9922d61 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: trytond_project_invoice
-Version: 4.2.0
+Version: 4.2.1
 Summary: Tryton module to invoice 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 55ffda2..fa78cfd 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
 [tryton]
-version=4.2.0
+version=4.2.1
 depends:
     ir
     project
diff --git a/trytond_project_invoice.egg-info/PKG-INFO b/trytond_project_invoice.egg-info/PKG-INFO
index 269d462..a7110f6 100644
--- a/trytond_project_invoice.egg-info/PKG-INFO
+++ b/trytond_project_invoice.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: trytond-project-invoice
-Version: 4.2.0
+Version: 4.2.1
 Summary: Tryton module to invoice projects
 Home-page: http://www.tryton.org/
 Author: Tryton
diff --git a/work.py b/work.py
index ee240f9..7c60313 100644
--- a/work.py
+++ b/work.py
@@ -141,7 +141,7 @@ class Work:
     @staticmethod
     def _get_duration_to_invoice_effort(works):
         return dict((w.id, w.effort_duration) for w in works
-            if w.state == 'done' and not w.invoice_line)
+            if w.state == 'done' and not w.invoice_line and w.effort_duration)
 
     @staticmethod
     def _get_duration_to_invoice_progress(works):
-- 
tryton-modules-project-invoice



More information about the tryton-debian-vcs mailing list