[tryton-debian-vcs] tryton-modules-project branch debian-stretch-4.2 updated. debian/4.2.0-1-5-g64dc1db
Mathias Behrle
tryton-debian-vcs at alioth.debian.org
Thu Aug 17 12:37:19 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.git;a=commitdiff;h=debian/4.2.0-1-5-g64dc1db
commit 64dc1db79d65f7d8ca831cd2cdecaf7997e58742
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Thu Aug 17 12:28:14 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 87d24d5..8a74aaf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+tryton-modules-project (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> Thu, 17 Aug 2017 12:28:14 +0200
+
tryton-modules-project (4.2.0-1) unstable; urgency=medium
* Merging upstream version 4.2.0.
commit d03d368888882565648b2f4bb04834f1ede2288f
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Thu Aug 17 12:28:14 2017 +0200
Updating copyright file.
diff --git a/debian/copyright b/debian/copyright
index cb051af..6d3e548 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-2016 Cédric Krier
- 2008-2016 B2CK SPRL
+Copyright: 2008-2017 Cédric Krier
+ 2008-2017 B2CK SPRL
2009-2013 Bertrand Chenal
License: GPL-3+
commit 6f3173e7ea96eb16f06235cd4bfeba94f7b71a8c
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Thu Aug 17 12:28:14 2017 +0200
Merging upstream version 4.2.1.
diff --git a/CHANGELOG b/CHANGELOG
index c08094f..89d7080 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 4.2.1 - 2017-08-08
+* Bug fixes (see mercurial logs for details)
+
Version 4.2.0 - 2016-11-28
* Bug fixes (see mercurial logs for details)
* Use origin on Timesheet Work
diff --git a/COPYRIGHT b/COPYRIGHT
index 60f26e4..30adae7 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,5 +1,5 @@
-Copyright (C) 2008-2016 Cédric Krier.
-Copyright (C) 2008-2016 B2CK SPRL.
+Copyright (C) 2008-2017 Cédric Krier.
+Copyright (C) 2008-2017 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 7feabf4..df8cb04 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: trytond_project
-Version: 4.2.0
+Version: 4.2.1
Summary: Tryton module with 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 ecdbf02..b5bf5d7 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
[tryton]
-version=4.2.0
+version=4.2.1
depends:
company_work_time
ir
diff --git a/trytond_project.egg-info/PKG-INFO b/trytond_project.egg-info/PKG-INFO
index b94701a..ef11935 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: 4.2.0
+Version: 4.2.1
Summary: Tryton module with projects
Home-page: http://www.tryton.org/
Author: Tryton
diff --git a/work.py b/work.py
index cdb95a0..e6eb4de 100644
--- a/work.py
+++ b/work.py
@@ -90,9 +90,8 @@ class Work(sequence_ordered(), ModelSQL, ModelView):
left='left', right='right', ondelete='RESTRICT',
domain=[
('company', '=', Eval('company', -1)),
- ('id', '!=', Eval('id', -1)),
],
- depends=['company', 'id'])
+ depends=['company'])
left = fields.Integer('Left', required=True, select=True)
right = fields.Integer('Right', required=True, select=True)
children = fields.One2Many('project.work', 'parent', 'Children',
@@ -236,6 +235,7 @@ class Work(sequence_ordered(), ModelSQL, ModelView):
@classmethod
def validate(cls, works):
super(Work, cls).validate(works)
+ cls.check_recursion(works, rec_name='name')
for work in works:
work.check_state()
--
tryton-modules-project
More information about the tryton-debian-vcs
mailing list