[tryton-debian-vcs] tryton-modules-timesheet-cost branch debian-stretch-4.2 updated. debian/4.2.0-1-7-g451d4aa

[Mathias Behrle]

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-timesheet-cost.git;a=commitdiff;h=debian/4.2.0-1-7-g451d4aa

commit 451d4aa43e29df659fa3b8d117a3caf30e511b54
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Tue Sep 5 14:20:38 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 cc797c7..50fb331 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+tryton-modules-timesheet-cost (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 14:20:37 +0200
+
 tryton-modules-timesheet-cost (4.2.0-1) unstable; urgency=medium
 
   * Updating to Standards-Version: 3.9.8, no changes needed.
commit 86c42670612b929fb2d3f35db7a314d67612ba58
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Tue Sep 5 14:20:37 2017 +0200

    Updating copyright file.

diff --git a/debian/copyright b/debian/copyright
index 8c2b744..621a903 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,8 +1,8 @@
 Format: https://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
 License: GPL-3+
 
 Files: debian/*
commit 27e94ce64492cbf73c2f1a25cbca1978ccc9a9dd
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Tue Sep 5 14:20:37 2017 +0200

    Merging upstream version 4.2.1.

diff --git a/CHANGELOG b/CHANGELOG
index 43de57a..2531d5d 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)
 
diff --git a/COPYRIGHT b/COPYRIGHT
index 00cf5e6..0a0f6e2 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.
 
 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 b22817d..77bbab3 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: trytond_timesheet_cost
-Version: 4.2.0
+Version: 4.2.1
 Summary: Tryton module to add cost on timesheet
 Home-page: http://www.tryton.org/
 Author: Tryton
diff --git a/company.py b/company.py
index 1872a0c..6dacf45 100644
--- a/company.py
+++ b/company.py
@@ -73,7 +73,6 @@ class Employee:
 class EmployeeCostPrice(ModelSQL, ModelView):
     'Employee Cost Price'
     __name__ = 'company.employee_cost_price'
-    _rec_name = 'date'
     date = fields.Date('Date', required=True, select=True)
     cost_price = fields.Numeric('Cost Price',
         digits=price_digits, required=True, help="Hourly cost price")
@@ -108,6 +107,9 @@ class EmployeeCostPrice(ModelSQL, ModelView):
         Date = Pool().get('ir.date')
         return Date.today()
 
+    def get_rec_name(self, name):
+        return str(self.date)
+
     @classmethod
     def delete(cls, prices):
         Employee = Pool().get('company.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 664c177..c82693c 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
 [tryton]
-version=4.2.0
+version=4.2.1
 depends:
     ir
     company
diff --git a/trytond_timesheet_cost.egg-info/PKG-INFO b/trytond_timesheet_cost.egg-info/PKG-INFO
index 35920db..13effb7 100644
--- a/trytond_timesheet_cost.egg-info/PKG-INFO
+++ b/trytond_timesheet_cost.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: trytond-timesheet-cost
-Version: 4.2.0
+Version: 4.2.1
 Summary: Tryton module to add cost on timesheet
 Home-page: http://www.tryton.org/
 Author: Tryton
-- 
tryton-modules-timesheet-cost