[tryton-debian-vcs] tryton-modules-timesheet branch upstream created. 2c7a98d061976d265321ef18937233ec787672a9
Mathias Behrle
tryton-debian-vcs at alioth.debian.org
Wed Nov 27 17:12:44 UTC 2013
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=2c7a98d061976d265321ef18937233ec787672a9
commit 2c7a98d061976d265321ef18937233ec787672a9
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Sun Nov 24 17:28:46 2013 +0100
Adding upstream version 3.0.0.
diff --git a/CHANGELOG b/CHANGELOG
index 8a6f641..9dc6baf 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 3.0.0 - 2013-10-21
+* Bug fixes (see mercurial logs for details)
+
Version 2.8.0 - 2013-04-22
* Bug fixes (see mercurial logs for details)
* Add start/end date to work for timesheet
diff --git a/INSTALL b/INSTALL
index e8cb52c..0b5f2eb 100644
--- a/INSTALL
+++ b/INSTALL
@@ -5,6 +5,7 @@ Prerequisites
-------------
* Python 2.6 or later (http://www.python.org/)
+ * python-sql (http://code.google.com/p/python-sql/)
* trytond (http://www.tryton.org/)
* trytond_company (http://www.tryton.org/)
* trytond_company_work_time (http://www.tryton.org/)
diff --git a/PKG-INFO b/PKG-INFO
index 2b7b9b8..c597dcd 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,12 +1,12 @@
Metadata-Version: 1.1
Name: trytond_timesheet
-Version: 2.8.0
+Version: 3.0.0
Summary: Tryton module with timesheets
Home-page: http://www.tryton.org/
Author: Tryton
Author-email: UNKNOWN
License: GPL-3
-Download-URL: http://downloads.tryton.org/2.8/
+Download-URL: http://downloads.tryton.org/3.0/
Description: trytond_timesheet
=================
@@ -60,6 +60,7 @@ Classifier: Natural Language :: English
Classifier: Natural Language :: French
Classifier: Natural Language :: German
Classifier: Natural Language :: Russian
+Classifier: Natural Language :: Slovenian
Classifier: Natural Language :: Spanish
Classifier: Operating System :: OS Independent
Classifier: Programming Language :: Python :: 2.6
diff --git a/line.py b/line.py
index 541b016..f310df6 100644
--- a/line.py
+++ b/line.py
@@ -1,8 +1,12 @@
#This file is part of Tryton. The COPYRIGHT file at the top level of
#this repository contains the full copyright notices and license terms.
+from sql import Literal
+from sql.aggregate import Max, Sum
+from sql.conditionals import Coalesce
+from sql.functions import Extract
+
from trytond.model import ModelView, ModelSQL, fields
from trytond.wizard import Wizard, StateView, StateAction, Button
-from trytond.backend import FIELDS
from trytond.pyson import Eval, PYSONEncoder, Date, Get
from trytond.transaction import Transaction
from trytond.pool import Pool
@@ -18,7 +22,7 @@ class Line(ModelSQL, ModelView):
__name__ = 'timesheet.line'
employee = fields.Many2One('company.employee', 'Employee', required=True,
select=True, domain=[
- ('company', '=', Get(Eval('context', {}), 'company')),
+ ('company', '=', Eval('context', {}).get('company', -1)),
])
date = fields.Date('Date', required=True, select=True)
hours = fields.Float('Hours', digits=(16, 2), required=True)
@@ -76,7 +80,7 @@ class EnterLinesStart(ModelView):
'Enter Lines'
__name__ = 'timesheet.line.enter.start'
employee = fields.Many2One('company.employee', 'Employee', required=True,
- domain=[('company', '=', Get(Eval('context', {}), 'company'))])
+ domain=[('company', '=', Eval('context', {}).get('company', -1))])
date = fields.Date('Date', required=True)
@staticmethod
@@ -126,25 +130,24 @@ class HoursEmployee(ModelSQL, ModelView):
@staticmethod
def table_query():
- clause = ' '
- args = [True]
+ pool = Pool()
+ Line = pool.get('timesheet.line')
+ line = Line.__table__()
+ where = Literal(True)
if Transaction().context.get('start_date'):
- clause += 'AND date >= %s '
- args.append(Transaction().context['start_date'])
+ where &= line.date >= Transaction().context['start_date']
if Transaction().context.get('end_date'):
- clause += 'AND date <= %s '
- args.append(Transaction().context['end_date'])
- return ('SELECT DISTINCT(employee) AS id, '
- 'MAX(create_uid) AS create_uid, '
- 'MAX(create_date) AS create_date, '
- 'MAX(write_uid) AS write_uid, '
- 'MAX(write_date) AS write_date, '
- 'employee, '
- 'SUM(COALESCE(hours, 0)) AS hours '
- 'FROM timesheet_line '
- 'WHERE %s '
- + clause +
- 'GROUP BY employee', args)
+ where &= line.date <= Transaction().context['end_date']
+ return line.select(
+ line.employee.as_('id'),
+ Max(line.create_uid).as_('create_uid'),
+ Max(line.create_date).as_('create_date'),
+ Max(line.write_uid).as_('write_uid'),
+ Max(line.write_date).as_('write_date'),
+ line.employee,
+ Sum(Coalesce(line.hours, 0)).as_('hours'),
+ where=where,
+ group_by=line.employee)
class OpenHoursEmployeeStart(ModelView):
@@ -192,23 +195,25 @@ class HoursEmployeeWeekly(ModelSQL, ModelView):
@classmethod
def table_query(cls):
- type_name = FIELDS[cls.year._type].sql_type(cls.year)[0]
- return ('SELECT id, create_uid, create_date, write_uid, write_date, '
- 'CAST(year AS ' + type_name + ') AS year, week, '
- 'employee, hours '
- 'FROM ('
- 'SELECT EXTRACT(WEEK FROM date) + '
- 'EXTRACT(YEAR FROM date) * 100 + '
- 'employee * 1000000 AS id, '
- 'MAX(create_uid) AS create_uid, '
- 'MAX(create_date) AS create_date, '
- 'MAX(write_uid) AS write_uid, '
- 'MAX(write_date) AS write_date, '
- 'EXTRACT(YEAR FROM date) AS year, '
- 'EXTRACT(WEEK FROM date) AS week, employee, '
- 'SUM(COALESCE(hours, 0)) AS hours '
- 'FROM timesheet_line '
- 'GROUP BY year, week, employee) AS ' + cls._table, [])
+ pool = Pool()
+ Line = pool.get('timesheet.line')
+ line = Line.__table__()
+ type_name = cls.year.sql_type().base
+ year_column = Extract('YEAR', line.date).cast(type_name).as_('year')
+ week_column = Extract('WEEK', line.date).as_('week')
+ return line.select(
+ Max(Extract('WEEK', line.date)
+ + Extract('YEAR', line.date) * 100
+ + line.employee * 1000000).as_('id'),
+ Max(line.create_uid).as_('create_uid'),
+ Max(line.create_date).as_('create_date'),
+ Max(line.write_uid).as_('write_uid'),
+ Max(line.write_date).as_('write_date'),
+ year_column,
+ week_column,
+ line.employee,
+ Sum(Coalesce(line.hours, 0)).as_('hours'),
+ group_by=(year_column, week_column, line.employee))
class HoursEmployeeMonthly(ModelSQL, ModelView):
@@ -228,20 +233,22 @@ class HoursEmployeeMonthly(ModelSQL, ModelView):
@classmethod
def table_query(cls):
- type_name = FIELDS[cls.year._type].sql_type(cls.year)[0]
- return ('SELECT id, create_uid, create_date, write_uid, write_date, '
- 'CAST(year AS ' + type_name + ') AS year, month, '
- 'employee, hours '
- 'FROM ('
- 'SELECT EXTRACT(MONTH FROM date) + '
- 'EXTRACT(YEAR FROM date) * 100 + '
- 'employee * 1000000 AS id, '
- 'MAX(create_uid) AS create_uid, '
- 'MAX(create_date) AS create_date, '
- 'MAX(write_uid) AS write_uid, '
- 'MAX(write_date) AS write_date, '
- 'EXTRACT(YEAR FROM date) AS year, '
- 'EXTRACT(MONTH FROM date) AS month, employee, '
- 'SUM(COALESCE(hours, 0)) AS hours '
- 'FROM timesheet_line '
- 'GROUP BY year, month, employee) AS ' + cls._table, [])
+ pool = Pool()
+ Line = pool.get('timesheet.line')
+ line = Line.__table__()
+ type_name = cls.year.sql_type().base
+ year_column = Extract('YEAR', line.date).cast(type_name).as_('year')
+ month_column = Extract('MONTH', line.date).as_('month')
+ return line.select(
+ Max(Extract('MONTH', line.date)
+ + Extract('YEAR', line.date) * 100
+ + line.employee * 1000000).as_('id'),
+ Max(line.create_uid).as_('create_uid'),
+ Max(line.create_date).as_('create_date'),
+ Max(line.write_uid).as_('write_uid'),
+ Max(line.write_date).as_('write_date'),
+ year_column,
+ month_column,
+ line.employee,
+ Sum(Coalesce(line.hours, 0)).as_('hours'),
+ group_by=(year_column, month_column, line.employee))
diff --git a/locale/bg_BG.po b/locale/bg_BG.po
index ea6b806..18f4123 100644
--- a/locale/bg_BG.po
+++ b/locale/bg_BG.po
@@ -12,6 +12,12 @@ msgid ""
" and \"%(parent)s\" are in different companies."
msgstr ""
+msgctxt "error:timesheet.work:"
+msgid ""
+"You can not unset \"Available on timesheets\" for work \"%s\" because it "
+"already has timesheets."
+msgstr ""
+
msgctxt "field:timesheet.hours_employee,create_date:"
msgid "Create Date"
msgstr "Създадено на"
diff --git a/locale/ca_ES.po b/locale/ca_ES.po
index 5923ff2..dbc9343 100644
--- a/locale/ca_ES.po
+++ b/locale/ca_ES.po
@@ -14,6 +14,14 @@ msgstr ""
"Tot treball ha d'estar a la mateixa empresa que el seu pare, però "
"\"%(child)s\" i \"%(parent)s\" estan a empreses diferents."
+msgctxt "error:timesheet.work:"
+msgid ""
+"You can not unset \"Available on timesheets\" for work \"%s\" because it "
+"already has timesheets."
+msgstr ""
+"No podeu desactivar \"Disponible en fulls de treball\" pel treball \"%s\" "
+"perquè ja té fulls de treball."
+
msgctxt "field:timesheet.hours_employee,create_date:"
msgid "Create Date"
msgstr "Data creació"
@@ -250,6 +258,7 @@ msgctxt "field:timesheet.work,timesheet_end_date:"
msgid "Timesheet End"
msgstr "Final de full de treball"
+#, fuzzy
msgctxt "field:timesheet.work,timesheet_lines:"
msgid ""
msgstr ""
diff --git a/locale/cs_CZ.po b/locale/cs_CZ.po
index fcb4794..eadd0af 100644
--- a/locale/cs_CZ.po
+++ b/locale/cs_CZ.po
@@ -12,6 +12,12 @@ msgid ""
" and \"%(parent)s\" are in different companies."
msgstr ""
+msgctxt "error:timesheet.work:"
+msgid ""
+"You can not unset \"Available on timesheets\" for work \"%s\" because it "
+"already has timesheets."
+msgstr ""
+
msgctxt "field:timesheet.hours_employee,create_date:"
msgid "Create Date"
msgstr ""
diff --git a/locale/de_DE.po b/locale/de_DE.po
index 642bd9c..9249bd1 100644
--- a/locale/de_DE.po
+++ b/locale/de_DE.po
@@ -15,6 +15,14 @@ msgstr ""
"Aufgabe 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."
+
msgctxt "field:timesheet.hours_employee,create_date:"
msgid "Create Date"
msgstr "Erstellungsdatum"
diff --git a/locale/es_AR.po b/locale/es_AR.po
index 6d0bb4f..20a4d52 100644
--- a/locale/es_AR.po
+++ b/locale/es_AR.po
@@ -14,6 +14,14 @@ msgstr ""
"Todo trabajo debe estar en la misma empresa que su padre, pero «%(child)s» y"
" «%(parent)s» están en empresas diferentes."
+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."
+
msgctxt "field:timesheet.hours_employee,create_date:"
msgid "Create Date"
msgstr "Fecha creación"
diff --git a/locale/es_CO.po b/locale/es_CO.po
index 144fc7c..d0a70dc 100644
--- a/locale/es_CO.po
+++ b/locale/es_CO.po
@@ -14,6 +14,14 @@ msgstr ""
"Cada trabajo debe estar en la misma compañía que su trabajo padre pero "
"\"%(child)s\" y \"%(parent)s\" están en diferentes compañias."
+msgctxt "error:timesheet.work:"
+msgid ""
+"You can not unset \"Available on timesheets\" for work \"%s\" because it "
+"already has timesheets."
+msgstr ""
+"No puede cambiar \"Registros Disponibles\" para los trabajos \"%s\" porque "
+"hay registros activos."
+
msgctxt "field:timesheet.hours_employee,create_date:"
msgid "Create Date"
msgstr "Fecha de Creación"
diff --git a/locale/es_ES.po b/locale/es_ES.po
index ad0d604..aabd8b2 100644
--- a/locale/es_ES.po
+++ b/locale/es_ES.po
@@ -14,6 +14,14 @@ msgstr ""
"Todo trabajo debe estar en la misma empresa que su padre, pero \"%(child)s\""
" y \"%(parent)s\" están en empresas diferentes."
+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 hojas de trabajo\" \"%s\" porque ya "
+"tiene hojas de trabajo."
+
msgctxt "field:timesheet.hours_employee,create_date:"
msgid "Create Date"
msgstr "Fecha creación"
diff --git a/locale/fr_FR.po b/locale/fr_FR.po
index 2ed9279..d05dbb9 100644
--- a/locale/fr_FR.po
+++ b/locale/fr_FR.po
@@ -6,10 +6,6 @@ msgctxt "error:timesheet.line:"
msgid "Hours field must be positive"
msgstr "Le champ Heures doit être positif"
-msgctxt "error:timesheet.line:"
-msgid "Hours field must be positive"
-msgstr "Le champ Heures doit être positif"
-
msgctxt "error:timesheet.work:"
msgid ""
"Every work must be in the same company as it's parent work but \"%(child)s\""
@@ -18,6 +14,14 @@ 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."
+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."
+
msgctxt "field:timesheet.hours_employee,create_date:"
msgid "Create Date"
msgstr "Date de création"
@@ -220,7 +224,7 @@ msgstr "Créé par"
msgctxt "field:timesheet.work,hours:"
msgid "Timesheet Hours"
-msgstr "Heures"
+msgstr "Heures de présence"
msgctxt "field:timesheet.work,id:"
msgid "ID"
@@ -252,7 +256,7 @@ msgstr "Disponible sur les feuilles de présence"
msgctxt "field:timesheet.work,timesheet_end_date:"
msgid "Timesheet End"
-msgstr "Fin feuille de présence"
+msgstr "Fin de feuille de présence"
msgctxt "field:timesheet.work,timesheet_lines:"
msgid ""
@@ -260,7 +264,7 @@ msgstr ""
msgctxt "field:timesheet.work,timesheet_start_date:"
msgid "Timesheet Start"
-msgstr "Début feuille de présence"
+msgstr "Début de feuille de présence"
msgctxt "field:timesheet.work,write_date:"
msgid "Write Date"
@@ -284,11 +288,11 @@ msgstr "Date de fin"
msgctxt "help:timesheet.work,hours:"
msgid "Total time spent on this work"
-msgstr "Temps total passé sur cette activité"
+msgstr "Temps total passé sur ce travail"
msgctxt "help:timesheet.work,timesheet_available:"
msgid "Allow to fill in timesheets with this work"
-msgstr "Autoriser cette activité sur les feuilles de présence"
+msgstr "Autoriser ce travail sur les feuilles de présence"
msgctxt "model:ir.action,name:act_hours_employee_form"
msgid "Hours per Employee"
@@ -308,7 +312,7 @@ msgstr "Nombre d'heures par employé par semaine"
msgctxt "model:ir.action,name:act_line_enter"
msgid "Enter Timesheet"
-msgstr "Entrer la feuille de présence"
+msgstr "Entrer feuille de présence"
msgctxt "model:ir.action,name:act_line_form"
msgid "Timesheet Lines"
@@ -320,23 +324,23 @@ msgstr "Lignes de feuille de présence"
msgctxt "model:ir.action,name:act_open_work"
msgid "Hours per Work"
-msgstr "Heures par activité"
+msgstr "Heures par travail"
msgctxt "model:ir.action,name:act_open_work_graph"
msgid "Hours per Work"
-msgstr "Heures par activité"
+msgstr "Heures par travail"
msgctxt "model:ir.action,name:act_work_form2"
msgid "Hours per Work"
-msgstr "Heures par activité"
+msgstr "Heures par travail"
msgctxt "model:ir.action,name:act_work_form3"
msgid "Hours per Work"
-msgstr "Heures par activité"
+msgstr "Heures par travail"
msgctxt "model:ir.action,name:act_work_hours_board"
msgid "Hours per Work"
-msgstr "Heures par activité"
+msgstr "Heures par travail"
msgctxt "model:ir.action,name:act_work_list"
msgid "Works"
@@ -368,7 +372,7 @@ msgstr "Heures par employé par semaine"
msgctxt "model:ir.ui.menu,name:menu_line_enter"
msgid "Enter Timesheet"
-msgstr "Entrer la feuille de présence"
+msgstr "Entrer feuille de présence"
msgctxt "model:ir.ui.menu,name:menu_line_form"
msgid "Timesheet Lines"
@@ -392,7 +396,7 @@ msgstr "Travaux"
msgctxt "model:ir.ui.menu,name:menu_work_tree2"
msgid "Hours per Work"
-msgstr "Heures par activité"
+msgstr "Heures par travail"
msgctxt "model:res.group,name:group_timesheet_admin"
msgid "Timesheet Administration"
@@ -428,7 +432,7 @@ msgstr "Travail"
msgctxt "model:timesheet.work.open.start,name:"
msgid "Open Work"
-msgstr "Ouvrir la tâche"
+msgstr "Ouvrir le travail"
msgctxt "view:timesheet.hours_employee.open.start:"
msgid "Hours per Employee"
@@ -439,14 +443,6 @@ msgid "Hours"
msgstr "Heures"
msgctxt "view:timesheet.hours_employee:"
-msgid "Hours"
-msgstr "Heures"
-
-msgctxt "view:timesheet.hours_employee:"
-msgid "Hours per Employee"
-msgstr "Heures par employé"
-
-msgctxt "view:timesheet.hours_employee:"
msgid "Hours per Employee"
msgstr "Heures par employé"
@@ -454,25 +450,13 @@ msgctxt "view:timesheet.hours_employee_monthly:"
msgid "Hours per Employee per Month"
msgstr "Nombre d'heures par employé par mois"
-msgctxt "view:timesheet.hours_employee_monthly:"
-msgid "Hours per Employee per Month"
-msgstr "Nombre d'heures par employé par mois"
-
-msgctxt "view:timesheet.hours_employee_weekly:"
-msgid "Hours per Employee per Week"
-msgstr "Nombre d'heures par employé par semaine"
-
msgctxt "view:timesheet.hours_employee_weekly:"
msgid "Hours per Employee per Week"
msgstr "Nombre d'heures par employé par semaine"
msgctxt "view:timesheet.line.enter.start:"
msgid "Enter Timesheet"
-msgstr "Entrer la feuille de présence"
-
-msgctxt "view:timesheet.line:"
-msgid "Hours"
-msgstr "Heures"
+msgstr "Entrer feuille de présence"
msgctxt "view:timesheet.line:"
msgid "Hours"
@@ -483,32 +467,16 @@ msgid "Timesheet Line"
msgstr "Ligne de feuille de présence"
msgctxt "view:timesheet.line:"
-msgid "Timesheet Line"
-msgstr "Ligne de feuille de présence"
-
-msgctxt "view:timesheet.line:"
-msgid "Timesheet Lines"
-msgstr "Lignes de feuille de présence"
-
-msgctxt "view:timesheet.line:"
msgid "Timesheet Lines"
msgstr "Lignes de feuille de présence"
msgctxt "view:timesheet.work.open.start:"
msgid "Hours per Work"
-msgstr "Heures par activité"
-
-msgctxt "view:timesheet.work:"
-msgid "Hours per Work"
-msgstr "Heures par activité"
+msgstr "Heures par travail"
msgctxt "view:timesheet.work:"
msgid "Hours per Work"
-msgstr "Heures par activité"
-
-msgctxt "view:timesheet.work:"
-msgid "Work"
-msgstr "Travail"
+msgstr "Heures par travail"
msgctxt "view:timesheet.work:"
msgid "Work"
@@ -518,10 +486,6 @@ msgctxt "view:timesheet.work:"
msgid "Works"
msgstr "Travaux"
-msgctxt "view:timesheet.work:"
-msgid "Works"
-msgstr "Travaux"
-
msgctxt "wizard_button:timesheet.hours_employee.open,start,end:"
msgid "Cancel"
msgstr "Annuler"
diff --git a/locale/nl_NL.po b/locale/nl_NL.po
index d4e074e..a233f65 100644
--- a/locale/nl_NL.po
+++ b/locale/nl_NL.po
@@ -12,6 +12,12 @@ msgid ""
" and \"%(parent)s\" are in different companies."
msgstr ""
+msgctxt "error:timesheet.work:"
+msgid ""
+"You can not unset \"Available on timesheets\" for work \"%s\" because it "
+"already has timesheets."
+msgstr ""
+
msgctxt "field:timesheet.hours_employee,create_date:"
msgid "Create Date"
msgstr ""
diff --git a/locale/ru_RU.po b/locale/ru_RU.po
index 724500f..b58a027 100644
--- a/locale/ru_RU.po
+++ b/locale/ru_RU.po
@@ -14,6 +14,12 @@ msgstr ""
"Каждая работа должна быть в той же организации, что и её предок, но "
"\"%(child)s\" и \"%(parent)s\" принадлежат разным организациям."
+msgctxt "error:timesheet.work:"
+msgid ""
+"You can not unset \"Available on timesheets\" for work \"%s\" because it "
+"already has timesheets."
+msgstr ""
+
msgctxt "field:timesheet.hours_employee,create_date:"
msgid "Create Date"
msgstr "Дата создания"
diff --git a/locale/ca_ES.po b/locale/sl_SI.po
similarity index 75%
copy from locale/ca_ES.po
copy to locale/sl_SI.po
index 5923ff2..588e1c5 100644
--- a/locale/ca_ES.po
+++ b/locale/sl_SI.po
@@ -4,31 +4,39 @@ msgstr "Content-Type: text/plain; charset=utf-8\n"
msgctxt "error:timesheet.line:"
msgid "Hours field must be positive"
-msgstr "El camp d'hores ha de ser positiu"
+msgstr "Vrednost polja \"Ure\" mora biti pozitivna"
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 ""
-"Tot treball ha d'estar a la mateixa empresa que el seu pare, però "
-"\"%(child)s\" i \"%(parent)s\" estan a empreses diferents."
+"Vsaka dejavnost mora biti v istem podjetju kot njena matična dejavnost, "
+"vendar sta \"%(child)s\" in \"%(parent)s\" v različnih podjetjih."
+
+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."
msgctxt "field:timesheet.hours_employee,create_date:"
msgid "Create Date"
-msgstr "Data creació"
+msgstr "Ustvarjeno"
msgctxt "field:timesheet.hours_employee,create_uid:"
msgid "Create User"
-msgstr "Usuari creació"
+msgstr "Ustvaril"
msgctxt "field:timesheet.hours_employee,employee:"
msgid "Employee"
-msgstr "Empleat"
+msgstr "Zaposlenec"
msgctxt "field:timesheet.hours_employee,hours:"
msgid "Hours"
-msgstr "Hores"
+msgstr "Ure"
msgctxt "field:timesheet.hours_employee,id:"
msgid "ID"
@@ -36,19 +44,19 @@ msgstr "ID"
msgctxt "field:timesheet.hours_employee,rec_name:"
msgid "Name"
-msgstr "Nom"
+msgstr "Ime"
msgctxt "field:timesheet.hours_employee,write_date:"
msgid "Write Date"
-msgstr "Data modificació"
+msgstr "Zapisano"
msgctxt "field:timesheet.hours_employee,write_uid:"
msgid "Write User"
-msgstr "Usuari modificació"
+msgstr "Zapisal"
msgctxt "field:timesheet.hours_employee.open.start,end_date:"
msgid "End Date"
-msgstr "Data final"
+msgstr "Končni datum"
msgctxt "field:timesheet.hours_employee.open.start,id:"
msgid "ID"
@@ -56,23 +64,23 @@ msgstr "ID"
msgctxt "field:timesheet.hours_employee.open.start,start_date:"
msgid "Start Date"
-msgstr "Data inici"
+msgstr "Začetni datum"
msgctxt "field:timesheet.hours_employee_monthly,create_date:"
msgid "Create Date"
-msgstr "Data creació"
+msgstr "Ustvarjeno"
msgctxt "field:timesheet.hours_employee_monthly,create_uid:"
msgid "Create User"
-msgstr "Usuari creació"
+msgstr "Ustvaril"
msgctxt "field:timesheet.hours_employee_monthly,employee:"
msgid "Employee"
-msgstr "Empleat"
+msgstr "Zaposlenec"
msgctxt "field:timesheet.hours_employee_monthly,hours:"
msgid "Hours"
-msgstr "Hores"
+msgstr "Ure"
msgctxt "field:timesheet.hours_employee_monthly,id:"
msgid "ID"
@@ -80,39 +88,39 @@ msgstr "ID"
msgctxt "field:timesheet.hours_employee_monthly,month:"
msgid "Month"
-msgstr "Mes"
+msgstr "Mesec"
msgctxt "field:timesheet.hours_employee_monthly,rec_name:"
msgid "Name"
-msgstr "Nom"
+msgstr "Ime"
msgctxt "field:timesheet.hours_employee_monthly,write_date:"
msgid "Write Date"
-msgstr "Data modificació"
+msgstr "Zapisano"
msgctxt "field:timesheet.hours_employee_monthly,write_uid:"
msgid "Write User"
-msgstr "Usuari modificació"
+msgstr "Zapisal"
msgctxt "field:timesheet.hours_employee_monthly,year:"
msgid "Year"
-msgstr "Any"
+msgstr "Leto"
msgctxt "field:timesheet.hours_employee_weekly,create_date:"
msgid "Create Date"
-msgstr "Data creació"
+msgstr "Ustvarjeno"
msgctxt "field:timesheet.hours_employee_weekly,create_uid:"
msgid "Create User"
-msgstr "Usuari creació"
+msgstr "Ustvaril"
msgctxt "field:timesheet.hours_employee_weekly,employee:"
msgid "Employee"
-msgstr "Empleat"
+msgstr "Zaposlenec"
msgctxt "field:timesheet.hours_employee_weekly,hours:"
msgid "Hours"
-msgstr "Hores"
+msgstr "Ure"
msgctxt "field:timesheet.hours_employee_weekly,id:"
msgid "ID"
@@ -120,47 +128,47 @@ msgstr "ID"
msgctxt "field:timesheet.hours_employee_weekly,rec_name:"
msgid "Name"
-msgstr "Nom"
+msgstr "Ime"
msgctxt "field:timesheet.hours_employee_weekly,week:"
msgid "Week"
-msgstr "Setmana"
+msgstr "Teden"
msgctxt "field:timesheet.hours_employee_weekly,write_date:"
msgid "Write Date"
-msgstr "Data modificació"
+msgstr "Zapisano"
msgctxt "field:timesheet.hours_employee_weekly,write_uid:"
msgid "Write User"
-msgstr "Usuari modificació"
+msgstr "Zapisal"
msgctxt "field:timesheet.hours_employee_weekly,year:"
msgid "Year"
-msgstr "Any"
+msgstr "Leto"
msgctxt "field:timesheet.line,create_date:"
msgid "Create Date"
-msgstr "Data creació"
+msgstr "Ustvarjeno"
msgctxt "field:timesheet.line,create_uid:"
msgid "Create User"
-msgstr "Usuari creació"
+msgstr "Ustvaril"
msgctxt "field:timesheet.line,date:"
msgid "Date"
-msgstr "Data"
+msgstr "Datum"
msgctxt "field:timesheet.line,description:"
msgid "Description"
-msgstr "Descripció"
+msgstr "Opis"
msgctxt "field:timesheet.line,employee:"
msgid "Employee"
-msgstr "Empleat"
+msgstr "Zaposlenec"
msgctxt "field:timesheet.line,hours:"
msgid "Hours"
-msgstr "Hores"
+msgstr "Ure"
msgctxt "field:timesheet.line,id:"
msgid "ID"
@@ -168,27 +176,27 @@ msgstr "ID"
msgctxt "field:timesheet.line,rec_name:"
msgid "Name"
-msgstr "Nom"
+msgstr "Ime"
msgctxt "field:timesheet.line,work:"
msgid "Work"
-msgstr "Treball"
+msgstr "Dejavnost"
msgctxt "field:timesheet.line,write_date:"
msgid "Write Date"
-msgstr "Data modificació"
+msgstr "Zapisano"
msgctxt "field:timesheet.line,write_uid:"
msgid "Write User"
-msgstr "Usuari modificació"
+msgstr "Zapisal"
msgctxt "field:timesheet.line.enter.start,date:"
msgid "Date"
-msgstr "Data"
+msgstr "Datum"
msgctxt "field:timesheet.line.enter.start,employee:"
msgid "Employee"
-msgstr "Empleat"
+msgstr "Zaposlenec"
msgctxt "field:timesheet.line.enter.start,id:"
msgid "ID"
@@ -196,27 +204,27 @@ msgstr "ID"
msgctxt "field:timesheet.work,active:"
msgid "Active"
-msgstr "Actiu"
+msgstr "Aktivno"
msgctxt "field:timesheet.work,children:"
msgid "Children"
-msgstr "Fills"
+msgstr "Poddejavnosti"
msgctxt "field:timesheet.work,company:"
msgid "Company"
-msgstr "Empresa"
+msgstr "Podjetje"
msgctxt "field:timesheet.work,create_date:"
msgid "Create Date"
-msgstr "Data creació"
+msgstr "Ustvarjeno"
msgctxt "field:timesheet.work,create_uid:"
msgid "Create User"
-msgstr "Usuari creació"
+msgstr "Ustvaril"
msgctxt "field:timesheet.work,hours:"
msgid "Timesheet Hours"
-msgstr "Hores del full de treball"
+msgstr "Ure prisotnosti"
msgctxt "field:timesheet.work,id:"
msgid "ID"
@@ -224,51 +232,51 @@ msgstr "ID"
msgctxt "field:timesheet.work,left:"
msgid "Left"
-msgstr "Esquerra"
+msgstr "Levo"
msgctxt "field:timesheet.work,name:"
msgid "Name"
-msgstr "Nom"
+msgstr "Naziv"
msgctxt "field:timesheet.work,parent:"
msgid "Parent"
-msgstr "Pare"
+msgstr "Matična dejavnost"
msgctxt "field:timesheet.work,rec_name:"
msgid "Name"
-msgstr "Nom"
+msgstr "Ime"
msgctxt "field:timesheet.work,right:"
msgid "Right"
-msgstr "Dreta"
+msgstr "Desno"
msgctxt "field:timesheet.work,timesheet_available:"
msgid "Available on timesheets"
-msgstr "Disponible en fulls de treball"
+msgstr "Na evidenci"
msgctxt "field:timesheet.work,timesheet_end_date:"
msgid "Timesheet End"
-msgstr "Final de full de treball"
+msgstr "Prisotnost do"
msgctxt "field:timesheet.work,timesheet_lines:"
-msgid ""
-msgstr ""
+msgid "Timesheet Lines"
+msgstr "Evidenca prisotnosti"
msgctxt "field:timesheet.work,timesheet_start_date:"
msgid "Timesheet Start"
-msgstr "Començament de full de treball"
+msgstr "Prisotnost od"
msgctxt "field:timesheet.work,write_date:"
msgid "Write Date"
-msgstr "Data modificació"
+msgstr "Zapisano"
msgctxt "field:timesheet.work,write_uid:"
msgid "Write User"
-msgstr "Usuari modificació"
+msgstr "Zapisal"
msgctxt "field:timesheet.work.open.start,from_date:"
msgid "From Date"
-msgstr "Des de la data"
+msgstr "Od"
msgctxt "field:timesheet.work.open.start,id:"
msgid "ID"
@@ -276,236 +284,236 @@ msgstr "ID"
msgctxt "field:timesheet.work.open.start,to_date:"
msgid "To Date"
-msgstr "Fins a la data"
+msgstr "Do"
msgctxt "help:timesheet.work,hours:"
msgid "Total time spent on this work"
-msgstr "Temps total empleat en aquest treball"
+msgstr "Skupni porabljen čas na dejavnosti"
msgctxt "help:timesheet.work,timesheet_available:"
msgid "Allow to fill in timesheets with this work"
-msgstr "Permet completar fulls de treball amb aquest treball."
+msgstr "Omogoča vnos v evidenco"
msgctxt "model:ir.action,name:act_hours_employee_form"
msgid "Hours per Employee"
-msgstr "Hores per empleat"
+msgstr "Ure po zaposlencu"
msgctxt "model:ir.action,name:act_hours_employee_monthly_form"
msgid "Hours per Employee per Month"
-msgstr "Hores per empleat i mes"
+msgstr "Mesečne ure po zaposlencu"
msgctxt "model:ir.action,name:act_hours_employee_open"
msgid "Hours per Employee"
-msgstr "Hores per empleat"
+msgstr "Ure po zaposlencu"
msgctxt "model:ir.action,name:act_hours_employee_weekly_form"
msgid "Hours per Employee per Week"
-msgstr "Hores per empleat i setmana"
+msgstr "Tedenske ure po zaposlencu"
msgctxt "model:ir.action,name:act_line_enter"
msgid "Enter Timesheet"
-msgstr "Afegeix full de treball"
+msgstr "Vnos prisotnosti"
msgctxt "model:ir.action,name:act_line_form"
msgid "Timesheet Lines"
-msgstr "Línies del full de treball"
+msgstr "Evidenca prisotnosti"
msgctxt "model:ir.action,name:act_line_form_work"
msgid "Timesheet Lines"
-msgstr "Línies del full de treball"
+msgstr "Evidenca prisotnosti"
msgctxt "model:ir.action,name:act_open_work"
msgid "Hours per Work"
-msgstr "Hores per treball"
+msgstr "Ure po dejavnosti"
msgctxt "model:ir.action,name:act_open_work_graph"
msgid "Hours per Work"
-msgstr "Hores per treball"
+msgstr "Ure po dejavnosti"
msgctxt "model:ir.action,name:act_work_form2"
msgid "Hours per Work"
-msgstr "Hores per treball"
+msgstr "Ure po dejavnosti"
msgctxt "model:ir.action,name:act_work_form3"
msgid "Hours per Work"
-msgstr "Hores per treball"
+msgstr "Ure po dejavnosti"
msgctxt "model:ir.action,name:act_work_hours_board"
msgid "Hours per Work"
-msgstr "Hores per treball"
+msgstr "Ure po dejavnosti"
msgctxt "model:ir.action,name:act_work_list"
msgid "Works"
-msgstr "Treballs"
+msgstr "Dejavnosti"
msgctxt "model:ir.action,name:act_work_tree"
msgid "Works"
-msgstr "Treballs"
+msgstr "Dejavnosti"
msgctxt "model:ir.action,name:act_work_tree2"
msgid "Works"
-msgstr "Treballs"
+msgstr "Dejavnosti"
msgctxt "model:ir.ui.menu,name:menu_configuration"
msgid "Configuration"
-msgstr "Configuració"
+msgstr "Nastavitve"
msgctxt "model:ir.ui.menu,name:menu_hours_employee_open"
msgid "Hours per Employee"
-msgstr "Hores per empleat"
+msgstr "Ure po zaposlencu"
msgctxt "model:ir.ui.menu,name:menu_hours_employee_open_monthly"
msgid "Hours per Employee per Month"
-msgstr "Hores per empleat i mes"
+msgstr "Mesečne ure po zaposlencu"
msgctxt "model:ir.ui.menu,name:menu_hours_employee_open_weekly"
msgid "Hours per Employee per Week"
-msgstr "Hores per empleat i setmana"
+msgstr "Tedenske ure po zaposlencu"
msgctxt "model:ir.ui.menu,name:menu_line_enter"
msgid "Enter Timesheet"
-msgstr "Afegeix full de treball"
+msgstr "Vnos prisotnosti"
msgctxt "model:ir.ui.menu,name:menu_line_form"
msgid "Timesheet Lines"
-msgstr "Línies del full de treball"
+msgstr "Evidenca prisotnosti"
msgctxt "model:ir.ui.menu,name:menu_reporting"
msgid "Reporting"
-msgstr "Informes"
+msgstr "Poročila"
msgctxt "model:ir.ui.menu,name:menu_timesheet"
msgid "Timesheet"
-msgstr "Full de treball"
+msgstr "Evidenca prisotnosti"
msgctxt "model:ir.ui.menu,name:menu_work_list"
msgid "Works"
-msgstr "Treballs"
+msgstr "Dejavnosti"
msgctxt "model:ir.ui.menu,name:menu_work_tree"
msgid "Works"
-msgstr "Treballs"
+msgstr "Dejavnosti"
msgctxt "model:ir.ui.menu,name:menu_work_tree2"
msgid "Hours per Work"
-msgstr "Hores per treball"
+msgstr "Ure po dejavnosti"
msgctxt "model:res.group,name:group_timesheet_admin"
msgid "Timesheet Administration"
-msgstr "Administració de fulls de treball"
+msgstr "Evidenca prisotnosti - vodenje"
msgctxt "model:timesheet.hours_employee,name:"
msgid "Hours per Employee"
-msgstr "Hores per empleat"
+msgstr "Ure po zaposlencu"
msgctxt "model:timesheet.hours_employee.open.start,name:"
msgid "Open Hours per Employee"
-msgstr "Obrir hores per empleat"
+msgstr "Odprte ure po zaposlencu"
msgctxt "model:timesheet.hours_employee_monthly,name:"
msgid "Hours per Employee per Month"
-msgstr "Hores per empleat i mes"
+msgstr "Mesečne ure po zaposlencu"
msgctxt "model:timesheet.hours_employee_weekly,name:"
msgid "Hours per Employee per Week"
-msgstr "Hores per empleat i setmana"
+msgstr "Tedenske ure po zaposlencu"
msgctxt "model:timesheet.line,name:"
msgid "Timesheet Line"
-msgstr "Línia de full de treball"
+msgstr "Evidenca prisotnosti"
msgctxt "model:timesheet.line.enter.start,name:"
msgid "Enter Lines"
-msgstr "Afegir línies"
+msgstr "Vnos postavk"
msgctxt "model:timesheet.work,name:"
msgid "Work"
-msgstr "Treball"
+msgstr "Dejavnost"
msgctxt "model:timesheet.work.open.start,name:"
msgid "Open Work"
-msgstr "Obrir treball"
+msgstr "Odpri dejavnost"
msgctxt "view:timesheet.hours_employee.open.start:"
msgid "Hours per Employee"
-msgstr "Hores per empleat"
+msgstr "Ure po zaposlencu"
msgctxt "view:timesheet.hours_employee:"
msgid "Hours"
-msgstr "Hores"
+msgstr "Ure"
msgctxt "view:timesheet.hours_employee:"
msgid "Hours per Employee"
-msgstr "Hores per empleat"
+msgstr "Ure po zaposlencu"
msgctxt "view:timesheet.hours_employee_monthly:"
msgid "Hours per Employee per Month"
-msgstr "Hores per empleat i mes"
+msgstr "Mesečne ure po zaposlencu"
msgctxt "view:timesheet.hours_employee_weekly:"
msgid "Hours per Employee per Week"
-msgstr "Hores per empleat i setmana"
+msgstr "Tedenske ure po zaposlencu"
msgctxt "view:timesheet.line.enter.start:"
msgid "Enter Timesheet"
-msgstr "Afegeix full de treball"
+msgstr "Vnos prisotnosti"
msgctxt "view:timesheet.line:"
msgid "Hours"
-msgstr "Hores"
+msgstr "Ure"
msgctxt "view:timesheet.line:"
msgid "Timesheet Line"
-msgstr "Línia de full de treball"
+msgstr "Evidenca prisotnosti"
msgctxt "view:timesheet.line:"
msgid "Timesheet Lines"
-msgstr "Línies del full de treball"
+msgstr "Evidenca prisotnosti"
msgctxt "view:timesheet.work.open.start:"
msgid "Hours per Work"
-msgstr "Hores per treball"
+msgstr "Ure po dejavnosti"
msgctxt "view:timesheet.work:"
msgid "Hours per Work"
-msgstr "Hores per treball"
+msgstr "Ure po dejavnosti"
msgctxt "view:timesheet.work:"
msgid "Work"
-msgstr "Treball"
+msgstr "Dejavnost"
msgctxt "view:timesheet.work:"
msgid "Works"
-msgstr "Treballs"
+msgstr "Dejavnosti"
msgctxt "wizard_button:timesheet.hours_employee.open,start,end:"
msgid "Cancel"
-msgstr "Cancel·la"
+msgstr "Prekliči"
msgctxt "wizard_button:timesheet.hours_employee.open,start,open_:"
msgid "Open"
-msgstr "Obre"
+msgstr "Odpri"
msgctxt "wizard_button:timesheet.line.enter,start,end:"
msgid "Cancel"
-msgstr "Cancel·la"
+msgstr "Prekliči"
msgctxt "wizard_button:timesheet.line.enter,start,enter:"
msgid "Enter"
-msgstr "Afegeix"
+msgstr "Vnos"
msgctxt "wizard_button:timesheet.work.open,start,end:"
msgid "Cancel"
-msgstr "Cancel·la"
+msgstr "Prekliči"
msgctxt "wizard_button:timesheet.work.open,start,open_:"
msgid "Open"
-msgstr "Obre"
+msgstr "Odpri"
msgctxt "wizard_button:timesheet.work.open2,start,end:"
msgid "Cancel"
-msgstr "Cancel·la"
+msgstr "Prekliči"
msgctxt "wizard_button:timesheet.work.open2,start,open_:"
msgid "Open"
-msgstr "Obre"
+msgstr "Odpri"
diff --git a/setup.py b/setup.py
index 2f74046..3aa56a3 100644
--- a/setup.py
+++ b/setup.py
@@ -21,7 +21,7 @@ major_version, minor_version, _ = info.get('version', '0.0.1').split('.', 2)
major_version = int(major_version)
minor_version = int(minor_version)
-requires = []
+requires = ['python-sql']
for dep in info.get('depends', []):
if not re.match(r'(ir|res|webdav)(\W|$)', dep):
requires.append('trytond_%s >= %s.%s, < %s.%s' %
@@ -64,6 +64,7 @@ setup(name='trytond_timesheet',
'Natural Language :: French',
'Natural Language :: German',
'Natural Language :: Russian',
+ 'Natural Language :: Slovenian',
'Natural Language :: Spanish',
'Operating System :: OS Independent',
'Programming Language :: Python :: 2.6',
diff --git a/tests/__init__.py b/tests/__init__.py
index 7da0f02..11bca20 100644
--- a/tests/__init__.py
+++ b/tests/__init__.py
@@ -2,3 +2,5 @@
#this repository contains the full copyright notices and license terms.
from .test_timesheet import suite
+
+__all__ = ['suite']
diff --git a/tryton.cfg b/tryton.cfg
index edb48ca..2c85ffe 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
[tryton]
-version=2.8.0
+version=3.0.0
depends:
company
company_work_time
diff --git a/trytond_timesheet.egg-info/PKG-INFO b/trytond_timesheet.egg-info/PKG-INFO
index ab086c7..c9e184c 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: 2.8.0
+Version: 3.0.0
Summary: Tryton module with timesheets
Home-page: http://www.tryton.org/
Author: Tryton
Author-email: UNKNOWN
License: GPL-3
-Download-URL: http://downloads.tryton.org/2.8/
+Download-URL: http://downloads.tryton.org/3.0/
Description: trytond_timesheet
=================
@@ -60,6 +60,7 @@ Classifier: Natural Language :: English
Classifier: Natural Language :: French
Classifier: Natural Language :: German
Classifier: Natural Language :: Russian
+Classifier: Natural Language :: Slovenian
Classifier: Natural Language :: Spanish
Classifier: Operating System :: OS Independent
Classifier: Programming Language :: Python :: 2.6
diff --git a/trytond_timesheet.egg-info/SOURCES.txt b/trytond_timesheet.egg-info/SOURCES.txt
index 7d468c5..2644413 100644
--- a/trytond_timesheet.egg-info/SOURCES.txt
+++ b/trytond_timesheet.egg-info/SOURCES.txt
@@ -25,6 +25,7 @@ locale/es_ES.po
locale/fr_FR.po
locale/nl_NL.po
locale/ru_RU.po
+locale/sl_SI.po
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 0e5dc9e..d103351 100644
--- a/trytond_timesheet.egg-info/requires.txt
+++ b/trytond_timesheet.egg-info/requires.txt
@@ -1,3 +1,4 @@
-trytond_company >= 2.8, < 2.9
-trytond_company_work_time >= 2.8, < 2.9
-trytond >= 2.8, < 2.9
\ No newline at end of file
+python-sql
+trytond_company >= 3.0, < 3.1
+trytond_company_work_time >= 3.0, < 3.1
+trytond >= 3.0, < 3.1
\ No newline at end of file
diff --git a/work.py b/work.py
index b90d971..fd08005 100644
--- a/work.py
+++ b/work.py
@@ -1,10 +1,14 @@
#This file is part of Tryton. The COPYRIGHT file at the top level of
#this repository contains the full copyright notices and license terms.
+from sql import Literal
+from sql.aggregate import Sum
+
from trytond.model import ModelView, ModelSQL, fields
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
__all__ = ['Work', 'OpenWorkStart', 'OpenWork', 'OpenWork2', 'OpenWorkGraph']
@@ -26,9 +30,6 @@ class Work(ModelSQL, ModelView):
depends=['timesheet_available'],
help="Total time spent on this work"), 'get_hours')
timesheet_available = fields.Boolean('Available on timesheets',
- states={
- 'readonly': Bool(Eval('timesheet_lines', [0])),
- },
help="Allow to fill in timesheets with this work")
timesheet_start_date = fields.Date('Timesheet Start',
states={
@@ -57,6 +58,9 @@ class Work(ModelSQL, ModelView):
'invalid_parent_company': ('Every work must be in the same '
'company as it\'s parent work but "%(child)s" and '
'"%(parent)s" are in different companies.'),
+ 'change_timesheet_available': ('You can not unset "Available '
+ 'on timesheets" for work "%s" because it already has '
+ 'timesheets.'),
})
@staticmethod
@@ -96,54 +100,38 @@ class Work(ModelSQL, ModelView):
})
@classmethod
- def _tree_qty(cls, hours_by_wt, children, ids, to_compute):
- res = 0
- for h in ids:
- if (not children.get(h)) or (not to_compute[h]):
- res += hours_by_wt.setdefault(h, 0)
- else:
- sub_qty = cls._tree_qty(
- hours_by_wt, children, children[h], to_compute)
- hours_by_wt.setdefault(h, 0)
- hours_by_wt[h] += sub_qty
- res += hours_by_wt[h]
- to_compute[h] = False
- return res
-
- @classmethod
def get_hours(cls, works, name):
+ pool = Pool()
+ Line = pool.get('timesheet.line')
+ transaction = Transaction()
+ cursor = transaction.cursor
+ in_max = cursor.IN_MAX
+ context = transaction.context
+
+ table_w = cls.__table__()
+ table_c = cls.__table__()
+ line = Line.__table__()
ids = [w.id for w in works]
- all_works = cls.search([
- ('parent', 'child_of', ids),
- ])
- all_ids = [w.id for w in all_works]
- # force inactive ids to be in all_ids
- all_ids = list(set(all_ids + ids))
- clause = ("SELECT work, sum(hours) FROM timesheet_line "
- "WHERE work IN (%s) "
- % ",".join(('%s',) * len(all_ids)))
- date_cond = ""
- args = []
- if Transaction().context.get('from_date'):
- date_cond = " AND date >= %s"
- args.append(Transaction().context['from_date'])
- if Transaction().context.get('to_date'):
- date_cond += " AND date <= %s"
- args.append(Transaction().context['to_date'])
- clause += date_cond + " GROUP BY work"
-
- Transaction().cursor.execute(clause, all_ids + args)
-
- hours_by_wt = dict((i[0], i[1]) for i in
- Transaction().cursor.fetchall())
- to_compute = dict.fromkeys(all_ids, True)
- works = cls.browse(all_ids)
- children = {}
- for work in works:
- if work.parent:
- children.setdefault(work.parent.id, []).append(work.id)
- cls._tree_qty(hours_by_wt, children, ids, to_compute)
- return hours_by_wt
+ hours = dict.fromkeys(ids, 0)
+ where = Literal(True)
+ if context.get('from_date'):
+ where &= line.date >= context['from_date']
+ if context.get('to_date'):
+ 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]
+ 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.hours),
+ where=red_sql & where,
+ group_by=table_w.id))
+ hours.update(dict(cursor.fetchall()))
+ return hours
def get_rec_name(self, name):
if self.parent:
@@ -177,7 +165,17 @@ class Work(ModelSQL, ModelView):
@classmethod
def write(cls, works, vals):
+ pool = Pool()
+ Lines = pool.get('timesheet.line')
childs = None
+ if not vals.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)
+ if lines:
+ cls.raise_user_error('change_timesheet_available',
+ lines[0].work.rec_name)
if not vals.get('active', True):
childs = cls.search([
('parent', 'child_of', [w.id for w in works]),
diff --git a/work.xml b/work.xml
index 51a6a99..e357047 100644
--- a/work.xml
+++ b/work.xml
@@ -25,7 +25,7 @@ this repository contains the full copyright notices and license terms. -->
<record model="ir.action.act_window" id="act_work_tree">
<field name="name">Works</field>
<field name="res_model">timesheet.work</field>
- <field name="domain">[('parent', '=', False)]</field>
+ <field name="domain">[('parent', '=', None)]</field>
</record>
<record model="ir.action.act_window.view"
id="act_work_tree_view1">
@@ -71,7 +71,7 @@ this repository contains the full copyright notices and license terms. -->
<record model="ir.action.act_window" id="act_work_tree2">
<field name="name">Works</field>
<field name="res_model">timesheet.work</field>
- <field name="domain">[('parent', '=', False)]</field>
+ <field name="domain">[('parent', '=', None)]</field>
</record>
<record model="ir.action.act_window.view"
id="act_work_tree2_view1">
@@ -88,7 +88,7 @@ this repository contains the full copyright notices and license terms. -->
<record model="ir.action.act_window" id="act_work_form2">
<field name="name">Hours per Work</field>
<field name="res_model">timesheet.work</field>
- <field name="domain">[('parent', '=', Get(Eval('timesheet.act_work_tree2', {}), 'id', False))]</field>
+ <field name="domain">[('parent', '=', Get(Eval('timesheet.act_work_tree2', {}), 'id', None))]</field>
</record>
<record model="ir.action.act_window.view"
id="act_work_form2_view1">
commit c224fd754ee6d7a721c86f104332bfc1ad650447
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Thu May 2 00:38:27 2013 +0200
Adding upstream version 2.8.0.
diff --git a/CHANGELOG b/CHANGELOG
index 1a6ae6e..8a6f641 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,7 @@
+Version 2.8.0 - 2013-04-22
+* Bug fixes (see mercurial logs for details)
+* Add start/end date to work for timesheet
+
Version 2.6.0 - 2012-10-22
* Bug fixes (see mercurial logs for details)
diff --git a/COPYRIGHT b/COPYRIGHT
index 2057c72..9192c97 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,6 +1,6 @@
-Copyright (C) 2008-2012 Cédric Krier.
-Copyright (C) 2008-2012 Bertrand Chenal.
-Copyright (C) 2008-2012 B2CK SPRL.
+Copyright (C) 2008-2013 Cédric Krier.
+Copyright (C) 2008-2013 Bertrand Chenal.
+Copyright (C) 2008-2013 B2CK SPRL.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff --git a/MANIFEST.in b/MANIFEST.in
index 97a9596..2569955 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -6,6 +6,7 @@ include CHANGELOG
include LICENSE
include tryton.cfg
include *.xml
+include view/*.xml
include *.odt
include locale/*.po
include doc/*
diff --git a/PKG-INFO b/PKG-INFO
index d6c4330..2b7b9b8 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,12 +1,12 @@
-Metadata-Version: 1.0
+Metadata-Version: 1.1
Name: trytond_timesheet
-Version: 2.6.0
+Version: 2.8.0
Summary: Tryton module with timesheets
Home-page: http://www.tryton.org/
Author: Tryton
Author-email: UNKNOWN
License: GPL-3
-Download-URL: http://downloads.tryton.org/2.6/
+Download-URL: http://downloads.tryton.org/2.8/
Description: trytond_timesheet
=================
@@ -53,6 +53,7 @@ Classifier: Intended Audience :: Legal Industry
Classifier: Intended Audience :: Manufacturing
Classifier: License :: OSI Approved :: GNU General Public License (GPL)
Classifier: Natural Language :: Bulgarian
+Classifier: Natural Language :: Catalan
Classifier: Natural Language :: Czech
Classifier: Natural Language :: Dutch
Classifier: Natural Language :: English
diff --git a/line.py b/line.py
index 1b32308..541b016 100644
--- a/line.py
+++ b/line.py
@@ -23,9 +23,18 @@ class Line(ModelSQL, ModelView):
date = fields.Date('Date', required=True, select=True)
hours = fields.Float('Hours', digits=(16, 2), required=True)
work = fields.Many2One('timesheet.work', 'Work',
- required=True, select=True, domain=[
- ('timesheet_available', '=', True),
- ])
+ required=True, select=True, domain=[
+ ('timesheet_available', '=', True),
+ ['OR',
+ ('timesheet_start_date', '=', None),
+ ('timesheet_start_date', '<=', Eval('date')),
+ ],
+ ['OR',
+ ('timesheet_end_date', '=', None),
+ ('timesheet_end_date', '>=', Eval('date')),
+ ],
+ ],
+ depends=['date'])
description = fields.Char('Description')
@classmethod
@@ -60,7 +69,7 @@ class Line(ModelSQL, ModelView):
return value
Employee = Pool().get('company.employee')
employee = Employee(Transaction().context['employee'])
- return value + " (" + employee.name + ")"
+ return value + " (" + employee.rec_name + ")"
class EnterLinesStart(ModelView):
@@ -125,17 +134,17 @@ class HoursEmployee(ModelSQL, ModelView):
if Transaction().context.get('end_date'):
clause += 'AND date <= %s '
args.append(Transaction().context['end_date'])
- return ('SELECT DISTINCT(employee) AS id, ' \
- 'MAX(create_uid) AS create_uid, ' \
- 'MAX(create_date) AS create_date, ' \
- 'MAX(write_uid) AS write_uid, ' \
- 'MAX(write_date) AS write_date, ' \
- 'employee, ' \
- 'SUM(COALESCE(hours, 0)) AS hours ' \
- 'FROM timesheet_line ' \
- 'WHERE %s ' \
- + clause + \
- 'GROUP BY employee', args)
+ return ('SELECT DISTINCT(employee) AS id, '
+ 'MAX(create_uid) AS create_uid, '
+ 'MAX(create_date) AS create_date, '
+ 'MAX(write_uid) AS write_uid, '
+ 'MAX(write_date) AS write_date, '
+ 'employee, '
+ 'SUM(COALESCE(hours, 0)) AS hours '
+ 'FROM timesheet_line '
+ 'WHERE %s '
+ + clause +
+ 'GROUP BY employee', args)
class OpenHoursEmployeeStart(ModelView):
@@ -184,22 +193,22 @@ class HoursEmployeeWeekly(ModelSQL, ModelView):
@classmethod
def table_query(cls):
type_name = FIELDS[cls.year._type].sql_type(cls.year)[0]
- return ('SELECT id, create_uid, create_date, write_uid, write_date, ' \
- 'CAST(year AS ' + type_name + ') AS year, week, ' \
- 'employee, hours ' \
- 'FROM ('
- 'SELECT EXTRACT(WEEK FROM date) + ' \
- 'EXTRACT(YEAR FROM date) * 100 + ' \
- 'employee * 1000000 AS id, ' \
- 'MAX(create_uid) AS create_uid, ' \
- 'MAX(create_date) AS create_date, ' \
- 'MAX(write_uid) AS write_uid, ' \
- 'MAX(write_date) AS write_date, ' \
- 'EXTRACT(YEAR FROM date) AS year, ' \
- 'EXTRACT(WEEK FROM date) AS week, employee, ' \
- 'SUM(COALESCE(hours, 0)) AS hours ' \
- 'FROM timesheet_line ' \
- 'GROUP BY year, week, employee) AS ' + cls._table, [])
+ return ('SELECT id, create_uid, create_date, write_uid, write_date, '
+ 'CAST(year AS ' + type_name + ') AS year, week, '
+ 'employee, hours '
+ 'FROM ('
+ 'SELECT EXTRACT(WEEK FROM date) + '
+ 'EXTRACT(YEAR FROM date) * 100 + '
+ 'employee * 1000000 AS id, '
+ 'MAX(create_uid) AS create_uid, '
+ 'MAX(create_date) AS create_date, '
+ 'MAX(write_uid) AS write_uid, '
+ 'MAX(write_date) AS write_date, '
+ 'EXTRACT(YEAR FROM date) AS year, '
+ 'EXTRACT(WEEK FROM date) AS week, employee, '
+ 'SUM(COALESCE(hours, 0)) AS hours '
+ 'FROM timesheet_line '
+ 'GROUP BY year, week, employee) AS ' + cls._table, [])
class HoursEmployeeMonthly(ModelSQL, ModelView):
@@ -220,19 +229,19 @@ class HoursEmployeeMonthly(ModelSQL, ModelView):
@classmethod
def table_query(cls):
type_name = FIELDS[cls.year._type].sql_type(cls.year)[0]
- return ('SELECT id, create_uid, create_date, write_uid, write_date, ' \
- 'CAST(year AS ' + type_name + ') AS year, month, ' \
- 'employee, hours ' \
- 'FROM ('
- 'SELECT EXTRACT(MONTH FROM date) + ' \
- 'EXTRACT(YEAR FROM date) * 100 + ' \
- 'employee * 1000000 AS id, ' \
- 'MAX(create_uid) AS create_uid, ' \
- 'MAX(create_date) AS create_date, ' \
- 'MAX(write_uid) AS write_uid, ' \
- 'MAX(write_date) AS write_date, ' \
- 'EXTRACT(YEAR FROM date) AS year, ' \
- 'EXTRACT(MONTH FROM date) AS month, employee, ' \
- 'SUM(COALESCE(hours, 0)) AS hours ' \
- 'FROM timesheet_line ' \
- 'GROUP BY year, month, employee) AS ' + cls._table, [])
+ return ('SELECT id, create_uid, create_date, write_uid, write_date, '
+ 'CAST(year AS ' + type_name + ') AS year, month, '
+ 'employee, hours '
+ 'FROM ('
+ 'SELECT EXTRACT(MONTH FROM date) + '
+ 'EXTRACT(YEAR FROM date) * 100 + '
+ 'employee * 1000000 AS id, '
+ 'MAX(create_uid) AS create_uid, '
+ 'MAX(create_date) AS create_date, '
+ 'MAX(write_uid) AS write_uid, '
+ 'MAX(write_date) AS write_date, '
+ 'EXTRACT(YEAR FROM date) AS year, '
+ 'EXTRACT(MONTH FROM date) AS month, employee, '
+ 'SUM(COALESCE(hours, 0)) AS hours '
+ 'FROM timesheet_line '
+ 'GROUP BY year, month, employee) AS ' + cls._table, [])
diff --git a/line.xml b/line.xml
index 8cd92c7..425ceda 100644
--- a/line.xml
+++ b/line.xml
@@ -6,39 +6,12 @@ this repository contains the full copyright notices and license terms. -->
<record model="ir.ui.view" id="line_view_form">
<field name="model">timesheet.line</field>
<field name="type">form</field>
- <field name="arch" type="xml">
- <![CDATA[
- <form string="Timesheet Line">
- <label name="employee"/>
- <field name="employee" colspan="3"/>
- <label name="date"/>
- <field name="date"/>
- <label name="hours"/>
- <field name="hours" widget="float_time"
- float_time="company_work_time"/>
- <label name="work"/>
- <field name="work"/>
- <label name="description"/>
- <field name="description"/>
- </form>
- ]]>
- </field>
+ <field name="name">line_form</field>
</record>
<record model="ir.ui.view" id="line_view_tree">
<field name="model">timesheet.line</field>
<field name="type">tree</field>
- <field name="arch" type="xml">
- <![CDATA[
- <tree string="Timesheet Lines" editable="bottom">
- <field name="employee"/>
- <field name="date"/>
- <field name="hours" widget="float_time"
- float_time="company_work_time" sum="Hours"/>
- <field name="work" width="300"/>
- <field name="description"/>
- </tree>
- ]]>
- </field>
+ <field name="name">line_tree</field>
</record>
<record model="ir.action.act_window" id="act_line_form">
<field name="name">Timesheet Lines</field>
@@ -59,15 +32,36 @@ this repository contains the full copyright notices and license terms. -->
<menuitem parent="menu_timesheet" action="act_line_form"
id="menu_line_form" sequence="30"/>
+ <record model="ir.action.act_window" id="act_line_form_work">
+ <field name="name">Timesheet Lines</field>
+ <field name="res_model">timesheet.line</field>
+ <field name="domain">[('work', '=', Eval('id'))]</field>
+ </record>
+ <record model="ir.action.act_window.view"
+ id="act_line_form_work_view1">
+ <field name="sequence" eval="10"/>
+ <field name="view" ref="line_view_tree"/>
+ <field name="act_window" ref="act_line_form_work"/>
+ </record>
+ <record model="ir.action.act_window.view"
+ id="act_line_form_work_view2">
+ <field name="sequence" eval="20"/>
+ <field name="view" ref="line_view_form"/>
+ <field name="act_window" ref="act_line_form_work"/>
+ </record>
+ <record model="ir.action.keyword" id="act_line_form_work_keyword1">
+ <field name="keyword">form_relate</field>
+ <field name="model">timesheet.work,-1</field>
+ <field name="action" ref="act_line_form_work"/>
+ </record>
+
<record model="ir.rule.group" id="rule_group_line">
<field name="model" search="[('model', '=', 'timesheet.line')]"/>
<field name="global_p" eval="False"/>
<field name="default_p" eval="True"/>
</record>
<record model="ir.rule" id="rule_line1">
- <field name="field" search="[('name', '=', 'employee'), ('model.model', '=', 'timesheet.line')]"/>
- <field name="operator">=</field>
- <field name="operand">User/Current Employee</field>
+ <field name="domain">[('employee', '=', user.employee.id if user.employee else None)]</field>
<field name="rule_group" ref="rule_group_line"/>
</record>
<record model="ir.rule.group" id="rule_group_line_admin">
@@ -84,16 +78,7 @@ this repository contains the full copyright notices and license terms. -->
<record model="ir.ui.view" id="line_enter_start_view_form">
<field name="model">timesheet.line.enter.start</field>
<field name="type">form</field>
- <field name="arch" type="xml">
- <![CDATA[
- <form string="Enter Timesheet">
- <label name="employee"/>
- <field name="employee"/>
- <label name="date"/>
- <field name="date"/>
- </form>
- ]]>
- </field>
+ <field name="name">line_enter_start_form</field>
</record>
<record model="ir.action.wizard" id="act_line_enter">
@@ -106,32 +91,12 @@ this repository contains the full copyright notices and license terms. -->
<record model="ir.ui.view" id="hours_employee_view_tree">
<field name="model">timesheet.hours_employee</field>
<field name="type">tree</field>
- <field name="arch" type="xml">
- <![CDATA[
- <tree string="Hours per Employee">
- <field name="employee"/>
- <field name="hours" widget="float_time"
- float_time="company_work_time" sum="Hours"/>
- </tree>
- ]]>
- </field>
+ <field name="name">hours_employee_tree</field>
</record>
<record model="ir.ui.view" id="hours_employee_view_graph">
<field name="model">timesheet.hours_employee</field>
<field name="type">graph</field>
- <field name="arch" type="xml">
- <![CDATA[
- <graph string="Hours per Employee">
- <x>
- <field name="employee"/>
- </x>
- <y>
- <field name="hours" widget="float_time"
- float_time="company_work_time"/>
- </y>
- </graph>
- ]]>
- </field>
+ <field name="name">hours_employee_graph</field>
</record>
<record model="ir.action.act_window" id="act_hours_employee_form">
<field name="name">Hours per Employee</field>
@@ -156,9 +121,7 @@ this repository contains the full copyright notices and license terms. -->
<field name="default_p" eval="True"/>
</record>
<record model="ir.rule" id="rule_hours_employee1">
- <field name="field" search="[('name', '=', 'employee'), ('model.model', '=', 'timesheet.hours_employee')]"/>
- <field name="operator">=</field>
- <field name="operand">User/Current Employee</field>
+ <field name="domain">[('employee', '=', user.employee.id if user.employee else None)]</field>
<field name="rule_group" ref="rule_group_hours_employee"/>
</record>
<record model="ir.rule.group" id="rule_group_hours_employee_admin">
@@ -175,16 +138,7 @@ this repository contains the full copyright notices and license terms. -->
<record model="ir.ui.view" id="hours_employee_open_start_view_form">
<field name="model">timesheet.hours_employee.open.start</field>
<field name="type">form</field>
- <field name="arch" type="xml">
- <![CDATA[
- <form string="Hours per Employee">
- <label name="start_date"/>
- <field name="start_date"/>
- <label name="end_date"/>
- <field name="end_date"/>
- </form>
- ]]>
- </field>
+ <field name="name">hours_employee_open_start_form</field>
</record>
<record model="ir.action.wizard" id="act_hours_employee_open">
<field name="name">Hours per Employee</field>
@@ -196,17 +150,7 @@ this repository contains the full copyright notices and license terms. -->
<record model="ir.ui.view" id="hours_employee_weekly_view_tree">
<field name="model">timesheet.hours_employee_weekly</field>
<field name="type">tree</field>
- <field name="arch" type="xml">
- <![CDATA[
- <tree string="Hours per Employee per Week">
- <field name="year"/>
- <field name="week"/>
- <field name="employee"/>
- <field name="hours" widget="float_time"
- float_time="company_work_time"/>
- </tree>
- ]]>
- </field>
+ <field name="name">hours_employee_weekly_tree</field>
</record>
<record model="ir.action.act_window" id="act_hours_employee_weekly_form">
<field name="name">Hours per Employee per Week</field>
@@ -224,17 +168,7 @@ this repository contains the full copyright notices and license terms. -->
<record model="ir.ui.view" id="hours_employee_monthly_view_tree">
<field name="model">timesheet.hours_employee_monthly</field>
<field name="type">tree</field>
- <field name="arch" type="xml">
- <![CDATA[
- <tree string="Hours per Employee per Month">
- <field name="year"/>
- <field name="month"/>
- <field name="employee"/>
- <field name="hours" widget="float_time"
- float_time="company_work_time"/>
- </tree>
- ]]>
- </field>
+ <field name="name">hours_employee_monthly_tree</field>
</record>
<record model="ir.action.act_window" id="act_hours_employee_monthly_form">
<field name="name">Hours per Employee per Month</field>
diff --git a/locale/bg_BG.po b/locale/bg_BG.po
index 3cb0af5..ea6b806 100644
--- a/locale/bg_BG.po
+++ b/locale/bg_BG.po
@@ -7,13 +7,10 @@ msgid "Hours field must be positive"
msgstr "Часовете трябва да са положителни числа"
msgctxt "error:timesheet.work:"
-msgid "Every work must be in the same company as it's parent 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 ""
-"Всяка задача трябва да е в същата фирма като тази на родителската задача!"
-
-msgctxt "error:timesheet.work:"
-msgid "You can not create recursive works!"
-msgstr "Не може да създавате взаимно вложени задачи!"
msgctxt "field:timesheet.hours_employee,create_date:"
msgid "Create Date"
@@ -247,10 +244,18 @@ msgctxt "field:timesheet.work,timesheet_available:"
msgid "Available on timesheets"
msgstr "Наличен в график"
+msgctxt "field:timesheet.work,timesheet_end_date:"
+msgid "Timesheet End"
+msgstr ""
+
msgctxt "field:timesheet.work,timesheet_lines:"
msgid ""
msgstr ""
+msgctxt "field:timesheet.work,timesheet_start_date:"
+msgid "Timesheet Start"
+msgstr ""
+
msgctxt "field:timesheet.work,write_date:"
msgid "Write Date"
msgstr "Променено на"
@@ -303,6 +308,11 @@ msgctxt "model:ir.action,name:act_line_form"
msgid "Timesheet Lines"
msgstr "Редове от график"
+#, fuzzy
+msgctxt "model:ir.action,name:act_line_form_work"
+msgid "Timesheet Lines"
+msgstr "Редове от график"
+
msgctxt "model:ir.action,name:act_open_work"
msgid "Hours per Work"
msgstr "Часове за работа"
diff --git a/locale/ca_ES.po b/locale/ca_ES.po
index 19a021c..5923ff2 100644
--- a/locale/ca_ES.po
+++ b/locale/ca_ES.po
@@ -7,13 +7,12 @@ msgid "Hours field must be positive"
msgstr "El camp d'hores ha de ser positiu"
msgctxt "error:timesheet.work:"
-msgid "Every work must be in the same company as it's parent 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 ""
-"Cada treball ha d'estar en la mateixa empresa que el seu treball pare."
-
-msgctxt "error:timesheet.work:"
-msgid "You can not create recursive works!"
-msgstr "No pot crear treballs recursius."
+"Tot treball ha d'estar a la mateixa empresa que el seu pare, però "
+"\"%(child)s\" i \"%(parent)s\" estan a empreses diferents."
msgctxt "field:timesheet.hours_employee,create_date:"
msgid "Create Date"
@@ -247,10 +246,17 @@ msgctxt "field:timesheet.work,timesheet_available:"
msgid "Available on timesheets"
msgstr "Disponible en fulls de treball"
-#, fuzzy
+msgctxt "field:timesheet.work,timesheet_end_date:"
+msgid "Timesheet End"
+msgstr "Final de full de treball"
+
msgctxt "field:timesheet.work,timesheet_lines:"
msgid ""
-msgstr "Servidor"
+msgstr ""
+
+msgctxt "field:timesheet.work,timesheet_start_date:"
+msgid "Timesheet Start"
+msgstr "Començament de full de treball"
msgctxt "field:timesheet.work,write_date:"
msgid "Write Date"
@@ -278,7 +284,7 @@ msgstr "Temps total empleat en aquest treball"
msgctxt "help:timesheet.work,timesheet_available:"
msgid "Allow to fill in timesheets with this work"
-msgstr "Permet completar fullsde treball amb aquest treball."
+msgstr "Permet completar fulls de treball amb aquest treball."
msgctxt "model:ir.action,name:act_hours_employee_form"
msgid "Hours per Employee"
@@ -304,6 +310,10 @@ msgctxt "model:ir.action,name:act_line_form"
msgid "Timesheet Lines"
msgstr "Línies del full de treball"
+msgctxt "model:ir.action,name:act_line_form_work"
+msgid "Timesheet Lines"
+msgstr "Línies del full de treball"
+
msgctxt "model:ir.action,name:act_open_work"
msgid "Hours per Work"
msgstr "Hores per treball"
@@ -358,7 +368,7 @@ msgstr "Afegeix full de treball"
msgctxt "model:ir.ui.menu,name:menu_line_form"
msgid "Timesheet Lines"
-msgstr "Línies de full de treball"
+msgstr "Línies del full de treball"
msgctxt "model:ir.ui.menu,name:menu_reporting"
msgid "Reporting"
@@ -366,7 +376,7 @@ msgstr "Informes"
msgctxt "model:ir.ui.menu,name:menu_timesheet"
msgid "Timesheet"
-msgstr "Fulls de treball"
+msgstr "Full de treball"
msgctxt "model:ir.ui.menu,name:menu_work_list"
msgid "Works"
@@ -438,7 +448,7 @@ msgstr "Hores per empleat i setmana"
msgctxt "view:timesheet.line.enter.start:"
msgid "Enter Timesheet"
-msgstr "Afegir part de treball"
+msgstr "Afegeix full de treball"
msgctxt "view:timesheet.line:"
msgid "Hours"
@@ -450,7 +460,7 @@ msgstr "Línia de full de treball"
msgctxt "view:timesheet.line:"
msgid "Timesheet Lines"
-msgstr "Línies de full de treball"
+msgstr "Línies del full de treball"
msgctxt "view:timesheet.work.open.start:"
msgid "Hours per Work"
diff --git a/locale/cs_CZ.po b/locale/cs_CZ.po
index d4eb353..fcb4794 100644
--- a/locale/cs_CZ.po
+++ b/locale/cs_CZ.po
@@ -7,11 +7,9 @@ msgid "Hours field must be positive"
msgstr ""
msgctxt "error:timesheet.work:"
-msgid "Every work must be in the same company as it's parent work!"
-msgstr ""
-
-msgctxt "error:timesheet.work:"
-msgid "You can not create recursive works!"
+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 ""
msgctxt "field:timesheet.hours_employee,create_date:"
@@ -246,10 +244,18 @@ msgctxt "field:timesheet.work,timesheet_available:"
msgid "Available on timesheets"
msgstr ""
+msgctxt "field:timesheet.work,timesheet_end_date:"
+msgid "Timesheet End"
+msgstr ""
+
msgctxt "field:timesheet.work,timesheet_lines:"
msgid "Timesheet Lines"
msgstr ""
+msgctxt "field:timesheet.work,timesheet_start_date:"
+msgid "Timesheet Start"
+msgstr ""
+
msgctxt "field:timesheet.work,write_date:"
msgid "Write Date"
msgstr ""
@@ -302,6 +308,10 @@ msgctxt "model:ir.action,name:act_line_form"
msgid "Timesheet Lines"
msgstr ""
+msgctxt "model:ir.action,name:act_line_form_work"
+msgid "Timesheet Lines"
+msgstr ""
+
msgctxt "model:ir.action,name:act_open_work"
msgid "Hours per Work"
msgstr ""
diff --git a/locale/de_DE.po b/locale/de_DE.po
index 39677c5..642bd9c 100644
--- a/locale/de_DE.po
+++ b/locale/de_DE.po
@@ -7,14 +7,13 @@ msgid "Hours field must be positive"
msgstr "Feld Stunden muss einen positiven Wert haben"
msgctxt "error:timesheet.work:"
-msgid "Every work must be in the same company as it's parent 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 ""
-"Eine Aufgabe muss immer zum selben Unternehmen wie die übergeordnete Aufgabe"
-" gehören!"
-
-msgctxt "error:timesheet.work:"
-msgid "You can not create recursive works!"
-msgstr "Aufgaben können nicht rekursiv angelegt werden!"
+"Das Unternehmen einer Aufgabe muss dasselbe wie das der übergeordneten "
+"Aufgabe sein, aber \"%(child)s\" und \"%(parent)s\" sind unterschiedlichen "
+"Unternehmen zugeordnet."
msgctxt "field:timesheet.hours_employee,create_date:"
msgid "Create Date"
@@ -248,10 +247,18 @@ msgctxt "field:timesheet.work,timesheet_available:"
msgid "Available on timesheets"
msgstr "Verfügbar für Zeiterfassung"
+msgctxt "field:timesheet.work,timesheet_end_date:"
+msgid "Timesheet End"
+msgstr "Zeiterfassung Ende"
+
msgctxt "field:timesheet.work,timesheet_lines:"
msgid ""
msgstr ""
+msgctxt "field:timesheet.work,timesheet_start_date:"
+msgid "Timesheet Start"
+msgstr "Zeiterfassung Beginn"
+
msgctxt "field:timesheet.work,write_date:"
msgid "Write Date"
msgstr "Zuletzt geändert"
@@ -286,7 +293,7 @@ msgstr "Stunden pro Mitarbeiter"
msgctxt "model:ir.action,name:act_hours_employee_monthly_form"
msgid "Hours per Employee per Month"
-msgstr "Stunden pro Mitarbeiter pro Monat"
+msgstr "Stunden pro Mitarbeiter und Monat"
msgctxt "model:ir.action,name:act_hours_employee_open"
msgid "Hours per Employee"
@@ -294,7 +301,7 @@ msgstr "Stunden pro Mitarbeiter"
msgctxt "model:ir.action,name:act_hours_employee_weekly_form"
msgid "Hours per Employee per Week"
-msgstr "Stunden pro Mitarbeiter pro Monat"
+msgstr "Stunden pro Mitarbeiter und Woche"
msgctxt "model:ir.action,name:act_line_enter"
msgid "Enter Timesheet"
@@ -304,6 +311,10 @@ msgctxt "model:ir.action,name:act_line_form"
msgid "Timesheet Lines"
msgstr "Zeitpositionen"
+msgctxt "model:ir.action,name:act_line_form_work"
+msgid "Timesheet Lines"
+msgstr "Zeitpositionen"
+
msgctxt "model:ir.action,name:act_open_work"
msgid "Hours per Work"
msgstr "Stunden pro Aufgabe"
@@ -326,15 +337,15 @@ msgstr "Stunden pro Aufgabe"
msgctxt "model:ir.action,name:act_work_list"
msgid "Works"
-msgstr "Aufgaben"
+msgstr "Arbeiten"
msgctxt "model:ir.action,name:act_work_tree"
msgid "Works"
-msgstr "Aufgaben"
+msgstr "Arbeiten"
msgctxt "model:ir.action,name:act_work_tree2"
msgid "Works"
-msgstr "Aufgaben"
+msgstr "Arbeiten"
msgctxt "model:ir.ui.menu,name:menu_configuration"
msgid "Configuration"
@@ -370,11 +381,11 @@ msgstr "Zeiterfassung"
msgctxt "model:ir.ui.menu,name:menu_work_list"
msgid "Works"
-msgstr "Aufgaben"
+msgstr "Arbeiten"
msgctxt "model:ir.ui.menu,name:menu_work_tree"
msgid "Works"
-msgstr "Aufgaben"
+msgstr "Arbeiten"
msgctxt "model:ir.ui.menu,name:menu_work_tree2"
msgid "Hours per Work"
@@ -466,7 +477,7 @@ msgstr "Aufgabe"
msgctxt "view:timesheet.work:"
msgid "Works"
-msgstr "Aufgaben"
+msgstr "Arbeiten"
msgctxt "wizard_button:timesheet.hours_employee.open,start,end:"
msgid "Cancel"
diff --git a/locale/es_AR.po b/locale/es_AR.po
index d4019dc..6d0bb4f 100644
--- a/locale/es_AR.po
+++ b/locale/es_AR.po
@@ -4,15 +4,15 @@ msgstr "Content-Type: text/plain; charset=utf-8\n"
msgctxt "error:timesheet.line:"
msgid "Hours field must be positive"
-msgstr "El campo de horas debe ser positivo"
+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!"
-msgstr "¡Cada trabajo debe estar en la misma empresa que su trabajo padre!"
-
-msgctxt "error:timesheet.work:"
-msgid "You can not create recursive works!"
-msgstr "¡No puede crear trabajos recursivos!"
+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 ""
+"Todo trabajo debe estar en la misma empresa que su padre, pero «%(child)s» y"
+" «%(parent)s» están en empresas diferentes."
msgctxt "field:timesheet.hours_employee,create_date:"
msgid "Create Date"
@@ -246,10 +246,18 @@ msgctxt "field:timesheet.work,timesheet_available:"
msgid "Available on timesheets"
msgstr "Disponible en partes de trabajo"
+msgctxt "field:timesheet.work,timesheet_end_date:"
+msgid "Timesheet End"
+msgstr "Fin de parte de trabajo"
+
msgctxt "field:timesheet.work,timesheet_lines:"
msgid ""
msgstr ""
+msgctxt "field:timesheet.work,timesheet_start_date:"
+msgid "Timesheet Start"
+msgstr "Inicio de parte de trabajo"
+
msgctxt "field:timesheet.work,write_date:"
msgid "Write Date"
msgstr "Fecha modificación"
@@ -260,7 +268,7 @@ msgstr "Usuario modificación"
msgctxt "field:timesheet.work.open.start,from_date:"
msgid "From Date"
-msgstr "Fecha inicial"
+msgstr "Desde la fecha"
msgctxt "field:timesheet.work.open.start,id:"
msgid "ID"
@@ -272,7 +280,7 @@ msgstr "Hasta la fecha"
msgctxt "help:timesheet.work,hours:"
msgid "Total time spent on this work"
-msgstr "Tiempo total empleado en este trabajo"
+msgstr "Tiempo total empleado en este trabajo."
msgctxt "help:timesheet.work,timesheet_available:"
msgid "Allow to fill in timesheets with this work"
@@ -302,6 +310,10 @@ msgctxt "model:ir.action,name:act_line_form"
msgid "Timesheet Lines"
msgstr "Líneas del parte de trabajo"
+msgctxt "model:ir.action,name:act_line_form_work"
+msgid "Timesheet Lines"
+msgstr "Líneas del parte de trabajo"
+
msgctxt "model:ir.action,name:act_open_work"
msgid "Hours per Work"
msgstr "Horas por trabajo"
@@ -356,7 +368,7 @@ msgstr "Ingrese parte de trabajo"
msgctxt "model:ir.ui.menu,name:menu_line_form"
msgid "Timesheet Lines"
-msgstr "Lineas de parte de trabajo"
+msgstr "Líneas del parte de trabajo"
msgctxt "model:ir.ui.menu,name:menu_reporting"
msgid "Reporting"
@@ -364,7 +376,7 @@ msgstr "Informes"
msgctxt "model:ir.ui.menu,name:menu_timesheet"
msgid "Timesheet"
-msgstr "Gestión de parte de trabajo"
+msgstr "Partes de trabajo"
msgctxt "model:ir.ui.menu,name:menu_work_list"
msgid "Works"
@@ -380,7 +392,7 @@ msgstr "Horas por trabajo"
msgctxt "model:res.group,name:group_timesheet_admin"
msgid "Timesheet Administration"
-msgstr "Administración de parte de trabajo"
+msgstr "Administración de partes de trabajo"
msgctxt "model:timesheet.hours_employee,name:"
msgid "Hours per Employee"
@@ -400,7 +412,7 @@ msgstr "Horas por empleado y semana"
msgctxt "model:timesheet.line,name:"
msgid "Timesheet Line"
-msgstr "Linea de parte de trabajo"
+msgstr "Línea de parte de trabajo"
msgctxt "model:timesheet.line.enter.start,name:"
msgid "Enter Lines"
@@ -444,11 +456,11 @@ msgstr "Horas"
msgctxt "view:timesheet.line:"
msgid "Timesheet Line"
-msgstr "Linea de parte de trabajo"
+msgstr "Línea de parte de trabajo"
msgctxt "view:timesheet.line:"
msgid "Timesheet Lines"
-msgstr "Lineas de parte de trabajo"
+msgstr "Líneas del parte de trabajo"
msgctxt "view:timesheet.work.open.start:"
msgid "Hours per Work"
diff --git a/locale/es_CO.po b/locale/es_CO.po
index 63470a2..144fc7c 100644
--- a/locale/es_CO.po
+++ b/locale/es_CO.po
@@ -4,17 +4,15 @@ msgstr "Content-Type: text/plain; charset=utf-8\n"
msgctxt "error:timesheet.line:"
msgid "Hours field must be positive"
-msgstr "El campo Horas debe ser positivo"
+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!"
+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 ""
-"¡Cada trabajo debe estar en la misma compañía lo mismo que el trabajo que lo"
-" originó!"
-
-msgctxt "error:timesheet.work:"
-msgid "You can not create recursive works!"
-msgstr "No puede crear trabajos recursivos!"
+"Cada trabajo debe estar en la misma compañía que su trabajo padre pero "
+"\"%(child)s\" y \"%(parent)s\" están en diferentes compañias."
msgctxt "field:timesheet.hours_employee,create_date:"
msgid "Create Date"
@@ -22,7 +20,7 @@ msgstr "Fecha de Creación"
msgctxt "field:timesheet.hours_employee,create_uid:"
msgid "Create User"
-msgstr "Crear usuario"
+msgstr "Creado por Usuario"
msgctxt "field:timesheet.hours_employee,employee:"
msgid "Employee"
@@ -42,11 +40,11 @@ msgstr "Nombre"
msgctxt "field:timesheet.hours_employee,write_date:"
msgid "Write Date"
-msgstr "Fecha modificación"
+msgstr "Modificado por Usuario"
msgctxt "field:timesheet.hours_employee,write_uid:"
msgid "Write User"
-msgstr "Usuario modificación"
+msgstr "Modificado por Usuario"
msgctxt "field:timesheet.hours_employee.open.start,end_date:"
msgid "End Date"
@@ -58,7 +56,7 @@ msgstr "ID"
msgctxt "field:timesheet.hours_employee.open.start,start_date:"
msgid "Start Date"
-msgstr "Fecha Inicio"
+msgstr "Fecha de Inicio"
msgctxt "field:timesheet.hours_employee_monthly,create_date:"
msgid "Create Date"
@@ -66,7 +64,7 @@ msgstr "Fecha de Creación"
msgctxt "field:timesheet.hours_employee_monthly,create_uid:"
msgid "Create User"
-msgstr "Crear usuario"
+msgstr "Creado por Usuario"
msgctxt "field:timesheet.hours_employee_monthly,employee:"
msgid "Employee"
@@ -90,11 +88,11 @@ msgstr "Nombre"
msgctxt "field:timesheet.hours_employee_monthly,write_date:"
msgid "Write Date"
-msgstr "Fecha modificación"
+msgstr "Modificado por Usuario"
msgctxt "field:timesheet.hours_employee_monthly,write_uid:"
msgid "Write User"
-msgstr "Usuario modificación"
+msgstr "Modificado por Usuario"
msgctxt "field:timesheet.hours_employee_monthly,year:"
msgid "Year"
@@ -106,7 +104,7 @@ msgstr "Fecha de Creación"
msgctxt "field:timesheet.hours_employee_weekly,create_uid:"
msgid "Create User"
-msgstr "Crear usuario"
+msgstr "Creado por Usuario"
msgctxt "field:timesheet.hours_employee_weekly,employee:"
msgid "Employee"
@@ -130,11 +128,11 @@ msgstr "Semana"
msgctxt "field:timesheet.hours_employee_weekly,write_date:"
msgid "Write Date"
-msgstr "Fecha modificación"
+msgstr "Modificado por Usuario"
msgctxt "field:timesheet.hours_employee_weekly,write_uid:"
msgid "Write User"
-msgstr "Usuario modificación"
+msgstr "Modificado por Usuario"
msgctxt "field:timesheet.hours_employee_weekly,year:"
msgid "Year"
@@ -146,7 +144,7 @@ msgstr "Fecha de Creación"
msgctxt "field:timesheet.line,create_uid:"
msgid "Create User"
-msgstr "Crear usuario"
+msgstr "Creado por Usuario"
msgctxt "field:timesheet.line,date:"
msgid "Date"
@@ -178,11 +176,11 @@ msgstr "Trabajo"
msgctxt "field:timesheet.line,write_date:"
msgid "Write Date"
-msgstr "Fecha modificación"
+msgstr "Modificado por Usuario"
msgctxt "field:timesheet.line,write_uid:"
msgid "Write User"
-msgstr "Usuario modificación"
+msgstr "Modificado por Usuario"
msgctxt "field:timesheet.line.enter.start,date:"
msgid "Date"
@@ -202,7 +200,7 @@ msgstr "Activo"
msgctxt "field:timesheet.work,children:"
msgid "Children"
-msgstr "Descendientes"
+msgstr "Hijos"
msgctxt "field:timesheet.work,company:"
msgid "Company"
@@ -214,7 +212,7 @@ msgstr "Fecha de Creación"
msgctxt "field:timesheet.work,create_uid:"
msgid "Create User"
-msgstr "Crear usuario"
+msgstr "Creado por Usuario"
msgctxt "field:timesheet.work,hours:"
msgid "Timesheet Hours"
@@ -246,20 +244,27 @@ msgstr "Derecha"
msgctxt "field:timesheet.work,timesheet_available:"
msgid "Available on timesheets"
-msgstr "Disponibilidad en los registros de tiempos"
+msgstr "Disponible en los registros de tiempo"
+
+msgctxt "field:timesheet.work,timesheet_end_date:"
+msgid "Timesheet End"
+msgstr "Fin de Registro de Tiempo"
-#, fuzzy
msgctxt "field:timesheet.work,timesheet_lines:"
-msgid ""
-msgstr "Punto de Orden"
+msgid "Timesheet Lines"
+msgstr "Lineas de Registro de Tiempo"
+
+msgctxt "field:timesheet.work,timesheet_start_date:"
+msgid "Timesheet Start"
+msgstr "Inicio de Registro de Tiempo"
msgctxt "field:timesheet.work,write_date:"
msgid "Write Date"
-msgstr "Fecha modificación"
+msgstr "Modificado por Usuario"
msgctxt "field:timesheet.work,write_uid:"
msgid "Write User"
-msgstr "Usuario modificación"
+msgstr "Modificado por Usuario"
msgctxt "field:timesheet.work.open.start,from_date:"
msgid "From Date"
@@ -279,7 +284,7 @@ msgstr "Tiempo total utilizado en este trabajo"
msgctxt "help:timesheet.work,timesheet_available:"
msgid "Allow to fill in timesheets with this work"
-msgstr "Permitir llenar en registro de tiempos con este trabajo"
+msgstr "Permite llenar los registros de tiempo con este trabajo"
msgctxt "model:ir.action,name:act_hours_employee_form"
msgid "Hours per Employee"
@@ -287,7 +292,7 @@ msgstr "Horas por Empleado"
msgctxt "model:ir.action,name:act_hours_employee_monthly_form"
msgid "Hours per Employee per Month"
-msgstr "Horas por Empleado en el mes"
+msgstr "Horas por Empleado por Mes"
msgctxt "model:ir.action,name:act_hours_employee_open"
msgid "Hours per Employee"
@@ -295,7 +300,7 @@ msgstr "Horas por Empleado"
msgctxt "model:ir.action,name:act_hours_employee_weekly_form"
msgid "Hours per Employee per Week"
-msgstr "Horas por Empleado en la semana"
+msgstr "Horas por Empleado por Semana"
msgctxt "model:ir.action,name:act_line_enter"
msgid "Enter Timesheet"
@@ -305,6 +310,10 @@ msgctxt "model:ir.action,name:act_line_form"
msgid "Timesheet Lines"
msgstr "Lineas de Registro de Tiempo"
+msgctxt "model:ir.action,name:act_line_form_work"
+msgid "Timesheet Lines"
+msgstr "Lineas de Registro de Tiempo"
+
msgctxt "model:ir.action,name:act_open_work"
msgid "Hours per Work"
msgstr "Horas por Trabajo"
@@ -347,11 +356,11 @@ msgstr "Horas por Empleado"
msgctxt "model:ir.ui.menu,name:menu_hours_employee_open_monthly"
msgid "Hours per Employee per Month"
-msgstr "Horas por Empleado en el mes"
+msgstr "Horas por Empleado por Mes"
msgctxt "model:ir.ui.menu,name:menu_hours_employee_open_weekly"
msgid "Hours per Employee per Week"
-msgstr "Horas por Empleado en la semana"
+msgstr "Horas por Empleado por Semana"
msgctxt "model:ir.ui.menu,name:menu_line_enter"
msgid "Enter Timesheet"
@@ -363,7 +372,7 @@ msgstr "Lineas de Registro de Tiempo"
msgctxt "model:ir.ui.menu,name:menu_reporting"
msgid "Reporting"
-msgstr "Reportes"
+msgstr "Informes"
msgctxt "model:ir.ui.menu,name:menu_timesheet"
msgid "Timesheet"
@@ -395,11 +404,11 @@ msgstr "Abrir Horas por Empleado"
msgctxt "model:timesheet.hours_employee_monthly,name:"
msgid "Hours per Employee per Month"
-msgstr "Horas por Empleado en el mes"
+msgstr "Horas por Empleado por Mes"
msgctxt "model:timesheet.hours_employee_weekly,name:"
msgid "Hours per Employee per Week"
-msgstr "Horas por Empleado en la semana"
+msgstr "Horas por Empleado por Semana"
msgctxt "model:timesheet.line,name:"
msgid "Timesheet Line"
@@ -431,11 +440,11 @@ msgstr "Horas por Empleado"
msgctxt "view:timesheet.hours_employee_monthly:"
msgid "Hours per Employee per Month"
-msgstr "Horas por Empleado en el mes"
+msgstr "Horas por Empleado por Mes"
msgctxt "view:timesheet.hours_employee_weekly:"
msgid "Hours per Employee per Week"
-msgstr "Horas por Empleado en la semana"
+msgstr "Horas por Empleado por Semana"
msgctxt "view:timesheet.line.enter.start:"
msgid "Enter Timesheet"
diff --git a/locale/es_ES.po b/locale/es_ES.po
index 8204be8..ad0d604 100644
--- a/locale/es_ES.po
+++ b/locale/es_ES.po
@@ -7,12 +7,12 @@ msgid "Hours field must be positive"
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!"
-msgstr "Cada trabajo debe estar en la misma empresa que su trabajo padre."
-
-msgctxt "error:timesheet.work:"
-msgid "You can not create recursive works!"
-msgstr "No puede crear trabajos recursivos."
+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 ""
+"Todo trabajo debe estar en la misma empresa que su padre, pero \"%(child)s\""
+" y \"%(parent)s\" están en empresas diferentes."
msgctxt "field:timesheet.hours_employee,create_date:"
msgid "Create Date"
@@ -246,10 +246,18 @@ msgctxt "field:timesheet.work,timesheet_available:"
msgid "Available on timesheets"
msgstr "Disponible en partes de trabajo"
+msgctxt "field:timesheet.work,timesheet_end_date:"
+msgid "Timesheet End"
+msgstr "Fin de parte de trabajo"
+
msgctxt "field:timesheet.work,timesheet_lines:"
msgid ""
msgstr ""
+msgctxt "field:timesheet.work,timesheet_start_date:"
+msgid "Timesheet Start"
+msgstr "Inicio de parte de trabajo"
+
msgctxt "field:timesheet.work,write_date:"
msgid "Write Date"
msgstr "Fecha modificación"
@@ -302,6 +310,10 @@ msgctxt "model:ir.action,name:act_line_form"
msgid "Timesheet Lines"
msgstr "Líneas del parte de trabajo"
+msgctxt "model:ir.action,name:act_line_form_work"
+msgid "Timesheet Lines"
+msgstr "Líneas del parte de trabajo"
+
msgctxt "model:ir.action,name:act_open_work"
msgid "Hours per Work"
msgstr "Horas por trabajo"
@@ -356,7 +368,7 @@ msgstr "Añadir parte de trabajo"
msgctxt "model:ir.ui.menu,name:menu_line_form"
msgid "Timesheet Lines"
-msgstr "Líneas de parte de trabajo"
+msgstr "Líneas del parte de trabajo"
msgctxt "model:ir.ui.menu,name:menu_reporting"
msgid "Reporting"
@@ -448,7 +460,7 @@ msgstr "Línea de parte de trabajo"
msgctxt "view:timesheet.line:"
msgid "Timesheet Lines"
-msgstr "Líneas de parte de trabajo"
+msgstr "Líneas del parte de trabajo"
msgctxt "view:timesheet.work.open.start:"
msgid "Hours per Work"
diff --git a/locale/fr_FR.po b/locale/fr_FR.po
index 8484550..2ed9279 100644
--- a/locale/fr_FR.po
+++ b/locale/fr_FR.po
@@ -11,22 +11,12 @@ msgid "Hours field must be positive"
msgstr "Le champ Heures doit être positif"
msgctxt "error:timesheet.work:"
-msgid "Every work must be in the same company as it's parent work!"
-msgstr ""
-"Chaque activité doit être dans la même société que son activité parente !"
-
-msgctxt "error:timesheet.work:"
-msgid "Every work must be in the same company as it's parent 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 ""
-"Chaque activité doit être dans la même société que son activité parente !"
-
-msgctxt "error:timesheet.work:"
-msgid "You can not create recursive works!"
-msgstr "Vous ne pouvez pas créer des activités récursives!"
-
-msgctxt "error:timesheet.work:"
-msgid "You can not create recursive works!"
-msgstr "Vous ne pouvez pas créer des activités récursives!"
+"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 "field:timesheet.hours_employee,create_date:"
msgid "Create Date"
@@ -260,10 +250,18 @@ msgctxt "field:timesheet.work,timesheet_available:"
msgid "Available on timesheets"
msgstr "Disponible sur les feuilles de présence"
+msgctxt "field:timesheet.work,timesheet_end_date:"
+msgid "Timesheet End"
+msgstr "Fin feuille de présence"
+
msgctxt "field:timesheet.work,timesheet_lines:"
msgid ""
msgstr ""
+msgctxt "field:timesheet.work,timesheet_start_date:"
+msgid "Timesheet Start"
+msgstr "Début feuille de présence"
+
msgctxt "field:timesheet.work,write_date:"
msgid "Write Date"
msgstr "Date de mise à jour"
@@ -316,6 +314,10 @@ msgctxt "model:ir.action,name:act_line_form"
msgid "Timesheet Lines"
msgstr "Lignes de feuille de présence"
+msgctxt "model:ir.action,name:act_line_form_work"
+msgid "Timesheet Lines"
+msgstr "Lignes de feuille de présence"
+
msgctxt "model:ir.action,name:act_open_work"
msgid "Hours per Work"
msgstr "Heures par activité"
diff --git a/locale/nl_NL.po b/locale/nl_NL.po
index a817417..d4e074e 100644
--- a/locale/nl_NL.po
+++ b/locale/nl_NL.po
@@ -7,13 +7,10 @@ msgid "Hours field must be positive"
msgstr "Het veld uren moet positief zijn"
msgctxt "error:timesheet.work:"
-msgid "Every work must be in the same company as it's parent 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 ""
-"Ieder werk moet onder hetzelfde bedrijf vallen als het bovenliggende werk!"
-
-msgctxt "error:timesheet.work:"
-msgid "You can not create recursive works!"
-msgstr "U kunt een werk niet naar zichzelf laten verwijzen!"
msgctxt "field:timesheet.hours_employee,create_date:"
msgid "Create Date"
@@ -251,11 +248,19 @@ msgctxt "field:timesheet.work,timesheet_available:"
msgid "Available on timesheets"
msgstr "Beschikbaar in tijdregistartie"
+msgctxt "field:timesheet.work,timesheet_end_date:"
+msgid "Timesheet End"
+msgstr ""
+
#, fuzzy
msgctxt "field:timesheet.work,timesheet_lines:"
msgid "Timesheet Lines"
msgstr "Tijdregistratieregels"
+msgctxt "field:timesheet.work,timesheet_start_date:"
+msgid "Timesheet Start"
+msgstr ""
+
msgctxt "field:timesheet.work,write_date:"
msgid "Write Date"
msgstr ""
@@ -311,6 +316,11 @@ msgctxt "model:ir.action,name:act_line_form"
msgid "Timesheet Lines"
msgstr "Tijdregistratieregels"
+#, fuzzy
+msgctxt "model:ir.action,name:act_line_form_work"
+msgid "Timesheet Lines"
+msgstr "Tijdregistratieregels"
+
msgctxt "model:ir.action,name:act_open_work"
msgid "Hours per Work"
msgstr "Uren per werk"
diff --git a/locale/ru_RU.po b/locale/ru_RU.po
index 333c909..724500f 100644
--- a/locale/ru_RU.po
+++ b/locale/ru_RU.po
@@ -4,533 +4,508 @@ msgstr "Content-Type: text/plain; charset=utf-8\n"
msgctxt "error:timesheet.line:"
msgid "Hours field must be positive"
-msgstr ""
-
-msgctxt "error:timesheet.work:"
-msgid "Every work must be in the same company as it's parent work!"
-msgstr ""
+msgstr "Количество часов должно быть положительным"
msgctxt "error:timesheet.work:"
-msgid "You can not create recursive works!"
+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 ""
+"Каждая работа должна быть в той же организации, что и её предок, но "
+"\"%(child)s\" и \"%(parent)s\" принадлежат разным организациям."
msgctxt "field:timesheet.hours_employee,create_date:"
msgid "Create Date"
-msgstr ""
+msgstr "Дата создания"
msgctxt "field:timesheet.hours_employee,create_uid:"
msgid "Create User"
-msgstr ""
+msgstr "Создано пользователем"
-#, fuzzy
msgctxt "field:timesheet.hours_employee,employee:"
msgid "Employee"
msgstr "Сотрудник"
-#, fuzzy
msgctxt "field:timesheet.hours_employee,hours:"
msgid "Hours"
msgstr "Часы"
msgctxt "field:timesheet.hours_employee,id:"
msgid "ID"
-msgstr ""
+msgstr "ID"
-#, fuzzy
msgctxt "field:timesheet.hours_employee,rec_name:"
msgid "Name"
msgstr "Наименование"
msgctxt "field:timesheet.hours_employee,write_date:"
msgid "Write Date"
-msgstr ""
+msgstr "Дата изменения"
msgctxt "field:timesheet.hours_employee,write_uid:"
msgid "Write User"
-msgstr ""
+msgstr "Изменено пользователем"
-#, fuzzy
msgctxt "field:timesheet.hours_employee.open.start,end_date:"
msgid "End Date"
msgstr "Дата окончания"
msgctxt "field:timesheet.hours_employee.open.start,id:"
msgid "ID"
-msgstr ""
+msgstr "ID"
-#, fuzzy
msgctxt "field:timesheet.hours_employee.open.start,start_date:"
msgid "Start Date"
msgstr "Дата начала"
msgctxt "field:timesheet.hours_employee_monthly,create_date:"
msgid "Create Date"
-msgstr ""
+msgstr "Дата создания"
msgctxt "field:timesheet.hours_employee_monthly,create_uid:"
msgid "Create User"
-msgstr ""
+msgstr "Создано пользователем"
-#, fuzzy
msgctxt "field:timesheet.hours_employee_monthly,employee:"
msgid "Employee"
msgstr "Сотрудник"
-#, fuzzy
msgctxt "field:timesheet.hours_employee_monthly,hours:"
msgid "Hours"
msgstr "Часы"
msgctxt "field:timesheet.hours_employee_monthly,id:"
msgid "ID"
-msgstr ""
+msgstr "ID"
msgctxt "field:timesheet.hours_employee_monthly,month:"
msgid "Month"
-msgstr ""
+msgstr "Месяц"
-#, fuzzy
msgctxt "field:timesheet.hours_employee_monthly,rec_name:"
msgid "Name"
msgstr "Наименование"
msgctxt "field:timesheet.hours_employee_monthly,write_date:"
msgid "Write Date"
-msgstr ""
+msgstr "Дата изменения"
msgctxt "field:timesheet.hours_employee_monthly,write_uid:"
msgid "Write User"
-msgstr ""
+msgstr "Изменено пользователем"
msgctxt "field:timesheet.hours_employee_monthly,year:"
msgid "Year"
-msgstr ""
+msgstr "Год"
msgctxt "field:timesheet.hours_employee_weekly,create_date:"
msgid "Create Date"
-msgstr ""
+msgstr "Дата создания"
msgctxt "field:timesheet.hours_employee_weekly,create_uid:"
msgid "Create User"
-msgstr ""
+msgstr "Создано пользователем"
-#, fuzzy
msgctxt "field:timesheet.hours_employee_weekly,employee:"
msgid "Employee"
msgstr "Сотрудник"
-#, fuzzy
msgctxt "field:timesheet.hours_employee_weekly,hours:"
msgid "Hours"
msgstr "Часы"
msgctxt "field:timesheet.hours_employee_weekly,id:"
msgid "ID"
-msgstr ""
+msgstr "ID"
-#, fuzzy
msgctxt "field:timesheet.hours_employee_weekly,rec_name:"
msgid "Name"
msgstr "Наименование"
msgctxt "field:timesheet.hours_employee_weekly,week:"
msgid "Week"
-msgstr ""
+msgstr "Неделя"
msgctxt "field:timesheet.hours_employee_weekly,write_date:"
msgid "Write Date"
-msgstr ""
+msgstr "Дата изменения"
msgctxt "field:timesheet.hours_employee_weekly,write_uid:"
msgid "Write User"
-msgstr ""
+msgstr "Изменено пользователем"
msgctxt "field:timesheet.hours_employee_weekly,year:"
msgid "Year"
-msgstr ""
+msgstr "Год"
msgctxt "field:timesheet.line,create_date:"
msgid "Create Date"
-msgstr ""
+msgstr "Дата создания"
msgctxt "field:timesheet.line,create_uid:"
msgid "Create User"
-msgstr ""
+msgstr "Создано пользователем"
-#, fuzzy
msgctxt "field:timesheet.line,date:"
msgid "Date"
msgstr "Дата"
-#, fuzzy
msgctxt "field:timesheet.line,description:"
msgid "Description"
msgstr "Описание"
-#, fuzzy
msgctxt "field:timesheet.line,employee:"
msgid "Employee"
msgstr "Сотрудник"
-#, fuzzy
msgctxt "field:timesheet.line,hours:"
msgid "Hours"
msgstr "Часы"
msgctxt "field:timesheet.line,id:"
msgid "ID"
-msgstr ""
+msgstr "ID"
-#, fuzzy
msgctxt "field:timesheet.line,rec_name:"
msgid "Name"
msgstr "Наименование"
msgctxt "field:timesheet.line,work:"
msgid "Work"
-msgstr ""
+msgstr "Работа"
msgctxt "field:timesheet.line,write_date:"
msgid "Write Date"
-msgstr ""
+msgstr "Дата изменения"
msgctxt "field:timesheet.line,write_uid:"
msgid "Write User"
-msgstr ""
+msgstr "Изменено пользователем"
-#, fuzzy
msgctxt "field:timesheet.line.enter.start,date:"
msgid "Date"
msgstr "Дата"
-#, fuzzy
msgctxt "field:timesheet.line.enter.start,employee:"
msgid "Employee"
msgstr "Сотрудник"
msgctxt "field:timesheet.line.enter.start,id:"
msgid "ID"
-msgstr ""
+msgstr "ID"
-#, fuzzy
msgctxt "field:timesheet.work,active:"
msgid "Active"
-msgstr "Действительный"
+msgstr "Действующий"
-#, fuzzy
msgctxt "field:timesheet.work,children:"
msgid "Children"
msgstr "Подчиненый"
-#, fuzzy
msgctxt "field:timesheet.work,company:"
msgid "Company"
-msgstr "Учет.орг."
+msgstr "Организация"
msgctxt "field:timesheet.work,create_date:"
msgid "Create Date"
-msgstr ""
+msgstr "Дата создания"
msgctxt "field:timesheet.work,create_uid:"
msgid "Create User"
-msgstr ""
+msgstr "Создано пользователем"
msgctxt "field:timesheet.work,hours:"
msgid "Timesheet Hours"
-msgstr ""
+msgstr "Часы табеля"
msgctxt "field:timesheet.work,id:"
msgid "ID"
-msgstr ""
+msgstr "ID"
-#, fuzzy
msgctxt "field:timesheet.work,left:"
msgid "Left"
-msgstr "Левая сторона"
+msgstr "Слева"
-#, fuzzy
msgctxt "field:timesheet.work,name:"
msgid "Name"
msgstr "Наименование"
-#, fuzzy
msgctxt "field:timesheet.work,parent:"
msgid "Parent"
-msgstr "Основной"
+msgstr "Предок"
-#, fuzzy
msgctxt "field:timesheet.work,rec_name:"
msgid "Name"
msgstr "Наименование"
-#, fuzzy
msgctxt "field:timesheet.work,right:"
msgid "Right"
-msgstr "Правая сторона"
+msgstr "Справа"
msgctxt "field:timesheet.work,timesheet_available:"
msgid "Available on timesheets"
-msgstr ""
+msgstr "Доступно в табеле"
+
+msgctxt "field:timesheet.work,timesheet_end_date:"
+msgid "Timesheet End"
+msgstr "Конечная дата табеля"
msgctxt "field:timesheet.work,timesheet_lines:"
msgid "Timesheet Lines"
-msgstr ""
+msgstr "Строки табеля"
+
+msgctxt "field:timesheet.work,timesheet_start_date:"
+msgid "Timesheet Start"
+msgstr "Начальная дата табеля"
msgctxt "field:timesheet.work,write_date:"
msgid "Write Date"
-msgstr ""
+msgstr "Дата изменения"
msgctxt "field:timesheet.work,write_uid:"
msgid "Write User"
-msgstr ""
+msgstr "Изменено пользователем"
msgctxt "field:timesheet.work.open.start,from_date:"
msgid "From Date"
-msgstr ""
+msgstr "Начальная дата"
msgctxt "field:timesheet.work.open.start,id:"
msgid "ID"
-msgstr ""
+msgstr "ID"
msgctxt "field:timesheet.work.open.start,to_date:"
msgid "To Date"
-msgstr ""
+msgstr "Конечная дата"
msgctxt "help:timesheet.work,hours:"
msgid "Total time spent on this work"
-msgstr ""
+msgstr "Общее время потраченное на эту работу"
msgctxt "help:timesheet.work,timesheet_available:"
msgid "Allow to fill in timesheets with this work"
-msgstr ""
+msgstr "Разрешить заполнять табель с этой работой"
msgctxt "model:ir.action,name:act_hours_employee_form"
msgid "Hours per Employee"
-msgstr ""
+msgstr "Часы на сотрудника"
msgctxt "model:ir.action,name:act_hours_employee_monthly_form"
msgid "Hours per Employee per Month"
-msgstr ""
+msgstr "Часы на сотрудника в месяц"
msgctxt "model:ir.action,name:act_hours_employee_open"
msgid "Hours per Employee"
-msgstr ""
+msgstr "Часы на сотрудника"
msgctxt "model:ir.action,name:act_hours_employee_weekly_form"
msgid "Hours per Employee per Week"
-msgstr ""
+msgstr "Часы на сотрудника в неделю"
msgctxt "model:ir.action,name:act_line_enter"
msgid "Enter Timesheet"
-msgstr ""
+msgstr "Ввод табеля"
msgctxt "model:ir.action,name:act_line_form"
msgid "Timesheet Lines"
-msgstr ""
+msgstr "Строки табеля"
+
+msgctxt "model:ir.action,name:act_line_form_work"
+msgid "Timesheet Lines"
+msgstr "Строки табеля"
msgctxt "model:ir.action,name:act_open_work"
msgid "Hours per Work"
-msgstr ""
+msgstr "Часов на работу"
msgctxt "model:ir.action,name:act_open_work_graph"
msgid "Hours per Work"
-msgstr ""
+msgstr "Часов на работу"
msgctxt "model:ir.action,name:act_work_form2"
msgid "Hours per Work"
-msgstr ""
+msgstr "Часов на работу"
msgctxt "model:ir.action,name:act_work_form3"
msgid "Hours per Work"
-msgstr ""
+msgstr "Часов на работу"
msgctxt "model:ir.action,name:act_work_hours_board"
msgid "Hours per Work"
-msgstr ""
+msgstr "Часов на работу"
msgctxt "model:ir.action,name:act_work_list"
msgid "Works"
-msgstr ""
+msgstr "Работы"
msgctxt "model:ir.action,name:act_work_tree"
msgid "Works"
-msgstr ""
+msgstr "Работы"
msgctxt "model:ir.action,name:act_work_tree2"
msgid "Works"
-msgstr ""
+msgstr "Работы"
-#, fuzzy
msgctxt "model:ir.ui.menu,name:menu_configuration"
msgid "Configuration"
msgstr "Конфигурация"
msgctxt "model:ir.ui.menu,name:menu_hours_employee_open"
msgid "Hours per Employee"
-msgstr ""
+msgstr "Часы на сотрудника"
msgctxt "model:ir.ui.menu,name:menu_hours_employee_open_monthly"
msgid "Hours per Employee per Month"
-msgstr ""
+msgstr "Часы на сотрудника в месяц"
msgctxt "model:ir.ui.menu,name:menu_hours_employee_open_weekly"
msgid "Hours per Employee per Week"
-msgstr ""
+msgstr "Часы на сотрудника в неделю"
msgctxt "model:ir.ui.menu,name:menu_line_enter"
msgid "Enter Timesheet"
-msgstr ""
+msgstr "Ввод табеля"
msgctxt "model:ir.ui.menu,name:menu_line_form"
msgid "Timesheet Lines"
-msgstr ""
+msgstr "Строки табеля"
-#, fuzzy
msgctxt "model:ir.ui.menu,name:menu_reporting"
msgid "Reporting"
msgstr "Отчетность"
msgctxt "model:ir.ui.menu,name:menu_timesheet"
msgid "Timesheet"
-msgstr ""
+msgstr "Табель"
msgctxt "model:ir.ui.menu,name:menu_work_list"
msgid "Works"
-msgstr ""
+msgstr "Работы"
msgctxt "model:ir.ui.menu,name:menu_work_tree"
msgid "Works"
-msgstr ""
+msgstr "Работы"
msgctxt "model:ir.ui.menu,name:menu_work_tree2"
msgid "Hours per Work"
-msgstr ""
+msgstr "Часов на работу"
msgctxt "model:res.group,name:group_timesheet_admin"
msgid "Timesheet Administration"
-msgstr ""
+msgstr "Администрирование табелей"
msgctxt "model:timesheet.hours_employee,name:"
msgid "Hours per Employee"
-msgstr ""
+msgstr "Часы на сотрудника"
msgctxt "model:timesheet.hours_employee.open.start,name:"
msgid "Open Hours per Employee"
-msgstr ""
+msgstr "Открытые часы на сотрудника"
msgctxt "model:timesheet.hours_employee_monthly,name:"
msgid "Hours per Employee per Month"
-msgstr ""
+msgstr "Часы на сотрудника в месяц"
msgctxt "model:timesheet.hours_employee_weekly,name:"
msgid "Hours per Employee per Week"
-msgstr ""
+msgstr "Часы на сотрудника в неделю"
msgctxt "model:timesheet.line,name:"
msgid "Timesheet Line"
-msgstr ""
+msgstr "Строка табеля"
msgctxt "model:timesheet.line.enter.start,name:"
msgid "Enter Lines"
-msgstr ""
+msgstr "Ввод строк"
msgctxt "model:timesheet.work,name:"
msgid "Work"
-msgstr ""
+msgstr "Работа"
msgctxt "model:timesheet.work.open.start,name:"
msgid "Open Work"
-msgstr ""
+msgstr "Открытые работы"
msgctxt "view:timesheet.hours_employee.open.start:"
msgid "Hours per Employee"
-msgstr ""
+msgstr "Часы на сотрудника"
-#, fuzzy
msgctxt "view:timesheet.hours_employee:"
msgid "Hours"
msgstr "Часы"
msgctxt "view:timesheet.hours_employee:"
msgid "Hours per Employee"
-msgstr ""
+msgstr "Часы на сотрудника"
msgctxt "view:timesheet.hours_employee_monthly:"
msgid "Hours per Employee per Month"
-msgstr ""
+msgstr "Часы на сотрудника в месяц"
msgctxt "view:timesheet.hours_employee_weekly:"
msgid "Hours per Employee per Week"
-msgstr ""
+msgstr "Часы на сотрудника в неделю"
msgctxt "view:timesheet.line.enter.start:"
msgid "Enter Timesheet"
-msgstr ""
+msgstr "Ввод табеля"
-#, fuzzy
msgctxt "view:timesheet.line:"
msgid "Hours"
msgstr "Часы"
msgctxt "view:timesheet.line:"
msgid "Timesheet Line"
-msgstr ""
+msgstr "Строка табеля"
msgctxt "view:timesheet.line:"
msgid "Timesheet Lines"
-msgstr ""
+msgstr "Строки табеля"
msgctxt "view:timesheet.work.open.start:"
msgid "Hours per Work"
-msgstr ""
+msgstr "Часов на работу"
msgctxt "view:timesheet.work:"
msgid "Hours per Work"
-msgstr ""
+msgstr "Часов на работу"
msgctxt "view:timesheet.work:"
msgid "Work"
-msgstr ""
+msgstr "Работа"
msgctxt "view:timesheet.work:"
msgid "Works"
-msgstr ""
+msgstr "Работы"
-#, fuzzy
msgctxt "wizard_button:timesheet.hours_employee.open,start,end:"
msgid "Cancel"
msgstr "Отменить"
-#, fuzzy
msgctxt "wizard_button:timesheet.hours_employee.open,start,open_:"
msgid "Open"
msgstr "Открыть"
-#, fuzzy
msgctxt "wizard_button:timesheet.line.enter,start,end:"
msgid "Cancel"
msgstr "Отменить"
msgctxt "wizard_button:timesheet.line.enter,start,enter:"
msgid "Enter"
-msgstr ""
+msgstr "Ввод"
-#, fuzzy
msgctxt "wizard_button:timesheet.work.open,start,end:"
msgid "Cancel"
msgstr "Отменить"
-#, fuzzy
msgctxt "wizard_button:timesheet.work.open,start,open_:"
msgid "Open"
msgstr "Открыть"
-#, fuzzy
msgctxt "wizard_button:timesheet.work.open2,start,end:"
msgid "Cancel"
msgstr "Отменить"
-#, fuzzy
msgctxt "wizard_button:timesheet.work.open2,start,open_:"
msgid "Open"
msgstr "Открыть"
diff --git a/setup.py b/setup.py
index aef6f4b..2f74046 100644
--- a/setup.py
+++ b/setup.py
@@ -25,10 +25,10 @@ requires = []
for dep in info.get('depends', []):
if not re.match(r'(ir|res|webdav)(\W|$)', dep):
requires.append('trytond_%s >= %s.%s, < %s.%s' %
- (dep, major_version, minor_version, major_version,
- minor_version + 1))
+ (dep, major_version, minor_version, major_version,
+ minor_version + 1))
requires.append('trytond >= %s.%s, < %s.%s' %
- (major_version, minor_version, major_version, minor_version + 1))
+ (major_version, minor_version, major_version, minor_version + 1))
setup(name='trytond_timesheet',
version=info.get('version', '0.0.1'),
@@ -36,16 +36,16 @@ setup(name='trytond_timesheet',
long_description=read('README'),
author='Tryton',
url='http://www.tryton.org/',
- download_url="http://downloads.tryton.org/" + \
- info.get('version', '0.0.1').rsplit('.', 1)[0] + '/',
+ download_url=("http://downloads.tryton.org/" +
+ info.get('version', '0.0.1').rsplit('.', 1)[0] + '/'),
package_dir={'trytond.modules.timesheet': '.'},
packages=[
'trytond.modules.timesheet',
'trytond.modules.timesheet.tests',
],
package_data={
- 'trytond.modules.timesheet': info.get('xml', []) \
- + ['tryton.cfg', 'locale/*.po'],
+ 'trytond.modules.timesheet': (info.get('xml', [])
+ + ['tryton.cfg', 'view/*.xml', 'locale/*.po']),
},
classifiers=[
'Development Status :: 5 - Production/Stable',
@@ -57,6 +57,7 @@ setup(name='trytond_timesheet',
'Intended Audience :: Manufacturing',
'License :: OSI Approved :: GNU General Public License (GPL)',
'Natural Language :: Bulgarian',
+ 'Natural Language :: Catalan',
'Natural Language :: Czech',
'Natural Language :: Dutch',
'Natural Language :: English',
diff --git a/tryton.cfg b/tryton.cfg
index d7e8163..edb48ca 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
[tryton]
-version=2.6.0
+version=2.8.0
depends:
company
company_work_time
diff --git a/trytond_timesheet.egg-info/PKG-INFO b/trytond_timesheet.egg-info/PKG-INFO
index c7bce31..ab086c7 100644
--- a/trytond_timesheet.egg-info/PKG-INFO
+++ b/trytond_timesheet.egg-info/PKG-INFO
@@ -1,12 +1,12 @@
-Metadata-Version: 1.0
+Metadata-Version: 1.1
Name: trytond-timesheet
-Version: 2.6.0
+Version: 2.8.0
Summary: Tryton module with timesheets
Home-page: http://www.tryton.org/
Author: Tryton
Author-email: UNKNOWN
License: GPL-3
-Download-URL: http://downloads.tryton.org/2.6/
+Download-URL: http://downloads.tryton.org/2.8/
Description: trytond_timesheet
=================
@@ -53,6 +53,7 @@ Classifier: Intended Audience :: Legal Industry
Classifier: Intended Audience :: Manufacturing
Classifier: License :: OSI Approved :: GNU General Public License (GPL)
Classifier: Natural Language :: Bulgarian
+Classifier: Natural Language :: Catalan
Classifier: Natural Language :: Czech
Classifier: Natural Language :: Dutch
Classifier: Natural Language :: English
diff --git a/trytond_timesheet.egg-info/SOURCES.txt b/trytond_timesheet.egg-info/SOURCES.txt
index 056625f..7d468c5 100644
--- a/trytond_timesheet.egg-info/SOURCES.txt
+++ b/trytond_timesheet.egg-info/SOURCES.txt
@@ -31,4 +31,19 @@ trytond_timesheet.egg-info/dependency_links.txt
trytond_timesheet.egg-info/entry_points.txt
trytond_timesheet.egg-info/not-zip-safe
trytond_timesheet.egg-info/requires.txt
-trytond_timesheet.egg-info/top_level.txt
\ No newline at end of file
+trytond_timesheet.egg-info/top_level.txt
+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
\ No newline at end of file
diff --git a/trytond_timesheet.egg-info/requires.txt b/trytond_timesheet.egg-info/requires.txt
index e00c7a5..0e5dc9e 100644
--- a/trytond_timesheet.egg-info/requires.txt
+++ b/trytond_timesheet.egg-info/requires.txt
@@ -1,3 +1,3 @@
-trytond_company >= 2.6, < 2.7
-trytond_company_work_time >= 2.6, < 2.7
-trytond >= 2.6, < 2.7
\ No newline at end of file
+trytond_company >= 2.8, < 2.9
+trytond_company_work_time >= 2.8, < 2.9
+trytond >= 2.8, < 2.9
\ No newline at end of file
diff --git a/view/hours_employee_graph.xml b/view/hours_employee_graph.xml
new file mode 100644
index 0000000..c9ca574
--- /dev/null
+++ b/view/hours_employee_graph.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0"?>
+<!-- This file is part of Tryton. The COPYRIGHT file at the top level of
+this repository contains the full copyright notices and license terms. -->
+<graph string="Hours per Employee">
+ <x>
+ <field name="employee"/>
+ </x>
+ <y>
+ <field name="hours" widget="float_time"
+ float_time="company_work_time"/>
+ </y>
+</graph>
diff --git a/view/hours_employee_monthly_tree.xml b/view/hours_employee_monthly_tree.xml
new file mode 100644
index 0000000..b2350ed
--- /dev/null
+++ b/view/hours_employee_monthly_tree.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0"?>
+<!-- This file is part of Tryton. The COPYRIGHT file at the top level of
+this repository contains the full copyright notices and license terms. -->
+<tree string="Hours per Employee per Month">
+ <field name="year"/>
+ <field name="month"/>
+ <field name="employee"/>
+ <field name="hours" widget="float_time" float_time="company_work_time"/>
+</tree>
diff --git a/view/hours_employee_open_start_form.xml b/view/hours_employee_open_start_form.xml
new file mode 100644
index 0000000..0e0a429
--- /dev/null
+++ b/view/hours_employee_open_start_form.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0"?>
+<!-- This file is part of Tryton. The COPYRIGHT file at the top level of
+this repository contains the full copyright notices and license terms. -->
+<form string="Hours per Employee">
+ <label name="start_date"/>
+ <field name="start_date"/>
+ <label name="end_date"/>
+ <field name="end_date"/>
+</form>
diff --git a/view/hours_employee_tree.xml b/view/hours_employee_tree.xml
new file mode 100644
index 0000000..6df2f8c
--- /dev/null
+++ b/view/hours_employee_tree.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<!-- This file is part of Tryton. The COPYRIGHT file at the top level of
+this repository contains the full copyright notices and license terms. -->
+<tree string="Hours per Employee">
+ <field name="employee"/>
+ <field name="hours" widget="float_time" float_time="company_work_time"
+ sum="Hours"/>
+</tree>
diff --git a/view/hours_employee_weekly_tree.xml b/view/hours_employee_weekly_tree.xml
new file mode 100644
index 0000000..d0335f2
--- /dev/null
+++ b/view/hours_employee_weekly_tree.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0"?>
+<!-- This file is part of Tryton. The COPYRIGHT file at the top level of
+this repository contains the full copyright notices and license terms. -->
+<tree string="Hours per Employee per Week">
+ <field name="year"/>
+ <field name="week"/>
+ <field name="employee"/>
+ <field name="hours" widget="float_time" float_time="company_work_time"/>
+</tree>
diff --git a/view/line_enter_start_form.xml b/view/line_enter_start_form.xml
new file mode 100644
index 0000000..6bb9382
--- /dev/null
+++ b/view/line_enter_start_form.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0"?>
+<!-- This file is part of Tryton. The COPYRIGHT file at the top level of
+this repository contains the full copyright notices and license terms. -->
+<form string="Enter Timesheet">
+ <label name="employee"/>
+ <field name="employee"/>
+ <label name="date"/>
+ <field name="date"/>
+</form>
diff --git a/view/line_form.xml b/view/line_form.xml
new file mode 100644
index 0000000..b2e2383
--- /dev/null
+++ b/view/line_form.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0"?>
+<!-- This file is part of Tryton. The COPYRIGHT file at the top level of
+this repository contains the full copyright notices and license terms. -->
+<form string="Timesheet Line">
+ <label name="employee"/>
+ <field name="employee" colspan="3"/>
+ <label name="date"/>
+ <field name="date"/>
+ <label name="hours"/>
+ <field name="hours" widget="float_time" float_time="company_work_time"/>
+ <label name="work"/>
+ <field name="work"/>
+ <label name="description"/>
+ <field name="description"/>
+</form>
diff --git a/view/line_tree.xml b/view/line_tree.xml
new file mode 100644
index 0000000..09ce21a
--- /dev/null
+++ b/view/line_tree.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0"?>
+<!-- This file is part of Tryton. The COPYRIGHT file at the top level of
+this repository contains the full copyright notices and license terms. -->
+<tree string="Timesheet Lines" editable="bottom">
+ <field name="employee"/>
+ <field name="date"/>
+ <field name="hours" widget="float_time" float_time="company_work_time"
+ sum="Hours"/>
+ <field name="work" width="300"/>
+ <field name="description"/>
+</tree>
diff --git a/view/work_form.xml b/view/work_form.xml
new file mode 100644
index 0000000..a95e62f
--- /dev/null
+++ b/view/work_form.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0"?>
+<!-- This file is part of Tryton. The COPYRIGHT file at the top level of
+this repository contains the full copyright notices and license terms. -->
+<form string="Work">
+ <label name="name"/>
+ <field name="name"/>
+ <label name="active"/>
+ <field name="active"/>
+ <label name="parent"/>
+ <field name="parent"/>
+ <label name="timesheet_available"/>
+ <field name="timesheet_available"/>
+ <label name="timesheet_start_date"/>
+ <field name="timesheet_start_date"/>
+ <label name="timesheet_end_date"/>
+ <field name="timesheet_end_date"/>
+ <label name="company"/>
+ <field name="company"/>
+</form>
diff --git a/view/work_graph.xml b/view/work_graph.xml
new file mode 100644
index 0000000..c3531d0
--- /dev/null
+++ b/view/work_graph.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0"?>
+<!-- This file is part of Tryton. The COPYRIGHT file at the top level of
+this repository contains the full copyright notices and license terms. -->
+<graph string="Hours per Work" type="pie">
+ <x>
+ <field name="name"/>
+ </x>
+ <y>
+ <field name="hours" widget="float_time"
+ float_time="company_work_time"/>
+ </y>
+</graph>
diff --git a/view/work_hours_board.xml b/view/work_hours_board.xml
new file mode 100644
index 0000000..3278591
--- /dev/null
+++ b/view/work_hours_board.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0"?>
+<!-- This file is part of Tryton. The COPYRIGHT file at the top level of
+this repository contains the full copyright notices and license terms. -->
+<board string="Hours per Work">
+ <hpaned id="hours_per_work">
+ <child id="tree">
+ <action name="timesheet.act_work_tree2"/>
+ </child>
+ <child id="graph">
+ <action name="timesheet.act_work_form2"/>
+ </child>
+ </hpaned>
+</board>
diff --git a/view/work_list.xml b/view/work_list.xml
new file mode 100644
index 0000000..642ff47
--- /dev/null
+++ b/view/work_list.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<!-- This file is part of Tryton. The COPYRIGHT file at the top level of
+this repository contains the full copyright notices and license terms. -->
+<tree string="Works">
+ <field name="rec_name"/>
+ <field name="name" tree_invisible="1"/>
+ <field name="active" tree_invisible="1"/>
+</tree>
diff --git a/view/work_open_start_form.xml b/view/work_open_start_form.xml
new file mode 100644
index 0000000..8e5e856
--- /dev/null
+++ b/view/work_open_start_form.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0"?>
+<!-- This file is part of Tryton. The COPYRIGHT file at the top level of
+this repository contains the full copyright notices and license terms. -->
+<form string="Hours per Work">
+ <label name="from_date"/>
+ <field name="from_date"/>
+ <label name="to_date"/>
+ <field name="to_date"/>
+</form>
diff --git a/view/work_tree.xml b/view/work_tree.xml
new file mode 100644
index 0000000..81bbe95
--- /dev/null
+++ b/view/work_tree.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0"?>
+<!-- This file is part of Tryton. The COPYRIGHT file at the top level of
+this repository contains the full copyright notices and license terms. -->
+<tree string="Works">
+ <field name="name"/>
+ <field name="timesheet_available"/>
+ <field name="parent" tree_invisible="1"/>
+ <field name="children" tree_invisible="1"/>
+</tree>
diff --git a/view/work_tree2.xml b/view/work_tree2.xml
new file mode 100644
index 0000000..41ff7ea
--- /dev/null
+++ b/view/work_tree2.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0"?>
+<!-- This file is part of Tryton. The COPYRIGHT file at the top level of
+this repository contains the full copyright notices and license terms. -->
+<tree string="Works">
+ <field name="name"/>
+ <field name="hours" widget="float_time" float_time="company_work_time"/>
+</tree>
diff --git a/work.py b/work.py
index cf4ac4d..b90d971 100644
--- a/work.py
+++ b/work.py
@@ -30,6 +30,16 @@ class Work(ModelSQL, ModelView):
'readonly': Bool(Eval('timesheet_lines', [0])),
},
help="Allow to fill in timesheets with this work")
+ timesheet_start_date = fields.Date('Timesheet Start',
+ states={
+ 'invisible': ~Eval('timesheet_available'),
+ },
+ depends=['timesheet_available'])
+ timesheet_end_date = fields.Date('Timesheet End',
+ states={
+ 'invisible': ~Eval('timesheet_available'),
+ },
+ depends=['timesheet_available'])
company = fields.Many2One('company.company', 'Company', required=True,
select=True)
timesheet_lines = fields.One2Many('timesheet.line', 'work',
@@ -43,14 +53,10 @@ class Work(ModelSQL, ModelView):
@classmethod
def __setup__(cls):
super(Work, cls).__setup__()
- cls._constraints += [
- ('check_recursion', 'recursive_works'),
- ('check_parent_company', 'parent_company'),
- ]
cls._error_messages.update({
- 'recursive_works': 'You can not create recursive works!',
- 'parent_company': 'Every work must be in the same company '\
- 'as it\'s parent work!',
+ 'invalid_parent_company': ('Every work must be in the same '
+ 'company as it\'s parent work but "%(child)s" and '
+ '"%(parent)s" are in different companies.'),
})
@staticmethod
@@ -73,10 +79,21 @@ class Work(ModelSQL, ModelView):
def default_company():
return Transaction().context.get('company')
+ @classmethod
+ def validate(cls, works):
+ super(Work, cls).validate(works)
+ cls.check_recursion(works, rec_name='name')
+ for work in works:
+ work.check_parent_company()
+
def check_parent_company(self):
if not self.parent:
- return True
- return self.parent.company == self.company
+ return
+ if self.parent.company != self.company:
+ self.raise_user_error('invalid_parent_company', {
+ 'child': self.rec_name,
+ 'parent': self.parent.rec_name,
+ })
@classmethod
def _tree_qty(cls, hours_by_wt, children, ids, to_compute):
@@ -102,9 +119,9 @@ class Work(ModelSQL, ModelView):
all_ids = [w.id for w in all_works]
# force inactive ids to be in all_ids
all_ids = list(set(all_ids + ids))
- clause = "SELECT work, sum(hours) FROM timesheet_line "\
- "WHERE work IN (%s) "\
- % ",".join(('%s',) * len(all_ids))
+ clause = ("SELECT work, sum(hours) FROM timesheet_line "
+ "WHERE work IN (%s) "
+ % ",".join(('%s',) * len(all_ids)))
date_cond = ""
args = []
if Transaction().context.get('from_date'):
@@ -135,6 +152,21 @@ class Work(ModelSQL, ModelView):
return self.name
@classmethod
+ def search_rec_name(cls, name, clause):
+ if isinstance(clause[2], basestring):
+ values = clause[2].split('\\')
+ values.reverse()
+ domain = []
+ field = 'name'
+ for name in values:
+ domain.append((field, clause[1], name.strip()))
+ field = 'parent.' + field
+ else:
+ domain = [('name',) + tuple(clause[1:])]
+ ids = [w.id for w in cls.search(domain, order=[])]
+ return [('parent', 'child_of', ids)]
+
+ @classmethod
def copy(cls, works, default=None):
if default is None:
default = {}
diff --git a/work.xml b/work.xml
index 90625e4..51a6a99 100644
--- a/work.xml
+++ b/work.xml
@@ -6,52 +6,20 @@ this repository contains the full copyright notices and license terms. -->
<record model="ir.ui.view" id="work_view_form">
<field name="model">timesheet.work</field>
<field name="type">form</field>
- <field name="arch" type="xml">
- <![CDATA[
- <form string="Work">
- <label name="name"/>
- <field name="name"/>
- <label name="active"/>
- <field name="active"/>
- <label name="parent"/>
- <field name="parent"/>
- <label name="timesheet_available"/>
- <field name="timesheet_available"/>
- <label name="company"/>
- <field name="company"/>
- </form>
- ]]>
- </field>
+ <field name="name">work_form</field>
</record>
<record model="ir.ui.view" id="work_view_list">
<field name="model">timesheet.work</field>
<field name="type">tree</field>
<field name="priority" eval="8"/>
- <field name="arch" type="xml">
- <![CDATA[
- <tree string="Works">
- <field name="rec_name"/>
- <field name="name" tree_invisible="1"/>
- <field name="active" tree_invisible="1"/>
- </tree>
- ]]>
- </field>
+ <field name="name">work_list</field>
</record>
<record model="ir.ui.view" id="work_view_tree">
<field name="model">timesheet.work</field>
<field name="type">tree</field>
<field name="priority" eval="16"/>
<field name="field_childs">children</field>
- <field name="arch" type="xml">
- <![CDATA[
- <tree string="Works">
- <field name="name"/>
- <field name="timesheet_available"/>
- <field name="parent" tree_invisible="1"/>
- <field name="children" tree_invisible="1"/>
- </tree>
- ]]>
- </field>
+ <field name="name">work_tree</field>
</record>
<record model="ir.action.act_window" id="act_work_tree">
@@ -98,15 +66,7 @@ this repository contains the full copyright notices and license terms. -->
<field name="type">tree</field>
<field name="priority" eval="16"/>
<field name="field_childs">children</field>
- <field name="arch" type="xml">
- <![CDATA[
- <tree string="Works">
- <field name="name"/>
- <field name="hours" widget="float_time"
- float_time="company_work_time"/>
- </tree>
- ]]>
- </field>
+ <field name="name">work_tree2</field>
</record>
<record model="ir.action.act_window" id="act_work_tree2">
<field name="name">Works</field>
@@ -123,19 +83,7 @@ this repository contains the full copyright notices and license terms. -->
<record model="ir.ui.view" id="work_view_graph">
<field name="model">timesheet.work</field>
<field name="type">graph</field>
- <field name="arch" type="xml">
- <![CDATA[
- <graph string="Hours per Work" type="pie">
- <x>
- <field name="name"/>
- </x>
- <y>
- <field name="hours" widget="float_time"
- float_time="company_work_time"/>
- </y>
- </graph>
- ]]>
- </field>
+ <field name="name">work_graph</field>
</record>
<record model="ir.action.act_window" id="act_work_form2">
<field name="name">Hours per Work</field>
@@ -152,20 +100,7 @@ this repository contains the full copyright notices and license terms. -->
<record model="ir.ui.view" id="work_hours_board">
<field name="type">board</field>
<field name="model"></field>
- <field name="arch" type="xml">
- <![CDATA[
- <board string="Hours per Work">
- <hpaned id="hours_per_work">
- <child id="tree">
- <action name="timesheet.act_work_tree2"/>
- </child>
- <child id="graph">
- <action name="timesheet.act_work_form2"/>
- </child>
- </hpaned>
- </board>
- ]]>
- </field>
+ <field name="name">work_hours_board</field>
</record>
<record model="ir.action.act_window" id="act_work_hours_board">
<field name="name">Hours per Work</field>
@@ -180,16 +115,7 @@ this repository contains the full copyright notices and license terms. -->
<record model="ir.ui.view" id="work_open_start_view_form">
<field name="model">timesheet.work.open.start</field>
<field name="type">form</field>
- <field name="arch" type="xml">
- <![CDATA[
- <form string="Hours per Work">
- <label name="from_date"/>
- <field name="from_date"/>
- <label name="to_date"/>
- <field name="to_date"/>
- </form>
- ]]>
- </field>
+ <field name="name">work_open_start_form</field>
</record>
<record model="ir.action.wizard" id="act_open_work">
@@ -243,10 +169,7 @@ this repository contains the full copyright notices and license terms. -->
<field name="default_p" eval="True"/>
</record>
<record model="ir.rule" id="rule_work1">
- <field name="field" search="[('name', '=', 'company'),
- ('model.model', '=', 'timesheet.work')]"/>
- <field name="operator">=</field>
- <field name="operand">User/Current Company</field>
+ <field name="domain">[('company', '=', user.company.id if user.company else None)]</field>
<field name="rule_group" ref="rule_group_work"/>
</record>
<record model="ir.rule.group" id="rule_group_work_admin">
@@ -259,6 +182,5 @@ this repository contains the full copyright notices and license terms. -->
<field name="rule_group" ref="rule_group_work_admin"/>
<field name="group" ref="group_timesheet_admin"/>
</record>
-
</data>
</tryton>
commit ccb664422eb534e56ca68d54583b8a90623d9530
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Tue Oct 23 19:54:04 2012 +0200
Adding upstream version 2.6.0.
diff --git a/CHANGELOG b/CHANGELOG
index c079ded..1a6ae6e 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,4 +1,4 @@
-Version 2.4.1 - 2012-09-01
+Version 2.6.0 - 2012-10-22
* Bug fixes (see mercurial logs for details)
Version 2.4.0 - 2012-04-24
diff --git a/MANIFEST.in b/MANIFEST.in
index 32879df..97a9596 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -4,6 +4,7 @@ include TODO
include COPYRIGHT
include CHANGELOG
include LICENSE
+include tryton.cfg
include *.xml
include *.odt
include locale/*.po
diff --git a/PKG-INFO b/PKG-INFO
index b14687c..d6c4330 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,21 +1,48 @@
Metadata-Version: 1.0
Name: trytond_timesheet
-Version: 2.4.1
-Summary: Timesheet Module with:
- - Work
- - Timesheet line
-
-And with reports:
- - Hours per work
- - Hours per employee per week
- - Hours per employee per month
-
+Version: 2.6.0
+Summary: Tryton module with timesheets
Home-page: http://www.tryton.org/
-Author: B2CK
-Author-email: info at b2ck.com
+Author: Tryton
+Author-email: UNKNOWN
License: GPL-3
-Download-URL: http://downloads.tryton.org/2.4/
-Description: UNKNOWN
+Download-URL: http://downloads.tryton.org/2.6/
+Description: trytond_timesheet
+ =================
+
+ The timesheet module of the Tryton application platform.
+
+ Installing
+ ----------
+
+ See INSTALL
+
+ Support
+ -------
+
+ If you encounter any problems with Tryton, please don't hesitate to ask
+ questions on the Tryton bug tracker, mailing list, wiki or IRC channel:
+
+ http://bugs.tryton.org/
+ http://groups.tryton.org/
+ http://wiki.tryton.org/
+ irc://irc.freenode.net/tryton
+
+ License
+ -------
+
+ See LICENSE
+
+ Copyright
+ ---------
+
+ See COPYRIGHT
+
+
+ For more information please visit the Tryton web site:
+
+ http://www.tryton.org/
+
Platform: UNKNOWN
Classifier: Development Status :: 5 - Production/Stable
Classifier: Environment :: Plugins
diff --git a/README b/README
index edcd014..914dda1 100644
--- a/README
+++ b/README
@@ -2,7 +2,6 @@ trytond_timesheet
=================
The timesheet module of the Tryton application platform.
-See __tryton__.py
Installing
----------
diff --git a/__init__.py b/__init__.py
index f02d94e..d5d56ac 100644
--- a/__init__.py
+++ b/__init__.py
@@ -1,5 +1,26 @@
#This file is part of Tryton. The COPYRIGHT file at the top level of
#this repository contains the full copyright notices and license terms.
+from trytond.pool import Pool
from .work import *
from .line import *
+
+
+def register():
+ Pool.register(
+ Work,
+ OpenWorkStart,
+ Line,
+ EnterLinesStart,
+ HoursEmployee,
+ OpenHoursEmployeeStart,
+ HoursEmployeeWeekly,
+ HoursEmployeeMonthly,
+ module='timesheet', type_='model')
+ Pool.register(
+ OpenWork,
+ OpenWork2,
+ OpenWorkGraph,
+ EnterLines,
+ OpenHoursEmployee,
+ module='timesheet', type_='wizard')
diff --git a/__tryton__.py b/__tryton__.py
deleted file mode 100644
index c58ff4a..0000000
--- a/__tryton__.py
+++ /dev/null
@@ -1,121 +0,0 @@
-#This file is part of Tryton. The COPYRIGHT file at the top level of
-#this repository contains the full copyright notices and license terms.
-{
- 'name': 'Timesheet',
- 'name_bg_BG': 'График',
- 'name_ca_ES': 'Fulls de treball',
- 'name_de_DE': 'Zeiterfassung',
- 'name_es_AR': 'Partes de trabajo',
- 'name_es_CO': 'Hoja de Asistencia',
- 'name_es_ES': 'Partes de trabajo',
- 'name_fr_FR': 'Feuille de présence',
- 'name_nl_NL': 'Tijdregistratie',
- 'version': '2.4.1',
- 'author': 'B2CK',
- 'email': 'info at b2ck.com',
- 'website': 'http://www.tryton.org/',
- 'description': '''Timesheet Module with:
- - Work
- - Timesheet line
-
-And with reports:
- - Hours per work
- - Hours per employee per week
- - Hours per employee per month
-''',
- 'description_bg_BG': '''Модул за график с:
- - Задачи
- - Редове от график
-
-Прилежащи справки:
- - Часове за задача
- - Часове по служител за седмица
- - Часове по служител за месец
-''',
- 'description_ca_ES': '''Mòdul de fulls de treball amb:
- - Feines o tasques
- - Línies de fulls de treball
-
-I els informes:
- - Hores per tasca
- - Hores per empleat i setmana
- - Hores per empleat i mes
-''',
- 'description_de_DE': '''Zeiterfassungsmodul mit:
- - Aufgaben
- - Zeitpositionen
-
-Zugehörige Berichte:
- - Stunden pro Aufgabe
- - Stunden pro Mitarbeiter pro Woche
- - Stunden pro Mitarbeiter pro Monat
-''',
- 'description_es_AR': '''Módulo de partes de trabajo con:
- - Trabajo
- - Línea de parte parte de trabajo
-
-Y con informes:
- - Horas por trabajo
- - Horas por empleado y semana
- - Horas por empleado y mes
-''',
- 'description_es_CO': '''Módulo de Hoja de Asistencia con:
- - Trabajo
- - Líneas de tiempo laborado
-
-Y con reportes de:
- - Horas por semana
- - Horas por empleado por semana
- - Horas por empleado por mes
-''',
- 'description_es_ES': '''Módulo de partes de trabajo con:
- - Trabajos o tareas
- - Líneas de parte de trabajo
-
-Y con informes:
- - Horas por trabajo
- - Horas por empleado y semana
- - Horas por empleado y mes
-''',
- 'description_fr_FR': '''Module feuille de présence, avec:
- - Tâche
- - Ligne de feuille de présence
-
-Et les rapports:
- - Heures par tâche
- - Heures par employé par semaine
- - Heures par employé par mois
-''',
- 'description_nl_NL': '''Tijdverantwoordingmodule met:
- - Werken
- - Tijdboekingen
-
-Bijbehorende rapporten:
- - Uren per werk
- - Uren per werknemer per week
- - Uren per werknemer per maand
-''',
- 'depends': [
- 'ir',
- 'res',
- 'company',
- 'company_work_time',
- ],
- 'xml': [
- 'timesheet.xml',
- 'work.xml',
- 'line.xml',
- ],
- 'translation': [
- 'locale/cs_CZ.po',
- 'locale/bg_BG.po',
- 'locale/ca_ES.po',
- 'locale/de_DE.po',
- 'locale/es_AR.po',
- 'locale/es_CO.po',
- 'locale/es_ES.po',
- 'locale/fr_FR.po',
- 'locale/nl_NL.po',
- 'locale/ru_RU.po',
- ],
-}
diff --git a/line.py b/line.py
index 8af964c..1b32308 100644
--- a/line.py
+++ b/line.py
@@ -7,12 +7,15 @@ from trytond.pyson import Eval, PYSONEncoder, Date, Get
from trytond.transaction import Transaction
from trytond.pool import Pool
+__all__ = ['Line', 'EnterLinesStart', 'EnterLines',
+ 'HoursEmployee',
+ 'OpenHoursEmployeeStart', 'OpenHoursEmployee',
+ 'HoursEmployeeWeekly', 'HoursEmployeeMonthly']
+
class Line(ModelSQL, ModelView):
'Timesheet Line'
- _name = 'timesheet.line'
- _description = __doc__
-
+ __name__ = 'timesheet.line'
employee = fields.Many2One('company.employee', 'Employee', required=True,
select=True, domain=[
('company', '=', Get(Eval('context', {}), 'company')),
@@ -21,67 +24,66 @@ class Line(ModelSQL, ModelView):
hours = fields.Float('Hours', digits=(16, 2), required=True)
work = fields.Many2One('timesheet.work', 'Work',
required=True, select=True, domain=[
- ('timesheet_available', '=', 'True'),
+ ('timesheet_available', '=', True),
])
description = fields.Char('Description')
- def __init__(self):
- super(Line, self).__init__()
- self._sql_constraints += [
+ @classmethod
+ def __setup__(cls):
+ super(Line, cls).__setup__()
+ cls._sql_constraints += [
('check_move_hours_pos',
'CHECK(hours >= 0.0)', 'Hours field must be positive'),
]
- def default_employee(self):
- user_obj = Pool().get('res.user')
+ @staticmethod
+ def default_employee():
+ User = Pool().get('res.user')
employee_id = None
if Transaction().context.get('employee'):
employee_id = Transaction().context['employee']
else:
- user = user_obj.browse(Transaction().user)
+ user = User(Transaction().user)
if user.employee:
employee_id = user.employee.id
if employee_id:
return employee_id
- def default_date(self):
- date_obj = Pool().get('ir.date')
+ @staticmethod
+ def default_date():
+ Date_ = Pool().get('ir.date')
+ return Transaction().context.get('date') or Date_.today()
- return Transaction().context.get('date') or date_obj.today()
-
- def view_header_get(self, value, view_type='form'):
+ @classmethod
+ def view_header_get(cls, value, view_type='form'):
if not Transaction().context.get('employee'):
return value
- employee_obj = Pool().get('company.employee')
- employee = employee_obj.browse(Transaction().context['employee'])
+ Employee = Pool().get('company.employee')
+ employee = Employee(Transaction().context['employee'])
return value + " (" + employee.name + ")"
-Line()
-
class EnterLinesStart(ModelView):
'Enter Lines'
- _name = 'timesheet.line.enter.start'
- _description = __doc__
+ __name__ = 'timesheet.line.enter.start'
employee = fields.Many2One('company.employee', 'Employee', required=True,
domain=[('company', '=', Get(Eval('context', {}), 'company'))])
date = fields.Date('Date', required=True)
- def default_employee(self):
- line_obj = Pool().get('timesheet.line')
- return line_obj.default_employee()
+ @staticmethod
+ def default_employee():
+ Line = Pool().get('timesheet.line')
+ return Line.default_employee()
- def default_date(self):
- line_obj = Pool().get('timesheet.line')
- return line_obj.default_date()
-
-EnterLinesStart()
+ @staticmethod
+ def default_date():
+ Line = Pool().get('timesheet.line')
+ return Line.default_date()
class EnterLines(Wizard):
'Enter Lines'
- _name = 'timesheet.line.enter'
-
+ __name__ = 'timesheet.line.enter'
start = StateView('timesheet.line.enter.start',
'timesheet.line_enter_start_view_form', [
Button('Cancel', 'end', 'tryton-cancel'),
@@ -89,35 +91,32 @@ class EnterLines(Wizard):
])
enter = StateAction('timesheet.act_line_form')
- def do_enter(self, session, action):
- date = session.start.date
+ def do_enter(self, action):
+ date = self.start.date
date = Date(date.year, date.month, date.day)
action['pyson_domain'] = PYSONEncoder().encode([
- ('employee', '=', session.start.employee.id),
+ ('employee', '=', self.start.employee.id),
('date', '=', date),
])
action['pyson_context'] = PYSONEncoder().encode({
- 'employee': session.start.employee.id,
+ 'employee': self.start.employee.id,
'date': date,
})
- action['name'] += " - " + session.start.employee.rec_name
+ action['name'] += " - " + self.start.employee.rec_name
return action, {}
- def transition_enter(self, session):
+ def transition_enter(self):
return 'end'
-EnterLines()
-
class HoursEmployee(ModelSQL, ModelView):
'Hours per Employee'
- _name = 'timesheet.hours_employee'
- _description = __doc__
-
+ __name__ = 'timesheet.hours_employee'
employee = fields.Many2One('company.employee', 'Employee', select=True)
hours = fields.Float('Hours', digits=(16, 2))
- def table_query(self):
+ @staticmethod
+ def table_query():
clause = ' '
args = [True]
if Transaction().context.get('start_date'):
@@ -138,23 +137,17 @@ class HoursEmployee(ModelSQL, ModelView):
+ clause + \
'GROUP BY employee', args)
-HoursEmployee()
-
class OpenHoursEmployeeStart(ModelView):
'Open Hours per Employee'
- _name = 'timesheet.hours_employee.open.start'
- _description = __doc__
+ __name__ = 'timesheet.hours_employee.open.start'
start_date = fields.Date('Start Date')
end_date = fields.Date('End Date')
-OpenHoursEmployeeStart()
-
class OpenHoursEmployee(Wizard):
'Open Hours per Employee'
- _name = 'timesheet.hours_employee.open'
-
+ __name__ = 'timesheet.hours_employee.open'
start = StateView('timesheet.hours_employee.open.start',
'timesheet.hours_employee_open_start_view_form', [
Button('Cancel', 'end', 'tryton-cancel'),
@@ -162,37 +155,35 @@ class OpenHoursEmployee(Wizard):
])
open_ = StateAction('timesheet.act_hours_employee_form')
- def do_open_(self, session, action):
+ def do_open_(self, action):
action['pyson_context'] = PYSONEncoder().encode({
- 'start_date': session.start.start_date,
- 'end_date': session.start.end_date,
+ 'start_date': self.start.start_date,
+ 'end_date': self.start.end_date,
})
return action, {}
- def transition_open_(self, session):
+ def transition_open_(self):
return 'end'
-OpenHoursEmployee()
-
class HoursEmployeeWeekly(ModelSQL, ModelView):
'Hours per Employee per Week'
- _name = 'timesheet.hours_employee_weekly'
- _description = __doc__
-
+ __name__ = 'timesheet.hours_employee_weekly'
year = fields.Char('Year', select=True)
week = fields.Integer('Week', select=True)
employee = fields.Many2One('company.employee', 'Employee', select=True)
hours = fields.Float('Hours', digits=(16, 2), select=True)
- def __init__(self):
- super(HoursEmployeeWeekly, self).__init__()
- self._order.insert(0, ('year', 'DESC'))
- self._order.insert(1, ('week', 'DESC'))
- self._order.insert(2, ('employee', 'ASC'))
+ @classmethod
+ def __setup__(cls):
+ super(HoursEmployeeWeekly, cls).__setup__()
+ cls._order.insert(0, ('year', 'DESC'))
+ cls._order.insert(1, ('week', 'DESC'))
+ cls._order.insert(2, ('employee', 'ASC'))
- def table_query(self):
- type_name = FIELDS[self.year._type].sql_type(self.year)[0]
+ @classmethod
+ def table_query(cls):
+ type_name = FIELDS[cls.year._type].sql_type(cls.year)[0]
return ('SELECT id, create_uid, create_date, write_uid, write_date, ' \
'CAST(year AS ' + type_name + ') AS year, week, ' \
'employee, hours ' \
@@ -208,29 +199,27 @@ class HoursEmployeeWeekly(ModelSQL, ModelView):
'EXTRACT(WEEK FROM date) AS week, employee, ' \
'SUM(COALESCE(hours, 0)) AS hours ' \
'FROM timesheet_line ' \
- 'GROUP BY year, week, employee) AS ' + self._table, [])
-
-HoursEmployeeWeekly()
+ 'GROUP BY year, week, employee) AS ' + cls._table, [])
class HoursEmployeeMonthly(ModelSQL, ModelView):
'Hours per Employee per Month'
- _name = 'timesheet.hours_employee_monthly'
- _description = __doc__
-
+ __name__ = 'timesheet.hours_employee_monthly'
year = fields.Char('Year', select=True)
month = fields.Integer('Month', select=True)
employee = fields.Many2One('company.employee', 'Employee', select=True)
hours = fields.Float('Hours', digits=(16, 2), select=True)
- def __init__(self):
- super(HoursEmployeeMonthly, self).__init__()
- self._order.insert(0, ('year', 'DESC'))
- self._order.insert(1, ('month', 'DESC'))
- self._order.insert(2, ('employee', 'ASC'))
+ @classmethod
+ def __setup__(cls):
+ super(HoursEmployeeMonthly, cls).__setup__()
+ cls._order.insert(0, ('year', 'DESC'))
+ cls._order.insert(1, ('month', 'DESC'))
+ cls._order.insert(2, ('employee', 'ASC'))
- def table_query(self):
- type_name = FIELDS[self.year._type].sql_type(self.year)[0]
+ @classmethod
+ def table_query(cls):
+ type_name = FIELDS[cls.year._type].sql_type(cls.year)[0]
return ('SELECT id, create_uid, create_date, write_uid, write_date, ' \
'CAST(year AS ' + type_name + ') AS year, month, ' \
'employee, hours ' \
@@ -246,6 +235,4 @@ class HoursEmployeeMonthly(ModelSQL, ModelView):
'EXTRACT(MONTH FROM date) AS month, employee, ' \
'SUM(COALESCE(hours, 0)) AS hours ' \
'FROM timesheet_line ' \
- 'GROUP BY year, month, employee) AS ' + self._table, [])
-
-HoursEmployeeMonthly()
+ 'GROUP BY year, month, employee) AS ' + cls._table, [])
diff --git a/line.xml b/line.xml
index 7c874f6..8cd92c7 100644
--- a/line.xml
+++ b/line.xml
@@ -67,7 +67,7 @@ this repository contains the full copyright notices and license terms. -->
<record model="ir.rule" id="rule_line1">
<field name="field" search="[('name', '=', 'employee'), ('model.model', '=', 'timesheet.line')]"/>
<field name="operator">=</field>
- <field name="operand">User/Employee</field>
+ <field name="operand">User/Current Employee</field>
<field name="rule_group" ref="rule_group_line"/>
</record>
<record model="ir.rule.group" id="rule_group_line_admin">
@@ -158,7 +158,7 @@ this repository contains the full copyright notices and license terms. -->
<record model="ir.rule" id="rule_hours_employee1">
<field name="field" search="[('name', '=', 'employee'), ('model.model', '=', 'timesheet.hours_employee')]"/>
<field name="operator">=</field>
- <field name="operand">User/Employee</field>
+ <field name="operand">User/Current Employee</field>
<field name="rule_group" ref="rule_group_hours_employee"/>
</record>
<record model="ir.rule.group" id="rule_group_hours_employee_admin">
diff --git a/locale/bg_BG.po b/locale/bg_BG.po
index 06a3b8d..3cb0af5 100644
--- a/locale/bg_BG.po
+++ b/locale/bg_BG.po
@@ -201,7 +201,7 @@ msgstr "Активен"
msgctxt "field:timesheet.work,children:"
msgid "Children"
-msgstr "Деца"
+msgstr "Наследници"
msgctxt "field:timesheet.work,company:"
msgid "Company"
@@ -389,7 +389,7 @@ msgstr "Часове на служител"
msgctxt "model:timesheet.hours_employee.open.start,name:"
msgid "Open Hours per Employee"
-msgstr ""
+msgstr "Работно време на служител"
msgctxt "model:timesheet.hours_employee_monthly,name:"
msgid "Hours per Employee per Month"
@@ -413,7 +413,7 @@ msgstr "Задача"
msgctxt "model:timesheet.work.open.start,name:"
msgid "Open Work"
-msgstr ""
+msgstr "Отваряне на задача"
msgctxt "view:timesheet.hours_employee.open.start:"
msgid "Hours per Employee"
diff --git a/locale/ca_ES.po b/locale/ca_ES.po
index e55d4a4..19a021c 100644
--- a/locale/ca_ES.po
+++ b/locale/ca_ES.po
@@ -8,20 +8,20 @@ msgstr "El camp d'hores ha de ser positiu"
msgctxt "error:timesheet.work:"
msgid "Every work must be in the same company as it's parent work!"
-msgstr "Cada treball ha d'estar en la mateixa empresa que el seu treball pare"
+msgstr ""
+"Cada treball ha d'estar en la mateixa empresa que el seu treball pare."
msgctxt "error:timesheet.work:"
msgid "You can not create recursive works!"
-msgstr "No pot crear treballs recursius"
+msgstr "No pot crear treballs recursius."
msgctxt "field:timesheet.hours_employee,create_date:"
msgid "Create Date"
-msgstr ""
+msgstr "Data creació"
-#, fuzzy
msgctxt "field:timesheet.hours_employee,create_uid:"
msgid "Create User"
-msgstr "Crear usuari"
+msgstr "Usuari creació"
msgctxt "field:timesheet.hours_employee,employee:"
msgid "Employee"
@@ -33,7 +33,7 @@ msgstr "Hores"
msgctxt "field:timesheet.hours_employee,id:"
msgid "ID"
-msgstr ""
+msgstr "ID"
msgctxt "field:timesheet.hours_employee,rec_name:"
msgid "Name"
@@ -41,34 +41,31 @@ msgstr "Nom"
msgctxt "field:timesheet.hours_employee,write_date:"
msgid "Write Date"
-msgstr ""
+msgstr "Data modificació"
msgctxt "field:timesheet.hours_employee,write_uid:"
msgid "Write User"
-msgstr ""
+msgstr "Usuari modificació"
-#, fuzzy
msgctxt "field:timesheet.hours_employee.open.start,end_date:"
msgid "End Date"
msgstr "Data final"
msgctxt "field:timesheet.hours_employee.open.start,id:"
msgid "ID"
-msgstr ""
+msgstr "ID"
-#, fuzzy
msgctxt "field:timesheet.hours_employee.open.start,start_date:"
msgid "Start Date"
msgstr "Data inici"
msgctxt "field:timesheet.hours_employee_monthly,create_date:"
msgid "Create Date"
-msgstr ""
+msgstr "Data creació"
-#, fuzzy
msgctxt "field:timesheet.hours_employee_monthly,create_uid:"
msgid "Create User"
-msgstr "Crear usuari"
+msgstr "Usuari creació"
msgctxt "field:timesheet.hours_employee_monthly,employee:"
msgid "Employee"
@@ -80,7 +77,7 @@ msgstr "Hores"
msgctxt "field:timesheet.hours_employee_monthly,id:"
msgid "ID"
-msgstr ""
+msgstr "ID"
msgctxt "field:timesheet.hours_employee_monthly,month:"
msgid "Month"
@@ -92,11 +89,11 @@ msgstr "Nom"
msgctxt "field:timesheet.hours_employee_monthly,write_date:"
msgid "Write Date"
-msgstr ""
+msgstr "Data modificació"
msgctxt "field:timesheet.hours_employee_monthly,write_uid:"
msgid "Write User"
-msgstr ""
+msgstr "Usuari modificació"
msgctxt "field:timesheet.hours_employee_monthly,year:"
msgid "Year"
@@ -104,12 +101,11 @@ msgstr "Any"
msgctxt "field:timesheet.hours_employee_weekly,create_date:"
msgid "Create Date"
-msgstr ""
+msgstr "Data creació"
-#, fuzzy
msgctxt "field:timesheet.hours_employee_weekly,create_uid:"
msgid "Create User"
-msgstr "Crear usuari"
+msgstr "Usuari creació"
msgctxt "field:timesheet.hours_employee_weekly,employee:"
msgid "Employee"
@@ -121,7 +117,7 @@ msgstr "Hores"
msgctxt "field:timesheet.hours_employee_weekly,id:"
msgid "ID"
-msgstr ""
+msgstr "ID"
msgctxt "field:timesheet.hours_employee_weekly,rec_name:"
msgid "Name"
@@ -133,11 +129,11 @@ msgstr "Setmana"
msgctxt "field:timesheet.hours_employee_weekly,write_date:"
msgid "Write Date"
-msgstr ""
+msgstr "Data modificació"
msgctxt "field:timesheet.hours_employee_weekly,write_uid:"
msgid "Write User"
-msgstr ""
+msgstr "Usuari modificació"
msgctxt "field:timesheet.hours_employee_weekly,year:"
msgid "Year"
@@ -145,12 +141,11 @@ msgstr "Any"
msgctxt "field:timesheet.line,create_date:"
msgid "Create Date"
-msgstr ""
+msgstr "Data creació"
-#, fuzzy
msgctxt "field:timesheet.line,create_uid:"
msgid "Create User"
-msgstr "Crear usuari"
+msgstr "Usuari creació"
msgctxt "field:timesheet.line,date:"
msgid "Date"
@@ -170,7 +165,7 @@ msgstr "Hores"
msgctxt "field:timesheet.line,id:"
msgid "ID"
-msgstr ""
+msgstr "ID"
msgctxt "field:timesheet.line,rec_name:"
msgid "Name"
@@ -182,25 +177,23 @@ msgstr "Treball"
msgctxt "field:timesheet.line,write_date:"
msgid "Write Date"
-msgstr ""
+msgstr "Data modificació"
msgctxt "field:timesheet.line,write_uid:"
msgid "Write User"
-msgstr ""
+msgstr "Usuari modificació"
-#, fuzzy
msgctxt "field:timesheet.line.enter.start,date:"
msgid "Date"
msgstr "Data"
-#, fuzzy
msgctxt "field:timesheet.line.enter.start,employee:"
msgid "Employee"
msgstr "Empleat"
msgctxt "field:timesheet.line.enter.start,id:"
msgid "ID"
-msgstr ""
+msgstr "ID"
msgctxt "field:timesheet.work,active:"
msgid "Active"
@@ -216,12 +209,11 @@ msgstr "Empresa"
msgctxt "field:timesheet.work,create_date:"
msgid "Create Date"
-msgstr ""
+msgstr "Data creació"
-#, fuzzy
msgctxt "field:timesheet.work,create_uid:"
msgid "Create User"
-msgstr "Crear usuari"
+msgstr "Usuari creació"
msgctxt "field:timesheet.work,hours:"
msgid "Timesheet Hours"
@@ -229,7 +221,7 @@ msgstr "Hores del full de treball"
msgctxt "field:timesheet.work,id:"
msgid "ID"
-msgstr ""
+msgstr "ID"
msgctxt "field:timesheet.work,left:"
msgid "Left"
@@ -255,28 +247,27 @@ msgctxt "field:timesheet.work,timesheet_available:"
msgid "Available on timesheets"
msgstr "Disponible en fulls de treball"
+#, fuzzy
msgctxt "field:timesheet.work,timesheet_lines:"
msgid ""
-msgstr ""
+msgstr "Servidor"
msgctxt "field:timesheet.work,write_date:"
msgid "Write Date"
-msgstr ""
+msgstr "Data modificació"
msgctxt "field:timesheet.work,write_uid:"
msgid "Write User"
-msgstr ""
+msgstr "Usuari modificació"
-#, fuzzy
msgctxt "field:timesheet.work.open.start,from_date:"
msgid "From Date"
msgstr "Des de la data"
msgctxt "field:timesheet.work.open.start,id:"
msgid "ID"
-msgstr ""
+msgstr "ID"
-#, fuzzy
msgctxt "field:timesheet.work.open.start,to_date:"
msgid "To Date"
msgstr "Fins a la data"
@@ -287,7 +278,7 @@ msgstr "Temps total empleat en aquest treball"
msgctxt "help:timesheet.work,timesheet_available:"
msgid "Allow to fill in timesheets with this work"
-msgstr "Permet completar fullsde treball amb aquest treball"
+msgstr "Permet completar fullsde treball amb aquest treball."
msgctxt "model:ir.action,name:act_hours_employee_form"
msgid "Hours per Employee"
@@ -297,7 +288,6 @@ msgctxt "model:ir.action,name:act_hours_employee_monthly_form"
msgid "Hours per Employee per Month"
msgstr "Hores per empleat i mes"
-#, fuzzy
msgctxt "model:ir.action,name:act_hours_employee_open"
msgid "Hours per Employee"
msgstr "Hores per empleat"
@@ -308,7 +298,7 @@ msgstr "Hores per empleat i setmana"
msgctxt "model:ir.action,name:act_line_enter"
msgid "Enter Timesheet"
-msgstr ""
+msgstr "Afegeix full de treball"
msgctxt "model:ir.action,name:act_line_form"
msgid "Timesheet Lines"
@@ -330,12 +320,10 @@ msgctxt "model:ir.action,name:act_work_form3"
msgid "Hours per Work"
msgstr "Hores per treball"
-#, fuzzy
msgctxt "model:ir.action,name:act_work_hours_board"
msgid "Hours per Work"
msgstr "Hores per treball"
-#, fuzzy
msgctxt "model:ir.action,name:act_work_list"
msgid "Works"
msgstr "Treballs"
@@ -352,24 +340,21 @@ msgctxt "model:ir.ui.menu,name:menu_configuration"
msgid "Configuration"
msgstr "Configuració"
-#, fuzzy
msgctxt "model:ir.ui.menu,name:menu_hours_employee_open"
msgid "Hours per Employee"
msgstr "Hores per empleat"
-#, fuzzy
msgctxt "model:ir.ui.menu,name:menu_hours_employee_open_monthly"
msgid "Hours per Employee per Month"
msgstr "Hores per empleat i mes"
-#, fuzzy
msgctxt "model:ir.ui.menu,name:menu_hours_employee_open_weekly"
msgid "Hours per Employee per Week"
msgstr "Hores per empleat i setmana"
msgctxt "model:ir.ui.menu,name:menu_line_enter"
msgid "Enter Timesheet"
-msgstr ""
+msgstr "Afegeix full de treball"
msgctxt "model:ir.ui.menu,name:menu_line_form"
msgid "Timesheet Lines"
@@ -379,12 +364,10 @@ msgctxt "model:ir.ui.menu,name:menu_reporting"
msgid "Reporting"
msgstr "Informes"
-#, fuzzy
msgctxt "model:ir.ui.menu,name:menu_timesheet"
msgid "Timesheet"
-msgstr "Gestió de fulls de treball"
+msgstr "Fulls de treball"
-#, fuzzy
msgctxt "model:ir.ui.menu,name:menu_work_list"
msgid "Works"
msgstr "Treballs"
@@ -407,7 +390,7 @@ msgstr "Hores per empleat"
msgctxt "model:timesheet.hours_employee.open.start,name:"
msgid "Open Hours per Employee"
-msgstr ""
+msgstr "Obrir hores per empleat"
msgctxt "model:timesheet.hours_employee_monthly,name:"
msgid "Hours per Employee per Month"
@@ -423,7 +406,7 @@ msgstr "Línia de full de treball"
msgctxt "model:timesheet.line.enter.start,name:"
msgid "Enter Lines"
-msgstr ""
+msgstr "Afegir línies"
msgctxt "model:timesheet.work,name:"
msgid "Work"
@@ -431,9 +414,8 @@ msgstr "Treball"
msgctxt "model:timesheet.work.open.start,name:"
msgid "Open Work"
-msgstr ""
+msgstr "Obrir treball"
-#, fuzzy
msgctxt "view:timesheet.hours_employee.open.start:"
msgid "Hours per Employee"
msgstr "Hores per empleat"
@@ -456,7 +438,7 @@ msgstr "Hores per empleat i setmana"
msgctxt "view:timesheet.line.enter.start:"
msgid "Enter Timesheet"
-msgstr ""
+msgstr "Afegir part de treball"
msgctxt "view:timesheet.line:"
msgid "Hours"
@@ -470,7 +452,6 @@ msgctxt "view:timesheet.line:"
msgid "Timesheet Lines"
msgstr "Línies de full de treball"
-#, fuzzy
msgctxt "view:timesheet.work.open.start:"
msgid "Hours per Work"
msgstr "Hores per treball"
@@ -487,41 +468,34 @@ msgctxt "view:timesheet.work:"
msgid "Works"
msgstr "Treballs"
-#, fuzzy
msgctxt "wizard_button:timesheet.hours_employee.open,start,end:"
msgid "Cancel"
-msgstr "Cancel·lar"
+msgstr "Cancel·la"
-#, fuzzy
msgctxt "wizard_button:timesheet.hours_employee.open,start,open_:"
msgid "Open"
-msgstr "Obrir"
+msgstr "Obre"
-#, fuzzy
msgctxt "wizard_button:timesheet.line.enter,start,end:"
msgid "Cancel"
-msgstr "Cancel·lar"
+msgstr "Cancel·la"
msgctxt "wizard_button:timesheet.line.enter,start,enter:"
msgid "Enter"
-msgstr ""
+msgstr "Afegeix"
-#, fuzzy
msgctxt "wizard_button:timesheet.work.open,start,end:"
msgid "Cancel"
-msgstr "Cancel·lar"
+msgstr "Cancel·la"
-#, fuzzy
msgctxt "wizard_button:timesheet.work.open,start,open_:"
msgid "Open"
-msgstr "Obrir"
+msgstr "Obre"
-#, fuzzy
msgctxt "wizard_button:timesheet.work.open2,start,end:"
msgid "Cancel"
-msgstr "Cancel·lar"
+msgstr "Cancel·la"
-#, fuzzy
msgctxt "wizard_button:timesheet.work.open2,start,open_:"
msgid "Open"
-msgstr "Obrir"
+msgstr "Obre"
diff --git a/locale/es_CO.po b/locale/es_CO.po
index 4f5b9a5..63470a2 100644
--- a/locale/es_CO.po
+++ b/locale/es_CO.po
@@ -18,9 +18,8 @@ msgstr "No puede crear trabajos recursivos!"
msgctxt "field:timesheet.hours_employee,create_date:"
msgid "Create Date"
-msgstr ""
+msgstr "Fecha de Creación"
-#, fuzzy
msgctxt "field:timesheet.hours_employee,create_uid:"
msgid "Create User"
msgstr "Crear usuario"
@@ -35,7 +34,7 @@ msgstr "Horas"
msgctxt "field:timesheet.hours_employee,id:"
msgid "ID"
-msgstr ""
+msgstr "ID"
msgctxt "field:timesheet.hours_employee,rec_name:"
msgid "Name"
@@ -43,31 +42,28 @@ msgstr "Nombre"
msgctxt "field:timesheet.hours_employee,write_date:"
msgid "Write Date"
-msgstr ""
+msgstr "Fecha modificación"
msgctxt "field:timesheet.hours_employee,write_uid:"
msgid "Write User"
-msgstr ""
+msgstr "Usuario modificación"
-#, fuzzy
msgctxt "field:timesheet.hours_employee.open.start,end_date:"
msgid "End Date"
msgstr "Fecha Final"
msgctxt "field:timesheet.hours_employee.open.start,id:"
msgid "ID"
-msgstr ""
+msgstr "ID"
-#, fuzzy
msgctxt "field:timesheet.hours_employee.open.start,start_date:"
msgid "Start Date"
msgstr "Fecha Inicio"
msgctxt "field:timesheet.hours_employee_monthly,create_date:"
msgid "Create Date"
-msgstr ""
+msgstr "Fecha de Creación"
-#, fuzzy
msgctxt "field:timesheet.hours_employee_monthly,create_uid:"
msgid "Create User"
msgstr "Crear usuario"
@@ -82,7 +78,7 @@ msgstr "Horas"
msgctxt "field:timesheet.hours_employee_monthly,id:"
msgid "ID"
-msgstr ""
+msgstr "ID"
msgctxt "field:timesheet.hours_employee_monthly,month:"
msgid "Month"
@@ -94,11 +90,11 @@ msgstr "Nombre"
msgctxt "field:timesheet.hours_employee_monthly,write_date:"
msgid "Write Date"
-msgstr ""
+msgstr "Fecha modificación"
msgctxt "field:timesheet.hours_employee_monthly,write_uid:"
msgid "Write User"
-msgstr ""
+msgstr "Usuario modificación"
msgctxt "field:timesheet.hours_employee_monthly,year:"
msgid "Year"
@@ -106,9 +102,8 @@ msgstr "Año"
msgctxt "field:timesheet.hours_employee_weekly,create_date:"
msgid "Create Date"
-msgstr ""
+msgstr "Fecha de Creación"
-#, fuzzy
msgctxt "field:timesheet.hours_employee_weekly,create_uid:"
msgid "Create User"
msgstr "Crear usuario"
@@ -123,7 +118,7 @@ msgstr "Horas"
msgctxt "field:timesheet.hours_employee_weekly,id:"
msgid "ID"
-msgstr ""
+msgstr "ID"
msgctxt "field:timesheet.hours_employee_weekly,rec_name:"
msgid "Name"
@@ -135,11 +130,11 @@ msgstr "Semana"
msgctxt "field:timesheet.hours_employee_weekly,write_date:"
msgid "Write Date"
-msgstr ""
+msgstr "Fecha modificación"
msgctxt "field:timesheet.hours_employee_weekly,write_uid:"
msgid "Write User"
-msgstr ""
+msgstr "Usuario modificación"
msgctxt "field:timesheet.hours_employee_weekly,year:"
msgid "Year"
@@ -147,9 +142,8 @@ msgstr "Año"
msgctxt "field:timesheet.line,create_date:"
msgid "Create Date"
-msgstr ""
+msgstr "Fecha de Creación"
-#, fuzzy
msgctxt "field:timesheet.line,create_uid:"
msgid "Create User"
msgstr "Crear usuario"
@@ -172,7 +166,7 @@ msgstr "Horas"
msgctxt "field:timesheet.line,id:"
msgid "ID"
-msgstr ""
+msgstr "ID"
msgctxt "field:timesheet.line,rec_name:"
msgid "Name"
@@ -184,25 +178,23 @@ msgstr "Trabajo"
msgctxt "field:timesheet.line,write_date:"
msgid "Write Date"
-msgstr ""
+msgstr "Fecha modificación"
msgctxt "field:timesheet.line,write_uid:"
msgid "Write User"
-msgstr ""
+msgstr "Usuario modificación"
-#, fuzzy
msgctxt "field:timesheet.line.enter.start,date:"
msgid "Date"
msgstr "Fecha"
-#, fuzzy
msgctxt "field:timesheet.line.enter.start,employee:"
msgid "Employee"
msgstr "Empleado"
msgctxt "field:timesheet.line.enter.start,id:"
msgid "ID"
-msgstr ""
+msgstr "ID"
msgctxt "field:timesheet.work,active:"
msgid "Active"
@@ -218,20 +210,19 @@ msgstr "Compañía"
msgctxt "field:timesheet.work,create_date:"
msgid "Create Date"
-msgstr ""
+msgstr "Fecha de Creación"
-#, fuzzy
msgctxt "field:timesheet.work,create_uid:"
msgid "Create User"
msgstr "Crear usuario"
msgctxt "field:timesheet.work,hours:"
msgid "Timesheet Hours"
-msgstr "Horas de Hoja de Tiempo"
+msgstr "Horas de Registro de Tiempo"
msgctxt "field:timesheet.work,id:"
msgid "ID"
-msgstr ""
+msgstr "ID"
msgctxt "field:timesheet.work,left:"
msgid "Left"
@@ -255,30 +246,29 @@ msgstr "Derecha"
msgctxt "field:timesheet.work,timesheet_available:"
msgid "Available on timesheets"
-msgstr "Disponibilidad en las hojas de tiempos"
+msgstr "Disponibilidad en los registros de tiempos"
+#, fuzzy
msgctxt "field:timesheet.work,timesheet_lines:"
msgid ""
-msgstr ""
+msgstr "Punto de Orden"
msgctxt "field:timesheet.work,write_date:"
msgid "Write Date"
-msgstr ""
+msgstr "Fecha modificación"
msgctxt "field:timesheet.work,write_uid:"
msgid "Write User"
-msgstr ""
+msgstr "Usuario modificación"
-#, fuzzy
msgctxt "field:timesheet.work.open.start,from_date:"
msgid "From Date"
msgstr "Fecha Inicial"
msgctxt "field:timesheet.work.open.start,id:"
msgid "ID"
-msgstr ""
+msgstr "ID"
-#, fuzzy
msgctxt "field:timesheet.work.open.start,to_date:"
msgid "To Date"
msgstr "A la Fecha"
@@ -289,7 +279,7 @@ msgstr "Tiempo total utilizado en este trabajo"
msgctxt "help:timesheet.work,timesheet_available:"
msgid "Allow to fill in timesheets with this work"
-msgstr "Permitir llenar con este trabajo en la hoja de tiempos"
+msgstr "Permitir llenar en registro de tiempos con este trabajo"
msgctxt "model:ir.action,name:act_hours_employee_form"
msgid "Hours per Employee"
@@ -299,7 +289,6 @@ msgctxt "model:ir.action,name:act_hours_employee_monthly_form"
msgid "Hours per Employee per Month"
msgstr "Horas por Empleado en el mes"
-#, fuzzy
msgctxt "model:ir.action,name:act_hours_employee_open"
msgid "Hours per Employee"
msgstr "Horas por Empleado"
@@ -310,11 +299,11 @@ msgstr "Horas por Empleado en la semana"
msgctxt "model:ir.action,name:act_line_enter"
msgid "Enter Timesheet"
-msgstr ""
+msgstr "Ingresar Registro de Tiempo"
msgctxt "model:ir.action,name:act_line_form"
msgid "Timesheet Lines"
-msgstr "Lineas de Hoja de Tiempo"
+msgstr "Lineas de Registro de Tiempo"
msgctxt "model:ir.action,name:act_open_work"
msgid "Hours per Work"
@@ -332,12 +321,10 @@ msgctxt "model:ir.action,name:act_work_form3"
msgid "Hours per Work"
msgstr "Horas por Trabajo"
-#, fuzzy
msgctxt "model:ir.action,name:act_work_hours_board"
msgid "Hours per Work"
msgstr "Horas por Trabajo"
-#, fuzzy
msgctxt "model:ir.action,name:act_work_list"
msgid "Works"
msgstr "Trabajos"
@@ -354,39 +341,34 @@ msgctxt "model:ir.ui.menu,name:menu_configuration"
msgid "Configuration"
msgstr "Configuración"
-#, fuzzy
msgctxt "model:ir.ui.menu,name:menu_hours_employee_open"
msgid "Hours per Employee"
msgstr "Horas por Empleado"
-#, fuzzy
msgctxt "model:ir.ui.menu,name:menu_hours_employee_open_monthly"
msgid "Hours per Employee per Month"
msgstr "Horas por Empleado en el mes"
-#, fuzzy
msgctxt "model:ir.ui.menu,name:menu_hours_employee_open_weekly"
msgid "Hours per Employee per Week"
msgstr "Horas por Empleado en la semana"
msgctxt "model:ir.ui.menu,name:menu_line_enter"
msgid "Enter Timesheet"
-msgstr ""
+msgstr "Ingresar Registro de Tiempo"
msgctxt "model:ir.ui.menu,name:menu_line_form"
msgid "Timesheet Lines"
-msgstr "Lineas de Hoja de Tiempo"
+msgstr "Lineas de Registro de Tiempo"
msgctxt "model:ir.ui.menu,name:menu_reporting"
msgid "Reporting"
msgstr "Reportes"
-#, fuzzy
msgctxt "model:ir.ui.menu,name:menu_timesheet"
msgid "Timesheet"
-msgstr "Hoja de Tiempo"
+msgstr "Registro de Tiempo"
-#, fuzzy
msgctxt "model:ir.ui.menu,name:menu_work_list"
msgid "Works"
msgstr "Trabajos"
@@ -401,7 +383,7 @@ msgstr "Horas por Trabajo"
msgctxt "model:res.group,name:group_timesheet_admin"
msgid "Timesheet Administration"
-msgstr "Administración de Hoja de tiempos"
+msgstr "Administración de Registro de Tiempo"
msgctxt "model:timesheet.hours_employee,name:"
msgid "Hours per Employee"
@@ -409,7 +391,7 @@ msgstr "Horas por Empleado"
msgctxt "model:timesheet.hours_employee.open.start,name:"
msgid "Open Hours per Employee"
-msgstr ""
+msgstr "Abrir Horas por Empleado"
msgctxt "model:timesheet.hours_employee_monthly,name:"
msgid "Hours per Employee per Month"
@@ -421,11 +403,11 @@ msgstr "Horas por Empleado en la semana"
msgctxt "model:timesheet.line,name:"
msgid "Timesheet Line"
-msgstr "Linea de Hoja de Tiempo"
+msgstr "Linea de Registro de Tiempo"
msgctxt "model:timesheet.line.enter.start,name:"
msgid "Enter Lines"
-msgstr ""
+msgstr "Ingresar Lineas"
msgctxt "model:timesheet.work,name:"
msgid "Work"
@@ -433,9 +415,8 @@ msgstr "Trabajo"
msgctxt "model:timesheet.work.open.start,name:"
msgid "Open Work"
-msgstr ""
+msgstr "Abrir Actividad"
-#, fuzzy
msgctxt "view:timesheet.hours_employee.open.start:"
msgid "Hours per Employee"
msgstr "Horas por Empleado"
@@ -458,7 +439,7 @@ msgstr "Horas por Empleado en la semana"
msgctxt "view:timesheet.line.enter.start:"
msgid "Enter Timesheet"
-msgstr ""
+msgstr "Ingresar Registro de Tiempo"
msgctxt "view:timesheet.line:"
msgid "Hours"
@@ -466,13 +447,12 @@ msgstr "Horas"
msgctxt "view:timesheet.line:"
msgid "Timesheet Line"
-msgstr "Linea de Hoja de Tiempo"
+msgstr "Linea de Registro de Tiempo"
msgctxt "view:timesheet.line:"
msgid "Timesheet Lines"
-msgstr "Lineas de Hoja de Tiempo"
+msgstr "Lineas de Registro de Tiempo"
-#, fuzzy
msgctxt "view:timesheet.work.open.start:"
msgid "Hours per Work"
msgstr "Horas por Trabajo"
@@ -489,41 +469,34 @@ msgctxt "view:timesheet.work:"
msgid "Works"
msgstr "Trabajos"
-#, fuzzy
msgctxt "wizard_button:timesheet.hours_employee.open,start,end:"
msgid "Cancel"
msgstr "Cancelar"
-#, fuzzy
msgctxt "wizard_button:timesheet.hours_employee.open,start,open_:"
msgid "Open"
msgstr "Abrir"
-#, fuzzy
msgctxt "wizard_button:timesheet.line.enter,start,end:"
msgid "Cancel"
msgstr "Cancelar"
msgctxt "wizard_button:timesheet.line.enter,start,enter:"
msgid "Enter"
-msgstr ""
+msgstr "Ingresar"
-#, fuzzy
msgctxt "wizard_button:timesheet.work.open,start,end:"
msgid "Cancel"
msgstr "Cancelar"
-#, fuzzy
msgctxt "wizard_button:timesheet.work.open,start,open_:"
msgid "Open"
msgstr "Abrir"
-#, fuzzy
msgctxt "wizard_button:timesheet.work.open2,start,end:"
msgid "Cancel"
msgstr "Cancelar"
-#, fuzzy
msgctxt "wizard_button:timesheet.work.open2,start,open_:"
msgid "Open"
msgstr "Abrir"
diff --git a/locale/es_ES.po b/locale/es_ES.po
index 7c70c65..8204be8 100644
--- a/locale/es_ES.po
+++ b/locale/es_ES.po
@@ -364,7 +364,7 @@ msgstr "Informes"
msgctxt "model:ir.ui.menu,name:menu_timesheet"
msgid "Timesheet"
-msgstr "Parte de trabajo"
+msgstr "Partes de trabajo"
msgctxt "model:ir.ui.menu,name:menu_work_list"
msgid "Works"
diff --git a/setup.py b/setup.py
index 158e0e7..aef6f4b 100644
--- a/setup.py
+++ b/setup.py
@@ -4,8 +4,19 @@
from setuptools import setup
import re
+import os
+import ConfigParser
-info = eval(open('__tryton__.py').read())
+
+def read(fname):
+ return open(os.path.join(os.path.dirname(__file__), fname)).read()
+
+config = ConfigParser.ConfigParser()
+config.readfp(open('tryton.cfg'))
+info = dict(config.items('tryton'))
+for key in ('depends', 'extras_depend', 'xml'):
+ if key in info:
+ info[key] = info[key].strip().splitlines()
major_version, minor_version, _ = info.get('version', '0.0.1').split('.', 2)
major_version = int(major_version)
minor_version = int(minor_version)
@@ -21,21 +32,21 @@ requires.append('trytond >= %s.%s, < %s.%s' %
setup(name='trytond_timesheet',
version=info.get('version', '0.0.1'),
- description=info.get('description', ''),
- author=info.get('author', ''),
- author_email=info.get('email', ''),
- url=info.get('website', ''),
+ description='Tryton module with timesheets',
+ long_description=read('README'),
+ author='Tryton',
+ url='http://www.tryton.org/',
download_url="http://downloads.tryton.org/" + \
- info.get('version', '0.0.1').rsplit('.', 1)[0] + '/',
+ info.get('version', '0.0.1').rsplit('.', 1)[0] + '/',
package_dir={'trytond.modules.timesheet': '.'},
packages=[
'trytond.modules.timesheet',
'trytond.modules.timesheet.tests',
- ],
+ ],
package_data={
'trytond.modules.timesheet': info.get('xml', []) \
- + info.get('translation', []),
- },
+ + ['tryton.cfg', 'locale/*.po'],
+ },
classifiers=[
'Development Status :: 5 - Production/Stable',
'Environment :: Plugins',
@@ -57,7 +68,7 @@ setup(name='trytond_timesheet',
'Programming Language :: Python :: 2.6',
'Programming Language :: Python :: 2.7',
'Topic :: Office/Business',
- ],
+ ],
license='GPL-3',
install_requires=requires,
zip_safe=False,
@@ -67,4 +78,4 @@ setup(name='trytond_timesheet',
""",
test_suite='tests',
test_loader='trytond.test_loader:Loader',
-)
+ )
diff --git a/tryton.cfg b/tryton.cfg
new file mode 100644
index 0000000..d7e8163
--- /dev/null
+++ b/tryton.cfg
@@ -0,0 +1,11 @@
+[tryton]
+version=2.6.0
+depends:
+ company
+ company_work_time
+ ir
+ res
+xml:
+ timesheet.xml
+ work.xml
+ line.xml
diff --git a/trytond_timesheet.egg-info/PKG-INFO b/trytond_timesheet.egg-info/PKG-INFO
index bc35299..c7bce31 100644
--- a/trytond_timesheet.egg-info/PKG-INFO
+++ b/trytond_timesheet.egg-info/PKG-INFO
@@ -1,21 +1,48 @@
Metadata-Version: 1.0
Name: trytond-timesheet
-Version: 2.4.1
-Summary: Timesheet Module with:
- - Work
- - Timesheet line
-
-And with reports:
- - Hours per work
- - Hours per employee per week
- - Hours per employee per month
-
+Version: 2.6.0
+Summary: Tryton module with timesheets
Home-page: http://www.tryton.org/
-Author: B2CK
-Author-email: info at b2ck.com
+Author: Tryton
+Author-email: UNKNOWN
License: GPL-3
-Download-URL: http://downloads.tryton.org/2.4/
-Description: UNKNOWN
+Download-URL: http://downloads.tryton.org/2.6/
+Description: trytond_timesheet
+ =================
+
+ The timesheet module of the Tryton application platform.
+
+ Installing
+ ----------
+
+ See INSTALL
+
+ Support
+ -------
+
+ If you encounter any problems with Tryton, please don't hesitate to ask
+ questions on the Tryton bug tracker, mailing list, wiki or IRC channel:
+
+ http://bugs.tryton.org/
+ http://groups.tryton.org/
+ http://wiki.tryton.org/
+ irc://irc.freenode.net/tryton
+
+ License
+ -------
+
+ See LICENSE
+
+ Copyright
+ ---------
+
+ See COPYRIGHT
+
+
+ For more information please visit the Tryton web site:
+
+ http://www.tryton.org/
+
Platform: UNKNOWN
Classifier: Development Status :: 5 - Production/Stable
Classifier: Environment :: Plugins
diff --git a/trytond_timesheet.egg-info/SOURCES.txt b/trytond_timesheet.egg-info/SOURCES.txt
index 4f89d28..056625f 100644
--- a/trytond_timesheet.egg-info/SOURCES.txt
+++ b/trytond_timesheet.egg-info/SOURCES.txt
@@ -7,9 +7,9 @@ README
line.xml
setup.py
timesheet.xml
+tryton.cfg
work.xml
./__init__.py
-./__tryton__.py
./line.py
./work.py
./tests/__init__.py
diff --git a/trytond_timesheet.egg-info/requires.txt b/trytond_timesheet.egg-info/requires.txt
index 54c7765..e00c7a5 100644
--- a/trytond_timesheet.egg-info/requires.txt
+++ b/trytond_timesheet.egg-info/requires.txt
@@ -1,3 +1,3 @@
-trytond_company >= 2.4, < 2.5
-trytond_company_work_time >= 2.4, < 2.5
-trytond >= 2.4, < 2.5
\ No newline at end of file
+trytond_company >= 2.6, < 2.7
+trytond_company_work_time >= 2.6, < 2.7
+trytond >= 2.6, < 2.7
\ No newline at end of file
diff --git a/work.py b/work.py
index 7d8ebc8..cf4ac4d 100644
--- a/work.py
+++ b/work.py
@@ -6,12 +6,12 @@ from trytond.pyson import PYSONEncoder, Not, Bool, Eval
from trytond.transaction import Transaction
from trytond.pool import Pool
+__all__ = ['Work', 'OpenWorkStart', 'OpenWork', 'OpenWork2', 'OpenWorkGraph']
+
class Work(ModelSQL, ModelView):
'Work'
- _name = 'timesheet.work'
- _description = __doc__
-
+ __name__ = 'timesheet.work'
name = fields.Char('Name', required=True)
active = fields.Boolean('Active')
parent = fields.Many2One('timesheet.work', 'Parent', left="left",
@@ -20,7 +20,11 @@ class Work(ModelSQL, ModelView):
right = fields.Integer('Right', required=True, select=True)
children = fields.One2Many('timesheet.work', 'parent', 'Children')
hours = fields.Function(fields.Float('Timesheet Hours', digits=(16, 2),
- help="Total time spent on this work"), 'get_hours')
+ states={
+ 'invisible': ~Eval('timesheet_available'),
+ },
+ depends=['timesheet_available'],
+ help="Total time spent on this work"), 'get_hours')
timesheet_available = fields.Boolean('Available on timesheets',
states={
'readonly': Bool(Eval('timesheet_lines', [0])),
@@ -36,48 +40,52 @@ class Work(ModelSQL, ModelView):
'readonly': Not(Bool(Eval('active'))),
})
- def __init__(self):
- super(Work, self).__init__()
- self._constraints += [
+ @classmethod
+ def __setup__(cls):
+ super(Work, cls).__setup__()
+ cls._constraints += [
('check_recursion', 'recursive_works'),
('check_parent_company', 'parent_company'),
- ]
- self._error_messages.update({
- 'recursive_works': 'You can not create recursive works!',
- 'parent_company': 'Every work must be in the same company '\
- 'as it\'s parent work!',
- })
-
- def default_active(self):
+ ]
+ cls._error_messages.update({
+ 'recursive_works': 'You can not create recursive works!',
+ 'parent_company': 'Every work must be in the same company '\
+ 'as it\'s parent work!',
+ })
+
+ @staticmethod
+ def default_active():
return True
- def default_left(self):
+ @staticmethod
+ def default_left():
return 0
- def default_right(self):
+ @staticmethod
+ def default_right():
return 0
- def default_timesheet_available(self):
+ @staticmethod
+ def default_timesheet_available():
return True
- def default_company(self):
+ @staticmethod
+ def default_company():
return Transaction().context.get('company')
- def check_parent_company(self, ids):
- for work in self.browse(ids):
- if not work.parent:
- continue
- if work.parent.company.id != work.company.id:
- return False
- return True
+ def check_parent_company(self):
+ if not self.parent:
+ return True
+ return self.parent.company == self.company
- def _tree_qty(self, hours_by_wt, children, ids, to_compute):
+ @classmethod
+ def _tree_qty(cls, hours_by_wt, children, ids, to_compute):
res = 0
for h in ids:
if (not children.get(h)) or (not to_compute[h]):
res += hours_by_wt.setdefault(h, 0)
else:
- sub_qty = self._tree_qty(
+ sub_qty = cls._tree_qty(
hours_by_wt, children, children[h], to_compute)
hours_by_wt.setdefault(h, 0)
hours_by_wt[h] += sub_qty
@@ -85,10 +93,13 @@ class Work(ModelSQL, ModelView):
to_compute[h] = False
return res
- def get_hours(self, ids, name):
- all_ids = self.search([
+ @classmethod
+ def get_hours(cls, works, name):
+ ids = [w.id for w in works]
+ all_works = cls.search([
('parent', 'child_of', ids),
])
+ all_ids = [w.id for w in all_works]
# force inactive ids to be in all_ids
all_ids = list(set(all_ids + ids))
clause = "SELECT work, sum(hours) FROM timesheet_line "\
@@ -109,66 +120,53 @@ class Work(ModelSQL, ModelView):
hours_by_wt = dict((i[0], i[1]) for i in
Transaction().cursor.fetchall())
to_compute = dict.fromkeys(all_ids, True)
- works = self.browse(all_ids)
+ works = cls.browse(all_ids)
children = {}
for work in works:
if work.parent:
children.setdefault(work.parent.id, []).append(work.id)
- self._tree_qty(hours_by_wt, children, ids, to_compute)
+ cls._tree_qty(hours_by_wt, children, ids, to_compute)
return hours_by_wt
- def get_rec_name(self, ids, name):
- if not ids:
- return {}
- res = {}
+ def get_rec_name(self, name):
+ if self.parent:
+ return self.parent.get_rec_name(name) + '\\' + self.name
+ else:
+ return self.name
- def _name(work):
- if work.parent:
- return _name(work.parent) + '\\' + work.name
- else:
- return work.name
- for work in self.browse(ids):
- res[work.id] = _name(work)
- return res
-
- def copy(self, ids, default=None):
+ @classmethod
+ def copy(cls, works, default=None):
if default is None:
default = {}
default = default.copy()
if 'timesheet_lines' not in default:
default['timesheet_lines'] = None
- return super(Work, self).copy(ids, default=default)
+ return super(Work, cls).copy(works, default=default)
- def write(self, ids, vals):
- child_ids = None
+ @classmethod
+ def write(cls, works, vals):
+ childs = None
if not vals.get('active', True):
- child_ids = self.search([
- ('parent', 'child_of', ids),
- ])
- res = super(Work, self).write(ids, vals)
- if child_ids:
- self.write(child_ids, {
- 'active': False,
- })
- return res
-
-Work()
+ childs = cls.search([
+ ('parent', 'child_of', [w.id for w in works]),
+ ])
+ super(Work, cls).write(works, vals)
+ if childs:
+ cls.write(childs, {
+ 'active': False,
+ })
class OpenWorkStart(ModelView):
'Open Work'
- _name = 'timesheet.work.open.start'
- _description = __doc__
+ __name__ = 'timesheet.work.open.start'
from_date = fields.Date('From Date')
to_date = fields.Date('To Date')
-OpenWorkStart()
-
class OpenWork(Wizard):
'Open Work'
- _name = 'timesheet.work.open'
-
+ __name__ = 'timesheet.work.open'
start = StateView('timesheet.work.open.start',
'timesheet.work_open_start_view_form', [
Button('Cancel', 'end', 'tryton-cancel'),
@@ -176,39 +174,31 @@ class OpenWork(Wizard):
])
open_ = StateAction('timesheet.act_work_hours_board')
- def do_open_(self, session, action):
+ def do_open_(self, action):
action['pyson_context'] = PYSONEncoder().encode({
- 'from_date': session.start.from_date,
- 'to_date': session.start.to_date,
+ 'from_date': self.start.from_date,
+ 'to_date': self.start.to_date,
})
return action, {}
- def transition_open_(self, session):
+ def transition_open_(self):
return 'end'
-OpenWork()
-
class OpenWork2(OpenWork):
- _name = 'timesheet.work.open2'
-
+ __name__ = 'timesheet.work.open2'
open_ = StateAction('timesheet.act_work_form2')
-OpenWork2()
-
class OpenWorkGraph(Wizard):
- _name = 'timesheet.work.open_graph'
+ __name__ = 'timesheet.work.open_graph'
start_state = 'open_'
open_ = StateAction('timesheet.act_work_form3')
- def do_open_(self, session, action):
- pool = Pool()
- work_obj = pool.get('timesheet.work')
+ def do_open_(self, action):
+ Work = Pool().get('timesheet.work')
if 'active_id' in Transaction().context:
- work = work_obj.browse(Transaction().context['active_id'])
+ work = Work(Transaction().context['active_id'])
action['name'] = action['name'] + ' - ' + work.rec_name
return action, {}
-
-OpenWorkGraph()
diff --git a/work.xml b/work.xml
index aeb1393..90625e4 100644
--- a/work.xml
+++ b/work.xml
@@ -140,7 +140,7 @@ this repository contains the full copyright notices and license terms. -->
<record model="ir.action.act_window" id="act_work_form2">
<field name="name">Hours per Work</field>
<field name="res_model">timesheet.work</field>
- <field name="domain" eval="'[(\'parent\', \'=\', Get(Eval(\'_active_%s\', {}), \'id\', False))]' % ref('act_work_tree2')"/>
+ <field name="domain">[('parent', '=', Get(Eval('timesheet.act_work_tree2', {}), 'id', False))]</field>
</record>
<record model="ir.action.act_window.view"
id="act_work_form2_view1">
@@ -157,10 +157,10 @@ this repository contains the full copyright notices and license terms. -->
<board string="Hours per Work">
<hpaned id="hours_per_work">
<child id="tree">
- <action name="%(act_work_tree2)s"/>
+ <action name="timesheet.act_work_tree2"/>
</child>
<child id="graph">
- <action name="%(act_work_form2)s"/>
+ <action name="timesheet.act_work_form2"/>
</child>
</hpaned>
</board>
commit 3146bdad9082b13feba8a4d9c81e8c206028f7f8
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Tue Sep 11 13:16:52 2012 +0200
Adding upstream version 2.4.1.
diff --git a/CHANGELOG b/CHANGELOG
index 3e53715..c079ded 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 2.4.1 - 2012-09-01
+* Bug fixes (see mercurial logs for details)
+
Version 2.4.0 - 2012-04-24
* Bug fixes (see mercurial logs for details)
* Change record rule for work to use the current company instead of main
diff --git a/PKG-INFO b/PKG-INFO
index b0d65a1..b14687c 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.0
Name: trytond_timesheet
-Version: 2.4.0
+Version: 2.4.1
Summary: Timesheet Module with:
- Work
- Timesheet line
diff --git a/__tryton__.py b/__tryton__.py
index 43033f9..c58ff4a 100644
--- a/__tryton__.py
+++ b/__tryton__.py
@@ -10,7 +10,7 @@
'name_es_ES': 'Partes de trabajo',
'name_fr_FR': 'Feuille de présence',
'name_nl_NL': 'Tijdregistratie',
- 'version': '2.4.0',
+ 'version': '2.4.1',
'author': 'B2CK',
'email': 'info at b2ck.com',
'website': 'http://www.tryton.org/',
diff --git a/trytond_timesheet.egg-info/PKG-INFO b/trytond_timesheet.egg-info/PKG-INFO
index e5c23a2..bc35299 100644
--- a/trytond_timesheet.egg-info/PKG-INFO
+++ b/trytond_timesheet.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.0
Name: trytond-timesheet
-Version: 2.4.0
+Version: 2.4.1
Summary: Timesheet Module with:
- Work
- Timesheet line
diff --git a/work.py b/work.py
index e3bfa34..7d8ebc8 100644
--- a/work.py
+++ b/work.py
@@ -90,7 +90,7 @@ class Work(ModelSQL, ModelView):
('parent', 'child_of', ids),
])
# force inactive ids to be in all_ids
- all_ids = all_ids + ids
+ all_ids = list(set(all_ids + ids))
clause = "SELECT work, sum(hours) FROM timesheet_line "\
"WHERE work IN (%s) "\
% ",".join(('%s',) * len(all_ids))
commit ead8a2fb0fe896fd86db352e950d879c36db5953
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Tue Apr 24 19:31:09 2012 +0200
Adding upstream version 2.4.0.
diff --git a/CHANGELOG b/CHANGELOG
index e519b5a..3e53715 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,7 @@
+Version 2.4.0 - 2012-04-24
+* Bug fixes (see mercurial logs for details)
+* Change record rule for work to use the current company instead of main
+
Version 2.2.0 - 2011-10-25
* Bug fixes (see mercurial logs for details)
diff --git a/COPYRIGHT b/COPYRIGHT
index 3d2324b..2057c72 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,6 +1,6 @@
-Copyright (C) 2008-2011 Cédric Krier.
-Copyright (C) 2008-2011 Bertrand Chenal.
-Copyright (C) 2008-2011 B2CK SPRL.
+Copyright (C) 2008-2012 Cédric Krier.
+Copyright (C) 2008-2012 Bertrand Chenal.
+Copyright (C) 2008-2012 B2CK SPRL.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff --git a/INSTALL b/INSTALL
index 789b2e5..e8cb52c 100644
--- a/INSTALL
+++ b/INSTALL
@@ -4,7 +4,7 @@ Installing trytond_timesheet
Prerequisites
-------------
- * Python 2.5 or later (http://www.python.org/)
+ * Python 2.6 or later (http://www.python.org/)
* trytond (http://www.tryton.org/)
* trytond_company (http://www.tryton.org/)
* trytond_company_work_time (http://www.tryton.org/)
diff --git a/PKG-INFO b/PKG-INFO
index ed7202c..b0d65a1 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.0
Name: trytond_timesheet
-Version: 2.2.0
+Version: 2.4.0
Summary: Timesheet Module with:
- Work
- Timesheet line
@@ -14,7 +14,7 @@ Home-page: http://www.tryton.org/
Author: B2CK
Author-email: info at b2ck.com
License: GPL-3
-Download-URL: http://downloads.tryton.org/2.2/
+Download-URL: http://downloads.tryton.org/2.4/
Description: UNKNOWN
Platform: UNKNOWN
Classifier: Development Status :: 5 - Production/Stable
diff --git a/__init__.py b/__init__.py
index 5a3432e..f02d94e 100644
--- a/__init__.py
+++ b/__init__.py
@@ -1,5 +1,5 @@
#This file is part of Tryton. The COPYRIGHT file at the top level of
#this repository contains the full copyright notices and license terms.
-from work import *
-from line import *
+from .work import *
+from .line import *
diff --git a/__tryton__.py b/__tryton__.py
index 35fe407..43033f9 100644
--- a/__tryton__.py
+++ b/__tryton__.py
@@ -3,12 +3,14 @@
{
'name': 'Timesheet',
'name_bg_BG': 'График',
+ 'name_ca_ES': 'Fulls de treball',
'name_de_DE': 'Zeiterfassung',
+ 'name_es_AR': 'Partes de trabajo',
'name_es_CO': 'Hoja de Asistencia',
'name_es_ES': 'Partes de trabajo',
'name_fr_FR': 'Feuille de présence',
'name_nl_NL': 'Tijdregistratie',
- 'version': '2.2.0',
+ 'version': '2.4.0',
'author': 'B2CK',
'email': 'info at b2ck.com',
'website': 'http://www.tryton.org/',
@@ -30,6 +32,15 @@ And with reports:
- Часове по служител за седмица
- Часове по служител за месец
''',
+ 'description_ca_ES': '''Mòdul de fulls de treball amb:
+ - Feines o tasques
+ - Línies de fulls de treball
+
+I els informes:
+ - Hores per tasca
+ - Hores per empleat i setmana
+ - Hores per empleat i mes
+''',
'description_de_DE': '''Zeiterfassungsmodul mit:
- Aufgaben
- Zeitpositionen
@@ -39,6 +50,15 @@ Zugehörige Berichte:
- Stunden pro Mitarbeiter pro Woche
- Stunden pro Mitarbeiter pro Monat
''',
+ 'description_es_AR': '''Módulo de partes de trabajo con:
+ - Trabajo
+ - Línea de parte parte de trabajo
+
+Y con informes:
+ - Horas por trabajo
+ - Horas por empleado y semana
+ - Horas por empleado y mes
+''',
'description_es_CO': '''Módulo de Hoja de Asistencia con:
- Trabajo
- Líneas de tiempo laborado
@@ -49,8 +69,8 @@ Y con reportes de:
- Horas por empleado por mes
''',
'description_es_ES': '''Módulo de partes de trabajo con:
- - Trabajo
- - Línea de parte parte de trabajo
+ - Trabajos o tareas
+ - Líneas de parte de trabajo
Y con informes:
- Horas por trabajo
@@ -89,7 +109,9 @@ Bijbehorende rapporten:
'translation': [
'locale/cs_CZ.po',
'locale/bg_BG.po',
+ 'locale/ca_ES.po',
'locale/de_DE.po',
+ 'locale/es_AR.po',
'locale/es_CO.po',
'locale/es_ES.po',
'locale/fr_FR.po',
diff --git a/doc/index.rst b/doc/index.rst
index 6155753..732f960 100644
--- a/doc/index.rst
+++ b/doc/index.rst
@@ -22,7 +22,7 @@ fields:
Timesheet Line
-##############
+**************
A timesheet line express the fact that one employee spend a part of
his/her time on a specific work at a given date. An optional
diff --git a/line.py b/line.py
index b3107dc..8af964c 100644
--- a/line.py
+++ b/line.py
@@ -1,7 +1,7 @@
#This file is part of Tryton. The COPYRIGHT file at the top level of
#this repository contains the full copyright notices and license terms.
from trytond.model import ModelView, ModelSQL, fields
-from trytond.wizard import Wizard
+from trytond.wizard import Wizard, StateView, StateAction, Button
from trytond.backend import FIELDS
from trytond.pyson import Eval, PYSONEncoder, Date, Get
from trytond.transaction import Transaction
@@ -14,11 +14,13 @@ class Line(ModelSQL, ModelView):
_description = __doc__
employee = fields.Many2One('company.employee', 'Employee', required=True,
- select=1, domain=[('company', '=', Get(Eval('context', {}), 'company'))])
- date = fields.Date('Date', required=True, select=1)
+ select=True, domain=[
+ ('company', '=', Get(Eval('context', {}), 'company')),
+ ])
+ date = fields.Date('Date', required=True, select=True)
hours = fields.Float('Hours', digits=(16, 2), required=True)
work = fields.Many2One('timesheet.work', 'Work',
- required=True, select=1, domain=[
+ required=True, select=True, domain=[
('timesheet_available', '=', 'True'),
])
description = fields.Char('Description')
@@ -32,8 +34,6 @@ class Line(ModelSQL, ModelView):
def default_employee(self):
user_obj = Pool().get('res.user')
- employee_obj = Pool().get('company.employee')
-
employee_id = None
if Transaction().context.get('employee'):
employee_id = Transaction().context['employee']
@@ -43,7 +43,6 @@ class Line(ModelSQL, ModelView):
employee_id = user.employee.id
if employee_id:
return employee_id
- return False
def default_date(self):
date_obj = Pool().get('ir.date')
@@ -60,9 +59,9 @@ class Line(ModelSQL, ModelView):
Line()
-class EnterLinesInit(ModelView):
- 'Enter Lines Init'
- _name = 'timesheet.enter_lines.init'
+class EnterLinesStart(ModelView):
+ 'Enter Lines'
+ _name = 'timesheet.line.enter.start'
_description = __doc__
employee = fields.Many2One('company.employee', 'Employee', required=True,
domain=[('company', '=', Get(Eval('context', {}), 'company'))])
@@ -76,55 +75,36 @@ class EnterLinesInit(ModelView):
line_obj = Pool().get('timesheet.line')
return line_obj.default_date()
-EnterLinesInit()
+EnterLinesStart()
class EnterLines(Wizard):
'Enter Lines'
- _name = 'timesheet.enter_lines'
- states = {
- 'init': {
- 'result': {
- 'type': 'form',
- 'object': 'timesheet.enter_lines.init',
- 'state': [
- ('end', 'Cancel', 'tryton-cancel'),
- ('enter', 'Enter', 'tryton-ok', True),
- ],
- },
- },
- 'enter': {
- 'result': {
- 'type': 'action',
- 'action': '_action_enter_lines',
- 'state': 'end',
- },
- }
- }
-
- def _action_enter_lines(self, data):
- pool = Pool()
- model_data_obj = pool.get('ir.model.data')
- act_window_obj = pool.get('ir.action.act_window')
- employee_obj = pool.get('company.employee')
- act_window_id = model_data_obj.get_id('timesheet', 'act_line_form')
- res = act_window_obj.read(act_window_id)
- date = data['form']['date']
- date = Date(date.year, date.month, date.day)
- res['pyson_domain'] = PYSONEncoder().encode([
- ('employee', '=', data['form']['employee']),
- ('date', '=', date),
- ])
- res['pyson_context'] = PYSONEncoder().encode({
- 'employee': data['form']['employee'],
- 'date': date,
- })
+ _name = 'timesheet.line.enter'
- if data['form']['employee']:
- employee = employee_obj.browse(data['form']['employee'])
- res['name'] += " - " + employee.rec_name
+ start = StateView('timesheet.line.enter.start',
+ 'timesheet.line_enter_start_view_form', [
+ Button('Cancel', 'end', 'tryton-cancel'),
+ Button('Enter', 'enter', 'tryton-ok', default=True),
+ ])
+ enter = StateAction('timesheet.act_line_form')
- return res
+ def do_enter(self, session, action):
+ date = session.start.date
+ date = Date(date.year, date.month, date.day)
+ action['pyson_domain'] = PYSONEncoder().encode([
+ ('employee', '=', session.start.employee.id),
+ ('date', '=', date),
+ ])
+ action['pyson_context'] = PYSONEncoder().encode({
+ 'employee': session.start.employee.id,
+ 'date': date,
+ })
+ action['name'] += " - " + session.start.employee.rec_name
+ return action, {}
+
+ def transition_enter(self, session):
+ return 'end'
EnterLines()
@@ -134,7 +114,7 @@ class HoursEmployee(ModelSQL, ModelView):
_name = 'timesheet.hours_employee'
_description = __doc__
- employee = fields.Many2One('company.employee', 'Employee', select=1)
+ employee = fields.Many2One('company.employee', 'Employee', select=True)
hours = fields.Float('Hours', digits=(16, 2))
def table_query(self):
@@ -161,50 +141,36 @@ class HoursEmployee(ModelSQL, ModelView):
HoursEmployee()
-class OpenHoursEmployeeInit(ModelView):
- 'Open Hours Employee Init'
- _name = 'timesheet.open_hours_employee.init'
+class OpenHoursEmployeeStart(ModelView):
+ 'Open Hours per Employee'
+ _name = 'timesheet.hours_employee.open.start'
_description = __doc__
start_date = fields.Date('Start Date')
end_date = fields.Date('End Date')
-OpenHoursEmployeeInit()
+OpenHoursEmployeeStart()
class OpenHoursEmployee(Wizard):
'Open Hours per Employee'
- _name = 'timesheet.open_hours_employee'
- states = {
- 'init': {
- 'result': {
- 'type': 'form',
- 'object': 'timesheet.open_hours_employee.init',
- 'state': [
- ('end', 'Cancel', 'tryton-cancel'),
- ('open', 'Open', 'tryton-ok', True),
- ],
- },
- },
- 'open': {
- 'result': {
- 'type': 'action',
- 'action': '_action_open',
- 'state': 'end',
- },
- },
- }
-
- def _action_open(self, data):
- model_data_obj = Pool().get('ir.model.data')
- act_window_obj = Pool().get('ir.action.act_window')
- act_window_id = model_data_obj.get_id('timesheet',
- 'act_hours_employee_form')
- res = act_window_obj.read(act_window_id)
- res['pyson_context'] = PYSONEncoder().encode({
- 'start_date': data['form']['start_date'],
- 'end_date': data['form']['end_date'],
- })
- return res
+ _name = 'timesheet.hours_employee.open'
+
+ start = StateView('timesheet.hours_employee.open.start',
+ 'timesheet.hours_employee_open_start_view_form', [
+ Button('Cancel', 'end', 'tryton-cancel'),
+ Button('Open', 'open_', 'tryton-ok', default=True),
+ ])
+ open_ = StateAction('timesheet.act_hours_employee_form')
+
+ def do_open_(self, session, action):
+ action['pyson_context'] = PYSONEncoder().encode({
+ 'start_date': session.start.start_date,
+ 'end_date': session.start.end_date,
+ })
+ return action, {}
+
+ def transition_open_(self, session):
+ return 'end'
OpenHoursEmployee()
@@ -214,10 +180,10 @@ class HoursEmployeeWeekly(ModelSQL, ModelView):
_name = 'timesheet.hours_employee_weekly'
_description = __doc__
- year = fields.Char('Year', select=1)
- week = fields.Integer('Week', select=1)
- employee = fields.Many2One('company.employee', 'Employee', select=1)
- hours = fields.Float('Hours', digits=(16, 2), select=1)
+ year = fields.Char('Year', select=True)
+ week = fields.Integer('Week', select=True)
+ employee = fields.Many2One('company.employee', 'Employee', select=True)
+ hours = fields.Float('Hours', digits=(16, 2), select=True)
def __init__(self):
super(HoursEmployeeWeekly, self).__init__()
@@ -252,10 +218,10 @@ class HoursEmployeeMonthly(ModelSQL, ModelView):
_name = 'timesheet.hours_employee_monthly'
_description = __doc__
- year = fields.Char('Year', select=1)
- month = fields.Integer('Month', select=1)
- employee = fields.Many2One('company.employee', 'Employee', select=1)
- hours = fields.Float('Hours', digits=(16, 2), select=1)
+ year = fields.Char('Year', select=True)
+ month = fields.Integer('Month', select=True)
+ employee = fields.Many2One('company.employee', 'Employee', select=True)
+ hours = fields.Float('Hours', digits=(16, 2), select=True)
def __init__(self):
super(HoursEmployeeMonthly, self).__init__()
diff --git a/line.xml b/line.xml
index 4b2e8e9..7c874f6 100644
--- a/line.xml
+++ b/line.xml
@@ -81,8 +81,8 @@ this repository contains the full copyright notices and license terms. -->
<field name="group" ref="group_timesheet_admin"/>
</record>
- <record model="ir.ui.view" id="enter_lines_init_view_form">
- <field name="model">timesheet.enter_lines.init</field>
+ <record model="ir.ui.view" id="line_enter_start_view_form">
+ <field name="model">timesheet.line.enter.start</field>
<field name="type">form</field>
<field name="arch" type="xml">
<![CDATA[
@@ -96,12 +96,12 @@ this repository contains the full copyright notices and license terms. -->
</field>
</record>
- <record model="ir.action.wizard" id="act_enter_lines">
+ <record model="ir.action.wizard" id="act_line_enter">
<field name="name">Enter Timesheet</field>
- <field name="wiz_name">timesheet.enter_lines</field>
+ <field name="wiz_name">timesheet.line.enter</field>
</record>
- <menuitem parent="menu_timesheet" action="act_enter_lines"
- id="menu_enter_lines" sequence="20"/>
+ <menuitem parent="menu_timesheet" action="act_line_enter"
+ id="menu_line_enter" sequence="20"/>
<record model="ir.ui.view" id="hours_employee_view_tree">
<field name="model">timesheet.hours_employee</field>
@@ -172,8 +172,8 @@ this repository contains the full copyright notices and license terms. -->
<field name="group" ref="group_timesheet_admin"/>
</record>
- <record model="ir.ui.view" id="open_hours_employee_init_view_form">
- <field name="model">timesheet.open_hours_employee.init</field>
+ <record model="ir.ui.view" id="hours_employee_open_start_view_form">
+ <field name="model">timesheet.hours_employee.open.start</field>
<field name="type">form</field>
<field name="arch" type="xml">
<![CDATA[
@@ -186,12 +186,12 @@ this repository contains the full copyright notices and license terms. -->
]]>
</field>
</record>
- <record model="ir.action.wizard" id="act_open_hours_employee">
+ <record model="ir.action.wizard" id="act_hours_employee_open">
<field name="name">Hours per Employee</field>
- <field name="wiz_name">timesheet.open_hours_employee</field>
+ <field name="wiz_name">timesheet.hours_employee.open</field>
</record>
- <menuitem parent="menu_reporting" action="act_open_hours_employee"
- icon="tryton-list" id="menu_open_hours_employee"/>
+ <menuitem parent="menu_reporting" action="act_hours_employee_open"
+ icon="tryton-list" id="menu_hours_employee_open"/>
<record model="ir.ui.view" id="hours_employee_weekly_view_tree">
<field name="model">timesheet.hours_employee_weekly</field>
@@ -219,7 +219,7 @@ this repository contains the full copyright notices and license terms. -->
<field name="act_window" ref="act_hours_employee_weekly_form"/>
</record>
<menuitem parent="menu_reporting" action="act_hours_employee_weekly_form"
- id="menu_open_hours_employee_weekly"/>
+ id="menu_hours_employee_open_weekly"/>
<record model="ir.ui.view" id="hours_employee_monthly_view_tree">
<field name="model">timesheet.hours_employee_monthly</field>
@@ -247,6 +247,6 @@ this repository contains the full copyright notices and license terms. -->
<field name="act_window" ref="act_hours_employee_monthly_form"/>
</record>
<menuitem parent="menu_reporting" action="act_hours_employee_monthly_form"
- id="menu_open_hours_employee_monthly"/>
+ id="menu_hours_employee_open_monthly"/>
</data>
</tryton>
diff --git a/locale/bg_BG.po b/locale/bg_BG.po
index cae5ea8..06a3b8d 100644
--- a/locale/bg_BG.po
+++ b/locale/bg_BG.po
@@ -2,175 +2,283 @@
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
-msgctxt "error:timesheet.line:0"
+msgctxt "error:timesheet.line:"
msgid "Hours field must be positive"
msgstr "Часовете трябва да са положителни числа"
-msgctxt "error:timesheet.work:0"
+msgctxt "error:timesheet.work:"
msgid "Every work must be in the same company as it's parent work!"
msgstr ""
"Всяка задача трябва да е в същата фирма като тази на родителската задача!"
-msgctxt "error:timesheet.work:0"
+msgctxt "error:timesheet.work:"
msgid "You can not create recursive works!"
msgstr "Не може да създавате взаимно вложени задачи!"
-msgctxt "field:timesheet.enter_lines.init,date:0"
-msgid "Date"
-msgstr "Дата"
+msgctxt "field:timesheet.hours_employee,create_date:"
+msgid "Create Date"
+msgstr "Създадено на"
-msgctxt "field:timesheet.enter_lines.init,employee:0"
-msgid "Employee"
-msgstr "Служител"
+msgctxt "field:timesheet.hours_employee,create_uid:"
+msgid "Create User"
+msgstr "Създадено от"
-msgctxt "field:timesheet.hours_employee,employee:0"
+msgctxt "field:timesheet.hours_employee,employee:"
msgid "Employee"
msgstr "Служител"
-msgctxt "field:timesheet.hours_employee,hours:0"
+msgctxt "field:timesheet.hours_employee,hours:"
msgid "Hours"
msgstr "Часове"
-msgctxt "field:timesheet.hours_employee,rec_name:0"
+msgctxt "field:timesheet.hours_employee,id:"
+msgid "ID"
+msgstr "ID"
+
+msgctxt "field:timesheet.hours_employee,rec_name:"
msgid "Name"
msgstr "Име"
-msgctxt "field:timesheet.hours_employee_monthly,employee:0"
+msgctxt "field:timesheet.hours_employee,write_date:"
+msgid "Write Date"
+msgstr "Променено на"
+
+msgctxt "field:timesheet.hours_employee,write_uid:"
+msgid "Write User"
+msgstr "Променено от"
+
+msgctxt "field:timesheet.hours_employee.open.start,end_date:"
+msgid "End Date"
+msgstr "Крайна дата"
+
+msgctxt "field:timesheet.hours_employee.open.start,id:"
+msgid "ID"
+msgstr "ID"
+
+msgctxt "field:timesheet.hours_employee.open.start,start_date:"
+msgid "Start Date"
+msgstr "Начална дата"
+
+msgctxt "field:timesheet.hours_employee_monthly,create_date:"
+msgid "Create Date"
+msgstr "Създадено на"
+
+msgctxt "field:timesheet.hours_employee_monthly,create_uid:"
+msgid "Create User"
+msgstr "Създадено от"
+
+msgctxt "field:timesheet.hours_employee_monthly,employee:"
msgid "Employee"
msgstr "Служител"
-msgctxt "field:timesheet.hours_employee_monthly,hours:0"
+msgctxt "field:timesheet.hours_employee_monthly,hours:"
msgid "Hours"
msgstr "Часове"
-msgctxt "field:timesheet.hours_employee_monthly,month:0"
+msgctxt "field:timesheet.hours_employee_monthly,id:"
+msgid "ID"
+msgstr "ID"
+
+msgctxt "field:timesheet.hours_employee_monthly,month:"
msgid "Month"
msgstr "Месец"
-msgctxt "field:timesheet.hours_employee_monthly,rec_name:0"
+msgctxt "field:timesheet.hours_employee_monthly,rec_name:"
msgid "Name"
msgstr "Име"
-msgctxt "field:timesheet.hours_employee_monthly,year:0"
+msgctxt "field:timesheet.hours_employee_monthly,write_date:"
+msgid "Write Date"
+msgstr "Променено на"
+
+msgctxt "field:timesheet.hours_employee_monthly,write_uid:"
+msgid "Write User"
+msgstr "Променено от"
+
+msgctxt "field:timesheet.hours_employee_monthly,year:"
msgid "Year"
msgstr "Година"
-msgctxt "field:timesheet.hours_employee_weekly,employee:0"
+msgctxt "field:timesheet.hours_employee_weekly,create_date:"
+msgid "Create Date"
+msgstr "Създадено на"
+
+msgctxt "field:timesheet.hours_employee_weekly,create_uid:"
+msgid "Create User"
+msgstr "Създадено от"
+
+msgctxt "field:timesheet.hours_employee_weekly,employee:"
msgid "Employee"
msgstr "Служител"
-msgctxt "field:timesheet.hours_employee_weekly,hours:0"
+msgctxt "field:timesheet.hours_employee_weekly,hours:"
msgid "Hours"
msgstr "Часове"
-msgctxt "field:timesheet.hours_employee_weekly,rec_name:0"
+msgctxt "field:timesheet.hours_employee_weekly,id:"
+msgid "ID"
+msgstr "ID"
+
+msgctxt "field:timesheet.hours_employee_weekly,rec_name:"
msgid "Name"
msgstr "Име"
-msgctxt "field:timesheet.hours_employee_weekly,week:0"
+msgctxt "field:timesheet.hours_employee_weekly,week:"
msgid "Week"
msgstr "Седмица"
-msgctxt "field:timesheet.hours_employee_weekly,year:0"
+msgctxt "field:timesheet.hours_employee_weekly,write_date:"
+msgid "Write Date"
+msgstr "Променено на"
+
+msgctxt "field:timesheet.hours_employee_weekly,write_uid:"
+msgid "Write User"
+msgstr "Променено от"
+
+msgctxt "field:timesheet.hours_employee_weekly,year:"
msgid "Year"
msgstr "Година"
-msgctxt "field:timesheet.line,date:0"
+msgctxt "field:timesheet.line,create_date:"
+msgid "Create Date"
+msgstr "Създадено на"
+
+msgctxt "field:timesheet.line,create_uid:"
+msgid "Create User"
+msgstr "Създадено от"
+
+msgctxt "field:timesheet.line,date:"
msgid "Date"
msgstr "Дата"
-msgctxt "field:timesheet.line,description:0"
+msgctxt "field:timesheet.line,description:"
msgid "Description"
msgstr "Описание"
-msgctxt "field:timesheet.line,employee:0"
+msgctxt "field:timesheet.line,employee:"
msgid "Employee"
msgstr "Служител"
-msgctxt "field:timesheet.line,hours:0"
+msgctxt "field:timesheet.line,hours:"
msgid "Hours"
msgstr "Часове"
-msgctxt "field:timesheet.line,rec_name:0"
+msgctxt "field:timesheet.line,id:"
+msgid "ID"
+msgstr "ID"
+
+msgctxt "field:timesheet.line,rec_name:"
msgid "Name"
msgstr "Име"
-msgctxt "field:timesheet.line,work:0"
+msgctxt "field:timesheet.line,work:"
msgid "Work"
msgstr "Задача"
-msgctxt "field:timesheet.open_hours_employee.init,end_date:0"
-msgid "End Date"
-msgstr "Крайна дата"
+msgctxt "field:timesheet.line,write_date:"
+msgid "Write Date"
+msgstr "Променено на"
-msgctxt "field:timesheet.open_hours_employee.init,start_date:0"
-msgid "Start Date"
-msgstr "Начална дата"
+msgctxt "field:timesheet.line,write_uid:"
+msgid "Write User"
+msgstr "Променено от"
+
+msgctxt "field:timesheet.line.enter.start,date:"
+msgid "Date"
+msgstr "Дата"
-msgctxt "field:timesheet.work,active:0"
+msgctxt "field:timesheet.line.enter.start,employee:"
+msgid "Employee"
+msgstr "Служител"
+
+msgctxt "field:timesheet.line.enter.start,id:"
+msgid "ID"
+msgstr "ID"
+
+msgctxt "field:timesheet.work,active:"
msgid "Active"
msgstr "Активен"
-msgctxt "field:timesheet.work,children:0"
+msgctxt "field:timesheet.work,children:"
msgid "Children"
msgstr "Деца"
-msgctxt "field:timesheet.work,company:0"
+msgctxt "field:timesheet.work,company:"
msgid "Company"
msgstr "Фирма"
-msgctxt "field:timesheet.work,hours:0"
+msgctxt "field:timesheet.work,create_date:"
+msgid "Create Date"
+msgstr "Създадено на"
+
+msgctxt "field:timesheet.work,create_uid:"
+msgid "Create User"
+msgstr "Създадено от"
+
+msgctxt "field:timesheet.work,hours:"
msgid "Timesheet Hours"
msgstr "Часове от график"
-msgctxt "field:timesheet.work,left:0"
+msgctxt "field:timesheet.work,id:"
+msgid "ID"
+msgstr "ID"
+
+msgctxt "field:timesheet.work,left:"
msgid "Left"
msgstr "Ляв"
-msgctxt "field:timesheet.work,name:0"
+msgctxt "field:timesheet.work,name:"
msgid "Name"
msgstr "Име"
-msgctxt "field:timesheet.work,parent:0"
+msgctxt "field:timesheet.work,parent:"
msgid "Parent"
msgstr "Родител"
-msgctxt "field:timesheet.work,rec_name:0"
+msgctxt "field:timesheet.work,rec_name:"
msgid "Name"
msgstr "Име"
-msgctxt "field:timesheet.work,right:0"
+msgctxt "field:timesheet.work,right:"
msgid "Right"
msgstr "Десен"
-msgctxt "field:timesheet.work,timesheet_available:0"
+msgctxt "field:timesheet.work,timesheet_available:"
msgid "Available on timesheets"
msgstr "Наличен в график"
-msgctxt "field:timesheet.work,timesheet_lines:0"
+msgctxt "field:timesheet.work,timesheet_lines:"
msgid ""
msgstr ""
-msgctxt "field:timesheet.work.open.init,from_date:0"
+msgctxt "field:timesheet.work,write_date:"
+msgid "Write Date"
+msgstr "Променено на"
+
+msgctxt "field:timesheet.work,write_uid:"
+msgid "Write User"
+msgstr "Променено от"
+
+msgctxt "field:timesheet.work.open.start,from_date:"
msgid "From Date"
msgstr "От дата"
-msgctxt "field:timesheet.work.open.init,to_date:0"
+msgctxt "field:timesheet.work.open.start,id:"
+msgid "ID"
+msgstr "ID"
+
+msgctxt "field:timesheet.work.open.start,to_date:"
msgid "To Date"
msgstr "До дата"
-msgctxt "help:timesheet.work,hours:0"
+msgctxt "help:timesheet.work,hours:"
msgid "Total time spent on this work"
msgstr "Общо време за изпълнение на тази задача"
-msgctxt "help:timesheet.work,timesheet_available:0"
+msgctxt "help:timesheet.work,timesheet_available:"
msgid "Allow to fill in timesheets with this work"
msgstr "Позволява да се попълни в график с тази задача"
-msgctxt "model:ir.action,name:act_enter_lines"
-msgid "Enter Timesheet"
-msgstr "Въвеждане на график"
-
msgctxt "model:ir.action,name:act_hours_employee_form"
msgid "Hours per Employee"
msgstr "Часове на служител"
@@ -179,18 +287,22 @@ msgctxt "model:ir.action,name:act_hours_employee_monthly_form"
msgid "Hours per Employee per Month"
msgstr "Часове за служител за месец"
+msgctxt "model:ir.action,name:act_hours_employee_open"
+msgid "Hours per Employee"
+msgstr "Часове на служител"
+
msgctxt "model:ir.action,name:act_hours_employee_weekly_form"
msgid "Hours per Employee per Week"
msgstr "Часове на служител за седмица"
+msgctxt "model:ir.action,name:act_line_enter"
+msgid "Enter Timesheet"
+msgstr "Въвеждане на график"
+
msgctxt "model:ir.action,name:act_line_form"
msgid "Timesheet Lines"
msgstr "Редове от график"
-msgctxt "model:ir.action,name:act_open_hours_employee"
-msgid "Hours per Employee"
-msgstr "Часове на служител"
-
msgctxt "model:ir.action,name:act_open_work"
msgid "Hours per Work"
msgstr "Часове за работа"
@@ -207,12 +319,10 @@ msgctxt "model:ir.action,name:act_work_form3"
msgid "Hours per Work"
msgstr "Часове за работа"
-#, fuzzy
msgctxt "model:ir.action,name:act_work_hours_board"
msgid "Hours per Work"
msgstr "Часове за работа"
-#, fuzzy
msgctxt "model:ir.action,name:act_work_list"
msgid "Works"
msgstr "Зачади"
@@ -229,36 +339,34 @@ msgctxt "model:ir.ui.menu,name:menu_configuration"
msgid "Configuration"
msgstr "Конфигурация"
-msgctxt "model:ir.ui.menu,name:menu_enter_lines"
-msgid "Enter Timesheet"
-msgstr "Въвеждане на график"
-
-msgctxt "model:ir.ui.menu,name:menu_line_form"
-msgid "Timesheet Lines"
-msgstr "Редове от график"
-
-msgctxt "model:ir.ui.menu,name:menu_open_hours_employee"
+msgctxt "model:ir.ui.menu,name:menu_hours_employee_open"
msgid "Hours per Employee"
msgstr "Часове на служител"
-msgctxt "model:ir.ui.menu,name:menu_open_hours_employee_monthly"
+msgctxt "model:ir.ui.menu,name:menu_hours_employee_open_monthly"
msgid "Hours per Employee per Month"
msgstr "Часове за служител за месец"
-msgctxt "model:ir.ui.menu,name:menu_open_hours_employee_weekly"
+msgctxt "model:ir.ui.menu,name:menu_hours_employee_open_weekly"
msgid "Hours per Employee per Week"
msgstr "Часове на служител за седмица"
+msgctxt "model:ir.ui.menu,name:menu_line_enter"
+msgid "Enter Timesheet"
+msgstr "Въвеждане на график"
+
+msgctxt "model:ir.ui.menu,name:menu_line_form"
+msgid "Timesheet Lines"
+msgstr "Редове от график"
+
msgctxt "model:ir.ui.menu,name:menu_reporting"
msgid "Reporting"
msgstr "Справки"
-#, fuzzy
msgctxt "model:ir.ui.menu,name:menu_timesheet"
msgid "Timesheet"
msgstr "Управление на графици"
-#, fuzzy
msgctxt "model:ir.ui.menu,name:menu_work_list"
msgid "Works"
msgstr "Зачади"
@@ -275,118 +383,118 @@ msgctxt "model:res.group,name:group_timesheet_admin"
msgid "Timesheet Administration"
msgstr "Управление на графици"
-msgctxt "model:timesheet.enter_lines.init,name:0"
-msgid "Enter Lines Init"
-msgstr "Начално въвеждане на редове"
-
-msgctxt "model:timesheet.hours_employee,name:0"
+msgctxt "model:timesheet.hours_employee,name:"
msgid "Hours per Employee"
msgstr "Часове на служител"
-msgctxt "model:timesheet.hours_employee_monthly,name:0"
+msgctxt "model:timesheet.hours_employee.open.start,name:"
+msgid "Open Hours per Employee"
+msgstr ""
+
+msgctxt "model:timesheet.hours_employee_monthly,name:"
msgid "Hours per Employee per Month"
msgstr "Часове за служител за месец"
-msgctxt "model:timesheet.hours_employee_weekly,name:0"
+msgctxt "model:timesheet.hours_employee_weekly,name:"
msgid "Hours per Employee per Week"
msgstr "Часове на служител за седмица"
-msgctxt "model:timesheet.line,name:0"
+msgctxt "model:timesheet.line,name:"
msgid "Timesheet Line"
msgstr "Ред от график"
-msgctxt "model:timesheet.open_hours_employee.init,name:0"
-msgid "Open Hours Employee Init"
-msgstr "Начално отваряне на часове на служители"
+msgctxt "model:timesheet.line.enter.start,name:"
+msgid "Enter Lines"
+msgstr ""
-msgctxt "model:timesheet.work,name:0"
+msgctxt "model:timesheet.work,name:"
msgid "Work"
msgstr "Задача"
-msgctxt "model:timesheet.work.open.init,name:0"
-msgid "Open Work Init"
-msgstr "Начално отваряне на задача"
+msgctxt "model:timesheet.work.open.start,name:"
+msgid "Open Work"
+msgstr ""
-msgctxt "view:timesheet.enter_lines.init:0"
-msgid "Enter Timesheet"
-msgstr "Въвеждане на график"
+msgctxt "view:timesheet.hours_employee.open.start:"
+msgid "Hours per Employee"
+msgstr "Часове на служител"
-msgctxt "view:timesheet.hours_employee:0"
+msgctxt "view:timesheet.hours_employee:"
msgid "Hours"
msgstr "Часове"
-msgctxt "view:timesheet.hours_employee:0"
+msgctxt "view:timesheet.hours_employee:"
msgid "Hours per Employee"
msgstr "Часове на служител"
-msgctxt "view:timesheet.hours_employee_monthly:0"
+msgctxt "view:timesheet.hours_employee_monthly:"
msgid "Hours per Employee per Month"
msgstr "Часове за служител за месец"
-msgctxt "view:timesheet.hours_employee_weekly:0"
+msgctxt "view:timesheet.hours_employee_weekly:"
msgid "Hours per Employee per Week"
msgstr "Часове на служител за седмица"
-msgctxt "view:timesheet.line:0"
+msgctxt "view:timesheet.line.enter.start:"
+msgid "Enter Timesheet"
+msgstr "Въвеждане на график"
+
+msgctxt "view:timesheet.line:"
msgid "Hours"
msgstr "Часове"
-msgctxt "view:timesheet.line:0"
+msgctxt "view:timesheet.line:"
msgid "Timesheet Line"
msgstr "Ред от график"
-msgctxt "view:timesheet.line:0"
+msgctxt "view:timesheet.line:"
msgid "Timesheet Lines"
msgstr "Редове от график"
-msgctxt "view:timesheet.open_hours_employee.init:0"
-msgid "Hours per Employee"
-msgstr "Часове на служител"
-
-msgctxt "view:timesheet.work.open.init:0"
+msgctxt "view:timesheet.work.open.start:"
msgid "Hours per Work"
msgstr "Часове за работа"
-msgctxt "view:timesheet.work:0"
+msgctxt "view:timesheet.work:"
msgid "Hours per Work"
msgstr "Часове за работа"
-msgctxt "view:timesheet.work:0"
+msgctxt "view:timesheet.work:"
msgid "Work"
msgstr "Задача"
-msgctxt "view:timesheet.work:0"
+msgctxt "view:timesheet.work:"
msgid "Works"
msgstr "Зачади"
-msgctxt "wizard_button:timesheet.enter_lines,init,end:0"
+msgctxt "wizard_button:timesheet.hours_employee.open,start,end:"
msgid "Cancel"
msgstr "Отказ"
-msgctxt "wizard_button:timesheet.enter_lines,init,enter:0"
-msgid "Enter"
-msgstr "Въвеждане"
+msgctxt "wizard_button:timesheet.hours_employee.open,start,open_:"
+msgid "Open"
+msgstr "Отваряне"
-msgctxt "wizard_button:timesheet.open_hours_employee,init,end:0"
+msgctxt "wizard_button:timesheet.line.enter,start,end:"
msgid "Cancel"
msgstr "Отказ"
-msgctxt "wizard_button:timesheet.open_hours_employee,init,open:0"
-msgid "Open"
-msgstr "Отваряне"
+msgctxt "wizard_button:timesheet.line.enter,start,enter:"
+msgid "Enter"
+msgstr "Въвеждане"
-msgctxt "wizard_button:timesheet.work.open,init,end:0"
+msgctxt "wizard_button:timesheet.work.open,start,end:"
msgid "Cancel"
msgstr "Отказ"
-msgctxt "wizard_button:timesheet.work.open,init,open:0"
+msgctxt "wizard_button:timesheet.work.open,start,open_:"
msgid "Open"
msgstr "Отваряне"
-msgctxt "wizard_button:timesheet.work.open2,init,end:0"
+msgctxt "wizard_button:timesheet.work.open2,start,end:"
msgid "Cancel"
msgstr "Отказ"
-msgctxt "wizard_button:timesheet.work.open2,init,open:0"
+msgctxt "wizard_button:timesheet.work.open2,start,open_:"
msgid "Open"
msgstr "Отваряне"
diff --git a/locale/ca_ES.po b/locale/ca_ES.po
new file mode 100644
index 0000000..e55d4a4
--- /dev/null
+++ b/locale/ca_ES.po
@@ -0,0 +1,527 @@
+#
+msgid ""
+msgstr "Content-Type: text/plain; charset=utf-8\n"
+
+msgctxt "error:timesheet.line:"
+msgid "Hours field must be positive"
+msgstr "El camp d'hores ha de ser positiu"
+
+msgctxt "error:timesheet.work:"
+msgid "Every work must be in the same company as it's parent work!"
+msgstr "Cada treball ha d'estar en la mateixa empresa que el seu treball pare"
+
+msgctxt "error:timesheet.work:"
+msgid "You can not create recursive works!"
+msgstr "No pot crear treballs recursius"
+
+msgctxt "field:timesheet.hours_employee,create_date:"
+msgid "Create Date"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:timesheet.hours_employee,create_uid:"
+msgid "Create User"
+msgstr "Crear usuari"
+
+msgctxt "field:timesheet.hours_employee,employee:"
+msgid "Employee"
+msgstr "Empleat"
+
+msgctxt "field:timesheet.hours_employee,hours:"
+msgid "Hours"
+msgstr "Hores"
+
+msgctxt "field:timesheet.hours_employee,id:"
+msgid "ID"
+msgstr ""
+
+msgctxt "field:timesheet.hours_employee,rec_name:"
+msgid "Name"
+msgstr "Nom"
+
+msgctxt "field:timesheet.hours_employee,write_date:"
+msgid "Write Date"
+msgstr ""
+
+msgctxt "field:timesheet.hours_employee,write_uid:"
+msgid "Write User"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:timesheet.hours_employee.open.start,end_date:"
+msgid "End Date"
+msgstr "Data final"
+
+msgctxt "field:timesheet.hours_employee.open.start,id:"
+msgid "ID"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:timesheet.hours_employee.open.start,start_date:"
+msgid "Start Date"
+msgstr "Data inici"
+
+msgctxt "field:timesheet.hours_employee_monthly,create_date:"
+msgid "Create Date"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:timesheet.hours_employee_monthly,create_uid:"
+msgid "Create User"
+msgstr "Crear usuari"
+
+msgctxt "field:timesheet.hours_employee_monthly,employee:"
+msgid "Employee"
+msgstr "Empleat"
+
+msgctxt "field:timesheet.hours_employee_monthly,hours:"
+msgid "Hours"
+msgstr "Hores"
+
+msgctxt "field:timesheet.hours_employee_monthly,id:"
+msgid "ID"
+msgstr ""
+
+msgctxt "field:timesheet.hours_employee_monthly,month:"
+msgid "Month"
+msgstr "Mes"
+
+msgctxt "field:timesheet.hours_employee_monthly,rec_name:"
+msgid "Name"
+msgstr "Nom"
+
+msgctxt "field:timesheet.hours_employee_monthly,write_date:"
+msgid "Write Date"
+msgstr ""
+
+msgctxt "field:timesheet.hours_employee_monthly,write_uid:"
+msgid "Write User"
+msgstr ""
+
+msgctxt "field:timesheet.hours_employee_monthly,year:"
+msgid "Year"
+msgstr "Any"
+
+msgctxt "field:timesheet.hours_employee_weekly,create_date:"
+msgid "Create Date"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:timesheet.hours_employee_weekly,create_uid:"
+msgid "Create User"
+msgstr "Crear usuari"
+
+msgctxt "field:timesheet.hours_employee_weekly,employee:"
+msgid "Employee"
+msgstr "Empleat"
+
+msgctxt "field:timesheet.hours_employee_weekly,hours:"
+msgid "Hours"
+msgstr "Hores"
+
+msgctxt "field:timesheet.hours_employee_weekly,id:"
+msgid "ID"
+msgstr ""
+
+msgctxt "field:timesheet.hours_employee_weekly,rec_name:"
+msgid "Name"
+msgstr "Nom"
+
+msgctxt "field:timesheet.hours_employee_weekly,week:"
+msgid "Week"
+msgstr "Setmana"
+
+msgctxt "field:timesheet.hours_employee_weekly,write_date:"
+msgid "Write Date"
+msgstr ""
+
+msgctxt "field:timesheet.hours_employee_weekly,write_uid:"
+msgid "Write User"
+msgstr ""
+
+msgctxt "field:timesheet.hours_employee_weekly,year:"
+msgid "Year"
+msgstr "Any"
+
+msgctxt "field:timesheet.line,create_date:"
+msgid "Create Date"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:timesheet.line,create_uid:"
+msgid "Create User"
+msgstr "Crear usuari"
+
+msgctxt "field:timesheet.line,date:"
+msgid "Date"
+msgstr "Data"
+
+msgctxt "field:timesheet.line,description:"
+msgid "Description"
+msgstr "Descripció"
+
+msgctxt "field:timesheet.line,employee:"
+msgid "Employee"
+msgstr "Empleat"
+
+msgctxt "field:timesheet.line,hours:"
+msgid "Hours"
+msgstr "Hores"
+
+msgctxt "field:timesheet.line,id:"
+msgid "ID"
+msgstr ""
+
+msgctxt "field:timesheet.line,rec_name:"
+msgid "Name"
+msgstr "Nom"
+
+msgctxt "field:timesheet.line,work:"
+msgid "Work"
+msgstr "Treball"
+
+msgctxt "field:timesheet.line,write_date:"
+msgid "Write Date"
+msgstr ""
+
+msgctxt "field:timesheet.line,write_uid:"
+msgid "Write User"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:timesheet.line.enter.start,date:"
+msgid "Date"
+msgstr "Data"
+
+#, fuzzy
+msgctxt "field:timesheet.line.enter.start,employee:"
+msgid "Employee"
+msgstr "Empleat"
+
+msgctxt "field:timesheet.line.enter.start,id:"
+msgid "ID"
+msgstr ""
+
+msgctxt "field:timesheet.work,active:"
+msgid "Active"
+msgstr "Actiu"
+
+msgctxt "field:timesheet.work,children:"
+msgid "Children"
+msgstr "Fills"
+
+msgctxt "field:timesheet.work,company:"
+msgid "Company"
+msgstr "Empresa"
+
+msgctxt "field:timesheet.work,create_date:"
+msgid "Create Date"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:timesheet.work,create_uid:"
+msgid "Create User"
+msgstr "Crear usuari"
+
+msgctxt "field:timesheet.work,hours:"
+msgid "Timesheet Hours"
+msgstr "Hores del full de treball"
+
+msgctxt "field:timesheet.work,id:"
+msgid "ID"
+msgstr ""
+
+msgctxt "field:timesheet.work,left:"
+msgid "Left"
+msgstr "Esquerra"
+
+msgctxt "field:timesheet.work,name:"
+msgid "Name"
+msgstr "Nom"
+
+msgctxt "field:timesheet.work,parent:"
+msgid "Parent"
+msgstr "Pare"
+
+msgctxt "field:timesheet.work,rec_name:"
+msgid "Name"
+msgstr "Nom"
+
+msgctxt "field:timesheet.work,right:"
+msgid "Right"
+msgstr "Dreta"
+
+msgctxt "field:timesheet.work,timesheet_available:"
+msgid "Available on timesheets"
+msgstr "Disponible en fulls de treball"
+
+msgctxt "field:timesheet.work,timesheet_lines:"
+msgid ""
+msgstr ""
+
+msgctxt "field:timesheet.work,write_date:"
+msgid "Write Date"
+msgstr ""
+
+msgctxt "field:timesheet.work,write_uid:"
+msgid "Write User"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:timesheet.work.open.start,from_date:"
+msgid "From Date"
+msgstr "Des de la data"
+
+msgctxt "field:timesheet.work.open.start,id:"
+msgid "ID"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:timesheet.work.open.start,to_date:"
+msgid "To Date"
+msgstr "Fins a la data"
+
+msgctxt "help:timesheet.work,hours:"
+msgid "Total time spent on this work"
+msgstr "Temps total empleat en aquest treball"
+
+msgctxt "help:timesheet.work,timesheet_available:"
+msgid "Allow to fill in timesheets with this work"
+msgstr "Permet completar fullsde treball amb aquest treball"
+
+msgctxt "model:ir.action,name:act_hours_employee_form"
+msgid "Hours per Employee"
+msgstr "Hores per empleat"
+
+msgctxt "model:ir.action,name:act_hours_employee_monthly_form"
+msgid "Hours per Employee per Month"
+msgstr "Hores per empleat i mes"
+
+#, fuzzy
+msgctxt "model:ir.action,name:act_hours_employee_open"
+msgid "Hours per Employee"
+msgstr "Hores per empleat"
+
+msgctxt "model:ir.action,name:act_hours_employee_weekly_form"
+msgid "Hours per Employee per Week"
+msgstr "Hores per empleat i setmana"
+
+msgctxt "model:ir.action,name:act_line_enter"
+msgid "Enter Timesheet"
+msgstr ""
+
+msgctxt "model:ir.action,name:act_line_form"
+msgid "Timesheet Lines"
+msgstr "Línies del full de treball"
+
+msgctxt "model:ir.action,name:act_open_work"
+msgid "Hours per Work"
+msgstr "Hores per treball"
+
+msgctxt "model:ir.action,name:act_open_work_graph"
+msgid "Hours per Work"
+msgstr "Hores per treball"
+
+msgctxt "model:ir.action,name:act_work_form2"
+msgid "Hours per Work"
+msgstr "Hores per treball"
+
+msgctxt "model:ir.action,name:act_work_form3"
+msgid "Hours per Work"
+msgstr "Hores per treball"
+
+#, fuzzy
+msgctxt "model:ir.action,name:act_work_hours_board"
+msgid "Hours per Work"
+msgstr "Hores per treball"
+
+#, fuzzy
+msgctxt "model:ir.action,name:act_work_list"
+msgid "Works"
+msgstr "Treballs"
+
+msgctxt "model:ir.action,name:act_work_tree"
+msgid "Works"
+msgstr "Treballs"
+
+msgctxt "model:ir.action,name:act_work_tree2"
+msgid "Works"
+msgstr "Treballs"
+
+msgctxt "model:ir.ui.menu,name:menu_configuration"
+msgid "Configuration"
+msgstr "Configuració"
+
+#, fuzzy
+msgctxt "model:ir.ui.menu,name:menu_hours_employee_open"
+msgid "Hours per Employee"
+msgstr "Hores per empleat"
+
+#, fuzzy
+msgctxt "model:ir.ui.menu,name:menu_hours_employee_open_monthly"
+msgid "Hours per Employee per Month"
+msgstr "Hores per empleat i mes"
+
+#, fuzzy
+msgctxt "model:ir.ui.menu,name:menu_hours_employee_open_weekly"
+msgid "Hours per Employee per Week"
+msgstr "Hores per empleat i setmana"
+
+msgctxt "model:ir.ui.menu,name:menu_line_enter"
+msgid "Enter Timesheet"
+msgstr ""
+
+msgctxt "model:ir.ui.menu,name:menu_line_form"
+msgid "Timesheet Lines"
+msgstr "Línies de full de treball"
+
+msgctxt "model:ir.ui.menu,name:menu_reporting"
+msgid "Reporting"
+msgstr "Informes"
+
+#, fuzzy
+msgctxt "model:ir.ui.menu,name:menu_timesheet"
+msgid "Timesheet"
+msgstr "Gestió de fulls de treball"
+
+#, fuzzy
+msgctxt "model:ir.ui.menu,name:menu_work_list"
+msgid "Works"
+msgstr "Treballs"
+
+msgctxt "model:ir.ui.menu,name:menu_work_tree"
+msgid "Works"
+msgstr "Treballs"
+
+msgctxt "model:ir.ui.menu,name:menu_work_tree2"
+msgid "Hours per Work"
+msgstr "Hores per treball"
+
+msgctxt "model:res.group,name:group_timesheet_admin"
+msgid "Timesheet Administration"
+msgstr "Administració de fulls de treball"
+
+msgctxt "model:timesheet.hours_employee,name:"
+msgid "Hours per Employee"
+msgstr "Hores per empleat"
+
+msgctxt "model:timesheet.hours_employee.open.start,name:"
+msgid "Open Hours per Employee"
+msgstr ""
+
+msgctxt "model:timesheet.hours_employee_monthly,name:"
+msgid "Hours per Employee per Month"
+msgstr "Hores per empleat i mes"
+
+msgctxt "model:timesheet.hours_employee_weekly,name:"
+msgid "Hours per Employee per Week"
+msgstr "Hores per empleat i setmana"
+
+msgctxt "model:timesheet.line,name:"
+msgid "Timesheet Line"
+msgstr "Línia de full de treball"
+
+msgctxt "model:timesheet.line.enter.start,name:"
+msgid "Enter Lines"
+msgstr ""
+
+msgctxt "model:timesheet.work,name:"
+msgid "Work"
+msgstr "Treball"
+
+msgctxt "model:timesheet.work.open.start,name:"
+msgid "Open Work"
+msgstr ""
+
+#, fuzzy
+msgctxt "view:timesheet.hours_employee.open.start:"
+msgid "Hours per Employee"
+msgstr "Hores per empleat"
+
+msgctxt "view:timesheet.hours_employee:"
+msgid "Hours"
+msgstr "Hores"
+
+msgctxt "view:timesheet.hours_employee:"
+msgid "Hours per Employee"
+msgstr "Hores per empleat"
+
+msgctxt "view:timesheet.hours_employee_monthly:"
+msgid "Hours per Employee per Month"
+msgstr "Hores per empleat i mes"
+
+msgctxt "view:timesheet.hours_employee_weekly:"
+msgid "Hours per Employee per Week"
+msgstr "Hores per empleat i setmana"
+
+msgctxt "view:timesheet.line.enter.start:"
+msgid "Enter Timesheet"
+msgstr ""
+
+msgctxt "view:timesheet.line:"
+msgid "Hours"
+msgstr "Hores"
+
+msgctxt "view:timesheet.line:"
+msgid "Timesheet Line"
+msgstr "Línia de full de treball"
+
+msgctxt "view:timesheet.line:"
+msgid "Timesheet Lines"
+msgstr "Línies de full de treball"
+
+#, fuzzy
+msgctxt "view:timesheet.work.open.start:"
+msgid "Hours per Work"
+msgstr "Hores per treball"
+
+msgctxt "view:timesheet.work:"
+msgid "Hours per Work"
+msgstr "Hores per treball"
+
+msgctxt "view:timesheet.work:"
+msgid "Work"
+msgstr "Treball"
+
+msgctxt "view:timesheet.work:"
+msgid "Works"
+msgstr "Treballs"
+
+#, fuzzy
+msgctxt "wizard_button:timesheet.hours_employee.open,start,end:"
+msgid "Cancel"
+msgstr "Cancel·lar"
+
+#, fuzzy
+msgctxt "wizard_button:timesheet.hours_employee.open,start,open_:"
+msgid "Open"
+msgstr "Obrir"
+
+#, fuzzy
+msgctxt "wizard_button:timesheet.line.enter,start,end:"
+msgid "Cancel"
+msgstr "Cancel·lar"
+
+msgctxt "wizard_button:timesheet.line.enter,start,enter:"
+msgid "Enter"
+msgstr ""
+
+#, fuzzy
+msgctxt "wizard_button:timesheet.work.open,start,end:"
+msgid "Cancel"
+msgstr "Cancel·lar"
+
+#, fuzzy
+msgctxt "wizard_button:timesheet.work.open,start,open_:"
+msgid "Open"
+msgstr "Obrir"
+
+#, fuzzy
+msgctxt "wizard_button:timesheet.work.open2,start,end:"
+msgid "Cancel"
+msgstr "Cancel·lar"
+
+#, fuzzy
+msgctxt "wizard_button:timesheet.work.open2,start,open_:"
+msgid "Open"
+msgstr "Obrir"
diff --git a/locale/cs_CZ.po b/locale/cs_CZ.po
index 31dc45b..d4eb353 100644
--- a/locale/cs_CZ.po
+++ b/locale/cs_CZ.po
@@ -2,174 +2,282 @@
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
-msgctxt "error:timesheet.line:0"
+msgctxt "error:timesheet.line:"
msgid "Hours field must be positive"
msgstr ""
-msgctxt "error:timesheet.work:0"
+msgctxt "error:timesheet.work:"
msgid "Every work must be in the same company as it's parent work!"
msgstr ""
-msgctxt "error:timesheet.work:0"
+msgctxt "error:timesheet.work:"
msgid "You can not create recursive works!"
msgstr ""
-msgctxt "field:timesheet.enter_lines.init,date:0"
-msgid "Date"
+msgctxt "field:timesheet.hours_employee,create_date:"
+msgid "Create Date"
msgstr ""
-msgctxt "field:timesheet.enter_lines.init,employee:0"
-msgid "Employee"
+msgctxt "field:timesheet.hours_employee,create_uid:"
+msgid "Create User"
msgstr ""
-msgctxt "field:timesheet.hours_employee,employee:0"
+msgctxt "field:timesheet.hours_employee,employee:"
msgid "Employee"
msgstr ""
-msgctxt "field:timesheet.hours_employee,hours:0"
+msgctxt "field:timesheet.hours_employee,hours:"
msgid "Hours"
msgstr ""
-msgctxt "field:timesheet.hours_employee,rec_name:0"
+msgctxt "field:timesheet.hours_employee,id:"
+msgid "ID"
+msgstr ""
+
+msgctxt "field:timesheet.hours_employee,rec_name:"
msgid "Name"
msgstr ""
-msgctxt "field:timesheet.hours_employee_monthly,employee:0"
+msgctxt "field:timesheet.hours_employee,write_date:"
+msgid "Write Date"
+msgstr ""
+
+msgctxt "field:timesheet.hours_employee,write_uid:"
+msgid "Write User"
+msgstr ""
+
+msgctxt "field:timesheet.hours_employee.open.start,end_date:"
+msgid "End Date"
+msgstr ""
+
+msgctxt "field:timesheet.hours_employee.open.start,id:"
+msgid "ID"
+msgstr ""
+
+msgctxt "field:timesheet.hours_employee.open.start,start_date:"
+msgid "Start Date"
+msgstr ""
+
+msgctxt "field:timesheet.hours_employee_monthly,create_date:"
+msgid "Create Date"
+msgstr ""
+
+msgctxt "field:timesheet.hours_employee_monthly,create_uid:"
+msgid "Create User"
+msgstr ""
+
+msgctxt "field:timesheet.hours_employee_monthly,employee:"
msgid "Employee"
msgstr ""
-msgctxt "field:timesheet.hours_employee_monthly,hours:0"
+msgctxt "field:timesheet.hours_employee_monthly,hours:"
msgid "Hours"
msgstr ""
-msgctxt "field:timesheet.hours_employee_monthly,month:0"
+msgctxt "field:timesheet.hours_employee_monthly,id:"
+msgid "ID"
+msgstr ""
+
+msgctxt "field:timesheet.hours_employee_monthly,month:"
msgid "Month"
msgstr ""
-msgctxt "field:timesheet.hours_employee_monthly,rec_name:0"
+msgctxt "field:timesheet.hours_employee_monthly,rec_name:"
msgid "Name"
msgstr ""
-msgctxt "field:timesheet.hours_employee_monthly,year:0"
+msgctxt "field:timesheet.hours_employee_monthly,write_date:"
+msgid "Write Date"
+msgstr ""
+
+msgctxt "field:timesheet.hours_employee_monthly,write_uid:"
+msgid "Write User"
+msgstr ""
+
+msgctxt "field:timesheet.hours_employee_monthly,year:"
msgid "Year"
msgstr ""
-msgctxt "field:timesheet.hours_employee_weekly,employee:0"
+msgctxt "field:timesheet.hours_employee_weekly,create_date:"
+msgid "Create Date"
+msgstr ""
+
+msgctxt "field:timesheet.hours_employee_weekly,create_uid:"
+msgid "Create User"
+msgstr ""
+
+msgctxt "field:timesheet.hours_employee_weekly,employee:"
msgid "Employee"
msgstr ""
-msgctxt "field:timesheet.hours_employee_weekly,hours:0"
+msgctxt "field:timesheet.hours_employee_weekly,hours:"
msgid "Hours"
msgstr ""
-msgctxt "field:timesheet.hours_employee_weekly,rec_name:0"
+msgctxt "field:timesheet.hours_employee_weekly,id:"
+msgid "ID"
+msgstr ""
+
+msgctxt "field:timesheet.hours_employee_weekly,rec_name:"
msgid "Name"
msgstr ""
-msgctxt "field:timesheet.hours_employee_weekly,week:0"
+msgctxt "field:timesheet.hours_employee_weekly,week:"
msgid "Week"
msgstr ""
-msgctxt "field:timesheet.hours_employee_weekly,year:0"
+msgctxt "field:timesheet.hours_employee_weekly,write_date:"
+msgid "Write Date"
+msgstr ""
+
+msgctxt "field:timesheet.hours_employee_weekly,write_uid:"
+msgid "Write User"
+msgstr ""
+
+msgctxt "field:timesheet.hours_employee_weekly,year:"
msgid "Year"
msgstr ""
-msgctxt "field:timesheet.line,date:0"
+msgctxt "field:timesheet.line,create_date:"
+msgid "Create Date"
+msgstr ""
+
+msgctxt "field:timesheet.line,create_uid:"
+msgid "Create User"
+msgstr ""
+
+msgctxt "field:timesheet.line,date:"
msgid "Date"
msgstr ""
-msgctxt "field:timesheet.line,description:0"
+msgctxt "field:timesheet.line,description:"
msgid "Description"
msgstr ""
-msgctxt "field:timesheet.line,employee:0"
+msgctxt "field:timesheet.line,employee:"
msgid "Employee"
msgstr ""
-msgctxt "field:timesheet.line,hours:0"
+msgctxt "field:timesheet.line,hours:"
msgid "Hours"
msgstr ""
-msgctxt "field:timesheet.line,rec_name:0"
+msgctxt "field:timesheet.line,id:"
+msgid "ID"
+msgstr ""
+
+msgctxt "field:timesheet.line,rec_name:"
msgid "Name"
msgstr ""
-msgctxt "field:timesheet.line,work:0"
+msgctxt "field:timesheet.line,work:"
msgid "Work"
msgstr ""
-msgctxt "field:timesheet.open_hours_employee.init,end_date:0"
-msgid "End Date"
+msgctxt "field:timesheet.line,write_date:"
+msgid "Write Date"
msgstr ""
-msgctxt "field:timesheet.open_hours_employee.init,start_date:0"
-msgid "Start Date"
+msgctxt "field:timesheet.line,write_uid:"
+msgid "Write User"
+msgstr ""
+
+msgctxt "field:timesheet.line.enter.start,date:"
+msgid "Date"
+msgstr ""
+
+msgctxt "field:timesheet.line.enter.start,employee:"
+msgid "Employee"
+msgstr ""
+
+msgctxt "field:timesheet.line.enter.start,id:"
+msgid "ID"
msgstr ""
-msgctxt "field:timesheet.work,active:0"
+msgctxt "field:timesheet.work,active:"
msgid "Active"
msgstr ""
-msgctxt "field:timesheet.work,children:0"
+msgctxt "field:timesheet.work,children:"
msgid "Children"
msgstr ""
-msgctxt "field:timesheet.work,company:0"
+msgctxt "field:timesheet.work,company:"
msgid "Company"
msgstr ""
-msgctxt "field:timesheet.work,hours:0"
+msgctxt "field:timesheet.work,create_date:"
+msgid "Create Date"
+msgstr ""
+
+msgctxt "field:timesheet.work,create_uid:"
+msgid "Create User"
+msgstr ""
+
+msgctxt "field:timesheet.work,hours:"
msgid "Timesheet Hours"
msgstr ""
-msgctxt "field:timesheet.work,left:0"
+msgctxt "field:timesheet.work,id:"
+msgid "ID"
+msgstr ""
+
+msgctxt "field:timesheet.work,left:"
msgid "Left"
msgstr ""
-msgctxt "field:timesheet.work,name:0"
+msgctxt "field:timesheet.work,name:"
msgid "Name"
msgstr ""
-msgctxt "field:timesheet.work,parent:0"
+msgctxt "field:timesheet.work,parent:"
msgid "Parent"
msgstr ""
-msgctxt "field:timesheet.work,rec_name:0"
+msgctxt "field:timesheet.work,rec_name:"
msgid "Name"
msgstr ""
-msgctxt "field:timesheet.work,right:0"
+msgctxt "field:timesheet.work,right:"
msgid "Right"
msgstr ""
-msgctxt "field:timesheet.work,timesheet_available:0"
+msgctxt "field:timesheet.work,timesheet_available:"
msgid "Available on timesheets"
msgstr ""
-msgctxt "field:timesheet.work,timesheet_lines:0"
+msgctxt "field:timesheet.work,timesheet_lines:"
msgid "Timesheet Lines"
msgstr ""
-msgctxt "field:timesheet.work.open.init,from_date:0"
+msgctxt "field:timesheet.work,write_date:"
+msgid "Write Date"
+msgstr ""
+
+msgctxt "field:timesheet.work,write_uid:"
+msgid "Write User"
+msgstr ""
+
+msgctxt "field:timesheet.work.open.start,from_date:"
msgid "From Date"
msgstr ""
-msgctxt "field:timesheet.work.open.init,to_date:0"
+msgctxt "field:timesheet.work.open.start,id:"
+msgid "ID"
+msgstr ""
+
+msgctxt "field:timesheet.work.open.start,to_date:"
msgid "To Date"
msgstr ""
-msgctxt "help:timesheet.work,hours:0"
+msgctxt "help:timesheet.work,hours:"
msgid "Total time spent on this work"
msgstr ""
-msgctxt "help:timesheet.work,timesheet_available:0"
+msgctxt "help:timesheet.work,timesheet_available:"
msgid "Allow to fill in timesheets with this work"
msgstr ""
-msgctxt "model:ir.action,name:act_enter_lines"
-msgid "Enter Timesheet"
-msgstr ""
-
msgctxt "model:ir.action,name:act_hours_employee_form"
msgid "Hours per Employee"
msgstr ""
@@ -178,16 +286,20 @@ msgctxt "model:ir.action,name:act_hours_employee_monthly_form"
msgid "Hours per Employee per Month"
msgstr ""
+msgctxt "model:ir.action,name:act_hours_employee_open"
+msgid "Hours per Employee"
+msgstr ""
+
msgctxt "model:ir.action,name:act_hours_employee_weekly_form"
msgid "Hours per Employee per Week"
msgstr ""
-msgctxt "model:ir.action,name:act_line_form"
-msgid "Timesheet Lines"
+msgctxt "model:ir.action,name:act_line_enter"
+msgid "Enter Timesheet"
msgstr ""
-msgctxt "model:ir.action,name:act_open_hours_employee"
-msgid "Hours per Employee"
+msgctxt "model:ir.action,name:act_line_form"
+msgid "Timesheet Lines"
msgstr ""
msgctxt "model:ir.action,name:act_open_work"
@@ -226,24 +338,24 @@ msgctxt "model:ir.ui.menu,name:menu_configuration"
msgid "Configuration"
msgstr ""
-msgctxt "model:ir.ui.menu,name:menu_enter_lines"
-msgid "Enter Timesheet"
+msgctxt "model:ir.ui.menu,name:menu_hours_employee_open"
+msgid "Hours per Employee"
msgstr ""
-msgctxt "model:ir.ui.menu,name:menu_line_form"
-msgid "Timesheet Lines"
+msgctxt "model:ir.ui.menu,name:menu_hours_employee_open_monthly"
+msgid "Hours per Employee per Month"
msgstr ""
-msgctxt "model:ir.ui.menu,name:menu_open_hours_employee"
-msgid "Hours per Employee"
+msgctxt "model:ir.ui.menu,name:menu_hours_employee_open_weekly"
+msgid "Hours per Employee per Week"
msgstr ""
-msgctxt "model:ir.ui.menu,name:menu_open_hours_employee_monthly"
-msgid "Hours per Employee per Month"
+msgctxt "model:ir.ui.menu,name:menu_line_enter"
+msgid "Enter Timesheet"
msgstr ""
-msgctxt "model:ir.ui.menu,name:menu_open_hours_employee_weekly"
-msgid "Hours per Employee per Week"
+msgctxt "model:ir.ui.menu,name:menu_line_form"
+msgid "Timesheet Lines"
msgstr ""
msgctxt "model:ir.ui.menu,name:menu_reporting"
@@ -270,118 +382,118 @@ msgctxt "model:res.group,name:group_timesheet_admin"
msgid "Timesheet Administration"
msgstr ""
-msgctxt "model:timesheet.enter_lines.init,name:0"
-msgid "Enter Lines Init"
+msgctxt "model:timesheet.hours_employee,name:"
+msgid "Hours per Employee"
msgstr ""
-msgctxt "model:timesheet.hours_employee,name:0"
-msgid "Hours per Employee"
+msgctxt "model:timesheet.hours_employee.open.start,name:"
+msgid "Open Hours per Employee"
msgstr ""
-msgctxt "model:timesheet.hours_employee_monthly,name:0"
+msgctxt "model:timesheet.hours_employee_monthly,name:"
msgid "Hours per Employee per Month"
msgstr ""
-msgctxt "model:timesheet.hours_employee_weekly,name:0"
+msgctxt "model:timesheet.hours_employee_weekly,name:"
msgid "Hours per Employee per Week"
msgstr ""
-msgctxt "model:timesheet.line,name:0"
+msgctxt "model:timesheet.line,name:"
msgid "Timesheet Line"
msgstr ""
-msgctxt "model:timesheet.open_hours_employee.init,name:0"
-msgid "Open Hours Employee Init"
+msgctxt "model:timesheet.line.enter.start,name:"
+msgid "Enter Lines"
msgstr ""
-msgctxt "model:timesheet.work,name:0"
+msgctxt "model:timesheet.work,name:"
msgid "Work"
msgstr ""
-msgctxt "model:timesheet.work.open.init,name:0"
-msgid "Open Work Init"
+msgctxt "model:timesheet.work.open.start,name:"
+msgid "Open Work"
msgstr ""
-msgctxt "view:timesheet.enter_lines.init:0"
-msgid "Enter Timesheet"
+msgctxt "view:timesheet.hours_employee.open.start:"
+msgid "Hours per Employee"
msgstr ""
-msgctxt "view:timesheet.hours_employee:0"
+msgctxt "view:timesheet.hours_employee:"
msgid "Hours"
msgstr ""
-msgctxt "view:timesheet.hours_employee:0"
+msgctxt "view:timesheet.hours_employee:"
msgid "Hours per Employee"
msgstr ""
-msgctxt "view:timesheet.hours_employee_monthly:0"
+msgctxt "view:timesheet.hours_employee_monthly:"
msgid "Hours per Employee per Month"
msgstr ""
-msgctxt "view:timesheet.hours_employee_weekly:0"
+msgctxt "view:timesheet.hours_employee_weekly:"
msgid "Hours per Employee per Week"
msgstr ""
-msgctxt "view:timesheet.line:0"
+msgctxt "view:timesheet.line.enter.start:"
+msgid "Enter Timesheet"
+msgstr ""
+
+msgctxt "view:timesheet.line:"
msgid "Hours"
msgstr ""
-msgctxt "view:timesheet.line:0"
+msgctxt "view:timesheet.line:"
msgid "Timesheet Line"
msgstr ""
-msgctxt "view:timesheet.line:0"
+msgctxt "view:timesheet.line:"
msgid "Timesheet Lines"
msgstr ""
-msgctxt "view:timesheet.open_hours_employee.init:0"
-msgid "Hours per Employee"
-msgstr ""
-
-msgctxt "view:timesheet.work.open.init:0"
+msgctxt "view:timesheet.work.open.start:"
msgid "Hours per Work"
msgstr ""
-msgctxt "view:timesheet.work:0"
+msgctxt "view:timesheet.work:"
msgid "Hours per Work"
msgstr ""
-msgctxt "view:timesheet.work:0"
+msgctxt "view:timesheet.work:"
msgid "Work"
msgstr ""
-msgctxt "view:timesheet.work:0"
+msgctxt "view:timesheet.work:"
msgid "Works"
msgstr ""
-msgctxt "wizard_button:timesheet.enter_lines,init,end:0"
+msgctxt "wizard_button:timesheet.hours_employee.open,start,end:"
msgid "Cancel"
msgstr ""
-msgctxt "wizard_button:timesheet.enter_lines,init,enter:0"
-msgid "Enter"
+msgctxt "wizard_button:timesheet.hours_employee.open,start,open_:"
+msgid "Open"
msgstr ""
-msgctxt "wizard_button:timesheet.open_hours_employee,init,end:0"
+msgctxt "wizard_button:timesheet.line.enter,start,end:"
msgid "Cancel"
msgstr ""
-msgctxt "wizard_button:timesheet.open_hours_employee,init,open:0"
-msgid "Open"
+msgctxt "wizard_button:timesheet.line.enter,start,enter:"
+msgid "Enter"
msgstr ""
-msgctxt "wizard_button:timesheet.work.open,init,end:0"
+msgctxt "wizard_button:timesheet.work.open,start,end:"
msgid "Cancel"
msgstr ""
-msgctxt "wizard_button:timesheet.work.open,init,open:0"
+msgctxt "wizard_button:timesheet.work.open,start,open_:"
msgid "Open"
msgstr ""
-msgctxt "wizard_button:timesheet.work.open2,init,end:0"
+msgctxt "wizard_button:timesheet.work.open2,start,end:"
msgid "Cancel"
msgstr ""
-msgctxt "wizard_button:timesheet.work.open2,init,open:0"
+msgctxt "wizard_button:timesheet.work.open2,start,open_:"
msgid "Open"
msgstr ""
diff --git a/locale/de_DE.po b/locale/de_DE.po
index bf79908..39677c5 100644
--- a/locale/de_DE.po
+++ b/locale/de_DE.po
@@ -2,276 +2,284 @@
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
-msgctxt "error:timesheet.line:0"
+msgctxt "error:timesheet.line:"
msgid "Hours field must be positive"
msgstr "Feld Stunden muss einen positiven Wert haben"
-msgctxt "error:timesheet.work:0"
+msgctxt "error:timesheet.work:"
msgid "Every work must be in the same company as it's parent work!"
msgstr ""
"Eine Aufgabe muss immer zum selben Unternehmen wie die übergeordnete Aufgabe"
" gehören!"
-msgctxt "error:timesheet.work:0"
+msgctxt "error:timesheet.work:"
msgid "You can not create recursive works!"
msgstr "Aufgaben können nicht rekursiv angelegt werden!"
-msgctxt "field:timesheet.enter_lines.init,date:0"
-msgid "Date"
-msgstr "Datum"
-
-msgctxt "field:timesheet.enter_lines.init,employee:0"
-msgid "Employee"
-msgstr "Mitarbeiter"
-
-msgctxt "field:timesheet.hours_employee,create_date:0"
-msgid "Creation date"
+msgctxt "field:timesheet.hours_employee,create_date:"
+msgid "Create Date"
msgstr "Erstellungsdatum"
-msgctxt "field:timesheet.hours_employee,create_uid:0"
-msgid "Creation user"
-msgstr "Ersteller"
+msgctxt "field:timesheet.hours_employee,create_uid:"
+msgid "Create User"
+msgstr "Erstellt durch"
-msgctxt "field:timesheet.hours_employee,employee:0"
+msgctxt "field:timesheet.hours_employee,employee:"
msgid "Employee"
msgstr "Mitarbeiter"
-msgctxt "field:timesheet.hours_employee,hours:0"
+msgctxt "field:timesheet.hours_employee,hours:"
msgid "Hours"
msgstr "Stunden"
-msgctxt "field:timesheet.hours_employee,id:0"
+msgctxt "field:timesheet.hours_employee,id:"
msgid "ID"
msgstr "ID"
-msgctxt "field:timesheet.hours_employee,rec_name:0"
+msgctxt "field:timesheet.hours_employee,rec_name:"
msgid "Name"
msgstr "Name"
-msgctxt "field:timesheet.hours_employee,write_date:0"
-msgid "Last modification date"
-msgstr "Zuletzt geändert am"
+msgctxt "field:timesheet.hours_employee,write_date:"
+msgid "Write Date"
+msgstr "Zuletzt geändert"
+
+msgctxt "field:timesheet.hours_employee,write_uid:"
+msgid "Write User"
+msgstr "Letzte Änderung durch"
+
+msgctxt "field:timesheet.hours_employee.open.start,end_date:"
+msgid "End Date"
+msgstr "Enddatum"
+
+msgctxt "field:timesheet.hours_employee.open.start,id:"
+msgid "ID"
+msgstr "ID"
-msgctxt "field:timesheet.hours_employee,write_uid:0"
-msgid "Last modification by"
-msgstr "Zuletzt geändert von"
+msgctxt "field:timesheet.hours_employee.open.start,start_date:"
+msgid "Start Date"
+msgstr "Anfangsdatum"
-msgctxt "field:timesheet.hours_employee_monthly,create_date:0"
-msgid "Creation date"
+msgctxt "field:timesheet.hours_employee_monthly,create_date:"
+msgid "Create Date"
msgstr "Erstellungsdatum"
-msgctxt "field:timesheet.hours_employee_monthly,create_uid:0"
-msgid "Creation user"
-msgstr "Ersteller"
+msgctxt "field:timesheet.hours_employee_monthly,create_uid:"
+msgid "Create User"
+msgstr "Erstellt durch"
-msgctxt "field:timesheet.hours_employee_monthly,employee:0"
+msgctxt "field:timesheet.hours_employee_monthly,employee:"
msgid "Employee"
msgstr "Mitarbeiter"
-msgctxt "field:timesheet.hours_employee_monthly,hours:0"
+msgctxt "field:timesheet.hours_employee_monthly,hours:"
msgid "Hours"
msgstr "Stunden"
-msgctxt "field:timesheet.hours_employee_monthly,id:0"
+msgctxt "field:timesheet.hours_employee_monthly,id:"
msgid "ID"
msgstr "ID"
-msgctxt "field:timesheet.hours_employee_monthly,month:0"
+msgctxt "field:timesheet.hours_employee_monthly,month:"
msgid "Month"
msgstr "Monat"
-msgctxt "field:timesheet.hours_employee_monthly,rec_name:0"
+msgctxt "field:timesheet.hours_employee_monthly,rec_name:"
msgid "Name"
msgstr "Name"
-msgctxt "field:timesheet.hours_employee_monthly,write_date:0"
-msgid "Last modification date"
-msgstr "Zuletzt geändert am"
+msgctxt "field:timesheet.hours_employee_monthly,write_date:"
+msgid "Write Date"
+msgstr "Zuletzt geändert"
-msgctxt "field:timesheet.hours_employee_monthly,write_uid:0"
-msgid "Last modification by"
-msgstr "Zuletzt geändert von"
+msgctxt "field:timesheet.hours_employee_monthly,write_uid:"
+msgid "Write User"
+msgstr "Letzte Änderung durch"
-msgctxt "field:timesheet.hours_employee_monthly,year:0"
+msgctxt "field:timesheet.hours_employee_monthly,year:"
msgid "Year"
msgstr "Jahr"
-msgctxt "field:timesheet.hours_employee_weekly,create_date:0"
-msgid "Creation date"
+msgctxt "field:timesheet.hours_employee_weekly,create_date:"
+msgid "Create Date"
msgstr "Erstellungsdatum"
-msgctxt "field:timesheet.hours_employee_weekly,create_uid:0"
-msgid "Creation user"
-msgstr "Ersteller"
+msgctxt "field:timesheet.hours_employee_weekly,create_uid:"
+msgid "Create User"
+msgstr "Erstellt durch"
-msgctxt "field:timesheet.hours_employee_weekly,employee:0"
+msgctxt "field:timesheet.hours_employee_weekly,employee:"
msgid "Employee"
msgstr "Mitarbeiter"
-msgctxt "field:timesheet.hours_employee_weekly,hours:0"
+msgctxt "field:timesheet.hours_employee_weekly,hours:"
msgid "Hours"
msgstr "Stunden"
-msgctxt "field:timesheet.hours_employee_weekly,id:0"
+msgctxt "field:timesheet.hours_employee_weekly,id:"
msgid "ID"
msgstr "ID"
-msgctxt "field:timesheet.hours_employee_weekly,rec_name:0"
+msgctxt "field:timesheet.hours_employee_weekly,rec_name:"
msgid "Name"
msgstr "Name"
-msgctxt "field:timesheet.hours_employee_weekly,week:0"
+msgctxt "field:timesheet.hours_employee_weekly,week:"
msgid "Week"
msgstr "Woche"
-msgctxt "field:timesheet.hours_employee_weekly,write_date:0"
-msgid "Last modification date"
-msgstr "Zuletzt geändert am"
+msgctxt "field:timesheet.hours_employee_weekly,write_date:"
+msgid "Write Date"
+msgstr "Zuletzt geändert"
-msgctxt "field:timesheet.hours_employee_weekly,write_uid:0"
-msgid "Last modification by"
-msgstr "Zuletzt geändert von"
+msgctxt "field:timesheet.hours_employee_weekly,write_uid:"
+msgid "Write User"
+msgstr "Letzte Änderung durch"
-msgctxt "field:timesheet.hours_employee_weekly,year:0"
+msgctxt "field:timesheet.hours_employee_weekly,year:"
msgid "Year"
msgstr "Jahr"
-msgctxt "field:timesheet.line,create_date:0"
-msgid "Creation date"
+msgctxt "field:timesheet.line,create_date:"
+msgid "Create Date"
msgstr "Erstellungsdatum"
-msgctxt "field:timesheet.line,create_uid:0"
-msgid "Creation user"
-msgstr "Ersteller"
+msgctxt "field:timesheet.line,create_uid:"
+msgid "Create User"
+msgstr "Erstellt durch"
-msgctxt "field:timesheet.line,date:0"
+msgctxt "field:timesheet.line,date:"
msgid "Date"
msgstr "Datum"
-msgctxt "field:timesheet.line,description:0"
+msgctxt "field:timesheet.line,description:"
msgid "Description"
msgstr "Beschreibung"
-msgctxt "field:timesheet.line,employee:0"
+msgctxt "field:timesheet.line,employee:"
msgid "Employee"
msgstr "Mitarbeiter"
-msgctxt "field:timesheet.line,hours:0"
+msgctxt "field:timesheet.line,hours:"
msgid "Hours"
msgstr "Stunden"
-msgctxt "field:timesheet.line,id:0"
+msgctxt "field:timesheet.line,id:"
msgid "ID"
msgstr "ID"
-msgctxt "field:timesheet.line,rec_name:0"
+msgctxt "field:timesheet.line,rec_name:"
msgid "Name"
msgstr "Name"
-msgctxt "field:timesheet.line,work:0"
+msgctxt "field:timesheet.line,work:"
msgid "Work"
msgstr "Aufgabe"
-msgctxt "field:timesheet.line,write_date:0"
-msgid "Last modification date"
-msgstr "Zuletzt geändert am"
+msgctxt "field:timesheet.line,write_date:"
+msgid "Write Date"
+msgstr "Zuletzt geändert"
-msgctxt "field:timesheet.line,write_uid:0"
-msgid "Last modification by"
-msgstr "Zuletzt geändert von"
+msgctxt "field:timesheet.line,write_uid:"
+msgid "Write User"
+msgstr "Letzte Änderung durch"
-msgctxt "field:timesheet.open_hours_employee.init,end_date:0"
-msgid "End Date"
-msgstr "Enddatum"
+msgctxt "field:timesheet.line.enter.start,date:"
+msgid "Date"
+msgstr "Datum"
-msgctxt "field:timesheet.open_hours_employee.init,start_date:0"
-msgid "Start Date"
-msgstr "Anfangsdatum"
+msgctxt "field:timesheet.line.enter.start,employee:"
+msgid "Employee"
+msgstr "Mitarbeiter"
+
+msgctxt "field:timesheet.line.enter.start,id:"
+msgid "ID"
+msgstr "ID"
-msgctxt "field:timesheet.work,active:0"
+msgctxt "field:timesheet.work,active:"
msgid "Active"
msgstr "Aktiv"
-msgctxt "field:timesheet.work,children:0"
+msgctxt "field:timesheet.work,children:"
msgid "Children"
msgstr "Untergeordnet (Aufgaben)"
-msgctxt "field:timesheet.work,company:0"
+msgctxt "field:timesheet.work,company:"
msgid "Company"
msgstr "Unternehmen"
-msgctxt "field:timesheet.work,create_date:0"
-msgid "Creation date"
+msgctxt "field:timesheet.work,create_date:"
+msgid "Create Date"
msgstr "Erstellungsdatum"
-msgctxt "field:timesheet.work,create_uid:0"
-msgid "Creation user"
-msgstr "Ersteller"
+msgctxt "field:timesheet.work,create_uid:"
+msgid "Create User"
+msgstr "Erstellt durch"
-msgctxt "field:timesheet.work,hours:0"
+msgctxt "field:timesheet.work,hours:"
msgid "Timesheet Hours"
msgstr "Stunden"
-msgctxt "field:timesheet.work,id:0"
+msgctxt "field:timesheet.work,id:"
msgid "ID"
msgstr "ID"
-msgctxt "field:timesheet.work,left:0"
+msgctxt "field:timesheet.work,left:"
msgid "Left"
msgstr "Links"
-msgctxt "field:timesheet.work,name:0"
+msgctxt "field:timesheet.work,name:"
msgid "Name"
msgstr "Name"
-msgctxt "field:timesheet.work,parent:0"
+msgctxt "field:timesheet.work,parent:"
msgid "Parent"
msgstr "Übergeordnet (Aufgabe)"
-msgctxt "field:timesheet.work,rec_name:0"
+msgctxt "field:timesheet.work,rec_name:"
msgid "Name"
msgstr "Name"
-msgctxt "field:timesheet.work,right:0"
+msgctxt "field:timesheet.work,right:"
msgid "Right"
msgstr "Rechts"
-msgctxt "field:timesheet.work,timesheet_available:0"
+msgctxt "field:timesheet.work,timesheet_available:"
msgid "Available on timesheets"
msgstr "Verfügbar für Zeiterfassung"
-msgctxt "field:timesheet.work,timesheet_lines:0"
+msgctxt "field:timesheet.work,timesheet_lines:"
msgid ""
msgstr ""
-msgctxt "field:timesheet.work,write_date:0"
-msgid "Last modification date"
-msgstr "Zuletzt geändert am"
+msgctxt "field:timesheet.work,write_date:"
+msgid "Write Date"
+msgstr "Zuletzt geändert"
-msgctxt "field:timesheet.work,write_uid:0"
-msgid "Last modification by"
-msgstr "Zuletzt geändert von"
+msgctxt "field:timesheet.work,write_uid:"
+msgid "Write User"
+msgstr "Letzte Änderung durch"
-msgctxt "field:timesheet.work.open.init,from_date:0"
+msgctxt "field:timesheet.work.open.start,from_date:"
msgid "From Date"
-msgstr "Von"
+msgstr "Von Datum"
-msgctxt "field:timesheet.work.open.init,to_date:0"
+msgctxt "field:timesheet.work.open.start,id:"
+msgid "ID"
+msgstr "ID"
+
+msgctxt "field:timesheet.work.open.start,to_date:"
msgid "To Date"
-msgstr "Bis"
+msgstr "Bis Datum"
-msgctxt "help:timesheet.work,hours:0"
+msgctxt "help:timesheet.work,hours:"
msgid "Total time spent on this work"
msgstr "Gesamtzeit für diese Arbeit"
-msgctxt "help:timesheet.work,timesheet_available:0"
+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"
-msgctxt "model:ir.action,name:act_enter_lines"
-msgid "Enter Timesheet"
-msgstr "Zur Zeiterfassung"
-
msgctxt "model:ir.action,name:act_hours_employee_form"
msgid "Hours per Employee"
msgstr "Stunden pro Mitarbeiter"
@@ -280,18 +288,22 @@ msgctxt "model:ir.action,name:act_hours_employee_monthly_form"
msgid "Hours per Employee per Month"
msgstr "Stunden pro Mitarbeiter pro Monat"
+msgctxt "model:ir.action,name:act_hours_employee_open"
+msgid "Hours per Employee"
+msgstr "Stunden pro Mitarbeiter"
+
msgctxt "model:ir.action,name:act_hours_employee_weekly_form"
msgid "Hours per Employee per Week"
msgstr "Stunden pro Mitarbeiter pro Monat"
+msgctxt "model:ir.action,name:act_line_enter"
+msgid "Enter Timesheet"
+msgstr "Zur Zeiterfassung"
+
msgctxt "model:ir.action,name:act_line_form"
msgid "Timesheet Lines"
msgstr "Zeitpositionen"
-msgctxt "model:ir.action,name:act_open_hours_employee"
-msgid "Hours per Employee"
-msgstr "Stunden pro Mitarbeiter"
-
msgctxt "model:ir.action,name:act_open_work"
msgid "Hours per Work"
msgstr "Stunden pro Aufgabe"
@@ -328,25 +340,25 @@ msgctxt "model:ir.ui.menu,name:menu_configuration"
msgid "Configuration"
msgstr "Einstellungen"
-msgctxt "model:ir.ui.menu,name:menu_enter_lines"
-msgid "Enter Timesheet"
-msgstr "Zur Zeiterfassung"
-
-msgctxt "model:ir.ui.menu,name:menu_line_form"
-msgid "Timesheet Lines"
-msgstr "Zeitpositionen"
-
-msgctxt "model:ir.ui.menu,name:menu_open_hours_employee"
+msgctxt "model:ir.ui.menu,name:menu_hours_employee_open"
msgid "Hours per Employee"
msgstr "Stunden pro Mitarbeiter"
-msgctxt "model:ir.ui.menu,name:menu_open_hours_employee_monthly"
+msgctxt "model:ir.ui.menu,name:menu_hours_employee_open_monthly"
msgid "Hours per Employee per Month"
-msgstr "Stunden pro Mitarbeiter pro Monat"
+msgstr "Stunden pro Mitarbeiter und Monat"
-msgctxt "model:ir.ui.menu,name:menu_open_hours_employee_weekly"
+msgctxt "model:ir.ui.menu,name:menu_hours_employee_open_weekly"
msgid "Hours per Employee per Week"
-msgstr "Stunden pro Mitarbeiter pro Woche"
+msgstr "Stunden pro Mitarbeiter und Woche"
+
+msgctxt "model:ir.ui.menu,name:menu_line_enter"
+msgid "Enter Timesheet"
+msgstr "Zur Zeiterfassung"
+
+msgctxt "model:ir.ui.menu,name:menu_line_form"
+msgid "Timesheet Lines"
+msgstr "Zeitpositionen"
msgctxt "model:ir.ui.menu,name:menu_reporting"
msgid "Reporting"
@@ -372,118 +384,118 @@ msgctxt "model:res.group,name:group_timesheet_admin"
msgid "Timesheet Administration"
msgstr "Zeiterfassung Administration"
-msgctxt "model:timesheet.enter_lines.init,name:0"
-msgid "Enter Lines Init"
-msgstr "Eingabe Zeitposition Init"
-
-msgctxt "model:timesheet.hours_employee,name:0"
+msgctxt "model:timesheet.hours_employee,name:"
msgid "Hours per Employee"
msgstr "Stunden pro Mitarbeiter"
-msgctxt "model:timesheet.hours_employee_monthly,name:0"
+msgctxt "model:timesheet.hours_employee.open.start,name:"
+msgid "Open Hours per Employee"
+msgstr "Stunden pro Mitarbeiter Öffnen"
+
+msgctxt "model:timesheet.hours_employee_monthly,name:"
msgid "Hours per Employee per Month"
msgstr "Stunden pro Mitarbeiter und Monat"
-msgctxt "model:timesheet.hours_employee_weekly,name:0"
+msgctxt "model:timesheet.hours_employee_weekly,name:"
msgid "Hours per Employee per Week"
msgstr "Stunden pro Mitarbeiter und Woche"
-msgctxt "model:timesheet.line,name:0"
+msgctxt "model:timesheet.line,name:"
msgid "Timesheet Line"
msgstr "Zeitposition"
-msgctxt "model:timesheet.open_hours_employee.init,name:0"
-msgid "Open Hours Employee Init"
-msgstr "Stunden Mitarbeiter Öffnen Init"
+msgctxt "model:timesheet.line.enter.start,name:"
+msgid "Enter Lines"
+msgstr "Eingabe Zeilen"
-msgctxt "model:timesheet.work,name:0"
+msgctxt "model:timesheet.work,name:"
msgid "Work"
msgstr "Aufgabe"
-msgctxt "model:timesheet.work.open.init,name:0"
-msgid "Open Work Init"
-msgstr "Aufgabe Öffnen Init"
+msgctxt "model:timesheet.work.open.start,name:"
+msgid "Open Work"
+msgstr "Aufgabe Öffnen"
-msgctxt "view:timesheet.enter_lines.init:0"
-msgid "Enter Timesheet"
-msgstr "Zur Zeiterfassung"
+msgctxt "view:timesheet.hours_employee.open.start:"
+msgid "Hours per Employee"
+msgstr "Stunden pro Mitarbeiter"
-msgctxt "view:timesheet.hours_employee:0"
+msgctxt "view:timesheet.hours_employee:"
msgid "Hours"
msgstr "Stunden"
-msgctxt "view:timesheet.hours_employee:0"
+msgctxt "view:timesheet.hours_employee:"
msgid "Hours per Employee"
msgstr "Stunden pro Mitarbeiter"
-msgctxt "view:timesheet.hours_employee_monthly:0"
+msgctxt "view:timesheet.hours_employee_monthly:"
msgid "Hours per Employee per Month"
msgstr "Stunden pro Mitarbeiter pro Monat"
-msgctxt "view:timesheet.hours_employee_weekly:0"
+msgctxt "view:timesheet.hours_employee_weekly:"
msgid "Hours per Employee per Week"
msgstr "Stunden pro Mitarbeiter pro Woche"
-msgctxt "view:timesheet.line:0"
+msgctxt "view:timesheet.line.enter.start:"
+msgid "Enter Timesheet"
+msgstr "Zur Zeiterfassung"
+
+msgctxt "view:timesheet.line:"
msgid "Hours"
msgstr "Stunden"
-msgctxt "view:timesheet.line:0"
+msgctxt "view:timesheet.line:"
msgid "Timesheet Line"
msgstr "Zeitposition"
-msgctxt "view:timesheet.line:0"
+msgctxt "view:timesheet.line:"
msgid "Timesheet Lines"
msgstr "Zeitpositionen"
-msgctxt "view:timesheet.open_hours_employee.init:0"
-msgid "Hours per Employee"
-msgstr "Stunden pro Mitarbeiter"
-
-msgctxt "view:timesheet.work.open.init:0"
+msgctxt "view:timesheet.work.open.start:"
msgid "Hours per Work"
msgstr "Stunden pro Aufgabe"
-msgctxt "view:timesheet.work:0"
+msgctxt "view:timesheet.work:"
msgid "Hours per Work"
msgstr "Stunden pro Aufgabe"
-msgctxt "view:timesheet.work:0"
+msgctxt "view:timesheet.work:"
msgid "Work"
msgstr "Aufgabe"
-msgctxt "view:timesheet.work:0"
+msgctxt "view:timesheet.work:"
msgid "Works"
msgstr "Aufgaben"
-msgctxt "wizard_button:timesheet.enter_lines,init,end:0"
+msgctxt "wizard_button:timesheet.hours_employee.open,start,end:"
msgid "Cancel"
msgstr "Abbrechen"
-msgctxt "wizard_button:timesheet.enter_lines,init,enter:0"
-msgid "Enter"
-msgstr "Zur Eingabe"
+msgctxt "wizard_button:timesheet.hours_employee.open,start,open_:"
+msgid "Open"
+msgstr "Öffnen"
-msgctxt "wizard_button:timesheet.open_hours_employee,init,end:0"
+msgctxt "wizard_button:timesheet.line.enter,start,end:"
msgid "Cancel"
msgstr "Abbrechen"
-msgctxt "wizard_button:timesheet.open_hours_employee,init,open:0"
-msgid "Open"
-msgstr "Öffnen"
+msgctxt "wizard_button:timesheet.line.enter,start,enter:"
+msgid "Enter"
+msgstr "Zur Eingabe"
-msgctxt "wizard_button:timesheet.work.open,init,end:0"
+msgctxt "wizard_button:timesheet.work.open,start,end:"
msgid "Cancel"
msgstr "Abbrechen"
-msgctxt "wizard_button:timesheet.work.open,init,open:0"
+msgctxt "wizard_button:timesheet.work.open,start,open_:"
msgid "Open"
msgstr "Öffnen"
-msgctxt "wizard_button:timesheet.work.open2,init,end:0"
+msgctxt "wizard_button:timesheet.work.open2,start,end:"
msgid "Cancel"
msgstr "Abbrechen"
-msgctxt "wizard_button:timesheet.work.open2,init,open:0"
+msgctxt "wizard_button:timesheet.work.open2,start,open_:"
msgid "Open"
msgstr "Öffnen"
diff --git a/locale/es_AR.po b/locale/es_AR.po
new file mode 100644
index 0000000..d4019dc
--- /dev/null
+++ b/locale/es_AR.po
@@ -0,0 +1,499 @@
+#
+msgid ""
+msgstr "Content-Type: text/plain; charset=utf-8\n"
+
+msgctxt "error:timesheet.line:"
+msgid "Hours field must be positive"
+msgstr "El campo de horas debe ser positivo"
+
+msgctxt "error:timesheet.work:"
+msgid "Every work must be in the same company as it's parent work!"
+msgstr "¡Cada trabajo debe estar en la misma empresa que su trabajo padre!"
+
+msgctxt "error:timesheet.work:"
+msgid "You can not create recursive works!"
+msgstr "¡No puede crear trabajos recursivos!"
+
+msgctxt "field:timesheet.hours_employee,create_date:"
+msgid "Create Date"
+msgstr "Fecha creación"
+
+msgctxt "field:timesheet.hours_employee,create_uid:"
+msgid "Create User"
+msgstr "Usuario creación"
+
+msgctxt "field:timesheet.hours_employee,employee:"
+msgid "Employee"
+msgstr "Empleado"
+
+msgctxt "field:timesheet.hours_employee,hours:"
+msgid "Hours"
+msgstr "Horas"
+
+msgctxt "field:timesheet.hours_employee,id:"
+msgid "ID"
+msgstr "ID"
+
+msgctxt "field:timesheet.hours_employee,rec_name:"
+msgid "Name"
+msgstr "Nombre"
+
+msgctxt "field:timesheet.hours_employee,write_date:"
+msgid "Write Date"
+msgstr "Fecha modificación"
+
+msgctxt "field:timesheet.hours_employee,write_uid:"
+msgid "Write User"
+msgstr "Usuario modificación"
+
+msgctxt "field:timesheet.hours_employee.open.start,end_date:"
+msgid "End Date"
+msgstr "Fecha final"
+
+msgctxt "field:timesheet.hours_employee.open.start,id:"
+msgid "ID"
+msgstr "ID"
+
+msgctxt "field:timesheet.hours_employee.open.start,start_date:"
+msgid "Start Date"
+msgstr "Fecha inicio"
+
+msgctxt "field:timesheet.hours_employee_monthly,create_date:"
+msgid "Create Date"
+msgstr "Fecha creación"
+
+msgctxt "field:timesheet.hours_employee_monthly,create_uid:"
+msgid "Create User"
+msgstr "Usuario creación"
+
+msgctxt "field:timesheet.hours_employee_monthly,employee:"
+msgid "Employee"
+msgstr "Empleado"
+
+msgctxt "field:timesheet.hours_employee_monthly,hours:"
+msgid "Hours"
+msgstr "Horas"
+
+msgctxt "field:timesheet.hours_employee_monthly,id:"
+msgid "ID"
+msgstr "ID"
+
+msgctxt "field:timesheet.hours_employee_monthly,month:"
+msgid "Month"
+msgstr "Mes"
+
+msgctxt "field:timesheet.hours_employee_monthly,rec_name:"
+msgid "Name"
+msgstr "Nombre"
+
+msgctxt "field:timesheet.hours_employee_monthly,write_date:"
+msgid "Write Date"
+msgstr "Fecha modificación"
+
+msgctxt "field:timesheet.hours_employee_monthly,write_uid:"
+msgid "Write User"
+msgstr "Usuario modificación"
+
+msgctxt "field:timesheet.hours_employee_monthly,year:"
+msgid "Year"
+msgstr "Año"
+
+msgctxt "field:timesheet.hours_employee_weekly,create_date:"
+msgid "Create Date"
+msgstr "Fecha creación"
+
+msgctxt "field:timesheet.hours_employee_weekly,create_uid:"
+msgid "Create User"
+msgstr "Usuario creación"
+
+msgctxt "field:timesheet.hours_employee_weekly,employee:"
+msgid "Employee"
+msgstr "Empleado"
+
+msgctxt "field:timesheet.hours_employee_weekly,hours:"
+msgid "Hours"
+msgstr "Horas"
+
+msgctxt "field:timesheet.hours_employee_weekly,id:"
+msgid "ID"
+msgstr "ID"
+
+msgctxt "field:timesheet.hours_employee_weekly,rec_name:"
+msgid "Name"
+msgstr "Nombre"
+
+msgctxt "field:timesheet.hours_employee_weekly,week:"
+msgid "Week"
+msgstr "Semana"
+
+msgctxt "field:timesheet.hours_employee_weekly,write_date:"
+msgid "Write Date"
+msgstr "Fecha modificación"
+
+msgctxt "field:timesheet.hours_employee_weekly,write_uid:"
+msgid "Write User"
+msgstr "Usuario modificación"
+
+msgctxt "field:timesheet.hours_employee_weekly,year:"
+msgid "Year"
+msgstr "Año"
+
+msgctxt "field:timesheet.line,create_date:"
+msgid "Create Date"
+msgstr "Fecha creación"
+
+msgctxt "field:timesheet.line,create_uid:"
+msgid "Create User"
+msgstr "Usuario creación"
+
+msgctxt "field:timesheet.line,date:"
+msgid "Date"
+msgstr "Fecha"
+
+msgctxt "field:timesheet.line,description:"
+msgid "Description"
+msgstr "Descripción"
+
+msgctxt "field:timesheet.line,employee:"
+msgid "Employee"
+msgstr "Empleado"
+
+msgctxt "field:timesheet.line,hours:"
+msgid "Hours"
+msgstr "Horas"
+
+msgctxt "field:timesheet.line,id:"
+msgid "ID"
+msgstr "ID"
+
+msgctxt "field:timesheet.line,rec_name:"
+msgid "Name"
+msgstr "Nombre"
+
+msgctxt "field:timesheet.line,work:"
+msgid "Work"
+msgstr "Trabajo"
+
+msgctxt "field:timesheet.line,write_date:"
+msgid "Write Date"
+msgstr "Fecha modificación"
+
+msgctxt "field:timesheet.line,write_uid:"
+msgid "Write User"
+msgstr "Usuario modificación"
+
+msgctxt "field:timesheet.line.enter.start,date:"
+msgid "Date"
+msgstr "Fecha"
+
+msgctxt "field:timesheet.line.enter.start,employee:"
+msgid "Employee"
+msgstr "Empleado"
+
+msgctxt "field:timesheet.line.enter.start,id:"
+msgid "ID"
+msgstr "ID"
+
+msgctxt "field:timesheet.work,active:"
+msgid "Active"
+msgstr "Activo"
+
+msgctxt "field:timesheet.work,children:"
+msgid "Children"
+msgstr "Hijos"
+
+msgctxt "field:timesheet.work,company:"
+msgid "Company"
+msgstr "Empresa"
+
+msgctxt "field:timesheet.work,create_date:"
+msgid "Create Date"
+msgstr "Fecha creación"
+
+msgctxt "field:timesheet.work,create_uid:"
+msgid "Create User"
+msgstr "Usuario creación"
+
+msgctxt "field:timesheet.work,hours:"
+msgid "Timesheet Hours"
+msgstr "Horas del parte de trabajo"
+
+msgctxt "field:timesheet.work,id:"
+msgid "ID"
+msgstr "ID"
+
+msgctxt "field:timesheet.work,left:"
+msgid "Left"
+msgstr "Izquierda"
+
+msgctxt "field:timesheet.work,name:"
+msgid "Name"
+msgstr "Nombre"
+
+msgctxt "field:timesheet.work,parent:"
+msgid "Parent"
+msgstr "Padre"
+
+msgctxt "field:timesheet.work,rec_name:"
+msgid "Name"
+msgstr "Nombre"
+
+msgctxt "field:timesheet.work,right:"
+msgid "Right"
+msgstr "Derecha"
+
+msgctxt "field:timesheet.work,timesheet_available:"
+msgid "Available on timesheets"
+msgstr "Disponible en partes de trabajo"
+
+msgctxt "field:timesheet.work,timesheet_lines:"
+msgid ""
+msgstr ""
+
+msgctxt "field:timesheet.work,write_date:"
+msgid "Write Date"
+msgstr "Fecha modificación"
+
+msgctxt "field:timesheet.work,write_uid:"
+msgid "Write User"
+msgstr "Usuario modificación"
+
+msgctxt "field:timesheet.work.open.start,from_date:"
+msgid "From Date"
+msgstr "Fecha inicial"
+
+msgctxt "field:timesheet.work.open.start,id:"
+msgid "ID"
+msgstr "ID"
+
+msgctxt "field:timesheet.work.open.start,to_date:"
+msgid "To Date"
+msgstr "Hasta la fecha"
+
+msgctxt "help:timesheet.work,hours:"
+msgid "Total time spent on this work"
+msgstr "Tiempo total empleado en este trabajo"
+
+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 "model:ir.action,name:act_hours_employee_form"
+msgid "Hours per Employee"
+msgstr "Horas por empleado"
+
+msgctxt "model:ir.action,name:act_hours_employee_monthly_form"
+msgid "Hours per Employee per Month"
+msgstr "Horas por empleado y mes"
+
+msgctxt "model:ir.action,name:act_hours_employee_open"
+msgid "Hours per Employee"
+msgstr "Horas por empleado"
+
+msgctxt "model:ir.action,name:act_hours_employee_weekly_form"
+msgid "Hours per Employee per Week"
+msgstr "Horas por empleado y semana"
+
+msgctxt "model:ir.action,name:act_line_enter"
+msgid "Enter Timesheet"
+msgstr "Ingresar parte de trabajo"
+
+msgctxt "model:ir.action,name:act_line_form"
+msgid "Timesheet Lines"
+msgstr "Líneas del parte de trabajo"
+
+msgctxt "model:ir.action,name:act_open_work"
+msgid "Hours per Work"
+msgstr "Horas por trabajo"
+
+msgctxt "model:ir.action,name:act_open_work_graph"
+msgid "Hours per Work"
+msgstr "Horas por trabajo"
+
+msgctxt "model:ir.action,name:act_work_form2"
+msgid "Hours per Work"
+msgstr "Horas por trabajo"
+
+msgctxt "model:ir.action,name:act_work_form3"
+msgid "Hours per Work"
+msgstr "Horas por trabajo"
+
+msgctxt "model:ir.action,name:act_work_hours_board"
+msgid "Hours per Work"
+msgstr "Horas por trabajo"
+
+msgctxt "model:ir.action,name:act_work_list"
+msgid "Works"
+msgstr "Trabajos"
+
+msgctxt "model:ir.action,name:act_work_tree"
+msgid "Works"
+msgstr "Trabajos"
+
+msgctxt "model:ir.action,name:act_work_tree2"
+msgid "Works"
+msgstr "Trabajos"
+
+msgctxt "model:ir.ui.menu,name:menu_configuration"
+msgid "Configuration"
+msgstr "Configuración"
+
+msgctxt "model:ir.ui.menu,name:menu_hours_employee_open"
+msgid "Hours per Employee"
+msgstr "Horas por empleado"
+
+msgctxt "model:ir.ui.menu,name:menu_hours_employee_open_monthly"
+msgid "Hours per Employee per Month"
+msgstr "Horas por empleado y mes"
+
+msgctxt "model:ir.ui.menu,name:menu_hours_employee_open_weekly"
+msgid "Hours per Employee per Week"
+msgstr "Horas por empleado y semana"
+
+msgctxt "model:ir.ui.menu,name:menu_line_enter"
+msgid "Enter Timesheet"
+msgstr "Ingrese parte de trabajo"
+
+msgctxt "model:ir.ui.menu,name:menu_line_form"
+msgid "Timesheet Lines"
+msgstr "Lineas de parte de trabajo"
+
+msgctxt "model:ir.ui.menu,name:menu_reporting"
+msgid "Reporting"
+msgstr "Informes"
+
+msgctxt "model:ir.ui.menu,name:menu_timesheet"
+msgid "Timesheet"
+msgstr "Gestión de parte de trabajo"
+
+msgctxt "model:ir.ui.menu,name:menu_work_list"
+msgid "Works"
+msgstr "Trabajos"
+
+msgctxt "model:ir.ui.menu,name:menu_work_tree"
+msgid "Works"
+msgstr "Trabajos"
+
+msgctxt "model:ir.ui.menu,name:menu_work_tree2"
+msgid "Hours per Work"
+msgstr "Horas por trabajo"
+
+msgctxt "model:res.group,name:group_timesheet_admin"
+msgid "Timesheet Administration"
+msgstr "Administración de parte de trabajo"
+
+msgctxt "model:timesheet.hours_employee,name:"
+msgid "Hours per Employee"
+msgstr "Horas por empleado"
+
+msgctxt "model:timesheet.hours_employee.open.start,name:"
+msgid "Open Hours per Employee"
+msgstr "Horas abiertas por empleado"
+
+msgctxt "model:timesheet.hours_employee_monthly,name:"
+msgid "Hours per Employee per Month"
+msgstr "Horas por empleado y mes"
+
+msgctxt "model:timesheet.hours_employee_weekly,name:"
+msgid "Hours per Employee per Week"
+msgstr "Horas por empleado y semana"
+
+msgctxt "model:timesheet.line,name:"
+msgid "Timesheet Line"
+msgstr "Linea de parte de trabajo"
+
+msgctxt "model:timesheet.line.enter.start,name:"
+msgid "Enter Lines"
+msgstr "Ingresar líneas"
+
+msgctxt "model:timesheet.work,name:"
+msgid "Work"
+msgstr "Trabajo"
+
+msgctxt "model:timesheet.work.open.start,name:"
+msgid "Open Work"
+msgstr "Trabajo abierto"
+
+msgctxt "view:timesheet.hours_employee.open.start:"
+msgid "Hours per Employee"
+msgstr "Horas por empleado"
+
+msgctxt "view:timesheet.hours_employee:"
+msgid "Hours"
+msgstr "Horas"
+
+msgctxt "view:timesheet.hours_employee:"
+msgid "Hours per Employee"
+msgstr "Horas por empleado"
+
+msgctxt "view:timesheet.hours_employee_monthly:"
+msgid "Hours per Employee per Month"
+msgstr "Horas por empleado y mes"
+
+msgctxt "view:timesheet.hours_employee_weekly:"
+msgid "Hours per Employee per Week"
+msgstr "Horas por empleado y semana"
+
+msgctxt "view:timesheet.line.enter.start:"
+msgid "Enter Timesheet"
+msgstr "Ingrese parte de trabajo"
+
+msgctxt "view:timesheet.line:"
+msgid "Hours"
+msgstr "Horas"
+
+msgctxt "view:timesheet.line:"
+msgid "Timesheet Line"
+msgstr "Linea de parte de trabajo"
+
+msgctxt "view:timesheet.line:"
+msgid "Timesheet Lines"
+msgstr "Lineas de parte de trabajo"
+
+msgctxt "view:timesheet.work.open.start:"
+msgid "Hours per Work"
+msgstr "Horas por trabajo"
+
+msgctxt "view:timesheet.work:"
+msgid "Hours per Work"
+msgstr "Horas por trabajo"
+
+msgctxt "view:timesheet.work:"
+msgid "Work"
+msgstr "Trabajo"
+
+msgctxt "view:timesheet.work:"
+msgid "Works"
+msgstr "Trabajos"
+
+msgctxt "wizard_button:timesheet.hours_employee.open,start,end:"
+msgid "Cancel"
+msgstr "Cancelar"
+
+msgctxt "wizard_button:timesheet.hours_employee.open,start,open_:"
+msgid "Open"
+msgstr "Abrir"
+
+msgctxt "wizard_button:timesheet.line.enter,start,end:"
+msgid "Cancel"
+msgstr "Cancelar"
+
+msgctxt "wizard_button:timesheet.line.enter,start,enter:"
+msgid "Enter"
+msgstr "Ingresar"
+
+msgctxt "wizard_button:timesheet.work.open,start,end:"
+msgid "Cancel"
+msgstr "Cancelar"
+
+msgctxt "wizard_button:timesheet.work.open,start,open_:"
+msgid "Open"
+msgstr "Abrir"
+
+msgctxt "wizard_button:timesheet.work.open2,start,end:"
+msgid "Cancel"
+msgstr "Cancelar"
+
+msgctxt "wizard_button:timesheet.work.open2,start,open_:"
+msgid "Open"
+msgstr "Abrir"
diff --git a/locale/es_CO.po b/locale/es_CO.po
index da48567..4f5b9a5 100644
--- a/locale/es_CO.po
+++ b/locale/es_CO.po
@@ -2,176 +2,295 @@
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
-msgctxt "error:timesheet.line:0"
+msgctxt "error:timesheet.line:"
msgid "Hours field must be positive"
msgstr "El campo Horas debe ser positivo"
-msgctxt "error:timesheet.work:0"
+msgctxt "error:timesheet.work:"
msgid "Every work must be in the same company as it's parent work!"
msgstr ""
"¡Cada trabajo debe estar en la misma compañía lo mismo que el trabajo que lo"
" originó!"
-msgctxt "error:timesheet.work:0"
+msgctxt "error:timesheet.work:"
msgid "You can not create recursive works!"
msgstr "No puede crear trabajos recursivos!"
-msgctxt "field:timesheet.enter_lines.init,date:0"
-msgid "Date"
-msgstr "Fecha"
+msgctxt "field:timesheet.hours_employee,create_date:"
+msgid "Create Date"
+msgstr ""
-msgctxt "field:timesheet.enter_lines.init,employee:0"
-msgid "Employee"
-msgstr "Empleado"
+#, fuzzy
+msgctxt "field:timesheet.hours_employee,create_uid:"
+msgid "Create User"
+msgstr "Crear usuario"
-msgctxt "field:timesheet.hours_employee,employee:0"
+msgctxt "field:timesheet.hours_employee,employee:"
msgid "Employee"
msgstr "Empleado"
-msgctxt "field:timesheet.hours_employee,hours:0"
+msgctxt "field:timesheet.hours_employee,hours:"
msgid "Hours"
msgstr "Horas"
-msgctxt "field:timesheet.hours_employee,rec_name:0"
+msgctxt "field:timesheet.hours_employee,id:"
+msgid "ID"
+msgstr ""
+
+msgctxt "field:timesheet.hours_employee,rec_name:"
msgid "Name"
msgstr "Nombre"
-msgctxt "field:timesheet.hours_employee_monthly,employee:0"
+msgctxt "field:timesheet.hours_employee,write_date:"
+msgid "Write Date"
+msgstr ""
+
+msgctxt "field:timesheet.hours_employee,write_uid:"
+msgid "Write User"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:timesheet.hours_employee.open.start,end_date:"
+msgid "End Date"
+msgstr "Fecha Final"
+
+msgctxt "field:timesheet.hours_employee.open.start,id:"
+msgid "ID"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:timesheet.hours_employee.open.start,start_date:"
+msgid "Start Date"
+msgstr "Fecha Inicio"
+
+msgctxt "field:timesheet.hours_employee_monthly,create_date:"
+msgid "Create Date"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:timesheet.hours_employee_monthly,create_uid:"
+msgid "Create User"
+msgstr "Crear usuario"
+
+msgctxt "field:timesheet.hours_employee_monthly,employee:"
msgid "Employee"
msgstr "Empleado"
-msgctxt "field:timesheet.hours_employee_monthly,hours:0"
+msgctxt "field:timesheet.hours_employee_monthly,hours:"
msgid "Hours"
msgstr "Horas"
-msgctxt "field:timesheet.hours_employee_monthly,month:0"
+msgctxt "field:timesheet.hours_employee_monthly,id:"
+msgid "ID"
+msgstr ""
+
+msgctxt "field:timesheet.hours_employee_monthly,month:"
msgid "Month"
msgstr "Mes"
-msgctxt "field:timesheet.hours_employee_monthly,rec_name:0"
+msgctxt "field:timesheet.hours_employee_monthly,rec_name:"
msgid "Name"
msgstr "Nombre"
-msgctxt "field:timesheet.hours_employee_monthly,year:0"
+msgctxt "field:timesheet.hours_employee_monthly,write_date:"
+msgid "Write Date"
+msgstr ""
+
+msgctxt "field:timesheet.hours_employee_monthly,write_uid:"
+msgid "Write User"
+msgstr ""
+
+msgctxt "field:timesheet.hours_employee_monthly,year:"
msgid "Year"
msgstr "Año"
-msgctxt "field:timesheet.hours_employee_weekly,employee:0"
+msgctxt "field:timesheet.hours_employee_weekly,create_date:"
+msgid "Create Date"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:timesheet.hours_employee_weekly,create_uid:"
+msgid "Create User"
+msgstr "Crear usuario"
+
+msgctxt "field:timesheet.hours_employee_weekly,employee:"
msgid "Employee"
msgstr "Empleado"
-msgctxt "field:timesheet.hours_employee_weekly,hours:0"
+msgctxt "field:timesheet.hours_employee_weekly,hours:"
msgid "Hours"
msgstr "Horas"
-msgctxt "field:timesheet.hours_employee_weekly,rec_name:0"
+msgctxt "field:timesheet.hours_employee_weekly,id:"
+msgid "ID"
+msgstr ""
+
+msgctxt "field:timesheet.hours_employee_weekly,rec_name:"
msgid "Name"
msgstr "Nombre"
-msgctxt "field:timesheet.hours_employee_weekly,week:0"
+msgctxt "field:timesheet.hours_employee_weekly,week:"
msgid "Week"
msgstr "Semana"
-msgctxt "field:timesheet.hours_employee_weekly,year:0"
+msgctxt "field:timesheet.hours_employee_weekly,write_date:"
+msgid "Write Date"
+msgstr ""
+
+msgctxt "field:timesheet.hours_employee_weekly,write_uid:"
+msgid "Write User"
+msgstr ""
+
+msgctxt "field:timesheet.hours_employee_weekly,year:"
msgid "Year"
msgstr "Año"
-msgctxt "field:timesheet.line,date:0"
+msgctxt "field:timesheet.line,create_date:"
+msgid "Create Date"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:timesheet.line,create_uid:"
+msgid "Create User"
+msgstr "Crear usuario"
+
+msgctxt "field:timesheet.line,date:"
msgid "Date"
msgstr "Fecha"
-msgctxt "field:timesheet.line,description:0"
+msgctxt "field:timesheet.line,description:"
msgid "Description"
msgstr "Descripción"
-msgctxt "field:timesheet.line,employee:0"
+msgctxt "field:timesheet.line,employee:"
msgid "Employee"
msgstr "Empleado"
-msgctxt "field:timesheet.line,hours:0"
+msgctxt "field:timesheet.line,hours:"
msgid "Hours"
msgstr "Horas"
-msgctxt "field:timesheet.line,rec_name:0"
+msgctxt "field:timesheet.line,id:"
+msgid "ID"
+msgstr ""
+
+msgctxt "field:timesheet.line,rec_name:"
msgid "Name"
msgstr "Nombre"
-msgctxt "field:timesheet.line,work:0"
+msgctxt "field:timesheet.line,work:"
msgid "Work"
msgstr "Trabajo"
-msgctxt "field:timesheet.open_hours_employee.init,end_date:0"
-msgid "End Date"
-msgstr "Fecha Final"
+msgctxt "field:timesheet.line,write_date:"
+msgid "Write Date"
+msgstr ""
-msgctxt "field:timesheet.open_hours_employee.init,start_date:0"
-msgid "Start Date"
-msgstr "Fecha Inicial"
+msgctxt "field:timesheet.line,write_uid:"
+msgid "Write User"
+msgstr ""
-msgctxt "field:timesheet.work,active:0"
+#, fuzzy
+msgctxt "field:timesheet.line.enter.start,date:"
+msgid "Date"
+msgstr "Fecha"
+
+#, fuzzy
+msgctxt "field:timesheet.line.enter.start,employee:"
+msgid "Employee"
+msgstr "Empleado"
+
+msgctxt "field:timesheet.line.enter.start,id:"
+msgid "ID"
+msgstr ""
+
+msgctxt "field:timesheet.work,active:"
msgid "Active"
msgstr "Activo"
-msgctxt "field:timesheet.work,children:0"
+msgctxt "field:timesheet.work,children:"
msgid "Children"
msgstr "Descendientes"
-msgctxt "field:timesheet.work,company:0"
+msgctxt "field:timesheet.work,company:"
msgid "Company"
msgstr "Compañía"
-msgctxt "field:timesheet.work,hours:0"
+msgctxt "field:timesheet.work,create_date:"
+msgid "Create Date"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:timesheet.work,create_uid:"
+msgid "Create User"
+msgstr "Crear usuario"
+
+msgctxt "field:timesheet.work,hours:"
msgid "Timesheet Hours"
msgstr "Horas de Hoja de Tiempo"
-msgctxt "field:timesheet.work,left:0"
+msgctxt "field:timesheet.work,id:"
+msgid "ID"
+msgstr ""
+
+msgctxt "field:timesheet.work,left:"
msgid "Left"
msgstr "Izquierda"
-msgctxt "field:timesheet.work,name:0"
+msgctxt "field:timesheet.work,name:"
msgid "Name"
msgstr "Nombre"
-msgctxt "field:timesheet.work,parent:0"
+msgctxt "field:timesheet.work,parent:"
msgid "Parent"
msgstr "Padre"
-msgctxt "field:timesheet.work,rec_name:0"
+msgctxt "field:timesheet.work,rec_name:"
msgid "Name"
msgstr "Nombre"
-msgctxt "field:timesheet.work,right:0"
+msgctxt "field:timesheet.work,right:"
msgid "Right"
msgstr "Derecha"
-msgctxt "field:timesheet.work,timesheet_available:0"
+msgctxt "field:timesheet.work,timesheet_available:"
msgid "Available on timesheets"
msgstr "Disponibilidad en las hojas de tiempos"
-msgctxt "field:timesheet.work,timesheet_lines:0"
+msgctxt "field:timesheet.work,timesheet_lines:"
msgid ""
msgstr ""
-msgctxt "field:timesheet.work.open.init,from_date:0"
+msgctxt "field:timesheet.work,write_date:"
+msgid "Write Date"
+msgstr ""
+
+msgctxt "field:timesheet.work,write_uid:"
+msgid "Write User"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:timesheet.work.open.start,from_date:"
msgid "From Date"
msgstr "Fecha Inicial"
-msgctxt "field:timesheet.work.open.init,to_date:0"
+msgctxt "field:timesheet.work.open.start,id:"
+msgid "ID"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:timesheet.work.open.start,to_date:"
msgid "To Date"
msgstr "A la Fecha"
-msgctxt "help:timesheet.work,hours:0"
+msgctxt "help:timesheet.work,hours:"
msgid "Total time spent on this work"
msgstr "Tiempo total utilizado en este trabajo"
-msgctxt "help:timesheet.work,timesheet_available:0"
+msgctxt "help:timesheet.work,timesheet_available:"
msgid "Allow to fill in timesheets with this work"
msgstr "Permitir llenar con este trabajo en la hoja de tiempos"
-msgctxt "model:ir.action,name:act_enter_lines"
-msgid "Enter Timesheet"
-msgstr "Adicionar Hoja de Tiempo"
-
msgctxt "model:ir.action,name:act_hours_employee_form"
msgid "Hours per Employee"
msgstr "Horas por Empleado"
@@ -180,18 +299,23 @@ msgctxt "model:ir.action,name:act_hours_employee_monthly_form"
msgid "Hours per Employee per Month"
msgstr "Horas por Empleado en el mes"
+#, fuzzy
+msgctxt "model:ir.action,name:act_hours_employee_open"
+msgid "Hours per Employee"
+msgstr "Horas por Empleado"
+
msgctxt "model:ir.action,name:act_hours_employee_weekly_form"
msgid "Hours per Employee per Week"
msgstr "Horas por Empleado en la semana"
+msgctxt "model:ir.action,name:act_line_enter"
+msgid "Enter Timesheet"
+msgstr ""
+
msgctxt "model:ir.action,name:act_line_form"
msgid "Timesheet Lines"
msgstr "Lineas de Hoja de Tiempo"
-msgctxt "model:ir.action,name:act_open_hours_employee"
-msgid "Hours per Employee"
-msgstr "Horas por Empleado"
-
msgctxt "model:ir.action,name:act_open_work"
msgid "Hours per Work"
msgstr "Horas por Trabajo"
@@ -230,26 +354,29 @@ msgctxt "model:ir.ui.menu,name:menu_configuration"
msgid "Configuration"
msgstr "Configuración"
-msgctxt "model:ir.ui.menu,name:menu_enter_lines"
-msgid "Enter Timesheet"
-msgstr "Adicionar Hoja de Tiempo"
-
-msgctxt "model:ir.ui.menu,name:menu_line_form"
-msgid "Timesheet Lines"
-msgstr "Lineas de Hoja de Tiempo"
-
-msgctxt "model:ir.ui.menu,name:menu_open_hours_employee"
+#, fuzzy
+msgctxt "model:ir.ui.menu,name:menu_hours_employee_open"
msgid "Hours per Employee"
msgstr "Horas por Empleado"
-msgctxt "model:ir.ui.menu,name:menu_open_hours_employee_monthly"
+#, fuzzy
+msgctxt "model:ir.ui.menu,name:menu_hours_employee_open_monthly"
msgid "Hours per Employee per Month"
msgstr "Horas por Empleado en el mes"
-msgctxt "model:ir.ui.menu,name:menu_open_hours_employee_weekly"
+#, fuzzy
+msgctxt "model:ir.ui.menu,name:menu_hours_employee_open_weekly"
msgid "Hours per Employee per Week"
msgstr "Horas por Empleado en la semana"
+msgctxt "model:ir.ui.menu,name:menu_line_enter"
+msgid "Enter Timesheet"
+msgstr ""
+
+msgctxt "model:ir.ui.menu,name:menu_line_form"
+msgid "Timesheet Lines"
+msgstr "Lineas de Hoja de Tiempo"
+
msgctxt "model:ir.ui.menu,name:menu_reporting"
msgid "Reporting"
msgstr "Reportes"
@@ -276,118 +403,127 @@ msgctxt "model:res.group,name:group_timesheet_admin"
msgid "Timesheet Administration"
msgstr "Administración de Hoja de tiempos"
-msgctxt "model:timesheet.enter_lines.init,name:0"
-msgid "Enter Lines Init"
-msgstr "Ingresar Líneas Inicio"
-
-msgctxt "model:timesheet.hours_employee,name:0"
+msgctxt "model:timesheet.hours_employee,name:"
msgid "Hours per Employee"
msgstr "Horas por Empleado"
-msgctxt "model:timesheet.hours_employee_monthly,name:0"
+msgctxt "model:timesheet.hours_employee.open.start,name:"
+msgid "Open Hours per Employee"
+msgstr ""
+
+msgctxt "model:timesheet.hours_employee_monthly,name:"
msgid "Hours per Employee per Month"
msgstr "Horas por Empleado en el mes"
-msgctxt "model:timesheet.hours_employee_weekly,name:0"
+msgctxt "model:timesheet.hours_employee_weekly,name:"
msgid "Hours per Employee per Week"
msgstr "Horas por Empleado en la semana"
-msgctxt "model:timesheet.line,name:0"
+msgctxt "model:timesheet.line,name:"
msgid "Timesheet Line"
msgstr "Linea de Hoja de Tiempo"
-msgctxt "model:timesheet.open_hours_employee.init,name:0"
-msgid "Open Hours Employee Init"
-msgstr "Horas de Apertura de Inicio de Empleado"
+msgctxt "model:timesheet.line.enter.start,name:"
+msgid "Enter Lines"
+msgstr ""
-msgctxt "model:timesheet.work,name:0"
+msgctxt "model:timesheet.work,name:"
msgid "Work"
msgstr "Trabajo"
-msgctxt "model:timesheet.work.open.init,name:0"
-msgid "Open Work Init"
-msgstr "Inicio de Apertura de Trabajo"
+msgctxt "model:timesheet.work.open.start,name:"
+msgid "Open Work"
+msgstr ""
-msgctxt "view:timesheet.enter_lines.init:0"
-msgid "Enter Timesheet"
-msgstr "Adicionar Hoja de Tiempo"
+#, fuzzy
+msgctxt "view:timesheet.hours_employee.open.start:"
+msgid "Hours per Employee"
+msgstr "Horas por Empleado"
-msgctxt "view:timesheet.hours_employee:0"
+msgctxt "view:timesheet.hours_employee:"
msgid "Hours"
msgstr "Horas"
-msgctxt "view:timesheet.hours_employee:0"
+msgctxt "view:timesheet.hours_employee:"
msgid "Hours per Employee"
msgstr "Horas por Empleado"
-msgctxt "view:timesheet.hours_employee_monthly:0"
+msgctxt "view:timesheet.hours_employee_monthly:"
msgid "Hours per Employee per Month"
msgstr "Horas por Empleado en el mes"
-msgctxt "view:timesheet.hours_employee_weekly:0"
+msgctxt "view:timesheet.hours_employee_weekly:"
msgid "Hours per Employee per Week"
msgstr "Horas por Empleado en la semana"
-msgctxt "view:timesheet.line:0"
+msgctxt "view:timesheet.line.enter.start:"
+msgid "Enter Timesheet"
+msgstr ""
+
+msgctxt "view:timesheet.line:"
msgid "Hours"
msgstr "Horas"
-msgctxt "view:timesheet.line:0"
+msgctxt "view:timesheet.line:"
msgid "Timesheet Line"
msgstr "Linea de Hoja de Tiempo"
-msgctxt "view:timesheet.line:0"
+msgctxt "view:timesheet.line:"
msgid "Timesheet Lines"
msgstr "Lineas de Hoja de Tiempo"
-msgctxt "view:timesheet.open_hours_employee.init:0"
-msgid "Hours per Employee"
-msgstr "Horas por Empleado"
-
-msgctxt "view:timesheet.work.open.init:0"
+#, fuzzy
+msgctxt "view:timesheet.work.open.start:"
msgid "Hours per Work"
msgstr "Horas por Trabajo"
-msgctxt "view:timesheet.work:0"
+msgctxt "view:timesheet.work:"
msgid "Hours per Work"
msgstr "Horas por Trabajo"
-msgctxt "view:timesheet.work:0"
+msgctxt "view:timesheet.work:"
msgid "Work"
msgstr "Trabajo"
-msgctxt "view:timesheet.work:0"
+msgctxt "view:timesheet.work:"
msgid "Works"
msgstr "Trabajos"
-msgctxt "wizard_button:timesheet.enter_lines,init,end:0"
+#, fuzzy
+msgctxt "wizard_button:timesheet.hours_employee.open,start,end:"
msgid "Cancel"
msgstr "Cancelar"
-msgctxt "wizard_button:timesheet.enter_lines,init,enter:0"
-msgid "Enter"
-msgstr "Entrar"
+#, fuzzy
+msgctxt "wizard_button:timesheet.hours_employee.open,start,open_:"
+msgid "Open"
+msgstr "Abrir"
-msgctxt "wizard_button:timesheet.open_hours_employee,init,end:0"
+#, fuzzy
+msgctxt "wizard_button:timesheet.line.enter,start,end:"
msgid "Cancel"
msgstr "Cancelar"
-msgctxt "wizard_button:timesheet.open_hours_employee,init,open:0"
-msgid "Open"
-msgstr "Abrir"
+msgctxt "wizard_button:timesheet.line.enter,start,enter:"
+msgid "Enter"
+msgstr ""
-msgctxt "wizard_button:timesheet.work.open,init,end:0"
+#, fuzzy
+msgctxt "wizard_button:timesheet.work.open,start,end:"
msgid "Cancel"
msgstr "Cancelar"
-msgctxt "wizard_button:timesheet.work.open,init,open:0"
+#, fuzzy
+msgctxt "wizard_button:timesheet.work.open,start,open_:"
msgid "Open"
msgstr "Abrir"
-msgctxt "wizard_button:timesheet.work.open2,init,end:0"
+#, fuzzy
+msgctxt "wizard_button:timesheet.work.open2,start,end:"
msgid "Cancel"
msgstr "Cancelar"
-msgctxt "wizard_button:timesheet.work.open2,init,open:0"
+#, fuzzy
+msgctxt "wizard_button:timesheet.work.open2,start,open_:"
msgid "Open"
msgstr "Abrir"
diff --git a/locale/es_ES.po b/locale/es_ES.po
index 48728c7..7c70c65 100644
--- a/locale/es_ES.po
+++ b/locale/es_ES.po
@@ -2,173 +2,281 @@
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
-msgctxt "error:timesheet.line:0"
+msgctxt "error:timesheet.line:"
msgid "Hours field must be positive"
-msgstr "El campo de horas debe ser positivo"
+msgstr "El campo \"Horas\" debe ser positivo."
-msgctxt "error:timesheet.work:0"
+msgctxt "error:timesheet.work:"
msgid "Every work must be in the same company as it's parent work!"
-msgstr "Cada trabajo debe estar en la misma empresa que su trabajo padre"
+msgstr "Cada trabajo debe estar en la misma empresa que su trabajo padre."
-msgctxt "error:timesheet.work:0"
+msgctxt "error:timesheet.work:"
msgid "You can not create recursive works!"
-msgstr "No puede crear trabajos recursivos"
+msgstr "No puede crear trabajos recursivos."
-msgctxt "field:timesheet.enter_lines.init,date:0"
-msgid "Date"
-msgstr "Fecha"
+msgctxt "field:timesheet.hours_employee,create_date:"
+msgid "Create Date"
+msgstr "Fecha creación"
-msgctxt "field:timesheet.enter_lines.init,employee:0"
-msgid "Employee"
-msgstr "Empleado"
+msgctxt "field:timesheet.hours_employee,create_uid:"
+msgid "Create User"
+msgstr "Usuario creación"
-msgctxt "field:timesheet.hours_employee,employee:0"
+msgctxt "field:timesheet.hours_employee,employee:"
msgid "Employee"
msgstr "Empleado"
-msgctxt "field:timesheet.hours_employee,hours:0"
+msgctxt "field:timesheet.hours_employee,hours:"
msgid "Hours"
msgstr "Horas"
-msgctxt "field:timesheet.hours_employee,rec_name:0"
+msgctxt "field:timesheet.hours_employee,id:"
+msgid "ID"
+msgstr "ID"
+
+msgctxt "field:timesheet.hours_employee,rec_name:"
msgid "Name"
msgstr "Nombre"
-msgctxt "field:timesheet.hours_employee_monthly,employee:0"
+msgctxt "field:timesheet.hours_employee,write_date:"
+msgid "Write Date"
+msgstr "Fecha modificación"
+
+msgctxt "field:timesheet.hours_employee,write_uid:"
+msgid "Write User"
+msgstr "Usuario modificación"
+
+msgctxt "field:timesheet.hours_employee.open.start,end_date:"
+msgid "End Date"
+msgstr "Fecha final"
+
+msgctxt "field:timesheet.hours_employee.open.start,id:"
+msgid "ID"
+msgstr "ID"
+
+msgctxt "field:timesheet.hours_employee.open.start,start_date:"
+msgid "Start Date"
+msgstr "Fecha inicial"
+
+msgctxt "field:timesheet.hours_employee_monthly,create_date:"
+msgid "Create Date"
+msgstr "Fecha creación"
+
+msgctxt "field:timesheet.hours_employee_monthly,create_uid:"
+msgid "Create User"
+msgstr "Usuario creación"
+
+msgctxt "field:timesheet.hours_employee_monthly,employee:"
msgid "Employee"
msgstr "Empleado"
-msgctxt "field:timesheet.hours_employee_monthly,hours:0"
+msgctxt "field:timesheet.hours_employee_monthly,hours:"
msgid "Hours"
msgstr "Horas"
-msgctxt "field:timesheet.hours_employee_monthly,month:0"
+msgctxt "field:timesheet.hours_employee_monthly,id:"
+msgid "ID"
+msgstr "ID"
+
+msgctxt "field:timesheet.hours_employee_monthly,month:"
msgid "Month"
msgstr "Mes"
-msgctxt "field:timesheet.hours_employee_monthly,rec_name:0"
+msgctxt "field:timesheet.hours_employee_monthly,rec_name:"
msgid "Name"
msgstr "Nombre"
-msgctxt "field:timesheet.hours_employee_monthly,year:0"
+msgctxt "field:timesheet.hours_employee_monthly,write_date:"
+msgid "Write Date"
+msgstr "Fecha modificación"
+
+msgctxt "field:timesheet.hours_employee_monthly,write_uid:"
+msgid "Write User"
+msgstr "Usuario modificación"
+
+msgctxt "field:timesheet.hours_employee_monthly,year:"
msgid "Year"
msgstr "Año"
-msgctxt "field:timesheet.hours_employee_weekly,employee:0"
+msgctxt "field:timesheet.hours_employee_weekly,create_date:"
+msgid "Create Date"
+msgstr "Fecha creación"
+
+msgctxt "field:timesheet.hours_employee_weekly,create_uid:"
+msgid "Create User"
+msgstr "Usuario creación"
+
+msgctxt "field:timesheet.hours_employee_weekly,employee:"
msgid "Employee"
msgstr "Empleado"
-msgctxt "field:timesheet.hours_employee_weekly,hours:0"
+msgctxt "field:timesheet.hours_employee_weekly,hours:"
msgid "Hours"
msgstr "Horas"
-msgctxt "field:timesheet.hours_employee_weekly,rec_name:0"
+msgctxt "field:timesheet.hours_employee_weekly,id:"
+msgid "ID"
+msgstr "ID"
+
+msgctxt "field:timesheet.hours_employee_weekly,rec_name:"
msgid "Name"
msgstr "Nombre"
-msgctxt "field:timesheet.hours_employee_weekly,week:0"
+msgctxt "field:timesheet.hours_employee_weekly,week:"
msgid "Week"
msgstr "Semana"
-msgctxt "field:timesheet.hours_employee_weekly,year:0"
+msgctxt "field:timesheet.hours_employee_weekly,write_date:"
+msgid "Write Date"
+msgstr "Fecha modificación"
+
+msgctxt "field:timesheet.hours_employee_weekly,write_uid:"
+msgid "Write User"
+msgstr "Usuario modificación"
+
+msgctxt "field:timesheet.hours_employee_weekly,year:"
msgid "Year"
msgstr "Año"
-msgctxt "field:timesheet.line,date:0"
+msgctxt "field:timesheet.line,create_date:"
+msgid "Create Date"
+msgstr "Fecha creación"
+
+msgctxt "field:timesheet.line,create_uid:"
+msgid "Create User"
+msgstr "Usuario creación"
+
+msgctxt "field:timesheet.line,date:"
msgid "Date"
msgstr "Fecha"
-msgctxt "field:timesheet.line,description:0"
+msgctxt "field:timesheet.line,description:"
msgid "Description"
msgstr "Descripción"
-msgctxt "field:timesheet.line,employee:0"
+msgctxt "field:timesheet.line,employee:"
msgid "Employee"
msgstr "Empleado"
-msgctxt "field:timesheet.line,hours:0"
+msgctxt "field:timesheet.line,hours:"
msgid "Hours"
msgstr "Horas"
-msgctxt "field:timesheet.line,rec_name:0"
+msgctxt "field:timesheet.line,id:"
+msgid "ID"
+msgstr "ID"
+
+msgctxt "field:timesheet.line,rec_name:"
msgid "Name"
msgstr "Nombre"
-msgctxt "field:timesheet.line,work:0"
+msgctxt "field:timesheet.line,work:"
msgid "Work"
msgstr "Trabajo"
-msgctxt "field:timesheet.open_hours_employee.init,end_date:0"
-msgid "End Date"
-msgstr "Fecha final"
+msgctxt "field:timesheet.line,write_date:"
+msgid "Write Date"
+msgstr "Fecha modificación"
-msgctxt "field:timesheet.open_hours_employee.init,start_date:0"
-msgid "Start Date"
-msgstr "Fecha inicial"
+msgctxt "field:timesheet.line,write_uid:"
+msgid "Write User"
+msgstr "Usuario modificación"
+
+msgctxt "field:timesheet.line.enter.start,date:"
+msgid "Date"
+msgstr "Fecha"
+
+msgctxt "field:timesheet.line.enter.start,employee:"
+msgid "Employee"
+msgstr "Empleado"
+
+msgctxt "field:timesheet.line.enter.start,id:"
+msgid "ID"
+msgstr "ID"
-msgctxt "field:timesheet.work,active:0"
+msgctxt "field:timesheet.work,active:"
msgid "Active"
msgstr "Activo"
-msgctxt "field:timesheet.work,children:0"
+msgctxt "field:timesheet.work,children:"
msgid "Children"
msgstr "Hijos"
-msgctxt "field:timesheet.work,company:0"
+msgctxt "field:timesheet.work,company:"
msgid "Company"
msgstr "Empresa"
-msgctxt "field:timesheet.work,hours:0"
+msgctxt "field:timesheet.work,create_date:"
+msgid "Create Date"
+msgstr "Fecha creación"
+
+msgctxt "field:timesheet.work,create_uid:"
+msgid "Create User"
+msgstr "Usuario creación"
+
+msgctxt "field:timesheet.work,hours:"
msgid "Timesheet Hours"
-msgstr "Horas del parte de trabajo"
+msgstr "Horas parte de trabajo"
-msgctxt "field:timesheet.work,left:0"
+msgctxt "field:timesheet.work,id:"
+msgid "ID"
+msgstr "ID"
+
+msgctxt "field:timesheet.work,left:"
msgid "Left"
msgstr "Izquierda"
-msgctxt "field:timesheet.work,name:0"
+msgctxt "field:timesheet.work,name:"
msgid "Name"
msgstr "Nombre"
-msgctxt "field:timesheet.work,parent:0"
+msgctxt "field:timesheet.work,parent:"
msgid "Parent"
msgstr "Padre"
-msgctxt "field:timesheet.work,rec_name:0"
+msgctxt "field:timesheet.work,rec_name:"
msgid "Name"
msgstr "Nombre"
-msgctxt "field:timesheet.work,right:0"
+msgctxt "field:timesheet.work,right:"
msgid "Right"
msgstr "Derecha"
-msgctxt "field:timesheet.work,timesheet_available:0"
+msgctxt "field:timesheet.work,timesheet_available:"
msgid "Available on timesheets"
msgstr "Disponible en partes de trabajo"
-msgctxt "field:timesheet.work,timesheet_lines:0"
+msgctxt "field:timesheet.work,timesheet_lines:"
msgid ""
msgstr ""
-msgctxt "field:timesheet.work.open.init,from_date:0"
+msgctxt "field:timesheet.work,write_date:"
+msgid "Write Date"
+msgstr "Fecha modificación"
+
+msgctxt "field:timesheet.work,write_uid:"
+msgid "Write User"
+msgstr "Usuario modificación"
+
+msgctxt "field:timesheet.work.open.start,from_date:"
msgid "From Date"
msgstr "Desde la fecha"
-msgctxt "field:timesheet.work.open.init,to_date:0"
+msgctxt "field:timesheet.work.open.start,id:"
+msgid "ID"
+msgstr "ID"
+
+msgctxt "field:timesheet.work.open.start,to_date:"
msgid "To Date"
-msgstr "A la fecha"
+msgstr "Hasta la fecha"
-msgctxt "help:timesheet.work,hours:0"
+msgctxt "help:timesheet.work,hours:"
msgid "Total time spent on this work"
-msgstr "Tiempo total empleado en este trabajo"
+msgstr "Tiempo total empleado en este trabajo."
-msgctxt "help:timesheet.work,timesheet_available:0"
+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 "model:ir.action,name:act_enter_lines"
-msgid "Enter Timesheet"
-msgstr "Introducir parte de trabajo"
+msgstr "Permite completar partes de trabajo con este trabajo."
msgctxt "model:ir.action,name:act_hours_employee_form"
msgid "Hours per Employee"
@@ -178,18 +286,22 @@ msgctxt "model:ir.action,name:act_hours_employee_monthly_form"
msgid "Hours per Employee per Month"
msgstr "Horas por empleado y mes"
+msgctxt "model:ir.action,name:act_hours_employee_open"
+msgid "Hours per Employee"
+msgstr "Horas por empleado"
+
msgctxt "model:ir.action,name:act_hours_employee_weekly_form"
msgid "Hours per Employee per Week"
msgstr "Horas por empleado y semana"
+msgctxt "model:ir.action,name:act_line_enter"
+msgid "Enter Timesheet"
+msgstr "Añadir parte de trabajo"
+
msgctxt "model:ir.action,name:act_line_form"
msgid "Timesheet Lines"
msgstr "Líneas del parte de trabajo"
-msgctxt "model:ir.action,name:act_open_hours_employee"
-msgid "Hours per Employee"
-msgstr "Horas por empleado"
-
msgctxt "model:ir.action,name:act_open_work"
msgid "Hours per Work"
msgstr "Horas por trabajo"
@@ -206,12 +318,10 @@ msgctxt "model:ir.action,name:act_work_form3"
msgid "Hours per Work"
msgstr "Horas por trabajo"
-#, fuzzy
msgctxt "model:ir.action,name:act_work_hours_board"
msgid "Hours per Work"
msgstr "Horas por trabajo"
-#, fuzzy
msgctxt "model:ir.action,name:act_work_list"
msgid "Works"
msgstr "Trabajos"
@@ -228,36 +338,34 @@ msgctxt "model:ir.ui.menu,name:menu_configuration"
msgid "Configuration"
msgstr "Configuración"
-msgctxt "model:ir.ui.menu,name:menu_enter_lines"
-msgid "Enter Timesheet"
-msgstr "Introducir parte de trabajo"
-
-msgctxt "model:ir.ui.menu,name:menu_line_form"
-msgid "Timesheet Lines"
-msgstr "Lineas de parte de trabajo"
-
-msgctxt "model:ir.ui.menu,name:menu_open_hours_employee"
+msgctxt "model:ir.ui.menu,name:menu_hours_employee_open"
msgid "Hours per Employee"
msgstr "Horas por empleado"
-msgctxt "model:ir.ui.menu,name:menu_open_hours_employee_monthly"
+msgctxt "model:ir.ui.menu,name:menu_hours_employee_open_monthly"
msgid "Hours per Employee per Month"
msgstr "Horas por empleado y mes"
-msgctxt "model:ir.ui.menu,name:menu_open_hours_employee_weekly"
+msgctxt "model:ir.ui.menu,name:menu_hours_employee_open_weekly"
msgid "Hours per Employee per Week"
msgstr "Horas por empleado y semana"
+msgctxt "model:ir.ui.menu,name:menu_line_enter"
+msgid "Enter Timesheet"
+msgstr "Añadir parte de trabajo"
+
+msgctxt "model:ir.ui.menu,name:menu_line_form"
+msgid "Timesheet Lines"
+msgstr "Líneas de parte de trabajo"
+
msgctxt "model:ir.ui.menu,name:menu_reporting"
msgid "Reporting"
msgstr "Informes"
-#, fuzzy
msgctxt "model:ir.ui.menu,name:menu_timesheet"
msgid "Timesheet"
-msgstr "Gestión de parte de trabajo"
+msgstr "Parte de trabajo"
-#, fuzzy
msgctxt "model:ir.ui.menu,name:menu_work_list"
msgid "Works"
msgstr "Trabajos"
@@ -274,118 +382,118 @@ msgctxt "model:res.group,name:group_timesheet_admin"
msgid "Timesheet Administration"
msgstr "Administración de parte de trabajo"
-msgctxt "model:timesheet.enter_lines.init,name:0"
-msgid "Enter Lines Init"
-msgstr "Inicializa la introducción de líneas"
-
-msgctxt "model:timesheet.hours_employee,name:0"
+msgctxt "model:timesheet.hours_employee,name:"
msgid "Hours per Employee"
msgstr "Horas por empleado"
-msgctxt "model:timesheet.hours_employee_monthly,name:0"
+msgctxt "model:timesheet.hours_employee.open.start,name:"
+msgid "Open Hours per Employee"
+msgstr "Abrir horas por empleado"
+
+msgctxt "model:timesheet.hours_employee_monthly,name:"
msgid "Hours per Employee per Month"
msgstr "Horas por empleado y mes"
-msgctxt "model:timesheet.hours_employee_weekly,name:0"
+msgctxt "model:timesheet.hours_employee_weekly,name:"
msgid "Hours per Employee per Week"
msgstr "Horas por empleado y semana"
-msgctxt "model:timesheet.line,name:0"
+msgctxt "model:timesheet.line,name:"
msgid "Timesheet Line"
-msgstr "Linea de parte de trabajo"
+msgstr "Línea de parte de trabajo"
-msgctxt "model:timesheet.open_hours_employee.init,name:0"
-msgid "Open Hours Employee Init"
-msgstr "Inicializa la apertura de horas de empleado"
+msgctxt "model:timesheet.line.enter.start,name:"
+msgid "Enter Lines"
+msgstr "Añadir líneas"
-msgctxt "model:timesheet.work,name:0"
+msgctxt "model:timesheet.work,name:"
msgid "Work"
msgstr "Trabajo"
-msgctxt "model:timesheet.work.open.init,name:0"
-msgid "Open Work Init"
-msgstr "Inicializa la apertura de un trabajo"
+msgctxt "model:timesheet.work.open.start,name:"
+msgid "Open Work"
+msgstr "Abrir trabajo"
-msgctxt "view:timesheet.enter_lines.init:0"
-msgid "Enter Timesheet"
-msgstr "Introducir parte de trabajo"
+msgctxt "view:timesheet.hours_employee.open.start:"
+msgid "Hours per Employee"
+msgstr "Horas por empleado"
-msgctxt "view:timesheet.hours_employee:0"
+msgctxt "view:timesheet.hours_employee:"
msgid "Hours"
msgstr "Horas"
-msgctxt "view:timesheet.hours_employee:0"
+msgctxt "view:timesheet.hours_employee:"
msgid "Hours per Employee"
msgstr "Horas por empleado"
-msgctxt "view:timesheet.hours_employee_monthly:0"
+msgctxt "view:timesheet.hours_employee_monthly:"
msgid "Hours per Employee per Month"
msgstr "Horas por empleado y mes"
-msgctxt "view:timesheet.hours_employee_weekly:0"
+msgctxt "view:timesheet.hours_employee_weekly:"
msgid "Hours per Employee per Week"
msgstr "Horas por empleado y semana"
-msgctxt "view:timesheet.line:0"
+msgctxt "view:timesheet.line.enter.start:"
+msgid "Enter Timesheet"
+msgstr "Añadir parte de trabajo"
+
+msgctxt "view:timesheet.line:"
msgid "Hours"
msgstr "Horas"
-msgctxt "view:timesheet.line:0"
+msgctxt "view:timesheet.line:"
msgid "Timesheet Line"
-msgstr "Linea de parte de trabajo"
+msgstr "Línea de parte de trabajo"
-msgctxt "view:timesheet.line:0"
+msgctxt "view:timesheet.line:"
msgid "Timesheet Lines"
-msgstr "Lineas de parte de trabajo"
+msgstr "Líneas de parte de trabajo"
-msgctxt "view:timesheet.open_hours_employee.init:0"
-msgid "Hours per Employee"
-msgstr "Horas por empleado"
-
-msgctxt "view:timesheet.work.open.init:0"
+msgctxt "view:timesheet.work.open.start:"
msgid "Hours per Work"
msgstr "Horas por trabajo"
-msgctxt "view:timesheet.work:0"
+msgctxt "view:timesheet.work:"
msgid "Hours per Work"
msgstr "Horas por trabajo"
-msgctxt "view:timesheet.work:0"
+msgctxt "view:timesheet.work:"
msgid "Work"
msgstr "Trabajo"
-msgctxt "view:timesheet.work:0"
+msgctxt "view:timesheet.work:"
msgid "Works"
msgstr "Trabajos"
-msgctxt "wizard_button:timesheet.enter_lines,init,end:0"
+msgctxt "wizard_button:timesheet.hours_employee.open,start,end:"
msgid "Cancel"
msgstr "Cancelar"
-msgctxt "wizard_button:timesheet.enter_lines,init,enter:0"
-msgid "Enter"
-msgstr "Entrar"
+msgctxt "wizard_button:timesheet.hours_employee.open,start,open_:"
+msgid "Open"
+msgstr "Abrir"
-msgctxt "wizard_button:timesheet.open_hours_employee,init,end:0"
+msgctxt "wizard_button:timesheet.line.enter,start,end:"
msgid "Cancel"
msgstr "Cancelar"
-msgctxt "wizard_button:timesheet.open_hours_employee,init,open:0"
-msgid "Open"
-msgstr "Abrir"
+msgctxt "wizard_button:timesheet.line.enter,start,enter:"
+msgid "Enter"
+msgstr "Añadir"
-msgctxt "wizard_button:timesheet.work.open,init,end:0"
+msgctxt "wizard_button:timesheet.work.open,start,end:"
msgid "Cancel"
msgstr "Cancelar"
-msgctxt "wizard_button:timesheet.work.open,init,open:0"
+msgctxt "wizard_button:timesheet.work.open,start,open_:"
msgid "Open"
msgstr "Abrir"
-msgctxt "wizard_button:timesheet.work.open2,init,end:0"
+msgctxt "wizard_button:timesheet.work.open2,start,end:"
msgid "Cancel"
msgstr "Cancelar"
-msgctxt "wizard_button:timesheet.work.open2,init,open:0"
+msgctxt "wizard_button:timesheet.work.open2,start,open_:"
msgid "Open"
msgstr "Abrir"
diff --git a/locale/fr_FR.po b/locale/fr_FR.po
index d30963b..8484550 100644
--- a/locale/fr_FR.po
+++ b/locale/fr_FR.po
@@ -2,175 +2,296 @@
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
-msgctxt "error:timesheet.line:0"
+msgctxt "error:timesheet.line:"
msgid "Hours field must be positive"
msgstr "Le champ Heures doit être positif"
-msgctxt "error:timesheet.work:0"
+msgctxt "error:timesheet.line:"
+msgid "Hours field must be positive"
+msgstr "Le champ Heures doit être positif"
+
+msgctxt "error:timesheet.work:"
+msgid "Every work must be in the same company as it's parent work!"
+msgstr ""
+"Chaque activité doit être dans la même société que son activité parente !"
+
+msgctxt "error:timesheet.work:"
msgid "Every work must be in the same company as it's parent work!"
msgstr ""
"Chaque activité doit être dans la même société que son activité parente !"
-msgctxt "error:timesheet.work:0"
+msgctxt "error:timesheet.work:"
msgid "You can not create recursive works!"
msgstr "Vous ne pouvez pas créer des activités récursives!"
-msgctxt "field:timesheet.enter_lines.init,date:0"
-msgid "Date"
-msgstr "Date"
+msgctxt "error:timesheet.work:"
+msgid "You can not create recursive works!"
+msgstr "Vous ne pouvez pas créer des activités récursives!"
-msgctxt "field:timesheet.enter_lines.init,employee:0"
-msgid "Employee"
-msgstr "Employé"
+msgctxt "field:timesheet.hours_employee,create_date:"
+msgid "Create Date"
+msgstr "Date de création"
+
+msgctxt "field:timesheet.hours_employee,create_uid:"
+msgid "Create User"
+msgstr "Créé par"
-msgctxt "field:timesheet.hours_employee,employee:0"
+msgctxt "field:timesheet.hours_employee,employee:"
msgid "Employee"
msgstr "Employé"
-msgctxt "field:timesheet.hours_employee,hours:0"
+msgctxt "field:timesheet.hours_employee,hours:"
msgid "Hours"
msgstr "Heures"
-msgctxt "field:timesheet.hours_employee,rec_name:0"
+msgctxt "field:timesheet.hours_employee,id:"
+msgid "ID"
+msgstr "ID"
+
+msgctxt "field:timesheet.hours_employee,rec_name:"
msgid "Name"
msgstr "Nom"
-msgctxt "field:timesheet.hours_employee_monthly,employee:0"
+msgctxt "field:timesheet.hours_employee,write_date:"
+msgid "Write Date"
+msgstr "Date de mise à jour"
+
+msgctxt "field:timesheet.hours_employee,write_uid:"
+msgid "Write User"
+msgstr "Mis à jour par"
+
+msgctxt "field:timesheet.hours_employee.open.start,end_date:"
+msgid "End Date"
+msgstr "Date de fin"
+
+msgctxt "field:timesheet.hours_employee.open.start,id:"
+msgid "ID"
+msgstr "ID"
+
+msgctxt "field:timesheet.hours_employee.open.start,start_date:"
+msgid "Start Date"
+msgstr "Date de début"
+
+msgctxt "field:timesheet.hours_employee_monthly,create_date:"
+msgid "Create Date"
+msgstr "Date de création"
+
+msgctxt "field:timesheet.hours_employee_monthly,create_uid:"
+msgid "Create User"
+msgstr "Créé par"
+
+msgctxt "field:timesheet.hours_employee_monthly,employee:"
msgid "Employee"
msgstr "Employé"
-msgctxt "field:timesheet.hours_employee_monthly,hours:0"
+msgctxt "field:timesheet.hours_employee_monthly,hours:"
msgid "Hours"
msgstr "Heures"
-msgctxt "field:timesheet.hours_employee_monthly,month:0"
+msgctxt "field:timesheet.hours_employee_monthly,id:"
+msgid "ID"
+msgstr "ID"
+
+msgctxt "field:timesheet.hours_employee_monthly,month:"
msgid "Month"
msgstr "Mois"
-msgctxt "field:timesheet.hours_employee_monthly,rec_name:0"
+msgctxt "field:timesheet.hours_employee_monthly,rec_name:"
msgid "Name"
msgstr "Nom"
-msgctxt "field:timesheet.hours_employee_monthly,year:0"
+msgctxt "field:timesheet.hours_employee_monthly,write_date:"
+msgid "Write Date"
+msgstr "Date de mise à jour"
+
+msgctxt "field:timesheet.hours_employee_monthly,write_uid:"
+msgid "Write User"
+msgstr "Mis à jour par"
+
+msgctxt "field:timesheet.hours_employee_monthly,year:"
msgid "Year"
msgstr "Année"
-msgctxt "field:timesheet.hours_employee_weekly,employee:0"
+msgctxt "field:timesheet.hours_employee_weekly,create_date:"
+msgid "Create Date"
+msgstr "Date de création"
+
+msgctxt "field:timesheet.hours_employee_weekly,create_uid:"
+msgid "Create User"
+msgstr "Créé par"
+
+msgctxt "field:timesheet.hours_employee_weekly,employee:"
msgid "Employee"
msgstr "Employé"
-msgctxt "field:timesheet.hours_employee_weekly,hours:0"
+msgctxt "field:timesheet.hours_employee_weekly,hours:"
msgid "Hours"
msgstr "Heures"
-msgctxt "field:timesheet.hours_employee_weekly,rec_name:0"
+msgctxt "field:timesheet.hours_employee_weekly,id:"
+msgid "ID"
+msgstr "ID"
+
+msgctxt "field:timesheet.hours_employee_weekly,rec_name:"
msgid "Name"
msgstr "Nom"
-msgctxt "field:timesheet.hours_employee_weekly,week:0"
+msgctxt "field:timesheet.hours_employee_weekly,week:"
msgid "Week"
msgstr "Semaine"
-msgctxt "field:timesheet.hours_employee_weekly,year:0"
+msgctxt "field:timesheet.hours_employee_weekly,write_date:"
+msgid "Write Date"
+msgstr "Date de mise à jour"
+
+msgctxt "field:timesheet.hours_employee_weekly,write_uid:"
+msgid "Write User"
+msgstr "Mis à jour par"
+
+msgctxt "field:timesheet.hours_employee_weekly,year:"
msgid "Year"
msgstr "Année"
-msgctxt "field:timesheet.line,date:0"
+msgctxt "field:timesheet.line,create_date:"
+msgid "Create Date"
+msgstr "Date de création"
+
+msgctxt "field:timesheet.line,create_uid:"
+msgid "Create User"
+msgstr "Créé par"
+
+msgctxt "field:timesheet.line,date:"
msgid "Date"
msgstr "Date"
-msgctxt "field:timesheet.line,description:0"
+msgctxt "field:timesheet.line,description:"
msgid "Description"
msgstr "Description"
-msgctxt "field:timesheet.line,employee:0"
+msgctxt "field:timesheet.line,employee:"
msgid "Employee"
msgstr "Employé"
-msgctxt "field:timesheet.line,hours:0"
+msgctxt "field:timesheet.line,hours:"
msgid "Hours"
msgstr "Heures"
-msgctxt "field:timesheet.line,rec_name:0"
+msgctxt "field:timesheet.line,id:"
+msgid "ID"
+msgstr "ID"
+
+msgctxt "field:timesheet.line,rec_name:"
msgid "Name"
msgstr "Nom"
-msgctxt "field:timesheet.line,work:0"
+msgctxt "field:timesheet.line,work:"
msgid "Work"
msgstr "Travail"
-msgctxt "field:timesheet.open_hours_employee.init,end_date:0"
-msgid "End Date"
-msgstr "Date de fin"
+msgctxt "field:timesheet.line,write_date:"
+msgid "Write Date"
+msgstr "Date de mise à jour"
-msgctxt "field:timesheet.open_hours_employee.init,start_date:0"
-msgid "Start Date"
-msgstr "Date de début"
+msgctxt "field:timesheet.line,write_uid:"
+msgid "Write User"
+msgstr "Mis à jour par"
+
+msgctxt "field:timesheet.line.enter.start,date:"
+msgid "Date"
+msgstr "Date"
+
+msgctxt "field:timesheet.line.enter.start,employee:"
+msgid "Employee"
+msgstr "Employé"
+
+msgctxt "field:timesheet.line.enter.start,id:"
+msgid "ID"
+msgstr "ID"
-msgctxt "field:timesheet.work,active:0"
+msgctxt "field:timesheet.work,active:"
msgid "Active"
msgstr "Actif"
-msgctxt "field:timesheet.work,children:0"
+msgctxt "field:timesheet.work,children:"
msgid "Children"
msgstr "Enfants"
-msgctxt "field:timesheet.work,company:0"
+msgctxt "field:timesheet.work,company:"
msgid "Company"
msgstr "Société"
-msgctxt "field:timesheet.work,hours:0"
+msgctxt "field:timesheet.work,create_date:"
+msgid "Create Date"
+msgstr "Date de création"
+
+msgctxt "field:timesheet.work,create_uid:"
+msgid "Create User"
+msgstr "Créé par"
+
+msgctxt "field:timesheet.work,hours:"
msgid "Timesheet Hours"
msgstr "Heures"
-msgctxt "field:timesheet.work,left:0"
+msgctxt "field:timesheet.work,id:"
+msgid "ID"
+msgstr "ID"
+
+msgctxt "field:timesheet.work,left:"
msgid "Left"
msgstr "Gauche"
-msgctxt "field:timesheet.work,name:0"
+msgctxt "field:timesheet.work,name:"
msgid "Name"
msgstr "Nom"
-msgctxt "field:timesheet.work,parent:0"
+msgctxt "field:timesheet.work,parent:"
msgid "Parent"
msgstr "Parent"
-msgctxt "field:timesheet.work,rec_name:0"
+msgctxt "field:timesheet.work,rec_name:"
msgid "Name"
msgstr "Nom"
-msgctxt "field:timesheet.work,right:0"
+msgctxt "field:timesheet.work,right:"
msgid "Right"
msgstr "Droite"
-msgctxt "field:timesheet.work,timesheet_available:0"
+msgctxt "field:timesheet.work,timesheet_available:"
msgid "Available on timesheets"
msgstr "Disponible sur les feuilles de présence"
-msgctxt "field:timesheet.work,timesheet_lines:0"
+msgctxt "field:timesheet.work,timesheet_lines:"
msgid ""
msgstr ""
-msgctxt "field:timesheet.work.open.init,from_date:0"
+msgctxt "field:timesheet.work,write_date:"
+msgid "Write Date"
+msgstr "Date de mise à jour"
+
+msgctxt "field:timesheet.work,write_uid:"
+msgid "Write User"
+msgstr "Mis à jour par"
+
+msgctxt "field:timesheet.work.open.start,from_date:"
msgid "From Date"
msgstr "Date de début"
-msgctxt "field:timesheet.work.open.init,to_date:0"
+msgctxt "field:timesheet.work.open.start,id:"
+msgid "ID"
+msgstr "ID"
+
+msgctxt "field:timesheet.work.open.start,to_date:"
msgid "To Date"
msgstr "Date de fin"
-msgctxt "help:timesheet.work,hours:0"
+msgctxt "help:timesheet.work,hours:"
msgid "Total time spent on this work"
msgstr "Temps total passé sur cette activité"
-msgctxt "help:timesheet.work,timesheet_available:0"
+msgctxt "help:timesheet.work,timesheet_available:"
msgid "Allow to fill in timesheets with this work"
msgstr "Autoriser cette activité sur les feuilles de présence"
-msgctxt "model:ir.action,name:act_enter_lines"
-msgid "Enter Timesheet"
-msgstr "Entrez feuille de présence"
-
msgctxt "model:ir.action,name:act_hours_employee_form"
msgid "Hours per Employee"
msgstr "Heures par employé"
@@ -179,18 +300,22 @@ msgctxt "model:ir.action,name:act_hours_employee_monthly_form"
msgid "Hours per Employee per Month"
msgstr "Nombre d'heures par employé par mois"
+msgctxt "model:ir.action,name:act_hours_employee_open"
+msgid "Hours per Employee"
+msgstr "Heures par employé"
+
msgctxt "model:ir.action,name:act_hours_employee_weekly_form"
msgid "Hours per Employee per Week"
msgstr "Nombre d'heures par employé par semaine"
+msgctxt "model:ir.action,name:act_line_enter"
+msgid "Enter Timesheet"
+msgstr "Entrer la feuille de présence"
+
msgctxt "model:ir.action,name:act_line_form"
msgid "Timesheet Lines"
msgstr "Lignes de feuille de présence"
-msgctxt "model:ir.action,name:act_open_hours_employee"
-msgid "Hours per Employee"
-msgstr "Heures par employé"
-
msgctxt "model:ir.action,name:act_open_work"
msgid "Hours per Work"
msgstr "Heures par activité"
@@ -227,25 +352,25 @@ msgctxt "model:ir.ui.menu,name:menu_configuration"
msgid "Configuration"
msgstr "Configuration"
-msgctxt "model:ir.ui.menu,name:menu_enter_lines"
-msgid "Enter Timesheet"
-msgstr "Entrer feuille de présence"
-
-msgctxt "model:ir.ui.menu,name:menu_line_form"
-msgid "Timesheet Lines"
-msgstr "Lignes de feuille de présence"
-
-msgctxt "model:ir.ui.menu,name:menu_open_hours_employee"
+msgctxt "model:ir.ui.menu,name:menu_hours_employee_open"
msgid "Hours per Employee"
msgstr "Heures par employé"
-msgctxt "model:ir.ui.menu,name:menu_open_hours_employee_monthly"
+msgctxt "model:ir.ui.menu,name:menu_hours_employee_open_monthly"
msgid "Hours per Employee per Month"
-msgstr "Nombre d'heures par employé par mois"
+msgstr "Heures par employé par mois"
-msgctxt "model:ir.ui.menu,name:menu_open_hours_employee_weekly"
+msgctxt "model:ir.ui.menu,name:menu_hours_employee_open_weekly"
msgid "Hours per Employee per Week"
-msgstr "Nombre d'heures par employé par semaine"
+msgstr "Heures par employé par semaine"
+
+msgctxt "model:ir.ui.menu,name:menu_line_enter"
+msgid "Enter Timesheet"
+msgstr "Entrer la feuille de présence"
+
+msgctxt "model:ir.ui.menu,name:menu_line_form"
+msgid "Timesheet Lines"
+msgstr "Lignes de feuille de présence"
msgctxt "model:ir.ui.menu,name:menu_reporting"
msgid "Reporting"
@@ -271,118 +396,158 @@ msgctxt "model:res.group,name:group_timesheet_admin"
msgid "Timesheet Administration"
msgstr "Administration feuille de présence"
-msgctxt "model:timesheet.enter_lines.init,name:0"
-msgid "Enter Lines Init"
-msgstr "Entrez les lignes - Init"
-
-msgctxt "model:timesheet.hours_employee,name:0"
+msgctxt "model:timesheet.hours_employee,name:"
msgid "Hours per Employee"
msgstr "Heures par employé"
-msgctxt "model:timesheet.hours_employee_monthly,name:0"
+msgctxt "model:timesheet.hours_employee.open.start,name:"
+msgid "Open Hours per Employee"
+msgstr "Ouvrir les heures par employé"
+
+msgctxt "model:timesheet.hours_employee_monthly,name:"
msgid "Hours per Employee per Month"
msgstr "Nombre d'heures par employé par mois"
-msgctxt "model:timesheet.hours_employee_weekly,name:0"
+msgctxt "model:timesheet.hours_employee_weekly,name:"
msgid "Hours per Employee per Week"
msgstr "Nombre d'heures par employé par semaine"
-msgctxt "model:timesheet.line,name:0"
+msgctxt "model:timesheet.line,name:"
msgid "Timesheet Line"
msgstr "Ligne de feuille de présence"
-msgctxt "model:timesheet.open_hours_employee.init,name:0"
-msgid "Open Hours Employee Init"
-msgstr "Heures d'ouverture des employés - Init"
+msgctxt "model:timesheet.line.enter.start,name:"
+msgid "Enter Lines"
+msgstr "Entrer les lignes"
-msgctxt "model:timesheet.work,name:0"
+msgctxt "model:timesheet.work,name:"
msgid "Work"
msgstr "Travail"
-msgctxt "model:timesheet.work.open.init,name:0"
-msgid "Open Work Init"
-msgstr "Ouvrir activité - Init"
+msgctxt "model:timesheet.work.open.start,name:"
+msgid "Open Work"
+msgstr "Ouvrir la tâche"
-msgctxt "view:timesheet.enter_lines.init:0"
-msgid "Enter Timesheet"
-msgstr "Entrez feuille de présence"
+msgctxt "view:timesheet.hours_employee.open.start:"
+msgid "Hours per Employee"
+msgstr "Heures par employé"
-msgctxt "view:timesheet.hours_employee:0"
+msgctxt "view:timesheet.hours_employee:"
msgid "Hours"
msgstr "Heures"
-msgctxt "view:timesheet.hours_employee:0"
+msgctxt "view:timesheet.hours_employee:"
+msgid "Hours"
+msgstr "Heures"
+
+msgctxt "view:timesheet.hours_employee:"
+msgid "Hours per Employee"
+msgstr "Heures par employé"
+
+msgctxt "view:timesheet.hours_employee:"
msgid "Hours per Employee"
msgstr "Heures par employé"
-msgctxt "view:timesheet.hours_employee_monthly:0"
+msgctxt "view:timesheet.hours_employee_monthly:"
+msgid "Hours per Employee per Month"
+msgstr "Nombre d'heures par employé par mois"
+
+msgctxt "view:timesheet.hours_employee_monthly:"
msgid "Hours per Employee per Month"
msgstr "Nombre d'heures par employé par mois"
-msgctxt "view:timesheet.hours_employee_weekly:0"
+msgctxt "view:timesheet.hours_employee_weekly:"
msgid "Hours per Employee per Week"
msgstr "Nombre d'heures par employé par semaine"
-msgctxt "view:timesheet.line:0"
+msgctxt "view:timesheet.hours_employee_weekly:"
+msgid "Hours per Employee per Week"
+msgstr "Nombre d'heures par employé par semaine"
+
+msgctxt "view:timesheet.line.enter.start:"
+msgid "Enter Timesheet"
+msgstr "Entrer la feuille de présence"
+
+msgctxt "view:timesheet.line:"
+msgid "Hours"
+msgstr "Heures"
+
+msgctxt "view:timesheet.line:"
msgid "Hours"
msgstr "Heures"
-msgctxt "view:timesheet.line:0"
+msgctxt "view:timesheet.line:"
msgid "Timesheet Line"
msgstr "Ligne de feuille de présence"
-msgctxt "view:timesheet.line:0"
+msgctxt "view:timesheet.line:"
+msgid "Timesheet Line"
+msgstr "Ligne de feuille de présence"
+
+msgctxt "view:timesheet.line:"
msgid "Timesheet Lines"
msgstr "Lignes de feuille de présence"
-msgctxt "view:timesheet.open_hours_employee.init:0"
-msgid "Hours per Employee"
-msgstr "Heures par employé"
+msgctxt "view:timesheet.line:"
+msgid "Timesheet Lines"
+msgstr "Lignes de feuille de présence"
-msgctxt "view:timesheet.work.open.init:0"
+msgctxt "view:timesheet.work.open.start:"
msgid "Hours per Work"
msgstr "Heures par activité"
-msgctxt "view:timesheet.work:0"
+msgctxt "view:timesheet.work:"
msgid "Hours per Work"
msgstr "Heures par activité"
-msgctxt "view:timesheet.work:0"
+msgctxt "view:timesheet.work:"
+msgid "Hours per Work"
+msgstr "Heures par activité"
+
+msgctxt "view:timesheet.work:"
+msgid "Work"
+msgstr "Travail"
+
+msgctxt "view:timesheet.work:"
msgid "Work"
msgstr "Travail"
-msgctxt "view:timesheet.work:0"
+msgctxt "view:timesheet.work:"
msgid "Works"
msgstr "Travaux"
-msgctxt "wizard_button:timesheet.enter_lines,init,end:0"
+msgctxt "view:timesheet.work:"
+msgid "Works"
+msgstr "Travaux"
+
+msgctxt "wizard_button:timesheet.hours_employee.open,start,end:"
msgid "Cancel"
msgstr "Annuler"
-msgctxt "wizard_button:timesheet.enter_lines,init,enter:0"
-msgid "Enter"
-msgstr "Entrez"
+msgctxt "wizard_button:timesheet.hours_employee.open,start,open_:"
+msgid "Open"
+msgstr "Ouvrir"
-msgctxt "wizard_button:timesheet.open_hours_employee,init,end:0"
+msgctxt "wizard_button:timesheet.line.enter,start,end:"
msgid "Cancel"
msgstr "Annuler"
-msgctxt "wizard_button:timesheet.open_hours_employee,init,open:0"
-msgid "Open"
-msgstr "Ouvrir"
+msgctxt "wizard_button:timesheet.line.enter,start,enter:"
+msgid "Enter"
+msgstr "Entrer"
-msgctxt "wizard_button:timesheet.work.open,init,end:0"
+msgctxt "wizard_button:timesheet.work.open,start,end:"
msgid "Cancel"
msgstr "Annuler"
-msgctxt "wizard_button:timesheet.work.open,init,open:0"
+msgctxt "wizard_button:timesheet.work.open,start,open_:"
msgid "Open"
msgstr "Ouvrir"
-msgctxt "wizard_button:timesheet.work.open2,init,end:0"
+msgctxt "wizard_button:timesheet.work.open2,start,end:"
msgid "Cancel"
msgstr "Annuler"
-msgctxt "wizard_button:timesheet.work.open2,init,open:0"
+msgctxt "wizard_button:timesheet.work.open2,start,open_:"
msgid "Open"
msgstr "Ouvrir"
diff --git a/locale/nl_NL.po b/locale/nl_NL.po
index ce6e514..a817417 100644
--- a/locale/nl_NL.po
+++ b/locale/nl_NL.po
@@ -2,176 +2,290 @@
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
-msgctxt "error:timesheet.line:0"
+msgctxt "error:timesheet.line:"
msgid "Hours field must be positive"
msgstr "Het veld uren moet positief zijn"
-msgctxt "error:timesheet.work:0"
+msgctxt "error:timesheet.work:"
msgid "Every work must be in the same company as it's parent work!"
msgstr ""
"Ieder werk moet onder hetzelfde bedrijf vallen als het bovenliggende werk!"
-msgctxt "error:timesheet.work:0"
+msgctxt "error:timesheet.work:"
msgid "You can not create recursive works!"
msgstr "U kunt een werk niet naar zichzelf laten verwijzen!"
-msgctxt "field:timesheet.enter_lines.init,date:0"
-msgid "Date"
-msgstr "Datum"
+msgctxt "field:timesheet.hours_employee,create_date:"
+msgid "Create Date"
+msgstr ""
-msgctxt "field:timesheet.enter_lines.init,employee:0"
-msgid "Employee"
-msgstr "Werknemer"
+msgctxt "field:timesheet.hours_employee,create_uid:"
+msgid "Create User"
+msgstr ""
-msgctxt "field:timesheet.hours_employee,employee:0"
+msgctxt "field:timesheet.hours_employee,employee:"
msgid "Employee"
msgstr "Werknemer"
-msgctxt "field:timesheet.hours_employee,hours:0"
+msgctxt "field:timesheet.hours_employee,hours:"
msgid "Hours"
msgstr "Uren"
-msgctxt "field:timesheet.hours_employee,rec_name:0"
+msgctxt "field:timesheet.hours_employee,id:"
+msgid "ID"
+msgstr ""
+
+msgctxt "field:timesheet.hours_employee,rec_name:"
msgid "Name"
msgstr "Naam"
-msgctxt "field:timesheet.hours_employee_monthly,employee:0"
+msgctxt "field:timesheet.hours_employee,write_date:"
+msgid "Write Date"
+msgstr ""
+
+msgctxt "field:timesheet.hours_employee,write_uid:"
+msgid "Write User"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:timesheet.hours_employee.open.start,end_date:"
+msgid "End Date"
+msgstr "Eind datum"
+
+msgctxt "field:timesheet.hours_employee.open.start,id:"
+msgid "ID"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:timesheet.hours_employee.open.start,start_date:"
+msgid "Start Date"
+msgstr "Start datum"
+
+msgctxt "field:timesheet.hours_employee_monthly,create_date:"
+msgid "Create Date"
+msgstr ""
+
+msgctxt "field:timesheet.hours_employee_monthly,create_uid:"
+msgid "Create User"
+msgstr ""
+
+msgctxt "field:timesheet.hours_employee_monthly,employee:"
msgid "Employee"
msgstr "Werknemer"
-msgctxt "field:timesheet.hours_employee_monthly,hours:0"
+msgctxt "field:timesheet.hours_employee_monthly,hours:"
msgid "Hours"
msgstr "Uren"
-msgctxt "field:timesheet.hours_employee_monthly,month:0"
+msgctxt "field:timesheet.hours_employee_monthly,id:"
+msgid "ID"
+msgstr ""
+
+msgctxt "field:timesheet.hours_employee_monthly,month:"
msgid "Month"
msgstr "Maand"
-msgctxt "field:timesheet.hours_employee_monthly,rec_name:0"
+msgctxt "field:timesheet.hours_employee_monthly,rec_name:"
msgid "Name"
msgstr "Naam"
-msgctxt "field:timesheet.hours_employee_monthly,year:0"
+msgctxt "field:timesheet.hours_employee_monthly,write_date:"
+msgid "Write Date"
+msgstr ""
+
+msgctxt "field:timesheet.hours_employee_monthly,write_uid:"
+msgid "Write User"
+msgstr ""
+
+msgctxt "field:timesheet.hours_employee_monthly,year:"
msgid "Year"
msgstr "Jaar"
-msgctxt "field:timesheet.hours_employee_weekly,employee:0"
+msgctxt "field:timesheet.hours_employee_weekly,create_date:"
+msgid "Create Date"
+msgstr ""
+
+msgctxt "field:timesheet.hours_employee_weekly,create_uid:"
+msgid "Create User"
+msgstr ""
+
+msgctxt "field:timesheet.hours_employee_weekly,employee:"
msgid "Employee"
msgstr "Werknemer"
-msgctxt "field:timesheet.hours_employee_weekly,hours:0"
+msgctxt "field:timesheet.hours_employee_weekly,hours:"
msgid "Hours"
msgstr "Uren"
-msgctxt "field:timesheet.hours_employee_weekly,rec_name:0"
+msgctxt "field:timesheet.hours_employee_weekly,id:"
+msgid "ID"
+msgstr ""
+
+msgctxt "field:timesheet.hours_employee_weekly,rec_name:"
msgid "Name"
msgstr "Naam"
-msgctxt "field:timesheet.hours_employee_weekly,week:0"
+msgctxt "field:timesheet.hours_employee_weekly,week:"
msgid "Week"
msgstr "Week"
-msgctxt "field:timesheet.hours_employee_weekly,year:0"
+msgctxt "field:timesheet.hours_employee_weekly,write_date:"
+msgid "Write Date"
+msgstr ""
+
+msgctxt "field:timesheet.hours_employee_weekly,write_uid:"
+msgid "Write User"
+msgstr ""
+
+msgctxt "field:timesheet.hours_employee_weekly,year:"
msgid "Year"
msgstr "Jaar"
-msgctxt "field:timesheet.line,date:0"
+msgctxt "field:timesheet.line,create_date:"
+msgid "Create Date"
+msgstr ""
+
+msgctxt "field:timesheet.line,create_uid:"
+msgid "Create User"
+msgstr ""
+
+msgctxt "field:timesheet.line,date:"
msgid "Date"
msgstr "Datum"
-msgctxt "field:timesheet.line,description:0"
+msgctxt "field:timesheet.line,description:"
msgid "Description"
msgstr "Specificatie"
-msgctxt "field:timesheet.line,employee:0"
+msgctxt "field:timesheet.line,employee:"
msgid "Employee"
msgstr "Werknemer"
-msgctxt "field:timesheet.line,hours:0"
+msgctxt "field:timesheet.line,hours:"
msgid "Hours"
msgstr "Uren"
-msgctxt "field:timesheet.line,rec_name:0"
+msgctxt "field:timesheet.line,id:"
+msgid "ID"
+msgstr ""
+
+msgctxt "field:timesheet.line,rec_name:"
msgid "Name"
msgstr "Naam"
-msgctxt "field:timesheet.line,work:0"
+msgctxt "field:timesheet.line,work:"
msgid "Work"
msgstr "Werk"
-msgctxt "field:timesheet.open_hours_employee.init,end_date:0"
-msgid "End Date"
-msgstr "Eind datum"
+msgctxt "field:timesheet.line,write_date:"
+msgid "Write Date"
+msgstr ""
-msgctxt "field:timesheet.open_hours_employee.init,start_date:0"
-msgid "Start Date"
-msgstr "Start datum"
+msgctxt "field:timesheet.line,write_uid:"
+msgid "Write User"
+msgstr ""
-msgctxt "field:timesheet.work,active:0"
+#, fuzzy
+msgctxt "field:timesheet.line.enter.start,date:"
+msgid "Date"
+msgstr "Vervaldatum"
+
+#, fuzzy
+msgctxt "field:timesheet.line.enter.start,employee:"
+msgid "Employee"
+msgstr "Werknemer"
+
+msgctxt "field:timesheet.line.enter.start,id:"
+msgid "ID"
+msgstr ""
+
+msgctxt "field:timesheet.work,active:"
msgid "Active"
msgstr "Actief"
-msgctxt "field:timesheet.work,children:0"
+msgctxt "field:timesheet.work,children:"
msgid "Children"
msgstr "Onderliggende niveaus"
-msgctxt "field:timesheet.work,company:0"
+msgctxt "field:timesheet.work,company:"
msgid "Company"
msgstr "Bedrijf"
-msgctxt "field:timesheet.work,hours:0"
+msgctxt "field:timesheet.work,create_date:"
+msgid "Create Date"
+msgstr ""
+
+msgctxt "field:timesheet.work,create_uid:"
+msgid "Create User"
+msgstr ""
+
+msgctxt "field:timesheet.work,hours:"
msgid "Timesheet Hours"
msgstr "Tijdregistratie uren"
-msgctxt "field:timesheet.work,left:0"
+msgctxt "field:timesheet.work,id:"
+msgid "ID"
+msgstr ""
+
+msgctxt "field:timesheet.work,left:"
msgid "Left"
msgstr "Links"
-msgctxt "field:timesheet.work,name:0"
+msgctxt "field:timesheet.work,name:"
msgid "Name"
msgstr "Naam"
-msgctxt "field:timesheet.work,parent:0"
+msgctxt "field:timesheet.work,parent:"
msgid "Parent"
msgstr "Bovenliggend niveau"
-msgctxt "field:timesheet.work,rec_name:0"
+msgctxt "field:timesheet.work,rec_name:"
msgid "Name"
msgstr "Naam"
-msgctxt "field:timesheet.work,right:0"
+msgctxt "field:timesheet.work,right:"
msgid "Right"
msgstr "Rechts"
-msgctxt "field:timesheet.work,timesheet_available:0"
+msgctxt "field:timesheet.work,timesheet_available:"
msgid "Available on timesheets"
msgstr "Beschikbaar in tijdregistartie"
#, fuzzy
-msgctxt "field:timesheet.work,timesheet_lines:0"
+msgctxt "field:timesheet.work,timesheet_lines:"
msgid "Timesheet Lines"
msgstr "Tijdregistratieregels"
-msgctxt "field:timesheet.work.open.init,from_date:0"
+msgctxt "field:timesheet.work,write_date:"
+msgid "Write Date"
+msgstr ""
+
+msgctxt "field:timesheet.work,write_uid:"
+msgid "Write User"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:timesheet.work.open.start,from_date:"
msgid "From Date"
msgstr "Vanaf datum"
-msgctxt "field:timesheet.work.open.init,to_date:0"
+msgctxt "field:timesheet.work.open.start,id:"
+msgid "ID"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:timesheet.work.open.start,to_date:"
msgid "To Date"
msgstr "Tot datum"
-msgctxt "help:timesheet.work,hours:0"
+msgctxt "help:timesheet.work,hours:"
msgid "Total time spent on this work"
msgstr "Tijd besteed aan dit werk"
-msgctxt "help:timesheet.work,timesheet_available:0"
+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 "model:ir.action,name:act_enter_lines"
-msgid "Enter Timesheet"
-msgstr "Naar tijdregistratie"
-
msgctxt "model:ir.action,name:act_hours_employee_form"
msgid "Hours per Employee"
msgstr "Uren per werknemer"
@@ -180,18 +294,23 @@ msgctxt "model:ir.action,name:act_hours_employee_monthly_form"
msgid "Hours per Employee per Month"
msgstr "Uren per werknemer per maand"
+#, fuzzy
+msgctxt "model:ir.action,name:act_hours_employee_open"
+msgid "Hours per Employee"
+msgstr "Uren per werknemer"
+
msgctxt "model:ir.action,name:act_hours_employee_weekly_form"
msgid "Hours per Employee per Week"
msgstr "Uren per werknemer per week"
+msgctxt "model:ir.action,name:act_line_enter"
+msgid "Enter Timesheet"
+msgstr ""
+
msgctxt "model:ir.action,name:act_line_form"
msgid "Timesheet Lines"
msgstr "Tijdregistratieregels"
-msgctxt "model:ir.action,name:act_open_hours_employee"
-msgid "Hours per Employee"
-msgstr "Uren per werknemer"
-
msgctxt "model:ir.action,name:act_open_work"
msgid "Hours per Work"
msgstr "Uren per werk"
@@ -230,26 +349,29 @@ msgctxt "model:ir.ui.menu,name:menu_configuration"
msgid "Configuration"
msgstr "Instellingen"
-msgctxt "model:ir.ui.menu,name:menu_enter_lines"
-msgid "Enter Timesheet"
-msgstr "Naar tijdregistratie"
-
-msgctxt "model:ir.ui.menu,name:menu_line_form"
-msgid "Timesheet Lines"
-msgstr "Tijdregistratieregels"
-
-msgctxt "model:ir.ui.menu,name:menu_open_hours_employee"
+#, fuzzy
+msgctxt "model:ir.ui.menu,name:menu_hours_employee_open"
msgid "Hours per Employee"
msgstr "Uren per werknemer"
-msgctxt "model:ir.ui.menu,name:menu_open_hours_employee_monthly"
+#, fuzzy
+msgctxt "model:ir.ui.menu,name:menu_hours_employee_open_monthly"
msgid "Hours per Employee per Month"
msgstr "Uren per werknemer per maand"
-msgctxt "model:ir.ui.menu,name:menu_open_hours_employee_weekly"
+#, fuzzy
+msgctxt "model:ir.ui.menu,name:menu_hours_employee_open_weekly"
msgid "Hours per Employee per Week"
msgstr "Uren per werknemer per week"
+msgctxt "model:ir.ui.menu,name:menu_line_enter"
+msgid "Enter Timesheet"
+msgstr ""
+
+msgctxt "model:ir.ui.menu,name:menu_line_form"
+msgid "Timesheet Lines"
+msgstr "Tijdregistratieregels"
+
msgctxt "model:ir.ui.menu,name:menu_reporting"
msgid "Reporting"
msgstr "Rapportage"
@@ -276,118 +398,127 @@ msgctxt "model:res.group,name:group_timesheet_admin"
msgid "Timesheet Administration"
msgstr "Tijdregistratie"
-msgctxt "model:timesheet.enter_lines.init,name:0"
-msgid "Enter Lines Init"
-msgstr "Naar tijdregistratie gaan"
-
-msgctxt "model:timesheet.hours_employee,name:0"
+msgctxt "model:timesheet.hours_employee,name:"
msgid "Hours per Employee"
msgstr "Uren per werknemer"
-msgctxt "model:timesheet.hours_employee_monthly,name:0"
+msgctxt "model:timesheet.hours_employee.open.start,name:"
+msgid "Open Hours per Employee"
+msgstr ""
+
+msgctxt "model:timesheet.hours_employee_monthly,name:"
msgid "Hours per Employee per Month"
msgstr "Uren per werknemer per maand"
-msgctxt "model:timesheet.hours_employee_weekly,name:0"
+msgctxt "model:timesheet.hours_employee_weekly,name:"
msgid "Hours per Employee per Week"
msgstr "Uren per werknemer per week"
-msgctxt "model:timesheet.line,name:0"
+msgctxt "model:timesheet.line,name:"
msgid "Timesheet Line"
msgstr "Tijdregistratieregel"
-msgctxt "model:timesheet.open_hours_employee.init,name:0"
-msgid "Open Hours Employee Init"
-msgstr "Uren werknemer gaan openen"
+msgctxt "model:timesheet.line.enter.start,name:"
+msgid "Enter Lines"
+msgstr ""
-msgctxt "model:timesheet.work,name:0"
+msgctxt "model:timesheet.work,name:"
msgid "Work"
msgstr "Werk"
-msgctxt "model:timesheet.work.open.init,name:0"
-msgid "Open Work Init"
-msgstr "Werk gaan openen"
+msgctxt "model:timesheet.work.open.start,name:"
+msgid "Open Work"
+msgstr ""
-msgctxt "view:timesheet.enter_lines.init:0"
-msgid "Enter Timesheet"
-msgstr "Naar tijdregistratie"
+#, fuzzy
+msgctxt "view:timesheet.hours_employee.open.start:"
+msgid "Hours per Employee"
+msgstr "Uren per werknemer"
-msgctxt "view:timesheet.hours_employee:0"
+msgctxt "view:timesheet.hours_employee:"
msgid "Hours"
msgstr "Uren"
-msgctxt "view:timesheet.hours_employee:0"
+msgctxt "view:timesheet.hours_employee:"
msgid "Hours per Employee"
msgstr "Uren per werknemer"
-msgctxt "view:timesheet.hours_employee_monthly:0"
+msgctxt "view:timesheet.hours_employee_monthly:"
msgid "Hours per Employee per Month"
msgstr "Uren per werknemer per maand"
-msgctxt "view:timesheet.hours_employee_weekly:0"
+msgctxt "view:timesheet.hours_employee_weekly:"
msgid "Hours per Employee per Week"
msgstr "Uren per werknemer per week"
-msgctxt "view:timesheet.line:0"
+msgctxt "view:timesheet.line.enter.start:"
+msgid "Enter Timesheet"
+msgstr ""
+
+msgctxt "view:timesheet.line:"
msgid "Hours"
msgstr "Uren"
-msgctxt "view:timesheet.line:0"
+msgctxt "view:timesheet.line:"
msgid "Timesheet Line"
msgstr "Tijdregistratieregel"
-msgctxt "view:timesheet.line:0"
+msgctxt "view:timesheet.line:"
msgid "Timesheet Lines"
msgstr "Tijdregistratieregels"
-msgctxt "view:timesheet.open_hours_employee.init:0"
-msgid "Hours per Employee"
-msgstr "Uren per werknemer"
-
-msgctxt "view:timesheet.work.open.init:0"
+#, fuzzy
+msgctxt "view:timesheet.work.open.start:"
msgid "Hours per Work"
msgstr "Uren per werk"
-msgctxt "view:timesheet.work:0"
+msgctxt "view:timesheet.work:"
msgid "Hours per Work"
msgstr "Uren per werk"
-msgctxt "view:timesheet.work:0"
+msgctxt "view:timesheet.work:"
msgid "Work"
msgstr "Werk"
-msgctxt "view:timesheet.work:0"
+msgctxt "view:timesheet.work:"
msgid "Works"
msgstr "Werken"
-msgctxt "wizard_button:timesheet.enter_lines,init,end:0"
+#, fuzzy
+msgctxt "wizard_button:timesheet.hours_employee.open,start,end:"
msgid "Cancel"
msgstr "Annuleren"
-msgctxt "wizard_button:timesheet.enter_lines,init,enter:0"
-msgid "Enter"
-msgstr "Bevestigen"
+#, fuzzy
+msgctxt "wizard_button:timesheet.hours_employee.open,start,open_:"
+msgid "Open"
+msgstr "Open"
-msgctxt "wizard_button:timesheet.open_hours_employee,init,end:0"
+#, fuzzy
+msgctxt "wizard_button:timesheet.line.enter,start,end:"
msgid "Cancel"
msgstr "Annuleren"
-msgctxt "wizard_button:timesheet.open_hours_employee,init,open:0"
-msgid "Open"
-msgstr "Open"
+msgctxt "wizard_button:timesheet.line.enter,start,enter:"
+msgid "Enter"
+msgstr ""
-msgctxt "wizard_button:timesheet.work.open,init,end:0"
+#, fuzzy
+msgctxt "wizard_button:timesheet.work.open,start,end:"
msgid "Cancel"
msgstr "Annuleren"
-msgctxt "wizard_button:timesheet.work.open,init,open:0"
+#, fuzzy
+msgctxt "wizard_button:timesheet.work.open,start,open_:"
msgid "Open"
msgstr "Open"
-msgctxt "wizard_button:timesheet.work.open2,init,end:0"
+#, fuzzy
+msgctxt "wizard_button:timesheet.work.open2,start,end:"
msgid "Cancel"
msgstr "Annuleren"
-msgctxt "wizard_button:timesheet.work.open2,init,open:0"
+#, fuzzy
+msgctxt "wizard_button:timesheet.work.open2,start,open_:"
msgid "Open"
msgstr "Open"
diff --git a/locale/ru_RU.po b/locale/ru_RU.po
index 3b998dd..333c909 100644
--- a/locale/ru_RU.po
+++ b/locale/ru_RU.po
@@ -2,200 +2,308 @@
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
-msgctxt "error:timesheet.line:0"
+msgctxt "error:timesheet.line:"
msgid "Hours field must be positive"
msgstr ""
-msgctxt "error:timesheet.work:0"
+msgctxt "error:timesheet.work:"
msgid "Every work must be in the same company as it's parent work!"
msgstr ""
-msgctxt "error:timesheet.work:0"
+msgctxt "error:timesheet.work:"
msgid "You can not create recursive works!"
msgstr ""
-#, fuzzy
-msgctxt "field:timesheet.enter_lines.init,date:0"
-msgid "Date"
-msgstr "Дата"
+msgctxt "field:timesheet.hours_employee,create_date:"
+msgid "Create Date"
+msgstr ""
-#, fuzzy
-msgctxt "field:timesheet.enter_lines.init,employee:0"
-msgid "Employee"
-msgstr "Сотрудник"
+msgctxt "field:timesheet.hours_employee,create_uid:"
+msgid "Create User"
+msgstr ""
#, fuzzy
-msgctxt "field:timesheet.hours_employee,employee:0"
+msgctxt "field:timesheet.hours_employee,employee:"
msgid "Employee"
msgstr "Сотрудник"
#, fuzzy
-msgctxt "field:timesheet.hours_employee,hours:0"
+msgctxt "field:timesheet.hours_employee,hours:"
msgid "Hours"
msgstr "Часы"
+msgctxt "field:timesheet.hours_employee,id:"
+msgid "ID"
+msgstr ""
+
#, fuzzy
-msgctxt "field:timesheet.hours_employee,rec_name:0"
+msgctxt "field:timesheet.hours_employee,rec_name:"
msgid "Name"
msgstr "Наименование"
+msgctxt "field:timesheet.hours_employee,write_date:"
+msgid "Write Date"
+msgstr ""
+
+msgctxt "field:timesheet.hours_employee,write_uid:"
+msgid "Write User"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:timesheet.hours_employee.open.start,end_date:"
+msgid "End Date"
+msgstr "Дата окончания"
+
+msgctxt "field:timesheet.hours_employee.open.start,id:"
+msgid "ID"
+msgstr ""
+
#, fuzzy
-msgctxt "field:timesheet.hours_employee_monthly,employee:0"
+msgctxt "field:timesheet.hours_employee.open.start,start_date:"
+msgid "Start Date"
+msgstr "Дата начала"
+
+msgctxt "field:timesheet.hours_employee_monthly,create_date:"
+msgid "Create Date"
+msgstr ""
+
+msgctxt "field:timesheet.hours_employee_monthly,create_uid:"
+msgid "Create User"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:timesheet.hours_employee_monthly,employee:"
msgid "Employee"
msgstr "Сотрудник"
#, fuzzy
-msgctxt "field:timesheet.hours_employee_monthly,hours:0"
+msgctxt "field:timesheet.hours_employee_monthly,hours:"
msgid "Hours"
msgstr "Часы"
-msgctxt "field:timesheet.hours_employee_monthly,month:0"
+msgctxt "field:timesheet.hours_employee_monthly,id:"
+msgid "ID"
+msgstr ""
+
+msgctxt "field:timesheet.hours_employee_monthly,month:"
msgid "Month"
msgstr ""
#, fuzzy
-msgctxt "field:timesheet.hours_employee_monthly,rec_name:0"
+msgctxt "field:timesheet.hours_employee_monthly,rec_name:"
msgid "Name"
msgstr "Наименование"
-msgctxt "field:timesheet.hours_employee_monthly,year:0"
+msgctxt "field:timesheet.hours_employee_monthly,write_date:"
+msgid "Write Date"
+msgstr ""
+
+msgctxt "field:timesheet.hours_employee_monthly,write_uid:"
+msgid "Write User"
+msgstr ""
+
+msgctxt "field:timesheet.hours_employee_monthly,year:"
msgid "Year"
msgstr ""
+msgctxt "field:timesheet.hours_employee_weekly,create_date:"
+msgid "Create Date"
+msgstr ""
+
+msgctxt "field:timesheet.hours_employee_weekly,create_uid:"
+msgid "Create User"
+msgstr ""
+
#, fuzzy
-msgctxt "field:timesheet.hours_employee_weekly,employee:0"
+msgctxt "field:timesheet.hours_employee_weekly,employee:"
msgid "Employee"
msgstr "Сотрудник"
#, fuzzy
-msgctxt "field:timesheet.hours_employee_weekly,hours:0"
+msgctxt "field:timesheet.hours_employee_weekly,hours:"
msgid "Hours"
msgstr "Часы"
+msgctxt "field:timesheet.hours_employee_weekly,id:"
+msgid "ID"
+msgstr ""
+
#, fuzzy
-msgctxt "field:timesheet.hours_employee_weekly,rec_name:0"
+msgctxt "field:timesheet.hours_employee_weekly,rec_name:"
msgid "Name"
msgstr "Наименование"
-msgctxt "field:timesheet.hours_employee_weekly,week:0"
+msgctxt "field:timesheet.hours_employee_weekly,week:"
msgid "Week"
msgstr ""
-msgctxt "field:timesheet.hours_employee_weekly,year:0"
+msgctxt "field:timesheet.hours_employee_weekly,write_date:"
+msgid "Write Date"
+msgstr ""
+
+msgctxt "field:timesheet.hours_employee_weekly,write_uid:"
+msgid "Write User"
+msgstr ""
+
+msgctxt "field:timesheet.hours_employee_weekly,year:"
msgid "Year"
msgstr ""
+msgctxt "field:timesheet.line,create_date:"
+msgid "Create Date"
+msgstr ""
+
+msgctxt "field:timesheet.line,create_uid:"
+msgid "Create User"
+msgstr ""
+
#, fuzzy
-msgctxt "field:timesheet.line,date:0"
+msgctxt "field:timesheet.line,date:"
msgid "Date"
msgstr "Дата"
#, fuzzy
-msgctxt "field:timesheet.line,description:0"
+msgctxt "field:timesheet.line,description:"
msgid "Description"
msgstr "Описание"
#, fuzzy
-msgctxt "field:timesheet.line,employee:0"
+msgctxt "field:timesheet.line,employee:"
msgid "Employee"
msgstr "Сотрудник"
#, fuzzy
-msgctxt "field:timesheet.line,hours:0"
+msgctxt "field:timesheet.line,hours:"
msgid "Hours"
msgstr "Часы"
+msgctxt "field:timesheet.line,id:"
+msgid "ID"
+msgstr ""
+
#, fuzzy
-msgctxt "field:timesheet.line,rec_name:0"
+msgctxt "field:timesheet.line,rec_name:"
msgid "Name"
msgstr "Наименование"
-msgctxt "field:timesheet.line,work:0"
+msgctxt "field:timesheet.line,work:"
msgid "Work"
msgstr ""
+msgctxt "field:timesheet.line,write_date:"
+msgid "Write Date"
+msgstr ""
+
+msgctxt "field:timesheet.line,write_uid:"
+msgid "Write User"
+msgstr ""
+
#, fuzzy
-msgctxt "field:timesheet.open_hours_employee.init,end_date:0"
-msgid "End Date"
-msgstr "Дата окончания"
+msgctxt "field:timesheet.line.enter.start,date:"
+msgid "Date"
+msgstr "Дата"
#, fuzzy
-msgctxt "field:timesheet.open_hours_employee.init,start_date:0"
-msgid "Start Date"
-msgstr "Дата начала"
+msgctxt "field:timesheet.line.enter.start,employee:"
+msgid "Employee"
+msgstr "Сотрудник"
+
+msgctxt "field:timesheet.line.enter.start,id:"
+msgid "ID"
+msgstr ""
#, fuzzy
-msgctxt "field:timesheet.work,active:0"
+msgctxt "field:timesheet.work,active:"
msgid "Active"
msgstr "Действительный"
#, fuzzy
-msgctxt "field:timesheet.work,children:0"
+msgctxt "field:timesheet.work,children:"
msgid "Children"
msgstr "Подчиненый"
#, fuzzy
-msgctxt "field:timesheet.work,company:0"
+msgctxt "field:timesheet.work,company:"
msgid "Company"
msgstr "Учет.орг."
-msgctxt "field:timesheet.work,hours:0"
+msgctxt "field:timesheet.work,create_date:"
+msgid "Create Date"
+msgstr ""
+
+msgctxt "field:timesheet.work,create_uid:"
+msgid "Create User"
+msgstr ""
+
+msgctxt "field:timesheet.work,hours:"
msgid "Timesheet Hours"
msgstr ""
+msgctxt "field:timesheet.work,id:"
+msgid "ID"
+msgstr ""
+
#, fuzzy
-msgctxt "field:timesheet.work,left:0"
+msgctxt "field:timesheet.work,left:"
msgid "Left"
msgstr "Левая сторона"
#, fuzzy
-msgctxt "field:timesheet.work,name:0"
+msgctxt "field:timesheet.work,name:"
msgid "Name"
msgstr "Наименование"
#, fuzzy
-msgctxt "field:timesheet.work,parent:0"
+msgctxt "field:timesheet.work,parent:"
msgid "Parent"
msgstr "Основной"
#, fuzzy
-msgctxt "field:timesheet.work,rec_name:0"
+msgctxt "field:timesheet.work,rec_name:"
msgid "Name"
msgstr "Наименование"
#, fuzzy
-msgctxt "field:timesheet.work,right:0"
+msgctxt "field:timesheet.work,right:"
msgid "Right"
msgstr "Правая сторона"
-msgctxt "field:timesheet.work,timesheet_available:0"
+msgctxt "field:timesheet.work,timesheet_available:"
msgid "Available on timesheets"
msgstr ""
-msgctxt "field:timesheet.work,timesheet_lines:0"
+msgctxt "field:timesheet.work,timesheet_lines:"
msgid "Timesheet Lines"
msgstr ""
-msgctxt "field:timesheet.work.open.init,from_date:0"
+msgctxt "field:timesheet.work,write_date:"
+msgid "Write Date"
+msgstr ""
+
+msgctxt "field:timesheet.work,write_uid:"
+msgid "Write User"
+msgstr ""
+
+msgctxt "field:timesheet.work.open.start,from_date:"
msgid "From Date"
msgstr ""
-msgctxt "field:timesheet.work.open.init,to_date:0"
+msgctxt "field:timesheet.work.open.start,id:"
+msgid "ID"
+msgstr ""
+
+msgctxt "field:timesheet.work.open.start,to_date:"
msgid "To Date"
msgstr ""
-msgctxt "help:timesheet.work,hours:0"
+msgctxt "help:timesheet.work,hours:"
msgid "Total time spent on this work"
msgstr ""
-msgctxt "help:timesheet.work,timesheet_available:0"
+msgctxt "help:timesheet.work,timesheet_available:"
msgid "Allow to fill in timesheets with this work"
msgstr ""
-msgctxt "model:ir.action,name:act_enter_lines"
-msgid "Enter Timesheet"
-msgstr ""
-
msgctxt "model:ir.action,name:act_hours_employee_form"
msgid "Hours per Employee"
msgstr ""
@@ -204,16 +312,20 @@ msgctxt "model:ir.action,name:act_hours_employee_monthly_form"
msgid "Hours per Employee per Month"
msgstr ""
+msgctxt "model:ir.action,name:act_hours_employee_open"
+msgid "Hours per Employee"
+msgstr ""
+
msgctxt "model:ir.action,name:act_hours_employee_weekly_form"
msgid "Hours per Employee per Week"
msgstr ""
-msgctxt "model:ir.action,name:act_line_form"
-msgid "Timesheet Lines"
+msgctxt "model:ir.action,name:act_line_enter"
+msgid "Enter Timesheet"
msgstr ""
-msgctxt "model:ir.action,name:act_open_hours_employee"
-msgid "Hours per Employee"
+msgctxt "model:ir.action,name:act_line_form"
+msgid "Timesheet Lines"
msgstr ""
msgctxt "model:ir.action,name:act_open_work"
@@ -253,24 +365,24 @@ msgctxt "model:ir.ui.menu,name:menu_configuration"
msgid "Configuration"
msgstr "Конфигурация"
-msgctxt "model:ir.ui.menu,name:menu_enter_lines"
-msgid "Enter Timesheet"
+msgctxt "model:ir.ui.menu,name:menu_hours_employee_open"
+msgid "Hours per Employee"
msgstr ""
-msgctxt "model:ir.ui.menu,name:menu_line_form"
-msgid "Timesheet Lines"
+msgctxt "model:ir.ui.menu,name:menu_hours_employee_open_monthly"
+msgid "Hours per Employee per Month"
msgstr ""
-msgctxt "model:ir.ui.menu,name:menu_open_hours_employee"
-msgid "Hours per Employee"
+msgctxt "model:ir.ui.menu,name:menu_hours_employee_open_weekly"
+msgid "Hours per Employee per Week"
msgstr ""
-msgctxt "model:ir.ui.menu,name:menu_open_hours_employee_monthly"
-msgid "Hours per Employee per Month"
+msgctxt "model:ir.ui.menu,name:menu_line_enter"
+msgid "Enter Timesheet"
msgstr ""
-msgctxt "model:ir.ui.menu,name:menu_open_hours_employee_weekly"
-msgid "Hours per Employee per Week"
+msgctxt "model:ir.ui.menu,name:menu_line_form"
+msgid "Timesheet Lines"
msgstr ""
#, fuzzy
@@ -298,127 +410,127 @@ msgctxt "model:res.group,name:group_timesheet_admin"
msgid "Timesheet Administration"
msgstr ""
-msgctxt "model:timesheet.enter_lines.init,name:0"
-msgid "Enter Lines Init"
+msgctxt "model:timesheet.hours_employee,name:"
+msgid "Hours per Employee"
msgstr ""
-msgctxt "model:timesheet.hours_employee,name:0"
-msgid "Hours per Employee"
+msgctxt "model:timesheet.hours_employee.open.start,name:"
+msgid "Open Hours per Employee"
msgstr ""
-msgctxt "model:timesheet.hours_employee_monthly,name:0"
+msgctxt "model:timesheet.hours_employee_monthly,name:"
msgid "Hours per Employee per Month"
msgstr ""
-msgctxt "model:timesheet.hours_employee_weekly,name:0"
+msgctxt "model:timesheet.hours_employee_weekly,name:"
msgid "Hours per Employee per Week"
msgstr ""
-msgctxt "model:timesheet.line,name:0"
+msgctxt "model:timesheet.line,name:"
msgid "Timesheet Line"
msgstr ""
-msgctxt "model:timesheet.open_hours_employee.init,name:0"
-msgid "Open Hours Employee Init"
+msgctxt "model:timesheet.line.enter.start,name:"
+msgid "Enter Lines"
msgstr ""
-msgctxt "model:timesheet.work,name:0"
+msgctxt "model:timesheet.work,name:"
msgid "Work"
msgstr ""
-msgctxt "model:timesheet.work.open.init,name:0"
-msgid "Open Work Init"
+msgctxt "model:timesheet.work.open.start,name:"
+msgid "Open Work"
msgstr ""
-msgctxt "view:timesheet.enter_lines.init:0"
-msgid "Enter Timesheet"
+msgctxt "view:timesheet.hours_employee.open.start:"
+msgid "Hours per Employee"
msgstr ""
#, fuzzy
-msgctxt "view:timesheet.hours_employee:0"
+msgctxt "view:timesheet.hours_employee:"
msgid "Hours"
msgstr "Часы"
-msgctxt "view:timesheet.hours_employee:0"
+msgctxt "view:timesheet.hours_employee:"
msgid "Hours per Employee"
msgstr ""
-msgctxt "view:timesheet.hours_employee_monthly:0"
+msgctxt "view:timesheet.hours_employee_monthly:"
msgid "Hours per Employee per Month"
msgstr ""
-msgctxt "view:timesheet.hours_employee_weekly:0"
+msgctxt "view:timesheet.hours_employee_weekly:"
msgid "Hours per Employee per Week"
msgstr ""
+msgctxt "view:timesheet.line.enter.start:"
+msgid "Enter Timesheet"
+msgstr ""
+
#, fuzzy
-msgctxt "view:timesheet.line:0"
+msgctxt "view:timesheet.line:"
msgid "Hours"
msgstr "Часы"
-msgctxt "view:timesheet.line:0"
+msgctxt "view:timesheet.line:"
msgid "Timesheet Line"
msgstr ""
-msgctxt "view:timesheet.line:0"
+msgctxt "view:timesheet.line:"
msgid "Timesheet Lines"
msgstr ""
-msgctxt "view:timesheet.open_hours_employee.init:0"
-msgid "Hours per Employee"
-msgstr ""
-
-msgctxt "view:timesheet.work.open.init:0"
+msgctxt "view:timesheet.work.open.start:"
msgid "Hours per Work"
msgstr ""
-msgctxt "view:timesheet.work:0"
+msgctxt "view:timesheet.work:"
msgid "Hours per Work"
msgstr ""
-msgctxt "view:timesheet.work:0"
+msgctxt "view:timesheet.work:"
msgid "Work"
msgstr ""
-msgctxt "view:timesheet.work:0"
+msgctxt "view:timesheet.work:"
msgid "Works"
msgstr ""
#, fuzzy
-msgctxt "wizard_button:timesheet.enter_lines,init,end:0"
+msgctxt "wizard_button:timesheet.hours_employee.open,start,end:"
msgid "Cancel"
msgstr "Отменить"
-msgctxt "wizard_button:timesheet.enter_lines,init,enter:0"
-msgid "Enter"
-msgstr ""
+#, fuzzy
+msgctxt "wizard_button:timesheet.hours_employee.open,start,open_:"
+msgid "Open"
+msgstr "Открыть"
#, fuzzy
-msgctxt "wizard_button:timesheet.open_hours_employee,init,end:0"
+msgctxt "wizard_button:timesheet.line.enter,start,end:"
msgid "Cancel"
msgstr "Отменить"
-#, fuzzy
-msgctxt "wizard_button:timesheet.open_hours_employee,init,open:0"
-msgid "Open"
-msgstr "Открыть"
+msgctxt "wizard_button:timesheet.line.enter,start,enter:"
+msgid "Enter"
+msgstr ""
#, fuzzy
-msgctxt "wizard_button:timesheet.work.open,init,end:0"
+msgctxt "wizard_button:timesheet.work.open,start,end:"
msgid "Cancel"
msgstr "Отменить"
#, fuzzy
-msgctxt "wizard_button:timesheet.work.open,init,open:0"
+msgctxt "wizard_button:timesheet.work.open,start,open_:"
msgid "Open"
msgstr "Открыть"
#, fuzzy
-msgctxt "wizard_button:timesheet.work.open2,init,end:0"
+msgctxt "wizard_button:timesheet.work.open2,start,end:"
msgid "Cancel"
msgstr "Отменить"
#, fuzzy
-msgctxt "wizard_button:timesheet.work.open2,init,open:0"
+msgctxt "wizard_button:timesheet.work.open2,start,open_:"
msgid "Open"
msgstr "Открыть"
diff --git a/setup.py b/setup.py
index 7b72686..158e0e7 100644
--- a/setup.py
+++ b/setup.py
@@ -12,7 +12,7 @@ minor_version = int(minor_version)
requires = []
for dep in info.get('depends', []):
- if not re.match(r'(ir|res|workflow|webdav)(\W|$)', dep):
+ if not re.match(r'(ir|res|webdav)(\W|$)', dep):
requires.append('trytond_%s >= %s.%s, < %s.%s' %
(dep, major_version, minor_version, major_version,
minor_version + 1))
diff --git a/tests/__init__.py b/tests/__init__.py
index 25f3642..7da0f02 100644
--- a/tests/__init__.py
+++ b/tests/__init__.py
@@ -1,4 +1,4 @@
#This file is part of Tryton. The COPYRIGHT file at the top level of
#this repository contains the full copyright notices and license terms.
-from test_timesheet import suite
+from .test_timesheet import suite
diff --git a/tests/test_timesheet.py b/tests/test_timesheet.py
index 7849096..8c53cad 100644
--- a/tests/test_timesheet.py
+++ b/tests/test_timesheet.py
@@ -2,7 +2,8 @@
#This file is part of Tryton. The COPYRIGHT file at the top level of
#this repository contains the full copyright notices and license terms.
-import sys, os
+import sys
+import os
DIR = os.path.abspath(os.path.normpath(os.path.join(__file__,
'..', '..', '..', '..', '..', 'trytond')))
if os.path.isdir(DIR):
@@ -33,6 +34,7 @@ class TimesheetTestCase(unittest.TestCase):
'''
test_depends()
+
def suite():
suite = trytond.tests.test_tryton.suite()
suite.addTests(unittest.TestLoader().loadTestsFromTestCase(
diff --git a/trytond_timesheet.egg-info/PKG-INFO b/trytond_timesheet.egg-info/PKG-INFO
index 4d00859..e5c23a2 100644
--- a/trytond_timesheet.egg-info/PKG-INFO
+++ b/trytond_timesheet.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.0
Name: trytond-timesheet
-Version: 2.2.0
+Version: 2.4.0
Summary: Timesheet Module with:
- Work
- Timesheet line
@@ -14,7 +14,7 @@ Home-page: http://www.tryton.org/
Author: B2CK
Author-email: info at b2ck.com
License: GPL-3
-Download-URL: http://downloads.tryton.org/2.2/
+Download-URL: http://downloads.tryton.org/2.4/
Description: UNKNOWN
Platform: UNKNOWN
Classifier: Development Status :: 5 - Production/Stable
diff --git a/trytond_timesheet.egg-info/SOURCES.txt b/trytond_timesheet.egg-info/SOURCES.txt
index a8ccc47..4f89d28 100644
--- a/trytond_timesheet.egg-info/SOURCES.txt
+++ b/trytond_timesheet.egg-info/SOURCES.txt
@@ -16,8 +16,10 @@ work.xml
./tests/test_timesheet.py
doc/index.rst
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_ES.po
locale/fr_FR.po
diff --git a/trytond_timesheet.egg-info/requires.txt b/trytond_timesheet.egg-info/requires.txt
index c37ee33..54c7765 100644
--- a/trytond_timesheet.egg-info/requires.txt
+++ b/trytond_timesheet.egg-info/requires.txt
@@ -1,3 +1,3 @@
-trytond_company >= 2.2, < 2.3
-trytond_company_work_time >= 2.2, < 2.3
-trytond >= 2.2, < 2.3
\ No newline at end of file
+trytond_company >= 2.4, < 2.5
+trytond_company_work_time >= 2.4, < 2.5
+trytond >= 2.4, < 2.5
\ No newline at end of file
diff --git a/work.py b/work.py
index 4e32e2a..e3bfa34 100644
--- a/work.py
+++ b/work.py
@@ -1,7 +1,7 @@
#This file is part of Tryton. The COPYRIGHT file at the top level of
#this repository contains the full copyright notices and license terms.
from trytond.model import ModelView, ModelSQL, fields
-from trytond.wizard import Wizard
+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
@@ -15,15 +15,19 @@ class Work(ModelSQL, ModelView):
name = fields.Char('Name', required=True)
active = fields.Boolean('Active')
parent = fields.Many2One('timesheet.work', 'Parent', left="left",
- right="right", select=2, ondelete="RESTRICT")
- left = fields.Integer('Left', required=True, select=1)
- right = fields.Integer('Right', required=True, select=1)
+ right="right", select=True, ondelete="RESTRICT")
+ left = fields.Integer('Left', required=True, select=True)
+ right = fields.Integer('Right', required=True, select=True)
children = fields.One2Many('timesheet.work', 'parent', 'Children')
hours = fields.Function(fields.Float('Timesheet Hours', digits=(16, 2),
help="Total time spent on this work"), 'get_hours')
timesheet_available = fields.Boolean('Available on timesheets',
- help="Allow to fill in timesheets with this work")
- company = fields.Many2One('company.company', 'Company', required=True)
+ states={
+ 'readonly': Bool(Eval('timesheet_lines', [0])),
+ },
+ help="Allow to fill in timesheets with this work")
+ company = fields.Many2One('company.company', 'Company', required=True,
+ select=True)
timesheet_lines = fields.One2Many('timesheet.line', 'work',
'Timesheet Lines',
depends=['timesheet_available', 'active'],
@@ -47,11 +51,17 @@ class Work(ModelSQL, ModelView):
def default_active(self):
return True
+ def default_left(self):
+ return 0
+
+ def default_right(self):
+ return 0
+
def default_timesheet_available(self):
return True
def default_company(self):
- return Transaction().context.get('company') or False
+ return Transaction().context.get('company')
def check_parent_company(self, ids):
for work in self.browse(ids):
@@ -96,7 +106,7 @@ class Work(ModelSQL, ModelView):
Transaction().cursor.execute(clause, all_ids + args)
- hours_by_wt = dict((i[0], i[1]) for i in
+ hours_by_wt = dict((i[0], i[1]) for i in
Transaction().cursor.fetchall())
to_compute = dict.fromkeys(all_ids, True)
works = self.browse(all_ids)
@@ -111,6 +121,7 @@ class Work(ModelSQL, ModelView):
if not ids:
return {}
res = {}
+
def _name(work):
if work.parent:
return _name(work.parent) + '\\' + work.name
@@ -125,7 +136,7 @@ class Work(ModelSQL, ModelView):
default = {}
default = default.copy()
if 'timesheet_lines' not in default:
- default['timesheet_lines'] = False
+ default['timesheet_lines'] = None
return super(Work, self).copy(ids, default=default)
def write(self, ids, vals):
@@ -144,48 +155,36 @@ class Work(ModelSQL, ModelView):
Work()
-class OpenWorkInit(ModelView):
- 'Open Work Init'
- _name = 'timesheet.work.open.init'
+class OpenWorkStart(ModelView):
+ 'Open Work'
+ _name = 'timesheet.work.open.start'
_description = __doc__
from_date = fields.Date('From Date')
to_date = fields.Date('To Date')
-OpenWorkInit()
+
+OpenWorkStart()
class OpenWork(Wizard):
'Open Work'
_name = 'timesheet.work.open'
- states = {
- 'init': {
- 'result': {
- 'type': 'form',
- 'object': 'timesheet.work.open.init',
- 'state': [
- ('end', 'Cancel', 'tryton-cancel'),
- ('open', 'Open', 'tryton-ok', True),
- ],
- },
- },
- 'open': {
- 'result': {
- 'type': 'action',
- 'action': '_action_open_work',
- 'state': 'end',
- },
- },
- }
-
- def _action_open_work(self, data):
- model_data_obj = Pool().get('ir.model.data')
- act_window_obj = Pool().get('ir.action.act_window')
- act_window_id = model_data_obj.get_id('timesheet', 'act_work_hours_board')
- res = act_window_obj.read(act_window_id)
- res['pyson_context'] = PYSONEncoder().encode({
- 'from_date': data['form']['from_date'],
- 'to_date': data['form']['to_date'],
- })
- return res
+
+ start = StateView('timesheet.work.open.start',
+ 'timesheet.work_open_start_view_form', [
+ Button('Cancel', 'end', 'tryton-cancel'),
+ Button('Open', 'open_', 'tryton-ok', default=True),
+ ])
+ open_ = StateAction('timesheet.act_work_hours_board')
+
+ def do_open_(self, session, action):
+ action['pyson_context'] = PYSONEncoder().encode({
+ 'from_date': session.start.from_date,
+ 'to_date': session.start.to_date,
+ })
+ return action, {}
+
+ def transition_open_(self, session):
+ return 'end'
OpenWork()
@@ -193,43 +192,23 @@ OpenWork()
class OpenWork2(OpenWork):
_name = 'timesheet.work.open2'
- def _action_open_work(self, data):
- model_data_obj = Pool().get('ir.model.data')
- act_window_obj = Pool().get('ir.action.act_window')
- act_window_id = model_data_obj.get_id('timesheet', 'act_work_form2')
- res = act_window_obj.read(act_window_id)
- res['pyson_context'] = PYSONEncoder().encode({
- 'from_date': data['form']['from_date'],
- 'to_date': data['form']['to_date'],
- })
- return res
+ open_ = StateAction('timesheet.act_work_form2')
OpenWork2()
class OpenWorkGraph(Wizard):
_name = 'timesheet.work.open_graph'
- states = {
- 'init': {
- 'result': {
- 'type': 'action',
- 'action': '_action_open_work',
- 'state': 'end',
- },
- },
- }
+ start_state = 'open_'
+ open_ = StateAction('timesheet.act_work_form3')
- def _action_open_work(self, data):
+ def do_open_(self, session, action):
pool = Pool()
- model_data_obj = pool.get('ir.model.data')
- act_window_obj = pool.get('ir.action.act_window')
work_obj = pool.get('timesheet.work')
- act_window_id = model_data_obj.get_id('timesheet', 'act_work_form3')
- res = act_window_obj.read(act_window_id)
if 'active_id' in Transaction().context:
work = work_obj.browse(Transaction().context['active_id'])
- res['name'] = res['name'] + ' - ' + work.rec_name
- return res
+ action['name'] = action['name'] + ' - ' + work.rec_name
+ return action, {}
OpenWorkGraph()
diff --git a/work.xml b/work.xml
index 2009d52..aeb1393 100644
--- a/work.xml
+++ b/work.xml
@@ -177,8 +177,8 @@ this repository contains the full copyright notices and license terms. -->
<field name="act_window" ref="act_work_hours_board"/>
</record>
- <record model="ir.ui.view" id="work_open_init_view_form">
- <field name="model">timesheet.work.open.init</field>
+ <record model="ir.ui.view" id="work_open_start_view_form">
+ <field name="model">timesheet.work.open.start</field>
<field name="type">form</field>
<field name="arch" type="xml">
<![CDATA[
@@ -246,7 +246,7 @@ this repository contains the full copyright notices and license terms. -->
<field name="field" search="[('name', '=', 'company'),
('model.model', '=', 'timesheet.work')]"/>
<field name="operator">=</field>
- <field name="operand">User/Main Company</field>
+ <field name="operand">User/Current Company</field>
<field name="rule_group" ref="rule_group_work"/>
</record>
<record model="ir.rule.group" id="rule_group_work_admin">
commit d71f50a84fd426adff76ece0b369ee237509d26b
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Mon Oct 31 16:21:32 2011 +0100
Adding upstream version 2.2.0.
diff --git a/CHANGELOG b/CHANGELOG
index 4d988f8..e519b5a 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 2.2.0 - 2011-10-25
+* Bug fixes (see mercurial logs for details)
+
Version 2.0.0 - 2011-04-27
* Bug fixes (see mercurial logs for details)
diff --git a/MANIFEST.in b/MANIFEST.in
index dcb2afa..32879df 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -6,5 +6,5 @@ include CHANGELOG
include LICENSE
include *.xml
include *.odt
-include *.csv
+include locale/*.po
include doc/*
diff --git a/PKG-INFO b/PKG-INFO
index c183afc..ed7202c 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.0
Name: trytond_timesheet
-Version: 2.0.0
+Version: 2.2.0
Summary: Timesheet Module with:
- Work
- Timesheet line
@@ -14,22 +14,26 @@ Home-page: http://www.tryton.org/
Author: B2CK
Author-email: info at b2ck.com
License: GPL-3
-Download-URL: http://downloads.tryton.org/2.0/
+Download-URL: http://downloads.tryton.org/2.2/
Description: UNKNOWN
Platform: UNKNOWN
Classifier: Development Status :: 5 - Production/Stable
Classifier: Environment :: Plugins
+Classifier: Framework :: Tryton
Classifier: Intended Audience :: Developers
Classifier: Intended Audience :: Financial and Insurance Industry
Classifier: Intended Audience :: Legal Industry
Classifier: Intended Audience :: Manufacturing
Classifier: License :: OSI Approved :: GNU General Public License (GPL)
Classifier: Natural Language :: Bulgarian
+Classifier: Natural Language :: Czech
Classifier: Natural Language :: Dutch
Classifier: Natural Language :: English
+Classifier: Natural Language :: French
Classifier: Natural Language :: German
+Classifier: Natural Language :: Russian
+Classifier: Natural Language :: Spanish
Classifier: Operating System :: OS Independent
-Classifier: Programming Language :: Python :: 2.5
Classifier: Programming Language :: Python :: 2.6
Classifier: Programming Language :: Python :: 2.7
Classifier: Topic :: Office/Business
diff --git a/__tryton__.py b/__tryton__.py
index a4ad1bd..35fe407 100644
--- a/__tryton__.py
+++ b/__tryton__.py
@@ -8,7 +8,7 @@
'name_es_ES': 'Partes de trabajo',
'name_fr_FR': 'Feuille de présence',
'name_nl_NL': 'Tijdregistratie',
- 'version': '2.0.0',
+ 'version': '2.2.0',
'author': 'B2CK',
'email': 'info at b2ck.com',
'website': 'http://www.tryton.org/',
@@ -87,11 +87,13 @@ Bijbehorende rapporten:
'line.xml',
],
'translation': [
- 'bg_BG.csv',
- 'de_DE.csv',
- 'es_CO.csv',
- 'es_ES.csv',
- 'fr_FR.csv',
- 'nl_NL.csv',
+ 'locale/cs_CZ.po',
+ 'locale/bg_BG.po',
+ 'locale/de_DE.po',
+ 'locale/es_CO.po',
+ 'locale/es_ES.po',
+ 'locale/fr_FR.po',
+ 'locale/nl_NL.po',
+ 'locale/ru_RU.po',
],
}
diff --git a/bg_BG.csv b/bg_BG.csv
deleted file mode 100644
index c01ec31..0000000
--- a/bg_BG.csv
+++ /dev/null
@@ -1,97 +0,0 @@
-type,name,res_id,src,value,fuzzy
-error,timesheet.line,0,Hours field must be positive,Часовете трябва да са положителни числа,0
-error,timesheet.work,0,Every work must be in the same company as it's parent work!,Всяка задача трябва да е в същата фирма като тази на родителската задача!,0
-error,timesheet.work,0,You can not create recursive works!,Не може да създавате взаимно вложени задачи!,0
-field,"timesheet.enter_lines.init,date",0,Date,Дата,0
-field,"timesheet.enter_lines.init,employee",0,Employee,Служител,0
-field,"timesheet.hours_employee,employee",0,Employee,Служител,0
-field,"timesheet.hours_employee,hours",0,Hours,Часове,0
-field,"timesheet.hours_employee,rec_name",0,Name,Име,0
-field,"timesheet.hours_employee_monthly,employee",0,Employee,Служител,0
-field,"timesheet.hours_employee_monthly,hours",0,Hours,Часове,0
-field,"timesheet.hours_employee_monthly,month",0,Month,Месец,0
-field,"timesheet.hours_employee_monthly,rec_name",0,Name,Име,0
-field,"timesheet.hours_employee_monthly,year",0,Year,Година,0
-field,"timesheet.hours_employee_weekly,employee",0,Employee,Служител,0
-field,"timesheet.hours_employee_weekly,hours",0,Hours,Часове,0
-field,"timesheet.hours_employee_weekly,rec_name",0,Name,Име,0
-field,"timesheet.hours_employee_weekly,week",0,Week,Седмица,0
-field,"timesheet.hours_employee_weekly,year",0,Year,Година,0
-field,"timesheet.line,date",0,Date,Дата,0
-field,"timesheet.line,description",0,Description,Описание,0
-field,"timesheet.line,employee",0,Employee,Служител,0
-field,"timesheet.line,hours",0,Hours,Часове,0
-field,"timesheet.line,rec_name",0,Name,Име,0
-field,"timesheet.line,work",0,Work,Задача,0
-field,"timesheet.open_hours_employee.init,end_date",0,End Date,Крайна дата,0
-field,"timesheet.open_hours_employee.init,start_date",0,Start Date,Начална дата,0
-field,"timesheet.work,active",0,Active,Активен,0
-field,"timesheet.work,children",0,Children,Деца,0
-field,"timesheet.work,company",0,Company,Фирма,0
-field,"timesheet.work,hours",0,Timesheet Hours,Часове от график,0
-field,"timesheet.work,left",0,Left,Ляв,0
-field,"timesheet.work,name",0,Name,Име,0
-field,"timesheet.work,parent",0,Parent,Родител,0
-field,"timesheet.work,rec_name",0,Name,Име,0
-field,"timesheet.work,right",0,Right,Десен,0
-field,"timesheet.work,timesheet_available",0,Available on timesheets,Наличен в график,0
-field,"timesheet.work.open.init,from_date",0,From Date,От дата,0
-field,"timesheet.work.open.init,to_date",0,To Date,До дата,0
-help,"timesheet.work,hours",0,Total time spent on this work,Общо време за изпълнение на тази задача,0
-help,"timesheet.work,timesheet_available",0,Allow to fill in timesheets with this work,Позволява да се попълни в график с тази задача,0
-model,"ir.action,name",act_enter_lines,Enter Timesheet,Въвеждане на график,0
-model,"ir.action,name",act_hours_employee_form,Hours per Employee,Часове на служител,0
-model,"ir.action,name",act_hours_employee_monthly_form,Hours per Employee per Month,Часове за служител за месец,0
-model,"ir.action,name",act_hours_employee_weekly_form,Hours per Employee per Week,Часове на служител за седмица,0
-model,"ir.action,name",act_line_form,Timesheet Lines,Редове от график,0
-model,"ir.action,name",act_open_hours_employee,Hours per Employee,Часове на служител,0
-model,"ir.action,name",act_open_work,Hours per Work,Часове за работа,0
-model,"ir.action,name",act_open_work2,Hours per Work,Часове за работа,0
-model,"ir.action,name",act_open_work_graph,Hours per Work,Часове за работа,0
-model,"ir.action,name",act_work_form,Works,Задачи,0
-model,"ir.action,name",act_work_form2,Hours per Work,Часове за работа,0
-model,"ir.action,name",act_work_form3,Hours per Work,Часове за работа,0
-model,"ir.action,name",act_work_tree,Works,Задачи,0
-model,"ir.action,name",act_work_tree2,Works,Задачи,0
-model,"ir.ui.menu,name",menu_configuration,Configuration,Конфигурация,0
-model,"ir.ui.menu,name",menu_enter_lines,Enter Timesheet,Въвеждане на график,0
-model,"ir.ui.menu,name",menu_line_form,Timesheet Lines,Редове от график,0
-model,"ir.ui.menu,name",menu_open_hours_employee,Hours per Employee,Часове на служител,0
-model,"ir.ui.menu,name",menu_open_hours_employee_monthly,Hours per Employee per Month,Часове за служител за месец,0
-model,"ir.ui.menu,name",menu_open_hours_employee_weekly,Hours per Employee per Week,Часове на служител за седмица,0
-model,"ir.ui.menu,name",menu_reporting,Reporting,Справки,0
-model,"ir.ui.menu,name",menu_timesheet,Timesheet Management,Управление на графици,0
-model,"ir.ui.menu,name",menu_work_form,New Work,Нова задача,0
-model,"ir.ui.menu,name",menu_work_form2,Hours per Work,Часове за работа,0
-model,"ir.ui.menu,name",menu_work_tree,Works,Задачи,0
-model,"ir.ui.menu,name",menu_work_tree2,Hours per Work,Часове за работа,0
-model,"res.group,name",group_timesheet_admin,Timesheet Administration,Управление на графици,0
-model,"timesheet.enter_lines.init,name",0,Enter Lines Init,Начално въвеждане на редове,0
-model,"timesheet.hours_employee,name",0,Hours per Employee,Часове на служител,0
-model,"timesheet.hours_employee_monthly,name",0,Hours per Employee per Month,Часове за служител за месец,0
-model,"timesheet.hours_employee_weekly,name",0,Hours per Employee per Week,Часове на служител за седмица,0
-model,"timesheet.line,name",0,Timesheet Line,Ред от график,0
-model,"timesheet.open_hours_employee.init,name",0,Open Hours Employee Init,Начално отваряне на часове на служители,0
-model,"timesheet.work,name",0,Work,Задача,0
-model,"timesheet.work.open.init,name",0,Open Work Init,Начално отваряне на задача,0
-view,timesheet.enter_lines.init,0,Enter Timesheet,Въвеждане на график,0
-view,timesheet.hours_employee,0,Hours,Часове,0
-view,timesheet.hours_employee,0,Hours per Employee,Часове на служител,0
-view,timesheet.hours_employee_monthly,0,Hours per Employee per Month,Часове за служител за месец,0
-view,timesheet.hours_employee_weekly,0,Hours per Employee per Week,Часове на служител за седмица,0
-view,timesheet.line,0,Hours,Часове,0
-view,timesheet.line,0,Timesheet Line,Ред от график,0
-view,timesheet.line,0,Timesheet Lines,Редове от график,0
-view,timesheet.open_hours_employee.init,0,Hours per Employee,Часове на служител,0
-view,timesheet.work,0,Hours per Work,Часове за работа,0
-view,timesheet.work,0,Work,Задача,0
-view,timesheet.work,0,Works,Зачади,0
-view,timesheet.work.open.init,0,Hours per Work,Часове за работа,0
-wizard_button,"timesheet.enter_lines,init,end",0,Cancel,Отказ,0
-wizard_button,"timesheet.enter_lines,init,enter",0,Enter,Въвеждане,0
-wizard_button,"timesheet.open_hours_employee,init,end",0,Cancel,Отказ,0
-wizard_button,"timesheet.open_hours_employee,init,open",0,Open,Отваряне,0
-wizard_button,"timesheet.work.open,init,end",0,Cancel,Отказ,0
-wizard_button,"timesheet.work.open,init,open",0,Open,Отваряне,0
-wizard_button,"timesheet.work.open2,init,end",0,Cancel,Отказ,0
-wizard_button,"timesheet.work.open2,init,open",0,Open,Отваряне,0
diff --git a/de_DE.csv b/de_DE.csv
deleted file mode 100644
index e968198..0000000
--- a/de_DE.csv
+++ /dev/null
@@ -1,124 +0,0 @@
-type,name,res_id,src,value,fuzzy
-error,timesheet.line,0,Hours field must be positive,Feld Stunden muss einen positiven Wert haben,0
-error,timesheet.work,0,Every work must be in the same company as it's parent work!,Eine Aufgabe muss immer zum selben Unternehmen wie die übergeordnete Aufgabe gehören!,0
-error,timesheet.work,0,You can not create recursive works!,Aufgaben können nicht rekursiv angelegt werden!,0
-field,"timesheet.enter_lines.init,date",0,Date,Datum,0
-field,"timesheet.enter_lines.init,employee",0,Employee,Mitarbeiter,0
-field,"timesheet.hours_employee,create_date",0,Creation date,Erstellungsdatum,0
-field,"timesheet.hours_employee,create_uid",0,Creation user,Ersteller,0
-field,"timesheet.hours_employee,employee",0,Employee,Mitarbeiter,0
-field,"timesheet.hours_employee,hours",0,Hours,Stunden,0
-field,"timesheet.hours_employee,id",0,ID,ID,0
-field,"timesheet.hours_employee,rec_name",0,Name,Name,0
-field,"timesheet.hours_employee,write_date",0,Last modification date,Zuletzt geändert am,0
-field,"timesheet.hours_employee,write_uid",0,Last modification by,Zuletzt geändert von,0
-field,"timesheet.hours_employee_monthly,create_date",0,Creation date,Erstellungsdatum,0
-field,"timesheet.hours_employee_monthly,create_uid",0,Creation user,Ersteller,0
-field,"timesheet.hours_employee_monthly,employee",0,Employee,Mitarbeiter,0
-field,"timesheet.hours_employee_monthly,hours",0,Hours,Stunden,0
-field,"timesheet.hours_employee_monthly,id",0,ID,ID,0
-field,"timesheet.hours_employee_monthly,month",0,Month,Monat,0
-field,"timesheet.hours_employee_monthly,rec_name",0,Name,Name,0
-field,"timesheet.hours_employee_monthly,write_date",0,Last modification date,Zuletzt geändert am,0
-field,"timesheet.hours_employee_monthly,write_uid",0,Last modification by,Zuletzt geändert von,0
-field,"timesheet.hours_employee_monthly,year",0,Year,Jahr,0
-field,"timesheet.hours_employee_weekly,create_date",0,Creation date,Erstellungsdatum,0
-field,"timesheet.hours_employee_weekly,create_uid",0,Creation user,Ersteller,0
-field,"timesheet.hours_employee_weekly,employee",0,Employee,Mitarbeiter,0
-field,"timesheet.hours_employee_weekly,hours",0,Hours,Stunden,0
-field,"timesheet.hours_employee_weekly,id",0,ID,ID,0
-field,"timesheet.hours_employee_weekly,rec_name",0,Name,Name,0
-field,"timesheet.hours_employee_weekly,week",0,Week,Woche,0
-field,"timesheet.hours_employee_weekly,write_date",0,Last modification date,Zuletzt geändert am,0
-field,"timesheet.hours_employee_weekly,write_uid",0,Last modification by,Zuletzt geändert von,0
-field,"timesheet.hours_employee_weekly,year",0,Year,Jahr,0
-field,"timesheet.line,create_date",0,Creation date,Erstellungsdatum,0
-field,"timesheet.line,create_uid",0,Creation user,Ersteller,0
-field,"timesheet.line,date",0,Date,Datum,0
-field,"timesheet.line,description",0,Description,Beschreibung,0
-field,"timesheet.line,employee",0,Employee,Mitarbeiter,0
-field,"timesheet.line,hours",0,Hours,Stunden,0
-field,"timesheet.line,id",0,ID,ID,0
-field,"timesheet.line,rec_name",0,Name,Name,0
-field,"timesheet.line,work",0,Work,Aufgabe,0
-field,"timesheet.line,write_date",0,Last modification date,Zuletzt geändert am,0
-field,"timesheet.line,write_uid",0,Last modification by,Zuletzt geändert von,0
-field,"timesheet.open_hours_employee.init,end_date",0,End Date,Enddatum,0
-field,"timesheet.open_hours_employee.init,start_date",0,Start Date,Anfangsdatum,0
-field,"timesheet.work,active",0,Active,Aktiv,0
-field,"timesheet.work,children",0,Children,Untergeordnet (Aufgaben),0
-field,"timesheet.work,company",0,Company,Unternehmen,0
-field,"timesheet.work,create_date",0,Creation date,Erstellungsdatum,0
-field,"timesheet.work,create_uid",0,Creation user,Ersteller,0
-field,"timesheet.work,hours",0,Timesheet Hours,Stunden,0
-field,"timesheet.work,id",0,ID,ID,0
-field,"timesheet.work,left",0,Left,Links,0
-field,"timesheet.work,name",0,Name,Name,0
-field,"timesheet.work,parent",0,Parent,Übergeordnet (Aufgabe),0
-field,"timesheet.work,rec_name",0,Name,Name,0
-field,"timesheet.work,right",0,Right,Rechts,0
-field,"timesheet.work,timesheet_available",0,Available on timesheets,Verfügbar für Zeiterfassung,0
-field,"timesheet.work,write_date",0,Last modification date,Zuletzt geändert am,0
-field,"timesheet.work,write_uid",0,Last modification by,Zuletzt geändert von,0
-field,"timesheet.work.open.init,from_date",0,From Date,Von,0
-field,"timesheet.work.open.init,to_date",0,To Date,Bis,0
-help,"timesheet.work,hours",0,Total time spent on this work,Gesamtzeit für diese Arbeit,0
-help,"timesheet.work,timesheet_available",0,Allow to fill in timesheets with this work,Diese Arbeit für den Eintrag in Zeiterfassungen freigeben,0
-model,"ir.action,name",act_enter_lines,Enter Timesheet,Zur Zeiterfassung,0
-model,"ir.action,name",act_hours_employee_form,Hours per Employee,Stunden pro Mitarbeiter,0
-model,"ir.action,name",act_hours_employee_monthly_form,Hours per Employee per Month,Stunden pro Mitarbeiter pro Monat,0
-model,"ir.action,name",act_hours_employee_weekly_form,Hours per Employee per Week,Stunden pro Mitarbeiter pro Monat,0
-model,"ir.action,name",act_line_form,Timesheet Lines,Zeitpositionen,0
-model,"ir.action,name",act_open_hours_employee,Hours per Employee,Stunden pro Mitarbeiter,0
-model,"ir.action,name",act_open_work,Hours per Work,Stunden pro Aufgabe,0
-model,"ir.action,name",act_open_work2,Hours per Work,Stunden pro Aufgabe,0
-model,"ir.action,name",act_open_work_graph,Hours per Work,Stunden pro Aufgabe,0
-model,"ir.action,name",act_work_form,Works,Aufgaben,0
-model,"ir.action,name",act_work_form2,Hours per Work,Stunden pro Aufgabe,0
-model,"ir.action,name",act_work_form3,Hours per Work,Stunden pro Aufgabe,0
-model,"ir.action,name",act_work_list,Works,Aufgaben,0
-model,"ir.action,name",act_work_tree,Works,Aufgaben,0
-model,"ir.action,name",act_work_tree2,Works,Aufgaben,0
-model,"ir.ui.menu,name",menu_configuration,Configuration,Einstellungen,0
-model,"ir.ui.menu,name",menu_enter_lines,Enter Timesheet,Zur Zeiterfassung,0
-model,"ir.ui.menu,name",menu_line_form,Timesheet Lines,Zeitpositionen,0
-model,"ir.ui.menu,name",menu_open_hours_employee,Hours per Employee,Stunden pro Mitarbeiter,0
-model,"ir.ui.menu,name",menu_open_hours_employee_monthly,Hours per Employee per Month,Stunden pro Mitarbeiter pro Monat,0
-model,"ir.ui.menu,name",menu_open_hours_employee_weekly,Hours per Employee per Week,Stunden pro Mitarbeiter pro Woche,0
-model,"ir.ui.menu,name",menu_reporting,Reporting,Auswertungen,0
-model,"ir.ui.menu,name",menu_timesheet,Timesheet Management,Zeiterfassung,0
-model,"ir.ui.menu,name",menu_work_form,New Work,Neue Aufgabe,0
-model,"ir.ui.menu,name",menu_work_form2,Hours per Work,Stunden pro Aufgabe,0
-model,"ir.ui.menu,name",menu_work_list,Works,Aufgaben,0
-model,"ir.ui.menu,name",menu_work_tree,Works,Aufgaben,0
-model,"ir.ui.menu,name",menu_work_tree2,Hours per Work,Stunden pro Aufgabe,0
-model,"res.group,name",group_timesheet_admin,Timesheet Administration,Zeiterfassung Administration,0
-model,"timesheet.enter_lines.init,name",0,Enter Lines Init,Eingabe Zeitposition Init,0
-model,"timesheet.hours_employee,name",0,Hours per Employee,Stunden pro Mitarbeiter,0
-model,"timesheet.hours_employee_monthly,name",0,Hours per Employee per Month,Stunden pro Mitarbeiter und Monat,0
-model,"timesheet.hours_employee_weekly,name",0,Hours per Employee per Week,Stunden pro Mitarbeiter und Woche,0
-model,"timesheet.line,name",0,Timesheet Line,Zeitposition,0
-model,"timesheet.open_hours_employee.init,name",0,Open Hours Employee Init,Stunden Mitarbeiter Öffnen Init,0
-model,"timesheet.work,name",0,Work,Aufgabe,0
-model,"timesheet.work.open.init,name",0,Open Work Init,Aufgabe Öffnen Init,0
-view,timesheet.enter_lines.init,0,Enter Timesheet,Zur Zeiterfassung,0
-view,timesheet.hours_employee,0,Hours,Stunden,0
-view,timesheet.hours_employee,0,Hours per Employee,Stunden pro Mitarbeiter,0
-view,timesheet.hours_employee_monthly,0,Hours per Employee per Month,Stunden pro Mitarbeiter pro Monat,0
-view,timesheet.hours_employee_weekly,0,Hours per Employee per Week,Stunden pro Mitarbeiter pro Woche,0
-view,timesheet.line,0,Hours,Stunden,0
-view,timesheet.line,0,Timesheet Line,Zeitposition,0
-view,timesheet.line,0,Timesheet Lines,Zeitpositionen,0
-view,timesheet.open_hours_employee.init,0,Hours per Employee,Stunden pro Mitarbeiter,0
-view,timesheet.work,0,Hours per Work,Stunden pro Aufgabe,0
-view,timesheet.work,0,Work,Aufgabe,0
-view,timesheet.work,0,Works,Aufgaben,0
-view,timesheet.work.open.init,0,Hours per Work,Stunden pro Aufgabe,0
-wizard_button,"timesheet.enter_lines,init,end",0,Cancel,Abbrechen,0
-wizard_button,"timesheet.enter_lines,init,enter",0,Enter,Eingabe,0
-wizard_button,"timesheet.open_hours_employee,init,end",0,Cancel,Abbrechen,0
-wizard_button,"timesheet.open_hours_employee,init,open",0,Open,Öffnen,0
-wizard_button,"timesheet.work.open,init,end",0,Cancel,Abbrechen,0
-wizard_button,"timesheet.work.open,init,open",0,Open,Öffnen,0
-wizard_button,"timesheet.work.open2,init,end",0,Cancel,Abbrechen,0
-wizard_button,"timesheet.work.open2,init,open",0,Open,Öffnen,0
diff --git a/es_CO.csv b/es_CO.csv
deleted file mode 100644
index fe7ee94..0000000
--- a/es_CO.csv
+++ /dev/null
@@ -1,97 +0,0 @@
-type,name,res_id,src,value,fuzzy
-error,timesheet.line,0,Hours field must be positive,El campo Horas debe ser positivo,0
-error,timesheet.work,0,Every work must be in the same company as it's parent work!,¡Cada trabajo debe estar en la misma compañía lo mismo que el trabajo que lo originó!,0
-error,timesheet.work,0,You can not create recursive works!,No puede crear trabajos recursivos!,0
-field,"timesheet.enter_lines.init,date",0,Date,Fecha,0
-field,"timesheet.enter_lines.init,employee",0,Employee,Empleado,0
-field,"timesheet.hours_employee,employee",0,Employee,Empleado,0
-field,"timesheet.hours_employee,hours",0,Hours,Horas,0
-field,"timesheet.hours_employee_monthly,employee",0,Employee,Empleado,0
-field,"timesheet.hours_employee_monthly,hours",0,Hours,Horas,0
-field,"timesheet.hours_employee_monthly,month",0,Month,Mes,0
-field,"timesheet.hours_employee_monthly,rec_name",0,Name,Nombre,0
-field,"timesheet.hours_employee_monthly,year",0,Year,Año,0
-field,"timesheet.hours_employee,rec_name",0,Name,Nombre,0
-field,"timesheet.hours_employee_weekly,employee",0,Employee,Empleado,0
-field,"timesheet.hours_employee_weekly,hours",0,Hours,Horas,0
-field,"timesheet.hours_employee_weekly,rec_name",0,Name,Nombre,0
-field,"timesheet.hours_employee_weekly,week",0,Week,Semana,0
-field,"timesheet.hours_employee_weekly,year",0,Year,Año,0
-field,"timesheet.line,date",0,Date,Fecha,0
-field,"timesheet.line,description",0,Description,Descripción,0
-field,"timesheet.line,employee",0,Employee,Empleado,0
-field,"timesheet.line,hours",0,Hours,Horas,0
-field,"timesheet.line,rec_name",0,Name,Nombre,0
-field,"timesheet.line,work",0,Work,Trabajo,0
-field,"timesheet.open_hours_employee.init,end_date",0,End Date,Fecha Final,0
-field,"timesheet.open_hours_employee.init,start_date",0,Start Date,Fecha Inicial,0
-field,"timesheet.work,active",0,Active,Activo,0
-field,"timesheet.work,children",0,Children,Descendientes,0
-field,"timesheet.work,company",0,Company,Compañía,0
-field,"timesheet.work,hours",0,Timesheet Hours,Horas de Hoja de Tiempo,0
-field,"timesheet.work,left",0,Left,Izquierda,0
-field,"timesheet.work,name",0,Name,Nombre,0
-field,"timesheet.work.open.init,from_date",0,From Date,Fecha Inicial,0
-field,"timesheet.work.open.init,to_date",0,To Date,A la Fecha,0
-field,"timesheet.work,parent",0,Parent,Padre,0
-field,"timesheet.work,rec_name",0,Name,Nombre,0
-field,"timesheet.work,right",0,Right,Derecha,0
-field,"timesheet.work,timesheet_available",0,Available on timesheets,Disponibilidad en las hojas de tiempos,0
-help,"timesheet.work,hours",0,Total time spent on this work,Tiempo total utilizado en este trabajo,0
-help,"timesheet.work,timesheet_available",0,Allow to fill in timesheets with this work,Permitir llenar con este trabajo en la hoja de tiempos,0
-model,"ir.action,name",act_enter_lines,Enter Timesheet,Adicionar Hoja de Tiempo,0
-model,"ir.action,name",act_hours_employee_form,Hours per Employee,Horas por Empleado,0
-model,"ir.action,name",act_open_hours_employee,Hours per Employee,Horas por Empleado,0
-model,"ir.action,name",act_hours_employee_monthly_form,Hours per Employee per Month,Horas por Empleado en el mes,0
-model,"ir.action,name",act_hours_employee_weekly_form,Hours per Employee per Week,Horas por Empleado en la semana,0
-model,"ir.action,name",act_open_work,Hours per Work,Horas por Trabajo,0
-model,"ir.action,name",act_work_form2,Hours per Work,Horas por Trabajo,0
-model,"ir.action,name",act_open_work2,Hours per Work,Horas por Trabajo,0
-model,"ir.action,name",act_work_form3,Hours per Work,Horas por Trabajo,0
-model,"ir.action,name",act_open_work_graph,Hours per Work,Horas por Trabajo,0
-model,"ir.action,name",act_line_form,Timesheet Lines,Lineas de Hoja de Tiempo,0
-model,"ir.action,name",act_work_form,Works,Trabajos,0
-model,"ir.action,name",act_work_tree,Works,Trabajos,0
-model,"ir.action,name",act_work_tree2,Works,Trabajos,0
-model,"ir.ui.menu,name",menu_configuration,Configuration,Configuración,0
-model,"ir.ui.menu,name",menu_enter_lines,Enter Timesheet,Adicionar Hoja de Tiempo,0
-model,"ir.ui.menu,name",menu_open_hours_employee,Hours per Employee,Horas por Empleado,0
-model,"ir.ui.menu,name",menu_open_hours_employee_monthly,Hours per Employee per Month,Horas por Empleado en el mes,0
-model,"ir.ui.menu,name",menu_open_hours_employee_weekly,Hours per Employee per Week,Horas por Empleado en la semana,0
-model,"ir.ui.menu,name",menu_work_tree2,Hours per Work,Horas por Trabajo,0
-model,"ir.ui.menu,name",menu_work_form2,Hours per Work,Horas por Trabajo,0
-model,"ir.ui.menu,name",menu_reporting,Reporting,Reportes,0
-model,"ir.ui.menu,name",menu_line_form,Timesheet Lines,Lineas de Hoja de Tiempo,0
-model,"ir.ui.menu,name",menu_timesheet,Timesheet Management,Hoja de Tiempo,0
-model,"ir.ui.menu,name",menu_work_form,Works,Trabajos,0
-model,"ir.ui.menu,name",menu_work_tree,Works,Trabajos,0
-model,"res.group,name",group_timesheet_admin,Timesheet Administration,Administración de Hoja de tiempos,0
-model,"timesheet.enter_lines.init,name",0,Enter Lines Init,Ingresar Líneas Inicio,0
-model,"timesheet.hours_employee_monthly,name",0,Hours per Employee per Month,Horas por Empleado en el mes,0
-model,"timesheet.hours_employee,name",0,Hours per Employee,Horas por Empleado,0
-model,"timesheet.hours_employee_weekly,name",0,Hours per Employee per Week,Horas por Empleado en la semana,0
-model,"timesheet.line,name",0,Timesheet Line,Linea de Hoja de Tiempo,0
-model,"timesheet.open_hours_employee.init,name",0,Open Hours Employee Init,Horas de Apertura de Inicio de Empleado,0
-model,"timesheet.work,name",0,Work,Trabajo,0
-model,"timesheet.work.open.init,name",0,Open Work Init,Inicio de Apertura de Trabajo,0
-view,timesheet.enter_lines.init,0,Enter Timesheet,Adicionar Hoja de Tiempo,0
-view,timesheet.hours_employee,0,Hours,Horas,0
-view,timesheet.hours_employee,0,Hours per Employee,Horas por Empleado,0
-view,timesheet.hours_employee_monthly,0,Hours per Employee per Month,Horas por Empleado en el mes,0
-view,timesheet.hours_employee_weekly,0,Hours per Employee per Week,Horas por Empleado en la semana,0
-view,timesheet.line,0,Hours,Horas,0
-view,timesheet.line,0,Timesheet Line,Linea de Hoja de Tiempo,0
-view,timesheet.line,0,Timesheet Lines,Lineas de Hoja de Tiempo,0
-view,timesheet.open_hours_employee.init,0,Hours per Employee,Horas por Empleado,0
-view,timesheet.work,0,Hours per Work,Horas por Trabajo,0
-view,timesheet.work,0,Work,Trabajo,0
-view,timesheet.work,0,Works,Trabajos,0
-view,timesheet.work.open.init,0,Hours per Work,Horas por Trabajo,0
-wizard_button,"timesheet.enter_lines,init,end",0,Cancel,Cancelar,0
-wizard_button,"timesheet.enter_lines,init,enter",0,Enter,Entrar,0
-wizard_button,"timesheet.open_hours_employee,init,end",0,Cancel,Cancelar,0
-wizard_button,"timesheet.open_hours_employee,init,open",0,Open,Abrir,0
-wizard_button,"timesheet.work.open2,init,end",0,Cancel,Cancelar,0
-wizard_button,"timesheet.work.open2,init,open",0,Open,Abrir,0
-wizard_button,"timesheet.work.open,init,end",0,Cancel,Cancelar,0
-wizard_button,"timesheet.work.open,init,open",0,Open,Abrir,0
diff --git a/es_ES.csv b/es_ES.csv
deleted file mode 100644
index 33c6bdd..0000000
--- a/es_ES.csv
+++ /dev/null
@@ -1,97 +0,0 @@
-type,name,res_id,src,value,fuzzy
-error,timesheet.line,0,Hours field must be positive,El campo de horas debe ser positivo,0
-error,timesheet.work,0,Every work must be in the same company as it's parent work!,Cada trabajo debe estar en la misma empresa que su trabajo padre,0
-error,timesheet.work,0,You can not create recursive works!,No puede crear trabajos recursivos,0
-field,"timesheet.enter_lines.init,date",0,Date,Fecha,0
-field,"timesheet.enter_lines.init,employee",0,Employee,Empleado,0
-field,"timesheet.hours_employee,employee",0,Employee,Empleado,0
-field,"timesheet.hours_employee,hours",0,Hours,Horas,0
-field,"timesheet.hours_employee_monthly,employee",0,Employee,Empleado,0
-field,"timesheet.hours_employee_monthly,hours",0,Hours,Horas,0
-field,"timesheet.hours_employee_monthly,month",0,Month,Mes,0
-field,"timesheet.hours_employee_monthly,rec_name",0,Name,Nombre,0
-field,"timesheet.hours_employee_monthly,year",0,Year,Año,0
-field,"timesheet.hours_employee,rec_name",0,Name,Nombre,0
-field,"timesheet.hours_employee_weekly,employee",0,Employee,Empleado,0
-field,"timesheet.hours_employee_weekly,hours",0,Hours,Horas,0
-field,"timesheet.hours_employee_weekly,rec_name",0,Name,Nombre,0
-field,"timesheet.hours_employee_weekly,week",0,Week,Semana,0
-field,"timesheet.hours_employee_weekly,year",0,Year,Año,0
-field,"timesheet.line,date",0,Date,Fecha,0
-field,"timesheet.line,description",0,Description,Descripción,0
-field,"timesheet.line,employee",0,Employee,Empleado,0
-field,"timesheet.line,hours",0,Hours,Horas,0
-field,"timesheet.line,rec_name",0,Name,Nombre,0
-field,"timesheet.line,work",0,Work,Trabajo,0
-field,"timesheet.open_hours_employee.init,end_date",0,End Date,Fecha final,0
-field,"timesheet.open_hours_employee.init,start_date",0,Start Date,Fecha inicial,0
-field,"timesheet.work,active",0,Active,Activo,0
-field,"timesheet.work,children",0,Children,Hijos,0
-field,"timesheet.work,company",0,Company,Empresa,0
-field,"timesheet.work,hours",0,Timesheet Hours,Horas del parte de trabajo,0
-field,"timesheet.work,left",0,Left,Izquierda,0
-field,"timesheet.work,name",0,Name,Nombre,0
-field,"timesheet.work.open.init,from_date",0,From Date,Desde la fecha,0
-field,"timesheet.work.open.init,to_date",0,To Date,A la fecha,0
-field,"timesheet.work,parent",0,Parent,Padre,0
-field,"timesheet.work,rec_name",0,Name,Nombre,0
-field,"timesheet.work,right",0,Right,Derecha,0
-field,"timesheet.work,timesheet_available",0,Available on timesheets,Disponible en partes de trabajo,0
-help,"timesheet.work,hours",0,Total time spent on this work,Tiempo total empleado en este trabajo,0
-help,"timesheet.work,timesheet_available",0,Allow to fill in timesheets with this work,Permite completar partes de trabajo con este trabajo,0
-model,"ir.action,name",act_enter_lines,Enter Timesheet,Introducir parte de trabajo,0
-model,"ir.action,name",act_hours_employee_form,Hours per Employee,Horas por empleado,0
-model,"ir.action,name",act_open_hours_employee,Hours per Employee,Horas por empleado,0
-model,"ir.action,name",act_hours_employee_monthly_form,Hours per Employee per Month,Horas por empleado y mes,0
-model,"ir.action,name",act_hours_employee_weekly_form,Hours per Employee per Week,Horas por empleado y semana,0
-model,"ir.action,name",act_open_work,Hours per Work,Horas por trabajo,0
-model,"ir.action,name",act_work_form2,Hours per Work,Horas por trabajo,0
-model,"ir.action,name",act_open_work2,Hours per Work,Horas por trabajo,0
-model,"ir.action,name",act_work_form3,Hours per Work,Horas por trabajo,0
-model,"ir.action,name",act_open_work_graph,Hours per Work,Horas por trabajo,0
-model,"ir.action,name",act_line_form,Timesheet Lines,Líneas del parte de trabajo,0
-model,"ir.action,name",act_work_form,Works,Trabajos,0
-model,"ir.action,name",act_work_tree,Works,Trabajos,0
-model,"ir.action,name",act_work_tree2,Works,Trabajos,0
-model,"ir.ui.menu,name",menu_configuration,Configuration,Configuración,0
-model,"ir.ui.menu,name",menu_enter_lines,Enter Timesheet,Introducir parte de trabajo,0
-model,"ir.ui.menu,name",menu_open_hours_employee,Hours per Employee,Horas por empleado,0
-model,"ir.ui.menu,name",menu_open_hours_employee_monthly,Hours per Employee per Month,Horas por empleado y mes,0
-model,"ir.ui.menu,name",menu_open_hours_employee_weekly,Hours per Employee per Week,Horas por empleado y semana,0
-model,"ir.ui.menu,name",menu_work_tree2,Hours per Work,Horas por trabajo,0
-model,"ir.ui.menu,name",menu_work_form2,Hours per Work,Horas por trabajo,0
-model,"ir.ui.menu,name",menu_reporting,Reporting,Informes,0
-model,"ir.ui.menu,name",menu_line_form,Timesheet Lines,Lineas de parte de trabajo,0
-model,"ir.ui.menu,name",menu_timesheet,Timesheet Management,Gestión de parte de trabajo,0
-model,"ir.ui.menu,name",menu_work_form,Works,Trabajos,0
-model,"ir.ui.menu,name",menu_work_tree,Works,Trabajos,0
-model,"res.group,name",group_timesheet_admin,Timesheet Administration,Administración de parte de trabajo,0
-model,"timesheet.enter_lines.init,name",0,Enter Lines Init,Inicializa la introducción de líneas,0
-model,"timesheet.hours_employee_monthly,name",0,Hours per Employee per Month,Horas por empleado y mes,0
-model,"timesheet.hours_employee,name",0,Hours per Employee,Horas por empleado,0
-model,"timesheet.hours_employee_weekly,name",0,Hours per Employee per Week,Horas por empleado y semana,0
-model,"timesheet.line,name",0,Timesheet Line,Linea de parte de trabajo,0
-model,"timesheet.open_hours_employee.init,name",0,Open Hours Employee Init,Inicializa la apertura de horas de empleado,0
-model,"timesheet.work,name",0,Work,Trabajo,0
-model,"timesheet.work.open.init,name",0,Open Work Init,Inicializa la apertura de un trabajo,0
-view,timesheet.enter_lines.init,0,Enter Timesheet,Introducir parte de trabajo,0
-view,timesheet.hours_employee,0,Hours,Horas,0
-view,timesheet.hours_employee,0,Hours per Employee,Horas por empleado,0
-view,timesheet.hours_employee_monthly,0,Hours per Employee per Month,Horas por empleado y mes,0
-view,timesheet.hours_employee_weekly,0,Hours per Employee per Week,Horas por empleado y semana,0
-view,timesheet.line,0,Hours,Horas,0
-view,timesheet.line,0,Timesheet Line,Linea de parte de trabajo,0
-view,timesheet.line,0,Timesheet Lines,Lineas de parte de trabajo,0
-view,timesheet.open_hours_employee.init,0,Hours per Employee,Horas por empleado,0
-view,timesheet.work,0,Hours per Work,Horas por trabajo,0
-view,timesheet.work,0,Work,Trabajo,0
-view,timesheet.work,0,Works,Trabajos,0
-view,timesheet.work.open.init,0,Hours per Work,Horas por trabajo,0
-wizard_button,"timesheet.enter_lines,init,end",0,Cancel,Cancelar,0
-wizard_button,"timesheet.enter_lines,init,enter",0,Enter,Entrar,0
-wizard_button,"timesheet.open_hours_employee,init,end",0,Cancel,Cancelar,0
-wizard_button,"timesheet.open_hours_employee,init,open",0,Open,Abrir,0
-wizard_button,"timesheet.work.open2,init,end",0,Cancel,Cancelar,0
-wizard_button,"timesheet.work.open2,init,open",0,Open,Abrir,0
-wizard_button,"timesheet.work.open,init,end",0,Cancel,Cancelar,0
-wizard_button,"timesheet.work.open,init,open",0,Open,Abrir,0
diff --git a/fr_FR.csv b/fr_FR.csv
deleted file mode 100644
index 6d7566a..0000000
--- a/fr_FR.csv
+++ /dev/null
@@ -1,99 +0,0 @@
-type,name,res_id,src,value,fuzzy
-error,timesheet.line,0,Hours field must be positive,Le champ Heures doit être positif,0
-error,timesheet.work,0,Every work must be in the same company as it's parent work!,Chaque activité doit être dans la même société que son activité parente !,0
-error,timesheet.work,0,You can not create recursive works!,Vous ne pouvez pas créer des activités récursives!,0
-field,"timesheet.enter_lines.init,date",0,Date,Date,0
-field,"timesheet.enter_lines.init,employee",0,Employee,Employé,0
-field,"timesheet.hours_employee,employee",0,Employee,Employé,0
-field,"timesheet.hours_employee,hours",0,Hours,Heures,0
-field,"timesheet.hours_employee,rec_name",0,Name,Nom,0
-field,"timesheet.hours_employee_monthly,employee",0,Employee,Employé,0
-field,"timesheet.hours_employee_monthly,hours",0,Hours,Heures,0
-field,"timesheet.hours_employee_monthly,month",0,Month,Mois,0
-field,"timesheet.hours_employee_monthly,rec_name",0,Name,Nom,0
-field,"timesheet.hours_employee_monthly,year",0,Year,Année,0
-field,"timesheet.hours_employee_weekly,employee",0,Employee,Employé,0
-field,"timesheet.hours_employee_weekly,hours",0,Hours,Heures,0
-field,"timesheet.hours_employee_weekly,rec_name",0,Name,Nom,0
-field,"timesheet.hours_employee_weekly,week",0,Week,Semaine,0
-field,"timesheet.hours_employee_weekly,year",0,Year,Année,0
-field,"timesheet.line,date",0,Date,Date,0
-field,"timesheet.line,description",0,Description,Description,0
-field,"timesheet.line,employee",0,Employee,Employé,0
-field,"timesheet.line,hours",0,Hours,Heures,0
-field,"timesheet.line,rec_name",0,Name,Nom,0
-field,"timesheet.line,work",0,Work,Activité,0
-field,"timesheet.open_hours_employee.init,end_date",0,End Date,Date de fin,0
-field,"timesheet.open_hours_employee.init,start_date",0,Start Date,Date de début,0
-field,"timesheet.work,active",0,Active,Actif,0
-field,"timesheet.work,children",0,Children,Enfants,0
-field,"timesheet.work,company",0,Company,Société,0
-field,"timesheet.work,hours",0,Timesheet Hours,Heures,0
-field,"timesheet.work,left",0,Left,Gauche,0
-field,"timesheet.work,name",0,Name,Nom,0
-field,"timesheet.work,parent",0,Parent,Parent,0
-field,"timesheet.work,rec_name",0,Name,Nom,0
-field,"timesheet.work,right",0,Right,Droite,0
-field,"timesheet.work,timesheet_available",0,Available on timesheets,Disponible sur les feuilles de présence,0
-field,"timesheet.work.open.init,from_date",0,From Date,Date de début,0
-field,"timesheet.work.open.init,to_date",0,To Date,Date de fin,0
-help,"timesheet.work,hours",0,Total time spent on this work,Temps total passé sur cette activité,0
-help,"timesheet.work,timesheet_available",0,Allow to fill in timesheets with this work,Autoriser cette activité sur les feuilles de présence,0
-model,"ir.action,name",act_enter_lines,Enter Timesheet,Entrez feuille de présence,0
-model,"ir.action,name",act_hours_employee_form,Hours per Employee,Heures par employé,0
-model,"ir.action,name",act_hours_employee_monthly_form,Hours per Employee per Month,Nombre d'heures par employé par mois,0
-model,"ir.action,name",act_hours_employee_weekly_form,Hours per Employee per Week,Nombre d'heures par employé par semaine,0
-model,"ir.action,name",act_line_form,Timesheet Lines,Lignes de feuille de présence,0
-model,"ir.action,name",act_open_hours_employee,Hours per Employee,Heures par employé,0
-model,"ir.action,name",act_open_work,Hours per Work,Heures par activité,0
-model,"ir.action,name",act_open_work2,Hours per Work,Heures par activité,0
-model,"ir.action,name",act_open_work_graph,Hours per Work,Heures par activité,0
-model,"ir.action,name",act_work_form,Works,Activités,0
-model,"ir.action,name",act_work_form2,Hours per Work,Heures par activité,0
-model,"ir.action,name",act_work_form3,Hours per Work,Heures par activité,0
-model,"ir.action,name",act_work_list,Works,Activités,1
-model,"ir.action,name",act_work_tree,Works,Activités,0
-model,"ir.action,name",act_work_tree2,Works,Activités,0
-model,"ir.ui.menu,name",menu_configuration,Configuration,Configuration,0
-model,"ir.ui.menu,name",menu_enter_lines,Enter Timesheet,Entrer feuille de présence,0
-model,"ir.ui.menu,name",menu_line_form,Timesheet Lines,Lignes de feuille de présence,0
-model,"ir.ui.menu,name",menu_open_hours_employee,Hours per Employee,Heures par employé,0
-model,"ir.ui.menu,name",menu_open_hours_employee_monthly,Hours per Employee per Month,Nombre d'heures par employé par mois,0
-model,"ir.ui.menu,name",menu_open_hours_employee_weekly,Hours per Employee per Week,Nombre d'heures par employé par semaine,0
-model,"ir.ui.menu,name",menu_reporting,Reporting,Rapports,0
-model,"ir.ui.menu,name",menu_timesheet,Timesheet Management,Feuilles de présence,0
-model,"ir.ui.menu,name",menu_work_form,New Work,Nouvelle activité,0
-model,"ir.ui.menu,name",menu_work_form2,Hours per Work,Heures par activité,0
-model,"ir.ui.menu,name",menu_work_list,Works,Activités,1
-model,"ir.ui.menu,name",menu_work_tree,Works,Activités,0
-model,"ir.ui.menu,name",menu_work_tree2,Hours per Work,Heures par activité,0
-model,"res.group,name",group_timesheet_admin,Timesheet Administration,Administration feuille de présence,0
-model,"timesheet.enter_lines.init,name",0,Enter Lines Init,Entrez les lignes - Init,0
-model,"timesheet.hours_employee,name",0,Hours per Employee,Heures par employé,0
-model,"timesheet.hours_employee_monthly,name",0,Hours per Employee per Month,Nombre d'heures par employé par mois,0
-model,"timesheet.hours_employee_weekly,name",0,Hours per Employee per Week,Nombre d'heures par employé par semaine,0
-model,"timesheet.line,name",0,Timesheet Line,Ligne de feuille de présence,0
-model,"timesheet.open_hours_employee.init,name",0,Open Hours Employee Init,Heures d'ouverture des employés - Init,0
-model,"timesheet.work,name",0,Work,Activité,0
-model,"timesheet.work.open.init,name",0,Open Work Init,Ouvrir activité - Init,0
-view,timesheet.enter_lines.init,0,Enter Timesheet,Entrez feuille de présence,0
-view,timesheet.hours_employee,0,Hours,Heures,0
-view,timesheet.hours_employee,0,Hours per Employee,Heures par employé,0
-view,timesheet.hours_employee_monthly,0,Hours per Employee per Month,Nombre d'heures par employé par mois,0
-view,timesheet.hours_employee_weekly,0,Hours per Employee per Week,Nombre d'heures par employé par semaine,0
-view,timesheet.line,0,Hours,Heures,0
-view,timesheet.line,0,Timesheet Line,Ligne de feuille de présence,0
-view,timesheet.line,0,Timesheet Lines,Lignes de feuille de présence,0
-view,timesheet.open_hours_employee.init,0,Hours per Employee,Heures par employé,0
-view,timesheet.work,0,Hours per Work,Heures par activité,0
-view,timesheet.work,0,Work,Activité,0
-view,timesheet.work,0,Works,Activités,0
-view,timesheet.work.open.init,0,Hours per Work,Heures par activité,0
-wizard_button,"timesheet.enter_lines,init,end",0,Cancel,Annuler,0
-wizard_button,"timesheet.enter_lines,init,enter",0,Enter,Entrez,0
-wizard_button,"timesheet.open_hours_employee,init,end",0,Cancel,Annuler,0
-wizard_button,"timesheet.open_hours_employee,init,open",0,Open,Ouvrir,0
-wizard_button,"timesheet.work.open,init,end",0,Cancel,Annuler,0
-wizard_button,"timesheet.work.open,init,open",0,Open,Ouvrir,0
-wizard_button,"timesheet.work.open2,init,end",0,Cancel,Annuler,0
-wizard_button,"timesheet.work.open2,init,open",0,Open,Ouvrir,0
diff --git a/line.py b/line.py
index e97b6ed..b3107dc 100644
--- a/line.py
+++ b/line.py
@@ -3,8 +3,10 @@
from trytond.model import ModelView, ModelSQL, fields
from trytond.wizard import Wizard
from trytond.backend import FIELDS
-from trytond.pyson import Eval, PYSONEncoder, Date
+from trytond.pyson import Eval, PYSONEncoder, Date, Get
from trytond.transaction import Transaction
+from trytond.pool import Pool
+
class Line(ModelSQL, ModelView):
'Timesheet Line'
@@ -12,7 +14,7 @@ class Line(ModelSQL, ModelView):
_description = __doc__
employee = fields.Many2One('company.employee', 'Employee', required=True,
- select=1, domain=[('company', '=', Eval('company'))])
+ select=1, domain=[('company', '=', Get(Eval('context', {}), 'company'))])
date = fields.Date('Date', required=True, select=1)
hours = fields.Float('Hours', digits=(16, 2), required=True)
work = fields.Many2One('timesheet.work', 'Work',
@@ -29,8 +31,8 @@ class Line(ModelSQL, ModelView):
]
def default_employee(self):
- user_obj = self.pool.get('res.user')
- employee_obj = self.pool.get('company.employee')
+ user_obj = Pool().get('res.user')
+ employee_obj = Pool().get('company.employee')
employee_id = None
if Transaction().context.get('employee'):
@@ -44,14 +46,14 @@ class Line(ModelSQL, ModelView):
return False
def default_date(self):
- date_obj = self.pool.get('ir.date')
+ date_obj = Pool().get('ir.date')
return Transaction().context.get('date') or date_obj.today()
def view_header_get(self, value, view_type='form'):
if not Transaction().context.get('employee'):
return value
- employee_obj = self.pool.get('company.employee')
+ employee_obj = Pool().get('company.employee')
employee = employee_obj.browse(Transaction().context['employee'])
return value + " (" + employee.name + ")"
@@ -63,15 +65,15 @@ class EnterLinesInit(ModelView):
_name = 'timesheet.enter_lines.init'
_description = __doc__
employee = fields.Many2One('company.employee', 'Employee', required=True,
- domain=[('company', '=', Eval('company'))])
+ domain=[('company', '=', Get(Eval('context', {}), 'company'))])
date = fields.Date('Date', required=True)
def default_employee(self):
- line_obj = self.pool.get('timesheet.line')
+ line_obj = Pool().get('timesheet.line')
return line_obj.default_employee()
def default_date(self):
- line_obj = self.pool.get('timesheet.line')
+ line_obj = Pool().get('timesheet.line')
return line_obj.default_date()
EnterLinesInit()
@@ -101,9 +103,10 @@ class EnterLines(Wizard):
}
def _action_enter_lines(self, data):
- model_data_obj = self.pool.get('ir.model.data')
- act_window_obj = self.pool.get('ir.action.act_window')
- employee_obj = self.pool.get('company.employee')
+ pool = Pool()
+ model_data_obj = pool.get('ir.model.data')
+ act_window_obj = pool.get('ir.action.act_window')
+ employee_obj = pool.get('company.employee')
act_window_id = model_data_obj.get_id('timesheet', 'act_line_form')
res = act_window_obj.read(act_window_id)
date = data['form']['date']
@@ -192,8 +195,8 @@ class OpenHoursEmployee(Wizard):
}
def _action_open(self, data):
- model_data_obj = self.pool.get('ir.model.data')
- act_window_obj = self.pool.get('ir.action.act_window')
+ model_data_obj = Pool().get('ir.model.data')
+ act_window_obj = Pool().get('ir.action.act_window')
act_window_id = model_data_obj.get_id('timesheet',
'act_hours_employee_form')
res = act_window_obj.read(act_window_id)
diff --git a/line.xml b/line.xml
index 228d3b4..4b2e8e9 100644
--- a/line.xml
+++ b/line.xml
@@ -30,11 +30,11 @@ this repository contains the full copyright notices and license terms. -->
<field name="arch" type="xml">
<![CDATA[
<tree string="Timesheet Lines" editable="bottom">
- <field name="employee" select="1"/>
- <field name="date" select="1"/>
+ <field name="employee"/>
+ <field name="date"/>
<field name="hours" widget="float_time"
float_time="company_work_time" sum="Hours"/>
- <field name="work" select="1" width="300"/>
+ <field name="work" width="300"/>
<field name="description"/>
</tree>
]]>
@@ -74,7 +74,11 @@ this repository contains the full copyright notices and license terms. -->
<field name="model" search="[('model', '=', 'timesheet.line')]"/>
<field name="global_p" eval="False"/>
<field name="default_p" eval="False"/>
- <field name="groups" eval="[('add', ref('group_timesheet_admin'))]"/>
+ </record>
+ <record model="ir.rule.group-res.group"
+ id="rule_group_line_admin_group_timesheet_admin">
+ <field name="rule_group" ref="rule_group_line_admin"/>
+ <field name="group" ref="group_timesheet_admin"/>
</record>
<record model="ir.ui.view" id="enter_lines_init_view_form">
@@ -161,7 +165,11 @@ this repository contains the full copyright notices and license terms. -->
<field name="model" search="[('model', '=', 'timesheet.hours_employee')]"/>
<field name="global_p" eval="False"/>
<field name="default_p" eval="False"/>
- <field name="groups" eval="[('add', ref('group_timesheet_admin'))]"/>
+ </record>
+ <record model="ir.rule.group-res.group"
+ id="rule_group_hours_employee_admin_group_timesheet_admin">
+ <field name="rule_group" ref="rule_group_hours_employee_admin"/>
+ <field name="group" ref="group_timesheet_admin"/>
</record>
<record model="ir.ui.view" id="open_hours_employee_init_view_form">
@@ -191,10 +199,10 @@ this repository contains the full copyright notices and license terms. -->
<field name="arch" type="xml">
<![CDATA[
<tree string="Hours per Employee per Week">
- <field name="year" select="1"/>
- <field name="week" select="1"/>
- <field name="employee" select="1"/>
- <field name="hours" select="1" widget="float_time"
+ <field name="year"/>
+ <field name="week"/>
+ <field name="employee"/>
+ <field name="hours" widget="float_time"
float_time="company_work_time"/>
</tree>
]]>
@@ -219,10 +227,10 @@ this repository contains the full copyright notices and license terms. -->
<field name="arch" type="xml">
<![CDATA[
<tree string="Hours per Employee per Month">
- <field name="year" select="1"/>
- <field name="month" select="1"/>
- <field name="employee" select="1"/>
- <field name="hours" select="1" widget="float_time"
+ <field name="year"/>
+ <field name="month"/>
+ <field name="employee"/>
+ <field name="hours" widget="float_time"
float_time="company_work_time"/>
</tree>
]]>
diff --git a/locale/bg_BG.po b/locale/bg_BG.po
new file mode 100644
index 0000000..cae5ea8
--- /dev/null
+++ b/locale/bg_BG.po
@@ -0,0 +1,392 @@
+#
+msgid ""
+msgstr "Content-Type: text/plain; charset=utf-8\n"
+
+msgctxt "error:timesheet.line:0"
+msgid "Hours field must be positive"
+msgstr "Часовете трябва да са положителни числа"
+
+msgctxt "error:timesheet.work:0"
+msgid "Every work must be in the same company as it's parent work!"
+msgstr ""
+"Всяка задача трябва да е в същата фирма като тази на родителската задача!"
+
+msgctxt "error:timesheet.work:0"
+msgid "You can not create recursive works!"
+msgstr "Не може да създавате взаимно вложени задачи!"
+
+msgctxt "field:timesheet.enter_lines.init,date:0"
+msgid "Date"
+msgstr "Дата"
+
+msgctxt "field:timesheet.enter_lines.init,employee:0"
+msgid "Employee"
+msgstr "Служител"
+
+msgctxt "field:timesheet.hours_employee,employee:0"
+msgid "Employee"
+msgstr "Служител"
+
+msgctxt "field:timesheet.hours_employee,hours:0"
+msgid "Hours"
+msgstr "Часове"
+
+msgctxt "field:timesheet.hours_employee,rec_name:0"
+msgid "Name"
+msgstr "Име"
+
+msgctxt "field:timesheet.hours_employee_monthly,employee:0"
+msgid "Employee"
+msgstr "Служител"
+
+msgctxt "field:timesheet.hours_employee_monthly,hours:0"
+msgid "Hours"
+msgstr "Часове"
+
+msgctxt "field:timesheet.hours_employee_monthly,month:0"
+msgid "Month"
+msgstr "Месец"
+
+msgctxt "field:timesheet.hours_employee_monthly,rec_name:0"
+msgid "Name"
+msgstr "Име"
+
+msgctxt "field:timesheet.hours_employee_monthly,year:0"
+msgid "Year"
+msgstr "Година"
+
+msgctxt "field:timesheet.hours_employee_weekly,employee:0"
+msgid "Employee"
+msgstr "Служител"
+
+msgctxt "field:timesheet.hours_employee_weekly,hours:0"
+msgid "Hours"
+msgstr "Часове"
+
+msgctxt "field:timesheet.hours_employee_weekly,rec_name:0"
+msgid "Name"
+msgstr "Име"
+
+msgctxt "field:timesheet.hours_employee_weekly,week:0"
+msgid "Week"
+msgstr "Седмица"
+
+msgctxt "field:timesheet.hours_employee_weekly,year:0"
+msgid "Year"
+msgstr "Година"
+
+msgctxt "field:timesheet.line,date:0"
+msgid "Date"
+msgstr "Дата"
+
+msgctxt "field:timesheet.line,description:0"
+msgid "Description"
+msgstr "Описание"
+
+msgctxt "field:timesheet.line,employee:0"
+msgid "Employee"
+msgstr "Служител"
+
+msgctxt "field:timesheet.line,hours:0"
+msgid "Hours"
+msgstr "Часове"
+
+msgctxt "field:timesheet.line,rec_name:0"
+msgid "Name"
+msgstr "Име"
+
+msgctxt "field:timesheet.line,work:0"
+msgid "Work"
+msgstr "Задача"
+
+msgctxt "field:timesheet.open_hours_employee.init,end_date:0"
+msgid "End Date"
+msgstr "Крайна дата"
+
+msgctxt "field:timesheet.open_hours_employee.init,start_date:0"
+msgid "Start Date"
+msgstr "Начална дата"
+
+msgctxt "field:timesheet.work,active:0"
+msgid "Active"
+msgstr "Активен"
+
+msgctxt "field:timesheet.work,children:0"
+msgid "Children"
+msgstr "Деца"
+
+msgctxt "field:timesheet.work,company:0"
+msgid "Company"
+msgstr "Фирма"
+
+msgctxt "field:timesheet.work,hours:0"
+msgid "Timesheet Hours"
+msgstr "Часове от график"
+
+msgctxt "field:timesheet.work,left:0"
+msgid "Left"
+msgstr "Ляв"
+
+msgctxt "field:timesheet.work,name:0"
+msgid "Name"
+msgstr "Име"
+
+msgctxt "field:timesheet.work,parent:0"
+msgid "Parent"
+msgstr "Родител"
+
+msgctxt "field:timesheet.work,rec_name:0"
+msgid "Name"
+msgstr "Име"
+
+msgctxt "field:timesheet.work,right:0"
+msgid "Right"
+msgstr "Десен"
+
+msgctxt "field:timesheet.work,timesheet_available:0"
+msgid "Available on timesheets"
+msgstr "Наличен в график"
+
+msgctxt "field:timesheet.work,timesheet_lines:0"
+msgid ""
+msgstr ""
+
+msgctxt "field:timesheet.work.open.init,from_date:0"
+msgid "From Date"
+msgstr "От дата"
+
+msgctxt "field:timesheet.work.open.init,to_date:0"
+msgid "To Date"
+msgstr "До дата"
+
+msgctxt "help:timesheet.work,hours:0"
+msgid "Total time spent on this work"
+msgstr "Общо време за изпълнение на тази задача"
+
+msgctxt "help:timesheet.work,timesheet_available:0"
+msgid "Allow to fill in timesheets with this work"
+msgstr "Позволява да се попълни в график с тази задача"
+
+msgctxt "model:ir.action,name:act_enter_lines"
+msgid "Enter Timesheet"
+msgstr "Въвеждане на график"
+
+msgctxt "model:ir.action,name:act_hours_employee_form"
+msgid "Hours per Employee"
+msgstr "Часове на служител"
+
+msgctxt "model:ir.action,name:act_hours_employee_monthly_form"
+msgid "Hours per Employee per Month"
+msgstr "Часове за служител за месец"
+
+msgctxt "model:ir.action,name:act_hours_employee_weekly_form"
+msgid "Hours per Employee per Week"
+msgstr "Часове на служител за седмица"
+
+msgctxt "model:ir.action,name:act_line_form"
+msgid "Timesheet Lines"
+msgstr "Редове от график"
+
+msgctxt "model:ir.action,name:act_open_hours_employee"
+msgid "Hours per Employee"
+msgstr "Часове на служител"
+
+msgctxt "model:ir.action,name:act_open_work"
+msgid "Hours per Work"
+msgstr "Часове за работа"
+
+msgctxt "model:ir.action,name:act_open_work_graph"
+msgid "Hours per Work"
+msgstr "Часове за работа"
+
+msgctxt "model:ir.action,name:act_work_form2"
+msgid "Hours per Work"
+msgstr "Часове за работа"
+
+msgctxt "model:ir.action,name:act_work_form3"
+msgid "Hours per Work"
+msgstr "Часове за работа"
+
+#, fuzzy
+msgctxt "model:ir.action,name:act_work_hours_board"
+msgid "Hours per Work"
+msgstr "Часове за работа"
+
+#, fuzzy
+msgctxt "model:ir.action,name:act_work_list"
+msgid "Works"
+msgstr "Зачади"
+
+msgctxt "model:ir.action,name:act_work_tree"
+msgid "Works"
+msgstr "Задачи"
+
+msgctxt "model:ir.action,name:act_work_tree2"
+msgid "Works"
+msgstr "Задачи"
+
+msgctxt "model:ir.ui.menu,name:menu_configuration"
+msgid "Configuration"
+msgstr "Конфигурация"
+
+msgctxt "model:ir.ui.menu,name:menu_enter_lines"
+msgid "Enter Timesheet"
+msgstr "Въвеждане на график"
+
+msgctxt "model:ir.ui.menu,name:menu_line_form"
+msgid "Timesheet Lines"
+msgstr "Редове от график"
+
+msgctxt "model:ir.ui.menu,name:menu_open_hours_employee"
+msgid "Hours per Employee"
+msgstr "Часове на служител"
+
+msgctxt "model:ir.ui.menu,name:menu_open_hours_employee_monthly"
+msgid "Hours per Employee per Month"
+msgstr "Часове за служител за месец"
+
+msgctxt "model:ir.ui.menu,name:menu_open_hours_employee_weekly"
+msgid "Hours per Employee per Week"
+msgstr "Часове на служител за седмица"
+
+msgctxt "model:ir.ui.menu,name:menu_reporting"
+msgid "Reporting"
+msgstr "Справки"
+
+#, fuzzy
+msgctxt "model:ir.ui.menu,name:menu_timesheet"
+msgid "Timesheet"
+msgstr "Управление на графици"
+
+#, fuzzy
+msgctxt "model:ir.ui.menu,name:menu_work_list"
+msgid "Works"
+msgstr "Зачади"
+
+msgctxt "model:ir.ui.menu,name:menu_work_tree"
+msgid "Works"
+msgstr "Задачи"
+
+msgctxt "model:ir.ui.menu,name:menu_work_tree2"
+msgid "Hours per Work"
+msgstr "Часове за работа"
+
+msgctxt "model:res.group,name:group_timesheet_admin"
+msgid "Timesheet Administration"
+msgstr "Управление на графици"
+
+msgctxt "model:timesheet.enter_lines.init,name:0"
+msgid "Enter Lines Init"
+msgstr "Начално въвеждане на редове"
+
+msgctxt "model:timesheet.hours_employee,name:0"
+msgid "Hours per Employee"
+msgstr "Часове на служител"
+
+msgctxt "model:timesheet.hours_employee_monthly,name:0"
+msgid "Hours per Employee per Month"
+msgstr "Часове за служител за месец"
+
+msgctxt "model:timesheet.hours_employee_weekly,name:0"
+msgid "Hours per Employee per Week"
+msgstr "Часове на служител за седмица"
+
+msgctxt "model:timesheet.line,name:0"
+msgid "Timesheet Line"
+msgstr "Ред от график"
+
+msgctxt "model:timesheet.open_hours_employee.init,name:0"
+msgid "Open Hours Employee Init"
+msgstr "Начално отваряне на часове на служители"
+
+msgctxt "model:timesheet.work,name:0"
+msgid "Work"
+msgstr "Задача"
+
+msgctxt "model:timesheet.work.open.init,name:0"
+msgid "Open Work Init"
+msgstr "Начално отваряне на задача"
+
+msgctxt "view:timesheet.enter_lines.init:0"
+msgid "Enter Timesheet"
+msgstr "Въвеждане на график"
+
+msgctxt "view:timesheet.hours_employee:0"
+msgid "Hours"
+msgstr "Часове"
+
+msgctxt "view:timesheet.hours_employee:0"
+msgid "Hours per Employee"
+msgstr "Часове на служител"
+
+msgctxt "view:timesheet.hours_employee_monthly:0"
+msgid "Hours per Employee per Month"
+msgstr "Часове за служител за месец"
+
+msgctxt "view:timesheet.hours_employee_weekly:0"
+msgid "Hours per Employee per Week"
+msgstr "Часове на служител за седмица"
+
+msgctxt "view:timesheet.line:0"
+msgid "Hours"
+msgstr "Часове"
+
+msgctxt "view:timesheet.line:0"
+msgid "Timesheet Line"
+msgstr "Ред от график"
+
+msgctxt "view:timesheet.line:0"
+msgid "Timesheet Lines"
+msgstr "Редове от график"
+
+msgctxt "view:timesheet.open_hours_employee.init:0"
+msgid "Hours per Employee"
+msgstr "Часове на служител"
+
+msgctxt "view:timesheet.work.open.init:0"
+msgid "Hours per Work"
+msgstr "Часове за работа"
+
+msgctxt "view:timesheet.work:0"
+msgid "Hours per Work"
+msgstr "Часове за работа"
+
+msgctxt "view:timesheet.work:0"
+msgid "Work"
+msgstr "Задача"
+
+msgctxt "view:timesheet.work:0"
+msgid "Works"
+msgstr "Зачади"
+
+msgctxt "wizard_button:timesheet.enter_lines,init,end:0"
+msgid "Cancel"
+msgstr "Отказ"
+
+msgctxt "wizard_button:timesheet.enter_lines,init,enter:0"
+msgid "Enter"
+msgstr "Въвеждане"
+
+msgctxt "wizard_button:timesheet.open_hours_employee,init,end:0"
+msgid "Cancel"
+msgstr "Отказ"
+
+msgctxt "wizard_button:timesheet.open_hours_employee,init,open:0"
+msgid "Open"
+msgstr "Отваряне"
+
+msgctxt "wizard_button:timesheet.work.open,init,end:0"
+msgid "Cancel"
+msgstr "Отказ"
+
+msgctxt "wizard_button:timesheet.work.open,init,open:0"
+msgid "Open"
+msgstr "Отваряне"
+
+msgctxt "wizard_button:timesheet.work.open2,init,end:0"
+msgid "Cancel"
+msgstr "Отказ"
+
+msgctxt "wizard_button:timesheet.work.open2,init,open:0"
+msgid "Open"
+msgstr "Отваряне"
diff --git a/locale/cs_CZ.po b/locale/cs_CZ.po
new file mode 100644
index 0000000..31dc45b
--- /dev/null
+++ b/locale/cs_CZ.po
@@ -0,0 +1,387 @@
+#
+msgid ""
+msgstr "Content-Type: text/plain; charset=utf-8\n"
+
+msgctxt "error:timesheet.line:0"
+msgid "Hours field must be positive"
+msgstr ""
+
+msgctxt "error:timesheet.work:0"
+msgid "Every work must be in the same company as it's parent work!"
+msgstr ""
+
+msgctxt "error:timesheet.work:0"
+msgid "You can not create recursive works!"
+msgstr ""
+
+msgctxt "field:timesheet.enter_lines.init,date:0"
+msgid "Date"
+msgstr ""
+
+msgctxt "field:timesheet.enter_lines.init,employee:0"
+msgid "Employee"
+msgstr ""
+
+msgctxt "field:timesheet.hours_employee,employee:0"
+msgid "Employee"
+msgstr ""
+
+msgctxt "field:timesheet.hours_employee,hours:0"
+msgid "Hours"
+msgstr ""
+
+msgctxt "field:timesheet.hours_employee,rec_name:0"
+msgid "Name"
+msgstr ""
+
+msgctxt "field:timesheet.hours_employee_monthly,employee:0"
+msgid "Employee"
+msgstr ""
+
+msgctxt "field:timesheet.hours_employee_monthly,hours:0"
+msgid "Hours"
+msgstr ""
+
+msgctxt "field:timesheet.hours_employee_monthly,month:0"
+msgid "Month"
+msgstr ""
+
+msgctxt "field:timesheet.hours_employee_monthly,rec_name:0"
+msgid "Name"
+msgstr ""
+
+msgctxt "field:timesheet.hours_employee_monthly,year:0"
+msgid "Year"
+msgstr ""
+
+msgctxt "field:timesheet.hours_employee_weekly,employee:0"
+msgid "Employee"
+msgstr ""
+
+msgctxt "field:timesheet.hours_employee_weekly,hours:0"
+msgid "Hours"
+msgstr ""
+
+msgctxt "field:timesheet.hours_employee_weekly,rec_name:0"
+msgid "Name"
+msgstr ""
+
+msgctxt "field:timesheet.hours_employee_weekly,week:0"
+msgid "Week"
+msgstr ""
+
+msgctxt "field:timesheet.hours_employee_weekly,year:0"
+msgid "Year"
+msgstr ""
+
+msgctxt "field:timesheet.line,date:0"
+msgid "Date"
+msgstr ""
+
+msgctxt "field:timesheet.line,description:0"
+msgid "Description"
+msgstr ""
+
+msgctxt "field:timesheet.line,employee:0"
+msgid "Employee"
+msgstr ""
+
+msgctxt "field:timesheet.line,hours:0"
+msgid "Hours"
+msgstr ""
+
+msgctxt "field:timesheet.line,rec_name:0"
+msgid "Name"
+msgstr ""
+
+msgctxt "field:timesheet.line,work:0"
+msgid "Work"
+msgstr ""
+
+msgctxt "field:timesheet.open_hours_employee.init,end_date:0"
+msgid "End Date"
+msgstr ""
+
+msgctxt "field:timesheet.open_hours_employee.init,start_date:0"
+msgid "Start Date"
+msgstr ""
+
+msgctxt "field:timesheet.work,active:0"
+msgid "Active"
+msgstr ""
+
+msgctxt "field:timesheet.work,children:0"
+msgid "Children"
+msgstr ""
+
+msgctxt "field:timesheet.work,company:0"
+msgid "Company"
+msgstr ""
+
+msgctxt "field:timesheet.work,hours:0"
+msgid "Timesheet Hours"
+msgstr ""
+
+msgctxt "field:timesheet.work,left:0"
+msgid "Left"
+msgstr ""
+
+msgctxt "field:timesheet.work,name:0"
+msgid "Name"
+msgstr ""
+
+msgctxt "field:timesheet.work,parent:0"
+msgid "Parent"
+msgstr ""
+
+msgctxt "field:timesheet.work,rec_name:0"
+msgid "Name"
+msgstr ""
+
+msgctxt "field:timesheet.work,right:0"
+msgid "Right"
+msgstr ""
+
+msgctxt "field:timesheet.work,timesheet_available:0"
+msgid "Available on timesheets"
+msgstr ""
+
+msgctxt "field:timesheet.work,timesheet_lines:0"
+msgid "Timesheet Lines"
+msgstr ""
+
+msgctxt "field:timesheet.work.open.init,from_date:0"
+msgid "From Date"
+msgstr ""
+
+msgctxt "field:timesheet.work.open.init,to_date:0"
+msgid "To Date"
+msgstr ""
+
+msgctxt "help:timesheet.work,hours:0"
+msgid "Total time spent on this work"
+msgstr ""
+
+msgctxt "help:timesheet.work,timesheet_available:0"
+msgid "Allow to fill in timesheets with this work"
+msgstr ""
+
+msgctxt "model:ir.action,name:act_enter_lines"
+msgid "Enter Timesheet"
+msgstr ""
+
+msgctxt "model:ir.action,name:act_hours_employee_form"
+msgid "Hours per Employee"
+msgstr ""
+
+msgctxt "model:ir.action,name:act_hours_employee_monthly_form"
+msgid "Hours per Employee per Month"
+msgstr ""
+
+msgctxt "model:ir.action,name:act_hours_employee_weekly_form"
+msgid "Hours per Employee per Week"
+msgstr ""
+
+msgctxt "model:ir.action,name:act_line_form"
+msgid "Timesheet Lines"
+msgstr ""
+
+msgctxt "model:ir.action,name:act_open_hours_employee"
+msgid "Hours per Employee"
+msgstr ""
+
+msgctxt "model:ir.action,name:act_open_work"
+msgid "Hours per Work"
+msgstr ""
+
+msgctxt "model:ir.action,name:act_open_work_graph"
+msgid "Hours per Work"
+msgstr ""
+
+msgctxt "model:ir.action,name:act_work_form2"
+msgid "Hours per Work"
+msgstr ""
+
+msgctxt "model:ir.action,name:act_work_form3"
+msgid "Hours per Work"
+msgstr ""
+
+msgctxt "model:ir.action,name:act_work_hours_board"
+msgid "Hours per Work"
+msgstr ""
+
+msgctxt "model:ir.action,name:act_work_list"
+msgid "Works"
+msgstr ""
+
+msgctxt "model:ir.action,name:act_work_tree"
+msgid "Works"
+msgstr ""
+
+msgctxt "model:ir.action,name:act_work_tree2"
+msgid "Works"
+msgstr ""
+
+msgctxt "model:ir.ui.menu,name:menu_configuration"
+msgid "Configuration"
+msgstr ""
+
+msgctxt "model:ir.ui.menu,name:menu_enter_lines"
+msgid "Enter Timesheet"
+msgstr ""
+
+msgctxt "model:ir.ui.menu,name:menu_line_form"
+msgid "Timesheet Lines"
+msgstr ""
+
+msgctxt "model:ir.ui.menu,name:menu_open_hours_employee"
+msgid "Hours per Employee"
+msgstr ""
+
+msgctxt "model:ir.ui.menu,name:menu_open_hours_employee_monthly"
+msgid "Hours per Employee per Month"
+msgstr ""
+
+msgctxt "model:ir.ui.menu,name:menu_open_hours_employee_weekly"
+msgid "Hours per Employee per Week"
+msgstr ""
+
+msgctxt "model:ir.ui.menu,name:menu_reporting"
+msgid "Reporting"
+msgstr ""
+
+msgctxt "model:ir.ui.menu,name:menu_timesheet"
+msgid "Timesheet"
+msgstr ""
+
+msgctxt "model:ir.ui.menu,name:menu_work_list"
+msgid "Works"
+msgstr ""
+
+msgctxt "model:ir.ui.menu,name:menu_work_tree"
+msgid "Works"
+msgstr ""
+
+msgctxt "model:ir.ui.menu,name:menu_work_tree2"
+msgid "Hours per Work"
+msgstr ""
+
+msgctxt "model:res.group,name:group_timesheet_admin"
+msgid "Timesheet Administration"
+msgstr ""
+
+msgctxt "model:timesheet.enter_lines.init,name:0"
+msgid "Enter Lines Init"
+msgstr ""
+
+msgctxt "model:timesheet.hours_employee,name:0"
+msgid "Hours per Employee"
+msgstr ""
+
+msgctxt "model:timesheet.hours_employee_monthly,name:0"
+msgid "Hours per Employee per Month"
+msgstr ""
+
+msgctxt "model:timesheet.hours_employee_weekly,name:0"
+msgid "Hours per Employee per Week"
+msgstr ""
+
+msgctxt "model:timesheet.line,name:0"
+msgid "Timesheet Line"
+msgstr ""
+
+msgctxt "model:timesheet.open_hours_employee.init,name:0"
+msgid "Open Hours Employee Init"
+msgstr ""
+
+msgctxt "model:timesheet.work,name:0"
+msgid "Work"
+msgstr ""
+
+msgctxt "model:timesheet.work.open.init,name:0"
+msgid "Open Work Init"
+msgstr ""
+
+msgctxt "view:timesheet.enter_lines.init:0"
+msgid "Enter Timesheet"
+msgstr ""
+
+msgctxt "view:timesheet.hours_employee:0"
+msgid "Hours"
+msgstr ""
+
+msgctxt "view:timesheet.hours_employee:0"
+msgid "Hours per Employee"
+msgstr ""
+
+msgctxt "view:timesheet.hours_employee_monthly:0"
+msgid "Hours per Employee per Month"
+msgstr ""
+
+msgctxt "view:timesheet.hours_employee_weekly:0"
+msgid "Hours per Employee per Week"
+msgstr ""
+
+msgctxt "view:timesheet.line:0"
+msgid "Hours"
+msgstr ""
+
+msgctxt "view:timesheet.line:0"
+msgid "Timesheet Line"
+msgstr ""
+
+msgctxt "view:timesheet.line:0"
+msgid "Timesheet Lines"
+msgstr ""
+
+msgctxt "view:timesheet.open_hours_employee.init:0"
+msgid "Hours per Employee"
+msgstr ""
+
+msgctxt "view:timesheet.work.open.init:0"
+msgid "Hours per Work"
+msgstr ""
+
+msgctxt "view:timesheet.work:0"
+msgid "Hours per Work"
+msgstr ""
+
+msgctxt "view:timesheet.work:0"
+msgid "Work"
+msgstr ""
+
+msgctxt "view:timesheet.work:0"
+msgid "Works"
+msgstr ""
+
+msgctxt "wizard_button:timesheet.enter_lines,init,end:0"
+msgid "Cancel"
+msgstr ""
+
+msgctxt "wizard_button:timesheet.enter_lines,init,enter:0"
+msgid "Enter"
+msgstr ""
+
+msgctxt "wizard_button:timesheet.open_hours_employee,init,end:0"
+msgid "Cancel"
+msgstr ""
+
+msgctxt "wizard_button:timesheet.open_hours_employee,init,open:0"
+msgid "Open"
+msgstr ""
+
+msgctxt "wizard_button:timesheet.work.open,init,end:0"
+msgid "Cancel"
+msgstr ""
+
+msgctxt "wizard_button:timesheet.work.open,init,open:0"
+msgid "Open"
+msgstr ""
+
+msgctxt "wizard_button:timesheet.work.open2,init,end:0"
+msgid "Cancel"
+msgstr ""
+
+msgctxt "wizard_button:timesheet.work.open2,init,open:0"
+msgid "Open"
+msgstr ""
diff --git a/locale/de_DE.po b/locale/de_DE.po
new file mode 100644
index 0000000..bf79908
--- /dev/null
+++ b/locale/de_DE.po
@@ -0,0 +1,489 @@
+#
+msgid ""
+msgstr "Content-Type: text/plain; charset=utf-8\n"
+
+msgctxt "error:timesheet.line:0"
+msgid "Hours field must be positive"
+msgstr "Feld Stunden muss einen positiven Wert haben"
+
+msgctxt "error:timesheet.work:0"
+msgid "Every work must be in the same company as it's parent work!"
+msgstr ""
+"Eine Aufgabe muss immer zum selben Unternehmen wie die übergeordnete Aufgabe"
+" gehören!"
+
+msgctxt "error:timesheet.work:0"
+msgid "You can not create recursive works!"
+msgstr "Aufgaben können nicht rekursiv angelegt werden!"
+
+msgctxt "field:timesheet.enter_lines.init,date:0"
+msgid "Date"
+msgstr "Datum"
+
+msgctxt "field:timesheet.enter_lines.init,employee:0"
+msgid "Employee"
+msgstr "Mitarbeiter"
+
+msgctxt "field:timesheet.hours_employee,create_date:0"
+msgid "Creation date"
+msgstr "Erstellungsdatum"
+
+msgctxt "field:timesheet.hours_employee,create_uid:0"
+msgid "Creation user"
+msgstr "Ersteller"
+
+msgctxt "field:timesheet.hours_employee,employee:0"
+msgid "Employee"
+msgstr "Mitarbeiter"
+
+msgctxt "field:timesheet.hours_employee,hours:0"
+msgid "Hours"
+msgstr "Stunden"
+
+msgctxt "field:timesheet.hours_employee,id:0"
+msgid "ID"
+msgstr "ID"
+
+msgctxt "field:timesheet.hours_employee,rec_name:0"
+msgid "Name"
+msgstr "Name"
+
+msgctxt "field:timesheet.hours_employee,write_date:0"
+msgid "Last modification date"
+msgstr "Zuletzt geändert am"
+
+msgctxt "field:timesheet.hours_employee,write_uid:0"
+msgid "Last modification by"
+msgstr "Zuletzt geändert von"
+
+msgctxt "field:timesheet.hours_employee_monthly,create_date:0"
+msgid "Creation date"
+msgstr "Erstellungsdatum"
+
+msgctxt "field:timesheet.hours_employee_monthly,create_uid:0"
+msgid "Creation user"
+msgstr "Ersteller"
+
+msgctxt "field:timesheet.hours_employee_monthly,employee:0"
+msgid "Employee"
+msgstr "Mitarbeiter"
+
+msgctxt "field:timesheet.hours_employee_monthly,hours:0"
+msgid "Hours"
+msgstr "Stunden"
+
+msgctxt "field:timesheet.hours_employee_monthly,id:0"
+msgid "ID"
+msgstr "ID"
+
+msgctxt "field:timesheet.hours_employee_monthly,month:0"
+msgid "Month"
+msgstr "Monat"
+
+msgctxt "field:timesheet.hours_employee_monthly,rec_name:0"
+msgid "Name"
+msgstr "Name"
+
+msgctxt "field:timesheet.hours_employee_monthly,write_date:0"
+msgid "Last modification date"
+msgstr "Zuletzt geändert am"
+
+msgctxt "field:timesheet.hours_employee_monthly,write_uid:0"
+msgid "Last modification by"
+msgstr "Zuletzt geändert von"
+
+msgctxt "field:timesheet.hours_employee_monthly,year:0"
+msgid "Year"
+msgstr "Jahr"
+
+msgctxt "field:timesheet.hours_employee_weekly,create_date:0"
+msgid "Creation date"
+msgstr "Erstellungsdatum"
+
+msgctxt "field:timesheet.hours_employee_weekly,create_uid:0"
+msgid "Creation user"
+msgstr "Ersteller"
+
+msgctxt "field:timesheet.hours_employee_weekly,employee:0"
+msgid "Employee"
+msgstr "Mitarbeiter"
+
+msgctxt "field:timesheet.hours_employee_weekly,hours:0"
+msgid "Hours"
+msgstr "Stunden"
+
+msgctxt "field:timesheet.hours_employee_weekly,id:0"
+msgid "ID"
+msgstr "ID"
+
+msgctxt "field:timesheet.hours_employee_weekly,rec_name:0"
+msgid "Name"
+msgstr "Name"
+
+msgctxt "field:timesheet.hours_employee_weekly,week:0"
+msgid "Week"
+msgstr "Woche"
+
+msgctxt "field:timesheet.hours_employee_weekly,write_date:0"
+msgid "Last modification date"
+msgstr "Zuletzt geändert am"
+
+msgctxt "field:timesheet.hours_employee_weekly,write_uid:0"
+msgid "Last modification by"
+msgstr "Zuletzt geändert von"
+
+msgctxt "field:timesheet.hours_employee_weekly,year:0"
+msgid "Year"
+msgstr "Jahr"
+
+msgctxt "field:timesheet.line,create_date:0"
+msgid "Creation date"
+msgstr "Erstellungsdatum"
+
+msgctxt "field:timesheet.line,create_uid:0"
+msgid "Creation user"
+msgstr "Ersteller"
+
+msgctxt "field:timesheet.line,date:0"
+msgid "Date"
+msgstr "Datum"
+
+msgctxt "field:timesheet.line,description:0"
+msgid "Description"
+msgstr "Beschreibung"
+
+msgctxt "field:timesheet.line,employee:0"
+msgid "Employee"
+msgstr "Mitarbeiter"
+
+msgctxt "field:timesheet.line,hours:0"
+msgid "Hours"
+msgstr "Stunden"
+
+msgctxt "field:timesheet.line,id:0"
+msgid "ID"
+msgstr "ID"
+
+msgctxt "field:timesheet.line,rec_name:0"
+msgid "Name"
+msgstr "Name"
+
+msgctxt "field:timesheet.line,work:0"
+msgid "Work"
+msgstr "Aufgabe"
+
+msgctxt "field:timesheet.line,write_date:0"
+msgid "Last modification date"
+msgstr "Zuletzt geändert am"
+
+msgctxt "field:timesheet.line,write_uid:0"
+msgid "Last modification by"
+msgstr "Zuletzt geändert von"
+
+msgctxt "field:timesheet.open_hours_employee.init,end_date:0"
+msgid "End Date"
+msgstr "Enddatum"
+
+msgctxt "field:timesheet.open_hours_employee.init,start_date:0"
+msgid "Start Date"
+msgstr "Anfangsdatum"
+
+msgctxt "field:timesheet.work,active:0"
+msgid "Active"
+msgstr "Aktiv"
+
+msgctxt "field:timesheet.work,children:0"
+msgid "Children"
+msgstr "Untergeordnet (Aufgaben)"
+
+msgctxt "field:timesheet.work,company:0"
+msgid "Company"
+msgstr "Unternehmen"
+
+msgctxt "field:timesheet.work,create_date:0"
+msgid "Creation date"
+msgstr "Erstellungsdatum"
+
+msgctxt "field:timesheet.work,create_uid:0"
+msgid "Creation user"
+msgstr "Ersteller"
+
+msgctxt "field:timesheet.work,hours:0"
+msgid "Timesheet Hours"
+msgstr "Stunden"
+
+msgctxt "field:timesheet.work,id:0"
+msgid "ID"
+msgstr "ID"
+
+msgctxt "field:timesheet.work,left:0"
+msgid "Left"
+msgstr "Links"
+
+msgctxt "field:timesheet.work,name:0"
+msgid "Name"
+msgstr "Name"
+
+msgctxt "field:timesheet.work,parent:0"
+msgid "Parent"
+msgstr "Übergeordnet (Aufgabe)"
+
+msgctxt "field:timesheet.work,rec_name:0"
+msgid "Name"
+msgstr "Name"
+
+msgctxt "field:timesheet.work,right:0"
+msgid "Right"
+msgstr "Rechts"
+
+msgctxt "field:timesheet.work,timesheet_available:0"
+msgid "Available on timesheets"
+msgstr "Verfügbar für Zeiterfassung"
+
+msgctxt "field:timesheet.work,timesheet_lines:0"
+msgid ""
+msgstr ""
+
+msgctxt "field:timesheet.work,write_date:0"
+msgid "Last modification date"
+msgstr "Zuletzt geändert am"
+
+msgctxt "field:timesheet.work,write_uid:0"
+msgid "Last modification by"
+msgstr "Zuletzt geändert von"
+
+msgctxt "field:timesheet.work.open.init,from_date:0"
+msgid "From Date"
+msgstr "Von"
+
+msgctxt "field:timesheet.work.open.init,to_date:0"
+msgid "To Date"
+msgstr "Bis"
+
+msgctxt "help:timesheet.work,hours:0"
+msgid "Total time spent on this work"
+msgstr "Gesamtzeit für diese Arbeit"
+
+msgctxt "help:timesheet.work,timesheet_available:0"
+msgid "Allow to fill in timesheets with this work"
+msgstr "Diese Arbeit für den Eintrag in Zeiterfassungen freigeben"
+
+msgctxt "model:ir.action,name:act_enter_lines"
+msgid "Enter Timesheet"
+msgstr "Zur Zeiterfassung"
+
+msgctxt "model:ir.action,name:act_hours_employee_form"
+msgid "Hours per Employee"
+msgstr "Stunden pro Mitarbeiter"
+
+msgctxt "model:ir.action,name:act_hours_employee_monthly_form"
+msgid "Hours per Employee per Month"
+msgstr "Stunden pro Mitarbeiter pro Monat"
+
+msgctxt "model:ir.action,name:act_hours_employee_weekly_form"
+msgid "Hours per Employee per Week"
+msgstr "Stunden pro Mitarbeiter pro Monat"
+
+msgctxt "model:ir.action,name:act_line_form"
+msgid "Timesheet Lines"
+msgstr "Zeitpositionen"
+
+msgctxt "model:ir.action,name:act_open_hours_employee"
+msgid "Hours per Employee"
+msgstr "Stunden pro Mitarbeiter"
+
+msgctxt "model:ir.action,name:act_open_work"
+msgid "Hours per Work"
+msgstr "Stunden pro Aufgabe"
+
+msgctxt "model:ir.action,name:act_open_work_graph"
+msgid "Hours per Work"
+msgstr "Stunden pro Aufgabe"
+
+msgctxt "model:ir.action,name:act_work_form2"
+msgid "Hours per Work"
+msgstr "Stunden pro Aufgabe"
+
+msgctxt "model:ir.action,name:act_work_form3"
+msgid "Hours per Work"
+msgstr "Stunden pro Aufgabe"
+
+msgctxt "model:ir.action,name:act_work_hours_board"
+msgid "Hours per Work"
+msgstr "Stunden pro Aufgabe"
+
+msgctxt "model:ir.action,name:act_work_list"
+msgid "Works"
+msgstr "Aufgaben"
+
+msgctxt "model:ir.action,name:act_work_tree"
+msgid "Works"
+msgstr "Aufgaben"
+
+msgctxt "model:ir.action,name:act_work_tree2"
+msgid "Works"
+msgstr "Aufgaben"
+
+msgctxt "model:ir.ui.menu,name:menu_configuration"
+msgid "Configuration"
+msgstr "Einstellungen"
+
+msgctxt "model:ir.ui.menu,name:menu_enter_lines"
+msgid "Enter Timesheet"
+msgstr "Zur Zeiterfassung"
+
+msgctxt "model:ir.ui.menu,name:menu_line_form"
+msgid "Timesheet Lines"
+msgstr "Zeitpositionen"
+
+msgctxt "model:ir.ui.menu,name:menu_open_hours_employee"
+msgid "Hours per Employee"
+msgstr "Stunden pro Mitarbeiter"
+
+msgctxt "model:ir.ui.menu,name:menu_open_hours_employee_monthly"
+msgid "Hours per Employee per Month"
+msgstr "Stunden pro Mitarbeiter pro Monat"
+
+msgctxt "model:ir.ui.menu,name:menu_open_hours_employee_weekly"
+msgid "Hours per Employee per Week"
+msgstr "Stunden pro Mitarbeiter pro Woche"
+
+msgctxt "model:ir.ui.menu,name:menu_reporting"
+msgid "Reporting"
+msgstr "Auswertungen"
+
+msgctxt "model:ir.ui.menu,name:menu_timesheet"
+msgid "Timesheet"
+msgstr "Zeiterfassung"
+
+msgctxt "model:ir.ui.menu,name:menu_work_list"
+msgid "Works"
+msgstr "Aufgaben"
+
+msgctxt "model:ir.ui.menu,name:menu_work_tree"
+msgid "Works"
+msgstr "Aufgaben"
+
+msgctxt "model:ir.ui.menu,name:menu_work_tree2"
+msgid "Hours per Work"
+msgstr "Stunden pro Aufgabe"
+
+msgctxt "model:res.group,name:group_timesheet_admin"
+msgid "Timesheet Administration"
+msgstr "Zeiterfassung Administration"
+
+msgctxt "model:timesheet.enter_lines.init,name:0"
+msgid "Enter Lines Init"
+msgstr "Eingabe Zeitposition Init"
+
+msgctxt "model:timesheet.hours_employee,name:0"
+msgid "Hours per Employee"
+msgstr "Stunden pro Mitarbeiter"
+
+msgctxt "model:timesheet.hours_employee_monthly,name:0"
+msgid "Hours per Employee per Month"
+msgstr "Stunden pro Mitarbeiter und Monat"
+
+msgctxt "model:timesheet.hours_employee_weekly,name:0"
+msgid "Hours per Employee per Week"
+msgstr "Stunden pro Mitarbeiter und Woche"
+
+msgctxt "model:timesheet.line,name:0"
+msgid "Timesheet Line"
+msgstr "Zeitposition"
+
+msgctxt "model:timesheet.open_hours_employee.init,name:0"
+msgid "Open Hours Employee Init"
+msgstr "Stunden Mitarbeiter Öffnen Init"
+
+msgctxt "model:timesheet.work,name:0"
+msgid "Work"
+msgstr "Aufgabe"
+
+msgctxt "model:timesheet.work.open.init,name:0"
+msgid "Open Work Init"
+msgstr "Aufgabe Öffnen Init"
+
+msgctxt "view:timesheet.enter_lines.init:0"
+msgid "Enter Timesheet"
+msgstr "Zur Zeiterfassung"
+
+msgctxt "view:timesheet.hours_employee:0"
+msgid "Hours"
+msgstr "Stunden"
+
+msgctxt "view:timesheet.hours_employee:0"
+msgid "Hours per Employee"
+msgstr "Stunden pro Mitarbeiter"
+
+msgctxt "view:timesheet.hours_employee_monthly:0"
+msgid "Hours per Employee per Month"
+msgstr "Stunden pro Mitarbeiter pro Monat"
+
+msgctxt "view:timesheet.hours_employee_weekly:0"
+msgid "Hours per Employee per Week"
+msgstr "Stunden pro Mitarbeiter pro Woche"
+
+msgctxt "view:timesheet.line:0"
+msgid "Hours"
+msgstr "Stunden"
+
+msgctxt "view:timesheet.line:0"
+msgid "Timesheet Line"
+msgstr "Zeitposition"
+
+msgctxt "view:timesheet.line:0"
+msgid "Timesheet Lines"
+msgstr "Zeitpositionen"
+
+msgctxt "view:timesheet.open_hours_employee.init:0"
+msgid "Hours per Employee"
+msgstr "Stunden pro Mitarbeiter"
+
+msgctxt "view:timesheet.work.open.init:0"
+msgid "Hours per Work"
+msgstr "Stunden pro Aufgabe"
+
+msgctxt "view:timesheet.work:0"
+msgid "Hours per Work"
+msgstr "Stunden pro Aufgabe"
+
+msgctxt "view:timesheet.work:0"
+msgid "Work"
+msgstr "Aufgabe"
+
+msgctxt "view:timesheet.work:0"
+msgid "Works"
+msgstr "Aufgaben"
+
+msgctxt "wizard_button:timesheet.enter_lines,init,end:0"
+msgid "Cancel"
+msgstr "Abbrechen"
+
+msgctxt "wizard_button:timesheet.enter_lines,init,enter:0"
+msgid "Enter"
+msgstr "Zur Eingabe"
+
+msgctxt "wizard_button:timesheet.open_hours_employee,init,end:0"
+msgid "Cancel"
+msgstr "Abbrechen"
+
+msgctxt "wizard_button:timesheet.open_hours_employee,init,open:0"
+msgid "Open"
+msgstr "Öffnen"
+
+msgctxt "wizard_button:timesheet.work.open,init,end:0"
+msgid "Cancel"
+msgstr "Abbrechen"
+
+msgctxt "wizard_button:timesheet.work.open,init,open:0"
+msgid "Open"
+msgstr "Öffnen"
+
+msgctxt "wizard_button:timesheet.work.open2,init,end:0"
+msgid "Cancel"
+msgstr "Abbrechen"
+
+msgctxt "wizard_button:timesheet.work.open2,init,open:0"
+msgid "Open"
+msgstr "Öffnen"
diff --git a/locale/es_CO.po b/locale/es_CO.po
new file mode 100644
index 0000000..da48567
--- /dev/null
+++ b/locale/es_CO.po
@@ -0,0 +1,393 @@
+#
+msgid ""
+msgstr "Content-Type: text/plain; charset=utf-8\n"
+
+msgctxt "error:timesheet.line:0"
+msgid "Hours field must be positive"
+msgstr "El campo Horas debe ser positivo"
+
+msgctxt "error:timesheet.work:0"
+msgid "Every work must be in the same company as it's parent work!"
+msgstr ""
+"¡Cada trabajo debe estar en la misma compañía lo mismo que el trabajo que lo"
+" originó!"
+
+msgctxt "error:timesheet.work:0"
+msgid "You can not create recursive works!"
+msgstr "No puede crear trabajos recursivos!"
+
+msgctxt "field:timesheet.enter_lines.init,date:0"
+msgid "Date"
+msgstr "Fecha"
+
+msgctxt "field:timesheet.enter_lines.init,employee:0"
+msgid "Employee"
+msgstr "Empleado"
+
+msgctxt "field:timesheet.hours_employee,employee:0"
+msgid "Employee"
+msgstr "Empleado"
+
+msgctxt "field:timesheet.hours_employee,hours:0"
+msgid "Hours"
+msgstr "Horas"
+
+msgctxt "field:timesheet.hours_employee,rec_name:0"
+msgid "Name"
+msgstr "Nombre"
+
+msgctxt "field:timesheet.hours_employee_monthly,employee:0"
+msgid "Employee"
+msgstr "Empleado"
+
+msgctxt "field:timesheet.hours_employee_monthly,hours:0"
+msgid "Hours"
+msgstr "Horas"
+
+msgctxt "field:timesheet.hours_employee_monthly,month:0"
+msgid "Month"
+msgstr "Mes"
+
+msgctxt "field:timesheet.hours_employee_monthly,rec_name:0"
+msgid "Name"
+msgstr "Nombre"
+
+msgctxt "field:timesheet.hours_employee_monthly,year:0"
+msgid "Year"
+msgstr "Año"
+
+msgctxt "field:timesheet.hours_employee_weekly,employee:0"
+msgid "Employee"
+msgstr "Empleado"
+
+msgctxt "field:timesheet.hours_employee_weekly,hours:0"
+msgid "Hours"
+msgstr "Horas"
+
+msgctxt "field:timesheet.hours_employee_weekly,rec_name:0"
+msgid "Name"
+msgstr "Nombre"
+
+msgctxt "field:timesheet.hours_employee_weekly,week:0"
+msgid "Week"
+msgstr "Semana"
+
+msgctxt "field:timesheet.hours_employee_weekly,year:0"
+msgid "Year"
+msgstr "Año"
+
+msgctxt "field:timesheet.line,date:0"
+msgid "Date"
+msgstr "Fecha"
+
+msgctxt "field:timesheet.line,description:0"
+msgid "Description"
+msgstr "Descripción"
+
+msgctxt "field:timesheet.line,employee:0"
+msgid "Employee"
+msgstr "Empleado"
+
+msgctxt "field:timesheet.line,hours:0"
+msgid "Hours"
+msgstr "Horas"
+
+msgctxt "field:timesheet.line,rec_name:0"
+msgid "Name"
+msgstr "Nombre"
+
+msgctxt "field:timesheet.line,work:0"
+msgid "Work"
+msgstr "Trabajo"
+
+msgctxt "field:timesheet.open_hours_employee.init,end_date:0"
+msgid "End Date"
+msgstr "Fecha Final"
+
+msgctxt "field:timesheet.open_hours_employee.init,start_date:0"
+msgid "Start Date"
+msgstr "Fecha Inicial"
+
+msgctxt "field:timesheet.work,active:0"
+msgid "Active"
+msgstr "Activo"
+
+msgctxt "field:timesheet.work,children:0"
+msgid "Children"
+msgstr "Descendientes"
+
+msgctxt "field:timesheet.work,company:0"
+msgid "Company"
+msgstr "Compañía"
+
+msgctxt "field:timesheet.work,hours:0"
+msgid "Timesheet Hours"
+msgstr "Horas de Hoja de Tiempo"
+
+msgctxt "field:timesheet.work,left:0"
+msgid "Left"
+msgstr "Izquierda"
+
+msgctxt "field:timesheet.work,name:0"
+msgid "Name"
+msgstr "Nombre"
+
+msgctxt "field:timesheet.work,parent:0"
+msgid "Parent"
+msgstr "Padre"
+
+msgctxt "field:timesheet.work,rec_name:0"
+msgid "Name"
+msgstr "Nombre"
+
+msgctxt "field:timesheet.work,right:0"
+msgid "Right"
+msgstr "Derecha"
+
+msgctxt "field:timesheet.work,timesheet_available:0"
+msgid "Available on timesheets"
+msgstr "Disponibilidad en las hojas de tiempos"
+
+msgctxt "field:timesheet.work,timesheet_lines:0"
+msgid ""
+msgstr ""
+
+msgctxt "field:timesheet.work.open.init,from_date:0"
+msgid "From Date"
+msgstr "Fecha Inicial"
+
+msgctxt "field:timesheet.work.open.init,to_date:0"
+msgid "To Date"
+msgstr "A la Fecha"
+
+msgctxt "help:timesheet.work,hours:0"
+msgid "Total time spent on this work"
+msgstr "Tiempo total utilizado en este trabajo"
+
+msgctxt "help:timesheet.work,timesheet_available:0"
+msgid "Allow to fill in timesheets with this work"
+msgstr "Permitir llenar con este trabajo en la hoja de tiempos"
+
+msgctxt "model:ir.action,name:act_enter_lines"
+msgid "Enter Timesheet"
+msgstr "Adicionar Hoja de Tiempo"
+
+msgctxt "model:ir.action,name:act_hours_employee_form"
+msgid "Hours per Employee"
+msgstr "Horas por Empleado"
+
+msgctxt "model:ir.action,name:act_hours_employee_monthly_form"
+msgid "Hours per Employee per Month"
+msgstr "Horas por Empleado en el mes"
+
+msgctxt "model:ir.action,name:act_hours_employee_weekly_form"
+msgid "Hours per Employee per Week"
+msgstr "Horas por Empleado en la semana"
+
+msgctxt "model:ir.action,name:act_line_form"
+msgid "Timesheet Lines"
+msgstr "Lineas de Hoja de Tiempo"
+
+msgctxt "model:ir.action,name:act_open_hours_employee"
+msgid "Hours per Employee"
+msgstr "Horas por Empleado"
+
+msgctxt "model:ir.action,name:act_open_work"
+msgid "Hours per Work"
+msgstr "Horas por Trabajo"
+
+msgctxt "model:ir.action,name:act_open_work_graph"
+msgid "Hours per Work"
+msgstr "Horas por Trabajo"
+
+msgctxt "model:ir.action,name:act_work_form2"
+msgid "Hours per Work"
+msgstr "Horas por Trabajo"
+
+msgctxt "model:ir.action,name:act_work_form3"
+msgid "Hours per Work"
+msgstr "Horas por Trabajo"
+
+#, fuzzy
+msgctxt "model:ir.action,name:act_work_hours_board"
+msgid "Hours per Work"
+msgstr "Horas por Trabajo"
+
+#, fuzzy
+msgctxt "model:ir.action,name:act_work_list"
+msgid "Works"
+msgstr "Trabajos"
+
+msgctxt "model:ir.action,name:act_work_tree"
+msgid "Works"
+msgstr "Trabajos"
+
+msgctxt "model:ir.action,name:act_work_tree2"
+msgid "Works"
+msgstr "Trabajos"
+
+msgctxt "model:ir.ui.menu,name:menu_configuration"
+msgid "Configuration"
+msgstr "Configuración"
+
+msgctxt "model:ir.ui.menu,name:menu_enter_lines"
+msgid "Enter Timesheet"
+msgstr "Adicionar Hoja de Tiempo"
+
+msgctxt "model:ir.ui.menu,name:menu_line_form"
+msgid "Timesheet Lines"
+msgstr "Lineas de Hoja de Tiempo"
+
+msgctxt "model:ir.ui.menu,name:menu_open_hours_employee"
+msgid "Hours per Employee"
+msgstr "Horas por Empleado"
+
+msgctxt "model:ir.ui.menu,name:menu_open_hours_employee_monthly"
+msgid "Hours per Employee per Month"
+msgstr "Horas por Empleado en el mes"
+
+msgctxt "model:ir.ui.menu,name:menu_open_hours_employee_weekly"
+msgid "Hours per Employee per Week"
+msgstr "Horas por Empleado en la semana"
+
+msgctxt "model:ir.ui.menu,name:menu_reporting"
+msgid "Reporting"
+msgstr "Reportes"
+
+#, fuzzy
+msgctxt "model:ir.ui.menu,name:menu_timesheet"
+msgid "Timesheet"
+msgstr "Hoja de Tiempo"
+
+#, fuzzy
+msgctxt "model:ir.ui.menu,name:menu_work_list"
+msgid "Works"
+msgstr "Trabajos"
+
+msgctxt "model:ir.ui.menu,name:menu_work_tree"
+msgid "Works"
+msgstr "Trabajos"
+
+msgctxt "model:ir.ui.menu,name:menu_work_tree2"
+msgid "Hours per Work"
+msgstr "Horas por Trabajo"
+
+msgctxt "model:res.group,name:group_timesheet_admin"
+msgid "Timesheet Administration"
+msgstr "Administración de Hoja de tiempos"
+
+msgctxt "model:timesheet.enter_lines.init,name:0"
+msgid "Enter Lines Init"
+msgstr "Ingresar Líneas Inicio"
+
+msgctxt "model:timesheet.hours_employee,name:0"
+msgid "Hours per Employee"
+msgstr "Horas por Empleado"
+
+msgctxt "model:timesheet.hours_employee_monthly,name:0"
+msgid "Hours per Employee per Month"
+msgstr "Horas por Empleado en el mes"
+
+msgctxt "model:timesheet.hours_employee_weekly,name:0"
+msgid "Hours per Employee per Week"
+msgstr "Horas por Empleado en la semana"
+
+msgctxt "model:timesheet.line,name:0"
+msgid "Timesheet Line"
+msgstr "Linea de Hoja de Tiempo"
+
+msgctxt "model:timesheet.open_hours_employee.init,name:0"
+msgid "Open Hours Employee Init"
+msgstr "Horas de Apertura de Inicio de Empleado"
+
+msgctxt "model:timesheet.work,name:0"
+msgid "Work"
+msgstr "Trabajo"
+
+msgctxt "model:timesheet.work.open.init,name:0"
+msgid "Open Work Init"
+msgstr "Inicio de Apertura de Trabajo"
+
+msgctxt "view:timesheet.enter_lines.init:0"
+msgid "Enter Timesheet"
+msgstr "Adicionar Hoja de Tiempo"
+
+msgctxt "view:timesheet.hours_employee:0"
+msgid "Hours"
+msgstr "Horas"
+
+msgctxt "view:timesheet.hours_employee:0"
+msgid "Hours per Employee"
+msgstr "Horas por Empleado"
+
+msgctxt "view:timesheet.hours_employee_monthly:0"
+msgid "Hours per Employee per Month"
+msgstr "Horas por Empleado en el mes"
+
+msgctxt "view:timesheet.hours_employee_weekly:0"
+msgid "Hours per Employee per Week"
+msgstr "Horas por Empleado en la semana"
+
+msgctxt "view:timesheet.line:0"
+msgid "Hours"
+msgstr "Horas"
+
+msgctxt "view:timesheet.line:0"
+msgid "Timesheet Line"
+msgstr "Linea de Hoja de Tiempo"
+
+msgctxt "view:timesheet.line:0"
+msgid "Timesheet Lines"
+msgstr "Lineas de Hoja de Tiempo"
+
+msgctxt "view:timesheet.open_hours_employee.init:0"
+msgid "Hours per Employee"
+msgstr "Horas por Empleado"
+
+msgctxt "view:timesheet.work.open.init:0"
+msgid "Hours per Work"
+msgstr "Horas por Trabajo"
+
+msgctxt "view:timesheet.work:0"
+msgid "Hours per Work"
+msgstr "Horas por Trabajo"
+
+msgctxt "view:timesheet.work:0"
+msgid "Work"
+msgstr "Trabajo"
+
+msgctxt "view:timesheet.work:0"
+msgid "Works"
+msgstr "Trabajos"
+
+msgctxt "wizard_button:timesheet.enter_lines,init,end:0"
+msgid "Cancel"
+msgstr "Cancelar"
+
+msgctxt "wizard_button:timesheet.enter_lines,init,enter:0"
+msgid "Enter"
+msgstr "Entrar"
+
+msgctxt "wizard_button:timesheet.open_hours_employee,init,end:0"
+msgid "Cancel"
+msgstr "Cancelar"
+
+msgctxt "wizard_button:timesheet.open_hours_employee,init,open:0"
+msgid "Open"
+msgstr "Abrir"
+
+msgctxt "wizard_button:timesheet.work.open,init,end:0"
+msgid "Cancel"
+msgstr "Cancelar"
+
+msgctxt "wizard_button:timesheet.work.open,init,open:0"
+msgid "Open"
+msgstr "Abrir"
+
+msgctxt "wizard_button:timesheet.work.open2,init,end:0"
+msgid "Cancel"
+msgstr "Cancelar"
+
+msgctxt "wizard_button:timesheet.work.open2,init,open:0"
+msgid "Open"
+msgstr "Abrir"
diff --git a/locale/es_ES.po b/locale/es_ES.po
new file mode 100644
index 0000000..48728c7
--- /dev/null
+++ b/locale/es_ES.po
@@ -0,0 +1,391 @@
+#
+msgid ""
+msgstr "Content-Type: text/plain; charset=utf-8\n"
+
+msgctxt "error:timesheet.line:0"
+msgid "Hours field must be positive"
+msgstr "El campo de horas debe ser positivo"
+
+msgctxt "error:timesheet.work:0"
+msgid "Every work must be in the same company as it's parent work!"
+msgstr "Cada trabajo debe estar en la misma empresa que su trabajo padre"
+
+msgctxt "error:timesheet.work:0"
+msgid "You can not create recursive works!"
+msgstr "No puede crear trabajos recursivos"
+
+msgctxt "field:timesheet.enter_lines.init,date:0"
+msgid "Date"
+msgstr "Fecha"
+
+msgctxt "field:timesheet.enter_lines.init,employee:0"
+msgid "Employee"
+msgstr "Empleado"
+
+msgctxt "field:timesheet.hours_employee,employee:0"
+msgid "Employee"
+msgstr "Empleado"
+
+msgctxt "field:timesheet.hours_employee,hours:0"
+msgid "Hours"
+msgstr "Horas"
+
+msgctxt "field:timesheet.hours_employee,rec_name:0"
+msgid "Name"
+msgstr "Nombre"
+
+msgctxt "field:timesheet.hours_employee_monthly,employee:0"
+msgid "Employee"
+msgstr "Empleado"
+
+msgctxt "field:timesheet.hours_employee_monthly,hours:0"
+msgid "Hours"
+msgstr "Horas"
+
+msgctxt "field:timesheet.hours_employee_monthly,month:0"
+msgid "Month"
+msgstr "Mes"
+
+msgctxt "field:timesheet.hours_employee_monthly,rec_name:0"
+msgid "Name"
+msgstr "Nombre"
+
+msgctxt "field:timesheet.hours_employee_monthly,year:0"
+msgid "Year"
+msgstr "Año"
+
+msgctxt "field:timesheet.hours_employee_weekly,employee:0"
+msgid "Employee"
+msgstr "Empleado"
+
+msgctxt "field:timesheet.hours_employee_weekly,hours:0"
+msgid "Hours"
+msgstr "Horas"
+
+msgctxt "field:timesheet.hours_employee_weekly,rec_name:0"
+msgid "Name"
+msgstr "Nombre"
+
+msgctxt "field:timesheet.hours_employee_weekly,week:0"
+msgid "Week"
+msgstr "Semana"
+
+msgctxt "field:timesheet.hours_employee_weekly,year:0"
+msgid "Year"
+msgstr "Año"
+
+msgctxt "field:timesheet.line,date:0"
+msgid "Date"
+msgstr "Fecha"
+
+msgctxt "field:timesheet.line,description:0"
+msgid "Description"
+msgstr "Descripción"
+
+msgctxt "field:timesheet.line,employee:0"
+msgid "Employee"
+msgstr "Empleado"
+
+msgctxt "field:timesheet.line,hours:0"
+msgid "Hours"
+msgstr "Horas"
+
+msgctxt "field:timesheet.line,rec_name:0"
+msgid "Name"
+msgstr "Nombre"
+
+msgctxt "field:timesheet.line,work:0"
+msgid "Work"
+msgstr "Trabajo"
+
+msgctxt "field:timesheet.open_hours_employee.init,end_date:0"
+msgid "End Date"
+msgstr "Fecha final"
+
+msgctxt "field:timesheet.open_hours_employee.init,start_date:0"
+msgid "Start Date"
+msgstr "Fecha inicial"
+
+msgctxt "field:timesheet.work,active:0"
+msgid "Active"
+msgstr "Activo"
+
+msgctxt "field:timesheet.work,children:0"
+msgid "Children"
+msgstr "Hijos"
+
+msgctxt "field:timesheet.work,company:0"
+msgid "Company"
+msgstr "Empresa"
+
+msgctxt "field:timesheet.work,hours:0"
+msgid "Timesheet Hours"
+msgstr "Horas del parte de trabajo"
+
+msgctxt "field:timesheet.work,left:0"
+msgid "Left"
+msgstr "Izquierda"
+
+msgctxt "field:timesheet.work,name:0"
+msgid "Name"
+msgstr "Nombre"
+
+msgctxt "field:timesheet.work,parent:0"
+msgid "Parent"
+msgstr "Padre"
+
+msgctxt "field:timesheet.work,rec_name:0"
+msgid "Name"
+msgstr "Nombre"
+
+msgctxt "field:timesheet.work,right:0"
+msgid "Right"
+msgstr "Derecha"
+
+msgctxt "field:timesheet.work,timesheet_available:0"
+msgid "Available on timesheets"
+msgstr "Disponible en partes de trabajo"
+
+msgctxt "field:timesheet.work,timesheet_lines:0"
+msgid ""
+msgstr ""
+
+msgctxt "field:timesheet.work.open.init,from_date:0"
+msgid "From Date"
+msgstr "Desde la fecha"
+
+msgctxt "field:timesheet.work.open.init,to_date:0"
+msgid "To Date"
+msgstr "A la fecha"
+
+msgctxt "help:timesheet.work,hours:0"
+msgid "Total time spent on this work"
+msgstr "Tiempo total empleado en este trabajo"
+
+msgctxt "help:timesheet.work,timesheet_available:0"
+msgid "Allow to fill in timesheets with this work"
+msgstr "Permite completar partes de trabajo con este trabajo"
+
+msgctxt "model:ir.action,name:act_enter_lines"
+msgid "Enter Timesheet"
+msgstr "Introducir parte de trabajo"
+
+msgctxt "model:ir.action,name:act_hours_employee_form"
+msgid "Hours per Employee"
+msgstr "Horas por empleado"
+
+msgctxt "model:ir.action,name:act_hours_employee_monthly_form"
+msgid "Hours per Employee per Month"
+msgstr "Horas por empleado y mes"
+
+msgctxt "model:ir.action,name:act_hours_employee_weekly_form"
+msgid "Hours per Employee per Week"
+msgstr "Horas por empleado y semana"
+
+msgctxt "model:ir.action,name:act_line_form"
+msgid "Timesheet Lines"
+msgstr "Líneas del parte de trabajo"
+
+msgctxt "model:ir.action,name:act_open_hours_employee"
+msgid "Hours per Employee"
+msgstr "Horas por empleado"
+
+msgctxt "model:ir.action,name:act_open_work"
+msgid "Hours per Work"
+msgstr "Horas por trabajo"
+
+msgctxt "model:ir.action,name:act_open_work_graph"
+msgid "Hours per Work"
+msgstr "Horas por trabajo"
+
+msgctxt "model:ir.action,name:act_work_form2"
+msgid "Hours per Work"
+msgstr "Horas por trabajo"
+
+msgctxt "model:ir.action,name:act_work_form3"
+msgid "Hours per Work"
+msgstr "Horas por trabajo"
+
+#, fuzzy
+msgctxt "model:ir.action,name:act_work_hours_board"
+msgid "Hours per Work"
+msgstr "Horas por trabajo"
+
+#, fuzzy
+msgctxt "model:ir.action,name:act_work_list"
+msgid "Works"
+msgstr "Trabajos"
+
+msgctxt "model:ir.action,name:act_work_tree"
+msgid "Works"
+msgstr "Trabajos"
+
+msgctxt "model:ir.action,name:act_work_tree2"
+msgid "Works"
+msgstr "Trabajos"
+
+msgctxt "model:ir.ui.menu,name:menu_configuration"
+msgid "Configuration"
+msgstr "Configuración"
+
+msgctxt "model:ir.ui.menu,name:menu_enter_lines"
+msgid "Enter Timesheet"
+msgstr "Introducir parte de trabajo"
+
+msgctxt "model:ir.ui.menu,name:menu_line_form"
+msgid "Timesheet Lines"
+msgstr "Lineas de parte de trabajo"
+
+msgctxt "model:ir.ui.menu,name:menu_open_hours_employee"
+msgid "Hours per Employee"
+msgstr "Horas por empleado"
+
+msgctxt "model:ir.ui.menu,name:menu_open_hours_employee_monthly"
+msgid "Hours per Employee per Month"
+msgstr "Horas por empleado y mes"
+
+msgctxt "model:ir.ui.menu,name:menu_open_hours_employee_weekly"
+msgid "Hours per Employee per Week"
+msgstr "Horas por empleado y semana"
+
+msgctxt "model:ir.ui.menu,name:menu_reporting"
+msgid "Reporting"
+msgstr "Informes"
+
+#, fuzzy
+msgctxt "model:ir.ui.menu,name:menu_timesheet"
+msgid "Timesheet"
+msgstr "Gestión de parte de trabajo"
+
+#, fuzzy
+msgctxt "model:ir.ui.menu,name:menu_work_list"
+msgid "Works"
+msgstr "Trabajos"
+
+msgctxt "model:ir.ui.menu,name:menu_work_tree"
+msgid "Works"
+msgstr "Trabajos"
+
+msgctxt "model:ir.ui.menu,name:menu_work_tree2"
+msgid "Hours per Work"
+msgstr "Horas por trabajo"
+
+msgctxt "model:res.group,name:group_timesheet_admin"
+msgid "Timesheet Administration"
+msgstr "Administración de parte de trabajo"
+
+msgctxt "model:timesheet.enter_lines.init,name:0"
+msgid "Enter Lines Init"
+msgstr "Inicializa la introducción de líneas"
+
+msgctxt "model:timesheet.hours_employee,name:0"
+msgid "Hours per Employee"
+msgstr "Horas por empleado"
+
+msgctxt "model:timesheet.hours_employee_monthly,name:0"
+msgid "Hours per Employee per Month"
+msgstr "Horas por empleado y mes"
+
+msgctxt "model:timesheet.hours_employee_weekly,name:0"
+msgid "Hours per Employee per Week"
+msgstr "Horas por empleado y semana"
+
+msgctxt "model:timesheet.line,name:0"
+msgid "Timesheet Line"
+msgstr "Linea de parte de trabajo"
+
+msgctxt "model:timesheet.open_hours_employee.init,name:0"
+msgid "Open Hours Employee Init"
+msgstr "Inicializa la apertura de horas de empleado"
+
+msgctxt "model:timesheet.work,name:0"
+msgid "Work"
+msgstr "Trabajo"
+
+msgctxt "model:timesheet.work.open.init,name:0"
+msgid "Open Work Init"
+msgstr "Inicializa la apertura de un trabajo"
+
+msgctxt "view:timesheet.enter_lines.init:0"
+msgid "Enter Timesheet"
+msgstr "Introducir parte de trabajo"
+
+msgctxt "view:timesheet.hours_employee:0"
+msgid "Hours"
+msgstr "Horas"
+
+msgctxt "view:timesheet.hours_employee:0"
+msgid "Hours per Employee"
+msgstr "Horas por empleado"
+
+msgctxt "view:timesheet.hours_employee_monthly:0"
+msgid "Hours per Employee per Month"
+msgstr "Horas por empleado y mes"
+
+msgctxt "view:timesheet.hours_employee_weekly:0"
+msgid "Hours per Employee per Week"
+msgstr "Horas por empleado y semana"
+
+msgctxt "view:timesheet.line:0"
+msgid "Hours"
+msgstr "Horas"
+
+msgctxt "view:timesheet.line:0"
+msgid "Timesheet Line"
+msgstr "Linea de parte de trabajo"
+
+msgctxt "view:timesheet.line:0"
+msgid "Timesheet Lines"
+msgstr "Lineas de parte de trabajo"
+
+msgctxt "view:timesheet.open_hours_employee.init:0"
+msgid "Hours per Employee"
+msgstr "Horas por empleado"
+
+msgctxt "view:timesheet.work.open.init:0"
+msgid "Hours per Work"
+msgstr "Horas por trabajo"
+
+msgctxt "view:timesheet.work:0"
+msgid "Hours per Work"
+msgstr "Horas por trabajo"
+
+msgctxt "view:timesheet.work:0"
+msgid "Work"
+msgstr "Trabajo"
+
+msgctxt "view:timesheet.work:0"
+msgid "Works"
+msgstr "Trabajos"
+
+msgctxt "wizard_button:timesheet.enter_lines,init,end:0"
+msgid "Cancel"
+msgstr "Cancelar"
+
+msgctxt "wizard_button:timesheet.enter_lines,init,enter:0"
+msgid "Enter"
+msgstr "Entrar"
+
+msgctxt "wizard_button:timesheet.open_hours_employee,init,end:0"
+msgid "Cancel"
+msgstr "Cancelar"
+
+msgctxt "wizard_button:timesheet.open_hours_employee,init,open:0"
+msgid "Open"
+msgstr "Abrir"
+
+msgctxt "wizard_button:timesheet.work.open,init,end:0"
+msgid "Cancel"
+msgstr "Cancelar"
+
+msgctxt "wizard_button:timesheet.work.open,init,open:0"
+msgid "Open"
+msgstr "Abrir"
+
+msgctxt "wizard_button:timesheet.work.open2,init,end:0"
+msgid "Cancel"
+msgstr "Cancelar"
+
+msgctxt "wizard_button:timesheet.work.open2,init,open:0"
+msgid "Open"
+msgstr "Abrir"
diff --git a/locale/fr_FR.po b/locale/fr_FR.po
new file mode 100644
index 0000000..d30963b
--- /dev/null
+++ b/locale/fr_FR.po
@@ -0,0 +1,388 @@
+#
+msgid ""
+msgstr "Content-Type: text/plain; charset=utf-8\n"
+
+msgctxt "error:timesheet.line:0"
+msgid "Hours field must be positive"
+msgstr "Le champ Heures doit être positif"
+
+msgctxt "error:timesheet.work:0"
+msgid "Every work must be in the same company as it's parent work!"
+msgstr ""
+"Chaque activité doit être dans la même société que son activité parente !"
+
+msgctxt "error:timesheet.work:0"
+msgid "You can not create recursive works!"
+msgstr "Vous ne pouvez pas créer des activités récursives!"
+
+msgctxt "field:timesheet.enter_lines.init,date:0"
+msgid "Date"
+msgstr "Date"
+
+msgctxt "field:timesheet.enter_lines.init,employee:0"
+msgid "Employee"
+msgstr "Employé"
+
+msgctxt "field:timesheet.hours_employee,employee:0"
+msgid "Employee"
+msgstr "Employé"
+
+msgctxt "field:timesheet.hours_employee,hours:0"
+msgid "Hours"
+msgstr "Heures"
+
+msgctxt "field:timesheet.hours_employee,rec_name:0"
+msgid "Name"
+msgstr "Nom"
+
+msgctxt "field:timesheet.hours_employee_monthly,employee:0"
+msgid "Employee"
+msgstr "Employé"
+
+msgctxt "field:timesheet.hours_employee_monthly,hours:0"
+msgid "Hours"
+msgstr "Heures"
+
+msgctxt "field:timesheet.hours_employee_monthly,month:0"
+msgid "Month"
+msgstr "Mois"
+
+msgctxt "field:timesheet.hours_employee_monthly,rec_name:0"
+msgid "Name"
+msgstr "Nom"
+
+msgctxt "field:timesheet.hours_employee_monthly,year:0"
+msgid "Year"
+msgstr "Année"
+
+msgctxt "field:timesheet.hours_employee_weekly,employee:0"
+msgid "Employee"
+msgstr "Employé"
+
+msgctxt "field:timesheet.hours_employee_weekly,hours:0"
+msgid "Hours"
+msgstr "Heures"
+
+msgctxt "field:timesheet.hours_employee_weekly,rec_name:0"
+msgid "Name"
+msgstr "Nom"
+
+msgctxt "field:timesheet.hours_employee_weekly,week:0"
+msgid "Week"
+msgstr "Semaine"
+
+msgctxt "field:timesheet.hours_employee_weekly,year:0"
+msgid "Year"
+msgstr "Année"
+
+msgctxt "field:timesheet.line,date:0"
+msgid "Date"
+msgstr "Date"
+
+msgctxt "field:timesheet.line,description:0"
+msgid "Description"
+msgstr "Description"
+
+msgctxt "field:timesheet.line,employee:0"
+msgid "Employee"
+msgstr "Employé"
+
+msgctxt "field:timesheet.line,hours:0"
+msgid "Hours"
+msgstr "Heures"
+
+msgctxt "field:timesheet.line,rec_name:0"
+msgid "Name"
+msgstr "Nom"
+
+msgctxt "field:timesheet.line,work:0"
+msgid "Work"
+msgstr "Travail"
+
+msgctxt "field:timesheet.open_hours_employee.init,end_date:0"
+msgid "End Date"
+msgstr "Date de fin"
+
+msgctxt "field:timesheet.open_hours_employee.init,start_date:0"
+msgid "Start Date"
+msgstr "Date de début"
+
+msgctxt "field:timesheet.work,active:0"
+msgid "Active"
+msgstr "Actif"
+
+msgctxt "field:timesheet.work,children:0"
+msgid "Children"
+msgstr "Enfants"
+
+msgctxt "field:timesheet.work,company:0"
+msgid "Company"
+msgstr "Société"
+
+msgctxt "field:timesheet.work,hours:0"
+msgid "Timesheet Hours"
+msgstr "Heures"
+
+msgctxt "field:timesheet.work,left:0"
+msgid "Left"
+msgstr "Gauche"
+
+msgctxt "field:timesheet.work,name:0"
+msgid "Name"
+msgstr "Nom"
+
+msgctxt "field:timesheet.work,parent:0"
+msgid "Parent"
+msgstr "Parent"
+
+msgctxt "field:timesheet.work,rec_name:0"
+msgid "Name"
+msgstr "Nom"
+
+msgctxt "field:timesheet.work,right:0"
+msgid "Right"
+msgstr "Droite"
+
+msgctxt "field:timesheet.work,timesheet_available:0"
+msgid "Available on timesheets"
+msgstr "Disponible sur les feuilles de présence"
+
+msgctxt "field:timesheet.work,timesheet_lines:0"
+msgid ""
+msgstr ""
+
+msgctxt "field:timesheet.work.open.init,from_date:0"
+msgid "From Date"
+msgstr "Date de début"
+
+msgctxt "field:timesheet.work.open.init,to_date:0"
+msgid "To Date"
+msgstr "Date de fin"
+
+msgctxt "help:timesheet.work,hours:0"
+msgid "Total time spent on this work"
+msgstr "Temps total passé sur cette activité"
+
+msgctxt "help:timesheet.work,timesheet_available:0"
+msgid "Allow to fill in timesheets with this work"
+msgstr "Autoriser cette activité sur les feuilles de présence"
+
+msgctxt "model:ir.action,name:act_enter_lines"
+msgid "Enter Timesheet"
+msgstr "Entrez feuille de présence"
+
+msgctxt "model:ir.action,name:act_hours_employee_form"
+msgid "Hours per Employee"
+msgstr "Heures par employé"
+
+msgctxt "model:ir.action,name:act_hours_employee_monthly_form"
+msgid "Hours per Employee per Month"
+msgstr "Nombre d'heures par employé par mois"
+
+msgctxt "model:ir.action,name:act_hours_employee_weekly_form"
+msgid "Hours per Employee per Week"
+msgstr "Nombre d'heures par employé par semaine"
+
+msgctxt "model:ir.action,name:act_line_form"
+msgid "Timesheet Lines"
+msgstr "Lignes de feuille de présence"
+
+msgctxt "model:ir.action,name:act_open_hours_employee"
+msgid "Hours per Employee"
+msgstr "Heures par employé"
+
+msgctxt "model:ir.action,name:act_open_work"
+msgid "Hours per Work"
+msgstr "Heures par activité"
+
+msgctxt "model:ir.action,name:act_open_work_graph"
+msgid "Hours per Work"
+msgstr "Heures par activité"
+
+msgctxt "model:ir.action,name:act_work_form2"
+msgid "Hours per Work"
+msgstr "Heures par activité"
+
+msgctxt "model:ir.action,name:act_work_form3"
+msgid "Hours per Work"
+msgstr "Heures par activité"
+
+msgctxt "model:ir.action,name:act_work_hours_board"
+msgid "Hours per Work"
+msgstr "Heures par activité"
+
+msgctxt "model:ir.action,name:act_work_list"
+msgid "Works"
+msgstr "Travaux"
+
+msgctxt "model:ir.action,name:act_work_tree"
+msgid "Works"
+msgstr "Travaux"
+
+msgctxt "model:ir.action,name:act_work_tree2"
+msgid "Works"
+msgstr "Travaux"
+
+msgctxt "model:ir.ui.menu,name:menu_configuration"
+msgid "Configuration"
+msgstr "Configuration"
+
+msgctxt "model:ir.ui.menu,name:menu_enter_lines"
+msgid "Enter Timesheet"
+msgstr "Entrer feuille de présence"
+
+msgctxt "model:ir.ui.menu,name:menu_line_form"
+msgid "Timesheet Lines"
+msgstr "Lignes de feuille de présence"
+
+msgctxt "model:ir.ui.menu,name:menu_open_hours_employee"
+msgid "Hours per Employee"
+msgstr "Heures par employé"
+
+msgctxt "model:ir.ui.menu,name:menu_open_hours_employee_monthly"
+msgid "Hours per Employee per Month"
+msgstr "Nombre d'heures par employé par mois"
+
+msgctxt "model:ir.ui.menu,name:menu_open_hours_employee_weekly"
+msgid "Hours per Employee per Week"
+msgstr "Nombre d'heures par employé par semaine"
+
+msgctxt "model:ir.ui.menu,name:menu_reporting"
+msgid "Reporting"
+msgstr "Rapports"
+
+msgctxt "model:ir.ui.menu,name:menu_timesheet"
+msgid "Timesheet"
+msgstr "Feuilles de présence"
+
+msgctxt "model:ir.ui.menu,name:menu_work_list"
+msgid "Works"
+msgstr "Travaux"
+
+msgctxt "model:ir.ui.menu,name:menu_work_tree"
+msgid "Works"
+msgstr "Travaux"
+
+msgctxt "model:ir.ui.menu,name:menu_work_tree2"
+msgid "Hours per Work"
+msgstr "Heures par activité"
+
+msgctxt "model:res.group,name:group_timesheet_admin"
+msgid "Timesheet Administration"
+msgstr "Administration feuille de présence"
+
+msgctxt "model:timesheet.enter_lines.init,name:0"
+msgid "Enter Lines Init"
+msgstr "Entrez les lignes - Init"
+
+msgctxt "model:timesheet.hours_employee,name:0"
+msgid "Hours per Employee"
+msgstr "Heures par employé"
+
+msgctxt "model:timesheet.hours_employee_monthly,name:0"
+msgid "Hours per Employee per Month"
+msgstr "Nombre d'heures par employé par mois"
+
+msgctxt "model:timesheet.hours_employee_weekly,name:0"
+msgid "Hours per Employee per Week"
+msgstr "Nombre d'heures par employé par semaine"
+
+msgctxt "model:timesheet.line,name:0"
+msgid "Timesheet Line"
+msgstr "Ligne de feuille de présence"
+
+msgctxt "model:timesheet.open_hours_employee.init,name:0"
+msgid "Open Hours Employee Init"
+msgstr "Heures d'ouverture des employés - Init"
+
+msgctxt "model:timesheet.work,name:0"
+msgid "Work"
+msgstr "Travail"
+
+msgctxt "model:timesheet.work.open.init,name:0"
+msgid "Open Work Init"
+msgstr "Ouvrir activité - Init"
+
+msgctxt "view:timesheet.enter_lines.init:0"
+msgid "Enter Timesheet"
+msgstr "Entrez feuille de présence"
+
+msgctxt "view:timesheet.hours_employee:0"
+msgid "Hours"
+msgstr "Heures"
+
+msgctxt "view:timesheet.hours_employee:0"
+msgid "Hours per Employee"
+msgstr "Heures par employé"
+
+msgctxt "view:timesheet.hours_employee_monthly:0"
+msgid "Hours per Employee per Month"
+msgstr "Nombre d'heures par employé par mois"
+
+msgctxt "view:timesheet.hours_employee_weekly:0"
+msgid "Hours per Employee per Week"
+msgstr "Nombre d'heures par employé par semaine"
+
+msgctxt "view:timesheet.line:0"
+msgid "Hours"
+msgstr "Heures"
+
+msgctxt "view:timesheet.line:0"
+msgid "Timesheet Line"
+msgstr "Ligne de feuille de présence"
+
+msgctxt "view:timesheet.line:0"
+msgid "Timesheet Lines"
+msgstr "Lignes de feuille de présence"
+
+msgctxt "view:timesheet.open_hours_employee.init:0"
+msgid "Hours per Employee"
+msgstr "Heures par employé"
+
+msgctxt "view:timesheet.work.open.init:0"
+msgid "Hours per Work"
+msgstr "Heures par activité"
+
+msgctxt "view:timesheet.work:0"
+msgid "Hours per Work"
+msgstr "Heures par activité"
+
+msgctxt "view:timesheet.work:0"
+msgid "Work"
+msgstr "Travail"
+
+msgctxt "view:timesheet.work:0"
+msgid "Works"
+msgstr "Travaux"
+
+msgctxt "wizard_button:timesheet.enter_lines,init,end:0"
+msgid "Cancel"
+msgstr "Annuler"
+
+msgctxt "wizard_button:timesheet.enter_lines,init,enter:0"
+msgid "Enter"
+msgstr "Entrez"
+
+msgctxt "wizard_button:timesheet.open_hours_employee,init,end:0"
+msgid "Cancel"
+msgstr "Annuler"
+
+msgctxt "wizard_button:timesheet.open_hours_employee,init,open:0"
+msgid "Open"
+msgstr "Ouvrir"
+
+msgctxt "wizard_button:timesheet.work.open,init,end:0"
+msgid "Cancel"
+msgstr "Annuler"
+
+msgctxt "wizard_button:timesheet.work.open,init,open:0"
+msgid "Open"
+msgstr "Ouvrir"
+
+msgctxt "wizard_button:timesheet.work.open2,init,end:0"
+msgid "Cancel"
+msgstr "Annuler"
+
+msgctxt "wizard_button:timesheet.work.open2,init,open:0"
+msgid "Open"
+msgstr "Ouvrir"
diff --git a/locale/nl_NL.po b/locale/nl_NL.po
new file mode 100644
index 0000000..ce6e514
--- /dev/null
+++ b/locale/nl_NL.po
@@ -0,0 +1,393 @@
+#
+msgid ""
+msgstr "Content-Type: text/plain; charset=utf-8\n"
+
+msgctxt "error:timesheet.line:0"
+msgid "Hours field must be positive"
+msgstr "Het veld uren moet positief zijn"
+
+msgctxt "error:timesheet.work:0"
+msgid "Every work must be in the same company as it's parent work!"
+msgstr ""
+"Ieder werk moet onder hetzelfde bedrijf vallen als het bovenliggende werk!"
+
+msgctxt "error:timesheet.work:0"
+msgid "You can not create recursive works!"
+msgstr "U kunt een werk niet naar zichzelf laten verwijzen!"
+
+msgctxt "field:timesheet.enter_lines.init,date:0"
+msgid "Date"
+msgstr "Datum"
+
+msgctxt "field:timesheet.enter_lines.init,employee:0"
+msgid "Employee"
+msgstr "Werknemer"
+
+msgctxt "field:timesheet.hours_employee,employee:0"
+msgid "Employee"
+msgstr "Werknemer"
+
+msgctxt "field:timesheet.hours_employee,hours:0"
+msgid "Hours"
+msgstr "Uren"
+
+msgctxt "field:timesheet.hours_employee,rec_name:0"
+msgid "Name"
+msgstr "Naam"
+
+msgctxt "field:timesheet.hours_employee_monthly,employee:0"
+msgid "Employee"
+msgstr "Werknemer"
+
+msgctxt "field:timesheet.hours_employee_monthly,hours:0"
+msgid "Hours"
+msgstr "Uren"
+
+msgctxt "field:timesheet.hours_employee_monthly,month:0"
+msgid "Month"
+msgstr "Maand"
+
+msgctxt "field:timesheet.hours_employee_monthly,rec_name:0"
+msgid "Name"
+msgstr "Naam"
+
+msgctxt "field:timesheet.hours_employee_monthly,year:0"
+msgid "Year"
+msgstr "Jaar"
+
+msgctxt "field:timesheet.hours_employee_weekly,employee:0"
+msgid "Employee"
+msgstr "Werknemer"
+
+msgctxt "field:timesheet.hours_employee_weekly,hours:0"
+msgid "Hours"
+msgstr "Uren"
+
+msgctxt "field:timesheet.hours_employee_weekly,rec_name:0"
+msgid "Name"
+msgstr "Naam"
+
+msgctxt "field:timesheet.hours_employee_weekly,week:0"
+msgid "Week"
+msgstr "Week"
+
+msgctxt "field:timesheet.hours_employee_weekly,year:0"
+msgid "Year"
+msgstr "Jaar"
+
+msgctxt "field:timesheet.line,date:0"
+msgid "Date"
+msgstr "Datum"
+
+msgctxt "field:timesheet.line,description:0"
+msgid "Description"
+msgstr "Specificatie"
+
+msgctxt "field:timesheet.line,employee:0"
+msgid "Employee"
+msgstr "Werknemer"
+
+msgctxt "field:timesheet.line,hours:0"
+msgid "Hours"
+msgstr "Uren"
+
+msgctxt "field:timesheet.line,rec_name:0"
+msgid "Name"
+msgstr "Naam"
+
+msgctxt "field:timesheet.line,work:0"
+msgid "Work"
+msgstr "Werk"
+
+msgctxt "field:timesheet.open_hours_employee.init,end_date:0"
+msgid "End Date"
+msgstr "Eind datum"
+
+msgctxt "field:timesheet.open_hours_employee.init,start_date:0"
+msgid "Start Date"
+msgstr "Start datum"
+
+msgctxt "field:timesheet.work,active:0"
+msgid "Active"
+msgstr "Actief"
+
+msgctxt "field:timesheet.work,children:0"
+msgid "Children"
+msgstr "Onderliggende niveaus"
+
+msgctxt "field:timesheet.work,company:0"
+msgid "Company"
+msgstr "Bedrijf"
+
+msgctxt "field:timesheet.work,hours:0"
+msgid "Timesheet Hours"
+msgstr "Tijdregistratie uren"
+
+msgctxt "field:timesheet.work,left:0"
+msgid "Left"
+msgstr "Links"
+
+msgctxt "field:timesheet.work,name:0"
+msgid "Name"
+msgstr "Naam"
+
+msgctxt "field:timesheet.work,parent:0"
+msgid "Parent"
+msgstr "Bovenliggend niveau"
+
+msgctxt "field:timesheet.work,rec_name:0"
+msgid "Name"
+msgstr "Naam"
+
+msgctxt "field:timesheet.work,right:0"
+msgid "Right"
+msgstr "Rechts"
+
+msgctxt "field:timesheet.work,timesheet_available:0"
+msgid "Available on timesheets"
+msgstr "Beschikbaar in tijdregistartie"
+
+#, fuzzy
+msgctxt "field:timesheet.work,timesheet_lines:0"
+msgid "Timesheet Lines"
+msgstr "Tijdregistratieregels"
+
+msgctxt "field:timesheet.work.open.init,from_date:0"
+msgid "From Date"
+msgstr "Vanaf datum"
+
+msgctxt "field:timesheet.work.open.init,to_date:0"
+msgid "To Date"
+msgstr "Tot datum"
+
+msgctxt "help:timesheet.work,hours:0"
+msgid "Total time spent on this work"
+msgstr "Tijd besteed aan dit werk"
+
+msgctxt "help:timesheet.work,timesheet_available:0"
+msgid "Allow to fill in timesheets with this work"
+msgstr "Sta het boeken van uren op dit werk toe"
+
+msgctxt "model:ir.action,name:act_enter_lines"
+msgid "Enter Timesheet"
+msgstr "Naar tijdregistratie"
+
+msgctxt "model:ir.action,name:act_hours_employee_form"
+msgid "Hours per Employee"
+msgstr "Uren per werknemer"
+
+msgctxt "model:ir.action,name:act_hours_employee_monthly_form"
+msgid "Hours per Employee per Month"
+msgstr "Uren per werknemer per maand"
+
+msgctxt "model:ir.action,name:act_hours_employee_weekly_form"
+msgid "Hours per Employee per Week"
+msgstr "Uren per werknemer per week"
+
+msgctxt "model:ir.action,name:act_line_form"
+msgid "Timesheet Lines"
+msgstr "Tijdregistratieregels"
+
+msgctxt "model:ir.action,name:act_open_hours_employee"
+msgid "Hours per Employee"
+msgstr "Uren per werknemer"
+
+msgctxt "model:ir.action,name:act_open_work"
+msgid "Hours per Work"
+msgstr "Uren per werk"
+
+msgctxt "model:ir.action,name:act_open_work_graph"
+msgid "Hours per Work"
+msgstr "Uren per werk"
+
+msgctxt "model:ir.action,name:act_work_form2"
+msgid "Hours per Work"
+msgstr "Uren per werk"
+
+msgctxt "model:ir.action,name:act_work_form3"
+msgid "Hours per Work"
+msgstr "Uren per werk"
+
+#, fuzzy
+msgctxt "model:ir.action,name:act_work_hours_board"
+msgid "Hours per Work"
+msgstr "Uren per werk"
+
+#, fuzzy
+msgctxt "model:ir.action,name:act_work_list"
+msgid "Works"
+msgstr "Werken"
+
+msgctxt "model:ir.action,name:act_work_tree"
+msgid "Works"
+msgstr "Werken"
+
+msgctxt "model:ir.action,name:act_work_tree2"
+msgid "Works"
+msgstr "Werken"
+
+msgctxt "model:ir.ui.menu,name:menu_configuration"
+msgid "Configuration"
+msgstr "Instellingen"
+
+msgctxt "model:ir.ui.menu,name:menu_enter_lines"
+msgid "Enter Timesheet"
+msgstr "Naar tijdregistratie"
+
+msgctxt "model:ir.ui.menu,name:menu_line_form"
+msgid "Timesheet Lines"
+msgstr "Tijdregistratieregels"
+
+msgctxt "model:ir.ui.menu,name:menu_open_hours_employee"
+msgid "Hours per Employee"
+msgstr "Uren per werknemer"
+
+msgctxt "model:ir.ui.menu,name:menu_open_hours_employee_monthly"
+msgid "Hours per Employee per Month"
+msgstr "Uren per werknemer per maand"
+
+msgctxt "model:ir.ui.menu,name:menu_open_hours_employee_weekly"
+msgid "Hours per Employee per Week"
+msgstr "Uren per werknemer per week"
+
+msgctxt "model:ir.ui.menu,name:menu_reporting"
+msgid "Reporting"
+msgstr "Rapportage"
+
+#, fuzzy
+msgctxt "model:ir.ui.menu,name:menu_timesheet"
+msgid "Timesheet"
+msgstr "Tijdverantwoording"
+
+#, fuzzy
+msgctxt "model:ir.ui.menu,name:menu_work_list"
+msgid "Works"
+msgstr "Werken"
+
+msgctxt "model:ir.ui.menu,name:menu_work_tree"
+msgid "Works"
+msgstr "Werken"
+
+msgctxt "model:ir.ui.menu,name:menu_work_tree2"
+msgid "Hours per Work"
+msgstr "Uren per werk"
+
+msgctxt "model:res.group,name:group_timesheet_admin"
+msgid "Timesheet Administration"
+msgstr "Tijdregistratie"
+
+msgctxt "model:timesheet.enter_lines.init,name:0"
+msgid "Enter Lines Init"
+msgstr "Naar tijdregistratie gaan"
+
+msgctxt "model:timesheet.hours_employee,name:0"
+msgid "Hours per Employee"
+msgstr "Uren per werknemer"
+
+msgctxt "model:timesheet.hours_employee_monthly,name:0"
+msgid "Hours per Employee per Month"
+msgstr "Uren per werknemer per maand"
+
+msgctxt "model:timesheet.hours_employee_weekly,name:0"
+msgid "Hours per Employee per Week"
+msgstr "Uren per werknemer per week"
+
+msgctxt "model:timesheet.line,name:0"
+msgid "Timesheet Line"
+msgstr "Tijdregistratieregel"
+
+msgctxt "model:timesheet.open_hours_employee.init,name:0"
+msgid "Open Hours Employee Init"
+msgstr "Uren werknemer gaan openen"
+
+msgctxt "model:timesheet.work,name:0"
+msgid "Work"
+msgstr "Werk"
+
+msgctxt "model:timesheet.work.open.init,name:0"
+msgid "Open Work Init"
+msgstr "Werk gaan openen"
+
+msgctxt "view:timesheet.enter_lines.init:0"
+msgid "Enter Timesheet"
+msgstr "Naar tijdregistratie"
+
+msgctxt "view:timesheet.hours_employee:0"
+msgid "Hours"
+msgstr "Uren"
+
+msgctxt "view:timesheet.hours_employee:0"
+msgid "Hours per Employee"
+msgstr "Uren per werknemer"
+
+msgctxt "view:timesheet.hours_employee_monthly:0"
+msgid "Hours per Employee per Month"
+msgstr "Uren per werknemer per maand"
+
+msgctxt "view:timesheet.hours_employee_weekly:0"
+msgid "Hours per Employee per Week"
+msgstr "Uren per werknemer per week"
+
+msgctxt "view:timesheet.line:0"
+msgid "Hours"
+msgstr "Uren"
+
+msgctxt "view:timesheet.line:0"
+msgid "Timesheet Line"
+msgstr "Tijdregistratieregel"
+
+msgctxt "view:timesheet.line:0"
+msgid "Timesheet Lines"
+msgstr "Tijdregistratieregels"
+
+msgctxt "view:timesheet.open_hours_employee.init:0"
+msgid "Hours per Employee"
+msgstr "Uren per werknemer"
+
+msgctxt "view:timesheet.work.open.init:0"
+msgid "Hours per Work"
+msgstr "Uren per werk"
+
+msgctxt "view:timesheet.work:0"
+msgid "Hours per Work"
+msgstr "Uren per werk"
+
+msgctxt "view:timesheet.work:0"
+msgid "Work"
+msgstr "Werk"
+
+msgctxt "view:timesheet.work:0"
+msgid "Works"
+msgstr "Werken"
+
+msgctxt "wizard_button:timesheet.enter_lines,init,end:0"
+msgid "Cancel"
+msgstr "Annuleren"
+
+msgctxt "wizard_button:timesheet.enter_lines,init,enter:0"
+msgid "Enter"
+msgstr "Bevestigen"
+
+msgctxt "wizard_button:timesheet.open_hours_employee,init,end:0"
+msgid "Cancel"
+msgstr "Annuleren"
+
+msgctxt "wizard_button:timesheet.open_hours_employee,init,open:0"
+msgid "Open"
+msgstr "Open"
+
+msgctxt "wizard_button:timesheet.work.open,init,end:0"
+msgid "Cancel"
+msgstr "Annuleren"
+
+msgctxt "wizard_button:timesheet.work.open,init,open:0"
+msgid "Open"
+msgstr "Open"
+
+msgctxt "wizard_button:timesheet.work.open2,init,end:0"
+msgid "Cancel"
+msgstr "Annuleren"
+
+msgctxt "wizard_button:timesheet.work.open2,init,open:0"
+msgid "Open"
+msgstr "Open"
diff --git a/locale/ru_RU.po b/locale/ru_RU.po
new file mode 100644
index 0000000..3b998dd
--- /dev/null
+++ b/locale/ru_RU.po
@@ -0,0 +1,424 @@
+#
+msgid ""
+msgstr "Content-Type: text/plain; charset=utf-8\n"
+
+msgctxt "error:timesheet.line:0"
+msgid "Hours field must be positive"
+msgstr ""
+
+msgctxt "error:timesheet.work:0"
+msgid "Every work must be in the same company as it's parent work!"
+msgstr ""
+
+msgctxt "error:timesheet.work:0"
+msgid "You can not create recursive works!"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:timesheet.enter_lines.init,date:0"
+msgid "Date"
+msgstr "Дата"
+
+#, fuzzy
+msgctxt "field:timesheet.enter_lines.init,employee:0"
+msgid "Employee"
+msgstr "Сотрудник"
+
+#, fuzzy
+msgctxt "field:timesheet.hours_employee,employee:0"
+msgid "Employee"
+msgstr "Сотрудник"
+
+#, fuzzy
+msgctxt "field:timesheet.hours_employee,hours:0"
+msgid "Hours"
+msgstr "Часы"
+
+#, fuzzy
+msgctxt "field:timesheet.hours_employee,rec_name:0"
+msgid "Name"
+msgstr "Наименование"
+
+#, fuzzy
+msgctxt "field:timesheet.hours_employee_monthly,employee:0"
+msgid "Employee"
+msgstr "Сотрудник"
+
+#, fuzzy
+msgctxt "field:timesheet.hours_employee_monthly,hours:0"
+msgid "Hours"
+msgstr "Часы"
+
+msgctxt "field:timesheet.hours_employee_monthly,month:0"
+msgid "Month"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:timesheet.hours_employee_monthly,rec_name:0"
+msgid "Name"
+msgstr "Наименование"
+
+msgctxt "field:timesheet.hours_employee_monthly,year:0"
+msgid "Year"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:timesheet.hours_employee_weekly,employee:0"
+msgid "Employee"
+msgstr "Сотрудник"
+
+#, fuzzy
+msgctxt "field:timesheet.hours_employee_weekly,hours:0"
+msgid "Hours"
+msgstr "Часы"
+
+#, fuzzy
+msgctxt "field:timesheet.hours_employee_weekly,rec_name:0"
+msgid "Name"
+msgstr "Наименование"
+
+msgctxt "field:timesheet.hours_employee_weekly,week:0"
+msgid "Week"
+msgstr ""
+
+msgctxt "field:timesheet.hours_employee_weekly,year:0"
+msgid "Year"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:timesheet.line,date:0"
+msgid "Date"
+msgstr "Дата"
+
+#, fuzzy
+msgctxt "field:timesheet.line,description:0"
+msgid "Description"
+msgstr "Описание"
+
+#, fuzzy
+msgctxt "field:timesheet.line,employee:0"
+msgid "Employee"
+msgstr "Сотрудник"
+
+#, fuzzy
+msgctxt "field:timesheet.line,hours:0"
+msgid "Hours"
+msgstr "Часы"
+
+#, fuzzy
+msgctxt "field:timesheet.line,rec_name:0"
+msgid "Name"
+msgstr "Наименование"
+
+msgctxt "field:timesheet.line,work:0"
+msgid "Work"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:timesheet.open_hours_employee.init,end_date:0"
+msgid "End Date"
+msgstr "Дата окончания"
+
+#, fuzzy
+msgctxt "field:timesheet.open_hours_employee.init,start_date:0"
+msgid "Start Date"
+msgstr "Дата начала"
+
+#, fuzzy
+msgctxt "field:timesheet.work,active:0"
+msgid "Active"
+msgstr "Действительный"
+
+#, fuzzy
+msgctxt "field:timesheet.work,children:0"
+msgid "Children"
+msgstr "Подчиненый"
+
+#, fuzzy
+msgctxt "field:timesheet.work,company:0"
+msgid "Company"
+msgstr "Учет.орг."
+
+msgctxt "field:timesheet.work,hours:0"
+msgid "Timesheet Hours"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:timesheet.work,left:0"
+msgid "Left"
+msgstr "Левая сторона"
+
+#, fuzzy
+msgctxt "field:timesheet.work,name:0"
+msgid "Name"
+msgstr "Наименование"
+
+#, fuzzy
+msgctxt "field:timesheet.work,parent:0"
+msgid "Parent"
+msgstr "Основной"
+
+#, fuzzy
+msgctxt "field:timesheet.work,rec_name:0"
+msgid "Name"
+msgstr "Наименование"
+
+#, fuzzy
+msgctxt "field:timesheet.work,right:0"
+msgid "Right"
+msgstr "Правая сторона"
+
+msgctxt "field:timesheet.work,timesheet_available:0"
+msgid "Available on timesheets"
+msgstr ""
+
+msgctxt "field:timesheet.work,timesheet_lines:0"
+msgid "Timesheet Lines"
+msgstr ""
+
+msgctxt "field:timesheet.work.open.init,from_date:0"
+msgid "From Date"
+msgstr ""
+
+msgctxt "field:timesheet.work.open.init,to_date:0"
+msgid "To Date"
+msgstr ""
+
+msgctxt "help:timesheet.work,hours:0"
+msgid "Total time spent on this work"
+msgstr ""
+
+msgctxt "help:timesheet.work,timesheet_available:0"
+msgid "Allow to fill in timesheets with this work"
+msgstr ""
+
+msgctxt "model:ir.action,name:act_enter_lines"
+msgid "Enter Timesheet"
+msgstr ""
+
+msgctxt "model:ir.action,name:act_hours_employee_form"
+msgid "Hours per Employee"
+msgstr ""
+
+msgctxt "model:ir.action,name:act_hours_employee_monthly_form"
+msgid "Hours per Employee per Month"
+msgstr ""
+
+msgctxt "model:ir.action,name:act_hours_employee_weekly_form"
+msgid "Hours per Employee per Week"
+msgstr ""
+
+msgctxt "model:ir.action,name:act_line_form"
+msgid "Timesheet Lines"
+msgstr ""
+
+msgctxt "model:ir.action,name:act_open_hours_employee"
+msgid "Hours per Employee"
+msgstr ""
+
+msgctxt "model:ir.action,name:act_open_work"
+msgid "Hours per Work"
+msgstr ""
+
+msgctxt "model:ir.action,name:act_open_work_graph"
+msgid "Hours per Work"
+msgstr ""
+
+msgctxt "model:ir.action,name:act_work_form2"
+msgid "Hours per Work"
+msgstr ""
+
+msgctxt "model:ir.action,name:act_work_form3"
+msgid "Hours per Work"
+msgstr ""
+
+msgctxt "model:ir.action,name:act_work_hours_board"
+msgid "Hours per Work"
+msgstr ""
+
+msgctxt "model:ir.action,name:act_work_list"
+msgid "Works"
+msgstr ""
+
+msgctxt "model:ir.action,name:act_work_tree"
+msgid "Works"
+msgstr ""
+
+msgctxt "model:ir.action,name:act_work_tree2"
+msgid "Works"
+msgstr ""
+
+#, fuzzy
+msgctxt "model:ir.ui.menu,name:menu_configuration"
+msgid "Configuration"
+msgstr "Конфигурация"
+
+msgctxt "model:ir.ui.menu,name:menu_enter_lines"
+msgid "Enter Timesheet"
+msgstr ""
+
+msgctxt "model:ir.ui.menu,name:menu_line_form"
+msgid "Timesheet Lines"
+msgstr ""
+
+msgctxt "model:ir.ui.menu,name:menu_open_hours_employee"
+msgid "Hours per Employee"
+msgstr ""
+
+msgctxt "model:ir.ui.menu,name:menu_open_hours_employee_monthly"
+msgid "Hours per Employee per Month"
+msgstr ""
+
+msgctxt "model:ir.ui.menu,name:menu_open_hours_employee_weekly"
+msgid "Hours per Employee per Week"
+msgstr ""
+
+#, fuzzy
+msgctxt "model:ir.ui.menu,name:menu_reporting"
+msgid "Reporting"
+msgstr "Отчетность"
+
+msgctxt "model:ir.ui.menu,name:menu_timesheet"
+msgid "Timesheet"
+msgstr ""
+
+msgctxt "model:ir.ui.menu,name:menu_work_list"
+msgid "Works"
+msgstr ""
+
+msgctxt "model:ir.ui.menu,name:menu_work_tree"
+msgid "Works"
+msgstr ""
+
+msgctxt "model:ir.ui.menu,name:menu_work_tree2"
+msgid "Hours per Work"
+msgstr ""
+
+msgctxt "model:res.group,name:group_timesheet_admin"
+msgid "Timesheet Administration"
+msgstr ""
+
+msgctxt "model:timesheet.enter_lines.init,name:0"
+msgid "Enter Lines Init"
+msgstr ""
+
+msgctxt "model:timesheet.hours_employee,name:0"
+msgid "Hours per Employee"
+msgstr ""
+
+msgctxt "model:timesheet.hours_employee_monthly,name:0"
+msgid "Hours per Employee per Month"
+msgstr ""
+
+msgctxt "model:timesheet.hours_employee_weekly,name:0"
+msgid "Hours per Employee per Week"
+msgstr ""
+
+msgctxt "model:timesheet.line,name:0"
+msgid "Timesheet Line"
+msgstr ""
+
+msgctxt "model:timesheet.open_hours_employee.init,name:0"
+msgid "Open Hours Employee Init"
+msgstr ""
+
+msgctxt "model:timesheet.work,name:0"
+msgid "Work"
+msgstr ""
+
+msgctxt "model:timesheet.work.open.init,name:0"
+msgid "Open Work Init"
+msgstr ""
+
+msgctxt "view:timesheet.enter_lines.init:0"
+msgid "Enter Timesheet"
+msgstr ""
+
+#, fuzzy
+msgctxt "view:timesheet.hours_employee:0"
+msgid "Hours"
+msgstr "Часы"
+
+msgctxt "view:timesheet.hours_employee:0"
+msgid "Hours per Employee"
+msgstr ""
+
+msgctxt "view:timesheet.hours_employee_monthly:0"
+msgid "Hours per Employee per Month"
+msgstr ""
+
+msgctxt "view:timesheet.hours_employee_weekly:0"
+msgid "Hours per Employee per Week"
+msgstr ""
+
+#, fuzzy
+msgctxt "view:timesheet.line:0"
+msgid "Hours"
+msgstr "Часы"
+
+msgctxt "view:timesheet.line:0"
+msgid "Timesheet Line"
+msgstr ""
+
+msgctxt "view:timesheet.line:0"
+msgid "Timesheet Lines"
+msgstr ""
+
+msgctxt "view:timesheet.open_hours_employee.init:0"
+msgid "Hours per Employee"
+msgstr ""
+
+msgctxt "view:timesheet.work.open.init:0"
+msgid "Hours per Work"
+msgstr ""
+
+msgctxt "view:timesheet.work:0"
+msgid "Hours per Work"
+msgstr ""
+
+msgctxt "view:timesheet.work:0"
+msgid "Work"
+msgstr ""
+
+msgctxt "view:timesheet.work:0"
+msgid "Works"
+msgstr ""
+
+#, fuzzy
+msgctxt "wizard_button:timesheet.enter_lines,init,end:0"
+msgid "Cancel"
+msgstr "Отменить"
+
+msgctxt "wizard_button:timesheet.enter_lines,init,enter:0"
+msgid "Enter"
+msgstr ""
+
+#, fuzzy
+msgctxt "wizard_button:timesheet.open_hours_employee,init,end:0"
+msgid "Cancel"
+msgstr "Отменить"
+
+#, fuzzy
+msgctxt "wizard_button:timesheet.open_hours_employee,init,open:0"
+msgid "Open"
+msgstr "Открыть"
+
+#, fuzzy
+msgctxt "wizard_button:timesheet.work.open,init,end:0"
+msgid "Cancel"
+msgstr "Отменить"
+
+#, fuzzy
+msgctxt "wizard_button:timesheet.work.open,init,open:0"
+msgid "Open"
+msgstr "Открыть"
+
+#, fuzzy
+msgctxt "wizard_button:timesheet.work.open2,init,end:0"
+msgid "Cancel"
+msgstr "Отменить"
+
+#, fuzzy
+msgctxt "wizard_button:timesheet.work.open2,init,open:0"
+msgid "Open"
+msgstr "Открыть"
diff --git a/nl_NL.csv b/nl_NL.csv
deleted file mode 100644
index 7fa47ac..0000000
--- a/nl_NL.csv
+++ /dev/null
@@ -1,97 +0,0 @@
-type,name,res_id,src,value,fuzzy
-error,timesheet.line,0,Hours field must be positive,Het veld uren moet positief zijn,0
-error,timesheet.work,0,Every work must be in the same company as it's parent work!,Ieder werk moet onder hetzelfde bedrijf vallen als het bovenliggende werk!,0
-error,timesheet.work,0,You can not create recursive works!,U kunt een werk niet naar zichzelf laten verwijzen!,0
-field,"timesheet.enter_lines.init,date",0,Date,Datum,0
-field,"timesheet.enter_lines.init,employee",0,Employee,Werknemer,0
-field,"timesheet.hours_employee,employee",0,Employee,Werknemer,0
-field,"timesheet.hours_employee,hours",0,Hours,Uren,0
-field,"timesheet.hours_employee,rec_name",0,Name,Naam,0
-field,"timesheet.hours_employee_monthly,employee",0,Employee,Werknemer,0
-field,"timesheet.hours_employee_monthly,hours",0,Hours,Uren,0
-field,"timesheet.hours_employee_monthly,month",0,Month,Maand,0
-field,"timesheet.hours_employee_monthly,rec_name",0,Name,Naam,0
-field,"timesheet.hours_employee_monthly,year",0,Year,Jaar,0
-field,"timesheet.hours_employee_weekly,employee",0,Employee,Werknemer,0
-field,"timesheet.hours_employee_weekly,hours",0,Hours,Uren,0
-field,"timesheet.hours_employee_weekly,rec_name",0,Name,Naam,0
-field,"timesheet.hours_employee_weekly,week",0,Week,Week,0
-field,"timesheet.hours_employee_weekly,year",0,Year,Jaar,0
-field,"timesheet.line,date",0,Date,Datum,0
-field,"timesheet.line,description",0,Description,Specificatie,0
-field,"timesheet.line,employee",0,Employee,Werknemer,0
-field,"timesheet.line,hours",0,Hours,Uren,0
-field,"timesheet.line,rec_name",0,Name,Naam,0
-field,"timesheet.line,work",0,Work,Werk,0
-field,"timesheet.open_hours_employee.init,end_date",0,End Date,Eind datum,0
-field,"timesheet.open_hours_employee.init,start_date",0,Start Date,Start datum,0
-field,"timesheet.work,active",0,Active,Actief,0
-field,"timesheet.work,children",0,Children,Onderliggende niveaus,0
-field,"timesheet.work,company",0,Company,Bedrijf,0
-field,"timesheet.work,hours",0,Timesheet Hours,Tijdregistratie uren,0
-field,"timesheet.work,left",0,Left,Links,0
-field,"timesheet.work,name",0,Name,Naam,0
-field,"timesheet.work,parent",0,Parent,Bovenliggend niveau,0
-field,"timesheet.work,rec_name",0,Name,Naam,0
-field,"timesheet.work,right",0,Right,Rechts,0
-field,"timesheet.work,timesheet_available",0,Available on timesheets,Beschikbaar in tijdregistartie,0
-field,"timesheet.work.open.init,from_date",0,From Date,Vanaf datum,0
-field,"timesheet.work.open.init,to_date",0,To Date,Tot datum,0
-help,"timesheet.work,hours",0,Total time spent on this work,Tijd besteed aan dit werk,0
-help,"timesheet.work,timesheet_available",0,Allow to fill in timesheets with this work,Sta het boeken van uren op dit werk toe,0
-model,"ir.action,name",act_enter_lines,Enter Timesheet,Naar tijdregistratie,0
-model,"ir.action,name",act_hours_employee_form,Hours per Employee,Uren per werknemer,0
-model,"ir.action,name",act_hours_employee_monthly_form,Hours per Employee per Month,Uren per werknemer per maand,0
-model,"ir.action,name",act_hours_employee_weekly_form,Hours per Employee per Week,Uren per werknemer per week,0
-model,"ir.action,name",act_line_form,Timesheet Lines,Tijdregistratieregels,0
-model,"ir.action,name",act_open_hours_employee,Hours per Employee,Uren per werknemer,0
-model,"ir.action,name",act_open_work,Hours per Work,Uren per werk,0
-model,"ir.action,name",act_open_work2,Hours per Work,Uren per werk,0
-model,"ir.action,name",act_open_work_graph,Hours per Work,Uren per werk,0
-model,"ir.action,name",act_work_form,Works,Werken,0
-model,"ir.action,name",act_work_form2,Hours per Work,Uren per werk,0
-model,"ir.action,name",act_work_form3,Hours per Work,Uren per werk,0
-model,"ir.action,name",act_work_tree,Works,Werken,0
-model,"ir.action,name",act_work_tree2,Works,Werken,0
-model,"ir.ui.menu,name",menu_configuration,Configuration,Instellingen,0
-model,"ir.ui.menu,name",menu_enter_lines,Enter Timesheet,Naar tijdregistratie,0
-model,"ir.ui.menu,name",menu_line_form,Timesheet Lines,Tijdregistratieregels,0
-model,"ir.ui.menu,name",menu_open_hours_employee,Hours per Employee,Uren per werknemer,0
-model,"ir.ui.menu,name",menu_open_hours_employee_monthly,Hours per Employee per Month,Uren per werknemer per maand,0
-model,"ir.ui.menu,name",menu_open_hours_employee_weekly,Hours per Employee per Week,Uren per werknemer per week,0
-model,"ir.ui.menu,name",menu_reporting,Reporting,Rapportage,0
-model,"ir.ui.menu,name",menu_timesheet,Timesheet Management,Tijdverantwoording,0
-model,"ir.ui.menu,name",menu_work_form,Works,Werken,0
-model,"ir.ui.menu,name",menu_work_form2,Hours per Work,Uren per werk,0
-model,"ir.ui.menu,name",menu_work_tree,Works,Werken,0
-model,"ir.ui.menu,name",menu_work_tree2,Hours per Work,Uren per werk,0
-model,"res.group,name",group_timesheet_admin,Timesheet Administration,Tijdregistratie,0
-model,"timesheet.enter_lines.init,name",0,Enter Lines Init,Naar tijdregistratie gaan,0
-model,"timesheet.hours_employee,name",0,Hours per Employee,Uren per werknemer,0
-model,"timesheet.hours_employee_monthly,name",0,Hours per Employee per Month,Uren per werknemer per maand,0
-model,"timesheet.hours_employee_weekly,name",0,Hours per Employee per Week,Uren per werknemer per week,0
-model,"timesheet.line,name",0,Timesheet Line,Tijdregistratieregel,0
-model,"timesheet.open_hours_employee.init,name",0,Open Hours Employee Init,Uren werknemer gaan openen,0
-model,"timesheet.work,name",0,Work,Werk,0
-model,"timesheet.work.open.init,name",0,Open Work Init,Werk gaan openen,0
-view,timesheet.enter_lines.init,0,Enter Timesheet,Naar tijdregistratie,0
-view,timesheet.hours_employee,0,Hours,Uren,0
-view,timesheet.hours_employee,0,Hours per Employee,Uren per werknemer,0
-view,timesheet.hours_employee_monthly,0,Hours per Employee per Month,Uren per werknemer per maand,0
-view,timesheet.hours_employee_weekly,0,Hours per Employee per Week,Uren per werknemer per week,0
-view,timesheet.line,0,Hours,Uren,0
-view,timesheet.line,0,Timesheet Line,Tijdregistratieregel,0
-view,timesheet.line,0,Timesheet Lines,Tijdregistratieregels,0
-view,timesheet.open_hours_employee.init,0,Hours per Employee,Uren per werknemer,0
-view,timesheet.work,0,Hours per Work,Uren per werk,0
-view,timesheet.work,0,Work,Werk,0
-view,timesheet.work,0,Works,Werken,0
-view,timesheet.work.open.init,0,Hours per Work,Uren per werk,0
-wizard_button,"timesheet.enter_lines,init,end",0,Cancel,Annuleren,0
-wizard_button,"timesheet.enter_lines,init,enter",0,Enter,Bevestigen,0
-wizard_button,"timesheet.open_hours_employee,init,end",0,Cancel,Annuleren,0
-wizard_button,"timesheet.open_hours_employee,init,open",0,Open,Open,0
-wizard_button,"timesheet.work.open,init,end",0,Cancel,Annuleren,0
-wizard_button,"timesheet.work.open,init,open",0,Open,Open,0
-wizard_button,"timesheet.work.open2,init,end",0,Cancel,Annuleren,0
-wizard_button,"timesheet.work.open2,init,open",0,Open,Open,0
diff --git a/setup.py b/setup.py
index a4af167..7b72686 100644
--- a/setup.py
+++ b/setup.py
@@ -39,17 +39,21 @@ setup(name='trytond_timesheet',
classifiers=[
'Development Status :: 5 - Production/Stable',
'Environment :: Plugins',
+ 'Framework :: Tryton',
'Intended Audience :: Developers',
'Intended Audience :: Financial and Insurance Industry',
'Intended Audience :: Legal Industry',
'Intended Audience :: Manufacturing',
'License :: OSI Approved :: GNU General Public License (GPL)',
'Natural Language :: Bulgarian',
+ 'Natural Language :: Czech',
'Natural Language :: Dutch',
'Natural Language :: English',
+ 'Natural Language :: French',
'Natural Language :: German',
+ 'Natural Language :: Russian',
+ 'Natural Language :: Spanish',
'Operating System :: OS Independent',
- 'Programming Language :: Python :: 2.5',
'Programming Language :: Python :: 2.6',
'Programming Language :: Python :: 2.7',
'Topic :: Office/Business',
diff --git a/tests/test_timesheet.py b/tests/test_timesheet.py
index 6c1f118..7849096 100644
--- a/tests/test_timesheet.py
+++ b/tests/test_timesheet.py
@@ -10,7 +10,7 @@ if os.path.isdir(DIR):
import unittest
import trytond.tests.test_tryton
-from trytond.tests.test_tryton import test_view
+from trytond.tests.test_tryton import test_view, test_depends
class TimesheetTestCase(unittest.TestCase):
@@ -27,6 +27,12 @@ class TimesheetTestCase(unittest.TestCase):
'''
test_view('timesheet')
+ def test0006depends(self):
+ '''
+ Test depends.
+ '''
+ test_depends()
+
def suite():
suite = trytond.tests.test_tryton.suite()
suite.addTests(unittest.TestLoader().loadTestsFromTestCase(
diff --git a/timesheet.xml b/timesheet.xml
index b57f5fd..bea2090 100644
--- a/timesheet.xml
+++ b/timesheet.xml
@@ -6,18 +6,26 @@ this repository contains the full copyright notices and license terms. -->
<record model="res.group" id="group_timesheet_admin">
<field name="name">Timesheet Administration</field>
</record>
- <record model="res.user" id="res.user_admin">
- <field name="groups" eval="[('add', ref('group_timesheet_admin'))]"/>
+ <record model="res.user-res.group"
+ id="user_admin_group_timesheet_admin">
+ <field name="user" ref="res.user_admin"/>
+ <field name="group" ref="group_timesheet_admin"/>
</record>
- <record model="res.user" id="res.user_trigger">
- <field name="groups" eval="[('add', ref('group_timesheet_admin'))]"/>
+ <record model="res.user-res.group"
+ id="user_trigger_group_timesheet_admin">
+ <field name="user" ref="res.user_trigger"/>
+ <field name="group" ref="group_timesheet_admin"/>
</record>
- <menuitem name="Timesheet Management" sequence="6" id="menu_timesheet"
+ <menuitem name="Timesheet" sequence="6" id="menu_timesheet"
icon="tryton-clock"/>
<menuitem name="Configuration" parent="menu_timesheet"
- id="menu_configuration" groups="group_timesheet_admin"
- sequence="10" icon="tryton-preferences"/>
+ id="menu_configuration" sequence="10" icon="tryton-preferences"/>
+ <record model="ir.ui.menu-res.group"
+ id="menu_configuration_group_timesheet_admin">
+ <field name="menu" ref="menu_configuration"/>
+ <field name="group" ref="group_timesheet_admin"/>
+ </record>
<menuitem name="Reporting" parent="menu_timesheet"
id="menu_reporting" sequence="100"/>
</data>
diff --git a/trytond_timesheet.egg-info/PKG-INFO b/trytond_timesheet.egg-info/PKG-INFO
index 3053a91..4d00859 100644
--- a/trytond_timesheet.egg-info/PKG-INFO
+++ b/trytond_timesheet.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.0
Name: trytond-timesheet
-Version: 2.0.0
+Version: 2.2.0
Summary: Timesheet Module with:
- Work
- Timesheet line
@@ -14,22 +14,26 @@ Home-page: http://www.tryton.org/
Author: B2CK
Author-email: info at b2ck.com
License: GPL-3
-Download-URL: http://downloads.tryton.org/2.0/
+Download-URL: http://downloads.tryton.org/2.2/
Description: UNKNOWN
Platform: UNKNOWN
Classifier: Development Status :: 5 - Production/Stable
Classifier: Environment :: Plugins
+Classifier: Framework :: Tryton
Classifier: Intended Audience :: Developers
Classifier: Intended Audience :: Financial and Insurance Industry
Classifier: Intended Audience :: Legal Industry
Classifier: Intended Audience :: Manufacturing
Classifier: License :: OSI Approved :: GNU General Public License (GPL)
Classifier: Natural Language :: Bulgarian
+Classifier: Natural Language :: Czech
Classifier: Natural Language :: Dutch
Classifier: Natural Language :: English
+Classifier: Natural Language :: French
Classifier: Natural Language :: German
+Classifier: Natural Language :: Russian
+Classifier: Natural Language :: Spanish
Classifier: Operating System :: OS Independent
-Classifier: Programming Language :: Python :: 2.5
Classifier: Programming Language :: Python :: 2.6
Classifier: Programming Language :: Python :: 2.7
Classifier: Topic :: Office/Business
diff --git a/trytond_timesheet.egg-info/SOURCES.txt b/trytond_timesheet.egg-info/SOURCES.txt
index a72c550..a8ccc47 100644
--- a/trytond_timesheet.egg-info/SOURCES.txt
+++ b/trytond_timesheet.egg-info/SOURCES.txt
@@ -4,13 +4,7 @@ INSTALL
LICENSE
MANIFEST.in
README
-bg_BG.csv
-de_DE.csv
-es_CO.csv
-es_ES.csv
-fr_FR.csv
line.xml
-nl_NL.csv
setup.py
timesheet.xml
work.xml
@@ -21,6 +15,14 @@ work.xml
./tests/__init__.py
./tests/test_timesheet.py
doc/index.rst
+locale/bg_BG.po
+locale/cs_CZ.po
+locale/de_DE.po
+locale/es_CO.po
+locale/es_ES.po
+locale/fr_FR.po
+locale/nl_NL.po
+locale/ru_RU.po
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 bfde32f..c37ee33 100644
--- a/trytond_timesheet.egg-info/requires.txt
+++ b/trytond_timesheet.egg-info/requires.txt
@@ -1,3 +1,3 @@
-trytond_company >= 2.0, < 2.1
-trytond_company_work_time >= 2.0, < 2.1
-trytond >= 2.0, < 2.1
\ No newline at end of file
+trytond_company >= 2.2, < 2.3
+trytond_company_work_time >= 2.2, < 2.3
+trytond >= 2.2, < 2.3
\ No newline at end of file
diff --git a/work.py b/work.py
index 13f8b1c..4e32e2a 100644
--- a/work.py
+++ b/work.py
@@ -2,8 +2,10 @@
#this repository contains the full copyright notices and license terms.
from trytond.model import ModelView, ModelSQL, fields
from trytond.wizard import Wizard
-from trytond.pyson import PYSONEncoder
+from trytond.pyson import PYSONEncoder, Not, Bool, Eval
from trytond.transaction import Transaction
+from trytond.pool import Pool
+
class Work(ModelSQL, ModelView):
'Work'
@@ -22,6 +24,13 @@ class Work(ModelSQL, ModelView):
timesheet_available = fields.Boolean('Available on timesheets',
help="Allow to fill in timesheets with this work")
company = fields.Many2One('company.company', 'Company', required=True)
+ timesheet_lines = fields.One2Many('timesheet.line', 'work',
+ 'Timesheet Lines',
+ depends=['timesheet_available', 'active'],
+ states={
+ 'invisible': Not(Bool(Eval('timesheet_available'))),
+ 'readonly': Not(Bool(Eval('active'))),
+ })
def __init__(self):
super(Work, self).__init__()
@@ -111,6 +120,14 @@ class Work(ModelSQL, ModelView):
res[work.id] = _name(work)
return res
+ def copy(self, ids, default=None):
+ if default is None:
+ default = {}
+ default = default.copy()
+ if 'timesheet_lines' not in default:
+ default['timesheet_lines'] = False
+ return super(Work, self).copy(ids, default=default)
+
def write(self, ids, vals):
child_ids = None
if not vals.get('active', True):
@@ -160,9 +177,9 @@ class OpenWork(Wizard):
}
def _action_open_work(self, data):
- model_data_obj = self.pool.get('ir.model.data')
- act_window_obj = self.pool.get('ir.action.act_window')
- act_window_id = model_data_obj.get_id('timesheet', 'act_work_tree2')
+ model_data_obj = Pool().get('ir.model.data')
+ act_window_obj = Pool().get('ir.action.act_window')
+ act_window_id = model_data_obj.get_id('timesheet', 'act_work_hours_board')
res = act_window_obj.read(act_window_id)
res['pyson_context'] = PYSONEncoder().encode({
'from_date': data['form']['from_date'],
@@ -177,8 +194,8 @@ class OpenWork2(OpenWork):
_name = 'timesheet.work.open2'
def _action_open_work(self, data):
- model_data_obj = self.pool.get('ir.model.data')
- act_window_obj = self.pool.get('ir.action.act_window')
+ model_data_obj = Pool().get('ir.model.data')
+ act_window_obj = Pool().get('ir.action.act_window')
act_window_id = model_data_obj.get_id('timesheet', 'act_work_form2')
res = act_window_obj.read(act_window_id)
res['pyson_context'] = PYSONEncoder().encode({
@@ -203,9 +220,10 @@ class OpenWorkGraph(Wizard):
}
def _action_open_work(self, data):
- model_data_obj = self.pool.get('ir.model.data')
- act_window_obj = self.pool.get('ir.action.act_window')
- work_obj = self.pool.get('timesheet.work')
+ pool = Pool()
+ model_data_obj = pool.get('ir.model.data')
+ act_window_obj = pool.get('ir.action.act_window')
+ work_obj = pool.get('timesheet.work')
act_window_id = model_data_obj.get_id('timesheet', 'act_work_form3')
res = act_window_obj.read(act_window_id)
diff --git a/work.xml b/work.xml
index f93dd90..2009d52 100644
--- a/work.xml
+++ b/work.xml
@@ -31,8 +31,8 @@ this repository contains the full copyright notices and license terms. -->
<![CDATA[
<tree string="Works">
<field name="rec_name"/>
- <field name="name" select="1" tree_invisible="1"/>
- <field name="active" select="1" tree_invisible="1"/>
+ <field name="name" tree_invisible="1"/>
+ <field name="active" tree_invisible="1"/>
</tree>
]]>
</field>
@@ -45,8 +45,8 @@ this repository contains the full copyright notices and license terms. -->
<field name="arch" type="xml">
<![CDATA[
<tree string="Works">
- <field name="name" select="1"/>
- <field name="timesheet_available" select="1"/>
+ <field name="name"/>
+ <field name="timesheet_available"/>
<field name="parent" tree_invisible="1"/>
<field name="children" tree_invisible="1"/>
</tree>
@@ -93,25 +93,6 @@ this repository contains the full copyright notices and license terms. -->
<menuitem parent="menu_work_tree"
action="act_work_list" id="menu_work_list"/>
- <record model="ir.action.act_window" id="act_work_form">
- <field name="name">Works</field>
- <field name="res_model">timesheet.work</field>
- </record>
- <record model="ir.action.act_window.view"
- id="act_work_form_view1">
- <field name="sequence" eval="10"/>
- <field name="view" ref="work_view_form"/>
- <field name="act_window" ref="act_work_form"/>
- </record>
- <record model="ir.action.act_window.view"
- id="act_work_form_view2">
- <field name="sequence" eval="20"/>
- <field name="view" ref="work_view_list"/>
- <field name="act_window" ref="act_work_form"/>
- </record>
- <menuitem name="New Work" parent="menu_work_tree"
- action="act_work_form" id="menu_work_form"/>
-
<record model="ir.ui.view" id="work_view_tree2">
<field name="model">timesheet.work</field>
<field name="type">tree</field>
@@ -120,7 +101,7 @@ this repository contains the full copyright notices and license terms. -->
<field name="arch" type="xml">
<![CDATA[
<tree string="Works">
- <field name="name" select="1"/>
+ <field name="name"/>
<field name="hours" widget="float_time"
float_time="company_work_time"/>
</tree>
@@ -138,12 +119,6 @@ this repository contains the full copyright notices and license terms. -->
<field name="view" ref="work_view_tree2"/>
<field name="act_window" ref="act_work_tree2"/>
</record>
- <record model="ir.action.wizard" id="act_open_work">
- <field name="name">Hours per Work</field>
- <field name="wiz_name">timesheet.work.open</field>
- </record>
- <menuitem parent="menu_reporting" action="act_open_work"
- id="menu_work_tree2" icon="tryton-tree"/>
<record model="ir.ui.view" id="work_view_graph">
<field name="model">timesheet.work</field>
@@ -165,7 +140,7 @@ this repository contains the full copyright notices and license terms. -->
<record model="ir.action.act_window" id="act_work_form2">
<field name="name">Hours per Work</field>
<field name="res_model">timesheet.work</field>
- <field name="domain">[('parent', '=', False)]</field>
+ <field name="domain" eval="'[(\'parent\', \'=\', Get(Eval(\'_active_%s\', {}), \'id\', False))]' % ref('act_work_tree2')"/>
</record>
<record model="ir.action.act_window.view"
id="act_work_form2_view1">
@@ -173,10 +148,35 @@ this repository contains the full copyright notices and license terms. -->
<field name="view" ref="work_view_graph"/>
<field name="act_window" ref="act_work_form2"/>
</record>
- <record model="ir.action.wizard" id="act_open_work2">
+
+ <record model="ir.ui.view" id="work_hours_board">
+ <field name="type">board</field>
+ <field name="model"></field>
+ <field name="arch" type="xml">
+ <![CDATA[
+ <board string="Hours per Work">
+ <hpaned id="hours_per_work">
+ <child id="tree">
+ <action name="%(act_work_tree2)s"/>
+ </child>
+ <child id="graph">
+ <action name="%(act_work_form2)s"/>
+ </child>
+ </hpaned>
+ </board>
+ ]]>
+ </field>
+ </record>
+ <record model="ir.action.act_window" id="act_work_hours_board">
<field name="name">Hours per Work</field>
- <field name="wiz_name">timesheet.work.open2</field>
</record>
+ <record model="ir.action.act_window.view"
+ id="act_work_hours_board_view1">
+ <field name="sequence" eval="10"/>
+ <field name="view" ref="work_hours_board"/>
+ <field name="act_window" ref="act_work_hours_board"/>
+ </record>
+
<record model="ir.ui.view" id="work_open_init_view_form">
<field name="model">timesheet.work.open.init</field>
<field name="type">form</field>
@@ -191,8 +191,14 @@ this repository contains the full copyright notices and license terms. -->
]]>
</field>
</record>
- <menuitem parent="menu_work_tree2" action="act_open_work2"
- id="menu_work_form2" icon="tryton-graph"/>
+
+ <record model="ir.action.wizard" id="act_open_work">
+ <field name="name">Hours per Work</field>
+ <field name="wiz_name">timesheet.work.open</field>
+ </record>
+ <menuitem parent="menu_reporting" action="act_open_work"
+ id="menu_work_tree2" icon="tryton-graph"/>
+
<record model="ir.action.act_window" id="act_work_form3">
<field name="name">Hours per Work</field>
@@ -211,7 +217,7 @@ this repository contains the full copyright notices and license terms. -->
</record>
<record model="ir.action.keyword" id="act_work_keyword">
<field name="keyword">graph_open</field>
- <field name="model">timesheet.work,0</field>
+ <field name="model">timesheet.work,-1</field>
<field name="action" ref="act_open_work_graph"/>
</record>
@@ -247,7 +253,11 @@ this repository contains the full copyright notices and license terms. -->
<field name="model" search="[('model', '=', 'timesheet.work')]"/>
<field name="global_p" eval="False"/>
<field name="default_p" eval="False"/>
- <field name="groups" eval="[('add', ref('group_timesheet_admin'))]"/>
+ </record>
+ <record model="ir.rule.group-res.group"
+ id="rule_group_work_admin_group_timesheet_admin">
+ <field name="rule_group" ref="rule_group_work_admin"/>
+ <field name="group" ref="group_timesheet_admin"/>
</record>
</data>
commit a4ad3171d59f096ab698d138980626e0b48084f4
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Tue May 24 19:13:24 2011 +0200
Adding upstream version 2.0.0.
diff --git a/CHANGELOG b/CHANGELOG
index 562c4d6..4d988f8 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 2.0.0 - 2011-04-27
+* Bug fixes (see mercurial logs for details)
+
Version 1.8.0 - 2010-11-01
* Bug fixes (see mercurial logs for details)
diff --git a/COPYRIGHT b/COPYRIGHT
index cca7db9..3d2324b 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,6 +1,6 @@
-Copyright (C) 2008-2010 Cédric Krier.
-Copyright (C) 2008-2010 Bertrand Chenal.
-Copyright (C) 2008-2010 B2CK SPRL.
+Copyright (C) 2008-2011 Cédric Krier.
+Copyright (C) 2008-2011 Bertrand Chenal.
+Copyright (C) 2008-2011 B2CK SPRL.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff --git a/PKG-INFO b/PKG-INFO
index 581001c..c183afc 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.0
Name: trytond_timesheet
-Version: 1.8.0
+Version: 2.0.0
Summary: Timesheet Module with:
- Work
- Timesheet line
@@ -14,7 +14,7 @@ Home-page: http://www.tryton.org/
Author: B2CK
Author-email: info at b2ck.com
License: GPL-3
-Download-URL: http://downloads.tryton.org/1.8/
+Download-URL: http://downloads.tryton.org/2.0/
Description: UNKNOWN
Platform: UNKNOWN
Classifier: Development Status :: 5 - Production/Stable
@@ -24,8 +24,12 @@ Classifier: Intended Audience :: Financial and Insurance Industry
Classifier: Intended Audience :: Legal Industry
Classifier: Intended Audience :: Manufacturing
Classifier: License :: OSI Approved :: GNU General Public License (GPL)
+Classifier: Natural Language :: Bulgarian
+Classifier: Natural Language :: Dutch
Classifier: Natural Language :: English
Classifier: Natural Language :: German
Classifier: Operating System :: OS Independent
-Classifier: Programming Language :: Python
+Classifier: Programming Language :: Python :: 2.5
+Classifier: Programming Language :: Python :: 2.6
+Classifier: Programming Language :: Python :: 2.7
Classifier: Topic :: Office/Business
diff --git a/__tryton__.py b/__tryton__.py
index 8affe95..a4ad1bd 100644
--- a/__tryton__.py
+++ b/__tryton__.py
@@ -2,11 +2,13 @@
#this repository contains the full copyright notices and license terms.
{
'name': 'Timesheet',
+ 'name_bg_BG': 'График',
'name_de_DE': 'Zeiterfassung',
'name_es_CO': 'Hoja de Asistencia',
'name_es_ES': 'Partes de trabajo',
'name_fr_FR': 'Feuille de présence',
- 'version': '1.8.0',
+ 'name_nl_NL': 'Tijdregistratie',
+ 'version': '2.0.0',
'author': 'B2CK',
'email': 'info at b2ck.com',
'website': 'http://www.tryton.org/',
@@ -19,6 +21,15 @@ And with reports:
- Hours per employee per week
- Hours per employee per month
''',
+ 'description_bg_BG': '''Модул за график с:
+ - Задачи
+ - Редове от график
+
+Прилежащи справки:
+ - Часове за задача
+ - Часове по служител за седмица
+ - Часове по служител за месец
+''',
'description_de_DE': '''Zeiterfassungsmodul mit:
- Aufgaben
- Zeitpositionen
@@ -55,6 +66,15 @@ Et les rapports:
- Heures par employé par semaine
- Heures par employé par mois
''',
+ 'description_nl_NL': '''Tijdverantwoordingmodule met:
+ - Werken
+ - Tijdboekingen
+
+Bijbehorende rapporten:
+ - Uren per werk
+ - Uren per werknemer per week
+ - Uren per werknemer per maand
+''',
'depends': [
'ir',
'res',
@@ -67,9 +87,11 @@ Et les rapports:
'line.xml',
],
'translation': [
+ 'bg_BG.csv',
'de_DE.csv',
'es_CO.csv',
'es_ES.csv',
'fr_FR.csv',
+ 'nl_NL.csv',
],
}
diff --git a/bg_BG.csv b/bg_BG.csv
new file mode 100644
index 0000000..c01ec31
--- /dev/null
+++ b/bg_BG.csv
@@ -0,0 +1,97 @@
+type,name,res_id,src,value,fuzzy
+error,timesheet.line,0,Hours field must be positive,Часовете трябва да са положителни числа,0
+error,timesheet.work,0,Every work must be in the same company as it's parent work!,Всяка задача трябва да е в същата фирма като тази на родителската задача!,0
+error,timesheet.work,0,You can not create recursive works!,Не може да създавате взаимно вложени задачи!,0
+field,"timesheet.enter_lines.init,date",0,Date,Дата,0
+field,"timesheet.enter_lines.init,employee",0,Employee,Служител,0
+field,"timesheet.hours_employee,employee",0,Employee,Служител,0
+field,"timesheet.hours_employee,hours",0,Hours,Часове,0
+field,"timesheet.hours_employee,rec_name",0,Name,Име,0
+field,"timesheet.hours_employee_monthly,employee",0,Employee,Служител,0
+field,"timesheet.hours_employee_monthly,hours",0,Hours,Часове,0
+field,"timesheet.hours_employee_monthly,month",0,Month,Месец,0
+field,"timesheet.hours_employee_monthly,rec_name",0,Name,Име,0
+field,"timesheet.hours_employee_monthly,year",0,Year,Година,0
+field,"timesheet.hours_employee_weekly,employee",0,Employee,Служител,0
+field,"timesheet.hours_employee_weekly,hours",0,Hours,Часове,0
+field,"timesheet.hours_employee_weekly,rec_name",0,Name,Име,0
+field,"timesheet.hours_employee_weekly,week",0,Week,Седмица,0
+field,"timesheet.hours_employee_weekly,year",0,Year,Година,0
+field,"timesheet.line,date",0,Date,Дата,0
+field,"timesheet.line,description",0,Description,Описание,0
+field,"timesheet.line,employee",0,Employee,Служител,0
+field,"timesheet.line,hours",0,Hours,Часове,0
+field,"timesheet.line,rec_name",0,Name,Име,0
+field,"timesheet.line,work",0,Work,Задача,0
+field,"timesheet.open_hours_employee.init,end_date",0,End Date,Крайна дата,0
+field,"timesheet.open_hours_employee.init,start_date",0,Start Date,Начална дата,0
+field,"timesheet.work,active",0,Active,Активен,0
+field,"timesheet.work,children",0,Children,Деца,0
+field,"timesheet.work,company",0,Company,Фирма,0
+field,"timesheet.work,hours",0,Timesheet Hours,Часове от график,0
+field,"timesheet.work,left",0,Left,Ляв,0
+field,"timesheet.work,name",0,Name,Име,0
+field,"timesheet.work,parent",0,Parent,Родител,0
+field,"timesheet.work,rec_name",0,Name,Име,0
+field,"timesheet.work,right",0,Right,Десен,0
+field,"timesheet.work,timesheet_available",0,Available on timesheets,Наличен в график,0
+field,"timesheet.work.open.init,from_date",0,From Date,От дата,0
+field,"timesheet.work.open.init,to_date",0,To Date,До дата,0
+help,"timesheet.work,hours",0,Total time spent on this work,Общо време за изпълнение на тази задача,0
+help,"timesheet.work,timesheet_available",0,Allow to fill in timesheets with this work,Позволява да се попълни в график с тази задача,0
+model,"ir.action,name",act_enter_lines,Enter Timesheet,Въвеждане на график,0
+model,"ir.action,name",act_hours_employee_form,Hours per Employee,Часове на служител,0
+model,"ir.action,name",act_hours_employee_monthly_form,Hours per Employee per Month,Часове за служител за месец,0
+model,"ir.action,name",act_hours_employee_weekly_form,Hours per Employee per Week,Часове на служител за седмица,0
+model,"ir.action,name",act_line_form,Timesheet Lines,Редове от график,0
+model,"ir.action,name",act_open_hours_employee,Hours per Employee,Часове на служител,0
+model,"ir.action,name",act_open_work,Hours per Work,Часове за работа,0
+model,"ir.action,name",act_open_work2,Hours per Work,Часове за работа,0
+model,"ir.action,name",act_open_work_graph,Hours per Work,Часове за работа,0
+model,"ir.action,name",act_work_form,Works,Задачи,0
+model,"ir.action,name",act_work_form2,Hours per Work,Часове за работа,0
+model,"ir.action,name",act_work_form3,Hours per Work,Часове за работа,0
+model,"ir.action,name",act_work_tree,Works,Задачи,0
+model,"ir.action,name",act_work_tree2,Works,Задачи,0
+model,"ir.ui.menu,name",menu_configuration,Configuration,Конфигурация,0
+model,"ir.ui.menu,name",menu_enter_lines,Enter Timesheet,Въвеждане на график,0
+model,"ir.ui.menu,name",menu_line_form,Timesheet Lines,Редове от график,0
+model,"ir.ui.menu,name",menu_open_hours_employee,Hours per Employee,Часове на служител,0
+model,"ir.ui.menu,name",menu_open_hours_employee_monthly,Hours per Employee per Month,Часове за служител за месец,0
+model,"ir.ui.menu,name",menu_open_hours_employee_weekly,Hours per Employee per Week,Часове на служител за седмица,0
+model,"ir.ui.menu,name",menu_reporting,Reporting,Справки,0
+model,"ir.ui.menu,name",menu_timesheet,Timesheet Management,Управление на графици,0
+model,"ir.ui.menu,name",menu_work_form,New Work,Нова задача,0
+model,"ir.ui.menu,name",menu_work_form2,Hours per Work,Часове за работа,0
+model,"ir.ui.menu,name",menu_work_tree,Works,Задачи,0
+model,"ir.ui.menu,name",menu_work_tree2,Hours per Work,Часове за работа,0
+model,"res.group,name",group_timesheet_admin,Timesheet Administration,Управление на графици,0
+model,"timesheet.enter_lines.init,name",0,Enter Lines Init,Начално въвеждане на редове,0
+model,"timesheet.hours_employee,name",0,Hours per Employee,Часове на служител,0
+model,"timesheet.hours_employee_monthly,name",0,Hours per Employee per Month,Часове за служител за месец,0
+model,"timesheet.hours_employee_weekly,name",0,Hours per Employee per Week,Часове на служител за седмица,0
+model,"timesheet.line,name",0,Timesheet Line,Ред от график,0
+model,"timesheet.open_hours_employee.init,name",0,Open Hours Employee Init,Начално отваряне на часове на служители,0
+model,"timesheet.work,name",0,Work,Задача,0
+model,"timesheet.work.open.init,name",0,Open Work Init,Начално отваряне на задача,0
+view,timesheet.enter_lines.init,0,Enter Timesheet,Въвеждане на график,0
+view,timesheet.hours_employee,0,Hours,Часове,0
+view,timesheet.hours_employee,0,Hours per Employee,Часове на служител,0
+view,timesheet.hours_employee_monthly,0,Hours per Employee per Month,Часове за служител за месец,0
+view,timesheet.hours_employee_weekly,0,Hours per Employee per Week,Часове на служител за седмица,0
+view,timesheet.line,0,Hours,Часове,0
+view,timesheet.line,0,Timesheet Line,Ред от график,0
+view,timesheet.line,0,Timesheet Lines,Редове от график,0
+view,timesheet.open_hours_employee.init,0,Hours per Employee,Часове на служител,0
+view,timesheet.work,0,Hours per Work,Часове за работа,0
+view,timesheet.work,0,Work,Задача,0
+view,timesheet.work,0,Works,Зачади,0
+view,timesheet.work.open.init,0,Hours per Work,Часове за работа,0
+wizard_button,"timesheet.enter_lines,init,end",0,Cancel,Отказ,0
+wizard_button,"timesheet.enter_lines,init,enter",0,Enter,Въвеждане,0
+wizard_button,"timesheet.open_hours_employee,init,end",0,Cancel,Отказ,0
+wizard_button,"timesheet.open_hours_employee,init,open",0,Open,Отваряне,0
+wizard_button,"timesheet.work.open,init,end",0,Cancel,Отказ,0
+wizard_button,"timesheet.work.open,init,open",0,Open,Отваряне,0
+wizard_button,"timesheet.work.open2,init,end",0,Cancel,Отказ,0
+wizard_button,"timesheet.work.open2,init,open",0,Open,Отваряне,0
diff --git a/de_DE.csv b/de_DE.csv
index 4d78de9..e968198 100644
--- a/de_DE.csv
+++ b/de_DE.csv
@@ -76,6 +76,7 @@ model,"ir.action,name",act_open_work_graph,Hours per Work,Stunden pro Aufgabe,0
model,"ir.action,name",act_work_form,Works,Aufgaben,0
model,"ir.action,name",act_work_form2,Hours per Work,Stunden pro Aufgabe,0
model,"ir.action,name",act_work_form3,Hours per Work,Stunden pro Aufgabe,0
+model,"ir.action,name",act_work_list,Works,Aufgaben,0
model,"ir.action,name",act_work_tree,Works,Aufgaben,0
model,"ir.action,name",act_work_tree2,Works,Aufgaben,0
model,"ir.ui.menu,name",menu_configuration,Configuration,Einstellungen,0
@@ -84,10 +85,11 @@ model,"ir.ui.menu,name",menu_line_form,Timesheet Lines,Zeitpositionen,0
model,"ir.ui.menu,name",menu_open_hours_employee,Hours per Employee,Stunden pro Mitarbeiter,0
model,"ir.ui.menu,name",menu_open_hours_employee_monthly,Hours per Employee per Month,Stunden pro Mitarbeiter pro Monat,0
model,"ir.ui.menu,name",menu_open_hours_employee_weekly,Hours per Employee per Week,Stunden pro Mitarbeiter pro Woche,0
-model,"ir.ui.menu,name",menu_reporting,Reporting,Berichte,0
+model,"ir.ui.menu,name",menu_reporting,Reporting,Auswertungen,0
model,"ir.ui.menu,name",menu_timesheet,Timesheet Management,Zeiterfassung,0
-model,"ir.ui.menu,name",menu_work_form,Works,Aufgaben,0
+model,"ir.ui.menu,name",menu_work_form,New Work,Neue Aufgabe,0
model,"ir.ui.menu,name",menu_work_form2,Hours per Work,Stunden pro Aufgabe,0
+model,"ir.ui.menu,name",menu_work_list,Works,Aufgaben,0
model,"ir.ui.menu,name",menu_work_tree,Works,Aufgaben,0
model,"ir.ui.menu,name",menu_work_tree2,Hours per Work,Stunden pro Aufgabe,0
model,"res.group,name",group_timesheet_admin,Timesheet Administration,Zeiterfassung Administration,0
diff --git a/fr_FR.csv b/fr_FR.csv
index 423e15d..6d7566a 100644
--- a/fr_FR.csv
+++ b/fr_FR.csv
@@ -51,6 +51,7 @@ model,"ir.action,name",act_open_work_graph,Hours per Work,Heures par activité,0
model,"ir.action,name",act_work_form,Works,Activités,0
model,"ir.action,name",act_work_form2,Hours per Work,Heures par activité,0
model,"ir.action,name",act_work_form3,Hours per Work,Heures par activité,0
+model,"ir.action,name",act_work_list,Works,Activités,1
model,"ir.action,name",act_work_tree,Works,Activités,0
model,"ir.action,name",act_work_tree2,Works,Activités,0
model,"ir.ui.menu,name",menu_configuration,Configuration,Configuration,0
@@ -61,8 +62,9 @@ model,"ir.ui.menu,name",menu_open_hours_employee_monthly,Hours per Employee per
model,"ir.ui.menu,name",menu_open_hours_employee_weekly,Hours per Employee per Week,Nombre d'heures par employé par semaine,0
model,"ir.ui.menu,name",menu_reporting,Reporting,Rapports,0
model,"ir.ui.menu,name",menu_timesheet,Timesheet Management,Feuilles de présence,0
-model,"ir.ui.menu,name",menu_work_form,Works,Activités,0
+model,"ir.ui.menu,name",menu_work_form,New Work,Nouvelle activité,0
model,"ir.ui.menu,name",menu_work_form2,Hours per Work,Heures par activité,0
+model,"ir.ui.menu,name",menu_work_list,Works,Activités,1
model,"ir.ui.menu,name",menu_work_tree,Works,Activités,0
model,"ir.ui.menu,name",menu_work_tree2,Hours per Work,Heures par activité,0
model,"res.group,name",group_timesheet_admin,Timesheet Administration,Administration feuille de présence,0
diff --git a/line.xml b/line.xml
index 1bed492..228d3b4 100644
--- a/line.xml
+++ b/line.xml
@@ -43,7 +43,6 @@ this repository contains the full copyright notices and license terms. -->
<record model="ir.action.act_window" id="act_line_form">
<field name="name">Timesheet Lines</field>
<field name="res_model">timesheet.line</field>
- <field name="view_type">form</field>
</record>
<record model="ir.action.act_window.view"
id="act_line_form_view1">
@@ -133,7 +132,6 @@ this repository contains the full copyright notices and license terms. -->
<record model="ir.action.act_window" id="act_hours_employee_form">
<field name="name">Hours per Employee</field>
<field name="res_model">timesheet.hours_employee</field>
- <field name="view_type">form</field>
</record>
<record model="ir.action.act_window.view"
id="act_hours_employee_form_view1">
@@ -205,7 +203,6 @@ this repository contains the full copyright notices and license terms. -->
<record model="ir.action.act_window" id="act_hours_employee_weekly_form">
<field name="name">Hours per Employee per Week</field>
<field name="res_model">timesheet.hours_employee_weekly</field>
- <field name="view_type">form</field>
</record>
<record model="ir.action.act_window.view"
id="act_hours_employee_weekly_form_view1">
@@ -234,7 +231,6 @@ this repository contains the full copyright notices and license terms. -->
<record model="ir.action.act_window" id="act_hours_employee_monthly_form">
<field name="name">Hours per Employee per Month</field>
<field name="res_model">timesheet.hours_employee_monthly</field>
- <field name="view_type">form</field>
</record>
<record model="ir.action.act_window.view"
id="act_hours_employee_monthly_form_view1">
diff --git a/nl_NL.csv b/nl_NL.csv
new file mode 100644
index 0000000..7fa47ac
--- /dev/null
+++ b/nl_NL.csv
@@ -0,0 +1,97 @@
+type,name,res_id,src,value,fuzzy
+error,timesheet.line,0,Hours field must be positive,Het veld uren moet positief zijn,0
+error,timesheet.work,0,Every work must be in the same company as it's parent work!,Ieder werk moet onder hetzelfde bedrijf vallen als het bovenliggende werk!,0
+error,timesheet.work,0,You can not create recursive works!,U kunt een werk niet naar zichzelf laten verwijzen!,0
+field,"timesheet.enter_lines.init,date",0,Date,Datum,0
+field,"timesheet.enter_lines.init,employee",0,Employee,Werknemer,0
+field,"timesheet.hours_employee,employee",0,Employee,Werknemer,0
+field,"timesheet.hours_employee,hours",0,Hours,Uren,0
+field,"timesheet.hours_employee,rec_name",0,Name,Naam,0
+field,"timesheet.hours_employee_monthly,employee",0,Employee,Werknemer,0
+field,"timesheet.hours_employee_monthly,hours",0,Hours,Uren,0
+field,"timesheet.hours_employee_monthly,month",0,Month,Maand,0
+field,"timesheet.hours_employee_monthly,rec_name",0,Name,Naam,0
+field,"timesheet.hours_employee_monthly,year",0,Year,Jaar,0
+field,"timesheet.hours_employee_weekly,employee",0,Employee,Werknemer,0
+field,"timesheet.hours_employee_weekly,hours",0,Hours,Uren,0
+field,"timesheet.hours_employee_weekly,rec_name",0,Name,Naam,0
+field,"timesheet.hours_employee_weekly,week",0,Week,Week,0
+field,"timesheet.hours_employee_weekly,year",0,Year,Jaar,0
+field,"timesheet.line,date",0,Date,Datum,0
+field,"timesheet.line,description",0,Description,Specificatie,0
+field,"timesheet.line,employee",0,Employee,Werknemer,0
+field,"timesheet.line,hours",0,Hours,Uren,0
+field,"timesheet.line,rec_name",0,Name,Naam,0
+field,"timesheet.line,work",0,Work,Werk,0
+field,"timesheet.open_hours_employee.init,end_date",0,End Date,Eind datum,0
+field,"timesheet.open_hours_employee.init,start_date",0,Start Date,Start datum,0
+field,"timesheet.work,active",0,Active,Actief,0
+field,"timesheet.work,children",0,Children,Onderliggende niveaus,0
+field,"timesheet.work,company",0,Company,Bedrijf,0
+field,"timesheet.work,hours",0,Timesheet Hours,Tijdregistratie uren,0
+field,"timesheet.work,left",0,Left,Links,0
+field,"timesheet.work,name",0,Name,Naam,0
+field,"timesheet.work,parent",0,Parent,Bovenliggend niveau,0
+field,"timesheet.work,rec_name",0,Name,Naam,0
+field,"timesheet.work,right",0,Right,Rechts,0
+field,"timesheet.work,timesheet_available",0,Available on timesheets,Beschikbaar in tijdregistartie,0
+field,"timesheet.work.open.init,from_date",0,From Date,Vanaf datum,0
+field,"timesheet.work.open.init,to_date",0,To Date,Tot datum,0
+help,"timesheet.work,hours",0,Total time spent on this work,Tijd besteed aan dit werk,0
+help,"timesheet.work,timesheet_available",0,Allow to fill in timesheets with this work,Sta het boeken van uren op dit werk toe,0
+model,"ir.action,name",act_enter_lines,Enter Timesheet,Naar tijdregistratie,0
+model,"ir.action,name",act_hours_employee_form,Hours per Employee,Uren per werknemer,0
+model,"ir.action,name",act_hours_employee_monthly_form,Hours per Employee per Month,Uren per werknemer per maand,0
+model,"ir.action,name",act_hours_employee_weekly_form,Hours per Employee per Week,Uren per werknemer per week,0
+model,"ir.action,name",act_line_form,Timesheet Lines,Tijdregistratieregels,0
+model,"ir.action,name",act_open_hours_employee,Hours per Employee,Uren per werknemer,0
+model,"ir.action,name",act_open_work,Hours per Work,Uren per werk,0
+model,"ir.action,name",act_open_work2,Hours per Work,Uren per werk,0
+model,"ir.action,name",act_open_work_graph,Hours per Work,Uren per werk,0
+model,"ir.action,name",act_work_form,Works,Werken,0
+model,"ir.action,name",act_work_form2,Hours per Work,Uren per werk,0
+model,"ir.action,name",act_work_form3,Hours per Work,Uren per werk,0
+model,"ir.action,name",act_work_tree,Works,Werken,0
+model,"ir.action,name",act_work_tree2,Works,Werken,0
+model,"ir.ui.menu,name",menu_configuration,Configuration,Instellingen,0
+model,"ir.ui.menu,name",menu_enter_lines,Enter Timesheet,Naar tijdregistratie,0
+model,"ir.ui.menu,name",menu_line_form,Timesheet Lines,Tijdregistratieregels,0
+model,"ir.ui.menu,name",menu_open_hours_employee,Hours per Employee,Uren per werknemer,0
+model,"ir.ui.menu,name",menu_open_hours_employee_monthly,Hours per Employee per Month,Uren per werknemer per maand,0
+model,"ir.ui.menu,name",menu_open_hours_employee_weekly,Hours per Employee per Week,Uren per werknemer per week,0
+model,"ir.ui.menu,name",menu_reporting,Reporting,Rapportage,0
+model,"ir.ui.menu,name",menu_timesheet,Timesheet Management,Tijdverantwoording,0
+model,"ir.ui.menu,name",menu_work_form,Works,Werken,0
+model,"ir.ui.menu,name",menu_work_form2,Hours per Work,Uren per werk,0
+model,"ir.ui.menu,name",menu_work_tree,Works,Werken,0
+model,"ir.ui.menu,name",menu_work_tree2,Hours per Work,Uren per werk,0
+model,"res.group,name",group_timesheet_admin,Timesheet Administration,Tijdregistratie,0
+model,"timesheet.enter_lines.init,name",0,Enter Lines Init,Naar tijdregistratie gaan,0
+model,"timesheet.hours_employee,name",0,Hours per Employee,Uren per werknemer,0
+model,"timesheet.hours_employee_monthly,name",0,Hours per Employee per Month,Uren per werknemer per maand,0
+model,"timesheet.hours_employee_weekly,name",0,Hours per Employee per Week,Uren per werknemer per week,0
+model,"timesheet.line,name",0,Timesheet Line,Tijdregistratieregel,0
+model,"timesheet.open_hours_employee.init,name",0,Open Hours Employee Init,Uren werknemer gaan openen,0
+model,"timesheet.work,name",0,Work,Werk,0
+model,"timesheet.work.open.init,name",0,Open Work Init,Werk gaan openen,0
+view,timesheet.enter_lines.init,0,Enter Timesheet,Naar tijdregistratie,0
+view,timesheet.hours_employee,0,Hours,Uren,0
+view,timesheet.hours_employee,0,Hours per Employee,Uren per werknemer,0
+view,timesheet.hours_employee_monthly,0,Hours per Employee per Month,Uren per werknemer per maand,0
+view,timesheet.hours_employee_weekly,0,Hours per Employee per Week,Uren per werknemer per week,0
+view,timesheet.line,0,Hours,Uren,0
+view,timesheet.line,0,Timesheet Line,Tijdregistratieregel,0
+view,timesheet.line,0,Timesheet Lines,Tijdregistratieregels,0
+view,timesheet.open_hours_employee.init,0,Hours per Employee,Uren per werknemer,0
+view,timesheet.work,0,Hours per Work,Uren per werk,0
+view,timesheet.work,0,Work,Werk,0
+view,timesheet.work,0,Works,Werken,0
+view,timesheet.work.open.init,0,Hours per Work,Uren per werk,0
+wizard_button,"timesheet.enter_lines,init,end",0,Cancel,Annuleren,0
+wizard_button,"timesheet.enter_lines,init,enter",0,Enter,Bevestigen,0
+wizard_button,"timesheet.open_hours_employee,init,end",0,Cancel,Annuleren,0
+wizard_button,"timesheet.open_hours_employee,init,open",0,Open,Open,0
+wizard_button,"timesheet.work.open,init,end",0,Cancel,Annuleren,0
+wizard_button,"timesheet.work.open,init,open",0,Open,Open,0
+wizard_button,"timesheet.work.open2,init,end",0,Cancel,Annuleren,0
+wizard_button,"timesheet.work.open2,init,open",0,Open,Open,0
diff --git a/setup.py b/setup.py
index 761dd28..a4af167 100644
--- a/setup.py
+++ b/setup.py
@@ -44,10 +44,14 @@ setup(name='trytond_timesheet',
'Intended Audience :: Legal Industry',
'Intended Audience :: Manufacturing',
'License :: OSI Approved :: GNU General Public License (GPL)',
+ 'Natural Language :: Bulgarian',
+ 'Natural Language :: Dutch',
'Natural Language :: English',
'Natural Language :: German',
'Operating System :: OS Independent',
- 'Programming Language :: Python',
+ 'Programming Language :: Python :: 2.5',
+ 'Programming Language :: Python :: 2.6',
+ 'Programming Language :: Python :: 2.7',
'Topic :: Office/Business',
],
license='GPL-3',
diff --git a/trytond_timesheet.egg-info/PKG-INFO b/trytond_timesheet.egg-info/PKG-INFO
index bd6e48f..3053a91 100644
--- a/trytond_timesheet.egg-info/PKG-INFO
+++ b/trytond_timesheet.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.0
Name: trytond-timesheet
-Version: 1.8.0
+Version: 2.0.0
Summary: Timesheet Module with:
- Work
- Timesheet line
@@ -14,7 +14,7 @@ Home-page: http://www.tryton.org/
Author: B2CK
Author-email: info at b2ck.com
License: GPL-3
-Download-URL: http://downloads.tryton.org/1.8/
+Download-URL: http://downloads.tryton.org/2.0/
Description: UNKNOWN
Platform: UNKNOWN
Classifier: Development Status :: 5 - Production/Stable
@@ -24,8 +24,12 @@ Classifier: Intended Audience :: Financial and Insurance Industry
Classifier: Intended Audience :: Legal Industry
Classifier: Intended Audience :: Manufacturing
Classifier: License :: OSI Approved :: GNU General Public License (GPL)
+Classifier: Natural Language :: Bulgarian
+Classifier: Natural Language :: Dutch
Classifier: Natural Language :: English
Classifier: Natural Language :: German
Classifier: Operating System :: OS Independent
-Classifier: Programming Language :: Python
+Classifier: Programming Language :: Python :: 2.5
+Classifier: Programming Language :: Python :: 2.6
+Classifier: Programming Language :: Python :: 2.7
Classifier: Topic :: Office/Business
diff --git a/trytond_timesheet.egg-info/SOURCES.txt b/trytond_timesheet.egg-info/SOURCES.txt
index 7a13615..a72c550 100644
--- a/trytond_timesheet.egg-info/SOURCES.txt
+++ b/trytond_timesheet.egg-info/SOURCES.txt
@@ -4,11 +4,13 @@ INSTALL
LICENSE
MANIFEST.in
README
+bg_BG.csv
de_DE.csv
es_CO.csv
es_ES.csv
fr_FR.csv
line.xml
+nl_NL.csv
setup.py
timesheet.xml
work.xml
diff --git a/trytond_timesheet.egg-info/requires.txt b/trytond_timesheet.egg-info/requires.txt
index 46957f2..bfde32f 100644
--- a/trytond_timesheet.egg-info/requires.txt
+++ b/trytond_timesheet.egg-info/requires.txt
@@ -1,3 +1,3 @@
-trytond_company >= 1.8, < 1.9
-trytond_company_work_time >= 1.8, < 1.9
-trytond >= 1.8, < 1.9
\ No newline at end of file
+trytond_company >= 2.0, < 2.1
+trytond_company_work_time >= 2.0, < 2.1
+trytond >= 2.0, < 2.1
\ No newline at end of file
diff --git a/work.xml b/work.xml
index f1745cb..f93dd90 100644
--- a/work.xml
+++ b/work.xml
@@ -23,7 +23,7 @@ this repository contains the full copyright notices and license terms. -->
]]>
</field>
</record>
- <record model="ir.ui.view" id="work_view_tree">
+ <record model="ir.ui.view" id="work_view_list">
<field name="model">timesheet.work</field>
<field name="type">tree</field>
<field name="priority" eval="8"/>
@@ -37,26 +37,7 @@ this repository contains the full copyright notices and license terms. -->
]]>
</field>
</record>
- <record model="ir.action.act_window" id="act_work_form">
- <field name="name">Works</field>
- <field name="res_model">timesheet.work</field>
- <field name="view_type">form</field>
- </record>
- <record model="ir.action.act_window.view"
- id="act_work_form_view1">
- <field name="sequence" eval="10"/>
- <field name="view" ref="work_view_tree"/>
- <field name="act_window" ref="act_work_form"/>
- </record>
- <record model="ir.action.act_window.view"
- id="act_work_form_view2">
- <field name="sequence" eval="20"/>
- <field name="view" ref="work_view_form"/>
- <field name="act_window" ref="act_work_form"/>
- </record>
- <menuitem parent="menu_configuration" action="act_work_form"
- id="menu_work_form"/>
- <record model="ir.ui.view" id="work_view_tree2">
+ <record model="ir.ui.view" id="work_view_tree">
<field name="model">timesheet.work</field>
<field name="type">tree</field>
<field name="priority" eval="16"/>
@@ -66,26 +47,72 @@ this repository contains the full copyright notices and license terms. -->
<tree string="Works">
<field name="name" select="1"/>
<field name="timesheet_available" select="1"/>
+ <field name="parent" tree_invisible="1"/>
+ <field name="children" tree_invisible="1"/>
</tree>
]]>
</field>
</record>
+
<record model="ir.action.act_window" id="act_work_tree">
<field name="name">Works</field>
<field name="res_model">timesheet.work</field>
- <field name="view_type">tree</field>
<field name="domain">[('parent', '=', False)]</field>
</record>
<record model="ir.action.act_window.view"
id="act_work_tree_view1">
<field name="sequence" eval="10"/>
- <field name="view" ref="work_view_tree2"/>
+ <field name="view" ref="work_view_tree"/>
<field name="act_window" ref="act_work_tree"/>
</record>
- <menuitem parent="menu_work_form" action="act_work_tree"
+ <record model="ir.action.act_window.view"
+ id="act_work_tree_view2">
+ <field name="sequence" eval="20"/>
+ <field name="view" ref="work_view_form"/>
+ <field name="act_window" ref="act_work_tree"/>
+ </record>
+ <menuitem parent="menu_configuration" action="act_work_tree"
id="menu_work_tree"/>
- <record model="ir.ui.view" id="work_view_tree3">
+ <record model="ir.action.act_window" id="act_work_list">
+ <field name="name">Works</field>
+ <field name="res_model">timesheet.work</field>
+ </record>
+ <record model="ir.action.act_window.view"
+ id="act_work_list_view1">
+ <field name="sequence" eval="10"/>
+ <field name="view" ref="work_view_list"/>
+ <field name="act_window" ref="act_work_list"/>
+ </record>
+ <record model="ir.action.act_window.view"
+ id="act_work_list_view2">
+ <field name="sequence" eval="20"/>
+ <field name="view" ref="work_view_form"/>
+ <field name="act_window" ref="act_work_list"/>
+ </record>
+ <menuitem parent="menu_work_tree"
+ action="act_work_list" id="menu_work_list"/>
+
+ <record model="ir.action.act_window" id="act_work_form">
+ <field name="name">Works</field>
+ <field name="res_model">timesheet.work</field>
+ </record>
+ <record model="ir.action.act_window.view"
+ id="act_work_form_view1">
+ <field name="sequence" eval="10"/>
+ <field name="view" ref="work_view_form"/>
+ <field name="act_window" ref="act_work_form"/>
+ </record>
+ <record model="ir.action.act_window.view"
+ id="act_work_form_view2">
+ <field name="sequence" eval="20"/>
+ <field name="view" ref="work_view_list"/>
+ <field name="act_window" ref="act_work_form"/>
+ </record>
+ <menuitem name="New Work" parent="menu_work_tree"
+ action="act_work_form" id="menu_work_form"/>
+
+ <record model="ir.ui.view" id="work_view_tree2">
<field name="model">timesheet.work</field>
<field name="type">tree</field>
<field name="priority" eval="16"/>
@@ -103,13 +130,12 @@ this repository contains the full copyright notices and license terms. -->
<record model="ir.action.act_window" id="act_work_tree2">
<field name="name">Works</field>
<field name="res_model">timesheet.work</field>
- <field name="view_type">tree</field>
<field name="domain">[('parent', '=', False)]</field>
</record>
<record model="ir.action.act_window.view"
- id="act_work_tree_view2">
+ id="act_work_tree2_view1">
<field name="sequence" eval="10"/>
- <field name="view" ref="work_view_tree3"/>
+ <field name="view" ref="work_view_tree2"/>
<field name="act_window" ref="act_work_tree2"/>
</record>
<record model="ir.action.wizard" id="act_open_work">
@@ -139,7 +165,6 @@ this repository contains the full copyright notices and license terms. -->
<record model="ir.action.act_window" id="act_work_form2">
<field name="name">Hours per Work</field>
<field name="res_model">timesheet.work</field>
- <field name="view_type">form</field>
<field name="domain">[('parent', '=', False)]</field>
</record>
<record model="ir.action.act_window.view"
@@ -172,7 +197,6 @@ this repository contains the full copyright notices and license terms. -->
<record model="ir.action.act_window" id="act_work_form3">
<field name="name">Hours per Work</field>
<field name="res_model">timesheet.work</field>
- <field name="view_type">form</field>
<field name="domain">[('parent', 'in', Eval('active_ids'))]</field>
</record>
<record model="ir.action.act_window.view"
commit 1d44edd77e51a452410b96bc20f292c96f7c0a15
Author: Daniel Baumann <daniel at debian.org>
Date: Thu Nov 4 20:12:42 2010 +0100
Adding upstream version 1.8.0.
diff --git a/CHANGELOG b/CHANGELOG
index 539164d..562c4d6 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 1.8.0 - 2010-11-01
+* Bug fixes (see mercurial logs for details)
+
Version 1.6.0 - 2010-05-12
* Bug fixes (see mercurial logs for details)
diff --git a/INSTALL b/INSTALL
index 7fc6d03..789b2e5 100644
--- a/INSTALL
+++ b/INSTALL
@@ -4,7 +4,7 @@ Installing trytond_timesheet
Prerequisites
-------------
- * Python 2.4 or later (http://www.python.org/)
+ * Python 2.5 or later (http://www.python.org/)
* trytond (http://www.tryton.org/)
* trytond_company (http://www.tryton.org/)
* trytond_company_work_time (http://www.tryton.org/)
diff --git a/PKG-INFO b/PKG-INFO
index b1c0473..581001c 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.0
Name: trytond_timesheet
-Version: 1.6.0
+Version: 1.8.0
Summary: Timesheet Module with:
- Work
- Timesheet line
@@ -14,7 +14,7 @@ Home-page: http://www.tryton.org/
Author: B2CK
Author-email: info at b2ck.com
License: GPL-3
-Download-URL: http://downloads.tryton.org/1.6/
+Download-URL: http://downloads.tryton.org/1.8/
Description: UNKNOWN
Platform: UNKNOWN
Classifier: Development Status :: 5 - Production/Stable
diff --git a/__tryton__.py b/__tryton__.py
index b405171..8affe95 100644
--- a/__tryton__.py
+++ b/__tryton__.py
@@ -6,7 +6,7 @@
'name_es_CO': 'Hoja de Asistencia',
'name_es_ES': 'Partes de trabajo',
'name_fr_FR': 'Feuille de présence',
- 'version': '1.6.0',
+ 'version': '1.8.0',
'author': 'B2CK',
'email': 'info at b2ck.com',
'website': 'http://www.tryton.org/',
diff --git a/de_DE.csv b/de_DE.csv
index d8345f9..4d78de9 100644
--- a/de_DE.csv
+++ b/de_DE.csv
@@ -1,7 +1,7 @@
type,name,res_id,src,value,fuzzy
error,timesheet.line,0,Hours field must be positive,Feld Stunden muss einen positiven Wert haben,0
error,timesheet.work,0,Every work must be in the same company as it's parent work!,Eine Aufgabe muss immer zum selben Unternehmen wie die übergeordnete Aufgabe gehören!,0
-error,timesheet.work,0,You can not create recursive works!,Es können keine rekursiven Aufgaben angelegt werden,0
+error,timesheet.work,0,You can not create recursive works!,Aufgaben können nicht rekursiv angelegt werden!,0
field,"timesheet.enter_lines.init,date",0,Date,Datum,0
field,"timesheet.enter_lines.init,employee",0,Employee,Mitarbeiter,0
field,"timesheet.hours_employee,create_date",0,Creation date,Erstellungsdatum,0
@@ -9,6 +9,9 @@ field,"timesheet.hours_employee,create_uid",0,Creation user,Ersteller,0
field,"timesheet.hours_employee,employee",0,Employee,Mitarbeiter,0
field,"timesheet.hours_employee,hours",0,Hours,Stunden,0
field,"timesheet.hours_employee,id",0,ID,ID,0
+field,"timesheet.hours_employee,rec_name",0,Name,Name,0
+field,"timesheet.hours_employee,write_date",0,Last modification date,Zuletzt geändert am,0
+field,"timesheet.hours_employee,write_uid",0,Last modification by,Zuletzt geändert von,0
field,"timesheet.hours_employee_monthly,create_date",0,Creation date,Erstellungsdatum,0
field,"timesheet.hours_employee_monthly,create_uid",0,Creation user,Ersteller,0
field,"timesheet.hours_employee_monthly,employee",0,Employee,Mitarbeiter,0
@@ -19,7 +22,6 @@ field,"timesheet.hours_employee_monthly,rec_name",0,Name,Name,0
field,"timesheet.hours_employee_monthly,write_date",0,Last modification date,Zuletzt geändert am,0
field,"timesheet.hours_employee_monthly,write_uid",0,Last modification by,Zuletzt geändert von,0
field,"timesheet.hours_employee_monthly,year",0,Year,Jahr,0
-field,"timesheet.hours_employee,rec_name",0,Name,Name,0
field,"timesheet.hours_employee_weekly,create_date",0,Creation date,Erstellungsdatum,0
field,"timesheet.hours_employee_weekly,create_uid",0,Creation user,Ersteller,0
field,"timesheet.hours_employee_weekly,employee",0,Employee,Mitarbeiter,0
@@ -30,8 +32,6 @@ field,"timesheet.hours_employee_weekly,week",0,Week,Woche,0
field,"timesheet.hours_employee_weekly,write_date",0,Last modification date,Zuletzt geändert am,0
field,"timesheet.hours_employee_weekly,write_uid",0,Last modification by,Zuletzt geändert von,0
field,"timesheet.hours_employee_weekly,year",0,Year,Jahr,0
-field,"timesheet.hours_employee,write_date",0,Last modification date,Zuletzt geändert am,0
-field,"timesheet.hours_employee,write_uid",0,Last modification by,Zuletzt geändert von,0
field,"timesheet.line,create_date",0,Creation date,Erstellungsdatum,0
field,"timesheet.line,create_uid",0,Creation user,Ersteller,0
field,"timesheet.line,date",0,Date,Datum,0
@@ -54,46 +54,46 @@ field,"timesheet.work,hours",0,Timesheet Hours,Stunden,0
field,"timesheet.work,id",0,ID,ID,0
field,"timesheet.work,left",0,Left,Links,0
field,"timesheet.work,name",0,Name,Name,0
-field,"timesheet.work.open.init,from_date",0,From Date,Von,0
-field,"timesheet.work.open.init,to_date",0,To Date,Bis,0
field,"timesheet.work,parent",0,Parent,Übergeordnet (Aufgabe),0
field,"timesheet.work,rec_name",0,Name,Name,0
field,"timesheet.work,right",0,Right,Rechts,0
field,"timesheet.work,timesheet_available",0,Available on timesheets,Verfügbar für Zeiterfassung,0
field,"timesheet.work,write_date",0,Last modification date,Zuletzt geändert am,0
field,"timesheet.work,write_uid",0,Last modification by,Zuletzt geändert von,0
+field,"timesheet.work.open.init,from_date",0,From Date,Von,0
+field,"timesheet.work.open.init,to_date",0,To Date,Bis,0
help,"timesheet.work,hours",0,Total time spent on this work,Gesamtzeit für diese Arbeit,0
help,"timesheet.work,timesheet_available",0,Allow to fill in timesheets with this work,Diese Arbeit für den Eintrag in Zeiterfassungen freigeben,0
model,"ir.action,name",act_enter_lines,Enter Timesheet,Zur Zeiterfassung,0
model,"ir.action,name",act_hours_employee_form,Hours per Employee,Stunden pro Mitarbeiter,0
-model,"ir.action,name",act_open_hours_employee,Hours per Employee,Stunden pro Mitarbeiter,0
model,"ir.action,name",act_hours_employee_monthly_form,Hours per Employee per Month,Stunden pro Mitarbeiter pro Monat,0
model,"ir.action,name",act_hours_employee_weekly_form,Hours per Employee per Week,Stunden pro Mitarbeiter pro Monat,0
+model,"ir.action,name",act_line_form,Timesheet Lines,Zeitpositionen,0
+model,"ir.action,name",act_open_hours_employee,Hours per Employee,Stunden pro Mitarbeiter,0
model,"ir.action,name",act_open_work,Hours per Work,Stunden pro Aufgabe,0
-model,"ir.action,name",act_work_form2,Hours per Work,Stunden pro Aufgabe,0
model,"ir.action,name",act_open_work2,Hours per Work,Stunden pro Aufgabe,0
-model,"ir.action,name",act_work_form3,Hours per Work,Stunden pro Aufgabe,0
model,"ir.action,name",act_open_work_graph,Hours per Work,Stunden pro Aufgabe,0
-model,"ir.action,name",act_line_form,Timesheet Lines,Zeitpositionen,0
model,"ir.action,name",act_work_form,Works,Aufgaben,0
+model,"ir.action,name",act_work_form2,Hours per Work,Stunden pro Aufgabe,0
+model,"ir.action,name",act_work_form3,Hours per Work,Stunden pro Aufgabe,0
model,"ir.action,name",act_work_tree,Works,Aufgaben,0
model,"ir.action,name",act_work_tree2,Works,Aufgaben,0
model,"ir.ui.menu,name",menu_configuration,Configuration,Einstellungen,0
model,"ir.ui.menu,name",menu_enter_lines,Enter Timesheet,Zur Zeiterfassung,0
+model,"ir.ui.menu,name",menu_line_form,Timesheet Lines,Zeitpositionen,0
model,"ir.ui.menu,name",menu_open_hours_employee,Hours per Employee,Stunden pro Mitarbeiter,0
model,"ir.ui.menu,name",menu_open_hours_employee_monthly,Hours per Employee per Month,Stunden pro Mitarbeiter pro Monat,0
model,"ir.ui.menu,name",menu_open_hours_employee_weekly,Hours per Employee per Week,Stunden pro Mitarbeiter pro Woche,0
-model,"ir.ui.menu,name",menu_work_tree2,Hours per Work,Stunden pro Aufgabe,0
-model,"ir.ui.menu,name",menu_work_form2,Hours per Work,Stunden pro Aufgabe,0
model,"ir.ui.menu,name",menu_reporting,Reporting,Berichte,0
-model,"ir.ui.menu,name",menu_line_form,Timesheet Lines,Zeitpositionen,0
model,"ir.ui.menu,name",menu_timesheet,Timesheet Management,Zeiterfassung,0
model,"ir.ui.menu,name",menu_work_form,Works,Aufgaben,0
+model,"ir.ui.menu,name",menu_work_form2,Hours per Work,Stunden pro Aufgabe,0
model,"ir.ui.menu,name",menu_work_tree,Works,Aufgaben,0
+model,"ir.ui.menu,name",menu_work_tree2,Hours per Work,Stunden pro Aufgabe,0
model,"res.group,name",group_timesheet_admin,Timesheet Administration,Zeiterfassung Administration,0
model,"timesheet.enter_lines.init,name",0,Enter Lines Init,Eingabe Zeitposition Init,0
-model,"timesheet.hours_employee_monthly,name",0,Hours per Employee per Month,Stunden pro Mitarbeiter und Monat,0
model,"timesheet.hours_employee,name",0,Hours per Employee,Stunden pro Mitarbeiter,0
+model,"timesheet.hours_employee_monthly,name",0,Hours per Employee per Month,Stunden pro Mitarbeiter und Monat,0
model,"timesheet.hours_employee_weekly,name",0,Hours per Employee per Week,Stunden pro Mitarbeiter und Woche,0
model,"timesheet.line,name",0,Timesheet Line,Zeitposition,0
model,"timesheet.open_hours_employee.init,name",0,Open Hours Employee Init,Stunden Mitarbeiter Öffnen Init,0
@@ -116,7 +116,7 @@ wizard_button,"timesheet.enter_lines,init,end",0,Cancel,Abbrechen,0
wizard_button,"timesheet.enter_lines,init,enter",0,Enter,Eingabe,0
wizard_button,"timesheet.open_hours_employee,init,end",0,Cancel,Abbrechen,0
wizard_button,"timesheet.open_hours_employee,init,open",0,Open,Öffnen,0
-wizard_button,"timesheet.work.open2,init,end",0,Cancel,Abbrechen,0
-wizard_button,"timesheet.work.open2,init,open",0,Open,Öffnen,0
wizard_button,"timesheet.work.open,init,end",0,Cancel,Abbrechen,0
wizard_button,"timesheet.work.open,init,open",0,Open,Öffnen,0
+wizard_button,"timesheet.work.open2,init,end",0,Cancel,Abbrechen,0
+wizard_button,"timesheet.work.open2,init,open",0,Open,Öffnen,0
diff --git a/fr_FR.csv b/fr_FR.csv
index eb985d6..423e15d 100644
--- a/fr_FR.csv
+++ b/fr_FR.csv
@@ -6,12 +6,12 @@ field,"timesheet.enter_lines.init,date",0,Date,Date,0
field,"timesheet.enter_lines.init,employee",0,Employee,Employé,0
field,"timesheet.hours_employee,employee",0,Employee,Employé,0
field,"timesheet.hours_employee,hours",0,Hours,Heures,0
+field,"timesheet.hours_employee,rec_name",0,Name,Nom,0
field,"timesheet.hours_employee_monthly,employee",0,Employee,Employé,0
field,"timesheet.hours_employee_monthly,hours",0,Hours,Heures,0
field,"timesheet.hours_employee_monthly,month",0,Month,Mois,0
field,"timesheet.hours_employee_monthly,rec_name",0,Name,Nom,0
field,"timesheet.hours_employee_monthly,year",0,Year,Année,0
-field,"timesheet.hours_employee,rec_name",0,Name,Nom,0
field,"timesheet.hours_employee_weekly,employee",0,Employee,Employé,0
field,"timesheet.hours_employee_weekly,hours",0,Hours,Heures,0
field,"timesheet.hours_employee_weekly,rec_name",0,Name,Nom,0
@@ -31,44 +31,44 @@ field,"timesheet.work,company",0,Company,Société,0
field,"timesheet.work,hours",0,Timesheet Hours,Heures,0
field,"timesheet.work,left",0,Left,Gauche,0
field,"timesheet.work,name",0,Name,Nom,0
-field,"timesheet.work.open.init,from_date",0,From Date,Date de début,0
-field,"timesheet.work.open.init,to_date",0,To Date,Date de fin,0
field,"timesheet.work,parent",0,Parent,Parent,0
field,"timesheet.work,rec_name",0,Name,Nom,0
field,"timesheet.work,right",0,Right,Droite,0
field,"timesheet.work,timesheet_available",0,Available on timesheets,Disponible sur les feuilles de présence,0
+field,"timesheet.work.open.init,from_date",0,From Date,Date de début,0
+field,"timesheet.work.open.init,to_date",0,To Date,Date de fin,0
help,"timesheet.work,hours",0,Total time spent on this work,Temps total passé sur cette activité,0
help,"timesheet.work,timesheet_available",0,Allow to fill in timesheets with this work,Autoriser cette activité sur les feuilles de présence,0
model,"ir.action,name",act_enter_lines,Enter Timesheet,Entrez feuille de présence,0
model,"ir.action,name",act_hours_employee_form,Hours per Employee,Heures par employé,0
-model,"ir.action,name",act_open_hours_employee,Hours per Employee,Heures par employé,0
model,"ir.action,name",act_hours_employee_monthly_form,Hours per Employee per Month,Nombre d'heures par employé par mois,0
model,"ir.action,name",act_hours_employee_weekly_form,Hours per Employee per Week,Nombre d'heures par employé par semaine,0
+model,"ir.action,name",act_line_form,Timesheet Lines,Lignes de feuille de présence,0
+model,"ir.action,name",act_open_hours_employee,Hours per Employee,Heures par employé,0
model,"ir.action,name",act_open_work,Hours per Work,Heures par activité,0
-model,"ir.action,name",act_work_form2,Hours per Work,Heures par activité,0
model,"ir.action,name",act_open_work2,Hours per Work,Heures par activité,0
-model,"ir.action,name",act_work_form3,Hours per Work,Heures par activité,0
model,"ir.action,name",act_open_work_graph,Hours per Work,Heures par activité,0
-model,"ir.action,name",act_line_form,Timesheet Lines,Lignes de feuille de présence,0
model,"ir.action,name",act_work_form,Works,Activités,0
+model,"ir.action,name",act_work_form2,Hours per Work,Heures par activité,0
+model,"ir.action,name",act_work_form3,Hours per Work,Heures par activité,0
model,"ir.action,name",act_work_tree,Works,Activités,0
model,"ir.action,name",act_work_tree2,Works,Activités,0
model,"ir.ui.menu,name",menu_configuration,Configuration,Configuration,0
model,"ir.ui.menu,name",menu_enter_lines,Enter Timesheet,Entrer feuille de présence,0
+model,"ir.ui.menu,name",menu_line_form,Timesheet Lines,Lignes de feuille de présence,0
model,"ir.ui.menu,name",menu_open_hours_employee,Hours per Employee,Heures par employé,0
model,"ir.ui.menu,name",menu_open_hours_employee_monthly,Hours per Employee per Month,Nombre d'heures par employé par mois,0
model,"ir.ui.menu,name",menu_open_hours_employee_weekly,Hours per Employee per Week,Nombre d'heures par employé par semaine,0
-model,"ir.ui.menu,name",menu_work_tree2,Hours per Work,Heures par activité,0
-model,"ir.ui.menu,name",menu_work_form2,Hours per Work,Heures par activité,0
model,"ir.ui.menu,name",menu_reporting,Reporting,Rapports,0
-model,"ir.ui.menu,name",menu_line_form,Timesheet Lines,Lignes de feuille de présence,0
model,"ir.ui.menu,name",menu_timesheet,Timesheet Management,Feuilles de présence,0
model,"ir.ui.menu,name",menu_work_form,Works,Activités,0
+model,"ir.ui.menu,name",menu_work_form2,Hours per Work,Heures par activité,0
model,"ir.ui.menu,name",menu_work_tree,Works,Activités,0
+model,"ir.ui.menu,name",menu_work_tree2,Hours per Work,Heures par activité,0
model,"res.group,name",group_timesheet_admin,Timesheet Administration,Administration feuille de présence,0
model,"timesheet.enter_lines.init,name",0,Enter Lines Init,Entrez les lignes - Init,0
-model,"timesheet.hours_employee_monthly,name",0,Hours per Employee per Month,Nombre d'heures par employé par mois,0
model,"timesheet.hours_employee,name",0,Hours per Employee,Heures par employé,0
+model,"timesheet.hours_employee_monthly,name",0,Hours per Employee per Month,Nombre d'heures par employé par mois,0
model,"timesheet.hours_employee_weekly,name",0,Hours per Employee per Week,Nombre d'heures par employé par semaine,0
model,"timesheet.line,name",0,Timesheet Line,Ligne de feuille de présence,0
model,"timesheet.open_hours_employee.init,name",0,Open Hours Employee Init,Heures d'ouverture des employés - Init,0
@@ -91,7 +91,7 @@ wizard_button,"timesheet.enter_lines,init,end",0,Cancel,Annuler,0
wizard_button,"timesheet.enter_lines,init,enter",0,Enter,Entrez,0
wizard_button,"timesheet.open_hours_employee,init,end",0,Cancel,Annuler,0
wizard_button,"timesheet.open_hours_employee,init,open",0,Open,Ouvrir,0
-wizard_button,"timesheet.work.open2,init,end",0,Cancel,Annuler,0
-wizard_button,"timesheet.work.open2,init,open",0,Open,Ouvrir,0
wizard_button,"timesheet.work.open,init,end",0,Cancel,Annuler,0
wizard_button,"timesheet.work.open,init,open",0,Open,Ouvrir,0
+wizard_button,"timesheet.work.open2,init,end",0,Cancel,Annuler,0
+wizard_button,"timesheet.work.open2,init,open",0,Open,Ouvrir,0
diff --git a/line.py b/line.py
index 99fb530..e97b6ed 100644
--- a/line.py
+++ b/line.py
@@ -1,11 +1,10 @@
#This file is part of Tryton. The COPYRIGHT file at the top level of
#this repository contains the full copyright notices and license terms.
-"Timesheet Line"
from trytond.model import ModelView, ModelSQL, fields
from trytond.wizard import Wizard
from trytond.backend import FIELDS
from trytond.pyson import Eval, PYSONEncoder, Date
-
+from trytond.transaction import Transaction
class Line(ModelSQL, ModelView):
'Timesheet Line'
@@ -29,39 +28,31 @@ class Line(ModelSQL, ModelView):
'CHECK(hours >= 0.0)', 'Hours field must be positive'),
]
- def default_employee(self, cursor, user_id, context=None):
+ def default_employee(self):
user_obj = self.pool.get('res.user')
employee_obj = self.pool.get('company.employee')
- if context is None:
- context = {}
employee_id = None
- if context.get('employee'):
- employee_id = context['employee']
+ if Transaction().context.get('employee'):
+ employee_id = Transaction().context['employee']
else:
- user = user_obj.browse(cursor, user_id, user_id, context=context)
+ user = user_obj.browse(Transaction().user)
if user.employee:
employee_id = user.employee.id
if employee_id:
return employee_id
return False
- def default_date(self, cursor, user, context=None):
+ def default_date(self):
date_obj = self.pool.get('ir.date')
- if context is None:
- context = {}
- if context.get('date'):
- return context['date']
- return date_obj.today(cursor, user, context=context)
+ return Transaction().context.get('date') or date_obj.today()
- def view_header_get(self, cursor, user, value, view_type='form',
- context=None):
- if not context.get('employee'):
+ def view_header_get(self, value, view_type='form'):
+ if not Transaction().context.get('employee'):
return value
employee_obj = self.pool.get('company.employee')
- employee = employee_obj.browse(cursor, user, context['employee'],
- context=context)
+ employee = employee_obj.browse(Transaction().context['employee'])
return value + " (" + employee.name + ")"
Line()
@@ -75,13 +66,13 @@ class EnterLinesInit(ModelView):
domain=[('company', '=', Eval('company'))])
date = fields.Date('Date', required=True)
- def default_employee(self, cursor, user, context=None):
+ def default_employee(self):
line_obj = self.pool.get('timesheet.line')
- return line_obj.default_employee(cursor, user, context=context)
+ return line_obj.default_employee()
- def default_date(self, cursor, user, context=None):
+ def default_date(self):
line_obj = self.pool.get('timesheet.line')
- return line_obj.default_date(cursor, user, context=context)
+ return line_obj.default_date()
EnterLinesInit()
@@ -109,13 +100,12 @@ class EnterLines(Wizard):
}
}
- def _action_enter_lines(self, cursor, user, data, context=None):
+ def _action_enter_lines(self, data):
model_data_obj = self.pool.get('ir.model.data')
act_window_obj = self.pool.get('ir.action.act_window')
employee_obj = self.pool.get('company.employee')
- act_window_id = model_data_obj.get_id(cursor, user, 'timesheet',
- 'act_line_form', context=context)
- res = act_window_obj.read(cursor, user, act_window_id, context=context)
+ act_window_id = model_data_obj.get_id('timesheet', 'act_line_form')
+ res = act_window_obj.read(act_window_id)
date = data['form']['date']
date = Date(date.year, date.month, date.day)
res['pyson_domain'] = PYSONEncoder().encode([
@@ -128,8 +118,7 @@ class EnterLines(Wizard):
})
if data['form']['employee']:
- employee = employee_obj.browse(
- cursor, user, data['form']['employee'], context=context)
+ employee = employee_obj.browse(data['form']['employee'])
res['name'] += " - " + employee.rec_name
return res
@@ -145,17 +134,15 @@ class HoursEmployee(ModelSQL, ModelView):
employee = fields.Many2One('company.employee', 'Employee', select=1)
hours = fields.Float('Hours', digits=(16, 2))
- def table_query(self, context=None):
- if context is None:
- context = {}
+ def table_query(self):
clause = ' '
- args = []
- if context.get('start_date'):
+ args = [True]
+ if Transaction().context.get('start_date'):
clause += 'AND date >= %s '
- args.append(context['start_date'])
- if context.get('end_date'):
+ args.append(Transaction().context['start_date'])
+ if Transaction().context.get('end_date'):
clause += 'AND date <= %s '
- args.append(context['end_date'])
+ args.append(Transaction().context['end_date'])
return ('SELECT DISTINCT(employee) AS id, ' \
'MAX(create_uid) AS create_uid, ' \
'MAX(create_date) AS create_date, ' \
@@ -164,7 +151,7 @@ class HoursEmployee(ModelSQL, ModelView):
'employee, ' \
'SUM(COALESCE(hours, 0)) AS hours ' \
'FROM timesheet_line ' \
- 'WHERE True ' \
+ 'WHERE %s ' \
+ clause + \
'GROUP BY employee', args)
@@ -204,12 +191,12 @@ class OpenHoursEmployee(Wizard):
},
}
- def _action_open(self, cursor, user, data, context=None):
+ def _action_open(self, data):
model_data_obj = self.pool.get('ir.model.data')
act_window_obj = self.pool.get('ir.action.act_window')
- act_window_id = model_data_obj.get_id(cursor, user, 'timesheet',
- 'act_hours_employee_form', context=context)
- res = act_window_obj.read(cursor, user, act_window_id, context=context)
+ act_window_id = model_data_obj.get_id('timesheet',
+ 'act_hours_employee_form')
+ res = act_window_obj.read(act_window_id)
res['pyson_context'] = PYSONEncoder().encode({
'start_date': data['form']['start_date'],
'end_date': data['form']['end_date'],
@@ -235,10 +222,11 @@ class HoursEmployeeWeekly(ModelSQL, ModelView):
self._order.insert(1, ('week', 'DESC'))
self._order.insert(2, ('employee', 'ASC'))
- def table_query(self, context=None):
+ def table_query(self):
type_name = FIELDS[self.year._type].sql_type(self.year)[0]
return ('SELECT id, create_uid, create_date, write_uid, write_date, ' \
- 'CAST(year AS ' + type_name + '), week, employee, hours ' \
+ 'CAST(year AS ' + type_name + ') AS year, week, ' \
+ 'employee, hours ' \
'FROM ('
'SELECT EXTRACT(WEEK FROM date) + ' \
'EXTRACT(YEAR FROM date) * 100 + ' \
@@ -272,10 +260,11 @@ class HoursEmployeeMonthly(ModelSQL, ModelView):
self._order.insert(1, ('month', 'DESC'))
self._order.insert(2, ('employee', 'ASC'))
- def table_query(self, context=None):
+ def table_query(self):
type_name = FIELDS[self.year._type].sql_type(self.year)[0]
return ('SELECT id, create_uid, create_date, write_uid, write_date, ' \
- 'CAST(year AS ' + type_name + '), month, employee, hours ' \
+ 'CAST(year AS ' + type_name + ') AS year, month, ' \
+ 'employee, hours ' \
'FROM ('
'SELECT EXTRACT(MONTH FROM date) + ' \
'EXTRACT(YEAR FROM date) * 100 + ' \
diff --git a/tests/test_timesheet.py b/tests/test_timesheet.py
index a4f57aa..6c1f118 100644
--- a/tests/test_timesheet.py
+++ b/tests/test_timesheet.py
@@ -25,7 +25,7 @@ class TimesheetTestCase(unittest.TestCase):
'''
Test views.
'''
- self.assertRaises(Exception, test_view('timesheet'))
+ test_view('timesheet')
def suite():
suite = trytond.tests.test_tryton.suite()
diff --git a/timesheet.xml b/timesheet.xml
index 5c639bd..b57f5fd 100644
--- a/timesheet.xml
+++ b/timesheet.xml
@@ -9,6 +9,9 @@ this repository contains the full copyright notices and license terms. -->
<record model="res.user" id="res.user_admin">
<field name="groups" eval="[('add', ref('group_timesheet_admin'))]"/>
</record>
+ <record model="res.user" id="res.user_trigger">
+ <field name="groups" eval="[('add', ref('group_timesheet_admin'))]"/>
+ </record>
<menuitem name="Timesheet Management" sequence="6" id="menu_timesheet"
icon="tryton-clock"/>
diff --git a/trytond_timesheet.egg-info/PKG-INFO b/trytond_timesheet.egg-info/PKG-INFO
index 63d0f5b..bd6e48f 100644
--- a/trytond_timesheet.egg-info/PKG-INFO
+++ b/trytond_timesheet.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.0
Name: trytond-timesheet
-Version: 1.6.0
+Version: 1.8.0
Summary: Timesheet Module with:
- Work
- Timesheet line
@@ -14,7 +14,7 @@ Home-page: http://www.tryton.org/
Author: B2CK
Author-email: info at b2ck.com
License: GPL-3
-Download-URL: http://downloads.tryton.org/1.6/
+Download-URL: http://downloads.tryton.org/1.8/
Description: UNKNOWN
Platform: UNKNOWN
Classifier: Development Status :: 5 - Production/Stable
diff --git a/trytond_timesheet.egg-info/requires.txt b/trytond_timesheet.egg-info/requires.txt
index d9790c4..46957f2 100644
--- a/trytond_timesheet.egg-info/requires.txt
+++ b/trytond_timesheet.egg-info/requires.txt
@@ -1,3 +1,3 @@
-trytond_company >= 1.6, < 1.7
-trytond_company_work_time >= 1.6, < 1.7
-trytond >= 1.6, < 1.7
\ No newline at end of file
+trytond_company >= 1.8, < 1.9
+trytond_company_work_time >= 1.8, < 1.9
+trytond >= 1.8, < 1.9
\ No newline at end of file
diff --git a/work.py b/work.py
index c29693f..13f8b1c 100644
--- a/work.py
+++ b/work.py
@@ -1,10 +1,9 @@
#This file is part of Tryton. The COPYRIGHT file at the top level of
#this repository contains the full copyright notices and license terms.
-"Work"
from trytond.model import ModelView, ModelSQL, fields
from trytond.wizard import Wizard
from trytond.pyson import PYSONEncoder
-
+from trytond.transaction import Transaction
class Work(ModelSQL, ModelView):
'Work'
@@ -36,21 +35,17 @@ class Work(ModelSQL, ModelView):
'as it\'s parent work!',
})
- def default_active(self, cursor, user, context=None):
+ def default_active(self):
return True
- def default_timesheet_available(self, cursor, user, context=None):
+ def default_timesheet_available(self):
return True
- def default_company(self, cursor, user, context=None):
- if context is None:
- context = {}
- if context.get('company'):
- return context['company']
- return False
+ def default_company(self):
+ return Transaction().context.get('company') or False
- def check_parent_company(self, cursor, user, ids):
- for work in self.browse(cursor, user, ids):
+ def check_parent_company(self, ids):
+ for work in self.browse(ids):
if not work.parent:
continue
if work.parent.company.id != work.company.id:
@@ -71,10 +66,10 @@ class Work(ModelSQL, ModelView):
to_compute[h] = False
return res
- def get_hours(self, cursor, user, ids, name, context=None):
- all_ids = self.search(cursor, user, [
- ('parent', 'child_of', ids)
- ], context=context)
+ def get_hours(self, ids, name):
+ all_ids = self.search([
+ ('parent', 'child_of', ids),
+ ])
# force inactive ids to be in all_ids
all_ids = all_ids + ids
clause = "SELECT work, sum(hours) FROM timesheet_line "\
@@ -82,19 +77,20 @@ class Work(ModelSQL, ModelView):
% ",".join(('%s',) * len(all_ids))
date_cond = ""
args = []
- if context.get('from_date'):
+ if Transaction().context.get('from_date'):
date_cond = " AND date >= %s"
- args.append(context['from_date'])
- if context.get('to_date'):
+ args.append(Transaction().context['from_date'])
+ if Transaction().context.get('to_date'):
date_cond += " AND date <= %s"
- args.append(context['to_date'])
+ args.append(Transaction().context['to_date'])
clause += date_cond + " GROUP BY work"
- cursor.execute(clause, all_ids + args)
+ Transaction().cursor.execute(clause, all_ids + args)
- hours_by_wt = dict([(i[0], i[1]) for i in cursor.fetchall()])
+ hours_by_wt = dict((i[0], i[1]) for i in
+ Transaction().cursor.fetchall())
to_compute = dict.fromkeys(all_ids, True)
- works = self.browse(cursor, user, all_ids, context=context)
+ works = self.browse(all_ids)
children = {}
for work in works:
if work.parent:
@@ -102,7 +98,7 @@ class Work(ModelSQL, ModelView):
self._tree_qty(hours_by_wt, children, ids, to_compute)
return hours_by_wt
- def get_rec_name(self, cursor, user, ids, name, context=None):
+ def get_rec_name(self, ids, name):
if not ids:
return {}
res = {}
@@ -111,22 +107,21 @@ class Work(ModelSQL, ModelView):
return _name(work.parent) + '\\' + work.name
else:
return work.name
- for work in self.browse(cursor, user, ids, context=context):
+ for work in self.browse(ids):
res[work.id] = _name(work)
return res
- def write(self, cursor, user, ids, vals, context=None):
+ def write(self, ids, vals):
child_ids = None
if not vals.get('active', True):
- child_ids = self.search(cursor, user, [
+ child_ids = self.search([
('parent', 'child_of', ids),
- ], context=context)
- res = super(Work, self).write(cursor, user, ids, vals,
- context=context)
+ ])
+ res = super(Work, self).write(ids, vals)
if child_ids:
- self.write(cursor, user, child_ids, {
+ self.write(child_ids, {
'active': False,
- }, context=context)
+ })
return res
Work()
@@ -164,12 +159,11 @@ class OpenWork(Wizard):
},
}
- def _action_open_work(self, cursor, user, data, context=None):
+ def _action_open_work(self, data):
model_data_obj = self.pool.get('ir.model.data')
act_window_obj = self.pool.get('ir.action.act_window')
- act_window_id = model_data_obj.get_id(cursor, user, 'timesheet',
- 'act_work_tree2', context=context)
- res = act_window_obj.read(cursor, user, act_window_id, context=context)
+ act_window_id = model_data_obj.get_id('timesheet', 'act_work_tree2')
+ res = act_window_obj.read(act_window_id)
res['pyson_context'] = PYSONEncoder().encode({
'from_date': data['form']['from_date'],
'to_date': data['form']['to_date'],
@@ -182,12 +176,11 @@ OpenWork()
class OpenWork2(OpenWork):
_name = 'timesheet.work.open2'
- def _action_open_work(self, cursor, user, data, context=None):
+ def _action_open_work(self, data):
model_data_obj = self.pool.get('ir.model.data')
act_window_obj = self.pool.get('ir.action.act_window')
- act_window_id = model_data_obj.get_id(cursor, user, 'timesheet',
- 'act_work_form2', context=context)
- res = act_window_obj.read(cursor, user, act_window_id, context=context)
+ act_window_id = model_data_obj.get_id('timesheet', 'act_work_form2')
+ res = act_window_obj.read(act_window_id)
res['pyson_context'] = PYSONEncoder().encode({
'from_date': data['form']['from_date'],
'to_date': data['form']['to_date'],
@@ -209,20 +202,15 @@ class OpenWorkGraph(Wizard):
},
}
- def _action_open_work(self, cursor, user, data, context=None):
+ def _action_open_work(self, data):
model_data_obj = self.pool.get('ir.model.data')
act_window_obj = self.pool.get('ir.action.act_window')
work_obj = self.pool.get('timesheet.work')
- if context is None:
- context = {}
-
- act_window_id = model_data_obj.get_id(cursor, user, 'timesheet',
- 'act_work_form3', context=context)
- res = act_window_obj.read(cursor, user, act_window_id, context=context)
- if 'active_id' in context:
- work = work_obj.browse(cursor, user, context['active_id'],
- context=context)
+ act_window_id = model_data_obj.get_id('timesheet', 'act_work_form3')
+ res = act_window_obj.read(act_window_id)
+ if 'active_id' in Transaction().context:
+ work = work_obj.browse(Transaction().context['active_id'])
res['name'] = res['name'] + ' - ' + work.rec_name
return res
commit cded7962a26353bcdef4f47c861ee200699375b3
Author: Mathias Behrle <mathiasb at mbsolutions.selfip.biz>
Date: Thu May 13 11:30:18 2010 +0200
Adding upstream version 1.6.0.
diff --git a/CHANGELOG b/CHANGELOG
index 931601e..539164d 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,2 +1,5 @@
+Version 1.6.0 - 2010-05-12
+* Bug fixes (see mercurial logs for details)
+
Version 1.4.0 - 2009-10-19
* Initial release
diff --git a/COPYRIGHT b/COPYRIGHT
index 2afd2a7..cca7db9 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,5 +1,6 @@
-Copyright (C) 2008 Cédric Krier.
-Copyright (C) 2008 B2CK SPRL.
+Copyright (C) 2008-2010 Cédric Krier.
+Copyright (C) 2008-2010 Bertrand Chenal.
+Copyright (C) 2008-2010 B2CK SPRL.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff --git a/MANIFEST.in b/MANIFEST.in
index b2a140e..dcb2afa 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -7,5 +7,4 @@ include LICENSE
include *.xml
include *.odt
include *.csv
-include tests/*
include doc/*
diff --git a/PKG-INFO b/PKG-INFO
index e0d8d0d..b1c0473 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.0
Name: trytond_timesheet
-Version: 1.4.0
+Version: 1.6.0
Summary: Timesheet Module with:
- Work
- Timesheet line
@@ -14,7 +14,7 @@ Home-page: http://www.tryton.org/
Author: B2CK
Author-email: info at b2ck.com
License: GPL-3
-Download-URL: http://downloads.tryton.org/1.4/
+Download-URL: http://downloads.tryton.org/1.6/
Description: UNKNOWN
Platform: UNKNOWN
Classifier: Development Status :: 5 - Production/Stable
diff --git a/__tryton__.py b/__tryton__.py
index 96e474c..b405171 100644
--- a/__tryton__.py
+++ b/__tryton__.py
@@ -6,7 +6,7 @@
'name_es_CO': 'Hoja de Asistencia',
'name_es_ES': 'Partes de trabajo',
'name_fr_FR': 'Feuille de présence',
- 'version': '1.4.0',
+ 'version': '1.6.0',
'author': 'B2CK',
'email': 'info at b2ck.com',
'website': 'http://www.tryton.org/',
diff --git a/line.py b/line.py
index 7862f3a..99fb530 100644
--- a/line.py
+++ b/line.py
@@ -1,9 +1,10 @@
-#This file is part of Tryton. The COPYRIGHT file at the top level
-#of this repository contains the full copyright notices and license terms.
+#This file is part of Tryton. The COPYRIGHT file at the top level of
+#this repository contains the full copyright notices and license terms.
"Timesheet Line"
from trytond.model import ModelView, ModelSQL, fields
from trytond.wizard import Wizard
from trytond.backend import FIELDS
+from trytond.pyson import Eval, PYSONEncoder, Date
class Line(ModelSQL, ModelView):
@@ -12,7 +13,7 @@ class Line(ModelSQL, ModelView):
_description = __doc__
employee = fields.Many2One('company.employee', 'Employee', required=True,
- select=1, domain=["('company', '=', company)"])
+ select=1, domain=[('company', '=', Eval('company'))])
date = fields.Date('Date', required=True, select=1)
hours = fields.Float('Hours', digits=(16, 2), required=True)
work = fields.Many2One('timesheet.work', 'Work',
@@ -71,7 +72,7 @@ class EnterLinesInit(ModelView):
_name = 'timesheet.enter_lines.init'
_description = __doc__
employee = fields.Many2One('company.employee', 'Employee', required=True,
- domain=["('company', '=', company)"])
+ domain=[('company', '=', Eval('company'))])
date = fields.Date('Date', required=True)
def default_employee(self, cursor, user, context=None):
@@ -112,22 +113,18 @@ class EnterLines(Wizard):
model_data_obj = self.pool.get('ir.model.data')
act_window_obj = self.pool.get('ir.action.act_window')
employee_obj = self.pool.get('company.employee')
-
- model_data_ids = model_data_obj.search(cursor, user, [
- ('fs_id', '=', 'act_line_form'),
- ('module', '=', 'timesheet'),
- ('inherit', '=', False),
- ], limit=1, context=context)
- model_data = model_data_obj.browse(cursor, user, model_data_ids[0],
- context=context)
- res = act_window_obj.read(cursor, user, model_data.db_id, context=context)
- res['domain'] = str([
+ act_window_id = model_data_obj.get_id(cursor, user, 'timesheet',
+ 'act_line_form', context=context)
+ res = act_window_obj.read(cursor, user, act_window_id, context=context)
+ date = data['form']['date']
+ date = Date(date.year, date.month, date.day)
+ res['pyson_domain'] = PYSONEncoder().encode([
('employee', '=', data['form']['employee']),
- ('date', '=', data['form']['date']),
+ ('date', '=', date),
])
- res['context'] = str({
+ res['pyson_context'] = PYSONEncoder().encode({
'employee': data['form']['employee'],
- 'date': data['form']['date'],
+ 'date': date,
})
if data['form']['employee']:
@@ -210,16 +207,10 @@ class OpenHoursEmployee(Wizard):
def _action_open(self, cursor, user, data, context=None):
model_data_obj = self.pool.get('ir.model.data')
act_window_obj = self.pool.get('ir.action.act_window')
-
- model_data_ids = model_data_obj.search(cursor, user, [
- ('fs_id', '=', 'act_hours_employee_form'),
- ('module', '=', 'timesheet'),
- ('inherit', '=', False),
- ], limit=1, context=context)
- model_data = model_data_obj.browse(cursor, user, model_data_ids[0],
- context=context)
- res = act_window_obj.read(cursor, user, model_data.db_id, context=context)
- res['context'] = str({
+ act_window_id = model_data_obj.get_id(cursor, user, 'timesheet',
+ 'act_hours_employee_form', context=context)
+ res = act_window_obj.read(cursor, user, act_window_id, context=context)
+ res['pyson_context'] = PYSONEncoder().encode({
'start_date': data['form']['start_date'],
'end_date': data['form']['end_date'],
})
diff --git a/setup.py b/setup.py
index 32678a1..761dd28 100644
--- a/setup.py
+++ b/setup.py
@@ -2,19 +2,22 @@
#This file is part of Tryton. The COPYRIGHT file at the top level of
#this repository contains the full copyright notices and license terms.
-from setuptools import setup, find_packages
+from setuptools import setup
import re
-info = eval(file('__tryton__.py').read())
+info = eval(open('__tryton__.py').read())
+major_version, minor_version, _ = info.get('version', '0.0.1').split('.', 2)
+major_version = int(major_version)
+minor_version = int(minor_version)
requires = []
for dep in info.get('depends', []):
if not re.match(r'(ir|res|workflow|webdav)(\W|$)', dep):
- requires.append('trytond_' + dep)
-
-major_version, minor_version, _ = info.get('version', '0.0.1').split('.', 2)
-requires.append('trytond >= %s.%s' % (major_version, minor_version))
-requires.append('trytond < %s.%s' % (major_version, int(minor_version) + 1))
+ requires.append('trytond_%s >= %s.%s, < %s.%s' %
+ (dep, major_version, minor_version, major_version,
+ minor_version + 1))
+requires.append('trytond >= %s.%s, < %s.%s' %
+ (major_version, minor_version, major_version, minor_version + 1))
setup(name='trytond_timesheet',
version=info.get('version', '0.0.1'),
@@ -27,6 +30,7 @@ setup(name='trytond_timesheet',
package_dir={'trytond.modules.timesheet': '.'},
packages=[
'trytond.modules.timesheet',
+ 'trytond.modules.timesheet.tests',
],
package_data={
'trytond.modules.timesheet': info.get('xml', []) \
@@ -53,4 +57,6 @@ setup(name='trytond_timesheet',
[trytond.modules]
timesheet = trytond.modules.timesheet
""",
+ test_suite='tests',
+ test_loader='trytond.test_loader:Loader',
)
diff --git a/tests/__init__.py b/tests/__init__.py
index d8bc848..25f3642 100644
--- a/tests/__init__.py
+++ b/tests/__init__.py
@@ -1,4 +1,4 @@
#This file is part of Tryton. The COPYRIGHT file at the top level of
#this repository contains the full copyright notices and license terms.
-from test_timesheet import *
+from test_timesheet import suite
diff --git a/tests/test_timesheet.py b/tests/test_timesheet.py
index b1a6a55..a4f57aa 100644
--- a/tests/test_timesheet.py
+++ b/tests/test_timesheet.py
@@ -10,7 +10,7 @@ if os.path.isdir(DIR):
import unittest
import trytond.tests.test_tryton
-from trytond.tests.test_tryton import RPCProxy, CONTEXT, SOCK, test_view
+from trytond.tests.test_tryton import test_view
class TimesheetTestCase(unittest.TestCase):
@@ -28,11 +28,10 @@ class TimesheetTestCase(unittest.TestCase):
self.assertRaises(Exception, test_view('timesheet'))
def suite():
- return unittest.TestLoader().loadTestsFromTestCase(TimesheetTestCase)
+ suite = trytond.tests.test_tryton.suite()
+ suite.addTests(unittest.TestLoader().loadTestsFromTestCase(
+ TimesheetTestCase))
+ return suite
if __name__ == '__main__':
- suiteTrytond = trytond.tests.test_tryton.suite()
- suiteTimesheet = suite()
- alltests = unittest.TestSuite([suiteTrytond, suiteTimesheet])
- unittest.TextTestRunner(verbosity=2).run(alltests)
- SOCK.disconnect()
+ unittest.TextTestRunner(verbosity=2).run(suite())
diff --git a/trytond_timesheet.egg-info/PKG-INFO b/trytond_timesheet.egg-info/PKG-INFO
index 99a554e..63d0f5b 100644
--- a/trytond_timesheet.egg-info/PKG-INFO
+++ b/trytond_timesheet.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.0
Name: trytond-timesheet
-Version: 1.4.0
+Version: 1.6.0
Summary: Timesheet Module with:
- Work
- Timesheet line
@@ -14,7 +14,7 @@ Home-page: http://www.tryton.org/
Author: B2CK
Author-email: info at b2ck.com
License: GPL-3
-Download-URL: http://downloads.tryton.org/1.4/
+Download-URL: http://downloads.tryton.org/1.6/
Description: UNKNOWN
Platform: UNKNOWN
Classifier: Development Status :: 5 - Production/Stable
diff --git a/trytond_timesheet.egg-info/SOURCES.txt b/trytond_timesheet.egg-info/SOURCES.txt
index ffee670..7a13615 100644
--- a/trytond_timesheet.egg-info/SOURCES.txt
+++ b/trytond_timesheet.egg-info/SOURCES.txt
@@ -16,9 +16,9 @@ work.xml
./__tryton__.py
./line.py
./work.py
+./tests/__init__.py
+./tests/test_timesheet.py
doc/index.rst
-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 695fdbc..d9790c4 100644
--- a/trytond_timesheet.egg-info/requires.txt
+++ b/trytond_timesheet.egg-info/requires.txt
@@ -1,4 +1,3 @@
-trytond_company
-trytond_company_work_time
-trytond >= 1.4
-trytond < 1.5
\ No newline at end of file
+trytond_company >= 1.6, < 1.7
+trytond_company_work_time >= 1.6, < 1.7
+trytond >= 1.6, < 1.7
\ No newline at end of file
diff --git a/work.py b/work.py
index e80e2ce..c29693f 100644
--- a/work.py
+++ b/work.py
@@ -3,6 +3,7 @@
"Work"
from trytond.model import ModelView, ModelSQL, fields
from trytond.wizard import Wizard
+from trytond.pyson import PYSONEncoder
class Work(ModelSQL, ModelView):
@@ -17,8 +18,8 @@ class Work(ModelSQL, ModelView):
left = fields.Integer('Left', required=True, select=1)
right = fields.Integer('Right', required=True, select=1)
children = fields.One2Many('timesheet.work', 'parent', 'Children')
- hours = fields.Function('get_hours', digits=(16, 2),
- string='Timesheet Hours', help="Total time spent on this work")
+ hours = fields.Function(fields.Float('Timesheet Hours', digits=(16, 2),
+ help="Total time spent on this work"), 'get_hours')
timesheet_available = fields.Boolean('Available on timesheets',
help="Allow to fill in timesheets with this work")
company = fields.Many2One('company.company', 'Company', required=True)
@@ -70,7 +71,7 @@ class Work(ModelSQL, ModelView):
to_compute[h] = False
return res
- def get_hours(self, cursor, user, ids, name, arg, context=None):
+ def get_hours(self, cursor, user, ids, name, context=None):
all_ids = self.search(cursor, user, [
('parent', 'child_of', ids)
], context=context)
@@ -101,7 +102,7 @@ class Work(ModelSQL, ModelView):
self._tree_qty(hours_by_wt, children, ids, to_compute)
return hours_by_wt
- def get_rec_name(self, cursor, user, ids, name, arg, context=None):
+ def get_rec_name(self, cursor, user, ids, name, context=None):
if not ids:
return {}
res = {}
@@ -166,16 +167,10 @@ class OpenWork(Wizard):
def _action_open_work(self, cursor, user, data, context=None):
model_data_obj = self.pool.get('ir.model.data')
act_window_obj = self.pool.get('ir.action.act_window')
-
- model_data_ids = model_data_obj.search(cursor, user, [
- ('fs_id', '=', 'act_work_tree2'),
- ('module', '=', 'timesheet'),
- ('inherit', '=', False),
- ], limit=1, context=context)
- model_data = model_data_obj.browse(cursor, user, model_data_ids[0],
- context=context)
- res = act_window_obj.read(cursor, user, model_data.db_id, context=context)
- res['context'] = str({
+ act_window_id = model_data_obj.get_id(cursor, user, 'timesheet',
+ 'act_work_tree2', context=context)
+ res = act_window_obj.read(cursor, user, act_window_id, context=context)
+ res['pyson_context'] = PYSONEncoder().encode({
'from_date': data['form']['from_date'],
'to_date': data['form']['to_date'],
})
@@ -190,16 +185,10 @@ class OpenWork2(OpenWork):
def _action_open_work(self, cursor, user, data, context=None):
model_data_obj = self.pool.get('ir.model.data')
act_window_obj = self.pool.get('ir.action.act_window')
-
- model_data_ids = model_data_obj.search(cursor, user, [
- ('fs_id', '=', 'act_work_form2'),
- ('module', '=', 'timesheet'),
- ('inherit', '=', False),
- ], limit=1, context=context)
- model_data = model_data_obj.browse(cursor, user, model_data_ids[0],
- context=context)
- res = act_window_obj.read(cursor, user, model_data.db_id, context=context)
- res['context'] = str({
+ act_window_id = model_data_obj.get_id(cursor, user, 'timesheet',
+ 'act_work_form2', context=context)
+ res = act_window_obj.read(cursor, user, act_window_id, context=context)
+ res['pyson_context'] = PYSONEncoder().encode({
'from_date': data['form']['from_date'],
'to_date': data['form']['to_date'],
})
@@ -228,14 +217,9 @@ class OpenWorkGraph(Wizard):
if context is None:
context = {}
- model_data_ids = model_data_obj.search(cursor, user, [
- ('fs_id', '=', 'act_work_form3'),
- ('module', '=', 'timesheet'),
- ('inherit', '=', False),
- ], limit=1, context=context)
- model_data = model_data_obj.browse(cursor, user, model_data_ids[0],
- context=context)
- res = act_window_obj.read(cursor, user, model_data.db_id, context=context)
+ act_window_id = model_data_obj.get_id(cursor, user, 'timesheet',
+ 'act_work_form3', context=context)
+ res = act_window_obj.read(cursor, user, act_window_id, context=context)
if 'active_id' in context:
work = work_obj.browse(cursor, user, context['active_id'],
context=context)
diff --git a/work.xml b/work.xml
index 5b3c15a..f1745cb 100644
--- a/work.xml
+++ b/work.xml
@@ -173,7 +173,7 @@ this repository contains the full copyright notices and license terms. -->
<field name="name">Hours per Work</field>
<field name="res_model">timesheet.work</field>
<field name="view_type">form</field>
- <field name="domain">[('parent', 'in', active_ids)]</field>
+ <field name="domain">[('parent', 'in', Eval('active_ids'))]</field>
</record>
<record model="ir.action.act_window.view"
id="act_work_form3_view1">
commit e389b70c8b72365737effd162b1af873cbd845c7
Author: Daniel Baumann <daniel at debian.org>
Date: Mon Oct 19 22:54:57 2009 +0200
Adding upstream version 1.4.0.
diff --git a/CHANGELOG b/CHANGELOG
new file mode 100644
index 0000000..931601e
--- /dev/null
+++ b/CHANGELOG
@@ -0,0 +1,2 @@
+Version 1.4.0 - 2009-10-19
+* Initial release
diff --git a/COPYRIGHT b/COPYRIGHT
new file mode 100644
index 0000000..2afd2a7
--- /dev/null
+++ b/COPYRIGHT
@@ -0,0 +1,15 @@
+Copyright (C) 2008 Cédric Krier.
+Copyright (C) 2008 B2CK SPRL.
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program. If not, see <http://www.gnu.org/licenses/>.
diff --git a/INSTALL b/INSTALL
new file mode 100644
index 0000000..7fc6d03
--- /dev/null
+++ b/INSTALL
@@ -0,0 +1,31 @@
+Installing trytond_timesheet
+============================
+
+Prerequisites
+-------------
+
+ * Python 2.4 or later (http://www.python.org/)
+ * trytond (http://www.tryton.org/)
+ * trytond_company (http://www.tryton.org/)
+ * trytond_company_work_time (http://www.tryton.org/)
+
+Installation
+------------
+
+Once you've downloaded and unpacked a trytond_timesheet source release, enter the
+directory where the archive was unpacked, and run:
+
+ python setup.py install
+
+Note that you may need administrator/root privileges for this step, as
+this command will by default attempt to install module to the Python
+site-packages directory on your system.
+
+For advanced options, please refer to the easy_install and/or the distutils
+documentation:
+
+ http://peak.telecommunity.com/DevCenter/EasyInstall
+ http://docs.python.org/inst/inst.html
+
+To use without installation, extract the archive into ``trytond/modules`` with
+the directory name timesheet.
diff --git a/LICENSE b/LICENSE
new file mode 100644
index 0000000..94a9ed0
--- /dev/null
+++ b/LICENSE
@@ -0,0 +1,674 @@
+ GNU GENERAL PUBLIC LICENSE
+ Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+ Preamble
+
+ The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
+
+ The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works. By contrast,
+the GNU General Public License is intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users. We, the Free Software Foundation, use the
+GNU General Public License for most of our software; it applies also to
+any other work released this way by its authors. You can apply it to
+your programs, too.
+
+ When we speak of free software, we are referring to freedom, not
+price. Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+ To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights. Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+you modify it: responsibilities to respect the freedom of others.
+
+ For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received. You must make sure that they, too, receive
+or can get the source code. And you must show them these terms so they
+know their rights.
+
+ Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
+
+ For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software. For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
+
+ Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the manufacturer
+can do so. This is fundamentally incompatible with the aim of
+protecting users' freedom to change the software. The systematic
+pattern of such abuse occurs in the area of products for individuals to
+use, which is precisely where it is most unacceptable. Therefore, we
+have designed this version of the GPL to prohibit the practice for those
+products. If such problems arise substantially in other domains, we
+stand ready to extend this provision to those domains in future versions
+of the GPL, as needed to protect the freedom of users.
+
+ Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish to
+avoid the special danger that patents applied to a free program could
+make it effectively proprietary. To prevent this, the GPL assures that
+patents cannot be used to render the program non-free.
+
+ The precise terms and conditions for copying, distribution and
+modification follow.
+
+ TERMS AND CONDITIONS
+
+ 0. Definitions.
+
+ "This License" refers to version 3 of the GNU General Public License.
+
+ "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+ "The Program" refers to any copyrightable work licensed under this
+License. Each licensee is addressed as "you". "Licensees" and
+"recipients" may be individuals or organizations.
+
+ To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy. The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+ A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+ To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy. Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+ To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies. Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+ An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License. If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+ 1. Source Code.
+
+ The "source code" for a work means the preferred form of the work
+for making modifications to it. "Object code" means any non-source
+form of a work.
+
+ A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+ The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form. A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+ The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities. However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work. For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+ The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+ The Corresponding Source for a work in source code form is that
+same work.
+
+ 2. Basic Permissions.
+
+ All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met. This License explicitly affirms your unlimited
+permission to run the unmodified Program. The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work. This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+ You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force. You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright. Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+ Conveying under any other circumstances is permitted solely under
+the conditions stated below. Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+ 3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+ No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+ When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+ 4. Conveying Verbatim Copies.
+
+ You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+ You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+ 5. Conveying Modified Source Versions.
+
+ You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+ a) The work must carry prominent notices stating that you modified
+ it, and giving a relevant date.
+
+ b) The work must carry prominent notices stating that it is
+ released under this License and any conditions added under section
+ 7. This requirement modifies the requirement in section 4 to
+ "keep intact all notices".
+
+ c) You must license the entire work, as a whole, under this
+ License to anyone who comes into possession of a copy. This
+ License will therefore apply, along with any applicable section 7
+ additional terms, to the whole of the work, and all its parts,
+ regardless of how they are packaged. This License gives no
+ permission to license the work in any other way, but it does not
+ invalidate such permission if you have separately received it.
+
+ d) If the work has interactive user interfaces, each must display
+ Appropriate Legal Notices; however, if the Program has interactive
+ interfaces that do not display Appropriate Legal Notices, your
+ work need not make them do so.
+
+ A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit. Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+ 6. Conveying Non-Source Forms.
+
+ You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+ a) Convey the object code in, or embodied in, a physical product
+ (including a physical distribution medium), accompanied by the
+ Corresponding Source fixed on a durable physical medium
+ customarily used for software interchange.
+
+ b) Convey the object code in, or embodied in, a physical product
+ (including a physical distribution medium), accompanied by a
+ written offer, valid for at least three years and valid for as
+ long as you offer spare parts or customer support for that product
+ model, to give anyone who possesses the object code either (1) a
+ copy of the Corresponding Source for all the software in the
+ product that is covered by this License, on a durable physical
+ medium customarily used for software interchange, for a price no
+ more than your reasonable cost of physically performing this
+ conveying of source, or (2) access to copy the
+ Corresponding Source from a network server at no charge.
+
+ c) Convey individual copies of the object code with a copy of the
+ written offer to provide the Corresponding Source. This
+ alternative is allowed only occasionally and noncommercially, and
+ only if you received the object code with such an offer, in accord
+ with subsection 6b.
+
+ d) Convey the object code by offering access from a designated
+ place (gratis or for a charge), and offer equivalent access to the
+ Corresponding Source in the same way through the same place at no
+ further charge. You need not require recipients to copy the
+ Corresponding Source along with the object code. If the place to
+ copy the object code is a network server, the Corresponding Source
+ may be on a different server (operated by you or a third party)
+ that supports equivalent copying facilities, provided you maintain
+ clear directions next to the object code saying where to find the
+ Corresponding Source. Regardless of what server hosts the
+ Corresponding Source, you remain obligated to ensure that it is
+ available for as long as needed to satisfy these requirements.
+
+ e) Convey the object code using peer-to-peer transmission, provided
+ you inform other peers where the object code and Corresponding
+ Source of the work are being offered to the general public at no
+ charge under subsection 6d.
+
+ A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+ A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling. In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage. For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product. A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+ "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source. The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+ If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information. But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+ The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed. Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+ Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+ 7. Additional Terms.
+
+ "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law. If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+ When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it. (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.) You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+ Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+ a) Disclaiming warranty or limiting liability differently from the
+ terms of sections 15 and 16 of this License; or
+
+ b) Requiring preservation of specified reasonable legal notices or
+ author attributions in that material or in the Appropriate Legal
+ Notices displayed by works containing it; or
+
+ c) Prohibiting misrepresentation of the origin of that material, or
+ requiring that modified versions of such material be marked in
+ reasonable ways as different from the original version; or
+
+ d) Limiting the use for publicity purposes of names of licensors or
+ authors of the material; or
+
+ e) Declining to grant rights under trademark law for use of some
+ trade names, trademarks, or service marks; or
+
+ f) Requiring indemnification of licensors and authors of that
+ material by anyone who conveys the material (or modified versions of
+ it) with contractual assumptions of liability to the recipient, for
+ any liability that these contractual assumptions directly impose on
+ those licensors and authors.
+
+ All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10. If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term. If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+ If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+ Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+ 8. Termination.
+
+ You may not propagate or modify a covered work except as expressly
+provided under this License. Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+ However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+ Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+ Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License. If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+ 9. Acceptance Not Required for Having Copies.
+
+ You are not required to accept this License in order to receive or
+run a copy of the Program. Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance. However,
+nothing other than this License grants you permission to propagate or
+modify any covered work. These actions infringe copyright if you do
+not accept this License. Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+ 10. Automatic Licensing of Downstream Recipients.
+
+ Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License. You are not responsible
+for enforcing compliance by third parties with this License.
+
+ An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations. If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+ You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License. For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+ 11. Patents.
+
+ A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based. The
+work thus licensed is called the contributor's "contributor version".
+
+ A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version. For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+ Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+ In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement). To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+ If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients. "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+ If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+ A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License. You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+ Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+ 12. No Surrender of Others' Freedom.
+
+ If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License. If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all. For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+ 13. Use with the GNU Affero General Public License.
+
+ Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU Affero General Public License into a single
+combined work, and to convey the resulting work. The terms of this
+License will continue to apply to the part which is the covered work,
+but the special requirements of the GNU Affero General Public License,
+section 13, concerning interaction through a network will apply to the
+combination as such.
+
+ 14. Revised Versions of this License.
+
+ The Free Software Foundation may publish revised and/or new versions of
+the GNU General Public License from time to time. Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+ Each version is given a distinguishing version number. If the
+Program specifies that a certain numbered version of the GNU General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation. If the Program does not specify a version number of the
+GNU General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+ If the Program specifies that a proxy can decide which future
+versions of the GNU General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+ Later license versions may give you additional or different
+permissions. However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+ 15. Disclaimer of Warranty.
+
+ THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+ 16. Limitation of Liability.
+
+ IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+ 17. Interpretation of Sections 15 and 16.
+
+ If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+ END OF TERMS AND CONDITIONS
+
+ How to Apply These Terms to Your New Programs
+
+ If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+ To do so, attach the following notices to the program. It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+ <one line to give the program's name and a brief idea of what it does.>
+ Copyright (C) <year> <name of author>
+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper mail.
+
+ If the program does terminal interaction, make it output a short
+notice like this when it starts in an interactive mode:
+
+ <program> Copyright (C) <year> <name of author>
+ This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+ This is free software, and you are welcome to redistribute it
+ under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License. Of course, your program's commands
+might be different; for a GUI interface, you would use an "about box".
+
+ You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU GPL, see
+<http://www.gnu.org/licenses/>.
+
+ The GNU General Public License does not permit incorporating your program
+into proprietary programs. If your program is a subroutine library, you
+may consider it more useful to permit linking proprietary applications with
+the library. If this is what you want to do, use the GNU Lesser General
+Public License instead of this License. But first, please read
+<http://www.gnu.org/philosophy/why-not-lgpl.html>.
diff --git a/MANIFEST.in b/MANIFEST.in
new file mode 100644
index 0000000..b2a140e
--- /dev/null
+++ b/MANIFEST.in
@@ -0,0 +1,11 @@
+include INSTALL
+include README
+include TODO
+include COPYRIGHT
+include CHANGELOG
+include LICENSE
+include *.xml
+include *.odt
+include *.csv
+include tests/*
+include doc/*
diff --git a/PKG-INFO b/PKG-INFO
new file mode 100644
index 0000000..e0d8d0d
--- /dev/null
+++ b/PKG-INFO
@@ -0,0 +1,31 @@
+Metadata-Version: 1.0
+Name: trytond_timesheet
+Version: 1.4.0
+Summary: Timesheet Module with:
+ - Work
+ - Timesheet line
+
+And with reports:
+ - Hours per work
+ - Hours per employee per week
+ - Hours per employee per month
+
+Home-page: http://www.tryton.org/
+Author: B2CK
+Author-email: info at b2ck.com
+License: GPL-3
+Download-URL: http://downloads.tryton.org/1.4/
+Description: UNKNOWN
+Platform: UNKNOWN
+Classifier: Development Status :: 5 - Production/Stable
+Classifier: Environment :: Plugins
+Classifier: Intended Audience :: Developers
+Classifier: Intended Audience :: Financial and Insurance Industry
+Classifier: Intended Audience :: Legal Industry
+Classifier: Intended Audience :: Manufacturing
+Classifier: License :: OSI Approved :: GNU General Public License (GPL)
+Classifier: Natural Language :: English
+Classifier: Natural Language :: German
+Classifier: Operating System :: OS Independent
+Classifier: Programming Language :: Python
+Classifier: Topic :: Office/Business
diff --git a/README b/README
new file mode 100644
index 0000000..edcd014
--- /dev/null
+++ b/README
@@ -0,0 +1,36 @@
+trytond_timesheet
+=================
+
+The timesheet module of the Tryton application platform.
+See __tryton__.py
+
+Installing
+----------
+
+See INSTALL
+
+Support
+-------
+
+If you encounter any problems with Tryton, please don't hesitate to ask
+questions on the Tryton bug tracker, mailing list, wiki or IRC channel:
+
+ http://bugs.tryton.org/
+ http://groups.tryton.org/
+ http://wiki.tryton.org/
+ irc://irc.freenode.net/tryton
+
+License
+-------
+
+See LICENSE
+
+Copyright
+---------
+
+See COPYRIGHT
+
+
+For more information please visit the Tryton web site:
+
+ http://www.tryton.org/
diff --git a/__init__.py b/__init__.py
new file mode 100644
index 0000000..5a3432e
--- /dev/null
+++ b/__init__.py
@@ -0,0 +1,5 @@
+#This file is part of Tryton. The COPYRIGHT file at the top level of
+#this repository contains the full copyright notices and license terms.
+
+from work import *
+from line import *
diff --git a/__tryton__.py b/__tryton__.py
new file mode 100644
index 0000000..96e474c
--- /dev/null
+++ b/__tryton__.py
@@ -0,0 +1,75 @@
+#This file is part of Tryton. The COPYRIGHT file at the top level of
+#this repository contains the full copyright notices and license terms.
+{
+ 'name': 'Timesheet',
+ 'name_de_DE': 'Zeiterfassung',
+ 'name_es_CO': 'Hoja de Asistencia',
+ 'name_es_ES': 'Partes de trabajo',
+ 'name_fr_FR': 'Feuille de présence',
+ 'version': '1.4.0',
+ 'author': 'B2CK',
+ 'email': 'info at b2ck.com',
+ 'website': 'http://www.tryton.org/',
+ 'description': '''Timesheet Module with:
+ - Work
+ - Timesheet line
+
+And with reports:
+ - Hours per work
+ - Hours per employee per week
+ - Hours per employee per month
+''',
+ 'description_de_DE': '''Zeiterfassungsmodul mit:
+ - Aufgaben
+ - Zeitpositionen
+
+Zugehörige Berichte:
+ - Stunden pro Aufgabe
+ - Stunden pro Mitarbeiter pro Woche
+ - Stunden pro Mitarbeiter pro Monat
+''',
+ 'description_es_CO': '''Módulo de Hoja de Asistencia con:
+ - Trabajo
+ - Líneas de tiempo laborado
+
+Y con reportes de:
+ - Horas por semana
+ - Horas por empleado por semana
+ - Horas por empleado por mes
+''',
+ 'description_es_ES': '''Módulo de partes de trabajo con:
+ - Trabajo
+ - Línea de parte parte de trabajo
+
+Y con informes:
+ - Horas por trabajo
+ - Horas por empleado y semana
+ - Horas por empleado y mes
+''',
+ 'description_fr_FR': '''Module feuille de présence, avec:
+ - Tâche
+ - Ligne de feuille de présence
+
+Et les rapports:
+ - Heures par tâche
+ - Heures par employé par semaine
+ - Heures par employé par mois
+''',
+ 'depends': [
+ 'ir',
+ 'res',
+ 'company',
+ 'company_work_time',
+ ],
+ 'xml': [
+ 'timesheet.xml',
+ 'work.xml',
+ 'line.xml',
+ ],
+ 'translation': [
+ 'de_DE.csv',
+ 'es_CO.csv',
+ 'es_ES.csv',
+ 'fr_FR.csv',
+ ],
+}
diff --git a/de_DE.csv b/de_DE.csv
new file mode 100644
index 0000000..d8345f9
--- /dev/null
+++ b/de_DE.csv
@@ -0,0 +1,122 @@
+type,name,res_id,src,value,fuzzy
+error,timesheet.line,0,Hours field must be positive,Feld Stunden muss einen positiven Wert haben,0
+error,timesheet.work,0,Every work must be in the same company as it's parent work!,Eine Aufgabe muss immer zum selben Unternehmen wie die übergeordnete Aufgabe gehören!,0
+error,timesheet.work,0,You can not create recursive works!,Es können keine rekursiven Aufgaben angelegt werden,0
+field,"timesheet.enter_lines.init,date",0,Date,Datum,0
+field,"timesheet.enter_lines.init,employee",0,Employee,Mitarbeiter,0
+field,"timesheet.hours_employee,create_date",0,Creation date,Erstellungsdatum,0
+field,"timesheet.hours_employee,create_uid",0,Creation user,Ersteller,0
+field,"timesheet.hours_employee,employee",0,Employee,Mitarbeiter,0
+field,"timesheet.hours_employee,hours",0,Hours,Stunden,0
+field,"timesheet.hours_employee,id",0,ID,ID,0
+field,"timesheet.hours_employee_monthly,create_date",0,Creation date,Erstellungsdatum,0
+field,"timesheet.hours_employee_monthly,create_uid",0,Creation user,Ersteller,0
+field,"timesheet.hours_employee_monthly,employee",0,Employee,Mitarbeiter,0
+field,"timesheet.hours_employee_monthly,hours",0,Hours,Stunden,0
+field,"timesheet.hours_employee_monthly,id",0,ID,ID,0
+field,"timesheet.hours_employee_monthly,month",0,Month,Monat,0
+field,"timesheet.hours_employee_monthly,rec_name",0,Name,Name,0
+field,"timesheet.hours_employee_monthly,write_date",0,Last modification date,Zuletzt geändert am,0
+field,"timesheet.hours_employee_monthly,write_uid",0,Last modification by,Zuletzt geändert von,0
+field,"timesheet.hours_employee_monthly,year",0,Year,Jahr,0
+field,"timesheet.hours_employee,rec_name",0,Name,Name,0
+field,"timesheet.hours_employee_weekly,create_date",0,Creation date,Erstellungsdatum,0
+field,"timesheet.hours_employee_weekly,create_uid",0,Creation user,Ersteller,0
+field,"timesheet.hours_employee_weekly,employee",0,Employee,Mitarbeiter,0
+field,"timesheet.hours_employee_weekly,hours",0,Hours,Stunden,0
+field,"timesheet.hours_employee_weekly,id",0,ID,ID,0
+field,"timesheet.hours_employee_weekly,rec_name",0,Name,Name,0
+field,"timesheet.hours_employee_weekly,week",0,Week,Woche,0
+field,"timesheet.hours_employee_weekly,write_date",0,Last modification date,Zuletzt geändert am,0
+field,"timesheet.hours_employee_weekly,write_uid",0,Last modification by,Zuletzt geändert von,0
+field,"timesheet.hours_employee_weekly,year",0,Year,Jahr,0
+field,"timesheet.hours_employee,write_date",0,Last modification date,Zuletzt geändert am,0
+field,"timesheet.hours_employee,write_uid",0,Last modification by,Zuletzt geändert von,0
+field,"timesheet.line,create_date",0,Creation date,Erstellungsdatum,0
+field,"timesheet.line,create_uid",0,Creation user,Ersteller,0
+field,"timesheet.line,date",0,Date,Datum,0
+field,"timesheet.line,description",0,Description,Beschreibung,0
+field,"timesheet.line,employee",0,Employee,Mitarbeiter,0
+field,"timesheet.line,hours",0,Hours,Stunden,0
+field,"timesheet.line,id",0,ID,ID,0
+field,"timesheet.line,rec_name",0,Name,Name,0
+field,"timesheet.line,work",0,Work,Aufgabe,0
+field,"timesheet.line,write_date",0,Last modification date,Zuletzt geändert am,0
+field,"timesheet.line,write_uid",0,Last modification by,Zuletzt geändert von,0
+field,"timesheet.open_hours_employee.init,end_date",0,End Date,Enddatum,0
+field,"timesheet.open_hours_employee.init,start_date",0,Start Date,Anfangsdatum,0
+field,"timesheet.work,active",0,Active,Aktiv,0
+field,"timesheet.work,children",0,Children,Untergeordnet (Aufgaben),0
+field,"timesheet.work,company",0,Company,Unternehmen,0
+field,"timesheet.work,create_date",0,Creation date,Erstellungsdatum,0
+field,"timesheet.work,create_uid",0,Creation user,Ersteller,0
+field,"timesheet.work,hours",0,Timesheet Hours,Stunden,0
+field,"timesheet.work,id",0,ID,ID,0
+field,"timesheet.work,left",0,Left,Links,0
+field,"timesheet.work,name",0,Name,Name,0
+field,"timesheet.work.open.init,from_date",0,From Date,Von,0
+field,"timesheet.work.open.init,to_date",0,To Date,Bis,0
+field,"timesheet.work,parent",0,Parent,Übergeordnet (Aufgabe),0
+field,"timesheet.work,rec_name",0,Name,Name,0
+field,"timesheet.work,right",0,Right,Rechts,0
+field,"timesheet.work,timesheet_available",0,Available on timesheets,Verfügbar für Zeiterfassung,0
+field,"timesheet.work,write_date",0,Last modification date,Zuletzt geändert am,0
+field,"timesheet.work,write_uid",0,Last modification by,Zuletzt geändert von,0
+help,"timesheet.work,hours",0,Total time spent on this work,Gesamtzeit für diese Arbeit,0
+help,"timesheet.work,timesheet_available",0,Allow to fill in timesheets with this work,Diese Arbeit für den Eintrag in Zeiterfassungen freigeben,0
+model,"ir.action,name",act_enter_lines,Enter Timesheet,Zur Zeiterfassung,0
+model,"ir.action,name",act_hours_employee_form,Hours per Employee,Stunden pro Mitarbeiter,0
+model,"ir.action,name",act_open_hours_employee,Hours per Employee,Stunden pro Mitarbeiter,0
+model,"ir.action,name",act_hours_employee_monthly_form,Hours per Employee per Month,Stunden pro Mitarbeiter pro Monat,0
+model,"ir.action,name",act_hours_employee_weekly_form,Hours per Employee per Week,Stunden pro Mitarbeiter pro Monat,0
+model,"ir.action,name",act_open_work,Hours per Work,Stunden pro Aufgabe,0
+model,"ir.action,name",act_work_form2,Hours per Work,Stunden pro Aufgabe,0
+model,"ir.action,name",act_open_work2,Hours per Work,Stunden pro Aufgabe,0
+model,"ir.action,name",act_work_form3,Hours per Work,Stunden pro Aufgabe,0
+model,"ir.action,name",act_open_work_graph,Hours per Work,Stunden pro Aufgabe,0
+model,"ir.action,name",act_line_form,Timesheet Lines,Zeitpositionen,0
+model,"ir.action,name",act_work_form,Works,Aufgaben,0
+model,"ir.action,name",act_work_tree,Works,Aufgaben,0
+model,"ir.action,name",act_work_tree2,Works,Aufgaben,0
+model,"ir.ui.menu,name",menu_configuration,Configuration,Einstellungen,0
+model,"ir.ui.menu,name",menu_enter_lines,Enter Timesheet,Zur Zeiterfassung,0
+model,"ir.ui.menu,name",menu_open_hours_employee,Hours per Employee,Stunden pro Mitarbeiter,0
+model,"ir.ui.menu,name",menu_open_hours_employee_monthly,Hours per Employee per Month,Stunden pro Mitarbeiter pro Monat,0
+model,"ir.ui.menu,name",menu_open_hours_employee_weekly,Hours per Employee per Week,Stunden pro Mitarbeiter pro Woche,0
+model,"ir.ui.menu,name",menu_work_tree2,Hours per Work,Stunden pro Aufgabe,0
+model,"ir.ui.menu,name",menu_work_form2,Hours per Work,Stunden pro Aufgabe,0
+model,"ir.ui.menu,name",menu_reporting,Reporting,Berichte,0
+model,"ir.ui.menu,name",menu_line_form,Timesheet Lines,Zeitpositionen,0
+model,"ir.ui.menu,name",menu_timesheet,Timesheet Management,Zeiterfassung,0
+model,"ir.ui.menu,name",menu_work_form,Works,Aufgaben,0
+model,"ir.ui.menu,name",menu_work_tree,Works,Aufgaben,0
+model,"res.group,name",group_timesheet_admin,Timesheet Administration,Zeiterfassung Administration,0
+model,"timesheet.enter_lines.init,name",0,Enter Lines Init,Eingabe Zeitposition Init,0
+model,"timesheet.hours_employee_monthly,name",0,Hours per Employee per Month,Stunden pro Mitarbeiter und Monat,0
+model,"timesheet.hours_employee,name",0,Hours per Employee,Stunden pro Mitarbeiter,0
+model,"timesheet.hours_employee_weekly,name",0,Hours per Employee per Week,Stunden pro Mitarbeiter und Woche,0
+model,"timesheet.line,name",0,Timesheet Line,Zeitposition,0
+model,"timesheet.open_hours_employee.init,name",0,Open Hours Employee Init,Stunden Mitarbeiter Öffnen Init,0
+model,"timesheet.work,name",0,Work,Aufgabe,0
+model,"timesheet.work.open.init,name",0,Open Work Init,Aufgabe Öffnen Init,0
+view,timesheet.enter_lines.init,0,Enter Timesheet,Zur Zeiterfassung,0
+view,timesheet.hours_employee,0,Hours,Stunden,0
+view,timesheet.hours_employee,0,Hours per Employee,Stunden pro Mitarbeiter,0
+view,timesheet.hours_employee_monthly,0,Hours per Employee per Month,Stunden pro Mitarbeiter pro Monat,0
+view,timesheet.hours_employee_weekly,0,Hours per Employee per Week,Stunden pro Mitarbeiter pro Woche,0
+view,timesheet.line,0,Hours,Stunden,0
+view,timesheet.line,0,Timesheet Line,Zeitposition,0
+view,timesheet.line,0,Timesheet Lines,Zeitpositionen,0
+view,timesheet.open_hours_employee.init,0,Hours per Employee,Stunden pro Mitarbeiter,0
+view,timesheet.work,0,Hours per Work,Stunden pro Aufgabe,0
+view,timesheet.work,0,Work,Aufgabe,0
+view,timesheet.work,0,Works,Aufgaben,0
+view,timesheet.work.open.init,0,Hours per Work,Stunden pro Aufgabe,0
+wizard_button,"timesheet.enter_lines,init,end",0,Cancel,Abbrechen,0
+wizard_button,"timesheet.enter_lines,init,enter",0,Enter,Eingabe,0
+wizard_button,"timesheet.open_hours_employee,init,end",0,Cancel,Abbrechen,0
+wizard_button,"timesheet.open_hours_employee,init,open",0,Open,Öffnen,0
+wizard_button,"timesheet.work.open2,init,end",0,Cancel,Abbrechen,0
+wizard_button,"timesheet.work.open2,init,open",0,Open,Öffnen,0
+wizard_button,"timesheet.work.open,init,end",0,Cancel,Abbrechen,0
+wizard_button,"timesheet.work.open,init,open",0,Open,Öffnen,0
diff --git a/doc/index.rst b/doc/index.rst
new file mode 100644
index 0000000..6155753
--- /dev/null
+++ b/doc/index.rst
@@ -0,0 +1,30 @@
+Timesheet Module
+################
+
+The timesheet module allow to track the time spent by employees on
+various works. This module also comes with several reports that show
+the time spent by employees on works following various time periods.
+
+
+Work
+****
+
+A work is a generic concept that encompass all activities from simple
+tasks to long-running projects. The Work model contains the following
+fields:
+
+- Name: The name of the work.
+- Active: A checkbox that allow to disable the work.
+- Parent: The parent work.
+- Available on timesheets: A checkbox that tells if employees can
+ create timesheets for this work.
+- Company: The company for which the work is (or was) executed.
+
+
+Timesheet Line
+##############
+
+A timesheet line express the fact that one employee spend a part of
+his/her time on a specific work at a given date. An optional
+Description field allow to give some extra informations about what
+have been done.
diff --git a/es_CO.csv b/es_CO.csv
new file mode 100644
index 0000000..fe7ee94
--- /dev/null
+++ b/es_CO.csv
@@ -0,0 +1,97 @@
+type,name,res_id,src,value,fuzzy
+error,timesheet.line,0,Hours field must be positive,El campo Horas debe ser positivo,0
+error,timesheet.work,0,Every work must be in the same company as it's parent work!,¡Cada trabajo debe estar en la misma compañía lo mismo que el trabajo que lo originó!,0
+error,timesheet.work,0,You can not create recursive works!,No puede crear trabajos recursivos!,0
+field,"timesheet.enter_lines.init,date",0,Date,Fecha,0
+field,"timesheet.enter_lines.init,employee",0,Employee,Empleado,0
+field,"timesheet.hours_employee,employee",0,Employee,Empleado,0
+field,"timesheet.hours_employee,hours",0,Hours,Horas,0
+field,"timesheet.hours_employee_monthly,employee",0,Employee,Empleado,0
+field,"timesheet.hours_employee_monthly,hours",0,Hours,Horas,0
+field,"timesheet.hours_employee_monthly,month",0,Month,Mes,0
+field,"timesheet.hours_employee_monthly,rec_name",0,Name,Nombre,0
+field,"timesheet.hours_employee_monthly,year",0,Year,Año,0
+field,"timesheet.hours_employee,rec_name",0,Name,Nombre,0
+field,"timesheet.hours_employee_weekly,employee",0,Employee,Empleado,0
+field,"timesheet.hours_employee_weekly,hours",0,Hours,Horas,0
+field,"timesheet.hours_employee_weekly,rec_name",0,Name,Nombre,0
+field,"timesheet.hours_employee_weekly,week",0,Week,Semana,0
+field,"timesheet.hours_employee_weekly,year",0,Year,Año,0
+field,"timesheet.line,date",0,Date,Fecha,0
+field,"timesheet.line,description",0,Description,Descripción,0
+field,"timesheet.line,employee",0,Employee,Empleado,0
+field,"timesheet.line,hours",0,Hours,Horas,0
+field,"timesheet.line,rec_name",0,Name,Nombre,0
+field,"timesheet.line,work",0,Work,Trabajo,0
+field,"timesheet.open_hours_employee.init,end_date",0,End Date,Fecha Final,0
+field,"timesheet.open_hours_employee.init,start_date",0,Start Date,Fecha Inicial,0
+field,"timesheet.work,active",0,Active,Activo,0
+field,"timesheet.work,children",0,Children,Descendientes,0
+field,"timesheet.work,company",0,Company,Compañía,0
+field,"timesheet.work,hours",0,Timesheet Hours,Horas de Hoja de Tiempo,0
+field,"timesheet.work,left",0,Left,Izquierda,0
+field,"timesheet.work,name",0,Name,Nombre,0
+field,"timesheet.work.open.init,from_date",0,From Date,Fecha Inicial,0
+field,"timesheet.work.open.init,to_date",0,To Date,A la Fecha,0
+field,"timesheet.work,parent",0,Parent,Padre,0
+field,"timesheet.work,rec_name",0,Name,Nombre,0
+field,"timesheet.work,right",0,Right,Derecha,0
+field,"timesheet.work,timesheet_available",0,Available on timesheets,Disponibilidad en las hojas de tiempos,0
+help,"timesheet.work,hours",0,Total time spent on this work,Tiempo total utilizado en este trabajo,0
+help,"timesheet.work,timesheet_available",0,Allow to fill in timesheets with this work,Permitir llenar con este trabajo en la hoja de tiempos,0
+model,"ir.action,name",act_enter_lines,Enter Timesheet,Adicionar Hoja de Tiempo,0
+model,"ir.action,name",act_hours_employee_form,Hours per Employee,Horas por Empleado,0
+model,"ir.action,name",act_open_hours_employee,Hours per Employee,Horas por Empleado,0
+model,"ir.action,name",act_hours_employee_monthly_form,Hours per Employee per Month,Horas por Empleado en el mes,0
+model,"ir.action,name",act_hours_employee_weekly_form,Hours per Employee per Week,Horas por Empleado en la semana,0
+model,"ir.action,name",act_open_work,Hours per Work,Horas por Trabajo,0
+model,"ir.action,name",act_work_form2,Hours per Work,Horas por Trabajo,0
+model,"ir.action,name",act_open_work2,Hours per Work,Horas por Trabajo,0
+model,"ir.action,name",act_work_form3,Hours per Work,Horas por Trabajo,0
+model,"ir.action,name",act_open_work_graph,Hours per Work,Horas por Trabajo,0
+model,"ir.action,name",act_line_form,Timesheet Lines,Lineas de Hoja de Tiempo,0
+model,"ir.action,name",act_work_form,Works,Trabajos,0
+model,"ir.action,name",act_work_tree,Works,Trabajos,0
+model,"ir.action,name",act_work_tree2,Works,Trabajos,0
+model,"ir.ui.menu,name",menu_configuration,Configuration,Configuración,0
+model,"ir.ui.menu,name",menu_enter_lines,Enter Timesheet,Adicionar Hoja de Tiempo,0
+model,"ir.ui.menu,name",menu_open_hours_employee,Hours per Employee,Horas por Empleado,0
+model,"ir.ui.menu,name",menu_open_hours_employee_monthly,Hours per Employee per Month,Horas por Empleado en el mes,0
+model,"ir.ui.menu,name",menu_open_hours_employee_weekly,Hours per Employee per Week,Horas por Empleado en la semana,0
+model,"ir.ui.menu,name",menu_work_tree2,Hours per Work,Horas por Trabajo,0
+model,"ir.ui.menu,name",menu_work_form2,Hours per Work,Horas por Trabajo,0
+model,"ir.ui.menu,name",menu_reporting,Reporting,Reportes,0
+model,"ir.ui.menu,name",menu_line_form,Timesheet Lines,Lineas de Hoja de Tiempo,0
+model,"ir.ui.menu,name",menu_timesheet,Timesheet Management,Hoja de Tiempo,0
+model,"ir.ui.menu,name",menu_work_form,Works,Trabajos,0
+model,"ir.ui.menu,name",menu_work_tree,Works,Trabajos,0
+model,"res.group,name",group_timesheet_admin,Timesheet Administration,Administración de Hoja de tiempos,0
+model,"timesheet.enter_lines.init,name",0,Enter Lines Init,Ingresar Líneas Inicio,0
+model,"timesheet.hours_employee_monthly,name",0,Hours per Employee per Month,Horas por Empleado en el mes,0
+model,"timesheet.hours_employee,name",0,Hours per Employee,Horas por Empleado,0
+model,"timesheet.hours_employee_weekly,name",0,Hours per Employee per Week,Horas por Empleado en la semana,0
+model,"timesheet.line,name",0,Timesheet Line,Linea de Hoja de Tiempo,0
+model,"timesheet.open_hours_employee.init,name",0,Open Hours Employee Init,Horas de Apertura de Inicio de Empleado,0
+model,"timesheet.work,name",0,Work,Trabajo,0
+model,"timesheet.work.open.init,name",0,Open Work Init,Inicio de Apertura de Trabajo,0
+view,timesheet.enter_lines.init,0,Enter Timesheet,Adicionar Hoja de Tiempo,0
+view,timesheet.hours_employee,0,Hours,Horas,0
+view,timesheet.hours_employee,0,Hours per Employee,Horas por Empleado,0
+view,timesheet.hours_employee_monthly,0,Hours per Employee per Month,Horas por Empleado en el mes,0
+view,timesheet.hours_employee_weekly,0,Hours per Employee per Week,Horas por Empleado en la semana,0
+view,timesheet.line,0,Hours,Horas,0
+view,timesheet.line,0,Timesheet Line,Linea de Hoja de Tiempo,0
+view,timesheet.line,0,Timesheet Lines,Lineas de Hoja de Tiempo,0
+view,timesheet.open_hours_employee.init,0,Hours per Employee,Horas por Empleado,0
+view,timesheet.work,0,Hours per Work,Horas por Trabajo,0
+view,timesheet.work,0,Work,Trabajo,0
+view,timesheet.work,0,Works,Trabajos,0
+view,timesheet.work.open.init,0,Hours per Work,Horas por Trabajo,0
+wizard_button,"timesheet.enter_lines,init,end",0,Cancel,Cancelar,0
+wizard_button,"timesheet.enter_lines,init,enter",0,Enter,Entrar,0
+wizard_button,"timesheet.open_hours_employee,init,end",0,Cancel,Cancelar,0
+wizard_button,"timesheet.open_hours_employee,init,open",0,Open,Abrir,0
+wizard_button,"timesheet.work.open2,init,end",0,Cancel,Cancelar,0
+wizard_button,"timesheet.work.open2,init,open",0,Open,Abrir,0
+wizard_button,"timesheet.work.open,init,end",0,Cancel,Cancelar,0
+wizard_button,"timesheet.work.open,init,open",0,Open,Abrir,0
diff --git a/es_ES.csv b/es_ES.csv
new file mode 100644
index 0000000..33c6bdd
--- /dev/null
+++ b/es_ES.csv
@@ -0,0 +1,97 @@
+type,name,res_id,src,value,fuzzy
+error,timesheet.line,0,Hours field must be positive,El campo de horas debe ser positivo,0
+error,timesheet.work,0,Every work must be in the same company as it's parent work!,Cada trabajo debe estar en la misma empresa que su trabajo padre,0
+error,timesheet.work,0,You can not create recursive works!,No puede crear trabajos recursivos,0
+field,"timesheet.enter_lines.init,date",0,Date,Fecha,0
+field,"timesheet.enter_lines.init,employee",0,Employee,Empleado,0
+field,"timesheet.hours_employee,employee",0,Employee,Empleado,0
+field,"timesheet.hours_employee,hours",0,Hours,Horas,0
+field,"timesheet.hours_employee_monthly,employee",0,Employee,Empleado,0
+field,"timesheet.hours_employee_monthly,hours",0,Hours,Horas,0
+field,"timesheet.hours_employee_monthly,month",0,Month,Mes,0
+field,"timesheet.hours_employee_monthly,rec_name",0,Name,Nombre,0
+field,"timesheet.hours_employee_monthly,year",0,Year,Año,0
+field,"timesheet.hours_employee,rec_name",0,Name,Nombre,0
+field,"timesheet.hours_employee_weekly,employee",0,Employee,Empleado,0
+field,"timesheet.hours_employee_weekly,hours",0,Hours,Horas,0
+field,"timesheet.hours_employee_weekly,rec_name",0,Name,Nombre,0
+field,"timesheet.hours_employee_weekly,week",0,Week,Semana,0
+field,"timesheet.hours_employee_weekly,year",0,Year,Año,0
+field,"timesheet.line,date",0,Date,Fecha,0
+field,"timesheet.line,description",0,Description,Descripción,0
+field,"timesheet.line,employee",0,Employee,Empleado,0
+field,"timesheet.line,hours",0,Hours,Horas,0
+field,"timesheet.line,rec_name",0,Name,Nombre,0
+field,"timesheet.line,work",0,Work,Trabajo,0
+field,"timesheet.open_hours_employee.init,end_date",0,End Date,Fecha final,0
+field,"timesheet.open_hours_employee.init,start_date",0,Start Date,Fecha inicial,0
+field,"timesheet.work,active",0,Active,Activo,0
+field,"timesheet.work,children",0,Children,Hijos,0
+field,"timesheet.work,company",0,Company,Empresa,0
+field,"timesheet.work,hours",0,Timesheet Hours,Horas del parte de trabajo,0
+field,"timesheet.work,left",0,Left,Izquierda,0
+field,"timesheet.work,name",0,Name,Nombre,0
+field,"timesheet.work.open.init,from_date",0,From Date,Desde la fecha,0
+field,"timesheet.work.open.init,to_date",0,To Date,A la fecha,0
+field,"timesheet.work,parent",0,Parent,Padre,0
+field,"timesheet.work,rec_name",0,Name,Nombre,0
+field,"timesheet.work,right",0,Right,Derecha,0
+field,"timesheet.work,timesheet_available",0,Available on timesheets,Disponible en partes de trabajo,0
+help,"timesheet.work,hours",0,Total time spent on this work,Tiempo total empleado en este trabajo,0
+help,"timesheet.work,timesheet_available",0,Allow to fill in timesheets with this work,Permite completar partes de trabajo con este trabajo,0
+model,"ir.action,name",act_enter_lines,Enter Timesheet,Introducir parte de trabajo,0
+model,"ir.action,name",act_hours_employee_form,Hours per Employee,Horas por empleado,0
+model,"ir.action,name",act_open_hours_employee,Hours per Employee,Horas por empleado,0
+model,"ir.action,name",act_hours_employee_monthly_form,Hours per Employee per Month,Horas por empleado y mes,0
+model,"ir.action,name",act_hours_employee_weekly_form,Hours per Employee per Week,Horas por empleado y semana,0
+model,"ir.action,name",act_open_work,Hours per Work,Horas por trabajo,0
+model,"ir.action,name",act_work_form2,Hours per Work,Horas por trabajo,0
+model,"ir.action,name",act_open_work2,Hours per Work,Horas por trabajo,0
+model,"ir.action,name",act_work_form3,Hours per Work,Horas por trabajo,0
+model,"ir.action,name",act_open_work_graph,Hours per Work,Horas por trabajo,0
+model,"ir.action,name",act_line_form,Timesheet Lines,Líneas del parte de trabajo,0
+model,"ir.action,name",act_work_form,Works,Trabajos,0
+model,"ir.action,name",act_work_tree,Works,Trabajos,0
+model,"ir.action,name",act_work_tree2,Works,Trabajos,0
+model,"ir.ui.menu,name",menu_configuration,Configuration,Configuración,0
+model,"ir.ui.menu,name",menu_enter_lines,Enter Timesheet,Introducir parte de trabajo,0
+model,"ir.ui.menu,name",menu_open_hours_employee,Hours per Employee,Horas por empleado,0
+model,"ir.ui.menu,name",menu_open_hours_employee_monthly,Hours per Employee per Month,Horas por empleado y mes,0
+model,"ir.ui.menu,name",menu_open_hours_employee_weekly,Hours per Employee per Week,Horas por empleado y semana,0
+model,"ir.ui.menu,name",menu_work_tree2,Hours per Work,Horas por trabajo,0
+model,"ir.ui.menu,name",menu_work_form2,Hours per Work,Horas por trabajo,0
+model,"ir.ui.menu,name",menu_reporting,Reporting,Informes,0
+model,"ir.ui.menu,name",menu_line_form,Timesheet Lines,Lineas de parte de trabajo,0
+model,"ir.ui.menu,name",menu_timesheet,Timesheet Management,Gestión de parte de trabajo,0
+model,"ir.ui.menu,name",menu_work_form,Works,Trabajos,0
+model,"ir.ui.menu,name",menu_work_tree,Works,Trabajos,0
+model,"res.group,name",group_timesheet_admin,Timesheet Administration,Administración de parte de trabajo,0
+model,"timesheet.enter_lines.init,name",0,Enter Lines Init,Inicializa la introducción de líneas,0
+model,"timesheet.hours_employee_monthly,name",0,Hours per Employee per Month,Horas por empleado y mes,0
+model,"timesheet.hours_employee,name",0,Hours per Employee,Horas por empleado,0
+model,"timesheet.hours_employee_weekly,name",0,Hours per Employee per Week,Horas por empleado y semana,0
+model,"timesheet.line,name",0,Timesheet Line,Linea de parte de trabajo,0
+model,"timesheet.open_hours_employee.init,name",0,Open Hours Employee Init,Inicializa la apertura de horas de empleado,0
+model,"timesheet.work,name",0,Work,Trabajo,0
+model,"timesheet.work.open.init,name",0,Open Work Init,Inicializa la apertura de un trabajo,0
+view,timesheet.enter_lines.init,0,Enter Timesheet,Introducir parte de trabajo,0
+view,timesheet.hours_employee,0,Hours,Horas,0
+view,timesheet.hours_employee,0,Hours per Employee,Horas por empleado,0
+view,timesheet.hours_employee_monthly,0,Hours per Employee per Month,Horas por empleado y mes,0
+view,timesheet.hours_employee_weekly,0,Hours per Employee per Week,Horas por empleado y semana,0
+view,timesheet.line,0,Hours,Horas,0
+view,timesheet.line,0,Timesheet Line,Linea de parte de trabajo,0
+view,timesheet.line,0,Timesheet Lines,Lineas de parte de trabajo,0
+view,timesheet.open_hours_employee.init,0,Hours per Employee,Horas por empleado,0
+view,timesheet.work,0,Hours per Work,Horas por trabajo,0
+view,timesheet.work,0,Work,Trabajo,0
+view,timesheet.work,0,Works,Trabajos,0
+view,timesheet.work.open.init,0,Hours per Work,Horas por trabajo,0
+wizard_button,"timesheet.enter_lines,init,end",0,Cancel,Cancelar,0
+wizard_button,"timesheet.enter_lines,init,enter",0,Enter,Entrar,0
+wizard_button,"timesheet.open_hours_employee,init,end",0,Cancel,Cancelar,0
+wizard_button,"timesheet.open_hours_employee,init,open",0,Open,Abrir,0
+wizard_button,"timesheet.work.open2,init,end",0,Cancel,Cancelar,0
+wizard_button,"timesheet.work.open2,init,open",0,Open,Abrir,0
+wizard_button,"timesheet.work.open,init,end",0,Cancel,Cancelar,0
+wizard_button,"timesheet.work.open,init,open",0,Open,Abrir,0
diff --git a/fr_FR.csv b/fr_FR.csv
new file mode 100644
index 0000000..eb985d6
--- /dev/null
+++ b/fr_FR.csv
@@ -0,0 +1,97 @@
+type,name,res_id,src,value,fuzzy
+error,timesheet.line,0,Hours field must be positive,Le champ Heures doit être positif,0
+error,timesheet.work,0,Every work must be in the same company as it's parent work!,Chaque activité doit être dans la même société que son activité parente !,0
+error,timesheet.work,0,You can not create recursive works!,Vous ne pouvez pas créer des activités récursives!,0
+field,"timesheet.enter_lines.init,date",0,Date,Date,0
+field,"timesheet.enter_lines.init,employee",0,Employee,Employé,0
+field,"timesheet.hours_employee,employee",0,Employee,Employé,0
+field,"timesheet.hours_employee,hours",0,Hours,Heures,0
+field,"timesheet.hours_employee_monthly,employee",0,Employee,Employé,0
+field,"timesheet.hours_employee_monthly,hours",0,Hours,Heures,0
+field,"timesheet.hours_employee_monthly,month",0,Month,Mois,0
+field,"timesheet.hours_employee_monthly,rec_name",0,Name,Nom,0
+field,"timesheet.hours_employee_monthly,year",0,Year,Année,0
+field,"timesheet.hours_employee,rec_name",0,Name,Nom,0
+field,"timesheet.hours_employee_weekly,employee",0,Employee,Employé,0
+field,"timesheet.hours_employee_weekly,hours",0,Hours,Heures,0
+field,"timesheet.hours_employee_weekly,rec_name",0,Name,Nom,0
+field,"timesheet.hours_employee_weekly,week",0,Week,Semaine,0
+field,"timesheet.hours_employee_weekly,year",0,Year,Année,0
+field,"timesheet.line,date",0,Date,Date,0
+field,"timesheet.line,description",0,Description,Description,0
+field,"timesheet.line,employee",0,Employee,Employé,0
+field,"timesheet.line,hours",0,Hours,Heures,0
+field,"timesheet.line,rec_name",0,Name,Nom,0
+field,"timesheet.line,work",0,Work,Activité,0
+field,"timesheet.open_hours_employee.init,end_date",0,End Date,Date de fin,0
+field,"timesheet.open_hours_employee.init,start_date",0,Start Date,Date de début,0
+field,"timesheet.work,active",0,Active,Actif,0
+field,"timesheet.work,children",0,Children,Enfants,0
+field,"timesheet.work,company",0,Company,Société,0
+field,"timesheet.work,hours",0,Timesheet Hours,Heures,0
+field,"timesheet.work,left",0,Left,Gauche,0
+field,"timesheet.work,name",0,Name,Nom,0
+field,"timesheet.work.open.init,from_date",0,From Date,Date de début,0
+field,"timesheet.work.open.init,to_date",0,To Date,Date de fin,0
+field,"timesheet.work,parent",0,Parent,Parent,0
+field,"timesheet.work,rec_name",0,Name,Nom,0
+field,"timesheet.work,right",0,Right,Droite,0
+field,"timesheet.work,timesheet_available",0,Available on timesheets,Disponible sur les feuilles de présence,0
+help,"timesheet.work,hours",0,Total time spent on this work,Temps total passé sur cette activité,0
+help,"timesheet.work,timesheet_available",0,Allow to fill in timesheets with this work,Autoriser cette activité sur les feuilles de présence,0
+model,"ir.action,name",act_enter_lines,Enter Timesheet,Entrez feuille de présence,0
+model,"ir.action,name",act_hours_employee_form,Hours per Employee,Heures par employé,0
+model,"ir.action,name",act_open_hours_employee,Hours per Employee,Heures par employé,0
+model,"ir.action,name",act_hours_employee_monthly_form,Hours per Employee per Month,Nombre d'heures par employé par mois,0
+model,"ir.action,name",act_hours_employee_weekly_form,Hours per Employee per Week,Nombre d'heures par employé par semaine,0
+model,"ir.action,name",act_open_work,Hours per Work,Heures par activité,0
+model,"ir.action,name",act_work_form2,Hours per Work,Heures par activité,0
+model,"ir.action,name",act_open_work2,Hours per Work,Heures par activité,0
+model,"ir.action,name",act_work_form3,Hours per Work,Heures par activité,0
+model,"ir.action,name",act_open_work_graph,Hours per Work,Heures par activité,0
+model,"ir.action,name",act_line_form,Timesheet Lines,Lignes de feuille de présence,0
+model,"ir.action,name",act_work_form,Works,Activités,0
+model,"ir.action,name",act_work_tree,Works,Activités,0
+model,"ir.action,name",act_work_tree2,Works,Activités,0
+model,"ir.ui.menu,name",menu_configuration,Configuration,Configuration,0
+model,"ir.ui.menu,name",menu_enter_lines,Enter Timesheet,Entrer feuille de présence,0
+model,"ir.ui.menu,name",menu_open_hours_employee,Hours per Employee,Heures par employé,0
+model,"ir.ui.menu,name",menu_open_hours_employee_monthly,Hours per Employee per Month,Nombre d'heures par employé par mois,0
+model,"ir.ui.menu,name",menu_open_hours_employee_weekly,Hours per Employee per Week,Nombre d'heures par employé par semaine,0
+model,"ir.ui.menu,name",menu_work_tree2,Hours per Work,Heures par activité,0
+model,"ir.ui.menu,name",menu_work_form2,Hours per Work,Heures par activité,0
+model,"ir.ui.menu,name",menu_reporting,Reporting,Rapports,0
+model,"ir.ui.menu,name",menu_line_form,Timesheet Lines,Lignes de feuille de présence,0
+model,"ir.ui.menu,name",menu_timesheet,Timesheet Management,Feuilles de présence,0
+model,"ir.ui.menu,name",menu_work_form,Works,Activités,0
+model,"ir.ui.menu,name",menu_work_tree,Works,Activités,0
+model,"res.group,name",group_timesheet_admin,Timesheet Administration,Administration feuille de présence,0
+model,"timesheet.enter_lines.init,name",0,Enter Lines Init,Entrez les lignes - Init,0
+model,"timesheet.hours_employee_monthly,name",0,Hours per Employee per Month,Nombre d'heures par employé par mois,0
+model,"timesheet.hours_employee,name",0,Hours per Employee,Heures par employé,0
+model,"timesheet.hours_employee_weekly,name",0,Hours per Employee per Week,Nombre d'heures par employé par semaine,0
+model,"timesheet.line,name",0,Timesheet Line,Ligne de feuille de présence,0
+model,"timesheet.open_hours_employee.init,name",0,Open Hours Employee Init,Heures d'ouverture des employés - Init,0
+model,"timesheet.work,name",0,Work,Activité,0
+model,"timesheet.work.open.init,name",0,Open Work Init,Ouvrir activité - Init,0
+view,timesheet.enter_lines.init,0,Enter Timesheet,Entrez feuille de présence,0
+view,timesheet.hours_employee,0,Hours,Heures,0
+view,timesheet.hours_employee,0,Hours per Employee,Heures par employé,0
+view,timesheet.hours_employee_monthly,0,Hours per Employee per Month,Nombre d'heures par employé par mois,0
+view,timesheet.hours_employee_weekly,0,Hours per Employee per Week,Nombre d'heures par employé par semaine,0
+view,timesheet.line,0,Hours,Heures,0
+view,timesheet.line,0,Timesheet Line,Ligne de feuille de présence,0
+view,timesheet.line,0,Timesheet Lines,Lignes de feuille de présence,0
+view,timesheet.open_hours_employee.init,0,Hours per Employee,Heures par employé,0
+view,timesheet.work,0,Hours per Work,Heures par activité,0
+view,timesheet.work,0,Work,Activité,0
+view,timesheet.work,0,Works,Activités,0
+view,timesheet.work.open.init,0,Hours per Work,Heures par activité,0
+wizard_button,"timesheet.enter_lines,init,end",0,Cancel,Annuler,0
+wizard_button,"timesheet.enter_lines,init,enter",0,Enter,Entrez,0
+wizard_button,"timesheet.open_hours_employee,init,end",0,Cancel,Annuler,0
+wizard_button,"timesheet.open_hours_employee,init,open",0,Open,Ouvrir,0
+wizard_button,"timesheet.work.open2,init,end",0,Cancel,Annuler,0
+wizard_button,"timesheet.work.open2,init,open",0,Open,Ouvrir,0
+wizard_button,"timesheet.work.open,init,end",0,Cancel,Annuler,0
+wizard_button,"timesheet.work.open,init,open",0,Open,Ouvrir,0
diff --git a/line.py b/line.py
new file mode 100644
index 0000000..7862f3a
--- /dev/null
+++ b/line.py
@@ -0,0 +1,302 @@
+#This file is part of Tryton. The COPYRIGHT file at the top level
+#of this repository contains the full copyright notices and license terms.
+"Timesheet Line"
+from trytond.model import ModelView, ModelSQL, fields
+from trytond.wizard import Wizard
+from trytond.backend import FIELDS
+
+
+class Line(ModelSQL, ModelView):
+ 'Timesheet Line'
+ _name = 'timesheet.line'
+ _description = __doc__
+
+ employee = fields.Many2One('company.employee', 'Employee', required=True,
+ select=1, domain=["('company', '=', company)"])
+ date = fields.Date('Date', required=True, select=1)
+ hours = fields.Float('Hours', digits=(16, 2), required=True)
+ work = fields.Many2One('timesheet.work', 'Work',
+ required=True, select=1, domain=[
+ ('timesheet_available', '=', 'True'),
+ ])
+ description = fields.Char('Description')
+
+ def __init__(self):
+ super(Line, self).__init__()
+ self._sql_constraints += [
+ ('check_move_hours_pos',
+ 'CHECK(hours >= 0.0)', 'Hours field must be positive'),
+ ]
+
+ def default_employee(self, cursor, user_id, context=None):
+ user_obj = self.pool.get('res.user')
+ employee_obj = self.pool.get('company.employee')
+
+ if context is None:
+ context = {}
+ employee_id = None
+ if context.get('employee'):
+ employee_id = context['employee']
+ else:
+ user = user_obj.browse(cursor, user_id, user_id, context=context)
+ if user.employee:
+ employee_id = user.employee.id
+ if employee_id:
+ return employee_id
+ return False
+
+ def default_date(self, cursor, user, context=None):
+ date_obj = self.pool.get('ir.date')
+
+ if context is None:
+ context = {}
+ if context.get('date'):
+ return context['date']
+ return date_obj.today(cursor, user, context=context)
+
+ def view_header_get(self, cursor, user, value, view_type='form',
+ context=None):
+ if not context.get('employee'):
+ return value
+ employee_obj = self.pool.get('company.employee')
+ employee = employee_obj.browse(cursor, user, context['employee'],
+ context=context)
+ return value + " (" + employee.name + ")"
+
+Line()
+
+
+class EnterLinesInit(ModelView):
+ 'Enter Lines Init'
+ _name = 'timesheet.enter_lines.init'
+ _description = __doc__
+ employee = fields.Many2One('company.employee', 'Employee', required=True,
+ domain=["('company', '=', company)"])
+ date = fields.Date('Date', required=True)
+
+ def default_employee(self, cursor, user, context=None):
+ line_obj = self.pool.get('timesheet.line')
+ return line_obj.default_employee(cursor, user, context=context)
+
+ def default_date(self, cursor, user, context=None):
+ line_obj = self.pool.get('timesheet.line')
+ return line_obj.default_date(cursor, user, context=context)
+
+EnterLinesInit()
+
+
+class EnterLines(Wizard):
+ 'Enter Lines'
+ _name = 'timesheet.enter_lines'
+ states = {
+ 'init': {
+ 'result': {
+ 'type': 'form',
+ 'object': 'timesheet.enter_lines.init',
+ 'state': [
+ ('end', 'Cancel', 'tryton-cancel'),
+ ('enter', 'Enter', 'tryton-ok', True),
+ ],
+ },
+ },
+ 'enter': {
+ 'result': {
+ 'type': 'action',
+ 'action': '_action_enter_lines',
+ 'state': 'end',
+ },
+ }
+ }
+
+ def _action_enter_lines(self, cursor, user, data, context=None):
+ model_data_obj = self.pool.get('ir.model.data')
+ act_window_obj = self.pool.get('ir.action.act_window')
+ employee_obj = self.pool.get('company.employee')
+
+ model_data_ids = model_data_obj.search(cursor, user, [
+ ('fs_id', '=', 'act_line_form'),
+ ('module', '=', 'timesheet'),
+ ('inherit', '=', False),
+ ], limit=1, context=context)
+ model_data = model_data_obj.browse(cursor, user, model_data_ids[0],
+ context=context)
+ res = act_window_obj.read(cursor, user, model_data.db_id, context=context)
+ res['domain'] = str([
+ ('employee', '=', data['form']['employee']),
+ ('date', '=', data['form']['date']),
+ ])
+ res['context'] = str({
+ 'employee': data['form']['employee'],
+ 'date': data['form']['date'],
+ })
+
+ if data['form']['employee']:
+ employee = employee_obj.browse(
+ cursor, user, data['form']['employee'], context=context)
+ res['name'] += " - " + employee.rec_name
+
+ return res
+
+EnterLines()
+
+
+class HoursEmployee(ModelSQL, ModelView):
+ 'Hours per Employee'
+ _name = 'timesheet.hours_employee'
+ _description = __doc__
+
+ employee = fields.Many2One('company.employee', 'Employee', select=1)
+ hours = fields.Float('Hours', digits=(16, 2))
+
+ def table_query(self, context=None):
+ if context is None:
+ context = {}
+ clause = ' '
+ args = []
+ if context.get('start_date'):
+ clause += 'AND date >= %s '
+ args.append(context['start_date'])
+ if context.get('end_date'):
+ clause += 'AND date <= %s '
+ args.append(context['end_date'])
+ return ('SELECT DISTINCT(employee) AS id, ' \
+ 'MAX(create_uid) AS create_uid, ' \
+ 'MAX(create_date) AS create_date, ' \
+ 'MAX(write_uid) AS write_uid, ' \
+ 'MAX(write_date) AS write_date, ' \
+ 'employee, ' \
+ 'SUM(COALESCE(hours, 0)) AS hours ' \
+ 'FROM timesheet_line ' \
+ 'WHERE True ' \
+ + clause + \
+ 'GROUP BY employee', args)
+
+HoursEmployee()
+
+
+class OpenHoursEmployeeInit(ModelView):
+ 'Open Hours Employee Init'
+ _name = 'timesheet.open_hours_employee.init'
+ _description = __doc__
+ start_date = fields.Date('Start Date')
+ end_date = fields.Date('End Date')
+
+OpenHoursEmployeeInit()
+
+
+class OpenHoursEmployee(Wizard):
+ 'Open Hours per Employee'
+ _name = 'timesheet.open_hours_employee'
+ states = {
+ 'init': {
+ 'result': {
+ 'type': 'form',
+ 'object': 'timesheet.open_hours_employee.init',
+ 'state': [
+ ('end', 'Cancel', 'tryton-cancel'),
+ ('open', 'Open', 'tryton-ok', True),
+ ],
+ },
+ },
+ 'open': {
+ 'result': {
+ 'type': 'action',
+ 'action': '_action_open',
+ 'state': 'end',
+ },
+ },
+ }
+
+ def _action_open(self, cursor, user, data, context=None):
+ model_data_obj = self.pool.get('ir.model.data')
+ act_window_obj = self.pool.get('ir.action.act_window')
+
+ model_data_ids = model_data_obj.search(cursor, user, [
+ ('fs_id', '=', 'act_hours_employee_form'),
+ ('module', '=', 'timesheet'),
+ ('inherit', '=', False),
+ ], limit=1, context=context)
+ model_data = model_data_obj.browse(cursor, user, model_data_ids[0],
+ context=context)
+ res = act_window_obj.read(cursor, user, model_data.db_id, context=context)
+ res['context'] = str({
+ 'start_date': data['form']['start_date'],
+ 'end_date': data['form']['end_date'],
+ })
+ return res
+
+OpenHoursEmployee()
+
+
+class HoursEmployeeWeekly(ModelSQL, ModelView):
+ 'Hours per Employee per Week'
+ _name = 'timesheet.hours_employee_weekly'
+ _description = __doc__
+
+ year = fields.Char('Year', select=1)
+ week = fields.Integer('Week', select=1)
+ employee = fields.Many2One('company.employee', 'Employee', select=1)
+ hours = fields.Float('Hours', digits=(16, 2), select=1)
+
+ def __init__(self):
+ super(HoursEmployeeWeekly, self).__init__()
+ self._order.insert(0, ('year', 'DESC'))
+ self._order.insert(1, ('week', 'DESC'))
+ self._order.insert(2, ('employee', 'ASC'))
+
+ def table_query(self, context=None):
+ type_name = FIELDS[self.year._type].sql_type(self.year)[0]
+ return ('SELECT id, create_uid, create_date, write_uid, write_date, ' \
+ 'CAST(year AS ' + type_name + '), week, employee, hours ' \
+ 'FROM ('
+ 'SELECT EXTRACT(WEEK FROM date) + ' \
+ 'EXTRACT(YEAR FROM date) * 100 + ' \
+ 'employee * 1000000 AS id, ' \
+ 'MAX(create_uid) AS create_uid, ' \
+ 'MAX(create_date) AS create_date, ' \
+ 'MAX(write_uid) AS write_uid, ' \
+ 'MAX(write_date) AS write_date, ' \
+ 'EXTRACT(YEAR FROM date) AS year, ' \
+ 'EXTRACT(WEEK FROM date) AS week, employee, ' \
+ 'SUM(COALESCE(hours, 0)) AS hours ' \
+ 'FROM timesheet_line ' \
+ 'GROUP BY year, week, employee) AS ' + self._table, [])
+
+HoursEmployeeWeekly()
+
+
+class HoursEmployeeMonthly(ModelSQL, ModelView):
+ 'Hours per Employee per Month'
+ _name = 'timesheet.hours_employee_monthly'
+ _description = __doc__
+
+ year = fields.Char('Year', select=1)
+ month = fields.Integer('Month', select=1)
+ employee = fields.Many2One('company.employee', 'Employee', select=1)
+ hours = fields.Float('Hours', digits=(16, 2), select=1)
+
+ def __init__(self):
+ super(HoursEmployeeMonthly, self).__init__()
+ self._order.insert(0, ('year', 'DESC'))
+ self._order.insert(1, ('month', 'DESC'))
+ self._order.insert(2, ('employee', 'ASC'))
+
+ def table_query(self, context=None):
+ type_name = FIELDS[self.year._type].sql_type(self.year)[0]
+ return ('SELECT id, create_uid, create_date, write_uid, write_date, ' \
+ 'CAST(year AS ' + type_name + '), month, employee, hours ' \
+ 'FROM ('
+ 'SELECT EXTRACT(MONTH FROM date) + ' \
+ 'EXTRACT(YEAR FROM date) * 100 + ' \
+ 'employee * 1000000 AS id, ' \
+ 'MAX(create_uid) AS create_uid, ' \
+ 'MAX(create_date) AS create_date, ' \
+ 'MAX(write_uid) AS write_uid, ' \
+ 'MAX(write_date) AS write_date, ' \
+ 'EXTRACT(YEAR FROM date) AS year, ' \
+ 'EXTRACT(MONTH FROM date) AS month, employee, ' \
+ 'SUM(COALESCE(hours, 0)) AS hours ' \
+ 'FROM timesheet_line ' \
+ 'GROUP BY year, month, employee) AS ' + self._table, [])
+
+HoursEmployeeMonthly()
diff --git a/line.xml b/line.xml
new file mode 100644
index 0000000..1bed492
--- /dev/null
+++ b/line.xml
@@ -0,0 +1,248 @@
+<?xml version="1.0"?>
+<!-- This file is part of Tryton. The COPYRIGHT file at the top level of
+this repository contains the full copyright notices and license terms. -->
+<tryton>
+ <data>
+ <record model="ir.ui.view" id="line_view_form">
+ <field name="model">timesheet.line</field>
+ <field name="type">form</field>
+ <field name="arch" type="xml">
+ <![CDATA[
+ <form string="Timesheet Line">
+ <label name="employee"/>
+ <field name="employee" colspan="3"/>
+ <label name="date"/>
+ <field name="date"/>
+ <label name="hours"/>
+ <field name="hours" widget="float_time"
+ float_time="company_work_time"/>
+ <label name="work"/>
+ <field name="work"/>
+ <label name="description"/>
+ <field name="description"/>
+ </form>
+ ]]>
+ </field>
+ </record>
+ <record model="ir.ui.view" id="line_view_tree">
+ <field name="model">timesheet.line</field>
+ <field name="type">tree</field>
+ <field name="arch" type="xml">
+ <![CDATA[
+ <tree string="Timesheet Lines" editable="bottom">
+ <field name="employee" select="1"/>
+ <field name="date" select="1"/>
+ <field name="hours" widget="float_time"
+ float_time="company_work_time" sum="Hours"/>
+ <field name="work" select="1" width="300"/>
+ <field name="description"/>
+ </tree>
+ ]]>
+ </field>
+ </record>
+ <record model="ir.action.act_window" id="act_line_form">
+ <field name="name">Timesheet Lines</field>
+ <field name="res_model">timesheet.line</field>
+ <field name="view_type">form</field>
+ </record>
+ <record model="ir.action.act_window.view"
+ id="act_line_form_view1">
+ <field name="sequence" eval="10"/>
+ <field name="view" ref="line_view_tree"/>
+ <field name="act_window" ref="act_line_form"/>
+ </record>
+ <record model="ir.action.act_window.view"
+ id="act_line_form_view2">
+ <field name="sequence" eval="20"/>
+ <field name="view" ref="line_view_form"/>
+ <field name="act_window" ref="act_line_form"/>
+ </record>
+ <menuitem parent="menu_timesheet" action="act_line_form"
+ id="menu_line_form" sequence="30"/>
+
+ <record model="ir.rule.group" id="rule_group_line">
+ <field name="model" search="[('model', '=', 'timesheet.line')]"/>
+ <field name="global_p" eval="False"/>
+ <field name="default_p" eval="True"/>
+ </record>
+ <record model="ir.rule" id="rule_line1">
+ <field name="field" search="[('name', '=', 'employee'), ('model.model', '=', 'timesheet.line')]"/>
+ <field name="operator">=</field>
+ <field name="operand">User/Employee</field>
+ <field name="rule_group" ref="rule_group_line"/>
+ </record>
+ <record model="ir.rule.group" id="rule_group_line_admin">
+ <field name="model" search="[('model', '=', 'timesheet.line')]"/>
+ <field name="global_p" eval="False"/>
+ <field name="default_p" eval="False"/>
+ <field name="groups" eval="[('add', ref('group_timesheet_admin'))]"/>
+ </record>
+
+ <record model="ir.ui.view" id="enter_lines_init_view_form">
+ <field name="model">timesheet.enter_lines.init</field>
+ <field name="type">form</field>
+ <field name="arch" type="xml">
+ <![CDATA[
+ <form string="Enter Timesheet">
+ <label name="employee"/>
+ <field name="employee"/>
+ <label name="date"/>
+ <field name="date"/>
+ </form>
+ ]]>
+ </field>
+ </record>
+
+ <record model="ir.action.wizard" id="act_enter_lines">
+ <field name="name">Enter Timesheet</field>
+ <field name="wiz_name">timesheet.enter_lines</field>
+ </record>
+ <menuitem parent="menu_timesheet" action="act_enter_lines"
+ id="menu_enter_lines" sequence="20"/>
+
+ <record model="ir.ui.view" id="hours_employee_view_tree">
+ <field name="model">timesheet.hours_employee</field>
+ <field name="type">tree</field>
+ <field name="arch" type="xml">
+ <![CDATA[
+ <tree string="Hours per Employee">
+ <field name="employee"/>
+ <field name="hours" widget="float_time"
+ float_time="company_work_time" sum="Hours"/>
+ </tree>
+ ]]>
+ </field>
+ </record>
+ <record model="ir.ui.view" id="hours_employee_view_graph">
+ <field name="model">timesheet.hours_employee</field>
+ <field name="type">graph</field>
+ <field name="arch" type="xml">
+ <![CDATA[
+ <graph string="Hours per Employee">
+ <x>
+ <field name="employee"/>
+ </x>
+ <y>
+ <field name="hours" widget="float_time"
+ float_time="company_work_time"/>
+ </y>
+ </graph>
+ ]]>
+ </field>
+ </record>
+ <record model="ir.action.act_window" id="act_hours_employee_form">
+ <field name="name">Hours per Employee</field>
+ <field name="res_model">timesheet.hours_employee</field>
+ <field name="view_type">form</field>
+ </record>
+ <record model="ir.action.act_window.view"
+ id="act_hours_employee_form_view1">
+ <field name="sequence" eval="10"/>
+ <field name="view" ref="hours_employee_view_tree"/>
+ <field name="act_window" ref="act_hours_employee_form"/>
+ </record>
+ <record model="ir.action.act_window.view"
+ id="act_hours_employee_form_view2">
+ <field name="sequence" eval="20"/>
+ <field name="view" ref="hours_employee_view_graph"/>
+ <field name="act_window" ref="act_hours_employee_form"/>
+ </record>
+
+ <record model="ir.rule.group" id="rule_group_hours_employee">
+ <field name="model" search="[('model', '=', 'timesheet.hours_employee')]"/>
+ <field name="global_p" eval="False"/>
+ <field name="default_p" eval="True"/>
+ </record>
+ <record model="ir.rule" id="rule_hours_employee1">
+ <field name="field" search="[('name', '=', 'employee'), ('model.model', '=', 'timesheet.hours_employee')]"/>
+ <field name="operator">=</field>
+ <field name="operand">User/Employee</field>
+ <field name="rule_group" ref="rule_group_hours_employee"/>
+ </record>
+ <record model="ir.rule.group" id="rule_group_hours_employee_admin">
+ <field name="model" search="[('model', '=', 'timesheet.hours_employee')]"/>
+ <field name="global_p" eval="False"/>
+ <field name="default_p" eval="False"/>
+ <field name="groups" eval="[('add', ref('group_timesheet_admin'))]"/>
+ </record>
+
+ <record model="ir.ui.view" id="open_hours_employee_init_view_form">
+ <field name="model">timesheet.open_hours_employee.init</field>
+ <field name="type">form</field>
+ <field name="arch" type="xml">
+ <![CDATA[
+ <form string="Hours per Employee">
+ <label name="start_date"/>
+ <field name="start_date"/>
+ <label name="end_date"/>
+ <field name="end_date"/>
+ </form>
+ ]]>
+ </field>
+ </record>
+ <record model="ir.action.wizard" id="act_open_hours_employee">
+ <field name="name">Hours per Employee</field>
+ <field name="wiz_name">timesheet.open_hours_employee</field>
+ </record>
+ <menuitem parent="menu_reporting" action="act_open_hours_employee"
+ icon="tryton-list" id="menu_open_hours_employee"/>
+
+ <record model="ir.ui.view" id="hours_employee_weekly_view_tree">
+ <field name="model">timesheet.hours_employee_weekly</field>
+ <field name="type">tree</field>
+ <field name="arch" type="xml">
+ <![CDATA[
+ <tree string="Hours per Employee per Week">
+ <field name="year" select="1"/>
+ <field name="week" select="1"/>
+ <field name="employee" select="1"/>
+ <field name="hours" select="1" widget="float_time"
+ float_time="company_work_time"/>
+ </tree>
+ ]]>
+ </field>
+ </record>
+ <record model="ir.action.act_window" id="act_hours_employee_weekly_form">
+ <field name="name">Hours per Employee per Week</field>
+ <field name="res_model">timesheet.hours_employee_weekly</field>
+ <field name="view_type">form</field>
+ </record>
+ <record model="ir.action.act_window.view"
+ id="act_hours_employee_weekly_form_view1">
+ <field name="sequence" eval="10"/>
+ <field name="view" ref="hours_employee_weekly_view_tree"/>
+ <field name="act_window" ref="act_hours_employee_weekly_form"/>
+ </record>
+ <menuitem parent="menu_reporting" action="act_hours_employee_weekly_form"
+ id="menu_open_hours_employee_weekly"/>
+
+ <record model="ir.ui.view" id="hours_employee_monthly_view_tree">
+ <field name="model">timesheet.hours_employee_monthly</field>
+ <field name="type">tree</field>
+ <field name="arch" type="xml">
+ <![CDATA[
+ <tree string="Hours per Employee per Month">
+ <field name="year" select="1"/>
+ <field name="month" select="1"/>
+ <field name="employee" select="1"/>
+ <field name="hours" select="1" widget="float_time"
+ float_time="company_work_time"/>
+ </tree>
+ ]]>
+ </field>
+ </record>
+ <record model="ir.action.act_window" id="act_hours_employee_monthly_form">
+ <field name="name">Hours per Employee per Month</field>
+ <field name="res_model">timesheet.hours_employee_monthly</field>
+ <field name="view_type">form</field>
+ </record>
+ <record model="ir.action.act_window.view"
+ id="act_hours_employee_monthly_form_view1">
+ <field name="sequence" eval="10"/>
+ <field name="view" ref="hours_employee_monthly_view_tree"/>
+ <field name="act_window" ref="act_hours_employee_monthly_form"/>
+ </record>
+ <menuitem parent="menu_reporting" action="act_hours_employee_monthly_form"
+ id="menu_open_hours_employee_monthly"/>
+ </data>
+</tryton>
diff --git a/setup.cfg b/setup.cfg
new file mode 100644
index 0000000..861a9f5
--- /dev/null
+++ b/setup.cfg
@@ -0,0 +1,5 @@
+[egg_info]
+tag_build =
+tag_date = 0
+tag_svn_revision = 0
+
diff --git a/setup.py b/setup.py
new file mode 100644
index 0000000..32678a1
--- /dev/null
+++ b/setup.py
@@ -0,0 +1,56 @@
+#!/usr/bin/env python
+#This file is part of Tryton. The COPYRIGHT file at the top level of
+#this repository contains the full copyright notices and license terms.
+
+from setuptools import setup, find_packages
+import re
+
+info = eval(file('__tryton__.py').read())
+
+requires = []
+for dep in info.get('depends', []):
+ if not re.match(r'(ir|res|workflow|webdav)(\W|$)', dep):
+ requires.append('trytond_' + dep)
+
+major_version, minor_version, _ = info.get('version', '0.0.1').split('.', 2)
+requires.append('trytond >= %s.%s' % (major_version, minor_version))
+requires.append('trytond < %s.%s' % (major_version, int(minor_version) + 1))
+
+setup(name='trytond_timesheet',
+ version=info.get('version', '0.0.1'),
+ description=info.get('description', ''),
+ author=info.get('author', ''),
+ author_email=info.get('email', ''),
+ url=info.get('website', ''),
+ download_url="http://downloads.tryton.org/" + \
+ info.get('version', '0.0.1').rsplit('.', 1)[0] + '/',
+ package_dir={'trytond.modules.timesheet': '.'},
+ packages=[
+ 'trytond.modules.timesheet',
+ ],
+ package_data={
+ 'trytond.modules.timesheet': info.get('xml', []) \
+ + info.get('translation', []),
+ },
+ classifiers=[
+ 'Development Status :: 5 - Production/Stable',
+ 'Environment :: Plugins',
+ 'Intended Audience :: Developers',
+ 'Intended Audience :: Financial and Insurance Industry',
+ 'Intended Audience :: Legal Industry',
+ 'Intended Audience :: Manufacturing',
+ 'License :: OSI Approved :: GNU General Public License (GPL)',
+ 'Natural Language :: English',
+ 'Natural Language :: German',
+ 'Operating System :: OS Independent',
+ 'Programming Language :: Python',
+ 'Topic :: Office/Business',
+ ],
+ license='GPL-3',
+ install_requires=requires,
+ zip_safe=False,
+ entry_points="""
+ [trytond.modules]
+ timesheet = trytond.modules.timesheet
+ """,
+)
diff --git a/tests/__init__.py b/tests/__init__.py
new file mode 100644
index 0000000..d8bc848
--- /dev/null
+++ b/tests/__init__.py
@@ -0,0 +1,4 @@
+#This file is part of Tryton. The COPYRIGHT file at the top level of
+#this repository contains the full copyright notices and license terms.
+
+from test_timesheet import *
diff --git a/tests/test_timesheet.py b/tests/test_timesheet.py
new file mode 100644
index 0000000..b1a6a55
--- /dev/null
+++ b/tests/test_timesheet.py
@@ -0,0 +1,38 @@
+#!/usr/bin/env python
+#This file is part of Tryton. The COPYRIGHT file at the top level of
+#this repository contains the full copyright notices and license terms.
+
+import sys, os
+DIR = os.path.abspath(os.path.normpath(os.path.join(__file__,
+ '..', '..', '..', '..', '..', 'trytond')))
+if os.path.isdir(DIR):
+ sys.path.insert(0, os.path.dirname(DIR))
+
+import unittest
+import trytond.tests.test_tryton
+from trytond.tests.test_tryton import RPCProxy, CONTEXT, SOCK, test_view
+
+
+class TimesheetTestCase(unittest.TestCase):
+ '''
+ Test Timesheet module.
+ '''
+
+ def setUp(self):
+ trytond.tests.test_tryton.install_module('timesheet')
+
+ def test0005views(self):
+ '''
+ Test views.
+ '''
+ self.assertRaises(Exception, test_view('timesheet'))
+
+def suite():
+ return unittest.TestLoader().loadTestsFromTestCase(TimesheetTestCase)
+
+if __name__ == '__main__':
+ suiteTrytond = trytond.tests.test_tryton.suite()
+ suiteTimesheet = suite()
+ alltests = unittest.TestSuite([suiteTrytond, suiteTimesheet])
+ unittest.TextTestRunner(verbosity=2).run(alltests)
+ SOCK.disconnect()
diff --git a/timesheet.xml b/timesheet.xml
new file mode 100644
index 0000000..5c639bd
--- /dev/null
+++ b/timesheet.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0"?>
+<!-- This file is part of Tryton. The COPYRIGHT file at the top level of
+this repository contains the full copyright notices and license terms. -->
+<tryton>
+ <data>
+ <record model="res.group" id="group_timesheet_admin">
+ <field name="name">Timesheet Administration</field>
+ </record>
+ <record model="res.user" id="res.user_admin">
+ <field name="groups" eval="[('add', ref('group_timesheet_admin'))]"/>
+ </record>
+
+ <menuitem name="Timesheet Management" sequence="6" id="menu_timesheet"
+ icon="tryton-clock"/>
+ <menuitem name="Configuration" parent="menu_timesheet"
+ id="menu_configuration" groups="group_timesheet_admin"
+ sequence="10" icon="tryton-preferences"/>
+ <menuitem name="Reporting" parent="menu_timesheet"
+ id="menu_reporting" sequence="100"/>
+ </data>
+</tryton>
diff --git a/trytond_timesheet.egg-info/PKG-INFO b/trytond_timesheet.egg-info/PKG-INFO
new file mode 100644
index 0000000..99a554e
--- /dev/null
+++ b/trytond_timesheet.egg-info/PKG-INFO
@@ -0,0 +1,31 @@
+Metadata-Version: 1.0
+Name: trytond-timesheet
+Version: 1.4.0
+Summary: Timesheet Module with:
+ - Work
+ - Timesheet line
+
+And with reports:
+ - Hours per work
+ - Hours per employee per week
+ - Hours per employee per month
+
+Home-page: http://www.tryton.org/
+Author: B2CK
+Author-email: info at b2ck.com
+License: GPL-3
+Download-URL: http://downloads.tryton.org/1.4/
+Description: UNKNOWN
+Platform: UNKNOWN
+Classifier: Development Status :: 5 - Production/Stable
+Classifier: Environment :: Plugins
+Classifier: Intended Audience :: Developers
+Classifier: Intended Audience :: Financial and Insurance Industry
+Classifier: Intended Audience :: Legal Industry
+Classifier: Intended Audience :: Manufacturing
+Classifier: License :: OSI Approved :: GNU General Public License (GPL)
+Classifier: Natural Language :: English
+Classifier: Natural Language :: German
+Classifier: Operating System :: OS Independent
+Classifier: Programming Language :: Python
+Classifier: Topic :: Office/Business
diff --git a/trytond_timesheet.egg-info/SOURCES.txt b/trytond_timesheet.egg-info/SOURCES.txt
new file mode 100644
index 0000000..ffee670
--- /dev/null
+++ b/trytond_timesheet.egg-info/SOURCES.txt
@@ -0,0 +1,28 @@
+CHANGELOG
+COPYRIGHT
+INSTALL
+LICENSE
+MANIFEST.in
+README
+de_DE.csv
+es_CO.csv
+es_ES.csv
+fr_FR.csv
+line.xml
+setup.py
+timesheet.xml
+work.xml
+./__init__.py
+./__tryton__.py
+./line.py
+./work.py
+doc/index.rst
+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
+trytond_timesheet.egg-info/entry_points.txt
+trytond_timesheet.egg-info/not-zip-safe
+trytond_timesheet.egg-info/requires.txt
+trytond_timesheet.egg-info/top_level.txt
\ No newline at end of file
diff --git a/trytond_timesheet.egg-info/dependency_links.txt b/trytond_timesheet.egg-info/dependency_links.txt
new file mode 100644
index 0000000..8b13789
--- /dev/null
+++ b/trytond_timesheet.egg-info/dependency_links.txt
@@ -0,0 +1 @@
+
diff --git a/trytond_timesheet.egg-info/entry_points.txt b/trytond_timesheet.egg-info/entry_points.txt
new file mode 100644
index 0000000..0eabb68
--- /dev/null
+++ b/trytond_timesheet.egg-info/entry_points.txt
@@ -0,0 +1,4 @@
+
+ [trytond.modules]
+ timesheet = trytond.modules.timesheet
+
\ No newline at end of file
diff --git a/trytond_timesheet.egg-info/not-zip-safe b/trytond_timesheet.egg-info/not-zip-safe
new file mode 100644
index 0000000..8b13789
--- /dev/null
+++ b/trytond_timesheet.egg-info/not-zip-safe
@@ -0,0 +1 @@
+
diff --git a/trytond_timesheet.egg-info/requires.txt b/trytond_timesheet.egg-info/requires.txt
new file mode 100644
index 0000000..695fdbc
--- /dev/null
+++ b/trytond_timesheet.egg-info/requires.txt
@@ -0,0 +1,4 @@
+trytond_company
+trytond_company_work_time
+trytond >= 1.4
+trytond < 1.5
\ No newline at end of file
diff --git a/trytond_timesheet.egg-info/top_level.txt b/trytond_timesheet.egg-info/top_level.txt
new file mode 100644
index 0000000..93df119
--- /dev/null
+++ b/trytond_timesheet.egg-info/top_level.txt
@@ -0,0 +1 @@
+trytond
diff --git a/work.py b/work.py
new file mode 100644
index 0000000..e80e2ce
--- /dev/null
+++ b/work.py
@@ -0,0 +1,245 @@
+#This file is part of Tryton. The COPYRIGHT file at the top level of
+#this repository contains the full copyright notices and license terms.
+"Work"
+from trytond.model import ModelView, ModelSQL, fields
+from trytond.wizard import Wizard
+
+
+class Work(ModelSQL, ModelView):
+ 'Work'
+ _name = 'timesheet.work'
+ _description = __doc__
+
+ name = fields.Char('Name', required=True)
+ active = fields.Boolean('Active')
+ parent = fields.Many2One('timesheet.work', 'Parent', left="left",
+ right="right", select=2, ondelete="RESTRICT")
+ left = fields.Integer('Left', required=True, select=1)
+ right = fields.Integer('Right', required=True, select=1)
+ children = fields.One2Many('timesheet.work', 'parent', 'Children')
+ hours = fields.Function('get_hours', digits=(16, 2),
+ string='Timesheet Hours', help="Total time spent on this work")
+ timesheet_available = fields.Boolean('Available on timesheets',
+ help="Allow to fill in timesheets with this work")
+ company = fields.Many2One('company.company', 'Company', required=True)
+
+ def __init__(self):
+ super(Work, self).__init__()
+ self._constraints += [
+ ('check_recursion', 'recursive_works'),
+ ('check_parent_company', 'parent_company'),
+ ]
+ self._error_messages.update({
+ 'recursive_works': 'You can not create recursive works!',
+ 'parent_company': 'Every work must be in the same company '\
+ 'as it\'s parent work!',
+ })
+
+ def default_active(self, cursor, user, context=None):
+ return True
+
+ def default_timesheet_available(self, cursor, user, context=None):
+ return True
+
+ def default_company(self, cursor, user, context=None):
+ if context is None:
+ context = {}
+ if context.get('company'):
+ return context['company']
+ return False
+
+ def check_parent_company(self, cursor, user, ids):
+ for work in self.browse(cursor, user, ids):
+ if not work.parent:
+ continue
+ if work.parent.company.id != work.company.id:
+ return False
+ return True
+
+ def _tree_qty(self, hours_by_wt, children, ids, to_compute):
+ res = 0
+ for h in ids:
+ if (not children.get(h)) or (not to_compute[h]):
+ res += hours_by_wt.setdefault(h, 0)
+ else:
+ sub_qty = self._tree_qty(
+ hours_by_wt, children, children[h], to_compute)
+ hours_by_wt.setdefault(h, 0)
+ hours_by_wt[h] += sub_qty
+ res += hours_by_wt[h]
+ to_compute[h] = False
+ return res
+
+ def get_hours(self, cursor, user, ids, name, arg, context=None):
+ all_ids = self.search(cursor, user, [
+ ('parent', 'child_of', ids)
+ ], context=context)
+ # force inactive ids to be in all_ids
+ all_ids = all_ids + ids
+ clause = "SELECT work, sum(hours) FROM timesheet_line "\
+ "WHERE work IN (%s) "\
+ % ",".join(('%s',) * len(all_ids))
+ date_cond = ""
+ args = []
+ if context.get('from_date'):
+ date_cond = " AND date >= %s"
+ args.append(context['from_date'])
+ if context.get('to_date'):
+ date_cond += " AND date <= %s"
+ args.append(context['to_date'])
+ clause += date_cond + " GROUP BY work"
+
+ cursor.execute(clause, all_ids + args)
+
+ hours_by_wt = dict([(i[0], i[1]) for i in cursor.fetchall()])
+ to_compute = dict.fromkeys(all_ids, True)
+ works = self.browse(cursor, user, all_ids, context=context)
+ children = {}
+ for work in works:
+ if work.parent:
+ children.setdefault(work.parent.id, []).append(work.id)
+ self._tree_qty(hours_by_wt, children, ids, to_compute)
+ return hours_by_wt
+
+ def get_rec_name(self, cursor, user, ids, name, arg, context=None):
+ if not ids:
+ return {}
+ res = {}
+ def _name(work):
+ if work.parent:
+ return _name(work.parent) + '\\' + work.name
+ else:
+ return work.name
+ for work in self.browse(cursor, user, ids, context=context):
+ res[work.id] = _name(work)
+ return res
+
+ def write(self, cursor, user, ids, vals, context=None):
+ child_ids = None
+ if not vals.get('active', True):
+ child_ids = self.search(cursor, user, [
+ ('parent', 'child_of', ids),
+ ], context=context)
+ res = super(Work, self).write(cursor, user, ids, vals,
+ context=context)
+ if child_ids:
+ self.write(cursor, user, child_ids, {
+ 'active': False,
+ }, context=context)
+ return res
+
+Work()
+
+
+class OpenWorkInit(ModelView):
+ 'Open Work Init'
+ _name = 'timesheet.work.open.init'
+ _description = __doc__
+ from_date = fields.Date('From Date')
+ to_date = fields.Date('To Date')
+OpenWorkInit()
+
+
+class OpenWork(Wizard):
+ 'Open Work'
+ _name = 'timesheet.work.open'
+ states = {
+ 'init': {
+ 'result': {
+ 'type': 'form',
+ 'object': 'timesheet.work.open.init',
+ 'state': [
+ ('end', 'Cancel', 'tryton-cancel'),
+ ('open', 'Open', 'tryton-ok', True),
+ ],
+ },
+ },
+ 'open': {
+ 'result': {
+ 'type': 'action',
+ 'action': '_action_open_work',
+ 'state': 'end',
+ },
+ },
+ }
+
+ def _action_open_work(self, cursor, user, data, context=None):
+ model_data_obj = self.pool.get('ir.model.data')
+ act_window_obj = self.pool.get('ir.action.act_window')
+
+ model_data_ids = model_data_obj.search(cursor, user, [
+ ('fs_id', '=', 'act_work_tree2'),
+ ('module', '=', 'timesheet'),
+ ('inherit', '=', False),
+ ], limit=1, context=context)
+ model_data = model_data_obj.browse(cursor, user, model_data_ids[0],
+ context=context)
+ res = act_window_obj.read(cursor, user, model_data.db_id, context=context)
+ res['context'] = str({
+ 'from_date': data['form']['from_date'],
+ 'to_date': data['form']['to_date'],
+ })
+ return res
+
+OpenWork()
+
+
+class OpenWork2(OpenWork):
+ _name = 'timesheet.work.open2'
+
+ def _action_open_work(self, cursor, user, data, context=None):
+ model_data_obj = self.pool.get('ir.model.data')
+ act_window_obj = self.pool.get('ir.action.act_window')
+
+ model_data_ids = model_data_obj.search(cursor, user, [
+ ('fs_id', '=', 'act_work_form2'),
+ ('module', '=', 'timesheet'),
+ ('inherit', '=', False),
+ ], limit=1, context=context)
+ model_data = model_data_obj.browse(cursor, user, model_data_ids[0],
+ context=context)
+ res = act_window_obj.read(cursor, user, model_data.db_id, context=context)
+ res['context'] = str({
+ 'from_date': data['form']['from_date'],
+ 'to_date': data['form']['to_date'],
+ })
+ return res
+
+OpenWork2()
+
+
+class OpenWorkGraph(Wizard):
+ _name = 'timesheet.work.open_graph'
+ states = {
+ 'init': {
+ 'result': {
+ 'type': 'action',
+ 'action': '_action_open_work',
+ 'state': 'end',
+ },
+ },
+ }
+
+ def _action_open_work(self, cursor, user, data, context=None):
+ model_data_obj = self.pool.get('ir.model.data')
+ act_window_obj = self.pool.get('ir.action.act_window')
+ work_obj = self.pool.get('timesheet.work')
+
+ if context is None:
+ context = {}
+
+ model_data_ids = model_data_obj.search(cursor, user, [
+ ('fs_id', '=', 'act_work_form3'),
+ ('module', '=', 'timesheet'),
+ ('inherit', '=', False),
+ ], limit=1, context=context)
+ model_data = model_data_obj.browse(cursor, user, model_data_ids[0],
+ context=context)
+ res = act_window_obj.read(cursor, user, model_data.db_id, context=context)
+ if 'active_id' in context:
+ work = work_obj.browse(cursor, user, context['active_id'],
+ context=context)
+ res['name'] = res['name'] + ' - ' + work.rec_name
+ return res
+
+OpenWorkGraph()
diff --git a/work.xml b/work.xml
new file mode 100644
index 0000000..5b3c15a
--- /dev/null
+++ b/work.xml
@@ -0,0 +1,230 @@
+<?xml version="1.0"?>
+<!-- This file is part of Tryton. The COPYRIGHT file at the top level of
+this repository contains the full copyright notices and license terms. -->
+<tryton>
+ <data>
+ <record model="ir.ui.view" id="work_view_form">
+ <field name="model">timesheet.work</field>
+ <field name="type">form</field>
+ <field name="arch" type="xml">
+ <![CDATA[
+ <form string="Work">
+ <label name="name"/>
+ <field name="name"/>
+ <label name="active"/>
+ <field name="active"/>
+ <label name="parent"/>
+ <field name="parent"/>
+ <label name="timesheet_available"/>
+ <field name="timesheet_available"/>
+ <label name="company"/>
+ <field name="company"/>
+ </form>
+ ]]>
+ </field>
+ </record>
+ <record model="ir.ui.view" id="work_view_tree">
+ <field name="model">timesheet.work</field>
+ <field name="type">tree</field>
+ <field name="priority" eval="8"/>
+ <field name="arch" type="xml">
+ <![CDATA[
+ <tree string="Works">
+ <field name="rec_name"/>
+ <field name="name" select="1" tree_invisible="1"/>
+ <field name="active" select="1" tree_invisible="1"/>
+ </tree>
+ ]]>
+ </field>
+ </record>
+ <record model="ir.action.act_window" id="act_work_form">
+ <field name="name">Works</field>
+ <field name="res_model">timesheet.work</field>
+ <field name="view_type">form</field>
+ </record>
+ <record model="ir.action.act_window.view"
+ id="act_work_form_view1">
+ <field name="sequence" eval="10"/>
+ <field name="view" ref="work_view_tree"/>
+ <field name="act_window" ref="act_work_form"/>
+ </record>
+ <record model="ir.action.act_window.view"
+ id="act_work_form_view2">
+ <field name="sequence" eval="20"/>
+ <field name="view" ref="work_view_form"/>
+ <field name="act_window" ref="act_work_form"/>
+ </record>
+ <menuitem parent="menu_configuration" action="act_work_form"
+ id="menu_work_form"/>
+ <record model="ir.ui.view" id="work_view_tree2">
+ <field name="model">timesheet.work</field>
+ <field name="type">tree</field>
+ <field name="priority" eval="16"/>
+ <field name="field_childs">children</field>
+ <field name="arch" type="xml">
+ <![CDATA[
+ <tree string="Works">
+ <field name="name" select="1"/>
+ <field name="timesheet_available" select="1"/>
+ </tree>
+ ]]>
+ </field>
+ </record>
+ <record model="ir.action.act_window" id="act_work_tree">
+ <field name="name">Works</field>
+ <field name="res_model">timesheet.work</field>
+ <field name="view_type">tree</field>
+ <field name="domain">[('parent', '=', False)]</field>
+ </record>
+ <record model="ir.action.act_window.view"
+ id="act_work_tree_view1">
+ <field name="sequence" eval="10"/>
+ <field name="view" ref="work_view_tree2"/>
+ <field name="act_window" ref="act_work_tree"/>
+ </record>
+ <menuitem parent="menu_work_form" action="act_work_tree"
+ id="menu_work_tree"/>
+
+ <record model="ir.ui.view" id="work_view_tree3">
+ <field name="model">timesheet.work</field>
+ <field name="type">tree</field>
+ <field name="priority" eval="16"/>
+ <field name="field_childs">children</field>
+ <field name="arch" type="xml">
+ <![CDATA[
+ <tree string="Works">
+ <field name="name" select="1"/>
+ <field name="hours" widget="float_time"
+ float_time="company_work_time"/>
+ </tree>
+ ]]>
+ </field>
+ </record>
+ <record model="ir.action.act_window" id="act_work_tree2">
+ <field name="name">Works</field>
+ <field name="res_model">timesheet.work</field>
+ <field name="view_type">tree</field>
+ <field name="domain">[('parent', '=', False)]</field>
+ </record>
+ <record model="ir.action.act_window.view"
+ id="act_work_tree_view2">
+ <field name="sequence" eval="10"/>
+ <field name="view" ref="work_view_tree3"/>
+ <field name="act_window" ref="act_work_tree2"/>
+ </record>
+ <record model="ir.action.wizard" id="act_open_work">
+ <field name="name">Hours per Work</field>
+ <field name="wiz_name">timesheet.work.open</field>
+ </record>
+ <menuitem parent="menu_reporting" action="act_open_work"
+ id="menu_work_tree2" icon="tryton-tree"/>
+
+ <record model="ir.ui.view" id="work_view_graph">
+ <field name="model">timesheet.work</field>
+ <field name="type">graph</field>
+ <field name="arch" type="xml">
+ <![CDATA[
+ <graph string="Hours per Work" type="pie">
+ <x>
+ <field name="name"/>
+ </x>
+ <y>
+ <field name="hours" widget="float_time"
+ float_time="company_work_time"/>
+ </y>
+ </graph>
+ ]]>
+ </field>
+ </record>
+ <record model="ir.action.act_window" id="act_work_form2">
+ <field name="name">Hours per Work</field>
+ <field name="res_model">timesheet.work</field>
+ <field name="view_type">form</field>
+ <field name="domain">[('parent', '=', False)]</field>
+ </record>
+ <record model="ir.action.act_window.view"
+ id="act_work_form2_view1">
+ <field name="sequence" eval="10"/>
+ <field name="view" ref="work_view_graph"/>
+ <field name="act_window" ref="act_work_form2"/>
+ </record>
+ <record model="ir.action.wizard" id="act_open_work2">
+ <field name="name">Hours per Work</field>
+ <field name="wiz_name">timesheet.work.open2</field>
+ </record>
+ <record model="ir.ui.view" id="work_open_init_view_form">
+ <field name="model">timesheet.work.open.init</field>
+ <field name="type">form</field>
+ <field name="arch" type="xml">
+ <![CDATA[
+ <form string="Hours per Work">
+ <label name="from_date"/>
+ <field name="from_date"/>
+ <label name="to_date"/>
+ <field name="to_date"/>
+ </form>
+ ]]>
+ </field>
+ </record>
+ <menuitem parent="menu_work_tree2" action="act_open_work2"
+ id="menu_work_form2" icon="tryton-graph"/>
+
+ <record model="ir.action.act_window" id="act_work_form3">
+ <field name="name">Hours per Work</field>
+ <field name="res_model">timesheet.work</field>
+ <field name="view_type">form</field>
+ <field name="domain">[('parent', 'in', active_ids)]</field>
+ </record>
+ <record model="ir.action.act_window.view"
+ id="act_work_form3_view1">
+ <field name="sequence" eval="10"/>
+ <field name="view" ref="work_view_graph"/>
+ <field name="act_window" ref="act_work_form3"/>
+ </record>
+ <record model="ir.action.wizard" id="act_open_work_graph">
+ <field name="name">Hours per Work</field>
+ <field name="wiz_name">timesheet.work.open_graph</field>
+ </record>
+ <record model="ir.action.keyword" id="act_work_keyword">
+ <field name="keyword">graph_open</field>
+ <field name="model">timesheet.work,0</field>
+ <field name="action" ref="act_open_work_graph"/>
+ </record>
+
+ <record model="ir.model.access" id="access_work">
+ <field name="model" search="[('model', '=', 'timesheet.work')]"/>
+ <field name="perm_read" eval="True"/>
+ <field name="perm_write" eval="False"/>
+ <field name="perm_create" eval="False"/>
+ <field name="perm_delete" eval="False"/>
+ </record>
+ <record model="ir.model.access" id="access_work_admin">
+ <field name="model" search="[('model', '=', 'timesheet.work')]"/>
+ <field name="group" ref="group_timesheet_admin"/>
+ <field name="perm_read" eval="True"/>
+ <field name="perm_write" eval="True"/>
+ <field name="perm_create" eval="True"/>
+ <field name="perm_delete" eval="True"/>
+ </record>
+
+ <record model="ir.rule.group" id="rule_group_work">
+ <field name="model" search="[('model', '=', 'timesheet.work')]"/>
+ <field name="global_p" eval="False"/>
+ <field name="default_p" eval="True"/>
+ </record>
+ <record model="ir.rule" id="rule_work1">
+ <field name="field" search="[('name', '=', 'company'),
+ ('model.model', '=', 'timesheet.work')]"/>
+ <field name="operator">=</field>
+ <field name="operand">User/Main Company</field>
+ <field name="rule_group" ref="rule_group_work"/>
+ </record>
+ <record model="ir.rule.group" id="rule_group_work_admin">
+ <field name="model" search="[('model', '=', 'timesheet.work')]"/>
+ <field name="global_p" eval="False"/>
+ <field name="default_p" eval="False"/>
+ <field name="groups" eval="[('add', ref('group_timesheet_admin'))]"/>
+ </record>
+
+ </data>
+</tryton>
--
tryton-modules-timesheet
More information about the tryton-debian-vcs
mailing list