[tryton-debian-vcs] tryton-modules-company branch debian-stretch-4.2 updated. debian/4.2.0-1-7-g28c2743
Mathias Behrle
tryton-debian-vcs at alioth.debian.org
Tue Sep 5 13:20:34 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-company.git;a=commitdiff;h=debian/4.2.0-1-7-g28c2743
commit 28c274306e7d838d886fe5b95207fad522fa46c9
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Tue Sep 5 13:46:35 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 e72bee1..9d5d3e0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+tryton-modules-company (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.
+ * Use the preferred https URL format in the copyright file.
+ * Bump the Standards-Version to 4.0.1.
+ * Merging upstream version 4.2.1.
+ * Updating copyright file.
+
+ -- Mathias Behrle <mathiasb at m9s.biz> Tue, 05 Sep 2017 13:46:35 +0200
+
tryton-modules-company (4.2.0-1) unstable; urgency=medium
* Merging upstream version 4.2.0.
commit 64e13ec38e59511097acaa9b0d05b3e959a3d04d
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Tue Sep 5 13:46:34 2017 +0200
Updating copyright file.
diff --git a/debian/copyright b/debian/copyright
index 6061ade..955996e 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,9 +1,9 @@
Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Files: *
-Copyright: 2008-2016 Cédric Krier
+Copyright: 2008-2017 Cédric Krier
2008-2013 Bertrand Chenal
- 2008-2016 B2CK SPRL
+ 2008-2017 B2CK SPRL
License: GPL-3+
Files: debian/*
commit c8e19d43e5ef3e51dfed458464db6f2fc63154fa
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Tue Sep 5 13:46:34 2017 +0200
Merging upstream version 4.2.1.
diff --git a/CHANGELOG b/CHANGELOG
index 4a7b56f..ff2b777 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 4.2.1 - 2017-09-04
+* Bug fixes (see mercurial logs for details)
+
Version 4.2.0 - 2016-11-28
* Bug fixes (see mercurial logs for details)
* Add start and end dates on employee
diff --git a/COPYRIGHT b/COPYRIGHT
index fcc5eeb..5af5413 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,6 +1,6 @@
-Copyright (C) 2008-2016 Cédric Krier.
+Copyright (C) 2008-2017 Cédric Krier.
Copyright (C) 2008-2013 Bertrand Chenal.
-Copyright (C) 2008-2016 B2CK SPRL.
+Copyright (C) 2008-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 1de5f10..e04ee43 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: trytond_company
-Version: 4.2.0
+Version: 4.2.1
Summary: Tryton module with companies and employees
Home-page: http://www.tryton.org/
Author: Tryton
diff --git a/company.py b/company.py
index 3223270..f5f9c2d 100644
--- a/company.py
+++ b/company.py
@@ -26,7 +26,6 @@ __all__ = ['Company', 'Employee', 'UserEmployee', 'User', 'Property',
class Company(ModelSQL, ModelView):
'Company'
__name__ = 'company.company'
- _rec_name = 'party'
party = fields.Many2One('party.party', 'Party', required=True,
ondelete='CASCADE')
parent = fields.Many2One('company.company', 'Parent')
@@ -50,6 +49,10 @@ class Company(ModelSQL, ModelView):
return self.party.rec_name
@classmethod
+ def search_rec_name(cls, name, clause):
+ return [('party',) + tuple(clause[1:])]
+
+ @classmethod
def write(cls, companies, values, *args):
super(Company, cls).write(companies, values, *args)
# Restart the cache on the domain_get method
@@ -59,7 +62,6 @@ class Company(ModelSQL, ModelView):
class Employee(ModelSQL, ModelView):
'Employee'
__name__ = 'company.employee'
- _rec_name = 'party'
party = fields.Many2One('party.party', 'Party', required=True)
company = fields.Many2One('company.company', 'Company', required=True)
start_date = fields.Date('Start Date',
@@ -84,6 +86,9 @@ class Employee(ModelSQL, ModelView):
def get_rec_name(self, name):
return self.party.rec_name
+ @classmethod
+ def search_rec_name(cls, name, clause):
+ return [('party',) + tuple(clause[1:])]
class UserEmployee(ModelSQL):
'User - Employee'
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 1500066..3aa4c3a 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
[tryton]
-version=4.2.0
+version=4.2.1
depends:
currency
ir
diff --git a/trytond_company.egg-info/PKG-INFO b/trytond_company.egg-info/PKG-INFO
index 29f2880..0d4080c 100644
--- a/trytond_company.egg-info/PKG-INFO
+++ b/trytond_company.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: trytond-company
-Version: 4.2.0
+Version: 4.2.1
Summary: Tryton module with companies and employees
Home-page: http://www.tryton.org/
Author: Tryton
--
tryton-modules-company
More information about the tryton-debian-vcs
mailing list