[tryton-debian-vcs] tryton-modules-timesheet branch upstream updated. upstream/3.6.0-1-gee4b8fa
Mathias Behrle
tryton-debian-vcs at alioth.debian.org
Wed Nov 11 11:30:45 UTC 2015
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/3.6.0-1-gee4b8fa
commit ee4b8fabda817ecde00b114399b1f4a8f6ef3653
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Wed Nov 11 12:11:21 2015 +0100
Adding upstream version 3.8.0.
Signed-off-by: Mathias Behrle <mathiasb at m9s.biz>
diff --git a/CHANGELOG b/CHANGELOG
index bca10c5..b4db4f5 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,7 @@
+Version 3.8.0 - 2015-11-02
+* Bug fixes (see mercurial logs for details)
+* Split duration into simple and total duration
+
Version 3.6.0 - 2015-04-20
* Bug fixes (see mercurial logs for details)
* Add support for PyPy
diff --git a/PKG-INFO b/PKG-INFO
index e2ee87c..9ff0c8c 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,12 +1,12 @@
Metadata-Version: 1.1
Name: trytond_timesheet
-Version: 3.6.0
+Version: 3.8.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/3.6/
+Download-URL: http://downloads.tryton.org/3.8/
Description: trytond_timesheet
=================
@@ -60,6 +60,9 @@ Classifier: Natural Language :: Dutch
Classifier: Natural Language :: English
Classifier: Natural Language :: French
Classifier: Natural Language :: German
+Classifier: Natural Language :: Hungarian
+Classifier: Natural Language :: Italian
+Classifier: Natural Language :: Portuguese (Brazilian)
Classifier: Natural Language :: Russian
Classifier: Natural Language :: Slovenian
Classifier: Natural Language :: Spanish
diff --git a/line.py b/line.py
index f9a0e15..8196e96 100644
--- a/line.py
+++ b/line.py
@@ -171,10 +171,12 @@ class EnterLines(Wizard):
date = Date(date.year, date.month, date.day)
action['pyson_domain'] = PYSONEncoder().encode([
('employee', '=', self.start.employee.id),
+ ('company', '=', self.start.employee.company.id),
('date', '=', date),
])
action['pyson_context'] = PYSONEncoder().encode({
'employee': self.start.employee.id,
+ 'company': self.start.employee.company.id,
'date': date,
})
action['name'] += " - " + self.start.employee.rec_name
diff --git a/locale/bg_BG.po b/locale/bg_BG.po
index a112aa0..9342c33 100644
--- a/locale/bg_BG.po
+++ b/locale/bg_BG.po
@@ -266,6 +266,10 @@ msgctxt "field:timesheet.work,timesheet_start_date:"
msgid "Timesheet Start"
msgstr ""
+msgctxt "field:timesheet.work,total_duration:"
+msgid "Total Timesheet Duration"
+msgstr ""
+
msgctxt "field:timesheet.work,write_date:"
msgid "Write Date"
msgstr "Променено на"
@@ -294,6 +298,10 @@ msgctxt "help:timesheet.work,timesheet_available:"
msgid "Allow to fill in timesheets with this work"
msgstr "Позволява да се попълни в график с тази задача"
+msgctxt "help:timesheet.work,total_duration:"
+msgid "Total time spent on this work and the sub-works"
+msgstr ""
+
msgctxt "model:ir.action,name:act_hours_employee_form"
msgid "Hours per Employee"
msgstr "Часове на служител"
@@ -440,8 +448,8 @@ msgid "Hours per Employee"
msgstr "Часове на служител"
msgctxt "view:timesheet.hours_employee:"
-msgid "Hours"
-msgstr "Часове"
+msgid "Duration"
+msgstr ""
msgctxt "view:timesheet.hours_employee:"
msgid "Hours per Employee"
@@ -460,8 +468,8 @@ msgid "Enter Timesheet"
msgstr "Въвеждане на график"
msgctxt "view:timesheet.line:"
-msgid "Hours"
-msgstr "Часове"
+msgid "Duration"
+msgstr ""
msgctxt "view:timesheet.line:"
msgid "Timesheet Line"
diff --git a/locale/ca_ES.po b/locale/ca_ES.po
index 3eed7e5..4076da1 100644
--- a/locale/ca_ES.po
+++ b/locale/ca_ES.po
@@ -262,6 +262,10 @@ msgctxt "field:timesheet.work,timesheet_start_date:"
msgid "Timesheet Start"
msgstr "Inici del full de treball"
+msgctxt "field:timesheet.work,total_duration:"
+msgid "Total Timesheet Duration"
+msgstr "Temps total del full de treball"
+
msgctxt "field:timesheet.work,write_date:"
msgid "Write Date"
msgstr "Data modificació"
@@ -290,6 +294,10 @@ msgctxt "help:timesheet.work,timesheet_available:"
msgid "Allow to fill in timesheets with this work"
msgstr "Permet completar fulls de treball amb aquest treball."
+msgctxt "help:timesheet.work,total_duration:"
+msgid "Total time spent on this work and the sub-works"
+msgstr "Temps total dedicat en aquest treball i els seus subtreballs."
+
msgctxt "model:ir.action,name:act_hours_employee_form"
msgid "Hours per Employee"
msgstr "Hores per empleat"
diff --git a/locale/cs_CZ.po b/locale/cs_CZ.po
index eed1cb1..8804410 100644
--- a/locale/cs_CZ.po
+++ b/locale/cs_CZ.po
@@ -260,6 +260,10 @@ msgctxt "field:timesheet.work,timesheet_start_date:"
msgid "Timesheet Start"
msgstr ""
+msgctxt "field:timesheet.work,total_duration:"
+msgid "Total Timesheet Duration"
+msgstr ""
+
msgctxt "field:timesheet.work,write_date:"
msgid "Write Date"
msgstr ""
@@ -288,6 +292,10 @@ msgctxt "help:timesheet.work,timesheet_available:"
msgid "Allow to fill in timesheets with this work"
msgstr ""
+msgctxt "help:timesheet.work,total_duration:"
+msgid "Total time spent on this work and the sub-works"
+msgstr ""
+
msgctxt "model:ir.action,name:act_hours_employee_form"
msgid "Hours per Employee"
msgstr ""
@@ -433,7 +441,7 @@ msgid "Hours per Employee"
msgstr ""
msgctxt "view:timesheet.hours_employee:"
-msgid "Hours"
+msgid "Duration"
msgstr ""
msgctxt "view:timesheet.hours_employee:"
@@ -453,7 +461,7 @@ msgid "Enter Timesheet"
msgstr ""
msgctxt "view:timesheet.line:"
-msgid "Hours"
+msgid "Duration"
msgstr ""
msgctxt "view:timesheet.line:"
diff --git a/locale/de_DE.po b/locale/de_DE.po
index 3a8a61b..7cabadd 100644
--- a/locale/de_DE.po
+++ b/locale/de_DE.po
@@ -263,6 +263,10 @@ msgctxt "field:timesheet.work,timesheet_start_date:"
msgid "Timesheet Start"
msgstr "Zeiterfassung Beginn"
+msgctxt "field:timesheet.work,total_duration:"
+msgid "Total Timesheet Duration"
+msgstr "Gesamtdauer"
+
msgctxt "field:timesheet.work,write_date:"
msgid "Write Date"
msgstr "Zuletzt geändert"
@@ -291,6 +295,11 @@ msgctxt "help:timesheet.work,timesheet_available:"
msgid "Allow to fill in timesheets with this work"
msgstr "Diese Tätigkeit für den Eintrag in Zeiterfassungen freigeben"
+msgctxt "help:timesheet.work,total_duration:"
+msgid "Total time spent on this work and the sub-works"
+msgstr ""
+"Die gesamte Zeit, die für diese Aufgabe inkl. Unteraufgaben verwendet wurde"
+
msgctxt "model:ir.action,name:act_hours_employee_form"
msgid "Hours per Employee"
msgstr "Stunden pro Mitarbeiter"
diff --git a/locale/es_AR.po b/locale/es_AR.po
index e8ba860..351e045 100644
--- a/locale/es_AR.po
+++ b/locale/es_AR.po
@@ -262,6 +262,10 @@ msgctxt "field:timesheet.work,timesheet_start_date:"
msgid "Timesheet Start"
msgstr "Inicio de parte de trabajo"
+msgctxt "field:timesheet.work,total_duration:"
+msgid "Total Timesheet Duration"
+msgstr "Duración de parte de trabajo"
+
msgctxt "field:timesheet.work,write_date:"
msgid "Write Date"
msgstr "Fecha modificación"
@@ -290,6 +294,10 @@ msgctxt "help:timesheet.work,timesheet_available:"
msgid "Allow to fill in timesheets with this work"
msgstr "Permite completar partes de trabajo con este trabajo"
+msgctxt "help:timesheet.work,total_duration:"
+msgid "Total time spent on this work and the sub-works"
+msgstr "Tiempo total empleado en esta actividad y sus subactividades"
+
msgctxt "model:ir.action,name:act_hours_employee_form"
msgid "Hours per Employee"
msgstr "Horas por empleado"
diff --git a/locale/es_CO.po b/locale/es_CO.po
index 212fe78..7e6da5e 100644
--- a/locale/es_CO.po
+++ b/locale/es_CO.po
@@ -262,6 +262,10 @@ msgctxt "field:timesheet.work,timesheet_start_date:"
msgid "Timesheet Start"
msgstr "Inicio de Registro de Tiempo"
+msgctxt "field:timesheet.work,total_duration:"
+msgid "Total Timesheet Duration"
+msgstr ""
+
msgctxt "field:timesheet.work,write_date:"
msgid "Write Date"
msgstr "Fecha de Modificación"
@@ -290,6 +294,10 @@ msgctxt "help:timesheet.work,timesheet_available:"
msgid "Allow to fill in timesheets with this work"
msgstr "Permite llenar los registros de tiempo con este trabajo"
+msgctxt "help:timesheet.work,total_duration:"
+msgid "Total time spent on this work and the sub-works"
+msgstr ""
+
msgctxt "model:ir.action,name:act_hours_employee_form"
msgid "Hours per Employee"
msgstr "Horas por Empleado"
diff --git a/locale/es_EC.po b/locale/es_EC.po
index 61478c1..f6a6a51 100644
--- a/locale/es_EC.po
+++ b/locale/es_EC.po
@@ -16,11 +16,11 @@ msgstr ""
msgctxt "field:timesheet.hours_employee,create_date:"
msgid "Create Date"
-msgstr "Fecha de Creación"
+msgstr "Fecha de creación"
msgctxt "field:timesheet.hours_employee,create_uid:"
msgid "Create User"
-msgstr "Creado por Usuario"
+msgstr "Creado por usuario"
msgctxt "field:timesheet.hours_employee,duration:"
msgid "Duration"
@@ -40,15 +40,15 @@ msgstr "Nombre"
msgctxt "field:timesheet.hours_employee,write_date:"
msgid "Write Date"
-msgstr "Fecha de Modificación"
+msgstr "Fecha de modificación"
msgctxt "field:timesheet.hours_employee,write_uid:"
msgid "Write User"
-msgstr "Modificado por Usuario"
+msgstr "Modificado por usuario"
msgctxt "field:timesheet.hours_employee.open.start,end_date:"
msgid "End Date"
-msgstr "Fecha Final"
+msgstr "Fecha final"
msgctxt "field:timesheet.hours_employee.open.start,id:"
msgid "ID"
@@ -56,15 +56,15 @@ msgstr "ID"
msgctxt "field:timesheet.hours_employee.open.start,start_date:"
msgid "Start Date"
-msgstr "Fecha de Inicio"
+msgstr "Fecha de inicio"
msgctxt "field:timesheet.hours_employee_monthly,create_date:"
msgid "Create Date"
-msgstr "Fecha de Creación"
+msgstr "Fecha de creación"
msgctxt "field:timesheet.hours_employee_monthly,create_uid:"
msgid "Create User"
-msgstr "Creado por Usuario"
+msgstr "Creado por usuario"
msgctxt "field:timesheet.hours_employee_monthly,duration:"
msgid "Duration"
@@ -88,11 +88,11 @@ msgstr "Nombre"
msgctxt "field:timesheet.hours_employee_monthly,write_date:"
msgid "Write Date"
-msgstr "Fecha de Modificación"
+msgstr "Fecha de modificación"
msgctxt "field:timesheet.hours_employee_monthly,write_uid:"
msgid "Write User"
-msgstr "Modificado por Usuario"
+msgstr "Modificado por usuario"
msgctxt "field:timesheet.hours_employee_monthly,year:"
msgid "Year"
@@ -100,11 +100,11 @@ msgstr "Año"
msgctxt "field:timesheet.hours_employee_weekly,create_date:"
msgid "Create Date"
-msgstr "Fecha de Creación"
+msgstr "Fecha de creación"
msgctxt "field:timesheet.hours_employee_weekly,create_uid:"
msgid "Create User"
-msgstr "Creado por Usuario"
+msgstr "Creado por usuario"
msgctxt "field:timesheet.hours_employee_weekly,duration:"
msgid "Duration"
@@ -128,11 +128,11 @@ msgstr "Semana"
msgctxt "field:timesheet.hours_employee_weekly,write_date:"
msgid "Write Date"
-msgstr "Fecha de Modificación"
+msgstr "Fecha de modificación"
msgctxt "field:timesheet.hours_employee_weekly,write_uid:"
msgid "Write User"
-msgstr "Modificado por Usuario"
+msgstr "Modificado por usuario"
msgctxt "field:timesheet.hours_employee_weekly,year:"
msgid "Year"
@@ -144,11 +144,11 @@ msgstr "Empresa"
msgctxt "field:timesheet.line,create_date:"
msgid "Create Date"
-msgstr "Fecha de Creación"
+msgstr "Fecha de creación"
msgctxt "field:timesheet.line,create_uid:"
msgid "Create User"
-msgstr "Creado por Usuario"
+msgstr "Creado por usuario"
msgctxt "field:timesheet.line,date:"
msgid "Date"
@@ -180,11 +180,11 @@ msgstr "Trabajo"
msgctxt "field:timesheet.line,write_date:"
msgid "Write Date"
-msgstr "Fecha de Modificación"
+msgstr "Fecha de modificación"
msgctxt "field:timesheet.line,write_uid:"
msgid "Write User"
-msgstr "Modificado por Usuario"
+msgstr "Modificado por usuario"
msgctxt "field:timesheet.line.enter.start,date:"
msgid "Date"
@@ -212,11 +212,11 @@ msgstr "Empresa"
msgctxt "field:timesheet.work,create_date:"
msgid "Create Date"
-msgstr "Fecha de Creación"
+msgstr "Fecha de creación"
msgctxt "field:timesheet.work,create_uid:"
msgid "Create User"
-msgstr "Creado por Usuario"
+msgstr "Creado por usuario"
msgctxt "field:timesheet.work,duration:"
msgid "Timesheet Duration"
@@ -252,27 +252,31 @@ msgstr "Disponible en partes de trabajo"
msgctxt "field:timesheet.work,timesheet_end_date:"
msgid "Timesheet End"
-msgstr "Fin de Parte de Trabajo"
+msgstr "Fin de parte de trabajo"
msgctxt "field:timesheet.work,timesheet_lines:"
msgid "Timesheet Lines"
-msgstr "Líneas de Parte de Trabajo"
+msgstr "Líneas de parte de trabajo"
msgctxt "field:timesheet.work,timesheet_start_date:"
msgid "Timesheet Start"
-msgstr "Inicio de Parte de Trabajo"
+msgstr "Inicio de parte de trabajo"
+
+msgctxt "field:timesheet.work,total_duration:"
+msgid "Total Timesheet Duration"
+msgstr "Duración total de parte de trabajo"
msgctxt "field:timesheet.work,write_date:"
msgid "Write Date"
-msgstr "Fecha de Modificación"
+msgstr "Fecha de modificación"
msgctxt "field:timesheet.work,write_uid:"
msgid "Write User"
-msgstr "Modificado por Usuario"
+msgstr "Modificado por usuario"
msgctxt "field:timesheet.work.open.start,from_date:"
msgid "From Date"
-msgstr "Desde la Fecha"
+msgstr "Desde la fecha"
msgctxt "field:timesheet.work.open.start,id:"
msgid "ID"
@@ -280,7 +284,7 @@ msgstr "ID"
msgctxt "field:timesheet.work.open.start,to_date:"
msgid "To Date"
-msgstr "Hasta la Fecha"
+msgstr "Hasta la fecha"
msgctxt "help:timesheet.work,duration:"
msgid "Total time spent on this work"
@@ -290,53 +294,57 @@ msgctxt "help:timesheet.work,timesheet_available:"
msgid "Allow to fill in timesheets with this work"
msgstr "Permite completar partes de trabajo con este trabajo"
+msgctxt "help:timesheet.work,total_duration:"
+msgid "Total time spent on this work and the sub-works"
+msgstr "Tiempo total empleado en este trabajo y sus subtrabajos"
+
msgctxt "model:ir.action,name:act_hours_employee_form"
msgid "Hours per Employee"
-msgstr "Horas por Empleado"
+msgstr "Horas por empleado"
msgctxt "model:ir.action,name:act_hours_employee_monthly_form"
msgid "Hours per Employee per Month"
-msgstr "Horas por Empleado por Mes"
+msgstr "Horas por empleado por mes"
msgctxt "model:ir.action,name:act_hours_employee_open"
msgid "Hours per Employee"
-msgstr "Horas por Empleado"
+msgstr "Horas por empleado"
msgctxt "model:ir.action,name:act_hours_employee_weekly_form"
msgid "Hours per Employee per Week"
-msgstr "Horas por Empleado por Semana"
+msgstr "Horas por empleado por semana"
msgctxt "model:ir.action,name:act_line_enter"
msgid "Enter Timesheet"
-msgstr "Ingresar Parte de Trabajo"
+msgstr "Ingresar parte de trabajo"
msgctxt "model:ir.action,name:act_line_form"
msgid "Timesheet Lines"
-msgstr "Líneas de Parte de Trabajo"
+msgstr "Líneas de parte de trabajo"
msgctxt "model:ir.action,name:act_line_form_work"
msgid "Timesheet Lines"
-msgstr "Líneas de Parte de Trabajo"
+msgstr "Líneas de parte de trabajo"
msgctxt "model:ir.action,name:act_open_work"
msgid "Hours per Work"
-msgstr "Horas por Trabajo"
+msgstr "Horas por trabajo"
msgctxt "model:ir.action,name:act_open_work_graph"
msgid "Hours per Work"
-msgstr "Horas por Trabajo"
+msgstr "Horas por trabajo"
msgctxt "model:ir.action,name:act_work_form2"
msgid "Hours per Work"
-msgstr "Horas por Trabajo"
+msgstr "Horas por trabajo"
msgctxt "model:ir.action,name:act_work_form3"
msgid "Hours per Work"
-msgstr "Horas por Trabajo"
+msgstr "Horas por trabajo"
msgctxt "model:ir.action,name:act_work_hours_board"
msgid "Hours per Work"
-msgstr "Horas por Trabajo"
+msgstr "Horas por trabajo"
msgctxt "model:ir.action,name:act_work_list"
msgid "Works"
@@ -400,27 +408,27 @@ msgstr "Administración de Partes de Trabajo"
msgctxt "model:timesheet.hours_employee,name:"
msgid "Hours per Employee"
-msgstr "Horas por Empleado"
+msgstr "Horas por empleado"
msgctxt "model:timesheet.hours_employee.open.start,name:"
msgid "Open Hours per Employee"
-msgstr "Abrir Horas por Empleado"
+msgstr "Abrir horas por empleado"
msgctxt "model:timesheet.hours_employee_monthly,name:"
msgid "Hours per Employee per Month"
-msgstr "Horas por Empleado por Mes"
+msgstr "Horas por empleado por mes"
msgctxt "model:timesheet.hours_employee_weekly,name:"
msgid "Hours per Employee per Week"
-msgstr "Horas por Empleado por Semana"
+msgstr "Horas por empleado por semana"
msgctxt "model:timesheet.line,name:"
msgid "Timesheet Line"
-msgstr "Línea de Parte de Trabajo"
+msgstr "Línea de parte de trabajo"
msgctxt "model:timesheet.line.enter.start,name:"
msgid "Enter Lines"
-msgstr "Ingresar Líneas"
+msgstr "Ingresar líneas"
msgctxt "model:timesheet.work,name:"
msgid "Work"
@@ -428,11 +436,11 @@ msgstr "Trabajo"
msgctxt "model:timesheet.work.open.start,name:"
msgid "Open Work"
-msgstr "Abrir Trabajo"
+msgstr "Abrir trabajo"
msgctxt "view:timesheet.hours_employee.open.start:"
msgid "Hours per Employee"
-msgstr "Horas por Empleado"
+msgstr "Horas por empleado"
msgctxt "view:timesheet.hours_employee:"
msgid "Duration"
@@ -440,19 +448,19 @@ msgstr "Duración"
msgctxt "view:timesheet.hours_employee:"
msgid "Hours per Employee"
-msgstr "Horas por Empleado"
+msgstr "Horas por empleado"
msgctxt "view:timesheet.hours_employee_monthly:"
msgid "Hours per Employee per Month"
-msgstr "Horas por Empleado por Mes"
+msgstr "Horas por empleado por mes"
msgctxt "view:timesheet.hours_employee_weekly:"
msgid "Hours per Employee per Week"
-msgstr "Horas por Empleado por Semana"
+msgstr "Horas por empleado por semana"
msgctxt "view:timesheet.line.enter.start:"
msgid "Enter Timesheet"
-msgstr "Ingresar Parte de Trabajo"
+msgstr "Ingresar parte de trabajo"
msgctxt "view:timesheet.line:"
msgid "Duration"
@@ -460,19 +468,19 @@ msgstr "Duración"
msgctxt "view:timesheet.line:"
msgid "Timesheet Line"
-msgstr "Línea de Parte de Trabajo"
+msgstr "Línea de parte de trabajo"
msgctxt "view:timesheet.line:"
msgid "Timesheet Lines"
-msgstr "Líneas de Parte de Trabajo"
+msgstr "Líneas de parte de trabajo"
msgctxt "view:timesheet.work.open.start:"
msgid "Hours per Work"
-msgstr "Horas por Trabajo"
+msgstr "Horas por trabajo"
msgctxt "view:timesheet.work:"
msgid "Hours per Work"
-msgstr "Horas por Trabajo"
+msgstr "Horas por trabajo"
msgctxt "view:timesheet.work:"
msgid "Work"
diff --git a/locale/es_ES.po b/locale/es_ES.po
index 67d51c5..ec7feec 100644
--- a/locale/es_ES.po
+++ b/locale/es_ES.po
@@ -262,6 +262,10 @@ msgctxt "field:timesheet.work,timesheet_start_date:"
msgid "Timesheet Start"
msgstr "Inicio de parte de trabajo"
+msgctxt "field:timesheet.work,total_duration:"
+msgid "Total Timesheet Duration"
+msgstr "Tiempo total del parte de trabajo"
+
msgctxt "field:timesheet.work,write_date:"
msgid "Write Date"
msgstr "Fecha modificación"
@@ -290,6 +294,10 @@ msgctxt "help:timesheet.work,timesheet_available:"
msgid "Allow to fill in timesheets with this work"
msgstr "Permite completar partes de trabajo con este trabajo."
+msgctxt "help:timesheet.work,total_duration:"
+msgid "Total time spent on this work and the sub-works"
+msgstr "Tiempo total empleado en este trabajo y sus subtrabajos."
+
msgctxt "model:ir.action,name:act_hours_employee_form"
msgid "Hours per Employee"
msgstr "Horas por empleado"
diff --git a/locale/es_ES.po b/locale/es_MX.po
similarity index 97%
copy from locale/es_ES.po
copy to locale/es_MX.po
index 67d51c5..e2fff42 100644
--- a/locale/es_ES.po
+++ b/locale/es_MX.po
@@ -262,6 +262,10 @@ msgctxt "field:timesheet.work,timesheet_start_date:"
msgid "Timesheet Start"
msgstr "Inicio de parte de trabajo"
+msgctxt "field:timesheet.work,total_duration:"
+msgid "Total Timesheet Duration"
+msgstr ""
+
msgctxt "field:timesheet.work,write_date:"
msgid "Write Date"
msgstr "Fecha modificación"
@@ -290,6 +294,10 @@ msgctxt "help:timesheet.work,timesheet_available:"
msgid "Allow to fill in timesheets with this work"
msgstr "Permite completar partes de trabajo con este trabajo."
+msgctxt "help:timesheet.work,total_duration:"
+msgid "Total time spent on this work and the sub-works"
+msgstr ""
+
msgctxt "model:ir.action,name:act_hours_employee_form"
msgid "Hours per Employee"
msgstr "Horas por empleado"
@@ -432,55 +440,55 @@ msgstr "Abrir trabajo"
msgctxt "view:timesheet.hours_employee.open.start:"
msgid "Hours per Employee"
-msgstr "Horas por empleado"
+msgstr ""
msgctxt "view:timesheet.hours_employee:"
msgid "Duration"
-msgstr "Tiempo"
+msgstr ""
msgctxt "view:timesheet.hours_employee:"
msgid "Hours per Employee"
-msgstr "Horas por empleado"
+msgstr ""
msgctxt "view:timesheet.hours_employee_monthly:"
msgid "Hours per Employee per Month"
-msgstr "Horas por empleado y mes"
+msgstr ""
msgctxt "view:timesheet.hours_employee_weekly:"
msgid "Hours per Employee per Week"
-msgstr "Horas por empleado y semana"
+msgstr ""
msgctxt "view:timesheet.line.enter.start:"
msgid "Enter Timesheet"
-msgstr "Añadir parte de trabajo"
+msgstr ""
msgctxt "view:timesheet.line:"
msgid "Duration"
-msgstr "Tiempo"
+msgstr ""
msgctxt "view:timesheet.line:"
msgid "Timesheet Line"
-msgstr "Línea de parte de trabajo"
+msgstr ""
msgctxt "view:timesheet.line:"
msgid "Timesheet Lines"
-msgstr "Líneas del parte de trabajo"
+msgstr ""
msgctxt "view:timesheet.work.open.start:"
msgid "Hours per Work"
-msgstr "Horas por trabajo"
+msgstr ""
msgctxt "view:timesheet.work:"
msgid "Hours per Work"
-msgstr "Horas por trabajo"
+msgstr ""
msgctxt "view:timesheet.work:"
msgid "Work"
-msgstr "Trabajo"
+msgstr ""
msgctxt "view:timesheet.work:"
msgid "Works"
-msgstr "Trabajos"
+msgstr ""
msgctxt "wizard_button:timesheet.hours_employee.open,start,end:"
msgid "Cancel"
diff --git a/locale/fr_FR.po b/locale/fr_FR.po
index b3d8429..6660b8f 100644
--- a/locale/fr_FR.po
+++ b/locale/fr_FR.po
@@ -262,6 +262,10 @@ msgctxt "field:timesheet.work,timesheet_start_date:"
msgid "Timesheet Start"
msgstr "Début de feuille de présence"
+msgctxt "field:timesheet.work,total_duration:"
+msgid "Total Timesheet Duration"
+msgstr "Durée totale de feuille de présence"
+
msgctxt "field:timesheet.work,write_date:"
msgid "Write Date"
msgstr "Date de mise à jour"
@@ -290,6 +294,10 @@ msgctxt "help:timesheet.work,timesheet_available:"
msgid "Allow to fill in timesheets with this work"
msgstr "Autoriser ce travail sur les feuilles de présence"
+msgctxt "help:timesheet.work,total_duration:"
+msgid "Total time spent on this work and the sub-works"
+msgstr "Temps total passé sur ce travail et les sous-travaux"
+
msgctxt "model:ir.action,name:act_hours_employee_form"
msgid "Hours per Employee"
msgstr "Heures par employé"
diff --git a/locale/cs_CZ.po b/locale/hu_HU.po
similarity index 97%
copy from locale/cs_CZ.po
copy to locale/hu_HU.po
index eed1cb1..8804410 100644
--- a/locale/cs_CZ.po
+++ b/locale/hu_HU.po
@@ -260,6 +260,10 @@ msgctxt "field:timesheet.work,timesheet_start_date:"
msgid "Timesheet Start"
msgstr ""
+msgctxt "field:timesheet.work,total_duration:"
+msgid "Total Timesheet Duration"
+msgstr ""
+
msgctxt "field:timesheet.work,write_date:"
msgid "Write Date"
msgstr ""
@@ -288,6 +292,10 @@ msgctxt "help:timesheet.work,timesheet_available:"
msgid "Allow to fill in timesheets with this work"
msgstr ""
+msgctxt "help:timesheet.work,total_duration:"
+msgid "Total time spent on this work and the sub-works"
+msgstr ""
+
msgctxt "model:ir.action,name:act_hours_employee_form"
msgid "Hours per Employee"
msgstr ""
@@ -433,7 +441,7 @@ msgid "Hours per Employee"
msgstr ""
msgctxt "view:timesheet.hours_employee:"
-msgid "Hours"
+msgid "Duration"
msgstr ""
msgctxt "view:timesheet.hours_employee:"
@@ -453,7 +461,7 @@ msgid "Enter Timesheet"
msgstr ""
msgctxt "view:timesheet.line:"
-msgid "Hours"
+msgid "Duration"
msgstr ""
msgctxt "view:timesheet.line:"
diff --git a/locale/cs_CZ.po b/locale/it_IT.po
similarity index 97%
copy from locale/cs_CZ.po
copy to locale/it_IT.po
index eed1cb1..8804410 100644
--- a/locale/cs_CZ.po
+++ b/locale/it_IT.po
@@ -260,6 +260,10 @@ msgctxt "field:timesheet.work,timesheet_start_date:"
msgid "Timesheet Start"
msgstr ""
+msgctxt "field:timesheet.work,total_duration:"
+msgid "Total Timesheet Duration"
+msgstr ""
+
msgctxt "field:timesheet.work,write_date:"
msgid "Write Date"
msgstr ""
@@ -288,6 +292,10 @@ msgctxt "help:timesheet.work,timesheet_available:"
msgid "Allow to fill in timesheets with this work"
msgstr ""
+msgctxt "help:timesheet.work,total_duration:"
+msgid "Total time spent on this work and the sub-works"
+msgstr ""
+
msgctxt "model:ir.action,name:act_hours_employee_form"
msgid "Hours per Employee"
msgstr ""
@@ -433,7 +441,7 @@ msgid "Hours per Employee"
msgstr ""
msgctxt "view:timesheet.hours_employee:"
-msgid "Hours"
+msgid "Duration"
msgstr ""
msgctxt "view:timesheet.hours_employee:"
@@ -453,7 +461,7 @@ msgid "Enter Timesheet"
msgstr ""
msgctxt "view:timesheet.line:"
-msgid "Hours"
+msgid "Duration"
msgstr ""
msgctxt "view:timesheet.line:"
diff --git a/locale/cs_CZ.po b/locale/ja_JP.po
similarity index 97%
copy from locale/cs_CZ.po
copy to locale/ja_JP.po
index eed1cb1..8804410 100644
--- a/locale/cs_CZ.po
+++ b/locale/ja_JP.po
@@ -260,6 +260,10 @@ msgctxt "field:timesheet.work,timesheet_start_date:"
msgid "Timesheet Start"
msgstr ""
+msgctxt "field:timesheet.work,total_duration:"
+msgid "Total Timesheet Duration"
+msgstr ""
+
msgctxt "field:timesheet.work,write_date:"
msgid "Write Date"
msgstr ""
@@ -288,6 +292,10 @@ msgctxt "help:timesheet.work,timesheet_available:"
msgid "Allow to fill in timesheets with this work"
msgstr ""
+msgctxt "help:timesheet.work,total_duration:"
+msgid "Total time spent on this work and the sub-works"
+msgstr ""
+
msgctxt "model:ir.action,name:act_hours_employee_form"
msgid "Hours per Employee"
msgstr ""
@@ -433,7 +441,7 @@ msgid "Hours per Employee"
msgstr ""
msgctxt "view:timesheet.hours_employee:"
-msgid "Hours"
+msgid "Duration"
msgstr ""
msgctxt "view:timesheet.hours_employee:"
@@ -453,7 +461,7 @@ msgid "Enter Timesheet"
msgstr ""
msgctxt "view:timesheet.line:"
-msgid "Hours"
+msgid "Duration"
msgstr ""
msgctxt "view:timesheet.line:"
diff --git a/locale/cs_CZ.po b/locale/lt_LT.po
similarity index 97%
copy from locale/cs_CZ.po
copy to locale/lt_LT.po
index eed1cb1..8804410 100644
--- a/locale/cs_CZ.po
+++ b/locale/lt_LT.po
@@ -260,6 +260,10 @@ msgctxt "field:timesheet.work,timesheet_start_date:"
msgid "Timesheet Start"
msgstr ""
+msgctxt "field:timesheet.work,total_duration:"
+msgid "Total Timesheet Duration"
+msgstr ""
+
msgctxt "field:timesheet.work,write_date:"
msgid "Write Date"
msgstr ""
@@ -288,6 +292,10 @@ msgctxt "help:timesheet.work,timesheet_available:"
msgid "Allow to fill in timesheets with this work"
msgstr ""
+msgctxt "help:timesheet.work,total_duration:"
+msgid "Total time spent on this work and the sub-works"
+msgstr ""
+
msgctxt "model:ir.action,name:act_hours_employee_form"
msgid "Hours per Employee"
msgstr ""
@@ -433,7 +441,7 @@ msgid "Hours per Employee"
msgstr ""
msgctxt "view:timesheet.hours_employee:"
-msgid "Hours"
+msgid "Duration"
msgstr ""
msgctxt "view:timesheet.hours_employee:"
@@ -453,7 +461,7 @@ msgid "Enter Timesheet"
msgstr ""
msgctxt "view:timesheet.line:"
-msgid "Hours"
+msgid "Duration"
msgstr ""
msgctxt "view:timesheet.line:"
diff --git a/locale/nl_NL.po b/locale/nl_NL.po
index 65473bd..46754ba 100644
--- a/locale/nl_NL.po
+++ b/locale/nl_NL.po
@@ -266,6 +266,10 @@ msgctxt "field:timesheet.work,timesheet_start_date:"
msgid "Timesheet Start"
msgstr ""
+msgctxt "field:timesheet.work,total_duration:"
+msgid "Total Timesheet Duration"
+msgstr ""
+
msgctxt "field:timesheet.work,write_date:"
msgid "Write Date"
msgstr ""
@@ -296,6 +300,10 @@ msgctxt "help:timesheet.work,timesheet_available:"
msgid "Allow to fill in timesheets with this work"
msgstr "Sta het boeken van uren op dit werk toe"
+msgctxt "help:timesheet.work,total_duration:"
+msgid "Total time spent on this work and the sub-works"
+msgstr ""
+
msgctxt "model:ir.action,name:act_hours_employee_form"
msgid "Hours per Employee"
msgstr "Uren per werknemer"
@@ -451,8 +459,8 @@ msgid "Hours per Employee"
msgstr "Uren per werknemer"
msgctxt "view:timesheet.hours_employee:"
-msgid "Hours"
-msgstr "Uren"
+msgid "Duration"
+msgstr ""
msgctxt "view:timesheet.hours_employee:"
msgid "Hours per Employee"
@@ -471,8 +479,8 @@ msgid "Enter Timesheet"
msgstr ""
msgctxt "view:timesheet.line:"
-msgid "Hours"
-msgstr "Uren"
+msgid "Duration"
+msgstr ""
msgctxt "view:timesheet.line:"
msgid "Timesheet Line"
diff --git a/locale/es_ES.po b/locale/pt_BR.po
similarity index 73%
copy from locale/es_ES.po
copy to locale/pt_BR.po
index 67d51c5..923296c 100644
--- a/locale/es_ES.po
+++ b/locale/pt_BR.po
@@ -4,31 +4,31 @@ msgstr "Content-Type: text/plain; charset=utf-8\n"
msgctxt "error:timesheet.line:"
msgid "Duration of line \"%(line)s\" must be positive."
-msgstr "El tiempo de la línea \"%(line)s\" debe ser positivo."
+msgstr "A duração da linha \"%(line)s\" deve ser positiva."
msgctxt "error:timesheet.work:"
msgid ""
"You can not unset \"Available on timesheets\" for work \"%s\" because it "
"already has timesheets."
msgstr ""
-"No puede deshabilitar \"Disponible en partes de trabajo\" \"%s\" porque ya "
-"tiene partes de trabajo."
+"Você não pode desabilitar \"Disponível nos Quadros de Horário\" para a "
+"tarefa \"%s\" por que ele já possui presenças registradas."
msgctxt "field:timesheet.hours_employee,create_date:"
msgid "Create Date"
-msgstr "Fecha creación"
+msgstr "Data de criação"
msgctxt "field:timesheet.hours_employee,create_uid:"
msgid "Create User"
-msgstr "Usuario creación"
+msgstr "Criado pelo usuário"
msgctxt "field:timesheet.hours_employee,duration:"
msgid "Duration"
-msgstr "Tiempo"
+msgstr "Duração"
msgctxt "field:timesheet.hours_employee,employee:"
msgid "Employee"
-msgstr "Empleado"
+msgstr "Empregado"
msgctxt "field:timesheet.hours_employee,id:"
msgid "ID"
@@ -36,19 +36,19 @@ msgstr "ID"
msgctxt "field:timesheet.hours_employee,rec_name:"
msgid "Name"
-msgstr "Nombre"
+msgstr "Nome"
msgctxt "field:timesheet.hours_employee,write_date:"
msgid "Write Date"
-msgstr "Fecha modificación"
+msgstr "Data de gravação"
msgctxt "field:timesheet.hours_employee,write_uid:"
msgid "Write User"
-msgstr "Usuario modificación"
+msgstr "Gravado pelo usuário"
msgctxt "field:timesheet.hours_employee.open.start,end_date:"
msgid "End Date"
-msgstr "Fecha final"
+msgstr "Data de extremidade"
msgctxt "field:timesheet.hours_employee.open.start,id:"
msgid "ID"
@@ -56,23 +56,23 @@ msgstr "ID"
msgctxt "field:timesheet.hours_employee.open.start,start_date:"
msgid "Start Date"
-msgstr "Fecha inicial"
+msgstr "Data de início"
msgctxt "field:timesheet.hours_employee_monthly,create_date:"
msgid "Create Date"
-msgstr "Fecha creación"
+msgstr "Data de criação"
msgctxt "field:timesheet.hours_employee_monthly,create_uid:"
msgid "Create User"
-msgstr "Usuario creación"
+msgstr "Criado pelo usuário"
msgctxt "field:timesheet.hours_employee_monthly,duration:"
msgid "Duration"
-msgstr "Tiempo"
+msgstr "Duração"
msgctxt "field:timesheet.hours_employee_monthly,employee:"
msgid "Employee"
-msgstr "Empleado"
+msgstr "Empregado"
msgctxt "field:timesheet.hours_employee_monthly,id:"
msgid "ID"
@@ -80,39 +80,39 @@ msgstr "ID"
msgctxt "field:timesheet.hours_employee_monthly,month:"
msgid "Month"
-msgstr "Mes"
+msgstr "Mês"
msgctxt "field:timesheet.hours_employee_monthly,rec_name:"
msgid "Name"
-msgstr "Nombre"
+msgstr "Nome"
msgctxt "field:timesheet.hours_employee_monthly,write_date:"
msgid "Write Date"
-msgstr "Fecha modificación"
+msgstr "Data de gravação"
msgctxt "field:timesheet.hours_employee_monthly,write_uid:"
msgid "Write User"
-msgstr "Usuario modificación"
+msgstr "Gravado pelo usuário"
msgctxt "field:timesheet.hours_employee_monthly,year:"
msgid "Year"
-msgstr "Año"
+msgstr "Ano"
msgctxt "field:timesheet.hours_employee_weekly,create_date:"
msgid "Create Date"
-msgstr "Fecha creación"
+msgstr "Data de criação"
msgctxt "field:timesheet.hours_employee_weekly,create_uid:"
msgid "Create User"
-msgstr "Usuario creación"
+msgstr "Criado pelo usuário"
msgctxt "field:timesheet.hours_employee_weekly,duration:"
msgid "Duration"
-msgstr "Tiempo"
+msgstr "Duração"
msgctxt "field:timesheet.hours_employee_weekly,employee:"
msgid "Employee"
-msgstr "Empleado"
+msgstr "Empregado"
msgctxt "field:timesheet.hours_employee_weekly,id:"
msgid "ID"
@@ -120,7 +120,7 @@ msgstr "ID"
msgctxt "field:timesheet.hours_employee_weekly,rec_name:"
msgid "Name"
-msgstr "Nombre"
+msgstr "Nome"
msgctxt "field:timesheet.hours_employee_weekly,week:"
msgid "Week"
@@ -128,15 +128,15 @@ msgstr "Semana"
msgctxt "field:timesheet.hours_employee_weekly,write_date:"
msgid "Write Date"
-msgstr "Fecha modificación"
+msgstr "Data de gravação"
msgctxt "field:timesheet.hours_employee_weekly,write_uid:"
msgid "Write User"
-msgstr "Usuario modificación"
+msgstr "Gravado pelo usuário"
msgctxt "field:timesheet.hours_employee_weekly,year:"
msgid "Year"
-msgstr "Año"
+msgstr "Ano"
msgctxt "field:timesheet.line,company:"
msgid "Company"
@@ -144,27 +144,27 @@ msgstr "Empresa"
msgctxt "field:timesheet.line,create_date:"
msgid "Create Date"
-msgstr "Fecha creación"
+msgstr "Data de criação"
msgctxt "field:timesheet.line,create_uid:"
msgid "Create User"
-msgstr "Usuario creación"
+msgstr "Criado pelo usuário"
msgctxt "field:timesheet.line,date:"
msgid "Date"
-msgstr "Fecha"
+msgstr "Data"
msgctxt "field:timesheet.line,description:"
msgid "Description"
-msgstr "Descripción"
+msgstr "Descrição"
msgctxt "field:timesheet.line,duration:"
msgid "Duration"
-msgstr "Tiempo"
+msgstr "Duração"
msgctxt "field:timesheet.line,employee:"
msgid "Employee"
-msgstr "Empleado"
+msgstr "Empregado"
msgctxt "field:timesheet.line,id:"
msgid "ID"
@@ -172,27 +172,27 @@ msgstr "ID"
msgctxt "field:timesheet.line,rec_name:"
msgid "Name"
-msgstr "Nombre"
+msgstr "Nome"
msgctxt "field:timesheet.line,work:"
msgid "Work"
-msgstr "Trabajo"
+msgstr "Trabalho"
msgctxt "field:timesheet.line,write_date:"
msgid "Write Date"
-msgstr "Fecha modificación"
+msgstr "Data de gravação"
msgctxt "field:timesheet.line,write_uid:"
msgid "Write User"
-msgstr "Usuario modificación"
+msgstr "Gravado pelo usuário"
msgctxt "field:timesheet.line.enter.start,date:"
msgid "Date"
-msgstr "Fecha"
+msgstr "Data"
msgctxt "field:timesheet.line.enter.start,employee:"
msgid "Employee"
-msgstr "Empleado"
+msgstr "Empregado"
msgctxt "field:timesheet.line.enter.start,id:"
msgid "ID"
@@ -200,11 +200,11 @@ msgstr "ID"
msgctxt "field:timesheet.work,active:"
msgid "Active"
-msgstr "Activo"
+msgstr "Ativo"
msgctxt "field:timesheet.work,children:"
msgid "Children"
-msgstr "Hijos"
+msgstr "Criança"
msgctxt "field:timesheet.work,company:"
msgid "Company"
@@ -212,15 +212,15 @@ msgstr "Empresa"
msgctxt "field:timesheet.work,create_date:"
msgid "Create Date"
-msgstr "Fecha creación"
+msgstr "Data de criação"
msgctxt "field:timesheet.work,create_uid:"
msgid "Create User"
-msgstr "Usuario creación"
+msgstr "Criado pelo usuário"
msgctxt "field:timesheet.work,duration:"
msgid "Timesheet Duration"
-msgstr "Tiempo del parte de trabajo"
+msgstr "Duração do Horário de Trabalho"
msgctxt "field:timesheet.work,id:"
msgid "ID"
@@ -228,51 +228,55 @@ msgstr "ID"
msgctxt "field:timesheet.work,left:"
msgid "Left"
-msgstr "Izquierda"
+msgstr "Esquerda"
msgctxt "field:timesheet.work,name:"
msgid "Name"
-msgstr "Nombre"
+msgstr "Nome"
msgctxt "field:timesheet.work,parent:"
msgid "Parent"
-msgstr "Padre"
+msgstr "Parente"
msgctxt "field:timesheet.work,rec_name:"
msgid "Name"
-msgstr "Nombre"
+msgstr "Nome"
msgctxt "field:timesheet.work,right:"
msgid "Right"
-msgstr "Derecha"
+msgstr "Direita"
msgctxt "field:timesheet.work,timesheet_available:"
msgid "Available on timesheets"
-msgstr "Disponible en partes de trabajo"
+msgstr "Disponível nos Horários de Trabalho"
msgctxt "field:timesheet.work,timesheet_end_date:"
msgid "Timesheet End"
-msgstr "Fin de parte de trabajo"
+msgstr "Fim do Horário de Trabalho"
msgctxt "field:timesheet.work,timesheet_lines:"
msgid "Timesheet Lines"
-msgstr "Líneas de parte de trabajo"
+msgstr "Linhas do Horário de Trabalho"
msgctxt "field:timesheet.work,timesheet_start_date:"
msgid "Timesheet Start"
-msgstr "Inicio de parte de trabajo"
+msgstr "Início do Horário de Trabalho"
+
+msgctxt "field:timesheet.work,total_duration:"
+msgid "Total Timesheet Duration"
+msgstr "Duração Total do Horário de Trabalho"
msgctxt "field:timesheet.work,write_date:"
msgid "Write Date"
-msgstr "Fecha modificación"
+msgstr "Data de gravação"
msgctxt "field:timesheet.work,write_uid:"
msgid "Write User"
-msgstr "Usuario modificación"
+msgstr "Gravado pelo usuário"
msgctxt "field:timesheet.work.open.start,from_date:"
msgid "From Date"
-msgstr "Desde la fecha"
+msgstr "Data de Início"
msgctxt "field:timesheet.work.open.start,id:"
msgid "ID"
@@ -280,207 +284,211 @@ msgstr "ID"
msgctxt "field:timesheet.work.open.start,to_date:"
msgid "To Date"
-msgstr "Hasta la fecha"
+msgstr "Data de Fim"
msgctxt "help:timesheet.work,duration:"
msgid "Total time spent on this work"
-msgstr "Tiempo total dedicado en este trabajo."
+msgstr "Total de tempo gasto neste trabalho"
msgctxt "help:timesheet.work,timesheet_available:"
msgid "Allow to fill in timesheets with this work"
-msgstr "Permite completar partes de trabajo con este trabajo."
+msgstr "Permite preencher os horários de trabalho com esta tarefa"
+
+msgctxt "help:timesheet.work,total_duration:"
+msgid "Total time spent on this work and the sub-works"
+msgstr "Tempo total gasto nesta tarega e nas subtarefas"
msgctxt "model:ir.action,name:act_hours_employee_form"
msgid "Hours per Employee"
-msgstr "Horas por empleado"
+msgstr "Horas por Empregado"
msgctxt "model:ir.action,name:act_hours_employee_monthly_form"
msgid "Hours per Employee per Month"
-msgstr "Horas por empleado y mes"
+msgstr "Horas por Empregado por Mês"
msgctxt "model:ir.action,name:act_hours_employee_open"
msgid "Hours per Employee"
-msgstr "Horas por empleado"
+msgstr "Horas por Empregado"
msgctxt "model:ir.action,name:act_hours_employee_weekly_form"
msgid "Hours per Employee per Week"
-msgstr "Horas por empleado y semana"
+msgstr "Horas por empregado por semana"
msgctxt "model:ir.action,name:act_line_enter"
msgid "Enter Timesheet"
-msgstr "Añadir parte de trabajo"
+msgstr "Digite Quadro de Horários"
msgctxt "model:ir.action,name:act_line_form"
msgid "Timesheet Lines"
-msgstr "Líneas del parte de trabajo"
+msgstr "Linhas do Horário de Trabalho"
msgctxt "model:ir.action,name:act_line_form_work"
msgid "Timesheet Lines"
-msgstr "Líneas del parte de trabajo"
+msgstr "Linhas do Horário de Trabalho"
msgctxt "model:ir.action,name:act_open_work"
msgid "Hours per Work"
-msgstr "Horas por trabajo"
+msgstr "Horas por Trabalho"
msgctxt "model:ir.action,name:act_open_work_graph"
msgid "Hours per Work"
-msgstr "Horas por trabajo"
+msgstr "Horas por Trabalho"
msgctxt "model:ir.action,name:act_work_form2"
msgid "Hours per Work"
-msgstr "Horas por trabajo"
+msgstr "Horas por Trabalho"
msgctxt "model:ir.action,name:act_work_form3"
msgid "Hours per Work"
-msgstr "Horas por trabajo"
+msgstr "Horas por Trabalho"
msgctxt "model:ir.action,name:act_work_hours_board"
msgid "Hours per Work"
-msgstr "Horas por trabajo"
+msgstr "Horas por Trabalho"
msgctxt "model:ir.action,name:act_work_list"
msgid "Works"
-msgstr "Trabajos"
+msgstr "Trabalhos"
msgctxt "model:ir.action,name:act_work_tree"
msgid "Works"
-msgstr "Trabajos"
+msgstr "Trabalhos"
msgctxt "model:ir.action,name:act_work_tree2"
msgid "Works"
-msgstr "Trabajos"
+msgstr "Trabalhos"
msgctxt "model:ir.ui.menu,name:menu_configuration"
msgid "Configuration"
-msgstr "Configuración"
+msgstr "Configuração"
msgctxt "model:ir.ui.menu,name:menu_hours_employee_open"
msgid "Hours per Employee"
-msgstr "Horas por empleado"
+msgstr "Horas por Empregado"
msgctxt "model:ir.ui.menu,name:menu_hours_employee_open_monthly"
msgid "Hours per Employee per Month"
-msgstr "Horas por empleado y mes"
+msgstr "Horas por Empregado por Mês"
msgctxt "model:ir.ui.menu,name:menu_hours_employee_open_weekly"
msgid "Hours per Employee per Week"
-msgstr "Horas por empleado y semana"
+msgstr "Horas por empregado por semana"
msgctxt "model:ir.ui.menu,name:menu_line_enter"
msgid "Enter Timesheet"
-msgstr "Añadir parte de trabajo"
+msgstr "Digite Quadro de Horários"
msgctxt "model:ir.ui.menu,name:menu_line_form"
msgid "Timesheet Lines"
-msgstr "Líneas del parte de trabajo"
+msgstr "Linhas do Horário de Trabalho"
msgctxt "model:ir.ui.menu,name:menu_reporting"
msgid "Reporting"
-msgstr "Informes"
+msgstr "Relatório"
msgctxt "model:ir.ui.menu,name:menu_timesheet"
msgid "Timesheet"
-msgstr "Partes de trabajo"
+msgstr "Quadro de tempo"
msgctxt "model:ir.ui.menu,name:menu_work_list"
msgid "Works"
-msgstr "Trabajos"
+msgstr "Trabalhos"
msgctxt "model:ir.ui.menu,name:menu_work_tree"
msgid "Works"
-msgstr "Trabajos"
+msgstr "Trabalhos"
msgctxt "model:ir.ui.menu,name:menu_work_tree2"
msgid "Hours per Work"
-msgstr "Horas por trabajo"
+msgstr "Horas por Trabalho"
msgctxt "model:res.group,name:group_timesheet_admin"
msgid "Timesheet Administration"
-msgstr "Administración de partes de trabajo"
+msgstr "Administração dos Horários de Trabalho"
msgctxt "model:timesheet.hours_employee,name:"
msgid "Hours per Employee"
-msgstr "Horas por empleado"
+msgstr "Horas por Empregado"
msgctxt "model:timesheet.hours_employee.open.start,name:"
msgid "Open Hours per Employee"
-msgstr "Abrir horas por empleado"
+msgstr "Abrir Horas por Empregado"
msgctxt "model:timesheet.hours_employee_monthly,name:"
msgid "Hours per Employee per Month"
-msgstr "Horas por empleado y mes"
+msgstr "Horas por Empregado por Semana"
msgctxt "model:timesheet.hours_employee_weekly,name:"
msgid "Hours per Employee per Week"
-msgstr "Horas por empleado y semana"
+msgstr "Horas por empregado por semana"
msgctxt "model:timesheet.line,name:"
msgid "Timesheet Line"
-msgstr "Línea de parte de trabajo"
+msgstr "Linha de Horário de Trabalho"
msgctxt "model:timesheet.line.enter.start,name:"
msgid "Enter Lines"
-msgstr "Añadir líneas"
+msgstr "Inserir as Linhas"
msgctxt "model:timesheet.work,name:"
msgid "Work"
-msgstr "Trabajo"
+msgstr "Trabalho"
msgctxt "model:timesheet.work.open.start,name:"
msgid "Open Work"
-msgstr "Abrir trabajo"
+msgstr "Abrir Tarefa"
msgctxt "view:timesheet.hours_employee.open.start:"
msgid "Hours per Employee"
-msgstr "Horas por empleado"
+msgstr "Horas por Empregado"
msgctxt "view:timesheet.hours_employee:"
msgid "Duration"
-msgstr "Tiempo"
+msgstr "Duração"
msgctxt "view:timesheet.hours_employee:"
msgid "Hours per Employee"
-msgstr "Horas por empleado"
+msgstr "Horas por Empregado"
msgctxt "view:timesheet.hours_employee_monthly:"
msgid "Hours per Employee per Month"
-msgstr "Horas por empleado y mes"
+msgstr "Horas por Empregado por Mês"
msgctxt "view:timesheet.hours_employee_weekly:"
msgid "Hours per Employee per Week"
-msgstr "Horas por empleado y semana"
+msgstr "Horas por empregado por semana"
msgctxt "view:timesheet.line.enter.start:"
msgid "Enter Timesheet"
-msgstr "Añadir parte de trabajo"
+msgstr "Digite Quadro de Horários"
msgctxt "view:timesheet.line:"
msgid "Duration"
-msgstr "Tiempo"
+msgstr "Duração"
msgctxt "view:timesheet.line:"
msgid "Timesheet Line"
-msgstr "Línea de parte de trabajo"
+msgstr "Linha do Horário de Trabalho"
msgctxt "view:timesheet.line:"
msgid "Timesheet Lines"
-msgstr "Líneas del parte de trabajo"
+msgstr "Linhas do Horário de Trabalho"
msgctxt "view:timesheet.work.open.start:"
msgid "Hours per Work"
-msgstr "Horas por trabajo"
+msgstr "Horas por Trabalho"
msgctxt "view:timesheet.work:"
msgid "Hours per Work"
-msgstr "Horas por trabajo"
+msgstr "Horas por Trabalho"
msgctxt "view:timesheet.work:"
msgid "Work"
-msgstr "Trabajo"
+msgstr "Trabalho"
msgctxt "view:timesheet.work:"
msgid "Works"
-msgstr "Trabajos"
+msgstr "Trabalhos"
msgctxt "wizard_button:timesheet.hours_employee.open,start,end:"
msgid "Cancel"
@@ -496,7 +504,7 @@ msgstr "Cancelar"
msgctxt "wizard_button:timesheet.line.enter,start,enter:"
msgid "Enter"
-msgstr "Añadir"
+msgstr "Inserir"
msgctxt "wizard_button:timesheet.work.open,start,end:"
msgid "Cancel"
diff --git a/locale/ru_RU.po b/locale/ru_RU.po
index d3a4bf5..92b7894 100644
--- a/locale/ru_RU.po
+++ b/locale/ru_RU.po
@@ -265,6 +265,10 @@ msgctxt "field:timesheet.work,timesheet_start_date:"
msgid "Timesheet Start"
msgstr "Начальная дата табеля"
+msgctxt "field:timesheet.work,total_duration:"
+msgid "Total Timesheet Duration"
+msgstr ""
+
msgctxt "field:timesheet.work,write_date:"
msgid "Write Date"
msgstr "Дата изменения"
@@ -293,6 +297,10 @@ msgctxt "help:timesheet.work,timesheet_available:"
msgid "Allow to fill in timesheets with this work"
msgstr "Разрешить заполнять табель с этой работой"
+msgctxt "help:timesheet.work,total_duration:"
+msgid "Total time spent on this work and the sub-works"
+msgstr ""
+
msgctxt "model:ir.action,name:act_hours_employee_form"
msgid "Hours per Employee"
msgstr "Часы на сотрудника"
@@ -438,8 +446,8 @@ msgid "Hours per Employee"
msgstr "Часы на сотрудника"
msgctxt "view:timesheet.hours_employee:"
-msgid "Hours"
-msgstr "Часы"
+msgid "Duration"
+msgstr ""
msgctxt "view:timesheet.hours_employee:"
msgid "Hours per Employee"
@@ -458,8 +466,8 @@ msgid "Enter Timesheet"
msgstr "Ввод табеля"
msgctxt "view:timesheet.line:"
-msgid "Hours"
-msgstr "Часы"
+msgid "Duration"
+msgstr ""
msgctxt "view:timesheet.line:"
msgid "Timesheet Line"
diff --git a/locale/sl_SI.po b/locale/sl_SI.po
index 63a5894..097f6cd 100644
--- a/locale/sl_SI.po
+++ b/locale/sl_SI.po
@@ -11,8 +11,8 @@ msgid ""
"You can not unset \"Available on timesheets\" for work \"%s\" because it "
"already has timesheets."
msgstr ""
-"Za dejavnost \"%s\" ni možno izključiti \"Na evidenci\", ker je bilo zanjo "
-"že evidentirano delo."
+"Za nalogo \"%s\" ni možno izključiti \"Na evidenci\", ker je bilo zanjo že "
+"evidentirano delo."
msgctxt "field:timesheet.hours_employee,create_date:"
msgid "Create Date"
@@ -176,7 +176,7 @@ msgstr "Ime"
msgctxt "field:timesheet.line,work:"
msgid "Work"
-msgstr "Dejavnost"
+msgstr "Naloga"
msgctxt "field:timesheet.line,write_date:"
msgid "Write Date"
@@ -204,7 +204,7 @@ msgstr "Aktivno"
msgctxt "field:timesheet.work,children:"
msgid "Children"
-msgstr "Poddejavnosti"
+msgstr "Podnaloge"
msgctxt "field:timesheet.work,company:"
msgid "Company"
@@ -236,7 +236,7 @@ msgstr "Naziv"
msgctxt "field:timesheet.work,parent:"
msgid "Parent"
-msgstr "Matična dejavnost"
+msgstr "Matična naloga"
msgctxt "field:timesheet.work,rec_name:"
msgid "Name"
@@ -252,15 +252,19 @@ msgstr "Na evidenci"
msgctxt "field:timesheet.work,timesheet_end_date:"
msgid "Timesheet End"
-msgstr "Prisotnost do"
+msgstr "Konec evidence"
msgctxt "field:timesheet.work,timesheet_lines:"
msgid "Timesheet Lines"
-msgstr "Evidenca prisotnosti"
+msgstr "Evidenca dela"
msgctxt "field:timesheet.work,timesheet_start_date:"
msgid "Timesheet Start"
-msgstr "Prisotnost od"
+msgstr "Začetek evidence"
+
+msgctxt "field:timesheet.work,total_duration:"
+msgid "Total Timesheet Duration"
+msgstr "Skupno porabljen čas"
msgctxt "field:timesheet.work,write_date:"
msgid "Write Date"
@@ -284,11 +288,15 @@ msgstr "Do"
msgctxt "help:timesheet.work,duration:"
msgid "Total time spent on this work"
-msgstr "Skupen porabljen čas na tej nalogi"
+msgstr "Skupen čas, porabljen na tej nalogi"
msgctxt "help:timesheet.work,timesheet_available:"
msgid "Allow to fill in timesheets with this work"
-msgstr "Omogoča vnos v evidenco"
+msgstr "Omogoča vnos dela v evidenco"
+
+msgctxt "help:timesheet.work,total_duration:"
+msgid "Total time spent on this work and the sub-works"
+msgstr "Skupen čas, porabljen na tej nalogi in podnalogah"
msgctxt "model:ir.action,name:act_hours_employee_form"
msgid "Hours per Employee"
@@ -308,47 +316,47 @@ msgstr "Tedenske ure po zaposlencu"
msgctxt "model:ir.action,name:act_line_enter"
msgid "Enter Timesheet"
-msgstr "Vnos prisotnosti"
+msgstr "Vnos dela"
msgctxt "model:ir.action,name:act_line_form"
msgid "Timesheet Lines"
-msgstr "Evidenca prisotnosti"
+msgstr "Evidenca dela"
msgctxt "model:ir.action,name:act_line_form_work"
msgid "Timesheet Lines"
-msgstr "Evidenca prisotnosti"
+msgstr "Evidenca dela"
msgctxt "model:ir.action,name:act_open_work"
msgid "Hours per Work"
-msgstr "Ure po dejavnosti"
+msgstr "Ure po nalogi"
msgctxt "model:ir.action,name:act_open_work_graph"
msgid "Hours per Work"
-msgstr "Ure po dejavnosti"
+msgstr "Ure po nalogi"
msgctxt "model:ir.action,name:act_work_form2"
msgid "Hours per Work"
-msgstr "Ure po dejavnosti"
+msgstr "Ure po nalogi"
msgctxt "model:ir.action,name:act_work_form3"
msgid "Hours per Work"
-msgstr "Ure po dejavnosti"
+msgstr "Ure po nalogi"
msgctxt "model:ir.action,name:act_work_hours_board"
msgid "Hours per Work"
-msgstr "Ure po dejavnosti"
+msgstr "Ure po nalogi"
msgctxt "model:ir.action,name:act_work_list"
msgid "Works"
-msgstr "Dejavnosti"
+msgstr "Naloge"
msgctxt "model:ir.action,name:act_work_tree"
msgid "Works"
-msgstr "Dejavnosti"
+msgstr "Naloge"
msgctxt "model:ir.action,name:act_work_tree2"
msgid "Works"
-msgstr "Dejavnosti"
+msgstr "Naloge"
msgctxt "model:ir.ui.menu,name:menu_configuration"
msgid "Configuration"
@@ -368,11 +376,11 @@ msgstr "Tedenske ure po zaposlencu"
msgctxt "model:ir.ui.menu,name:menu_line_enter"
msgid "Enter Timesheet"
-msgstr "Vnos prisotnosti"
+msgstr "Vnos dela"
msgctxt "model:ir.ui.menu,name:menu_line_form"
msgid "Timesheet Lines"
-msgstr "Evidenca prisotnosti"
+msgstr "Evidenca dela"
msgctxt "model:ir.ui.menu,name:menu_reporting"
msgid "Reporting"
@@ -380,23 +388,23 @@ msgstr "Poročila"
msgctxt "model:ir.ui.menu,name:menu_timesheet"
msgid "Timesheet"
-msgstr "Evidenca prisotnosti"
+msgstr "Evidenca dela"
msgctxt "model:ir.ui.menu,name:menu_work_list"
msgid "Works"
-msgstr "Dejavnosti"
+msgstr "Naloge"
msgctxt "model:ir.ui.menu,name:menu_work_tree"
msgid "Works"
-msgstr "Dejavnosti"
+msgstr "Naloge"
msgctxt "model:ir.ui.menu,name:menu_work_tree2"
msgid "Hours per Work"
-msgstr "Ure po dejavnosti"
+msgstr "Ure po nalogi"
msgctxt "model:res.group,name:group_timesheet_admin"
msgid "Timesheet Administration"
-msgstr "Evidenca prisotnosti - vodenje"
+msgstr "Evidenca dela - vodenje"
msgctxt "model:timesheet.hours_employee,name:"
msgid "Hours per Employee"
@@ -416,7 +424,7 @@ msgstr "Tedenske ure po zaposlencu"
msgctxt "model:timesheet.line,name:"
msgid "Timesheet Line"
-msgstr "Evidenca prisotnosti"
+msgstr "Evidenca dela"
msgctxt "model:timesheet.line.enter.start,name:"
msgid "Enter Lines"
@@ -424,11 +432,11 @@ msgstr "Vnos postavk"
msgctxt "model:timesheet.work,name:"
msgid "Work"
-msgstr "Dejavnost"
+msgstr "Naloga"
msgctxt "model:timesheet.work.open.start,name:"
msgid "Open Work"
-msgstr "Odpri dejavnost"
+msgstr "Odpri nalogo"
msgctxt "view:timesheet.hours_employee.open.start:"
msgid "Hours per Employee"
@@ -452,7 +460,7 @@ msgstr "Tedenske ure po zaposlencu"
msgctxt "view:timesheet.line.enter.start:"
msgid "Enter Timesheet"
-msgstr "Vnos prisotnosti"
+msgstr "Vnos dela"
msgctxt "view:timesheet.line:"
msgid "Duration"
@@ -460,27 +468,27 @@ msgstr "Trajanje"
msgctxt "view:timesheet.line:"
msgid "Timesheet Line"
-msgstr "Evidenca prisotnosti"
+msgstr "Evidenca dela"
msgctxt "view:timesheet.line:"
msgid "Timesheet Lines"
-msgstr "Evidenca prisotnosti"
+msgstr "Evidenca dela"
msgctxt "view:timesheet.work.open.start:"
msgid "Hours per Work"
-msgstr "Ure po dejavnosti"
+msgstr "Ure po nalogi"
msgctxt "view:timesheet.work:"
msgid "Hours per Work"
-msgstr "Ure po dejavnosti"
+msgstr "Ure po nalogi"
msgctxt "view:timesheet.work:"
msgid "Work"
-msgstr "Dejavnost"
+msgstr "Naloga"
msgctxt "view:timesheet.work:"
msgid "Works"
-msgstr "Dejavnosti"
+msgstr "Naloge"
msgctxt "wizard_button:timesheet.hours_employee.open,start,end:"
msgid "Cancel"
diff --git a/setup.py b/setup.py
index 4052345..053887e 100644
--- a/setup.py
+++ b/setup.py
@@ -81,6 +81,9 @@ setup(name=name,
'Natural Language :: English',
'Natural Language :: French',
'Natural Language :: German',
+ 'Natural Language :: Hungarian',
+ 'Natural Language :: Italian',
+ 'Natural Language :: Portuguese (Brazilian)',
'Natural Language :: Russian',
'Natural Language :: Slovenian',
'Natural Language :: Spanish',
diff --git a/tryton.cfg b/tryton.cfg
index 13c3bbc..5d5827e 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
[tryton]
-version=3.6.0
+version=3.8.0
depends:
company
company_work_time
diff --git a/trytond_timesheet.egg-info/PKG-INFO b/trytond_timesheet.egg-info/PKG-INFO
index 0815907..d649825 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: 3.6.0
+Version: 3.8.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/3.6/
+Download-URL: http://downloads.tryton.org/3.8/
Description: trytond_timesheet
=================
@@ -60,6 +60,9 @@ Classifier: Natural Language :: Dutch
Classifier: Natural Language :: English
Classifier: Natural Language :: French
Classifier: Natural Language :: German
+Classifier: Natural Language :: Hungarian
+Classifier: Natural Language :: Italian
+Classifier: Natural Language :: Portuguese (Brazilian)
Classifier: Natural Language :: Russian
Classifier: Natural Language :: Slovenian
Classifier: Natural Language :: Spanish
diff --git a/trytond_timesheet.egg-info/SOURCES.txt b/trytond_timesheet.egg-info/SOURCES.txt
index 3694b0b..4ae24b0 100644
--- a/trytond_timesheet.egg-info/SOURCES.txt
+++ b/trytond_timesheet.egg-info/SOURCES.txt
@@ -24,8 +24,14 @@ work.xml
./locale/es_CO.po
./locale/es_EC.po
./locale/es_ES.po
+./locale/es_MX.po
./locale/fr_FR.po
+./locale/hu_HU.po
+./locale/it_IT.po
+./locale/ja_JP.po
+./locale/lt_LT.po
./locale/nl_NL.po
+./locale/pt_BR.po
./locale/ru_RU.po
./locale/sl_SI.po
./tests/__init__.py
@@ -54,8 +60,14 @@ locale/es_AR.po
locale/es_CO.po
locale/es_EC.po
locale/es_ES.po
+locale/es_MX.po
locale/fr_FR.po
+locale/hu_HU.po
+locale/it_IT.po
+locale/ja_JP.po
+locale/lt_LT.po
locale/nl_NL.po
+locale/pt_BR.po
locale/ru_RU.po
locale/sl_SI.po
trytond_timesheet.egg-info/PKG-INFO
diff --git a/trytond_timesheet.egg-info/requires.txt b/trytond_timesheet.egg-info/requires.txt
index a603c96..28fcda3 100644
--- a/trytond_timesheet.egg-info/requires.txt
+++ b/trytond_timesheet.egg-info/requires.txt
@@ -1,4 +1,4 @@
python-sql
-trytond_company >= 3.6, < 3.7
-trytond_company_work_time >= 3.6, < 3.7
-trytond >= 3.6, < 3.7
\ No newline at end of file
+trytond_company >= 3.8, < 3.9
+trytond_company_work_time >= 3.8, < 3.9
+trytond >= 3.8, < 3.9
\ No newline at end of file
diff --git a/view/work_graph.xml b/view/work_graph.xml
index 0e598ba..8195458 100644
--- a/view/work_graph.xml
+++ b/view/work_graph.xml
@@ -6,6 +6,6 @@ this repository contains the full copyright notices and license terms. -->
<field name="name"/>
</x>
<y>
- <field name="duration" timedelta="company_work_time"/>
+ <field name="total_duration" timedelta="company_work_time"/>
</y>
</graph>
diff --git a/view/work_tree2.xml b/view/work_tree2.xml
index 81e9d02..9cc87c0 100644
--- a/view/work_tree2.xml
+++ b/view/work_tree2.xml
@@ -3,5 +3,5 @@
this repository contains the full copyright notices and license terms. -->
<tree string="Works">
<field name="name"/>
- <field name="duration"/>
+ <field name="total_duration"/>
</tree>
diff --git a/work.py b/work.py
index a1109c9..bc803da 100644
--- a/work.py
+++ b/work.py
@@ -38,6 +38,10 @@ class Work(ModelSQL, ModelView):
duration = fields.Function(fields.TimeDelta('Timesheet Duration',
'company_work_time', help="Total time spent on this work"),
'get_duration')
+ total_duration = fields.Function(fields.TimeDelta(
+ 'Total Timesheet Duration', 'company_work_time',
+ help='Total time spent on this work and the sub-works'),
+ 'get_duration')
timesheet_available = fields.Boolean('Available on timesheets',
help="Allow to fill in timesheets with this work")
timesheet_start_date = fields.Date('Timesheet Start',
@@ -103,7 +107,6 @@ class Work(ModelSQL, ModelView):
context = transaction.context
table_w = cls.__table__()
- table_c = cls.__table__()
line = Line.__table__()
ids = [w.id for w in works]
durations = dict.fromkeys(ids, None)
@@ -114,13 +117,20 @@ class Work(ModelSQL, ModelView):
where &= line.date <= context['to_date']
if context.get('employees'):
where &= line.employee.in_(context['employees'])
+
+ if name == 'duration':
+ query_table = table_w.join(line, 'LEFT',
+ condition=line.work == table_w.id)
+ else:
+ table_c = cls.__table__()
+ query_table = table_w.join(table_c,
+ condition=(table_c.left >= table_w.left)
+ & (table_c.right <= table_w.right)
+ ).join(line, 'LEFT', condition=line.work == table_c.id)
+
for sub_ids in grouped_slice(ids):
red_sql = reduce_ids(table_w.id, sub_ids)
- cursor.execute(*table_w.join(table_c,
- condition=(table_c.left >= table_w.left)
- & (table_c.right <= table_w.right)
- ).join(line, 'LEFT', condition=line.work == table_c.id
- ).select(table_w.id, Sum(line.duration),
+ cursor.execute(*query_table.select(table_w.id, Sum(line.duration),
where=red_sql & where,
group_by=table_w.id))
for work_id, duration in cursor.fetchall():
--
tryton-modules-timesheet
More information about the tryton-debian-vcs
mailing list