[tryton-debian-vcs] tryton-modules-project branch debian-jessie-3.4 updated. debian/3.4.1-1-6-g4d8347d
Mathias Behrle
tryton-debian-vcs at alioth.debian.org
Mon Oct 3 14:15:13 UTC 2016
The following commit has been merged in the debian-jessie-3.4 branch:
https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi/?p=tryton/tryton-modules-project.git;a=commitdiff;h=debian/3.4.1-1-6-g4d8347d
commit 4d8347df1fd4024838a7f38ab12944bd68ca50ee
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Mon Oct 3 12:53:29 2016 +0200
Releasing debian version 3.4.2-1.
Signed-off-by: Mathias Behrle <mathiasb at m9s.biz>
diff --git a/debian/changelog b/debian/changelog
index 67183fc..99bc5e9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+tryton-modules-project (3.4.2-1) unstable; urgency=medium
+
+ * Wrapping and sorting control files (wrap-and-sort -bts).
+ * Setting the branch in the watch file to the fixed version 3.4.
+ * Updating signing-key.asc with the actual upstream maintainer keys.
+ * Merging upstream version 3.4.2.
+ * Updating copyright file.
+
+ -- Mathias Behrle <mathiasb at m9s.biz> Mon, 03 Oct 2016 12:53:29 +0200
+
tryton-modules-project (3.4.1-1) unstable; urgency=medium
* Adding actual upstream signing key.
commit 2fbb06e004ba0b6c30807829062081d8aa129f71
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Mon Oct 3 12:53:28 2016 +0200
Updating copyright file.
diff --git a/debian/copyright b/debian/copyright
index 7747231..316f83e 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: 2008-2015 Cédric Krier
- 2008-2015 B2CK SPRL
+Copyright: 2008-2016 Cédric Krier
+ 2008-2016 B2CK SPRL
2009-2013 Bertrand Chenal
License: GPL-3+
commit e3a55e5c1eb251ddff0da9e04520eaf9d63036f9
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Mon Oct 3 12:53:28 2016 +0200
Merging upstream version 3.4.2.
diff --git a/CHANGELOG b/CHANGELOG
index 311b11c..3d3f4bb 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 3.4.2 - 2016-10-02
+* Bug fixes (see mercurial logs for details)
+
Version 3.4.1 - 2015-02-22
* Bug fixes (see mercurial logs for details)
diff --git a/COPYRIGHT b/COPYRIGHT
index dde6c87..60f26e4 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,5 +1,5 @@
-Copyright (C) 2008-2015 Cédric Krier.
-Copyright (C) 2008-2015 B2CK SPRL.
+Copyright (C) 2008-2016 Cédric Krier.
+Copyright (C) 2008-2016 B2CK SPRL.
Copyright (C) 2009-2013 Bertrand Chenal.
This program is free software: you can redistribute it and/or modify
diff --git a/PKG-INFO b/PKG-INFO
index 873e0da..8e1323a 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: trytond_project
-Version: 3.4.1
+Version: 3.4.2
Summary: Tryton module with projects
Home-page: http://www.tryton.org/
Author: Tryton
diff --git a/tryton.cfg b/tryton.cfg
index 28ebaec..59e1f57 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
[tryton]
-version=3.4.1
+version=3.4.2
depends:
company_work_time
ir
diff --git a/trytond_project.egg-info/PKG-INFO b/trytond_project.egg-info/PKG-INFO
index d2ceb8c..2a81531 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.4.1
+Version: 3.4.2
Summary: Tryton module with projects
Home-page: http://www.tryton.org/
Author: Tryton
diff --git a/trytond_project.egg-info/requires.txt b/trytond_project.egg-info/requires.txt
index b3cb3e4..298437f 100644
--- a/trytond_project.egg-info/requires.txt
+++ b/trytond_project.egg-info/requires.txt
@@ -1,4 +1,4 @@
trytond_company_work_time >= 3.4, < 3.5
trytond_party >= 3.4, < 3.5
trytond_timesheet >= 3.4, < 3.5
-trytond >= 3.4, < 3.5
\ No newline at end of file
+trytond >= 3.4, < 3.5
diff --git a/work.py b/work.py
index 513cdd0..d3e51cd 100644
--- a/work.py
+++ b/work.py
@@ -338,7 +338,9 @@ class Work(ModelSQL, ModelView):
super(Work, cls).delete(project_works)
- TimesheetWork.delete(timesheet_works)
+ if timesheet_works:
+ with Transaction().set_context(_check_access=False):
+ TimesheetWork.delete(timesheet_works)
@classmethod
def search_global(cls, text):
--
tryton-modules-project
More information about the tryton-debian-vcs
mailing list