[tryton-debian-vcs] tryton-modules-project-invoice branch debian updated. debian/3.8.0-2-4-gc0e92fc
Mathias Behrle
tryton-debian-vcs at alioth.debian.org
Tue Mar 15 20:37:04 UTC 2016
The following commit has been merged in the debian branch:
https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi/?p=tryton/tryton-modules-project-invoice.git;a=commitdiff;h=debian/3.8.0-2-4-gc0e92fc
commit c0e92fca154de9b9260711d21f6755c37b6abe85
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Tue Mar 15 20:40:13 2016 +0100
Releasing debian version 3.8.1-1.
Signed-off-by: Mathias Behrle <mathiasb at m9s.biz>
diff --git a/debian/changelog b/debian/changelog
index 737a6f8..3fd5d55 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+tryton-modules-project-invoice (3.8.1-1) unstable; urgency=medium
+
+ * Updating signing-key.asc with the actual upstream maintainer keys.
+ * Merging upstream version 3.8.1.
+ * Updating copyright file.
+
+ -- Mathias Behrle <mathiasb at m9s.biz> Tue, 15 Mar 2016 20:40:13 +0100
+
tryton-modules-project-invoice (3.8.0-2) unstable; urgency=medium
* Updating to standards version 3.9.7, no changes needed.
commit c3491f21a62d829a0e3d157407ef42e5d514a437
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Tue Mar 15 20:40:13 2016 +0100
Updating copyright file.
diff --git a/debian/copyright b/debian/copyright
index 2a0cd90..f1b4b7d 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-2015 Cédric Krier
- 2013-2015 B2CK SPRL
+Copyright: 2013-2016 Cédric Krier
+ 2013-2016 B2CK SPRL
License: GPL-3+
Files: debian/*
commit 0fffee33f7971d76f6a87a8fb268466ee4d67bc8
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Tue Mar 15 20:40:13 2016 +0100
Merging upstream version 3.8.1.
diff --git a/CHANGELOG b/CHANGELOG
index 3f5cb01..b8c3049 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 3.8.1 - 2016-03-14
+* Bug fixes (see mercurial logs for details)
+
Version 3.8.0 - 2015-11-02
* Bug fixes (see mercurial logs for details)
* Add progress invoice method
diff --git a/COPYRIGHT b/COPYRIGHT
index 1ab21bc..20bd036 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,5 +1,5 @@
-Copyright (C) 2013-2015 Cédric Krier.
-Copyright (C) 2013-2015 B2CK SPRL.
+Copyright (C) 2013-2016 Cédric Krier.
+Copyright (C) 2013-2016 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 7977984..fb81651 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: trytond_project_invoice
-Version: 3.8.0
+Version: 3.8.1
Summary: Tryton module to invoice projects
Home-page: http://www.tryton.org/
Author: Tryton
diff --git a/tryton.cfg b/tryton.cfg
index 6849549..4350e12 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
[tryton]
-version=3.8.0
+version=3.8.1
depends:
ir
project
diff --git a/trytond_project_invoice.egg-info/PKG-INFO b/trytond_project_invoice.egg-info/PKG-INFO
index 8e77718..57e8e8b 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: 3.8.0
+Version: 3.8.1
Summary: Tryton module to invoice projects
Home-page: http://www.tryton.org/
Author: Tryton
diff --git a/work.py b/work.py
index 2ce85f7..cf8b05f 100644
--- a/work.py
+++ b/work.py
@@ -307,7 +307,7 @@ class Work:
line = TimesheetLine.__table__()
durations = {}
- twork2work = dict((w.work.id, w.id) for w in works)
+ twork2work = dict((w.work.id, w.id) for w in works if w.work)
ids = twork2work.keys()
for sub_ids in grouped_slice(ids):
red_sql = reduce_ids(line.work, sub_ids)
@@ -509,7 +509,7 @@ class Work:
return []
def _get_lines_to_invoice_timesheet(self):
- if self.work.timesheet_lines:
+ if self.work and self.work.timesheet_lines:
if not self.product:
self.raise_user_error('missing_product', (self.rec_name,))
elif self.list_price is None:
--
tryton-modules-project-invoice
More information about the tryton-debian-vcs
mailing list