[tryton-debian-vcs] tryton-modules-timesheet-cost branch upstream updated. upstream/4.4.0-1-ge58e6c3
Mathias Behrle
tryton-debian-vcs at alioth.debian.org
Tue Sep 5 13:27:38 UTC 2017
The following commit has been merged in the upstream branch:
https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi/?p=tryton/tryton-modules-timesheet-cost.git;a=commitdiff;h=upstream/4.4.0-1-ge58e6c3
commit e58e6c300a71a3d169dad0be743e3e96d96670fb
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Tue Sep 5 14:18:52 2017 +0200
Adding upstream version 4.4.1.
Signed-off-by: Mathias Behrle <mathiasb at m9s.biz>
diff --git a/CHANGELOG b/CHANGELOG
index 5db92c3..9d3af8c 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 4.4.1 - 2017-09-04
+* Bug fixes (see mercurial logs for details)
+
Version 4.4.0 - 2017-05-01
* Bug fixes (see mercurial logs for details)
diff --git a/PKG-INFO b/PKG-INFO
index baefab1..58fdf00 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: trytond_timesheet_cost
-Version: 4.4.0
+Version: 4.4.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 3038395..4c327f6 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
[tryton]
-version=4.4.0
+version=4.4.1
depends:
ir
company
diff --git a/trytond_timesheet_cost.egg-info/PKG-INFO b/trytond_timesheet_cost.egg-info/PKG-INFO
index ea5365f..b683f9b 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.4.0
+Version: 4.4.1
Summary: Tryton module to add cost on timesheet
Home-page: http://www.tryton.org/
Author: Tryton
--
tryton-modules-timesheet-cost
More information about the tryton-debian-vcs
mailing list