[tryton-debian-vcs] tryton-modules-timesheet branch upstream updated. upstream/4.4.1-1-gcbdabc1
Mathias Behrle
tryton-debian-vcs at alioth.debian.org
Fri Nov 10 12:24:10 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.git;a=commitdiff;h=upstream/4.4.1-1-gcbdabc1
commit cbdabc131c7c8dbd4c5748f7a5b6f12a27b0d44c
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Mon Nov 6 14:41:31 2017 +0100
Adding upstream version 4.6.0.
Signed-off-by: Mathias Behrle <mathiasb at m9s.biz>
diff --git a/.drone.yml b/.drone.yml
new file mode 100644
index 0000000..e0bc2f7
--- /dev/null
+++ b/.drone.yml
@@ -0,0 +1,51 @@
+clone:
+ hg:
+ image: plugins/hg
+
+pipeline:
+ tox:
+ image: ${IMAGE}
+ environment:
+ - CFLAGS=-O0
+ - DB_CACHE=/cache
+ - TOX_TESTENV_PASSENV=CFLAGS DB_CACHE
+ - POSTGRESQL_URI=postgresql://postgres@postgresql:5432/
+ commands:
+ - pip install tox
+ - tox -e "${TOXENV}-${DATABASE}"
+ volumes:
+ - cache:/root/.cache
+
+services:
+ postgresql:
+ image: postgres
+ when:
+ matrix:
+ DATABASE: postgresql
+
+matrix:
+ include:
+ - IMAGE: python:2.7
+ TOXENV: py27
+ DATABASE: sqlite
+ - IMAGE: python:2.7
+ TOXENV: py27
+ DATABASE: postgresql
+ - IMAGE: python:3.4
+ TOXENV: py34
+ DATABASE: sqlite
+ - IMAGE: python:3.4
+ TOXENV: py34
+ DATABASE: postgresql
+ - IMAGE: python:3.5
+ TOXENV: py35
+ DATABASE: sqlite
+ - IMAGE: python:3.5
+ TOXENV: py35
+ DATABASE: postgresql
+ - IMAGE: python:3.6
+ TOXENV: py36
+ DATABASE: sqlite
+ - IMAGE: python:3.6
+ TOXENV: py36
+ DATABASE: postgresql
diff --git a/CHANGELOG b/CHANGELOG
index 5288cf3..9518d05 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,4 +1,4 @@
-Version 4.4.1 - 2017-06-06
+Version 4.6.0 - 2017-10-30
* Bug fixes (see mercurial logs for details)
Version 4.4.0 - 2017-05-01
diff --git a/PKG-INFO b/PKG-INFO
index 7fcfe37..3142ae3 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,12 +1,12 @@
Metadata-Version: 1.1
Name: trytond_timesheet
-Version: 4.4.1
+Version: 4.6.0
Summary: Tryton module with timesheets
Home-page: http://www.tryton.org/
Author: Tryton
Author-email: issue_tracker at tryton.org
License: GPL-3
-Download-URL: http://downloads.tryton.org/4.4/
+Download-URL: http://downloads.tryton.org/4.6/
Description: trytond_timesheet
=================
@@ -70,9 +70,9 @@ Classifier: Natural Language :: Slovenian
Classifier: Natural Language :: Spanish
Classifier: Operating System :: OS Independent
Classifier: Programming Language :: Python :: 2.7
-Classifier: Programming Language :: Python :: 3.3
Classifier: Programming Language :: Python :: 3.4
Classifier: Programming Language :: Python :: 3.5
+Classifier: Programming Language :: Python :: 3.6
Classifier: Programming Language :: Python :: Implementation :: CPython
Classifier: Programming Language :: Python :: Implementation :: PyPy
Classifier: Topic :: Office/Business
diff --git a/locale/bg.po b/locale/bg.po
index 579006f..4792732 100644
--- a/locale/bg.po
+++ b/locale/bg.po
@@ -1,4 +1,4 @@
-#
+#
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
@@ -37,8 +37,8 @@ msgid "ID"
msgstr "ID"
msgctxt "field:timesheet.hours_employee,rec_name:"
-msgid "Name"
-msgstr "Име"
+msgid "Record Name"
+msgstr ""
msgctxt "field:timesheet.hours_employee,write_date:"
msgid "Write Date"
@@ -94,8 +94,8 @@ msgid "Month"
msgstr "Месец"
msgctxt "field:timesheet.hours_employee_monthly,rec_name:"
-msgid "Name"
-msgstr "Име"
+msgid "Record Name"
+msgstr ""
msgctxt "field:timesheet.hours_employee_monthly,write_date:"
msgid "Write Date"
@@ -131,8 +131,8 @@ msgid "ID"
msgstr "ID"
msgctxt "field:timesheet.hours_employee_weekly,rec_name:"
-msgid "Name"
-msgstr "Име"
+msgid "Record Name"
+msgstr ""
msgctxt "field:timesheet.hours_employee_weekly,week:"
msgid "Week"
@@ -190,8 +190,8 @@ msgid "ID"
msgstr "ID"
msgctxt "field:timesheet.line,rec_name:"
-msgid "Name"
-msgstr "Име"
+msgid "Record Name"
+msgstr ""
msgctxt "field:timesheet.line,work:"
msgid "Work"
@@ -251,8 +251,8 @@ msgid "Origin"
msgstr "Източник"
msgctxt "field:timesheet.work,rec_name:"
-msgid "Name"
-msgstr "Име"
+msgid "Record Name"
+msgstr ""
#, fuzzy
msgctxt "field:timesheet.work,timesheet_end_date:"
diff --git a/locale/ca.po b/locale/ca.po
index 7111851..e89897b 100644
--- a/locale/ca.po
+++ b/locale/ca.po
@@ -1,4 +1,4 @@
-#
+#
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
@@ -38,8 +38,8 @@ msgid "ID"
msgstr "ID"
msgctxt "field:timesheet.hours_employee,rec_name:"
-msgid "Name"
-msgstr "Nom"
+msgid "Record Name"
+msgstr "Nom del registre"
msgctxt "field:timesheet.hours_employee,write_date:"
msgid "Write Date"
@@ -90,8 +90,8 @@ msgid "Month"
msgstr "Mes"
msgctxt "field:timesheet.hours_employee_monthly,rec_name:"
-msgid "Name"
-msgstr "Nom"
+msgid "Record Name"
+msgstr "Nom del registre"
msgctxt "field:timesheet.hours_employee_monthly,write_date:"
msgid "Write Date"
@@ -126,8 +126,8 @@ msgid "ID"
msgstr "ID"
msgctxt "field:timesheet.hours_employee_weekly,rec_name:"
-msgid "Name"
-msgstr "Nom"
+msgid "Record Name"
+msgstr "Nom del registre"
msgctxt "field:timesheet.hours_employee_weekly,week:"
msgid "Week"
@@ -182,8 +182,8 @@ msgid "ID"
msgstr "ID"
msgctxt "field:timesheet.line,rec_name:"
-msgid "Name"
-msgstr "Nom"
+msgid "Record Name"
+msgstr "Nom del registre"
msgctxt "field:timesheet.line,work:"
msgid "Work"
@@ -242,8 +242,8 @@ msgid "Origin"
msgstr "Origen"
msgctxt "field:timesheet.work,rec_name:"
-msgid "Name"
-msgstr "Nom"
+msgid "Record Name"
+msgstr "Nom del registre"
msgctxt "field:timesheet.work,timesheet_end_date:"
msgid "Timesheet End"
diff --git a/locale/cs.po b/locale/cs.po
index cf86a8e..f1ffb43 100644
--- a/locale/cs.po
+++ b/locale/cs.po
@@ -1,4 +1,4 @@
-#
+#
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
@@ -35,10 +35,9 @@ msgctxt "field:timesheet.hours_employee,id:"
msgid "ID"
msgstr ""
-#, fuzzy
msgctxt "field:timesheet.hours_employee,rec_name:"
-msgid "Name"
-msgstr "Namu"
+msgid "Record Name"
+msgstr ""
msgctxt "field:timesheet.hours_employee,write_date:"
msgid "Write Date"
@@ -88,10 +87,9 @@ msgctxt "field:timesheet.hours_employee_monthly,month_internal:"
msgid "Month"
msgstr ""
-#, fuzzy
msgctxt "field:timesheet.hours_employee_monthly,rec_name:"
-msgid "Name"
-msgstr "Namu"
+msgid "Record Name"
+msgstr ""
msgctxt "field:timesheet.hours_employee_monthly,write_date:"
msgid "Write Date"
@@ -125,10 +123,9 @@ msgctxt "field:timesheet.hours_employee_weekly,id:"
msgid "ID"
msgstr ""
-#, fuzzy
msgctxt "field:timesheet.hours_employee_weekly,rec_name:"
-msgid "Name"
-msgstr "Namu"
+msgid "Record Name"
+msgstr ""
msgctxt "field:timesheet.hours_employee_weekly,week:"
msgid "Week"
@@ -182,10 +179,9 @@ msgctxt "field:timesheet.line,id:"
msgid "ID"
msgstr ""
-#, fuzzy
msgctxt "field:timesheet.line,rec_name:"
-msgid "Name"
-msgstr "Namu"
+msgid "Record Name"
+msgstr ""
msgctxt "field:timesheet.line,work:"
msgid "Work"
@@ -244,10 +240,9 @@ msgctxt "field:timesheet.work,origin:"
msgid "Origin"
msgstr ""
-#, fuzzy
msgctxt "field:timesheet.work,rec_name:"
-msgid "Name"
-msgstr "Namu"
+msgid "Record Name"
+msgstr ""
msgctxt "field:timesheet.work,timesheet_end_date:"
msgid "Timesheet End"
diff --git a/locale/de.po b/locale/de.po
index a5cc051..7cf2888 100644
--- a/locale/de.po
+++ b/locale/de.po
@@ -1,4 +1,4 @@
-#
+#
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
@@ -38,8 +38,8 @@ msgid "ID"
msgstr "ID"
msgctxt "field:timesheet.hours_employee,rec_name:"
-msgid "Name"
-msgstr "Name"
+msgid "Record Name"
+msgstr ""
msgctxt "field:timesheet.hours_employee,write_date:"
msgid "Write Date"
@@ -90,8 +90,8 @@ msgid "Month"
msgstr "Monat"
msgctxt "field:timesheet.hours_employee_monthly,rec_name:"
-msgid "Name"
-msgstr "Name"
+msgid "Record Name"
+msgstr ""
msgctxt "field:timesheet.hours_employee_monthly,write_date:"
msgid "Write Date"
@@ -126,8 +126,8 @@ msgid "ID"
msgstr "ID"
msgctxt "field:timesheet.hours_employee_weekly,rec_name:"
-msgid "Name"
-msgstr "Name"
+msgid "Record Name"
+msgstr ""
msgctxt "field:timesheet.hours_employee_weekly,week:"
msgid "Week"
@@ -182,8 +182,8 @@ msgid "ID"
msgstr "ID"
msgctxt "field:timesheet.line,rec_name:"
-msgid "Name"
-msgstr "Name"
+msgid "Record Name"
+msgstr ""
msgctxt "field:timesheet.line,work:"
msgid "Work"
@@ -242,8 +242,8 @@ msgid "Origin"
msgstr "Herkunft"
msgctxt "field:timesheet.work,rec_name:"
-msgid "Name"
-msgstr "Name"
+msgid "Record Name"
+msgstr ""
msgctxt "field:timesheet.work,timesheet_end_date:"
msgid "Timesheet End"
diff --git a/locale/es.po b/locale/es.po
index 55ca327..4c891c7 100644
--- a/locale/es.po
+++ b/locale/es.po
@@ -1,4 +1,4 @@
-#
+#
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
@@ -38,8 +38,8 @@ msgid "ID"
msgstr "ID"
msgctxt "field:timesheet.hours_employee,rec_name:"
-msgid "Name"
-msgstr "Nombre"
+msgid "Record Name"
+msgstr "Nombre del registro"
msgctxt "field:timesheet.hours_employee,write_date:"
msgid "Write Date"
@@ -90,8 +90,8 @@ msgid "Month"
msgstr "Mes"
msgctxt "field:timesheet.hours_employee_monthly,rec_name:"
-msgid "Name"
-msgstr "Nombre"
+msgid "Record Name"
+msgstr "Nombre del registro"
msgctxt "field:timesheet.hours_employee_monthly,write_date:"
msgid "Write Date"
@@ -126,8 +126,8 @@ msgid "ID"
msgstr "ID"
msgctxt "field:timesheet.hours_employee_weekly,rec_name:"
-msgid "Name"
-msgstr "Nombre"
+msgid "Record Name"
+msgstr "Nombre del registro"
msgctxt "field:timesheet.hours_employee_weekly,week:"
msgid "Week"
@@ -182,8 +182,8 @@ msgid "ID"
msgstr "ID"
msgctxt "field:timesheet.line,rec_name:"
-msgid "Name"
-msgstr "Nombre"
+msgid "Record Name"
+msgstr "Nombre del registro"
msgctxt "field:timesheet.line,work:"
msgid "Work"
@@ -242,8 +242,8 @@ msgid "Origin"
msgstr "Origen"
msgctxt "field:timesheet.work,rec_name:"
-msgid "Name"
-msgstr "Nombre"
+msgid "Record Name"
+msgstr "Nombre del registro"
msgctxt "field:timesheet.work,timesheet_end_date:"
msgid "Timesheet End"
diff --git a/locale/es_419.po b/locale/es_419.po
index 79a39db..bde2610 100644
--- a/locale/es_419.po
+++ b/locale/es_419.po
@@ -1,4 +1,4 @@
-#
+#
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
@@ -36,7 +36,7 @@ msgid "ID"
msgstr ""
msgctxt "field:timesheet.hours_employee,rec_name:"
-msgid "Name"
+msgid "Record Name"
msgstr ""
msgctxt "field:timesheet.hours_employee,write_date:"
@@ -88,7 +88,7 @@ msgid "Month"
msgstr ""
msgctxt "field:timesheet.hours_employee_monthly,rec_name:"
-msgid "Name"
+msgid "Record Name"
msgstr ""
msgctxt "field:timesheet.hours_employee_monthly,write_date:"
@@ -124,7 +124,7 @@ msgid "ID"
msgstr ""
msgctxt "field:timesheet.hours_employee_weekly,rec_name:"
-msgid "Name"
+msgid "Record Name"
msgstr ""
msgctxt "field:timesheet.hours_employee_weekly,week:"
@@ -180,7 +180,7 @@ msgid "ID"
msgstr ""
msgctxt "field:timesheet.line,rec_name:"
-msgid "Name"
+msgid "Record Name"
msgstr ""
msgctxt "field:timesheet.line,work:"
@@ -240,7 +240,7 @@ msgid "Origin"
msgstr ""
msgctxt "field:timesheet.work,rec_name:"
-msgid "Name"
+msgid "Record Name"
msgstr ""
msgctxt "field:timesheet.work,timesheet_end_date:"
diff --git a/locale/fr.po b/locale/fr.po
index 99782e7..2dade24 100644
--- a/locale/fr.po
+++ b/locale/fr.po
@@ -1,4 +1,4 @@
-#
+#
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
@@ -37,8 +37,8 @@ msgid "ID"
msgstr "ID"
msgctxt "field:timesheet.hours_employee,rec_name:"
-msgid "Name"
-msgstr "Nom"
+msgid "Record Name"
+msgstr "Nom de l'enregistrement"
msgctxt "field:timesheet.hours_employee,write_date:"
msgid "Write Date"
@@ -89,8 +89,8 @@ msgid "Month"
msgstr "Mois"
msgctxt "field:timesheet.hours_employee_monthly,rec_name:"
-msgid "Name"
-msgstr "Nom"
+msgid "Record Name"
+msgstr "Nom de l'enregistrement"
msgctxt "field:timesheet.hours_employee_monthly,write_date:"
msgid "Write Date"
@@ -125,8 +125,8 @@ msgid "ID"
msgstr "ID"
msgctxt "field:timesheet.hours_employee_weekly,rec_name:"
-msgid "Name"
-msgstr "Nom"
+msgid "Record Name"
+msgstr "Nom de l'enregistrement"
msgctxt "field:timesheet.hours_employee_weekly,week:"
msgid "Week"
@@ -181,8 +181,8 @@ msgid "ID"
msgstr "ID"
msgctxt "field:timesheet.line,rec_name:"
-msgid "Name"
-msgstr "Nom"
+msgid "Record Name"
+msgstr "Nom de l'enregistrement"
msgctxt "field:timesheet.line,work:"
msgid "Work"
@@ -241,8 +241,8 @@ msgid "Origin"
msgstr "Origine"
msgctxt "field:timesheet.work,rec_name:"
-msgid "Name"
-msgstr "Nom"
+msgid "Record Name"
+msgstr "Nom de l'enregistrement"
msgctxt "field:timesheet.work,timesheet_end_date:"
msgid "Timesheet End"
diff --git a/locale/hu_HU.po b/locale/hu_HU.po
index b573331..eac7aa0 100644
--- a/locale/hu_HU.po
+++ b/locale/hu_HU.po
@@ -1,4 +1,4 @@
-#
+#
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
@@ -36,8 +36,8 @@ msgid "ID"
msgstr "ID"
msgctxt "field:timesheet.hours_employee,rec_name:"
-msgid "Name"
-msgstr "Név"
+msgid "Record Name"
+msgstr ""
msgctxt "field:timesheet.hours_employee,write_date:"
msgid "Write Date"
@@ -90,8 +90,8 @@ msgid "Month"
msgstr "Hónap"
msgctxt "field:timesheet.hours_employee_monthly,rec_name:"
-msgid "Name"
-msgstr "Név"
+msgid "Record Name"
+msgstr ""
msgctxt "field:timesheet.hours_employee_monthly,write_date:"
msgid "Write Date"
@@ -126,8 +126,8 @@ msgid "ID"
msgstr "ID"
msgctxt "field:timesheet.hours_employee_weekly,rec_name:"
-msgid "Name"
-msgstr "Név"
+msgid "Record Name"
+msgstr ""
msgctxt "field:timesheet.hours_employee_weekly,week:"
msgid "Week"
@@ -183,8 +183,8 @@ msgid "ID"
msgstr "ID"
msgctxt "field:timesheet.line,rec_name:"
-msgid "Name"
-msgstr "Név"
+msgid "Record Name"
+msgstr ""
msgctxt "field:timesheet.line,work:"
msgid "Work"
@@ -243,8 +243,8 @@ msgid "Origin"
msgstr ""
msgctxt "field:timesheet.work,rec_name:"
-msgid "Name"
-msgstr "Név"
+msgid "Record Name"
+msgstr ""
msgctxt "field:timesheet.work,timesheet_end_date:"
msgid "Timesheet End"
diff --git a/locale/it_IT.po b/locale/it_IT.po
index e32375f..b4b7340 100644
--- a/locale/it_IT.po
+++ b/locale/it_IT.po
@@ -1,4 +1,4 @@
-#
+#
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
@@ -37,8 +37,8 @@ msgid "ID"
msgstr "ID"
msgctxt "field:timesheet.hours_employee,rec_name:"
-msgid "Name"
-msgstr "Nome"
+msgid "Record Name"
+msgstr ""
msgctxt "field:timesheet.hours_employee,write_date:"
msgid "Write Date"
@@ -89,8 +89,8 @@ msgid "Month"
msgstr "Mese"
msgctxt "field:timesheet.hours_employee_monthly,rec_name:"
-msgid "Name"
-msgstr "Nome"
+msgid "Record Name"
+msgstr ""
msgctxt "field:timesheet.hours_employee_monthly,write_date:"
msgid "Write Date"
@@ -125,8 +125,8 @@ msgid "ID"
msgstr "ID"
msgctxt "field:timesheet.hours_employee_weekly,rec_name:"
-msgid "Name"
-msgstr "Nome"
+msgid "Record Name"
+msgstr ""
msgctxt "field:timesheet.hours_employee_weekly,week:"
msgid "Week"
@@ -181,8 +181,8 @@ msgid "ID"
msgstr "ID"
msgctxt "field:timesheet.line,rec_name:"
-msgid "Name"
-msgstr "Nome"
+msgid "Record Name"
+msgstr ""
msgctxt "field:timesheet.line,work:"
msgid "Work"
@@ -241,8 +241,8 @@ msgid "Origin"
msgstr "Origine"
msgctxt "field:timesheet.work,rec_name:"
-msgid "Name"
-msgstr "Nome"
+msgid "Record Name"
+msgstr ""
msgctxt "field:timesheet.work,timesheet_end_date:"
msgid "Timesheet End"
diff --git a/locale/ja_JP.po b/locale/ja_JP.po
index e09ea87..a9f01f5 100644
--- a/locale/ja_JP.po
+++ b/locale/ja_JP.po
@@ -1,4 +1,4 @@
-#
+#
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
@@ -36,7 +36,7 @@ msgid "ID"
msgstr ""
msgctxt "field:timesheet.hours_employee,rec_name:"
-msgid "Name"
+msgid "Record Name"
msgstr ""
msgctxt "field:timesheet.hours_employee,write_date:"
@@ -88,7 +88,7 @@ msgid "Month"
msgstr ""
msgctxt "field:timesheet.hours_employee_monthly,rec_name:"
-msgid "Name"
+msgid "Record Name"
msgstr ""
msgctxt "field:timesheet.hours_employee_monthly,write_date:"
@@ -124,7 +124,7 @@ msgid "ID"
msgstr ""
msgctxt "field:timesheet.hours_employee_weekly,rec_name:"
-msgid "Name"
+msgid "Record Name"
msgstr ""
msgctxt "field:timesheet.hours_employee_weekly,week:"
@@ -180,7 +180,7 @@ msgid "ID"
msgstr ""
msgctxt "field:timesheet.line,rec_name:"
-msgid "Name"
+msgid "Record Name"
msgstr ""
#, fuzzy
@@ -241,7 +241,7 @@ msgid "Origin"
msgstr ""
msgctxt "field:timesheet.work,rec_name:"
-msgid "Name"
+msgid "Record Name"
msgstr ""
#, fuzzy
diff --git a/locale/lo.po b/locale/lo.po
index e5922d9..03b58c2 100644
--- a/locale/lo.po
+++ b/locale/lo.po
@@ -1,4 +1,4 @@
-#
+#
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
@@ -39,8 +39,8 @@ msgid "ID"
msgstr "ບັດ"
msgctxt "field:timesheet.hours_employee,rec_name:"
-msgid "Name"
-msgstr "ຊື່"
+msgid "Record Name"
+msgstr ""
msgctxt "field:timesheet.hours_employee,write_date:"
msgid "Write Date"
@@ -91,8 +91,8 @@ msgid "Month"
msgstr "ເດືອນ"
msgctxt "field:timesheet.hours_employee_monthly,rec_name:"
-msgid "Name"
-msgstr "ຊື່"
+msgid "Record Name"
+msgstr ""
msgctxt "field:timesheet.hours_employee_monthly,write_date:"
msgid "Write Date"
@@ -127,8 +127,8 @@ msgid "ID"
msgstr "ບັດ"
msgctxt "field:timesheet.hours_employee_weekly,rec_name:"
-msgid "Name"
-msgstr "ຊື່"
+msgid "Record Name"
+msgstr ""
msgctxt "field:timesheet.hours_employee_weekly,week:"
msgid "Week"
@@ -183,8 +183,8 @@ msgid "ID"
msgstr "ບັດ"
msgctxt "field:timesheet.line,rec_name:"
-msgid "Name"
-msgstr "ຊື່"
+msgid "Record Name"
+msgstr ""
msgctxt "field:timesheet.line,work:"
msgid "Work"
@@ -243,8 +243,8 @@ msgid "Origin"
msgstr "ໜ້າວຽກເດີມ"
msgctxt "field:timesheet.work,rec_name:"
-msgid "Name"
-msgstr "ຊື່"
+msgid "Record Name"
+msgstr ""
msgctxt "field:timesheet.work,timesheet_end_date:"
msgid "Timesheet End"
diff --git a/locale/lt.po b/locale/lt.po
index cf86a8e..f1ffb43 100644
--- a/locale/lt.po
+++ b/locale/lt.po
@@ -1,4 +1,4 @@
-#
+#
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
@@ -35,10 +35,9 @@ msgctxt "field:timesheet.hours_employee,id:"
msgid "ID"
msgstr ""
-#, fuzzy
msgctxt "field:timesheet.hours_employee,rec_name:"
-msgid "Name"
-msgstr "Namu"
+msgid "Record Name"
+msgstr ""
msgctxt "field:timesheet.hours_employee,write_date:"
msgid "Write Date"
@@ -88,10 +87,9 @@ msgctxt "field:timesheet.hours_employee_monthly,month_internal:"
msgid "Month"
msgstr ""
-#, fuzzy
msgctxt "field:timesheet.hours_employee_monthly,rec_name:"
-msgid "Name"
-msgstr "Namu"
+msgid "Record Name"
+msgstr ""
msgctxt "field:timesheet.hours_employee_monthly,write_date:"
msgid "Write Date"
@@ -125,10 +123,9 @@ msgctxt "field:timesheet.hours_employee_weekly,id:"
msgid "ID"
msgstr ""
-#, fuzzy
msgctxt "field:timesheet.hours_employee_weekly,rec_name:"
-msgid "Name"
-msgstr "Namu"
+msgid "Record Name"
+msgstr ""
msgctxt "field:timesheet.hours_employee_weekly,week:"
msgid "Week"
@@ -182,10 +179,9 @@ msgctxt "field:timesheet.line,id:"
msgid "ID"
msgstr ""
-#, fuzzy
msgctxt "field:timesheet.line,rec_name:"
-msgid "Name"
-msgstr "Namu"
+msgid "Record Name"
+msgstr ""
msgctxt "field:timesheet.line,work:"
msgid "Work"
@@ -244,10 +240,9 @@ msgctxt "field:timesheet.work,origin:"
msgid "Origin"
msgstr ""
-#, fuzzy
msgctxt "field:timesheet.work,rec_name:"
-msgid "Name"
-msgstr "Namu"
+msgid "Record Name"
+msgstr ""
msgctxt "field:timesheet.work,timesheet_end_date:"
msgid "Timesheet End"
diff --git a/locale/nl.po b/locale/nl.po
index cfffce5..56d0c1b 100644
--- a/locale/nl.po
+++ b/locale/nl.po
@@ -1,4 +1,4 @@
-#
+#
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
@@ -39,8 +39,8 @@ msgid "ID"
msgstr "ID"
msgctxt "field:timesheet.hours_employee,rec_name:"
-msgid "Name"
-msgstr "Naam"
+msgid "Record Name"
+msgstr ""
#, fuzzy
msgctxt "field:timesheet.hours_employee,write_date:"
@@ -100,8 +100,8 @@ msgid "Month"
msgstr "Maand"
msgctxt "field:timesheet.hours_employee_monthly,rec_name:"
-msgid "Name"
-msgstr "Naam"
+msgid "Record Name"
+msgstr ""
#, fuzzy
msgctxt "field:timesheet.hours_employee_monthly,write_date:"
@@ -141,8 +141,8 @@ msgid "ID"
msgstr "ID"
msgctxt "field:timesheet.hours_employee_weekly,rec_name:"
-msgid "Name"
-msgstr "Naam"
+msgid "Record Name"
+msgstr ""
msgctxt "field:timesheet.hours_employee_weekly,week:"
msgid "Week"
@@ -204,8 +204,8 @@ msgid "ID"
msgstr "ID"
msgctxt "field:timesheet.line,rec_name:"
-msgid "Name"
-msgstr "Naam"
+msgid "Record Name"
+msgstr ""
msgctxt "field:timesheet.line,work:"
msgid "Work"
@@ -273,8 +273,8 @@ msgid "Origin"
msgstr "Oorsprong"
msgctxt "field:timesheet.work,rec_name:"
-msgid "Name"
-msgstr "Naam"
+msgid "Record Name"
+msgstr ""
#, fuzzy
msgctxt "field:timesheet.work,timesheet_end_date:"
diff --git a/locale/pl.po b/locale/pl.po
index 79d7a05..c35f7bf 100644
--- a/locale/pl.po
+++ b/locale/pl.po
@@ -1,4 +1,4 @@
-#
+#
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
@@ -36,8 +36,8 @@ msgid "ID"
msgstr "ID"
msgctxt "field:timesheet.hours_employee,rec_name:"
-msgid "Name"
-msgstr "Nazwa"
+msgid "Record Name"
+msgstr "Nazwa rekordu"
msgctxt "field:timesheet.hours_employee,write_date:"
msgid "Write Date"
@@ -88,8 +88,8 @@ msgid "Month"
msgstr "Miesiąc"
msgctxt "field:timesheet.hours_employee_monthly,rec_name:"
-msgid "Name"
-msgstr "Nazwa"
+msgid "Record Name"
+msgstr "Nazwa rekordu"
msgctxt "field:timesheet.hours_employee_monthly,write_date:"
msgid "Write Date"
@@ -124,8 +124,8 @@ msgid "ID"
msgstr "ID"
msgctxt "field:timesheet.hours_employee_weekly,rec_name:"
-msgid "Name"
-msgstr "Nazwa"
+msgid "Record Name"
+msgstr "Nazwa rekordu"
msgctxt "field:timesheet.hours_employee_weekly,week:"
msgid "Week"
@@ -180,8 +180,8 @@ msgid "ID"
msgstr "ID"
msgctxt "field:timesheet.line,rec_name:"
-msgid "Name"
-msgstr "Nazwa"
+msgid "Record Name"
+msgstr "Nazwa rekordu"
msgctxt "field:timesheet.line,work:"
msgid "Work"
@@ -237,11 +237,11 @@ msgstr "Nazwa"
msgctxt "field:timesheet.work,origin:"
msgid "Origin"
-msgstr "Pochodzenie"
+msgstr "Źródło"
msgctxt "field:timesheet.work,rec_name:"
-msgid "Name"
-msgstr "Nazwa"
+msgid "Record Name"
+msgstr "Nazwa rekordu"
#, fuzzy
msgctxt "field:timesheet.work,timesheet_end_date:"
@@ -271,7 +271,7 @@ msgstr "Zapisał"
msgctxt "field:timesheet.work.context,from_date:"
msgid "From Date"
-msgstr ""
+msgstr "Od dnia"
msgctxt "field:timesheet.work.context,id:"
msgid "ID"
@@ -279,7 +279,7 @@ msgstr "ID"
msgctxt "field:timesheet.work.context,to_date:"
msgid "To Date"
-msgstr ""
+msgstr "Do dnia"
msgctxt "help:timesheet.line,company:"
msgid "The company on which the time is spent."
@@ -317,7 +317,6 @@ msgctxt "help:timesheet.work,company:"
msgid "Make the work belong to the company."
msgstr ""
-#, fuzzy
msgctxt "help:timesheet.work,duration:"
msgid "Total time spent on this work."
msgstr "Całkowity czas pracy"
@@ -364,15 +363,15 @@ msgstr "Godziny wg pracownika na tydzień"
msgctxt "model:ir.action,name:act_line_enter"
msgid "Enter Timesheet"
-msgstr "Enter Timesheet"
+msgstr ""
msgctxt "model:ir.action,name:act_line_form"
msgid "Timesheet Lines"
-msgstr "Timesheet Lines"
+msgstr ""
msgctxt "model:ir.action,name:act_line_form_work"
msgid "Timesheet Lines"
-msgstr "Timesheet Lines"
+msgstr ""
msgctxt "model:ir.action,name:act_work_list"
msgid "Works"
@@ -400,19 +399,19 @@ msgstr "Godziny wg pracownika na tydzień"
msgctxt "model:ir.ui.menu,name:menu_line_enter"
msgid "Enter Timesheet"
-msgstr "Enter Timesheet"
+msgstr ""
msgctxt "model:ir.ui.menu,name:menu_line_form"
msgid "Timesheet Lines"
-msgstr "Timesheet Lines"
+msgstr ""
msgctxt "model:ir.ui.menu,name:menu_reporting"
msgid "Reporting"
-msgstr "Reporting"
+msgstr ""
msgctxt "model:ir.ui.menu,name:menu_timesheet"
msgid "Timesheet"
-msgstr "Timesheet"
+msgstr ""
msgctxt "model:ir.ui.menu,name:menu_work_list"
msgid "Works"
@@ -424,7 +423,7 @@ msgstr "Prace"
msgctxt "model:res.group,name:group_timesheet_admin"
msgid "Timesheet Administration"
-msgstr "Timesheet Administration"
+msgstr ""
msgctxt "model:timesheet.hours_employee,name:"
msgid "Hours per Employee"
diff --git a/locale/pt_BR.po b/locale/pt_BR.po
index df3f13c..06bdd13 100644
--- a/locale/pt_BR.po
+++ b/locale/pt_BR.po
@@ -1,4 +1,4 @@
-#
+#
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
@@ -36,8 +36,8 @@ msgid "ID"
msgstr "ID"
msgctxt "field:timesheet.hours_employee,rec_name:"
-msgid "Name"
-msgstr "Nome"
+msgid "Record Name"
+msgstr "Nome do Registro"
msgctxt "field:timesheet.hours_employee,write_date:"
msgid "Write Date"
@@ -88,8 +88,8 @@ msgid "Month"
msgstr "Mês"
msgctxt "field:timesheet.hours_employee_monthly,rec_name:"
-msgid "Name"
-msgstr "Nome"
+msgid "Record Name"
+msgstr "Nome do Registro"
msgctxt "field:timesheet.hours_employee_monthly,write_date:"
msgid "Write Date"
@@ -124,8 +124,8 @@ msgid "ID"
msgstr "ID"
msgctxt "field:timesheet.hours_employee_weekly,rec_name:"
-msgid "Name"
-msgstr "Nome"
+msgid "Record Name"
+msgstr "Nome do Registro"
msgctxt "field:timesheet.hours_employee_weekly,week:"
msgid "Week"
@@ -180,8 +180,8 @@ msgid "ID"
msgstr "ID"
msgctxt "field:timesheet.line,rec_name:"
-msgid "Name"
-msgstr "Nome"
+msgid "Record Name"
+msgstr "Nome do Registro"
msgctxt "field:timesheet.line,work:"
msgid "Work"
@@ -240,8 +240,8 @@ msgid "Origin"
msgstr "Origem"
msgctxt "field:timesheet.work,rec_name:"
-msgid "Name"
-msgstr "Nome"
+msgid "Record Name"
+msgstr "Nome do Registro"
msgctxt "field:timesheet.work,timesheet_end_date:"
msgid "Timesheet End"
diff --git a/locale/ru.po b/locale/ru.po
index 5821501..9b3fe24 100644
--- a/locale/ru.po
+++ b/locale/ru.po
@@ -1,4 +1,4 @@
-#
+#
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
@@ -37,8 +37,8 @@ msgid "ID"
msgstr "ID"
msgctxt "field:timesheet.hours_employee,rec_name:"
-msgid "Name"
-msgstr "Наименование"
+msgid "Record Name"
+msgstr ""
msgctxt "field:timesheet.hours_employee,write_date:"
msgid "Write Date"
@@ -94,8 +94,8 @@ msgid "Month"
msgstr "Месяц"
msgctxt "field:timesheet.hours_employee_monthly,rec_name:"
-msgid "Name"
-msgstr "Наименование"
+msgid "Record Name"
+msgstr ""
msgctxt "field:timesheet.hours_employee_monthly,write_date:"
msgid "Write Date"
@@ -131,8 +131,8 @@ msgid "ID"
msgstr "ID"
msgctxt "field:timesheet.hours_employee_weekly,rec_name:"
-msgid "Name"
-msgstr "Наименование"
+msgid "Record Name"
+msgstr ""
msgctxt "field:timesheet.hours_employee_weekly,week:"
msgid "Week"
@@ -190,8 +190,8 @@ msgid "ID"
msgstr "ID"
msgctxt "field:timesheet.line,rec_name:"
-msgid "Name"
-msgstr "Наименование"
+msgid "Record Name"
+msgstr ""
msgctxt "field:timesheet.line,work:"
msgid "Work"
@@ -251,8 +251,8 @@ msgid "Origin"
msgstr "Первоисточник"
msgctxt "field:timesheet.work,rec_name:"
-msgid "Name"
-msgstr "Наименование"
+msgid "Record Name"
+msgstr ""
msgctxt "field:timesheet.work,timesheet_end_date:"
msgid "Timesheet End"
diff --git a/locale/sl.po b/locale/sl.po
index 267748a..dff424e 100644
--- a/locale/sl.po
+++ b/locale/sl.po
@@ -1,4 +1,4 @@
-#
+#
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
@@ -36,8 +36,8 @@ msgid "ID"
msgstr "ID"
msgctxt "field:timesheet.hours_employee,rec_name:"
-msgid "Name"
-msgstr "Ime"
+msgid "Record Name"
+msgstr ""
msgctxt "field:timesheet.hours_employee,write_date:"
msgid "Write Date"
@@ -88,8 +88,8 @@ msgid "Month"
msgstr "Mesec"
msgctxt "field:timesheet.hours_employee_monthly,rec_name:"
-msgid "Name"
-msgstr "Ime"
+msgid "Record Name"
+msgstr ""
msgctxt "field:timesheet.hours_employee_monthly,write_date:"
msgid "Write Date"
@@ -124,8 +124,8 @@ msgid "ID"
msgstr "ID"
msgctxt "field:timesheet.hours_employee_weekly,rec_name:"
-msgid "Name"
-msgstr "Ime"
+msgid "Record Name"
+msgstr ""
msgctxt "field:timesheet.hours_employee_weekly,week:"
msgid "Week"
@@ -180,8 +180,8 @@ msgid "ID"
msgstr "ID"
msgctxt "field:timesheet.line,rec_name:"
-msgid "Name"
-msgstr "Ime"
+msgid "Record Name"
+msgstr ""
msgctxt "field:timesheet.line,work:"
msgid "Work"
@@ -240,8 +240,8 @@ msgid "Origin"
msgstr "Poreklo"
msgctxt "field:timesheet.work,rec_name:"
-msgid "Name"
-msgstr "Ime"
+msgid "Record Name"
+msgstr ""
msgctxt "field:timesheet.work,timesheet_end_date:"
msgid "Timesheet End"
diff --git a/locale/zh_CN.po b/locale/zh_CN.po
index 84b82fc..4c14235 100644
--- a/locale/zh_CN.po
+++ b/locale/zh_CN.po
@@ -1,4 +1,4 @@
-#
+#
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
@@ -38,10 +38,9 @@ msgctxt "field:timesheet.hours_employee,id:"
msgid "ID"
msgstr "编号"
-#, fuzzy
msgctxt "field:timesheet.hours_employee,rec_name:"
-msgid "Name"
-msgstr "纳木"
+msgid "Record Name"
+msgstr ""
#, fuzzy
msgctxt "field:timesheet.hours_employee,write_date:"
@@ -97,10 +96,9 @@ msgctxt "field:timesheet.hours_employee_monthly,month_internal:"
msgid "Month"
msgstr ""
-#, fuzzy
msgctxt "field:timesheet.hours_employee_monthly,rec_name:"
-msgid "Name"
-msgstr "纳木"
+msgid "Record Name"
+msgstr ""
#, fuzzy
msgctxt "field:timesheet.hours_employee_monthly,write_date:"
@@ -139,10 +137,9 @@ msgctxt "field:timesheet.hours_employee_weekly,id:"
msgid "ID"
msgstr "编号"
-#, fuzzy
msgctxt "field:timesheet.hours_employee_weekly,rec_name:"
-msgid "Name"
-msgstr "纳木"
+msgid "Record Name"
+msgstr ""
msgctxt "field:timesheet.hours_employee_weekly,week:"
msgid "Week"
@@ -203,10 +200,9 @@ msgctxt "field:timesheet.line,id:"
msgid "ID"
msgstr "编号"
-#, fuzzy
msgctxt "field:timesheet.line,rec_name:"
-msgid "Name"
-msgstr "纳木"
+msgid "Record Name"
+msgstr ""
msgctxt "field:timesheet.line,work:"
msgid "Work"
@@ -273,10 +269,9 @@ msgctxt "field:timesheet.work,origin:"
msgid "Origin"
msgstr ""
-#, fuzzy
msgctxt "field:timesheet.work,rec_name:"
-msgid "Name"
-msgstr "纳木"
+msgid "Record Name"
+msgstr ""
msgctxt "field:timesheet.work,timesheet_end_date:"
msgid "Timesheet End"
diff --git a/routes.py b/routes.py
index 88e4530..40f365e 100644
--- a/routes.py
+++ b/routes.py
@@ -36,14 +36,15 @@ def timesheet_works(request, pool, employee):
works = Work.search([
('company', '=', employee.company.id),
])
- return [{
- 'id': w.id,
- 'name': w.rec_name,
- 'start': (w.timesheet_start_date.strftime('%Y-%m-%d')
- if w.timesheet_start_date else None),
- 'end': (w.timesheet_end_date.strftime('%Y-%m-%d')
- if w.timesheet_end_date else None),
- } for w in works]
+ return sorted(({
+ 'id': w.id,
+ 'name': w.rec_name,
+ 'start': (w.timesheet_start_date.strftime('%Y-%m-%d')
+ if w.timesheet_start_date else None),
+ 'end': (w.timesheet_end_date.strftime('%Y-%m-%d')
+ if w.timesheet_end_date else None),
+ } for w in works),
+ key=lambda w: w['name'].lower())
@app.route('/<database_name>/timesheet/employee/<int:employee>/lines/<date>',
diff --git a/setup.py b/setup.py
index 3b5b6ed..69970bb 100644
--- a/setup.py
+++ b/setup.py
@@ -97,9 +97,9 @@ setup(name=name,
'Natural Language :: Spanish',
'Operating System :: OS Independent',
'Programming Language :: Python :: 2.7',
- 'Programming Language :: Python :: 3.3',
'Programming Language :: Python :: 3.4',
'Programming Language :: Python :: 3.5',
+ 'Programming Language :: Python :: 3.6',
'Programming Language :: Python :: Implementation :: CPython',
'Programming Language :: Python :: Implementation :: PyPy',
'Topic :: Office/Business',
diff --git a/tox.ini b/tox.ini
new file mode 100644
index 0000000..527d859
--- /dev/null
+++ b/tox.ini
@@ -0,0 +1,18 @@
+[tox]
+envlist = {py27,py34,py35,py36}-{sqlite,postgresql,mysql},pypy-{sqlite,postgresql}
+
+[testenv]
+commands = {envpython} setup.py test
+deps =
+ {py27,py34,py35,py36}-postgresql: psycopg2 >= 2.5
+ pypy-postgresql: psycopg2cffi >= 2.5
+ mysql: MySQL-python
+ sqlite: sqlitebck
+setenv =
+ sqlite: TRYTOND_DATABASE_URI={env:SQLITE_URI:sqlite://}
+ postgresql: TRYTOND_DATABASE_URI={env:POSTGRESQL_URI:postgresql://}
+ mysql: TRYTOND_DATABASE_URI={env:MYSQL_URI:mysql://}
+ sqlite: DB_NAME={env:SQLITE_NAME::memory:}
+ postgresql: DB_NAME={env:POSTGRESQL_NAME:test}
+ mysql: DB_NAME={env:MYSQL_NAME:test}
+install_command = pip install --pre --find-links https://trydevpi.tryton.org/ {opts} {packages}
diff --git a/tryton.cfg b/tryton.cfg
index 93a4322..d7d5085 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
[tryton]
-version=4.4.1
+version=4.6.0
depends:
company
company_work_time
diff --git a/trytond_timesheet.egg-info/PKG-INFO b/trytond_timesheet.egg-info/PKG-INFO
index 55d5d2d..a3f1711 100644
--- a/trytond_timesheet.egg-info/PKG-INFO
+++ b/trytond_timesheet.egg-info/PKG-INFO
@@ -1,12 +1,12 @@
Metadata-Version: 1.1
Name: trytond-timesheet
-Version: 4.4.1
+Version: 4.6.0
Summary: Tryton module with timesheets
Home-page: http://www.tryton.org/
Author: Tryton
Author-email: issue_tracker at tryton.org
License: GPL-3
-Download-URL: http://downloads.tryton.org/4.4/
+Download-URL: http://downloads.tryton.org/4.6/
Description: trytond_timesheet
=================
@@ -70,9 +70,9 @@ Classifier: Natural Language :: Slovenian
Classifier: Natural Language :: Spanish
Classifier: Operating System :: OS Independent
Classifier: Programming Language :: Python :: 2.7
-Classifier: Programming Language :: Python :: 3.3
Classifier: Programming Language :: Python :: 3.4
Classifier: Programming Language :: Python :: 3.5
+Classifier: Programming Language :: Python :: 3.6
Classifier: Programming Language :: Python :: Implementation :: CPython
Classifier: Programming Language :: Python :: Implementation :: PyPy
Classifier: Topic :: Office/Business
diff --git a/trytond_timesheet.egg-info/SOURCES.txt b/trytond_timesheet.egg-info/SOURCES.txt
index 8516f7b..b605d26 100644
--- a/trytond_timesheet.egg-info/SOURCES.txt
+++ b/trytond_timesheet.egg-info/SOURCES.txt
@@ -1,13 +1,21 @@
+.drone.yml
+.hgtags
CHANGELOG
COPYRIGHT
INSTALL
LICENSE
MANIFEST.in
README
+__init__.py
+line.py
line.xml
+routes.py
setup.py
timesheet.xml
+tox.ini
tryton.cfg
+user.py
+work.py
work.xml
./__init__.py
./line.py
@@ -71,6 +79,8 @@ locale/pt_BR.po
locale/ru.po
locale/sl.po
locale/zh_CN.po
+tests/__init__.py
+tests/test_timesheet.py
trytond_timesheet.egg-info/PKG-INFO
trytond_timesheet.egg-info/SOURCES.txt
trytond_timesheet.egg-info/dependency_links.txt
diff --git a/trytond_timesheet.egg-info/requires.txt b/trytond_timesheet.egg-info/requires.txt
index 06e0d42..a31dd31 100644
--- a/trytond_timesheet.egg-info/requires.txt
+++ b/trytond_timesheet.egg-info/requires.txt
@@ -1,4 +1,4 @@
python-sql
-trytond_company >= 4.4, < 4.5
-trytond_company_work_time >= 4.4, < 4.5
-trytond >= 4.4, < 4.5
+trytond_company >= 4.6, < 4.7
+trytond_company_work_time >= 4.6, < 4.7
+trytond >= 4.6, < 4.7
diff --git a/view/work_list.xml b/view/work_list.xml
index de815f0..68f636d 100644
--- a/view/work_list.xml
+++ b/view/work_list.xml
@@ -5,4 +5,6 @@ this repository contains the full copyright notices and license terms. -->
<field name="rec_name"/>
<field name="active" tree_invisible="1"/>
<field name="origin" tree_invisible="1"/>
+ <field name="timesheet_start_date" tree_invisible="1"/>
+ <field name="timesheet_end_date" tree_invisible="1"/>
</tree>
--
tryton-modules-timesheet
More information about the tryton-debian-vcs
mailing list