[tryton-debian-vcs] tryton-modules-project-invoice branch upstream updated. upstream/4.0.2-1-g551c50e
Mathias Behrle
tryton-debian-vcs at alioth.debian.org
Tue Dec 6 16:02:54 UTC 2016
The following commit has been merged in the upstream branch:
https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi/?p=tryton/tryton-modules-project-invoice.git;a=commitdiff;h=upstream/4.0.2-1-g551c50e
commit 551c50e3e21f708a4e6ccc35e26dfceebc062923
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Mon Dec 5 09:34:36 2016 +0100
Adding upstream version 4.2.0.
Signed-off-by: Mathias Behrle <mathiasb at m9s.biz>
diff --git a/CHANGELOG b/CHANGELOG
index 50dc293..48cab07 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,7 +1,4 @@
-Version 4.0.2 - 2016-11-06
-* Bug fixes (see mercurial logs for details)
-
-Version 4.0.1 - 2016-05-11
+Version 4.2.0 - 2016-11-28
* Bug fixes (see mercurial logs for details)
Version 4.0.0 - 2016-05-02
diff --git a/INSTALL b/INSTALL
index 5e8e3ee..e8f8f01 100644
--- a/INSTALL
+++ b/INSTALL
@@ -28,7 +28,7 @@ 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://setuptools.readthedocs.io/en/latest/easy_install.html
http://docs.python.org/inst/inst.html
To use without installation, extract the archive into ``trytond/modules`` with
diff --git a/PKG-INFO b/PKG-INFO
index 81d3312..d3a01df 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,12 +1,12 @@
Metadata-Version: 1.1
Name: trytond_project_invoice
-Version: 4.0.2
+Version: 4.2.0
Summary: Tryton module to invoice projects
Home-page: http://www.tryton.org/
Author: Tryton
Author-email: issue_tracker at tryton.org
License: GPL-3
-Download-URL: http://downloads.tryton.org/4.0/
+Download-URL: http://downloads.tryton.org/4.2/
Description: trytond_project_invoice
=======================
@@ -63,6 +63,7 @@ Classifier: Natural Language :: French
Classifier: Natural Language :: German
Classifier: Natural Language :: Hungarian
Classifier: Natural Language :: Italian
+Classifier: Natural Language :: Polish
Classifier: Natural Language :: Portuguese (Brazilian)
Classifier: Natural Language :: Russian
Classifier: Natural Language :: Slovenian
diff --git a/locale/bg_BG.po b/locale/bg.po
similarity index 92%
rename from locale/bg_BG.po
rename to locale/bg.po
index 0510abb..bfe7f1f 100644
--- a/locale/bg_BG.po
+++ b/locale/bg.po
@@ -53,42 +53,49 @@ msgctxt "field:project.work,project_invoice_method:"
msgid "Invoice Method"
msgstr "Начин на фактуриране"
+#, fuzzy
msgctxt "field:project.work.invoiced_progress,create_date:"
msgid "Create Date"
-msgstr ""
+msgstr "Създадено на"
+#, fuzzy
msgctxt "field:project.work.invoiced_progress,create_uid:"
msgid "Create User"
-msgstr ""
+msgstr "Създадено от"
msgctxt "field:project.work.invoiced_progress,effort_duration:"
msgid "Effort"
msgstr ""
+#, fuzzy
msgctxt "field:project.work.invoiced_progress,id:"
msgid "ID"
-msgstr ""
+msgstr "ID"
#, fuzzy
msgctxt "field:project.work.invoiced_progress,invoice_line:"
msgid "Invoice Line"
msgstr "Ред от фактура"
+#, fuzzy
msgctxt "field:project.work.invoiced_progress,rec_name:"
msgid "Name"
-msgstr ""
+msgstr "Условие за плащане"
+#, fuzzy
msgctxt "field:project.work.invoiced_progress,work:"
msgid "Work"
-msgstr ""
+msgstr "Задача"
+#, fuzzy
msgctxt "field:project.work.invoiced_progress,write_date:"
msgid "Write Date"
-msgstr ""
+msgstr "Променено на"
+#, fuzzy
msgctxt "field:project.work.invoiced_progress,write_uid:"
msgid "Write User"
-msgstr ""
+msgstr "Променено от"
#, fuzzy
msgctxt "field:timesheet.line,invoice_line:"
@@ -147,14 +154,6 @@ msgctxt "selection:project.work,project_invoice_method:"
msgid "On Timesheet"
msgstr ""
-msgctxt "view:project.work.invoiced_progress:"
-msgid "Work Invoiced Progress"
-msgstr ""
-
-msgctxt "view:project.work.invoiced_progress:"
-msgid "Work Invoiced Progresses"
-msgstr ""
-
#, fuzzy
msgctxt "view:project.work:"
msgid "Invoice"
diff --git a/locale/ca_ES.po b/locale/ca.po
similarity index 97%
rename from locale/ca_ES.po
rename to locale/ca.po
index 9b2bf65..9b9e517 100644
--- a/locale/ca_ES.po
+++ b/locale/ca.po
@@ -52,11 +52,11 @@ msgstr "Mètode de facturació"
msgctxt "field:project.work.invoiced_progress,create_date:"
msgid "Create Date"
-msgstr "Data creació"
+msgstr "Data de creació"
msgctxt "field:project.work.invoiced_progress,create_uid:"
msgid "Create User"
-msgstr "Usuari creació"
+msgstr "Usuari de creació"
msgctxt "field:project.work.invoiced_progress,effort_duration:"
msgid "Effort"
@@ -80,11 +80,11 @@ msgstr "Treball"
msgctxt "field:project.work.invoiced_progress,write_date:"
msgid "Write Date"
-msgstr "Data modificació"
+msgstr "Data de modificació"
msgctxt "field:project.work.invoiced_progress,write_uid:"
msgid "Write User"
-msgstr "Usuari modificació"
+msgstr "Usuari de modificació"
msgctxt "field:timesheet.line,invoice_line:"
msgid "Invoice Line"
@@ -138,6 +138,10 @@ msgctxt "selection:project.work,project_invoice_method:"
msgid "On Timesheet"
msgstr "Per les hores realitzades"
+msgctxt "view:project.work:"
+msgid "Invoice"
+msgstr "Factura"
+
msgctxt "view:project.work.invoiced_progress:"
msgid "Work Invoiced Progress"
msgstr "Progrés del treball facturat"
@@ -145,7 +149,3 @@ msgstr "Progrés del treball facturat"
msgctxt "view:project.work.invoiced_progress:"
msgid "Work Invoiced Progresses"
msgstr "Progressos del treball facturat"
-
-msgctxt "view:project.work:"
-msgid "Invoice"
-msgstr "Factura"
diff --git a/locale/cs_CZ.po b/locale/cs.po
similarity index 94%
rename from locale/cs_CZ.po
rename to locale/cs.po
index 846a933..ad92da6 100644
--- a/locale/cs_CZ.po
+++ b/locale/cs.po
@@ -70,9 +70,10 @@ msgctxt "field:project.work.invoiced_progress,invoice_line:"
msgid "Invoice Line"
msgstr ""
+#, fuzzy
msgctxt "field:project.work.invoiced_progress,rec_name:"
msgid "Name"
-msgstr ""
+msgstr "Namu"
msgctxt "field:project.work.invoiced_progress,work:"
msgid "Work"
@@ -138,14 +139,6 @@ msgctxt "selection:project.work,project_invoice_method:"
msgid "On Timesheet"
msgstr ""
-msgctxt "view:project.work.invoiced_progress:"
-msgid "Work Invoiced Progress"
-msgstr ""
-
-msgctxt "view:project.work.invoiced_progress:"
-msgid "Work Invoiced Progresses"
-msgstr ""
-
msgctxt "view:project.work:"
msgid "Invoice"
msgstr ""
diff --git a/locale/de_DE.po b/locale/de.po
similarity index 100%
rename from locale/de_DE.po
rename to locale/de.po
index a6d7d44..5be9aff 100644
--- a/locale/de_DE.po
+++ b/locale/de.po
@@ -138,6 +138,10 @@ msgctxt "selection:project.work,project_invoice_method:"
msgid "On Timesheet"
msgstr "Nach erfasstem Aufwand"
+msgctxt "view:project.work:"
+msgid "Invoice"
+msgstr "Rechnung erstellen"
+
msgctxt "view:project.work.invoiced_progress:"
msgid "Work Invoiced Progress"
msgstr "Nach Forstschritt fakturierte Aufgabe"
@@ -145,7 +149,3 @@ msgstr "Nach Forstschritt fakturierte Aufgabe"
msgctxt "view:project.work.invoiced_progress:"
msgid "Work Invoiced Progresses"
msgstr "Nach Forstschritt fakturierte Aufgaben"
-
-msgctxt "view:project.work:"
-msgid "Invoice"
-msgstr "Rechnung erstellen"
diff --git a/locale/es_ES.po b/locale/es.po
similarity index 96%
rename from locale/es_ES.po
rename to locale/es.po
index 0d26893..226046d 100644
--- a/locale/es_ES.po
+++ b/locale/es.po
@@ -52,11 +52,11 @@ msgstr "Método de facturación"
msgctxt "field:project.work.invoiced_progress,create_date:"
msgid "Create Date"
-msgstr "Fecha creación"
+msgstr "Fecha de creación"
msgctxt "field:project.work.invoiced_progress,create_uid:"
msgid "Create User"
-msgstr "Usuario creación"
+msgstr "Usuario de creación"
msgctxt "field:project.work.invoiced_progress,effort_duration:"
msgid "Effort"
@@ -80,11 +80,11 @@ msgstr "Trabajo"
msgctxt "field:project.work.invoiced_progress,write_date:"
msgid "Write Date"
-msgstr "Fecha modificación"
+msgstr "Fecha de modificación"
msgctxt "field:project.work.invoiced_progress,write_uid:"
msgid "Write User"
-msgstr "Usuario modificación"
+msgstr "Usuario de modificación"
msgctxt "field:timesheet.line,invoice_line:"
msgid "Invoice Line"
@@ -138,6 +138,10 @@ msgctxt "selection:project.work,project_invoice_method:"
msgid "On Timesheet"
msgstr "Por las horas realizadas"
+msgctxt "view:project.work:"
+msgid "Invoice"
+msgstr "Factura"
+
msgctxt "view:project.work.invoiced_progress:"
msgid "Work Invoiced Progress"
msgstr "Progreso del trabajo facturado"
@@ -145,7 +149,3 @@ msgstr "Progreso del trabajo facturado"
msgctxt "view:project.work.invoiced_progress:"
msgid "Work Invoiced Progresses"
msgstr "Progresos del trabajo facturado"
-
-msgctxt "view:project.work:"
-msgid "Invoice"
-msgstr "Factura"
diff --git a/locale/hu_HU.po b/locale/es_419.po
similarity index 92%
copy from locale/hu_HU.po
copy to locale/es_419.po
index 846a933..96b88bd 100644
--- a/locale/hu_HU.po
+++ b/locale/es_419.po
@@ -24,7 +24,7 @@ msgstr ""
msgctxt "field:project.work,duration_to_invoice:"
msgid "Duration to Invoice"
-msgstr ""
+msgstr "Duración a facturar"
msgctxt "field:project.work,invoice_line:"
msgid "Invoice Line"
@@ -40,7 +40,7 @@ msgstr ""
msgctxt "field:project.work,invoiced_duration:"
msgid "Invoiced Duration"
-msgstr ""
+msgstr "Duración facturada"
msgctxt "field:project.work,invoiced_progress:"
msgid "Invoiced Progress"
@@ -56,11 +56,11 @@ msgstr ""
msgctxt "field:project.work.invoiced_progress,create_uid:"
msgid "Create User"
-msgstr ""
+msgstr "Creado por usuario"
msgctxt "field:project.work.invoiced_progress,effort_duration:"
msgid "Effort"
-msgstr ""
+msgstr "Esfuerzo"
msgctxt "field:project.work.invoiced_progress,id:"
msgid "ID"
@@ -84,7 +84,7 @@ msgstr ""
msgctxt "field:project.work.invoiced_progress,write_uid:"
msgid "Write User"
-msgstr ""
+msgstr "Modificado por usuario"
msgctxt "field:timesheet.line,invoice_line:"
msgid "Invoice Line"
@@ -100,7 +100,7 @@ msgstr ""
msgctxt "model:project.work.invoiced_progress,name:"
msgid "Work Invoiced Progress"
-msgstr ""
+msgstr "Progreso facturado de trabajo"
msgctxt "model:res.group,name:group_project_invoice"
msgid "Project Invoice"
@@ -138,14 +138,6 @@ msgctxt "selection:project.work,project_invoice_method:"
msgid "On Timesheet"
msgstr ""
-msgctxt "view:project.work.invoiced_progress:"
-msgid "Work Invoiced Progress"
-msgstr ""
-
-msgctxt "view:project.work.invoiced_progress:"
-msgid "Work Invoiced Progresses"
-msgstr ""
-
msgctxt "view:project.work:"
msgid "Invoice"
msgstr ""
diff --git a/locale/es_AR.po b/locale/es_AR.po
deleted file mode 100644
index 98ab661..0000000
--- a/locale/es_AR.po
+++ /dev/null
@@ -1,151 +0,0 @@
-#
-msgid ""
-msgstr "Content-Type: text/plain; charset=utf-8\n"
-
-msgctxt "error:project.work:"
-msgid "There is no list price on work \"%s\"."
-msgstr "No hay ninguna lista de precio en la actividad «%s»."
-
-msgctxt "error:project.work:"
-msgid "There is no party on work \"%s\"."
-msgstr "No hay ninguna entidad en la actividad «%s»."
-
-msgctxt "error:project.work:"
-msgid "There is no product on work \"%s\"."
-msgstr "No hay ningún producto en la actividad «%s»."
-
-msgctxt "error:timesheet.line:"
-msgid "You can not delete invoiced line."
-msgstr "No puede eliminar una línea facturada."
-
-msgctxt "error:timesheet.line:"
-msgid "You can not modify invoiced line."
-msgstr "No puede modificar una línea facturada."
-
-msgctxt "field:project.work,duration_to_invoice:"
-msgid "Duration to Invoice"
-msgstr "Duración a facturar"
-
-msgctxt "field:project.work,invoice_line:"
-msgid "Invoice Line"
-msgstr "Línea de factura"
-
-msgctxt "field:project.work,invoice_method:"
-msgid "Invoice Method"
-msgstr "Método de facturación"
-
-msgctxt "field:project.work,invoiced_amount:"
-msgid "Invoiced Amount"
-msgstr "Importe facturado"
-
-msgctxt "field:project.work,invoiced_duration:"
-msgid "Invoiced Duration"
-msgstr "Duración facturada"
-
-msgctxt "field:project.work,invoiced_progress:"
-msgid "Invoiced Progress"
-msgstr "Progreso facturado"
-
-msgctxt "field:project.work,project_invoice_method:"
-msgid "Invoice Method"
-msgstr "Método de facturación"
-
-msgctxt "field:project.work.invoiced_progress,create_date:"
-msgid "Create Date"
-msgstr "Fecha creación"
-
-msgctxt "field:project.work.invoiced_progress,create_uid:"
-msgid "Create User"
-msgstr "Usuario creación"
-
-msgctxt "field:project.work.invoiced_progress,effort_duration:"
-msgid "Effort"
-msgstr "Esfuerzo"
-
-msgctxt "field:project.work.invoiced_progress,id:"
-msgid "ID"
-msgstr "ID"
-
-msgctxt "field:project.work.invoiced_progress,invoice_line:"
-msgid "Invoice Line"
-msgstr "Línea de factura"
-
-msgctxt "field:project.work.invoiced_progress,rec_name:"
-msgid "Name"
-msgstr "Nombre"
-
-msgctxt "field:project.work.invoiced_progress,work:"
-msgid "Work"
-msgstr "Actividad"
-
-msgctxt "field:project.work.invoiced_progress,write_date:"
-msgid "Write Date"
-msgstr "Fecha modificación"
-
-msgctxt "field:project.work.invoiced_progress,write_uid:"
-msgid "Write User"
-msgstr "Usuario modificación"
-
-msgctxt "field:timesheet.line,invoice_line:"
-msgid "Invoice Line"
-msgstr "Línea de factura"
-
-msgctxt "model:ir.action,name:act_timesheet_line_form_invoice"
-msgid "Timesheet Lines"
-msgstr "Líneas de parte de trabajo"
-
-msgctxt "model:ir.action,name:open_invoice"
-msgid "Invoices"
-msgstr "Facturas"
-
-msgctxt "model:project.work.invoiced_progress,name:"
-msgid "Work Invoiced Progress"
-msgstr "Progreso facturado de actividad"
-
-msgctxt "model:res.group,name:group_project_invoice"
-msgid "Project Invoice"
-msgstr "Facturación de proyectos"
-
-msgctxt "selection:project.work,invoice_method:"
-msgid "Manual"
-msgstr "Manual"
-
-msgctxt "selection:project.work,invoice_method:"
-msgid "On Effort"
-msgstr "Por el esfuerzo estimado"
-
-msgctxt "selection:project.work,invoice_method:"
-msgid "On Progress"
-msgstr "Según progreso"
-
-msgctxt "selection:project.work,invoice_method:"
-msgid "On Timesheet"
-msgstr "Por las horas realizadas"
-
-msgctxt "selection:project.work,project_invoice_method:"
-msgid "Manual"
-msgstr "Manual"
-
-msgctxt "selection:project.work,project_invoice_method:"
-msgid "On Effort"
-msgstr "Por el esfuerzo estimado"
-
-msgctxt "selection:project.work,project_invoice_method:"
-msgid "On Progress"
-msgstr "Según progreso"
-
-msgctxt "selection:project.work,project_invoice_method:"
-msgid "On Timesheet"
-msgstr "Por las horas realizadas"
-
-msgctxt "view:project.work.invoiced_progress:"
-msgid "Work Invoiced Progress"
-msgstr "Progreso facturado de actividad"
-
-msgctxt "view:project.work.invoiced_progress:"
-msgid "Work Invoiced Progresses"
-msgstr "Progresos facturados de actividad"
-
-msgctxt "view:project.work:"
-msgid "Invoice"
-msgstr "Factura"
diff --git a/locale/es_CO.po b/locale/es_CO.po
deleted file mode 100644
index 8b7d67a..0000000
--- a/locale/es_CO.po
+++ /dev/null
@@ -1,151 +0,0 @@
-#
-msgid ""
-msgstr "Content-Type: text/plain; charset=utf-8\n"
-
-msgctxt "error:project.work:"
-msgid "There is no list price on work \"%s\"."
-msgstr "No hay lista de precios en la tarea \"%s\"."
-
-msgctxt "error:project.work:"
-msgid "There is no party on work \"%s\"."
-msgstr "No hay tercero en la tarea \"%s\"."
-
-msgctxt "error:project.work:"
-msgid "There is no product on work \"%s\"."
-msgstr "No hay producto en la tarea \"%s\"."
-
-msgctxt "error:timesheet.line:"
-msgid "You can not delete invoiced line."
-msgstr "No puede eliminar líneas facturadas."
-
-msgctxt "error:timesheet.line:"
-msgid "You can not modify invoiced line."
-msgstr "No puede modificar una línea facurada."
-
-msgctxt "field:project.work,duration_to_invoice:"
-msgid "Duration to Invoice"
-msgstr "Duración de Factura"
-
-msgctxt "field:project.work,invoice_line:"
-msgid "Invoice Line"
-msgstr "Línea de Factura"
-
-msgctxt "field:project.work,invoice_method:"
-msgid "Invoice Method"
-msgstr "Método de Facturación"
-
-msgctxt "field:project.work,invoiced_amount:"
-msgid "Invoiced Amount"
-msgstr "Valor Facturado"
-
-msgctxt "field:project.work,invoiced_duration:"
-msgid "Invoiced Duration"
-msgstr "Duración de la Facturación"
-
-msgctxt "field:project.work,invoiced_progress:"
-msgid "Invoiced Progress"
-msgstr "Progreso de la Facturación"
-
-msgctxt "field:project.work,project_invoice_method:"
-msgid "Invoice Method"
-msgstr "Método de Facturación"
-
-msgctxt "field:project.work.invoiced_progress,create_date:"
-msgid "Create Date"
-msgstr "Fecha de Creación"
-
-msgctxt "field:project.work.invoiced_progress,create_uid:"
-msgid "Create User"
-msgstr "Creado por Usuario"
-
-msgctxt "field:project.work.invoiced_progress,effort_duration:"
-msgid "Effort"
-msgstr "Esfuerzo"
-
-msgctxt "field:project.work.invoiced_progress,id:"
-msgid "ID"
-msgstr "ID"
-
-msgctxt "field:project.work.invoiced_progress,invoice_line:"
-msgid "Invoice Line"
-msgstr "Línea de Factura"
-
-msgctxt "field:project.work.invoiced_progress,rec_name:"
-msgid "Name"
-msgstr "Nombre"
-
-msgctxt "field:project.work.invoiced_progress,work:"
-msgid "Work"
-msgstr "Tarea"
-
-msgctxt "field:project.work.invoiced_progress,write_date:"
-msgid "Write Date"
-msgstr "Fecha de Modificación"
-
-msgctxt "field:project.work.invoiced_progress,write_uid:"
-msgid "Write User"
-msgstr "Modificado por Usuario"
-
-msgctxt "field:timesheet.line,invoice_line:"
-msgid "Invoice Line"
-msgstr "Línea de Factura"
-
-msgctxt "model:ir.action,name:act_timesheet_line_form_invoice"
-msgid "Timesheet Lines"
-msgstr "Lineas de Registro de Tiempo"
-
-msgctxt "model:ir.action,name:open_invoice"
-msgid "Invoices"
-msgstr "Facturas"
-
-msgctxt "model:project.work.invoiced_progress,name:"
-msgid "Work Invoiced Progress"
-msgstr "Progreso de Tareas Facturadas"
-
-msgctxt "model:res.group,name:group_project_invoice"
-msgid "Project Invoice"
-msgstr "Facturación de Proyecto"
-
-msgctxt "selection:project.work,invoice_method:"
-msgid "Manual"
-msgstr "Manual"
-
-msgctxt "selection:project.work,invoice_method:"
-msgid "On Effort"
-msgstr "Por Esfuerzo"
-
-msgctxt "selection:project.work,invoice_method:"
-msgid "On Progress"
-msgstr "En Progreso"
-
-msgctxt "selection:project.work,invoice_method:"
-msgid "On Timesheet"
-msgstr "Por Registro de Tiempo"
-
-msgctxt "selection:project.work,project_invoice_method:"
-msgid "Manual"
-msgstr "Manual"
-
-msgctxt "selection:project.work,project_invoice_method:"
-msgid "On Effort"
-msgstr "Por Esfuerzo"
-
-msgctxt "selection:project.work,project_invoice_method:"
-msgid "On Progress"
-msgstr "En Progreso"
-
-msgctxt "selection:project.work,project_invoice_method:"
-msgid "On Timesheet"
-msgstr "Por Registro de Tiempo"
-
-msgctxt "view:project.work.invoiced_progress:"
-msgid "Work Invoiced Progress"
-msgstr "Progreso de Tareas Facturadas"
-
-msgctxt "view:project.work.invoiced_progress:"
-msgid "Work Invoiced Progresses"
-msgstr "Progresos de Tareas Facturadas"
-
-msgctxt "view:project.work:"
-msgid "Invoice"
-msgstr "Factura"
diff --git a/locale/es_EC.po b/locale/es_EC.po
deleted file mode 100644
index 98c3108..0000000
--- a/locale/es_EC.po
+++ /dev/null
@@ -1,151 +0,0 @@
-#
-msgid ""
-msgstr "Content-Type: text/plain; charset=utf-8\n"
-
-msgctxt "error:project.work:"
-msgid "There is no list price on work \"%s\"."
-msgstr "No hay ningún precio en el trabajo \"%s\"."
-
-msgctxt "error:project.work:"
-msgid "There is no party on work \"%s\"."
-msgstr "No hay ningún tercero en el trabajo \"%s\"."
-
-msgctxt "error:project.work:"
-msgid "There is no product on work \"%s\"."
-msgstr "No hay ningún producto en el trabajo \"%s\"."
-
-msgctxt "error:timesheet.line:"
-msgid "You can not delete invoiced line."
-msgstr "No puede eliminar una línea facturada."
-
-msgctxt "error:timesheet.line:"
-msgid "You can not modify invoiced line."
-msgstr "No puede modificar una línea facturada."
-
-msgctxt "field:project.work,duration_to_invoice:"
-msgid "Duration to Invoice"
-msgstr "Duración a facturar"
-
-msgctxt "field:project.work,invoice_line:"
-msgid "Invoice Line"
-msgstr "Línea de factura"
-
-msgctxt "field:project.work,invoice_method:"
-msgid "Invoice Method"
-msgstr "Método de facturación"
-
-msgctxt "field:project.work,invoiced_amount:"
-msgid "Invoiced Amount"
-msgstr "Importe facturado"
-
-msgctxt "field:project.work,invoiced_duration:"
-msgid "Invoiced Duration"
-msgstr "Duración facturada"
-
-msgctxt "field:project.work,invoiced_progress:"
-msgid "Invoiced Progress"
-msgstr "Progreso facturado"
-
-msgctxt "field:project.work,project_invoice_method:"
-msgid "Invoice Method"
-msgstr "Método de facturación"
-
-msgctxt "field:project.work.invoiced_progress,create_date:"
-msgid "Create Date"
-msgstr "Fecha de creación"
-
-msgctxt "field:project.work.invoiced_progress,create_uid:"
-msgid "Create User"
-msgstr "Creado por usuario"
-
-msgctxt "field:project.work.invoiced_progress,effort_duration:"
-msgid "Effort"
-msgstr "Esfuerzo"
-
-msgctxt "field:project.work.invoiced_progress,id:"
-msgid "ID"
-msgstr "ID"
-
-msgctxt "field:project.work.invoiced_progress,invoice_line:"
-msgid "Invoice Line"
-msgstr "Línea de factura"
-
-msgctxt "field:project.work.invoiced_progress,rec_name:"
-msgid "Name"
-msgstr "Nombre"
-
-msgctxt "field:project.work.invoiced_progress,work:"
-msgid "Work"
-msgstr "Trabajo"
-
-msgctxt "field:project.work.invoiced_progress,write_date:"
-msgid "Write Date"
-msgstr "Fecha de modificación"
-
-msgctxt "field:project.work.invoiced_progress,write_uid:"
-msgid "Write User"
-msgstr "Modificado por usuario"
-
-msgctxt "field:timesheet.line,invoice_line:"
-msgid "Invoice Line"
-msgstr "Línea de factura"
-
-msgctxt "model:ir.action,name:act_timesheet_line_form_invoice"
-msgid "Timesheet Lines"
-msgstr "Líneas de parte de trabajo"
-
-msgctxt "model:ir.action,name:open_invoice"
-msgid "Invoices"
-msgstr "Facturas"
-
-msgctxt "model:project.work.invoiced_progress,name:"
-msgid "Work Invoiced Progress"
-msgstr "Progreso facturado de trabajo"
-
-msgctxt "model:res.group,name:group_project_invoice"
-msgid "Project Invoice"
-msgstr "Facturación de Proyectos"
-
-msgctxt "selection:project.work,invoice_method:"
-msgid "Manual"
-msgstr "Manual"
-
-msgctxt "selection:project.work,invoice_method:"
-msgid "On Effort"
-msgstr "Por el esfuerzo estimado"
-
-msgctxt "selection:project.work,invoice_method:"
-msgid "On Progress"
-msgstr "Según el progreso"
-
-msgctxt "selection:project.work,invoice_method:"
-msgid "On Timesheet"
-msgstr "Por las horas realizadas"
-
-msgctxt "selection:project.work,project_invoice_method:"
-msgid "Manual"
-msgstr "Manual"
-
-msgctxt "selection:project.work,project_invoice_method:"
-msgid "On Effort"
-msgstr "Por esfuerzo estimado"
-
-msgctxt "selection:project.work,project_invoice_method:"
-msgid "On Progress"
-msgstr "Según el progreso"
-
-msgctxt "selection:project.work,project_invoice_method:"
-msgid "On Timesheet"
-msgstr "Por las horas realizadas"
-
-msgctxt "view:project.work.invoiced_progress:"
-msgid "Work Invoiced Progress"
-msgstr "Progreso facturado de trabajo"
-
-msgctxt "view:project.work.invoiced_progress:"
-msgid "Work Invoiced Progresses"
-msgstr "Progresos facturados de trabajo"
-
-msgctxt "view:project.work:"
-msgid "Invoice"
-msgstr "Factura"
diff --git a/locale/es_MX.po b/locale/es_MX.po
deleted file mode 100644
index 7f9b83b..0000000
--- a/locale/es_MX.po
+++ /dev/null
@@ -1,153 +0,0 @@
-#
-msgid ""
-msgstr "Content-Type: text/plain; charset=utf-8\n"
-
-msgctxt "error:project.work:"
-msgid "There is no list price on work \"%s\"."
-msgstr "No hay ningún precio en el trabajo \"%s\"."
-
-msgctxt "error:project.work:"
-msgid "There is no party on work \"%s\"."
-msgstr "No hay ningún entidad en el trabajo \"%s\"."
-
-msgctxt "error:project.work:"
-msgid "There is no product on work \"%s\"."
-msgstr "No hay ningún producto en el trabajo \"%s\"."
-
-msgctxt "error:timesheet.line:"
-msgid "You can not delete invoiced line."
-msgstr "No puede eliminar una línea facturada."
-
-msgctxt "error:timesheet.line:"
-msgid "You can not modify invoiced line."
-msgstr "No puede modificar una línea facturada."
-
-msgctxt "field:project.work,duration_to_invoice:"
-msgid "Duration to Invoice"
-msgstr "Tiempo a facturar"
-
-msgctxt "field:project.work,invoice_line:"
-msgid "Invoice Line"
-msgstr "Línea de factura"
-
-msgctxt "field:project.work,invoice_method:"
-msgid "Invoice Method"
-msgstr "Método de facturación"
-
-msgctxt "field:project.work,invoiced_amount:"
-msgid "Invoiced Amount"
-msgstr "Importe facturado"
-
-msgctxt "field:project.work,invoiced_duration:"
-msgid "Invoiced Duration"
-msgstr "Tiempo facturado"
-
-msgctxt "field:project.work,invoiced_progress:"
-msgid "Invoiced Progress"
-msgstr ""
-
-msgctxt "field:project.work,project_invoice_method:"
-msgid "Invoice Method"
-msgstr "Método de facturación"
-
-msgctxt "field:project.work.invoiced_progress,create_date:"
-msgid "Create Date"
-msgstr ""
-
-msgctxt "field:project.work.invoiced_progress,create_uid:"
-msgid "Create User"
-msgstr ""
-
-msgctxt "field:project.work.invoiced_progress,effort_duration:"
-msgid "Effort"
-msgstr ""
-
-msgctxt "field:project.work.invoiced_progress,id:"
-msgid "ID"
-msgstr ""
-
-#, fuzzy
-msgctxt "field:project.work.invoiced_progress,invoice_line:"
-msgid "Invoice Line"
-msgstr "Línea de factura"
-
-msgctxt "field:project.work.invoiced_progress,rec_name:"
-msgid "Name"
-msgstr ""
-
-msgctxt "field:project.work.invoiced_progress,work:"
-msgid "Work"
-msgstr ""
-
-msgctxt "field:project.work.invoiced_progress,write_date:"
-msgid "Write Date"
-msgstr ""
-
-msgctxt "field:project.work.invoiced_progress,write_uid:"
-msgid "Write User"
-msgstr ""
-
-msgctxt "field:timesheet.line,invoice_line:"
-msgid "Invoice Line"
-msgstr "Línea de factura"
-
-msgctxt "model:ir.action,name:act_timesheet_line_form_invoice"
-msgid "Timesheet Lines"
-msgstr "Líneas de parte de trabajo"
-
-msgctxt "model:ir.action,name:open_invoice"
-msgid "Invoices"
-msgstr "Facturas"
-
-msgctxt "model:project.work.invoiced_progress,name:"
-msgid "Work Invoiced Progress"
-msgstr ""
-
-msgctxt "model:res.group,name:group_project_invoice"
-msgid "Project Invoice"
-msgstr "Facturación de proyectos"
-
-msgctxt "selection:project.work,invoice_method:"
-msgid "Manual"
-msgstr "Manual"
-
-msgctxt "selection:project.work,invoice_method:"
-msgid "On Effort"
-msgstr "Por el esfuerzo estimado"
-
-msgctxt "selection:project.work,invoice_method:"
-msgid "On Progress"
-msgstr ""
-
-msgctxt "selection:project.work,invoice_method:"
-msgid "On Timesheet"
-msgstr "Por las horas realizadas"
-
-msgctxt "selection:project.work,project_invoice_method:"
-msgid "Manual"
-msgstr "Manual"
-
-msgctxt "selection:project.work,project_invoice_method:"
-msgid "On Effort"
-msgstr "Por el esfuerzo estimado"
-
-msgctxt "selection:project.work,project_invoice_method:"
-msgid "On Progress"
-msgstr ""
-
-msgctxt "selection:project.work,project_invoice_method:"
-msgid "On Timesheet"
-msgstr "Por las horas realizadas"
-
-msgctxt "view:project.work.invoiced_progress:"
-msgid "Work Invoiced Progress"
-msgstr ""
-
-msgctxt "view:project.work.invoiced_progress:"
-msgid "Work Invoiced Progresses"
-msgstr ""
-
-#, fuzzy
-msgctxt "view:project.work:"
-msgid "Invoice"
-msgstr "Facturas"
diff --git a/locale/fr_FR.po b/locale/fr.po
similarity index 99%
rename from locale/fr_FR.po
rename to locale/fr.po
index 33905db..fbd15f8 100644
--- a/locale/fr_FR.po
+++ b/locale/fr.po
@@ -138,6 +138,10 @@ msgctxt "selection:project.work,project_invoice_method:"
msgid "On Timesheet"
msgstr "Sur feuille de présence"
+msgctxt "view:project.work:"
+msgid "Invoice"
+msgstr "Facturer"
+
msgctxt "view:project.work.invoiced_progress:"
msgid "Work Invoiced Progress"
msgstr "Progression facturée de travail"
@@ -145,7 +149,3 @@ msgstr "Progression facturée de travail"
msgctxt "view:project.work.invoiced_progress:"
msgid "Work Invoiced Progresses"
msgstr "Progressions facturées de travail"
-
-msgctxt "view:project.work:"
-msgid "Invoice"
-msgstr "Facture"
diff --git a/locale/hu_HU.po b/locale/hu_HU.po
index 846a933..4e1568b 100644
--- a/locale/hu_HU.po
+++ b/locale/hu_HU.po
@@ -50,49 +50,57 @@ msgctxt "field:project.work,project_invoice_method:"
msgid "Invoice Method"
msgstr ""
+#, fuzzy
msgctxt "field:project.work.invoiced_progress,create_date:"
msgid "Create Date"
-msgstr ""
+msgstr "Létrehozás détuma"
+#, fuzzy
msgctxt "field:project.work.invoiced_progress,create_uid:"
msgid "Create User"
-msgstr ""
+msgstr "Által létrehozva "
msgctxt "field:project.work.invoiced_progress,effort_duration:"
msgid "Effort"
msgstr ""
+#, fuzzy
msgctxt "field:project.work.invoiced_progress,id:"
msgid "ID"
-msgstr ""
+msgstr "ID"
msgctxt "field:project.work.invoiced_progress,invoice_line:"
msgid "Invoice Line"
msgstr ""
+#, fuzzy
msgctxt "field:project.work.invoiced_progress,rec_name:"
msgid "Name"
-msgstr ""
+msgstr "Név"
+#, fuzzy
msgctxt "field:project.work.invoiced_progress,work:"
msgid "Work"
-msgstr ""
+msgstr "Tevékenység"
+#, fuzzy
msgctxt "field:project.work.invoiced_progress,write_date:"
msgid "Write Date"
-msgstr ""
+msgstr "utolsó módosítás dátuma"
+#, fuzzy
msgctxt "field:project.work.invoiced_progress,write_uid:"
msgid "Write User"
-msgstr ""
+msgstr "Által módosítva"
msgctxt "field:timesheet.line,invoice_line:"
msgid "Invoice Line"
msgstr ""
+#, fuzzy
msgctxt "model:ir.action,name:act_timesheet_line_form_invoice"
msgid "Timesheet Lines"
-msgstr ""
+msgstr "Időpozíció"
msgctxt "model:ir.action,name:open_invoice"
msgid "Invoices"
@@ -138,14 +146,6 @@ msgctxt "selection:project.work,project_invoice_method:"
msgid "On Timesheet"
msgstr ""
-msgctxt "view:project.work.invoiced_progress:"
-msgid "Work Invoiced Progress"
-msgstr ""
-
-msgctxt "view:project.work.invoiced_progress:"
-msgid "Work Invoiced Progresses"
-msgstr ""
-
msgctxt "view:project.work:"
msgid "Invoice"
msgstr ""
diff --git a/locale/it_IT.po b/locale/it_IT.po
index 846a933..f0e7158 100644
--- a/locale/it_IT.po
+++ b/locale/it_IT.po
@@ -26,9 +26,10 @@ msgctxt "field:project.work,duration_to_invoice:"
msgid "Duration to Invoice"
msgstr ""
+#, fuzzy
msgctxt "field:project.work,invoice_line:"
msgid "Invoice Line"
-msgstr ""
+msgstr "Riga fattura"
msgctxt "field:project.work,invoice_method:"
msgid "Invoice Method"
@@ -50,53 +51,62 @@ msgctxt "field:project.work,project_invoice_method:"
msgid "Invoice Method"
msgstr ""
+#, fuzzy
msgctxt "field:project.work.invoiced_progress,create_date:"
msgid "Create Date"
-msgstr ""
+msgstr "Data di creazione"
+#, fuzzy
msgctxt "field:project.work.invoiced_progress,create_uid:"
msgid "Create User"
-msgstr ""
+msgstr "Utente creazione"
msgctxt "field:project.work.invoiced_progress,effort_duration:"
msgid "Effort"
msgstr ""
+#, fuzzy
msgctxt "field:project.work.invoiced_progress,id:"
msgid "ID"
-msgstr ""
+msgstr "Movimento contabile"
+#, fuzzy
msgctxt "field:project.work.invoiced_progress,invoice_line:"
msgid "Invoice Line"
-msgstr ""
+msgstr "Riga fattura"
+#, fuzzy
msgctxt "field:project.work.invoiced_progress,rec_name:"
msgid "Name"
-msgstr ""
+msgstr "Nome"
msgctxt "field:project.work.invoiced_progress,work:"
msgid "Work"
msgstr ""
+#, fuzzy
msgctxt "field:project.work.invoiced_progress,write_date:"
msgid "Write Date"
-msgstr ""
+msgstr "Utente scrittura"
+#, fuzzy
msgctxt "field:project.work.invoiced_progress,write_uid:"
msgid "Write User"
-msgstr ""
+msgstr "modificato da"
+#, fuzzy
msgctxt "field:timesheet.line,invoice_line:"
msgid "Invoice Line"
-msgstr ""
+msgstr "Riga fattura"
msgctxt "model:ir.action,name:act_timesheet_line_form_invoice"
msgid "Timesheet Lines"
msgstr ""
+#, fuzzy
msgctxt "model:ir.action,name:open_invoice"
msgid "Invoices"
-msgstr ""
+msgstr "Fatture"
msgctxt "model:project.work.invoiced_progress,name:"
msgid "Work Invoiced Progress"
@@ -106,9 +116,10 @@ msgctxt "model:res.group,name:group_project_invoice"
msgid "Project Invoice"
msgstr ""
+#, fuzzy
msgctxt "selection:project.work,invoice_method:"
msgid "Manual"
-msgstr ""
+msgstr "Manuale"
msgctxt "selection:project.work,invoice_method:"
msgid "On Effort"
@@ -122,9 +133,10 @@ msgctxt "selection:project.work,invoice_method:"
msgid "On Timesheet"
msgstr ""
+#, fuzzy
msgctxt "selection:project.work,project_invoice_method:"
msgid "Manual"
-msgstr ""
+msgstr "Manuale"
msgctxt "selection:project.work,project_invoice_method:"
msgid "On Effort"
@@ -138,14 +150,7 @@ msgctxt "selection:project.work,project_invoice_method:"
msgid "On Timesheet"
msgstr ""
-msgctxt "view:project.work.invoiced_progress:"
-msgid "Work Invoiced Progress"
-msgstr ""
-
-msgctxt "view:project.work.invoiced_progress:"
-msgid "Work Invoiced Progresses"
-msgstr ""
-
+#, fuzzy
msgctxt "view:project.work:"
msgid "Invoice"
-msgstr ""
+msgstr "Fattura"
diff --git a/locale/ja_JP.po b/locale/ja_JP.po
index 846a933..10d05a4 100644
--- a/locale/ja_JP.po
+++ b/locale/ja_JP.po
@@ -92,11 +92,11 @@ msgstr ""
msgctxt "model:ir.action,name:act_timesheet_line_form_invoice"
msgid "Timesheet Lines"
-msgstr ""
+msgstr "Timesheet Lines"
msgctxt "model:ir.action,name:open_invoice"
msgid "Invoices"
-msgstr ""
+msgstr "Invoices"
msgctxt "model:project.work.invoiced_progress,name:"
msgid "Work Invoiced Progress"
@@ -104,7 +104,7 @@ msgstr ""
msgctxt "model:res.group,name:group_project_invoice"
msgid "Project Invoice"
-msgstr ""
+msgstr "Project Invoice"
msgctxt "selection:project.work,invoice_method:"
msgid "Manual"
@@ -138,14 +138,7 @@ msgctxt "selection:project.work,project_invoice_method:"
msgid "On Timesheet"
msgstr ""
-msgctxt "view:project.work.invoiced_progress:"
-msgid "Work Invoiced Progress"
-msgstr ""
-
-msgctxt "view:project.work.invoiced_progress:"
-msgid "Work Invoiced Progresses"
-msgstr ""
-
+#, fuzzy
msgctxt "view:project.work:"
msgid "Invoice"
-msgstr ""
+msgstr "Invoices"
diff --git a/locale/nl_NL.po b/locale/lo.po
similarity index 82%
copy from locale/nl_NL.po
copy to locale/lo.po
index dea9f68..c3aaddd 100644
--- a/locale/nl_NL.po
+++ b/locale/lo.po
@@ -29,12 +29,11 @@ msgstr ""
#, fuzzy
msgctxt "field:project.work,invoice_line:"
msgid "Invoice Line"
-msgstr "Factuurregel"
+msgstr "ລາຍການ"
-#, fuzzy
msgctxt "field:project.work,invoice_method:"
msgid "Invoice Method"
-msgstr "Factuur afhandeling"
+msgstr ""
msgctxt "field:project.work,invoiced_amount:"
msgid "Invoiced Amount"
@@ -48,62 +47,68 @@ msgctxt "field:project.work,invoiced_progress:"
msgid "Invoiced Progress"
msgstr ""
-#, fuzzy
msgctxt "field:project.work,project_invoice_method:"
msgid "Invoice Method"
-msgstr "Factuur afhandeling"
+msgstr ""
+#, fuzzy
msgctxt "field:project.work.invoiced_progress,create_date:"
msgid "Create Date"
-msgstr ""
+msgstr "ສ້າງວັນທີ"
+#, fuzzy
msgctxt "field:project.work.invoiced_progress,create_uid:"
msgid "Create User"
-msgstr ""
+msgstr "ສ້າງຜູ້ໃຊ້ງານ"
msgctxt "field:project.work.invoiced_progress,effort_duration:"
msgid "Effort"
msgstr ""
+#, fuzzy
msgctxt "field:project.work.invoiced_progress,id:"
msgid "ID"
-msgstr ""
+msgstr "ເລດລຳດັບ"
#, fuzzy
msgctxt "field:project.work.invoiced_progress,invoice_line:"
msgid "Invoice Line"
-msgstr "Factuurregel"
+msgstr "ລາຍການ"
+#, fuzzy
msgctxt "field:project.work.invoiced_progress,rec_name:"
msgid "Name"
-msgstr ""
+msgstr "ຊື່"
+#, fuzzy
msgctxt "field:project.work.invoiced_progress,work:"
msgid "Work"
-msgstr ""
+msgstr "ເຮັດວຽກ"
+#, fuzzy
msgctxt "field:project.work.invoiced_progress,write_date:"
msgid "Write Date"
-msgstr ""
+msgstr "ວັນທີບັນທຶກ"
+#, fuzzy
msgctxt "field:project.work.invoiced_progress,write_uid:"
msgid "Write User"
-msgstr ""
+msgstr "ສ້າງຜູ້ໃຊ້"
#, fuzzy
msgctxt "field:timesheet.line,invoice_line:"
msgid "Invoice Line"
-msgstr "Factuurregel"
+msgstr "ລາຍການ"
#, fuzzy
msgctxt "model:ir.action,name:act_timesheet_line_form_invoice"
msgid "Timesheet Lines"
-msgstr "Tijdregistratieregels"
+msgstr "ແຖວຕາຕະລາງເຮັດວຽກ"
#, fuzzy
msgctxt "model:ir.action,name:open_invoice"
msgid "Invoices"
-msgstr "Verkoopfacturen"
+msgstr "ໃບເກັບເງິນ"
msgctxt "model:project.work.invoiced_progress,name:"
msgid "Work Invoiced Progress"
@@ -116,7 +121,7 @@ msgstr ""
#, fuzzy
msgctxt "selection:project.work,invoice_method:"
msgid "Manual"
-msgstr "Handmatig"
+msgstr "ໃສ່ເອົາເອງ"
msgctxt "selection:project.work,invoice_method:"
msgid "On Effort"
@@ -133,7 +138,7 @@ msgstr ""
#, fuzzy
msgctxt "selection:project.work,project_invoice_method:"
msgid "Manual"
-msgstr "Handmatig"
+msgstr "ໃສ່ເອົາເອງ"
msgctxt "selection:project.work,project_invoice_method:"
msgid "On Effort"
@@ -147,15 +152,7 @@ msgctxt "selection:project.work,project_invoice_method:"
msgid "On Timesheet"
msgstr ""
-msgctxt "view:project.work.invoiced_progress:"
-msgid "Work Invoiced Progress"
-msgstr ""
-
-msgctxt "view:project.work.invoiced_progress:"
-msgid "Work Invoiced Progresses"
-msgstr ""
-
#, fuzzy
msgctxt "view:project.work:"
msgid "Invoice"
-msgstr "Verkoopfacturen"
+msgstr "ໃບເກັບເງິນພາສີທີ່ດິນ"
diff --git a/locale/lo_LA.po b/locale/lo_LA.po
deleted file mode 100644
index 846a933..0000000
--- a/locale/lo_LA.po
+++ /dev/null
@@ -1,151 +0,0 @@
-#
-msgid ""
-msgstr "Content-Type: text/plain; charset=utf-8\n"
-
-msgctxt "error:project.work:"
-msgid "There is no list price on work \"%s\"."
-msgstr ""
-
-msgctxt "error:project.work:"
-msgid "There is no party on work \"%s\"."
-msgstr ""
-
-msgctxt "error:project.work:"
-msgid "There is no product on work \"%s\"."
-msgstr ""
-
-msgctxt "error:timesheet.line:"
-msgid "You can not delete invoiced line."
-msgstr ""
-
-msgctxt "error:timesheet.line:"
-msgid "You can not modify invoiced line."
-msgstr ""
-
-msgctxt "field:project.work,duration_to_invoice:"
-msgid "Duration to Invoice"
-msgstr ""
-
-msgctxt "field:project.work,invoice_line:"
-msgid "Invoice Line"
-msgstr ""
-
-msgctxt "field:project.work,invoice_method:"
-msgid "Invoice Method"
-msgstr ""
-
-msgctxt "field:project.work,invoiced_amount:"
-msgid "Invoiced Amount"
-msgstr ""
-
-msgctxt "field:project.work,invoiced_duration:"
-msgid "Invoiced Duration"
-msgstr ""
-
-msgctxt "field:project.work,invoiced_progress:"
-msgid "Invoiced Progress"
-msgstr ""
-
-msgctxt "field:project.work,project_invoice_method:"
-msgid "Invoice Method"
-msgstr ""
-
-msgctxt "field:project.work.invoiced_progress,create_date:"
-msgid "Create Date"
-msgstr ""
-
-msgctxt "field:project.work.invoiced_progress,create_uid:"
-msgid "Create User"
-msgstr ""
-
-msgctxt "field:project.work.invoiced_progress,effort_duration:"
-msgid "Effort"
-msgstr ""
-
-msgctxt "field:project.work.invoiced_progress,id:"
-msgid "ID"
-msgstr ""
-
-msgctxt "field:project.work.invoiced_progress,invoice_line:"
-msgid "Invoice Line"
-msgstr ""
-
-msgctxt "field:project.work.invoiced_progress,rec_name:"
-msgid "Name"
-msgstr ""
-
-msgctxt "field:project.work.invoiced_progress,work:"
-msgid "Work"
-msgstr ""
-
-msgctxt "field:project.work.invoiced_progress,write_date:"
-msgid "Write Date"
-msgstr ""
-
-msgctxt "field:project.work.invoiced_progress,write_uid:"
-msgid "Write User"
-msgstr ""
-
-msgctxt "field:timesheet.line,invoice_line:"
-msgid "Invoice Line"
-msgstr ""
-
-msgctxt "model:ir.action,name:act_timesheet_line_form_invoice"
-msgid "Timesheet Lines"
-msgstr ""
-
-msgctxt "model:ir.action,name:open_invoice"
-msgid "Invoices"
-msgstr ""
-
-msgctxt "model:project.work.invoiced_progress,name:"
-msgid "Work Invoiced Progress"
-msgstr ""
-
-msgctxt "model:res.group,name:group_project_invoice"
-msgid "Project Invoice"
-msgstr ""
-
-msgctxt "selection:project.work,invoice_method:"
-msgid "Manual"
-msgstr ""
-
-msgctxt "selection:project.work,invoice_method:"
-msgid "On Effort"
-msgstr ""
-
-msgctxt "selection:project.work,invoice_method:"
-msgid "On Progress"
-msgstr ""
-
-msgctxt "selection:project.work,invoice_method:"
-msgid "On Timesheet"
-msgstr ""
-
-msgctxt "selection:project.work,project_invoice_method:"
-msgid "Manual"
-msgstr ""
-
-msgctxt "selection:project.work,project_invoice_method:"
-msgid "On Effort"
-msgstr ""
-
-msgctxt "selection:project.work,project_invoice_method:"
-msgid "On Progress"
-msgstr ""
-
-msgctxt "selection:project.work,project_invoice_method:"
-msgid "On Timesheet"
-msgstr ""
-
-msgctxt "view:project.work.invoiced_progress:"
-msgid "Work Invoiced Progress"
-msgstr ""
-
-msgctxt "view:project.work.invoiced_progress:"
-msgid "Work Invoiced Progresses"
-msgstr ""
-
-msgctxt "view:project.work:"
-msgid "Invoice"
-msgstr ""
diff --git a/locale/hu_HU.po b/locale/lt.po
similarity index 94%
copy from locale/hu_HU.po
copy to locale/lt.po
index 846a933..ad92da6 100644
--- a/locale/hu_HU.po
+++ b/locale/lt.po
@@ -70,9 +70,10 @@ msgctxt "field:project.work.invoiced_progress,invoice_line:"
msgid "Invoice Line"
msgstr ""
+#, fuzzy
msgctxt "field:project.work.invoiced_progress,rec_name:"
msgid "Name"
-msgstr ""
+msgstr "Namu"
msgctxt "field:project.work.invoiced_progress,work:"
msgid "Work"
@@ -138,14 +139,6 @@ msgctxt "selection:project.work,project_invoice_method:"
msgid "On Timesheet"
msgstr ""
-msgctxt "view:project.work.invoiced_progress:"
-msgid "Work Invoiced Progress"
-msgstr ""
-
-msgctxt "view:project.work.invoiced_progress:"
-msgid "Work Invoiced Progresses"
-msgstr ""
-
msgctxt "view:project.work:"
msgid "Invoice"
msgstr ""
diff --git a/locale/lt_LT.po b/locale/lt_LT.po
deleted file mode 100644
index 846a933..0000000
--- a/locale/lt_LT.po
+++ /dev/null
@@ -1,151 +0,0 @@
-#
-msgid ""
-msgstr "Content-Type: text/plain; charset=utf-8\n"
-
-msgctxt "error:project.work:"
-msgid "There is no list price on work \"%s\"."
-msgstr ""
-
-msgctxt "error:project.work:"
-msgid "There is no party on work \"%s\"."
-msgstr ""
-
-msgctxt "error:project.work:"
-msgid "There is no product on work \"%s\"."
-msgstr ""
-
-msgctxt "error:timesheet.line:"
-msgid "You can not delete invoiced line."
-msgstr ""
-
-msgctxt "error:timesheet.line:"
-msgid "You can not modify invoiced line."
-msgstr ""
-
-msgctxt "field:project.work,duration_to_invoice:"
-msgid "Duration to Invoice"
-msgstr ""
-
-msgctxt "field:project.work,invoice_line:"
-msgid "Invoice Line"
-msgstr ""
-
-msgctxt "field:project.work,invoice_method:"
-msgid "Invoice Method"
-msgstr ""
-
-msgctxt "field:project.work,invoiced_amount:"
-msgid "Invoiced Amount"
-msgstr ""
-
-msgctxt "field:project.work,invoiced_duration:"
-msgid "Invoiced Duration"
-msgstr ""
-
-msgctxt "field:project.work,invoiced_progress:"
-msgid "Invoiced Progress"
-msgstr ""
-
-msgctxt "field:project.work,project_invoice_method:"
-msgid "Invoice Method"
-msgstr ""
-
-msgctxt "field:project.work.invoiced_progress,create_date:"
-msgid "Create Date"
-msgstr ""
-
-msgctxt "field:project.work.invoiced_progress,create_uid:"
-msgid "Create User"
-msgstr ""
-
-msgctxt "field:project.work.invoiced_progress,effort_duration:"
-msgid "Effort"
-msgstr ""
-
-msgctxt "field:project.work.invoiced_progress,id:"
-msgid "ID"
-msgstr ""
-
-msgctxt "field:project.work.invoiced_progress,invoice_line:"
-msgid "Invoice Line"
-msgstr ""
-
-msgctxt "field:project.work.invoiced_progress,rec_name:"
-msgid "Name"
-msgstr ""
-
-msgctxt "field:project.work.invoiced_progress,work:"
-msgid "Work"
-msgstr ""
-
-msgctxt "field:project.work.invoiced_progress,write_date:"
-msgid "Write Date"
-msgstr ""
-
-msgctxt "field:project.work.invoiced_progress,write_uid:"
-msgid "Write User"
-msgstr ""
-
-msgctxt "field:timesheet.line,invoice_line:"
-msgid "Invoice Line"
-msgstr ""
-
-msgctxt "model:ir.action,name:act_timesheet_line_form_invoice"
-msgid "Timesheet Lines"
-msgstr ""
-
-msgctxt "model:ir.action,name:open_invoice"
-msgid "Invoices"
-msgstr ""
-
-msgctxt "model:project.work.invoiced_progress,name:"
-msgid "Work Invoiced Progress"
-msgstr ""
-
-msgctxt "model:res.group,name:group_project_invoice"
-msgid "Project Invoice"
-msgstr ""
-
-msgctxt "selection:project.work,invoice_method:"
-msgid "Manual"
-msgstr ""
-
-msgctxt "selection:project.work,invoice_method:"
-msgid "On Effort"
-msgstr ""
-
-msgctxt "selection:project.work,invoice_method:"
-msgid "On Progress"
-msgstr ""
-
-msgctxt "selection:project.work,invoice_method:"
-msgid "On Timesheet"
-msgstr ""
-
-msgctxt "selection:project.work,project_invoice_method:"
-msgid "Manual"
-msgstr ""
-
-msgctxt "selection:project.work,project_invoice_method:"
-msgid "On Effort"
-msgstr ""
-
-msgctxt "selection:project.work,project_invoice_method:"
-msgid "On Progress"
-msgstr ""
-
-msgctxt "selection:project.work,project_invoice_method:"
-msgid "On Timesheet"
-msgstr ""
-
-msgctxt "view:project.work.invoiced_progress:"
-msgid "Work Invoiced Progress"
-msgstr ""
-
-msgctxt "view:project.work.invoiced_progress:"
-msgid "Work Invoiced Progresses"
-msgstr ""
-
-msgctxt "view:project.work:"
-msgid "Invoice"
-msgstr ""
diff --git a/locale/nl_NL.po b/locale/nl.po
similarity index 92%
rename from locale/nl_NL.po
rename to locale/nl.po
index dea9f68..25ec95b 100644
--- a/locale/nl_NL.po
+++ b/locale/nl.po
@@ -53,42 +53,49 @@ msgctxt "field:project.work,project_invoice_method:"
msgid "Invoice Method"
msgstr "Factuur afhandeling"
+#, fuzzy
msgctxt "field:project.work.invoiced_progress,create_date:"
msgid "Create Date"
-msgstr ""
+msgstr "Datum"
+#, fuzzy
msgctxt "field:project.work.invoiced_progress,create_uid:"
msgid "Create User"
-msgstr ""
+msgstr "Gebruiker"
msgctxt "field:project.work.invoiced_progress,effort_duration:"
msgid "Effort"
msgstr ""
+#, fuzzy
msgctxt "field:project.work.invoiced_progress,id:"
msgid "ID"
-msgstr ""
+msgstr "ID"
#, fuzzy
msgctxt "field:project.work.invoiced_progress,invoice_line:"
msgid "Invoice Line"
msgstr "Factuurregel"
+#, fuzzy
msgctxt "field:project.work.invoiced_progress,rec_name:"
msgid "Name"
-msgstr ""
+msgstr "Naam bijlage"
+#, fuzzy
msgctxt "field:project.work.invoiced_progress,work:"
msgid "Work"
-msgstr ""
+msgstr "Werk"
+#, fuzzy
msgctxt "field:project.work.invoiced_progress,write_date:"
msgid "Write Date"
-msgstr ""
+msgstr "Schrijfdatum"
+#, fuzzy
msgctxt "field:project.work.invoiced_progress,write_uid:"
msgid "Write User"
-msgstr ""
+msgstr "Gebruiker"
#, fuzzy
msgctxt "field:timesheet.line,invoice_line:"
@@ -147,14 +154,6 @@ msgctxt "selection:project.work,project_invoice_method:"
msgid "On Timesheet"
msgstr ""
-msgctxt "view:project.work.invoiced_progress:"
-msgid "Work Invoiced Progress"
-msgstr ""
-
-msgctxt "view:project.work.invoiced_progress:"
-msgid "Work Invoiced Progresses"
-msgstr ""
-
#, fuzzy
msgctxt "view:project.work:"
msgid "Invoice"
diff --git a/locale/hu_HU.po b/locale/pl.po
similarity index 93%
copy from locale/hu_HU.po
copy to locale/pl.po
index 846a933..10d05a4 100644
--- a/locale/hu_HU.po
+++ b/locale/pl.po
@@ -92,11 +92,11 @@ msgstr ""
msgctxt "model:ir.action,name:act_timesheet_line_form_invoice"
msgid "Timesheet Lines"
-msgstr ""
+msgstr "Timesheet Lines"
msgctxt "model:ir.action,name:open_invoice"
msgid "Invoices"
-msgstr ""
+msgstr "Invoices"
msgctxt "model:project.work.invoiced_progress,name:"
msgid "Work Invoiced Progress"
@@ -104,7 +104,7 @@ msgstr ""
msgctxt "model:res.group,name:group_project_invoice"
msgid "Project Invoice"
-msgstr ""
+msgstr "Project Invoice"
msgctxt "selection:project.work,invoice_method:"
msgid "Manual"
@@ -138,14 +138,7 @@ msgctxt "selection:project.work,project_invoice_method:"
msgid "On Timesheet"
msgstr ""
-msgctxt "view:project.work.invoiced_progress:"
-msgid "Work Invoiced Progress"
-msgstr ""
-
-msgctxt "view:project.work.invoiced_progress:"
-msgid "Work Invoiced Progresses"
-msgstr ""
-
+#, fuzzy
msgctxt "view:project.work:"
msgid "Invoice"
-msgstr ""
+msgstr "Invoices"
diff --git a/locale/pt_BR.po b/locale/pt_BR.po
index d72a593..fbfb9fd 100644
--- a/locale/pt_BR.po
+++ b/locale/pt_BR.po
@@ -138,6 +138,10 @@ msgctxt "selection:project.work,project_invoice_method:"
msgid "On Timesheet"
msgstr "Sobre o Horário de Trabalho"
+msgctxt "view:project.work:"
+msgid "Invoice"
+msgstr "Fatura"
+
msgctxt "view:project.work.invoiced_progress:"
msgid "Work Invoiced Progress"
msgstr "Progresso Faturado do Trabalho"
@@ -145,7 +149,3 @@ msgstr "Progresso Faturado do Trabalho"
msgctxt "view:project.work.invoiced_progress:"
msgid "Work Invoiced Progresses"
msgstr "Progresso Faturado do Trabalho"
-
-msgctxt "view:project.work:"
-msgid "Invoice"
-msgstr "Fatura"
diff --git a/locale/ru_RU.po b/locale/ru.po
similarity index 91%
rename from locale/ru_RU.po
rename to locale/ru.po
index 9485ca1..9452334 100644
--- a/locale/ru_RU.po
+++ b/locale/ru.po
@@ -53,42 +53,49 @@ msgctxt "field:project.work,project_invoice_method:"
msgid "Invoice Method"
msgstr "Метод инвойса"
+#, fuzzy
msgctxt "field:project.work.invoiced_progress,create_date:"
msgid "Create Date"
-msgstr ""
+msgstr "Дата создания"
+#, fuzzy
msgctxt "field:project.work.invoiced_progress,create_uid:"
msgid "Create User"
-msgstr ""
+msgstr "Создано пользователем"
msgctxt "field:project.work.invoiced_progress,effort_duration:"
msgid "Effort"
msgstr ""
+#, fuzzy
msgctxt "field:project.work.invoiced_progress,id:"
msgid "ID"
-msgstr ""
+msgstr "ID"
#, fuzzy
msgctxt "field:project.work.invoiced_progress,invoice_line:"
msgid "Invoice Line"
msgstr "Строка инвойса"
+#, fuzzy
msgctxt "field:project.work.invoiced_progress,rec_name:"
msgid "Name"
-msgstr ""
+msgstr "Правило оплаты"
+#, fuzzy
msgctxt "field:project.work.invoiced_progress,work:"
msgid "Work"
-msgstr ""
+msgstr "Работа"
+#, fuzzy
msgctxt "field:project.work.invoiced_progress,write_date:"
msgid "Write Date"
-msgstr ""
+msgstr "Дата изменения"
+#, fuzzy
msgctxt "field:project.work.invoiced_progress,write_uid:"
msgid "Write User"
-msgstr ""
+msgstr "Изменено пользователем"
#, fuzzy
msgctxt "field:timesheet.line,invoice_line:"
@@ -147,14 +154,6 @@ msgctxt "selection:project.work,project_invoice_method:"
msgid "On Timesheet"
msgstr ""
-msgctxt "view:project.work.invoiced_progress:"
-msgid "Work Invoiced Progress"
-msgstr ""
-
-msgctxt "view:project.work.invoiced_progress:"
-msgid "Work Invoiced Progresses"
-msgstr ""
-
#, fuzzy
msgctxt "view:project.work:"
msgid "Invoice"
diff --git a/locale/sl_SI.po b/locale/sl.po
similarity index 100%
rename from locale/sl_SI.po
rename to locale/sl.po
index 7eee1bd..d134dc4 100644
--- a/locale/sl_SI.po
+++ b/locale/sl.po
@@ -138,6 +138,10 @@ msgctxt "selection:project.work,project_invoice_method:"
msgid "On Timesheet"
msgstr "Po dejanskem delu"
+msgctxt "view:project.work:"
+msgid "Invoice"
+msgstr "Račun"
+
msgctxt "view:project.work.invoiced_progress:"
msgid "Work Invoiced Progress"
msgstr "Zaračunano opravljeno delo"
@@ -145,7 +149,3 @@ msgstr "Zaračunano opravljeno delo"
msgctxt "view:project.work.invoiced_progress:"
msgid "Work Invoiced Progresses"
msgstr "Zaračunana opravljena dela"
-
-msgctxt "view:project.work:"
-msgid "Invoice"
-msgstr "Račun"
diff --git a/locale/zh_CN.po b/locale/zh_CN.po
index 846a933..b385da7 100644
--- a/locale/zh_CN.po
+++ b/locale/zh_CN.po
@@ -50,41 +50,47 @@ msgctxt "field:project.work,project_invoice_method:"
msgid "Invoice Method"
msgstr ""
+#, fuzzy
msgctxt "field:project.work.invoiced_progress,create_date:"
msgid "Create Date"
-msgstr ""
+msgstr "创建日期:"
+#, fuzzy
msgctxt "field:project.work.invoiced_progress,create_uid:"
msgid "Create User"
-msgstr ""
+msgstr "添加用户"
msgctxt "field:project.work.invoiced_progress,effort_duration:"
msgid "Effort"
msgstr ""
+#, fuzzy
msgctxt "field:project.work.invoiced_progress,id:"
msgid "ID"
-msgstr ""
+msgstr "编号"
msgctxt "field:project.work.invoiced_progress,invoice_line:"
msgid "Invoice Line"
msgstr ""
+#, fuzzy
msgctxt "field:project.work.invoiced_progress,rec_name:"
msgid "Name"
-msgstr ""
+msgstr "纳木"
msgctxt "field:project.work.invoiced_progress,work:"
msgid "Work"
msgstr ""
+#, fuzzy
msgctxt "field:project.work.invoiced_progress,write_date:"
msgid "Write Date"
-msgstr ""
+msgstr "写入日期"
+#, fuzzy
msgctxt "field:project.work.invoiced_progress,write_uid:"
msgid "Write User"
-msgstr ""
+msgstr "写入帐号"
msgctxt "field:timesheet.line,invoice_line:"
msgid "Invoice Line"
@@ -138,14 +144,6 @@ msgctxt "selection:project.work,project_invoice_method:"
msgid "On Timesheet"
msgstr ""
-msgctxt "view:project.work.invoiced_progress:"
-msgid "Work Invoiced Progress"
-msgstr ""
-
-msgctxt "view:project.work.invoiced_progress:"
-msgid "Work Invoiced Progresses"
-msgstr ""
-
msgctxt "view:project.work:"
msgid "Invoice"
msgstr ""
diff --git a/setup.py b/setup.py
index e8b4c60..64ff039 100644
--- a/setup.py
+++ b/setup.py
@@ -96,6 +96,7 @@ setup(name=name,
'Natural Language :: German',
'Natural Language :: Hungarian',
'Natural Language :: Italian',
+ 'Natural Language :: Polish',
'Natural Language :: Portuguese (Brazilian)',
'Natural Language :: Russian',
'Natural Language :: Slovenian',
diff --git a/tests/scenario_project_invoice_effort.rst b/tests/scenario_project_invoice_effort.rst
index 9ad3fc1..7c393c7 100644
--- a/tests/scenario_project_invoice_effort.rst
+++ b/tests/scenario_project_invoice_effort.rst
@@ -7,7 +7,8 @@ Imports::
>>> import datetime
>>> from dateutil.relativedelta import relativedelta
>>> from decimal import Decimal
- >>> from proteus import config, Model, Wizard
+ >>> from proteus import Model, Wizard
+ >>> from trytond.tests.tools import activate_modules
>>> from trytond.modules.company.tests.tools import create_company, \
... get_company
>>> from trytond.modules.account.tests.tools import create_chart, \
@@ -16,33 +17,19 @@ Imports::
... create_payment_term
>>> today = datetime.date.today()
-Create database::
-
- >>> config = config.set_trytond()
- >>> config.pool.test = True
-
Install project_invoice::
- >>> Module = Model.get('ir.module')
- >>> module, = Module.find([
- ... ('name', '=', 'project_invoice'),
- ... ])
- >>> module.click('install')
- >>> Wizard('ir.module.install_upgrade').execute('upgrade')
+ >>> config = activate_modules('project_invoice')
Create company::
>>> _ = create_company()
>>> company = get_company()
-Reload the context::
+Create project user::
>>> User = Model.get('res.user')
>>> Group = Model.get('res.group')
- >>> config._context = User.get_preferences(True, config.context)
-
-Create project user::
-
>>> project_user = User()
>>> project_user.name = 'Project'
>>> project_user.login = 'project'
diff --git a/tests/scenario_project_invoice_progress.rst b/tests/scenario_project_invoice_progress.rst
index 1aa003d..1230565 100644
--- a/tests/scenario_project_invoice_progress.rst
+++ b/tests/scenario_project_invoice_progress.rst
@@ -7,7 +7,8 @@ Imports::
>>> import datetime
>>> from dateutil.relativedelta import relativedelta
>>> from decimal import Decimal
- >>> from proteus import config, Model, Wizard
+ >>> from proteus import Model, Wizard
+ >>> from trytond.tests.tools import activate_modules
>>> from trytond.modules.company.tests.tools import create_company, \
... get_company
>>> from trytond.modules.account.tests.tools import create_chart, \
@@ -16,33 +17,19 @@ Imports::
... create_payment_term
>>> today = datetime.date.today()
-Create database::
-
- >>> config = config.set_trytond()
- >>> config.pool.test = True
-
Install project_invoice::
- >>> Module = Model.get('ir.module')
- >>> module, = Module.find([
- ... ('name', '=', 'project_invoice'),
- ... ])
- >>> module.click('install')
- >>> Wizard('ir.module.install_upgrade').execute('upgrade')
+ >>> config = activate_modules('project_invoice')
Create company::
>>> _ = create_company()
>>> company = get_company()
-Reload the context::
+Create project user::
>>> User = Model.get('res.user')
>>> Group = Model.get('res.group')
- >>> config._context = User.get_preferences(True, config.context)
-
-Create project user::
-
>>> project_user = User()
>>> project_user.name = 'Project'
>>> project_user.login = 'project'
diff --git a/tests/scenario_project_invoice_timesheet.rst b/tests/scenario_project_invoice_timesheet.rst
index 0fe65e1..500d7fd 100644
--- a/tests/scenario_project_invoice_timesheet.rst
+++ b/tests/scenario_project_invoice_timesheet.rst
@@ -7,7 +7,8 @@ Imports::
>>> import datetime
>>> from dateutil.relativedelta import relativedelta
>>> from decimal import Decimal
- >>> from proteus import config, Model, Wizard
+ >>> from proteus import Model, Wizard
+ >>> from trytond.tests.tools import activate_modules
>>> from trytond.modules.company.tests.tools import create_company, \
... get_company
>>> from trytond.modules.account.tests.tools import create_chart, \
@@ -16,33 +17,19 @@ Imports::
... create_payment_term
>>> today = datetime.date.today()
-Create database::
-
- >>> config = config.set_trytond()
- >>> config.pool.test = True
-
Install project_invoice::
- >>> Module = Model.get('ir.module')
- >>> module, = Module.find([
- ... ('name', '=', 'project_invoice'),
- ... ])
- >>> module.click('install')
- >>> Wizard('ir.module.install_upgrade').execute('upgrade')
+ >>> config = activate_modules('project_invoice')
Create company::
>>> _ = create_company()
>>> company = get_company()
-Reload the context::
+Create project user::
>>> User = Model.get('res.user')
>>> Group = Model.get('res.group')
- >>> config._context = User.get_preferences(True, config.context)
-
-Create project user::
-
>>> project_user = User()
>>> project_user.name = 'Project'
>>> project_user.login = 'project'
@@ -114,23 +101,16 @@ Create a Project::
>>> config.user = project_user.id
>>> ProjectWork = Model.get('project.work')
- >>> TimesheetWork = Model.get('timesheet.work')
>>> project = ProjectWork()
>>> project.name = 'Test timesheet'
- >>> work = TimesheetWork()
- >>> work.name = 'Test timesheet'
- >>> work.save()
- >>> project.work = work
>>> project.type = 'project'
>>> project.party = customer
>>> project.project_invoice_method = 'timesheet'
>>> project.product = product
+ >>> project.timesheet_available = True
>>> task = ProjectWork()
>>> task.name = 'Task 1'
- >>> work = TimesheetWork()
- >>> work.name = 'Task 1'
- >>> work.save()
- >>> task.work = work
+ >>> task.timesheet_available = True
>>> task.type = 'task'
>>> task.product = product
>>> project.children.append(task)
@@ -150,12 +130,12 @@ Create timesheets::
>>> line = TimesheetLine()
>>> line.employee = employee
>>> line.duration = datetime.timedelta(hours=3)
- >>> line.work = task.work
+ >>> line.work, = task.timesheet_works
>>> line.save()
>>> line = TimesheetLine()
>>> line.employee = employee
>>> line.duration = datetime.timedelta(hours=2)
- >>> line.work = project.work
+ >>> line.work, = project.timesheet_works
>>> line.save()
Check project duration::
@@ -186,7 +166,7 @@ Create more timesheets::
>>> line = TimesheetLine()
>>> line.employee = employee
>>> line.duration = datetime.timedelta(hours=4)
- >>> line.work = task.work
+ >>> line.work, = task.timesheet_works
>>> line.save()
Check project duration::
diff --git a/tests/test_project_invoice.py b/tests/test_project_invoice.py
index 66a03a1..bb3b349 100644
--- a/tests/test_project_invoice.py
+++ b/tests/test_project_invoice.py
@@ -4,7 +4,7 @@ import unittest
import doctest
import trytond.tests.test_tryton
from trytond.tests.test_tryton import ModuleTestCase
-from trytond.tests.test_tryton import doctest_setup, doctest_teardown
+from trytond.tests.test_tryton import doctest_teardown
from trytond.tests.test_tryton import doctest_checker
@@ -19,17 +19,17 @@ def suite():
ProjectInvoiceTestCase))
suite.addTests(doctest.DocFileSuite(
'scenario_project_invoice_timesheet.rst',
- setUp=doctest_setup, tearDown=doctest_teardown, encoding='utf-8',
+ tearDown=doctest_teardown, encoding='utf-8',
checker=doctest_checker,
optionflags=doctest.REPORT_ONLY_FIRST_FAILURE))
suite.addTests(doctest.DocFileSuite(
'scenario_project_invoice_effort.rst',
- setUp=doctest_setup, tearDown=doctest_teardown, encoding='utf-8',
+ tearDown=doctest_teardown, encoding='utf-8',
checker=doctest_checker,
optionflags=doctest.REPORT_ONLY_FIRST_FAILURE))
suite.addTests(doctest.DocFileSuite(
'scenario_project_invoice_progress.rst',
- setUp=doctest_setup, tearDown=doctest_teardown, encoding='utf-8',
+ tearDown=doctest_teardown, encoding='utf-8',
checker=doctest_checker,
optionflags=doctest.REPORT_ONLY_FIRST_FAILURE))
return suite
diff --git a/tryton.cfg b/tryton.cfg
index 0382cd5..55ffda2 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
[tryton]
-version=4.0.2
+version=4.2.0
depends:
ir
project
diff --git a/trytond_project_invoice.egg-info/PKG-INFO b/trytond_project_invoice.egg-info/PKG-INFO
index 08d3bf1..269d462 100644
--- a/trytond_project_invoice.egg-info/PKG-INFO
+++ b/trytond_project_invoice.egg-info/PKG-INFO
@@ -1,12 +1,12 @@
Metadata-Version: 1.1
Name: trytond-project-invoice
-Version: 4.0.2
+Version: 4.2.0
Summary: Tryton module to invoice projects
Home-page: http://www.tryton.org/
Author: Tryton
Author-email: issue_tracker at tryton.org
License: GPL-3
-Download-URL: http://downloads.tryton.org/4.0/
+Download-URL: http://downloads.tryton.org/4.2/
Description: trytond_project_invoice
=======================
@@ -63,6 +63,7 @@ Classifier: Natural Language :: French
Classifier: Natural Language :: German
Classifier: Natural Language :: Hungarian
Classifier: Natural Language :: Italian
+Classifier: Natural Language :: Polish
Classifier: Natural Language :: Portuguese (Brazilian)
Classifier: Natural Language :: Russian
Classifier: Natural Language :: Slovenian
diff --git a/trytond_project_invoice.egg-info/SOURCES.txt b/trytond_project_invoice.egg-info/SOURCES.txt
index 6b6866a..52bfc93 100644
--- a/trytond_project_invoice.egg-info/SOURCES.txt
+++ b/trytond_project_invoice.egg-info/SOURCES.txt
@@ -17,25 +17,23 @@ work.xml
./tryton.cfg
./work.py
./work.xml
-./locale/bg_BG.po
-./locale/ca_ES.po
-./locale/cs_CZ.po
-./locale/de_DE.po
-./locale/es_AR.po
-./locale/es_CO.po
-./locale/es_EC.po
-./locale/es_ES.po
-./locale/es_MX.po
-./locale/fr_FR.po
+./locale/bg.po
+./locale/ca.po
+./locale/cs.po
+./locale/de.po
+./locale/es.po
+./locale/es_419.po
+./locale/fr.po
./locale/hu_HU.po
./locale/it_IT.po
./locale/ja_JP.po
-./locale/lo_LA.po
-./locale/lt_LT.po
-./locale/nl_NL.po
+./locale/lo.po
+./locale/lt.po
+./locale/nl.po
+./locale/pl.po
./locale/pt_BR.po
-./locale/ru_RU.po
-./locale/sl_SI.po
+./locale/ru.po
+./locale/sl.po
./locale/zh_CN.po
./tests/__init__.py
./tests/scenario_project_invoice_effort.rst
@@ -46,25 +44,23 @@ work.xml
./view/work_invoiced_progress_form.xml
./view/work_invoiced_progress_list.xml
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_EC.po
-locale/es_ES.po
-locale/es_MX.po
-locale/fr_FR.po
+locale/bg.po
+locale/ca.po
+locale/cs.po
+locale/de.po
+locale/es.po
+locale/es_419.po
+locale/fr.po
locale/hu_HU.po
locale/it_IT.po
locale/ja_JP.po
-locale/lo_LA.po
-locale/lt_LT.po
-locale/nl_NL.po
+locale/lo.po
+locale/lt.po
+locale/nl.po
+locale/pl.po
locale/pt_BR.po
-locale/ru_RU.po
-locale/sl_SI.po
+locale/ru.po
+locale/sl.po
locale/zh_CN.po
tests/scenario_project_invoice_effort.rst
tests/scenario_project_invoice_progress.rst
diff --git a/trytond_project_invoice.egg-info/requires.txt b/trytond_project_invoice.egg-info/requires.txt
index 1c8794a..ff1fab9 100644
--- a/trytond_project_invoice.egg-info/requires.txt
+++ b/trytond_project_invoice.egg-info/requires.txt
@@ -1,8 +1,8 @@
python-sql >= 0.4
-trytond_project >= 4.0, < 4.1
-trytond_project_revenue >= 4.0, < 4.1
-trytond_timesheet >= 4.0, < 4.1
-trytond_account >= 4.0, < 4.1
-trytond_account_invoice >= 4.0, < 4.1
-trytond_product >= 4.0, < 4.1
-trytond >= 4.0, < 4.1
+trytond_project >= 4.2, < 4.3
+trytond_project_revenue >= 4.2, < 4.3
+trytond_timesheet >= 4.2, < 4.3
+trytond_account >= 4.2, < 4.3
+trytond_account_invoice >= 4.2, < 4.3
+trytond_product >= 4.2, < 4.3
+trytond >= 4.2, < 4.3
diff --git a/view/work_form.xml b/view/work_form.xml
index 5617fe0..f6cae03 100644
--- a/view/work_form.xml
+++ b/view/work_form.xml
@@ -3,7 +3,7 @@
this repository contains the full copyright notices and license terms. -->
<data>
<xpath
- expr="/form/notebook/page[@id='general']/field[@name='timesheet_available']"
+ expr="/form/notebook/page[@id='general']/group[@id='progress']"
position="after">
<label name="project_invoice_method"/>
<field name="project_invoice_method"/>
diff --git a/view/work_invoiced_progress_form.xml b/view/work_invoiced_progress_form.xml
index d4a7851..a063889 100644
--- a/view/work_invoiced_progress_form.xml
+++ b/view/work_invoiced_progress_form.xml
@@ -1,7 +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. -->
-<form string="Work Invoiced Progress">
+<form>
<label name="work"/>
<field name="work"/>
<newline/>
diff --git a/view/work_invoiced_progress_list.xml b/view/work_invoiced_progress_list.xml
index 9c0d567..fca84b4 100644
--- a/view/work_invoiced_progress_list.xml
+++ b/view/work_invoiced_progress_list.xml
@@ -1,7 +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="Work Invoiced Progresses">
+<tree>
<field name="work"/>
<field name="effort_duration"/>
<field name="invoice_line"/>
diff --git a/work.py b/work.py
index 74855a3..ee240f9 100644
--- a/work.py
+++ b/work.py
@@ -9,6 +9,7 @@ import datetime
from sql import Null
from sql.aggregate import Sum
+from sql.operators import Concat
from trytond.model import ModelSQL, ModelView, fields
from trytond.pool import PoolMeta
@@ -270,7 +271,9 @@ class Work:
for sub_ids in grouped_slice(work_ids):
where = reduce_ids(table.id, sub_ids)
cursor.execute(*table.join(timesheet_work,
- condition=table.work == timesheet_work.id
+ condition=(
+ Concat(cls.__name__ + ',', table.id)
+ == timesheet_work.origin)
).join(timesheet_line,
condition=timesheet_line.work == timesheet_work.id
).join(invoice_line,
@@ -306,8 +309,8 @@ class Work:
cursor = Transaction().connection.cursor()
line = TimesheetLine.__table__()
- durations = {}
- twork2work = dict((w.work.id, w.id) for w in works if w.work)
+ durations = defaultdict(datetime.timedelta)
+ twork2work = {tw.id: w.id for w in works for tw in w.timesheet_works}
ids = twork2work.keys()
for sub_ids in grouped_slice(ids):
red_sql = reduce_ids(line.work, sub_ids)
@@ -323,7 +326,7 @@ class Work:
# SQLite uses float for SUM
if not isinstance(duration, datetime.timedelta):
duration = datetime.timedelta(seconds=duration)
- durations[twork2work[twork_id]] = duration
+ durations[twork2work[twork_id]] += duration
return durations
@classmethod
@@ -511,7 +514,8 @@ class Work:
return []
def _get_lines_to_invoice_timesheet(self):
- if self.work and self.work.timesheet_lines:
+ if (self.timesheet_works
+ and any(tw.timesheet_lines for tw in self.timesheet_works)):
if not self.product:
self.raise_user_error('missing_product', (self.rec_name,))
elif self.list_price is None:
@@ -522,7 +526,9 @@ class Work:
'unit_price': self.list_price,
'origin': l,
'description': self.name,
- } for l in self.work.timesheet_lines
+ }
+ for tw in self.timesheet_works
+ for l in tw.timesheet_lines
if not l.invoice_line]
return []
@@ -576,8 +582,8 @@ class OpenInvoice(Wizard):
for work in works:
if work.invoice_line and work.invoice_line.invoice:
invoice_ids.add(work.invoice_line.invoice.id)
- if work.work:
- for timesheet_line in work.work.timesheet_lines:
+ for twork in work.timesheet_works:
+ for timesheet_line in twork.timesheet_lines:
if (timesheet_line.invoice_line
and timesheet_line.invoice_line.invoice):
invoice_ids.add(timesheet_line.invoice_line.invoice.id)
--
tryton-modules-project-invoice
More information about the tryton-debian-vcs
mailing list