[tryton-debian-vcs] tryton-modules-timesheet branch debian updated. debian/3.2.0-1-5-gd05f6ad
Mathias Behrle
tryton-debian-vcs at alioth.debian.org
Thu Oct 23 12:19:21 UTC 2014
The following commit has been merged in the debian branch:
https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi/?p=tryton/tryton-modules-timesheet.git;a=commitdiff;h=debian/3.2.0-1-5-gd05f6ad
commit d05f6adfff99a83c1ccc662f7096cf186ff988e9
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Thu Oct 23 13:32:11 2014 +0200
Releasing debian version 3.4.0-1.
Signed-off-by: Mathias Behrle <mathiasb at m9s.biz>
diff --git a/debian/changelog b/debian/changelog
index cf74428..c77590e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+tryton-modules-timesheet (3.4.0-1) unstable; urgency=medium
+
+ * Updating signing key while using now plain .asc files instead of .pgp
+ binaries.
+ * Adding actual upstream signing key.
+ * Updating to Standards-Version: 3.9.6, no changes needed.
+ * Merging upstream version 3.4.0.
+
+ -- Mathias Behrle <mathiasb at m9s.biz> Tue, 21 Oct 2014 20:24:39 +0200
+
tryton-modules-timesheet (3.2.0-1) unstable; urgency=medium
* Removing LC_ALL=C.UTF-8 as build environment.
commit c0325d5253eb66d4a56a13a6c31d9a75ee2ed484
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Tue Oct 21 11:29:25 2014 +0200
Merging upstream version 3.4.0.
diff --git a/CHANGELOG b/CHANGELOG
index 15a178e..ef139cd 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 3.4.0 - 2014-10-20
+* Bug fixes (see mercurial logs for details)
+
Version 3.2.0 - 2014-04-21
* Bug fixes (see mercurial logs for details)
diff --git a/PKG-INFO b/PKG-INFO
index 0d4f2de..073b9d0 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,12 +1,12 @@
Metadata-Version: 1.1
Name: trytond_timesheet
-Version: 3.2.0
+Version: 3.4.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.2/
+Download-URL: http://downloads.tryton.org/3.4/
Description: trytond_timesheet
=================
diff --git a/locale/de_DE.po b/locale/de_DE.po
index 0e1a942..56bfecb 100644
--- a/locale/de_DE.po
+++ b/locale/de_DE.po
@@ -11,17 +11,18 @@ msgid ""
"Every work must be in the same company as it's parent work but \"%(child)s\""
" and \"%(parent)s\" are in different companies."
msgstr ""
-"Das Unternehmen einer Aufgabe muss dasselbe wie das der übergeordneten "
-"Aufgabe sein, aber \"%(child)s\" und \"%(parent)s\" sind unterschiedlichen "
-"Unternehmen zugeordnet."
+"Das Unternehmen einer Tätigkeit muss dasselbe wie das der übergeordneten "
+"Tätigkeit sein, aber \"%(child)s\" und \"%(parent)s\" sind unterschiedlichen"
+" Unternehmen zugeordnet."
msgctxt "error:timesheet.work:"
msgid ""
"You can not unset \"Available on timesheets\" for work \"%s\" because it "
"already has timesheets."
msgstr ""
-"\"Verfügbar für Zeiterfassung\" kann für Arbeit \"%s\" nicht abgewählt "
-"werden, da sie bereits in Zeitpositionen verwendet wurde."
+"\"Verfügbar für Zeiterfassung\" kann für Stunden pro Tätigkeit \"%s\" nicht "
+"abgewählt werden, da sie bereits für die Eingabe von Zeitpositionen "
+"verwendet wurde."
msgctxt "field:timesheet.hours_employee,create_date:"
msgid "Create Date"
@@ -181,7 +182,7 @@ msgstr "Name"
msgctxt "field:timesheet.line,work:"
msgid "Work"
-msgstr "Aufgabe"
+msgstr "Tätigkeit"
msgctxt "field:timesheet.line,write_date:"
msgid "Write Date"
@@ -209,7 +210,7 @@ msgstr "Aktiv"
msgctxt "field:timesheet.work,children:"
msgid "Children"
-msgstr "Untergeordnet (Aufgaben)"
+msgstr "Untergeordnet (Tätigkeiten)"
msgctxt "field:timesheet.work,company:"
msgid "Company"
@@ -241,7 +242,7 @@ msgstr "Name"
msgctxt "field:timesheet.work,parent:"
msgid "Parent"
-msgstr "Übergeordnet (Aufgabe)"
+msgstr "Übergeordnet (Tätigkeit)"
msgctxt "field:timesheet.work,rec_name:"
msgid "Name"
@@ -289,11 +290,11 @@ msgstr "Bis Datum"
msgctxt "help:timesheet.work,hours:"
msgid "Total time spent on this work"
-msgstr "Gesamtzeit für diese Arbeit"
+msgstr "Gesamtzeit für diese Tätigkeit"
msgctxt "help:timesheet.work,timesheet_available:"
msgid "Allow to fill in timesheets with this work"
-msgstr "Diese Arbeit für den Eintrag in Zeiterfassungen freigeben"
+msgstr "Diese Tätigkeit für den Eintrag in Zeiterfassungen freigeben"
msgctxt "model:ir.action,name:act_hours_employee_form"
msgid "Hours per Employee"
@@ -325,35 +326,35 @@ msgstr "Zeitpositionen"
msgctxt "model:ir.action,name:act_open_work"
msgid "Hours per Work"
-msgstr "Stunden pro Aufgabe"
+msgstr "Stunden pro Tätigkeit"
msgctxt "model:ir.action,name:act_open_work_graph"
msgid "Hours per Work"
-msgstr "Stunden pro Aufgabe"
+msgstr "Stunden pro Tätigkeit"
msgctxt "model:ir.action,name:act_work_form2"
msgid "Hours per Work"
-msgstr "Stunden pro Aufgabe"
+msgstr "Stunden pro Tätigkeit"
msgctxt "model:ir.action,name:act_work_form3"
msgid "Hours per Work"
-msgstr "Stunden pro Aufgabe"
+msgstr "Stunden pro Tätigkeit"
msgctxt "model:ir.action,name:act_work_hours_board"
msgid "Hours per Work"
-msgstr "Stunden pro Aufgabe"
+msgstr "Stunden pro Tätigkeit"
msgctxt "model:ir.action,name:act_work_list"
msgid "Works"
-msgstr "Arbeiten"
+msgstr "Tätigkeiten"
msgctxt "model:ir.action,name:act_work_tree"
msgid "Works"
-msgstr "Arbeiten"
+msgstr "Tätigkeiten"
msgctxt "model:ir.action,name:act_work_tree2"
msgid "Works"
-msgstr "Arbeiten"
+msgstr "Tätigkeiten"
msgctxt "model:ir.ui.menu,name:menu_configuration"
msgid "Configuration"
@@ -389,15 +390,15 @@ msgstr "Zeiterfassung"
msgctxt "model:ir.ui.menu,name:menu_work_list"
msgid "Works"
-msgstr "Arbeiten"
+msgstr "Tätigkeiten"
msgctxt "model:ir.ui.menu,name:menu_work_tree"
msgid "Works"
-msgstr "Arbeiten"
+msgstr "Tätigkeiten"
msgctxt "model:ir.ui.menu,name:menu_work_tree2"
msgid "Hours per Work"
-msgstr "Stunden pro Aufgabe"
+msgstr "Stunden pro Tätigkeit"
msgctxt "model:res.group,name:group_timesheet_admin"
msgid "Timesheet Administration"
@@ -429,11 +430,11 @@ msgstr "Eingabe Zeilen"
msgctxt "model:timesheet.work,name:"
msgid "Work"
-msgstr "Aufgabe"
+msgstr "Tätigkeit"
msgctxt "model:timesheet.work.open.start,name:"
msgid "Open Work"
-msgstr "Aufgabe Öffnen"
+msgstr "Tätigkeit Öffnen"
msgctxt "view:timesheet.hours_employee.open.start:"
msgid "Hours per Employee"
@@ -473,19 +474,19 @@ msgstr "Zeitpositionen"
msgctxt "view:timesheet.work.open.start:"
msgid "Hours per Work"
-msgstr "Stunden pro Aufgabe"
+msgstr "Stunden pro Tätigkeit"
msgctxt "view:timesheet.work:"
msgid "Hours per Work"
-msgstr "Stunden pro Aufgabe"
+msgstr "Stunden pro Tätigkeit"
msgctxt "view:timesheet.work:"
msgid "Work"
-msgstr "Aufgabe"
+msgstr "Tätigkeit"
msgctxt "view:timesheet.work:"
msgid "Works"
-msgstr "Arbeiten"
+msgstr "Tätigkeiten"
msgctxt "wizard_button:timesheet.hours_employee.open,start,end:"
msgid "Cancel"
diff --git a/locale/sl_SI.po b/locale/es_EC.po
similarity index 73%
copy from locale/sl_SI.po
copy to locale/es_EC.po
index bb1a355..23d9cd3 100644
--- a/locale/sl_SI.po
+++ b/locale/es_EC.po
@@ -4,39 +4,39 @@ msgstr "Content-Type: text/plain; charset=utf-8\n"
msgctxt "error:timesheet.line:"
msgid "Hours field must be positive"
-msgstr "Vrednost polja \"Ure\" mora biti pozitivna"
+msgstr "El campo \"Horas\" debe ser positivo"
msgctxt "error:timesheet.work:"
msgid ""
"Every work must be in the same company as it's parent work but \"%(child)s\""
" and \"%(parent)s\" are in different companies."
msgstr ""
-"Vsaka dejavnost mora biti v isti družbi kot njena matična dejavnost, vendar "
-"sta \"%(child)s\" in \"%(parent)s\" v različnih družbah."
+"Todo trabajo debe estar en la misma empresa que su trabajo padre pero "
+"\"%(child)s\" y \"%(parent)s\" están en diferentes empresas."
msgctxt "error:timesheet.work:"
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."
+"No puede deshabilitar \"Disponible en partes de trabajo\" \"%s\" porque ya "
+"tiene partes de trabajo."
msgctxt "field:timesheet.hours_employee,create_date:"
msgid "Create Date"
-msgstr "Ustvarjeno"
+msgstr "Fecha de Creación"
msgctxt "field:timesheet.hours_employee,create_uid:"
msgid "Create User"
-msgstr "Ustvaril"
+msgstr "Creado por Usuario"
msgctxt "field:timesheet.hours_employee,employee:"
msgid "Employee"
-msgstr "Zaposlenec"
+msgstr "Empleado"
msgctxt "field:timesheet.hours_employee,hours:"
msgid "Hours"
-msgstr "Ure"
+msgstr "Horas"
msgctxt "field:timesheet.hours_employee,id:"
msgid "ID"
@@ -44,19 +44,19 @@ msgstr "ID"
msgctxt "field:timesheet.hours_employee,rec_name:"
msgid "Name"
-msgstr "Ime"
+msgstr "Nombre"
msgctxt "field:timesheet.hours_employee,write_date:"
msgid "Write Date"
-msgstr "Zapisano"
+msgstr "Fecha de Modificación"
msgctxt "field:timesheet.hours_employee,write_uid:"
msgid "Write User"
-msgstr "Zapisal"
+msgstr "Modificado por Usuario"
msgctxt "field:timesheet.hours_employee.open.start,end_date:"
msgid "End Date"
-msgstr "Končni datum"
+msgstr "Fecha Final"
msgctxt "field:timesheet.hours_employee.open.start,id:"
msgid "ID"
@@ -64,23 +64,23 @@ msgstr "ID"
msgctxt "field:timesheet.hours_employee.open.start,start_date:"
msgid "Start Date"
-msgstr "Začetni datum"
+msgstr "Fecha de Inicio"
msgctxt "field:timesheet.hours_employee_monthly,create_date:"
msgid "Create Date"
-msgstr "Ustvarjeno"
+msgstr "Fecha de Creación"
msgctxt "field:timesheet.hours_employee_monthly,create_uid:"
msgid "Create User"
-msgstr "Ustvaril"
+msgstr "Creado por Usuario"
msgctxt "field:timesheet.hours_employee_monthly,employee:"
msgid "Employee"
-msgstr "Zaposlenec"
+msgstr "Empleado"
msgctxt "field:timesheet.hours_employee_monthly,hours:"
msgid "Hours"
-msgstr "Ure"
+msgstr "Horas"
msgctxt "field:timesheet.hours_employee_monthly,id:"
msgid "ID"
@@ -88,39 +88,39 @@ msgstr "ID"
msgctxt "field:timesheet.hours_employee_monthly,month:"
msgid "Month"
-msgstr "Mesec"
+msgstr "Mes"
msgctxt "field:timesheet.hours_employee_monthly,rec_name:"
msgid "Name"
-msgstr "Ime"
+msgstr "Nombre"
msgctxt "field:timesheet.hours_employee_monthly,write_date:"
msgid "Write Date"
-msgstr "Zapisano"
+msgstr "Fecha de Modificación"
msgctxt "field:timesheet.hours_employee_monthly,write_uid:"
msgid "Write User"
-msgstr "Zapisal"
+msgstr "Modificado por Usuario"
msgctxt "field:timesheet.hours_employee_monthly,year:"
msgid "Year"
-msgstr "Leto"
+msgstr "Año"
msgctxt "field:timesheet.hours_employee_weekly,create_date:"
msgid "Create Date"
-msgstr "Ustvarjeno"
+msgstr "Fecha de Creación"
msgctxt "field:timesheet.hours_employee_weekly,create_uid:"
msgid "Create User"
-msgstr "Ustvaril"
+msgstr "Creado por Usuario"
msgctxt "field:timesheet.hours_employee_weekly,employee:"
msgid "Employee"
-msgstr "Zaposlenec"
+msgstr "Empleado"
msgctxt "field:timesheet.hours_employee_weekly,hours:"
msgid "Hours"
-msgstr "Ure"
+msgstr "Horas"
msgctxt "field:timesheet.hours_employee_weekly,id:"
msgid "ID"
@@ -128,47 +128,47 @@ msgstr "ID"
msgctxt "field:timesheet.hours_employee_weekly,rec_name:"
msgid "Name"
-msgstr "Ime"
+msgstr "Nombre"
msgctxt "field:timesheet.hours_employee_weekly,week:"
msgid "Week"
-msgstr "Teden"
+msgstr "Semana"
msgctxt "field:timesheet.hours_employee_weekly,write_date:"
msgid "Write Date"
-msgstr "Zapisano"
+msgstr "Fecha de Modificación"
msgctxt "field:timesheet.hours_employee_weekly,write_uid:"
msgid "Write User"
-msgstr "Zapisal"
+msgstr "Modificado por Usuario"
msgctxt "field:timesheet.hours_employee_weekly,year:"
msgid "Year"
-msgstr "Leto"
+msgstr "Año"
msgctxt "field:timesheet.line,create_date:"
msgid "Create Date"
-msgstr "Ustvarjeno"
+msgstr "Fecha de Creación"
msgctxt "field:timesheet.line,create_uid:"
msgid "Create User"
-msgstr "Ustvaril"
+msgstr "Creado por Usuario"
msgctxt "field:timesheet.line,date:"
msgid "Date"
-msgstr "Datum"
+msgstr "Fecha"
msgctxt "field:timesheet.line,description:"
msgid "Description"
-msgstr "Opis"
+msgstr "Descripción"
msgctxt "field:timesheet.line,employee:"
msgid "Employee"
-msgstr "Zaposlenec"
+msgstr "Empleado"
msgctxt "field:timesheet.line,hours:"
msgid "Hours"
-msgstr "Ure"
+msgstr "Horas"
msgctxt "field:timesheet.line,id:"
msgid "ID"
@@ -176,27 +176,27 @@ msgstr "ID"
msgctxt "field:timesheet.line,rec_name:"
msgid "Name"
-msgstr "Ime"
+msgstr "Nombre"
msgctxt "field:timesheet.line,work:"
msgid "Work"
-msgstr "Dejavnost"
+msgstr "Trabajo"
msgctxt "field:timesheet.line,write_date:"
msgid "Write Date"
-msgstr "Zapisano"
+msgstr "Fecha de Modificación"
msgctxt "field:timesheet.line,write_uid:"
msgid "Write User"
-msgstr "Zapisal"
+msgstr "Modificado por Usuario"
msgctxt "field:timesheet.line.enter.start,date:"
msgid "Date"
-msgstr "Datum"
+msgstr "Fecha"
msgctxt "field:timesheet.line.enter.start,employee:"
msgid "Employee"
-msgstr "Zaposlenec"
+msgstr "Empleado"
msgctxt "field:timesheet.line.enter.start,id:"
msgid "ID"
@@ -204,27 +204,27 @@ msgstr "ID"
msgctxt "field:timesheet.work,active:"
msgid "Active"
-msgstr "Aktivno"
+msgstr "Activo"
msgctxt "field:timesheet.work,children:"
msgid "Children"
-msgstr "Poddejavnosti"
+msgstr "Hijos"
msgctxt "field:timesheet.work,company:"
msgid "Company"
-msgstr "Družba"
+msgstr "Empresa"
msgctxt "field:timesheet.work,create_date:"
msgid "Create Date"
-msgstr "Ustvarjeno"
+msgstr "Fecha de Creación"
msgctxt "field:timesheet.work,create_uid:"
msgid "Create User"
-msgstr "Ustvaril"
+msgstr "Creado por Usuario"
msgctxt "field:timesheet.work,hours:"
msgid "Timesheet Hours"
-msgstr "Ure prisotnosti"
+msgstr "Horas de Parte de Trabajo"
msgctxt "field:timesheet.work,id:"
msgid "ID"
@@ -232,51 +232,51 @@ msgstr "ID"
msgctxt "field:timesheet.work,left:"
msgid "Left"
-msgstr "Levo"
+msgstr "Izquierda"
msgctxt "field:timesheet.work,name:"
msgid "Name"
-msgstr "Naziv"
+msgstr "Nombre"
msgctxt "field:timesheet.work,parent:"
msgid "Parent"
-msgstr "Matična dejavnost"
+msgstr "Padre"
msgctxt "field:timesheet.work,rec_name:"
msgid "Name"
-msgstr "Ime"
+msgstr "Nombre"
msgctxt "field:timesheet.work,right:"
msgid "Right"
-msgstr "Desno"
+msgstr "Derecha"
msgctxt "field:timesheet.work,timesheet_available:"
msgid "Available on timesheets"
-msgstr "Na evidenci"
+msgstr "Disponible en partes de trabajo"
msgctxt "field:timesheet.work,timesheet_end_date:"
msgid "Timesheet End"
-msgstr "Prisotnost do"
+msgstr "Fin de Parte de Trabajo"
msgctxt "field:timesheet.work,timesheet_lines:"
msgid "Timesheet Lines"
-msgstr "Evidenca prisotnosti"
+msgstr "Líneas de Parte de Trabajo"
msgctxt "field:timesheet.work,timesheet_start_date:"
msgid "Timesheet Start"
-msgstr "Prisotnost od"
+msgstr "Inicio de Parte de Trabajo"
msgctxt "field:timesheet.work,write_date:"
msgid "Write Date"
-msgstr "Zapisano"
+msgstr "Fecha de Modificación"
msgctxt "field:timesheet.work,write_uid:"
msgid "Write User"
-msgstr "Zapisal"
+msgstr "Modificado por Usuario"
msgctxt "field:timesheet.work.open.start,from_date:"
msgid "From Date"
-msgstr "Od"
+msgstr "Desde la Fecha"
msgctxt "field:timesheet.work.open.start,id:"
msgid "ID"
@@ -284,236 +284,236 @@ msgstr "ID"
msgctxt "field:timesheet.work.open.start,to_date:"
msgid "To Date"
-msgstr "Do"
+msgstr "Hasta la Fecha"
msgctxt "help:timesheet.work,hours:"
msgid "Total time spent on this work"
-msgstr "Skupni porabljen čas na dejavnosti"
+msgstr "Tiempo total empleado en esta actividad"
msgctxt "help:timesheet.work,timesheet_available:"
msgid "Allow to fill in timesheets with this work"
-msgstr "Omogoča vnos v evidenco"
+msgstr "Permite completar partes de trabajo con esta trabajo"
msgctxt "model:ir.action,name:act_hours_employee_form"
msgid "Hours per Employee"
-msgstr "Ure po zaposlencu"
+msgstr "Horas por Empleado"
msgctxt "model:ir.action,name:act_hours_employee_monthly_form"
msgid "Hours per Employee per Month"
-msgstr "Mesečne ure po zaposlencu"
+msgstr "Horas por Empleado por Mes"
msgctxt "model:ir.action,name:act_hours_employee_open"
msgid "Hours per Employee"
-msgstr "Ure po zaposlencu"
+msgstr "Horas por Empleado"
msgctxt "model:ir.action,name:act_hours_employee_weekly_form"
msgid "Hours per Employee per Week"
-msgstr "Tedenske ure po zaposlencu"
+msgstr "Horas por Empleado por Semana"
msgctxt "model:ir.action,name:act_line_enter"
msgid "Enter Timesheet"
-msgstr "Vnos prisotnosti"
+msgstr "Ingresar Parte de Trabajo"
msgctxt "model:ir.action,name:act_line_form"
msgid "Timesheet Lines"
-msgstr "Evidenca prisotnosti"
+msgstr "Líneas de Parte de Trabajo"
msgctxt "model:ir.action,name:act_line_form_work"
msgid "Timesheet Lines"
-msgstr "Evidenca prisotnosti"
+msgstr "Líneas de Parte de Trabajo"
msgctxt "model:ir.action,name:act_open_work"
msgid "Hours per Work"
-msgstr "Ure po dejavnosti"
+msgstr "Horas por Trabajo"
msgctxt "model:ir.action,name:act_open_work_graph"
msgid "Hours per Work"
-msgstr "Ure po dejavnosti"
+msgstr "Horas por Trabajo"
msgctxt "model:ir.action,name:act_work_form2"
msgid "Hours per Work"
-msgstr "Ure po dejavnosti"
+msgstr "Horas por Trabajo"
msgctxt "model:ir.action,name:act_work_form3"
msgid "Hours per Work"
-msgstr "Ure po dejavnosti"
+msgstr "Horas por Trabajo"
msgctxt "model:ir.action,name:act_work_hours_board"
msgid "Hours per Work"
-msgstr "Ure po dejavnosti"
+msgstr "Horas por Trabajo"
msgctxt "model:ir.action,name:act_work_list"
msgid "Works"
-msgstr "Dejavnosti"
+msgstr "Trabajos"
msgctxt "model:ir.action,name:act_work_tree"
msgid "Works"
-msgstr "Dejavnosti"
+msgstr "Trabajos"
msgctxt "model:ir.action,name:act_work_tree2"
msgid "Works"
-msgstr "Dejavnosti"
+msgstr "Trabajos"
msgctxt "model:ir.ui.menu,name:menu_configuration"
msgid "Configuration"
-msgstr "Nastavitve"
+msgstr "Configuración"
msgctxt "model:ir.ui.menu,name:menu_hours_employee_open"
msgid "Hours per Employee"
-msgstr "Ure po zaposlencu"
+msgstr "Horas por Empleado"
msgctxt "model:ir.ui.menu,name:menu_hours_employee_open_monthly"
msgid "Hours per Employee per Month"
-msgstr "Mesečne ure po zaposlencu"
+msgstr "Horas por Empleado por Mes"
msgctxt "model:ir.ui.menu,name:menu_hours_employee_open_weekly"
msgid "Hours per Employee per Week"
-msgstr "Tedenske ure po zaposlencu"
+msgstr "Horas por Empleado por Semana"
msgctxt "model:ir.ui.menu,name:menu_line_enter"
msgid "Enter Timesheet"
-msgstr "Vnos prisotnosti"
+msgstr "Ingresar Parte de Trabajo"
msgctxt "model:ir.ui.menu,name:menu_line_form"
msgid "Timesheet Lines"
-msgstr "Evidenca prisotnosti"
+msgstr "Líneas de Parte de Trabajo"
msgctxt "model:ir.ui.menu,name:menu_reporting"
msgid "Reporting"
-msgstr "Poročila"
+msgstr "Informes"
msgctxt "model:ir.ui.menu,name:menu_timesheet"
msgid "Timesheet"
-msgstr "Evidenca prisotnosti"
+msgstr "Partes de Trabajo"
msgctxt "model:ir.ui.menu,name:menu_work_list"
msgid "Works"
-msgstr "Dejavnosti"
+msgstr "Trabajos"
msgctxt "model:ir.ui.menu,name:menu_work_tree"
msgid "Works"
-msgstr "Dejavnosti"
+msgstr "Trabajos"
msgctxt "model:ir.ui.menu,name:menu_work_tree2"
msgid "Hours per Work"
-msgstr "Ure po dejavnosti"
+msgstr "Horas por Trabajo"
msgctxt "model:res.group,name:group_timesheet_admin"
msgid "Timesheet Administration"
-msgstr "Evidenca prisotnosti - vodenje"
+msgstr "Administración de Partes de Trabajo"
msgctxt "model:timesheet.hours_employee,name:"
msgid "Hours per Employee"
-msgstr "Ure po zaposlencu"
+msgstr "Horas por Empleado"
msgctxt "model:timesheet.hours_employee.open.start,name:"
msgid "Open Hours per Employee"
-msgstr "Odprte ure po zaposlencu"
+msgstr "Abrir Horas por Empleado"
msgctxt "model:timesheet.hours_employee_monthly,name:"
msgid "Hours per Employee per Month"
-msgstr "Mesečne ure po zaposlencu"
+msgstr "Horas por Empleado por Mes"
msgctxt "model:timesheet.hours_employee_weekly,name:"
msgid "Hours per Employee per Week"
-msgstr "Tedenske ure po zaposlencu"
+msgstr "Horas por Empleado por Semana"
msgctxt "model:timesheet.line,name:"
msgid "Timesheet Line"
-msgstr "Evidenca prisotnosti"
+msgstr "Línea de Parte de Trabajo"
msgctxt "model:timesheet.line.enter.start,name:"
msgid "Enter Lines"
-msgstr "Vnos postavk"
+msgstr "Ingresar Líneas"
msgctxt "model:timesheet.work,name:"
msgid "Work"
-msgstr "Dejavnost"
+msgstr "Trabajo"
msgctxt "model:timesheet.work.open.start,name:"
msgid "Open Work"
-msgstr "Odpri dejavnost"
+msgstr "Abrir Trabajo"
msgctxt "view:timesheet.hours_employee.open.start:"
msgid "Hours per Employee"
-msgstr "Ure po zaposlencu"
+msgstr "Horas por Empleado"
msgctxt "view:timesheet.hours_employee:"
msgid "Hours"
-msgstr "Ure"
+msgstr "Horas"
msgctxt "view:timesheet.hours_employee:"
msgid "Hours per Employee"
-msgstr "Ure po zaposlencu"
+msgstr "Horas por Empleado"
msgctxt "view:timesheet.hours_employee_monthly:"
msgid "Hours per Employee per Month"
-msgstr "Mesečne ure po zaposlencu"
+msgstr "Horas por Empleado por Mes"
msgctxt "view:timesheet.hours_employee_weekly:"
msgid "Hours per Employee per Week"
-msgstr "Tedenske ure po zaposlencu"
+msgstr "Horas por Empleado por Semana"
msgctxt "view:timesheet.line.enter.start:"
msgid "Enter Timesheet"
-msgstr "Vnos prisotnosti"
+msgstr "Ingresar Parte de Trabajo"
msgctxt "view:timesheet.line:"
msgid "Hours"
-msgstr "Ure"
+msgstr "Horas"
msgctxt "view:timesheet.line:"
msgid "Timesheet Line"
-msgstr "Evidenca prisotnosti"
+msgstr "Línea de Parte de Trabajo"
msgctxt "view:timesheet.line:"
msgid "Timesheet Lines"
-msgstr "Evidenca prisotnosti"
+msgstr "Líneas de Parte de Trabajo"
msgctxt "view:timesheet.work.open.start:"
msgid "Hours per Work"
-msgstr "Ure po dejavnosti"
+msgstr "Horas por Trabajo"
msgctxt "view:timesheet.work:"
msgid "Hours per Work"
-msgstr "Ure po dejavnosti"
+msgstr "Horas por Trabajo"
msgctxt "view:timesheet.work:"
msgid "Work"
-msgstr "Dejavnost"
+msgstr "Trabajo"
msgctxt "view:timesheet.work:"
msgid "Works"
-msgstr "Dejavnosti"
+msgstr "Trabajos"
msgctxt "wizard_button:timesheet.hours_employee.open,start,end:"
msgid "Cancel"
-msgstr "Prekliči"
+msgstr "Cancelar"
msgctxt "wizard_button:timesheet.hours_employee.open,start,open_:"
msgid "Open"
-msgstr "Odpri"
+msgstr "Abrir"
msgctxt "wizard_button:timesheet.line.enter,start,end:"
msgid "Cancel"
-msgstr "Prekliči"
+msgstr "Cancelar"
msgctxt "wizard_button:timesheet.line.enter,start,enter:"
msgid "Enter"
-msgstr "Vnos"
+msgstr "Ingresar"
msgctxt "wizard_button:timesheet.work.open,start,end:"
msgid "Cancel"
-msgstr "Prekliči"
+msgstr "Cancelar"
msgctxt "wizard_button:timesheet.work.open,start,open_:"
msgid "Open"
-msgstr "Odpri"
+msgstr "Abrir"
msgctxt "wizard_button:timesheet.work.open2,start,end:"
msgid "Cancel"
-msgstr "Prekliči"
+msgstr "Cancelar"
msgctxt "wizard_button:timesheet.work.open2,start,open_:"
msgid "Open"
-msgstr "Odpri"
+msgstr "Abrir"
diff --git a/locale/fr_FR.po b/locale/fr_FR.po
index ba9a2ff..dfaa33a 100644
--- a/locale/fr_FR.po
+++ b/locale/fr_FR.po
@@ -11,16 +11,16 @@ msgid ""
"Every work must be in the same company as it's parent work but \"%(child)s\""
" and \"%(parent)s\" are in different companies."
msgstr ""
-"Chaque travail doit être dans la même société que son parent mais "
-"\"%(child)s\" et \"%(parent)s\" ont des sociétés différentes."
+"Chaque travail doit être dans la même société que son parent mais « "
+"%(child)s » et « %(parent)s » ont des sociétés différentes."
msgctxt "error:timesheet.work:"
msgid ""
"You can not unset \"Available on timesheets\" for work \"%s\" because it "
"already has timesheets."
msgstr ""
-"Vous ne pouvez pas enlever \"Disponible sur les feuilles de présence\" pour "
-"le travail \"%s\" parce qu'il a déjà des feuilles de présences."
+"Vous ne pouvez pas enlever « Disponible sur les feuilles de présence » pour "
+"le travail « %s » parce qu'il a déjà des feuilles de présences."
msgctxt "field:timesheet.hours_employee,create_date:"
msgid "Create Date"
diff --git a/locale/sl_SI.po b/locale/sl_SI.po
index bb1a355..d0ad5f2 100644
--- a/locale/sl_SI.po
+++ b/locale/sl_SI.po
@@ -24,11 +24,11 @@ msgstr ""
msgctxt "field:timesheet.hours_employee,create_date:"
msgid "Create Date"
-msgstr "Ustvarjeno"
+msgstr "Izdelano"
msgctxt "field:timesheet.hours_employee,create_uid:"
msgid "Create User"
-msgstr "Ustvaril"
+msgstr "Izdelal"
msgctxt "field:timesheet.hours_employee,employee:"
msgid "Employee"
@@ -68,11 +68,11 @@ msgstr "Začetni datum"
msgctxt "field:timesheet.hours_employee_monthly,create_date:"
msgid "Create Date"
-msgstr "Ustvarjeno"
+msgstr "Izdelano"
msgctxt "field:timesheet.hours_employee_monthly,create_uid:"
msgid "Create User"
-msgstr "Ustvaril"
+msgstr "Izdelal"
msgctxt "field:timesheet.hours_employee_monthly,employee:"
msgid "Employee"
@@ -108,11 +108,11 @@ msgstr "Leto"
msgctxt "field:timesheet.hours_employee_weekly,create_date:"
msgid "Create Date"
-msgstr "Ustvarjeno"
+msgstr "Izdelano"
msgctxt "field:timesheet.hours_employee_weekly,create_uid:"
msgid "Create User"
-msgstr "Ustvaril"
+msgstr "Izdelal"
msgctxt "field:timesheet.hours_employee_weekly,employee:"
msgid "Employee"
@@ -148,11 +148,11 @@ msgstr "Leto"
msgctxt "field:timesheet.line,create_date:"
msgid "Create Date"
-msgstr "Ustvarjeno"
+msgstr "Izdelano"
msgctxt "field:timesheet.line,create_uid:"
msgid "Create User"
-msgstr "Ustvaril"
+msgstr "Izdelal"
msgctxt "field:timesheet.line,date:"
msgid "Date"
@@ -216,11 +216,11 @@ msgstr "Družba"
msgctxt "field:timesheet.work,create_date:"
msgid "Create Date"
-msgstr "Ustvarjeno"
+msgstr "Izdelano"
msgctxt "field:timesheet.work,create_uid:"
msgid "Create User"
-msgstr "Ustvaril"
+msgstr "Izdelal"
msgctxt "field:timesheet.work,hours:"
msgid "Timesheet Hours"
diff --git a/tryton.cfg b/tryton.cfg
index ddf5700..ac937bc 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
[tryton]
-version=3.2.0
+version=3.4.0
depends:
company
company_work_time
diff --git a/trytond_timesheet.egg-info/PKG-INFO b/trytond_timesheet.egg-info/PKG-INFO
index d72bcc4..9acc551 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.2.0
+Version: 3.4.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.2/
+Download-URL: http://downloads.tryton.org/3.4/
Description: trytond_timesheet
=================
diff --git a/trytond_timesheet.egg-info/SOURCES.txt b/trytond_timesheet.egg-info/SOURCES.txt
index 2644413..3694b0b 100644
--- a/trytond_timesheet.egg-info/SOURCES.txt
+++ b/trytond_timesheet.egg-info/SOURCES.txt
@@ -11,9 +11,40 @@ tryton.cfg
work.xml
./__init__.py
./line.py
+./line.xml
+./timesheet.xml
+./tryton.cfg
./work.py
+./work.xml
+./locale/bg_BG.po
+./locale/ca_ES.po
+./locale/cs_CZ.po
+./locale/de_DE.po
+./locale/es_AR.po
+./locale/es_CO.po
+./locale/es_EC.po
+./locale/es_ES.po
+./locale/fr_FR.po
+./locale/nl_NL.po
+./locale/ru_RU.po
+./locale/sl_SI.po
./tests/__init__.py
./tests/test_timesheet.py
+./view/hours_employee_graph.xml
+./view/hours_employee_monthly_tree.xml
+./view/hours_employee_open_start_form.xml
+./view/hours_employee_tree.xml
+./view/hours_employee_weekly_tree.xml
+./view/line_enter_start_form.xml
+./view/line_form.xml
+./view/line_tree.xml
+./view/work_form.xml
+./view/work_graph.xml
+./view/work_hours_board.xml
+./view/work_list.xml
+./view/work_open_start_form.xml
+./view/work_tree.xml
+./view/work_tree2.xml
doc/index.rst
locale/bg_BG.po
locale/ca_ES.po
@@ -21,6 +52,7 @@ locale/cs_CZ.po
locale/de_DE.po
locale/es_AR.po
locale/es_CO.po
+locale/es_EC.po
locale/es_ES.po
locale/fr_FR.po
locale/nl_NL.po
diff --git a/trytond_timesheet.egg-info/requires.txt b/trytond_timesheet.egg-info/requires.txt
index a575e5e..c699d82 100644
--- a/trytond_timesheet.egg-info/requires.txt
+++ b/trytond_timesheet.egg-info/requires.txt
@@ -1,4 +1,4 @@
python-sql
-trytond_company >= 3.2, < 3.3
-trytond_company_work_time >= 3.2, < 3.3
-trytond >= 3.2, < 3.3
\ No newline at end of file
+trytond_company >= 3.4, < 3.5
+trytond_company_work_time >= 3.4, < 3.5
+trytond >= 3.4, < 3.5
\ No newline at end of file
diff --git a/work.py b/work.py
index af9c0c4..0300d96 100644
--- a/work.py
+++ b/work.py
@@ -8,7 +8,7 @@ from trytond.wizard import Wizard, StateView, StateAction, Button
from trytond.pyson import PYSONEncoder, Not, Bool, Eval
from trytond.transaction import Transaction
from trytond.pool import Pool
-from trytond.tools import reduce_ids
+from trytond.tools import reduce_ids, grouped_slice
__all__ = ['Work', 'OpenWorkStart', 'OpenWork', 'OpenWork2', 'OpenWorkGraph']
@@ -101,7 +101,6 @@ class Work(ModelSQL, ModelView):
Line = pool.get('timesheet.line')
transaction = Transaction()
cursor = transaction.cursor
- in_max = cursor.IN_MAX
context = transaction.context
table_w = cls.__table__()
@@ -116,8 +115,7 @@ class Work(ModelSQL, ModelView):
where &= line.date <= context['to_date']
if context.get('employees'):
where &= line.employee.in_(context['employees'])
- for i in range(0, len(ids), in_max):
- sub_ids = ids[i:i + in_max]
+ 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)
@@ -168,10 +166,10 @@ class Work(ModelSQL, ModelView):
childs = []
for works, values in zip(actions, actions):
if not values.get('timesheet_available', True):
- in_max = Transaction().cursor.IN_MAX
- for i in range(0, len(works), in_max):
- sub_ids = [w.id for w in works[i:i + in_max]]
- lines = Lines.search([('work', 'in', sub_ids)], limit=1)
+ for sub_works in grouped_slice(works):
+ lines = Lines.search([
+ ('work', 'in', [x.id for x in sub_works]),
+ ], limit=1)
if lines:
cls.raise_user_error('change_timesheet_available',
lines[0].work.rec_name)
--
tryton-modules-timesheet
More information about the tryton-debian-vcs
mailing list