[tryton-debian-vcs] tryton-modules-project branch debian updated. debian/3.8.0-2-5-ga7764bf
Mathias Behrle
tryton-debian-vcs at alioth.debian.org
Thu Jun 2 16:23:10 UTC 2016
The following commit has been merged in the debian branch:
https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi/?p=tryton/tryton-modules-project.git;a=commitdiff;h=debian/3.8.0-2-5-ga7764bf
commit a7764bf2fabd7d3f189a4280dbad90ee0d00524c
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Wed Jun 1 21:47:27 2016 +0200
Releasing debian version 4.0.1-1.
Signed-off-by: Mathias Behrle <mathiasb at m9s.biz>
diff --git a/debian/changelog b/debian/changelog
index 292a77f..17d6fbd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+tryton-modules-project (4.0.1-1) unstable; urgency=medium
+
+ * Updating signing-key.asc with the actual upstream maintainer keys.
+ * Merging upstream version 4.0.0.
+ * Merging upstream version 4.0.1.
+ * Updating the copyright file.
+
+ -- Mathias Behrle <mathiasb at m9s.biz> Mon, 30 May 2016 19:30:25 +0200
+
tryton-modules-project (3.8.0-2) unstable; urgency=medium
* Updating to standards version 3.9.7, no changes needed.
commit 87631aeacbba86aae5b8208472a5e835018e0984
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Fri May 27 19:01:03 2016 +0200
Updating the copyright file.
diff --git a/debian/copyright b/debian/copyright
index 0048d3c..cb051af 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,8 +1,8 @@
Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Files: *
-Copyright: 2008-2015 Cédric Krier
- 2008-2015 B2CK SPRL
+Copyright: 2008-2016 Cédric Krier
+ 2008-2016 B2CK SPRL
2009-2013 Bertrand Chenal
License: GPL-3+
@@ -13,7 +13,7 @@ License: public-domain
Files: debian/*
Copyright:
2009-2012 Daniel Baumann <daniel at debian.org>
- 2011-2015 Mathias Behrle <mathiasb at m9s.biz>
+ 2011-2016 Mathias Behrle <mathiasb at m9s.biz>
License: GPL-3+
License: GPL-3+
commit aa6652ade7871eb2754d75e7a6ebf968989305bb
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Fri May 27 18:35:26 2016 +0200
Merging upstream version 4.0.1.
diff --git a/CHANGELOG b/CHANGELOG
index 3fd4af3..4b9dbcc 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 4.0.1 - 2016-05-11
+* Bug fixes (see mercurial logs for details)
+
Version 4.0.0 - 2016-05-02
* Bug fixes (see mercurial logs for details)
* Add Python3 support
diff --git a/PKG-INFO b/PKG-INFO
index 435f908..17fca7e 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: trytond_project
-Version: 4.0.0
+Version: 4.0.1
Summary: Tryton module with projects
Home-page: http://www.tryton.org/
Author: Tryton
diff --git a/locale/es_CO.po b/locale/es_CO.po
index d536144..f3ece4d 100644
--- a/locale/es_CO.po
+++ b/locale/es_CO.po
@@ -52,7 +52,7 @@ msgstr "ID"
msgctxt "field:project.work,left:"
msgid "Left"
-msgstr ""
+msgstr "Izquierda"
msgctxt "field:project.work,name:"
msgid "Name"
@@ -72,7 +72,7 @@ msgstr "Dirección de Contacto"
msgctxt "field:project.work,progress:"
msgid "Progress"
-msgstr ""
+msgstr "Progreso"
msgctxt "field:project.work,rec_name:"
msgid "Name"
@@ -80,7 +80,7 @@ msgstr "Nombre"
msgctxt "field:project.work,right:"
msgid "Right"
-msgstr ""
+msgstr "Derecha"
msgctxt "field:project.work,sequence:"
msgid "Sequence"
@@ -104,7 +104,7 @@ msgstr "Esfuerzo tTotal"
msgctxt "field:project.work,total_progress:"
msgid "Total Progress"
-msgstr ""
+msgstr "Progreso Total"
msgctxt "field:project.work,type:"
msgid "Type"
@@ -126,23 +126,21 @@ msgctxt "help:project.work,effort_duration:"
msgid "Estimated Effort for this work"
msgstr "Esfuerzo Estimado para este trabajo"
-#, fuzzy
msgctxt "help:project.work,progress:"
msgid "Estimated progress for this work"
-msgstr "Esfuerzo Estimado para este trabajo"
+msgstr "Progreso estimado para este trabajo"
msgctxt "help:project.work,timesheet_duration:"
msgid "Total time spent on this work and the sub-works"
-msgstr ""
+msgstr "Tiempo total gastado para este tarea y sub-tareas"
msgctxt "help:project.work,total_effort:"
msgid "Estimated total effort for this work and the sub-works"
msgstr "Esfuerzo total estimado para esta actividad y sus subactividades"
-#, fuzzy
msgctxt "help:project.work,total_progress:"
msgid "Estimated total progress for this work and the sub-works"
-msgstr "Esfuerzo total estimado para esta actividad y sus subactividades"
+msgstr "Progreso total estimado para esta tarea y sus sub-tareas"
msgctxt "model:ir.action,name:act_open_child_work"
msgid "Tasks"
@@ -246,7 +244,7 @@ msgstr "Tarea"
msgctxt "view:project.work:"
msgid "%"
-msgstr ""
+msgstr "%"
msgctxt "view:project.work:"
msgid "Children"
diff --git a/tryton.cfg b/tryton.cfg
index f9e61a6..58e4809 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
[tryton]
-version=4.0.0
+version=4.0.1
depends:
company_work_time
ir
diff --git a/trytond_project.egg-info/PKG-INFO b/trytond_project.egg-info/PKG-INFO
index 75ee4e4..69448a7 100644
--- a/trytond_project.egg-info/PKG-INFO
+++ b/trytond_project.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: trytond-project
-Version: 4.0.0
+Version: 4.0.1
Summary: Tryton module with projects
Home-page: http://www.tryton.org/
Author: Tryton
diff --git a/trytond_project.egg-info/SOURCES.txt b/trytond_project.egg-info/SOURCES.txt
index 53e625e..c842af9 100644
--- a/trytond_project.egg-info/SOURCES.txt
+++ b/trytond_project.egg-info/SOURCES.txt
@@ -27,11 +27,13 @@ work.xml
./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/pt_BR.po
./locale/ru_RU.po
./locale/sl_SI.po
+./locale/zh_CN.po
./tests/__init__.py
./tests/test_project.py
./view/work_form.xml
diff --git a/trytond_project.egg-info/requires.txt b/trytond_project.egg-info/requires.txt
index 39bb037..c89d339 100644
--- a/trytond_project.egg-info/requires.txt
+++ b/trytond_project.egg-info/requires.txt
@@ -2,4 +2,4 @@ python-sql >= 0.4
trytond_company_work_time >= 4.0, < 4.1
trytond_party >= 4.0, < 4.1
trytond_timesheet >= 4.0, < 4.1
-trytond >= 4.0, < 4.1
\ No newline at end of file
+trytond >= 4.0, < 4.1
commit 095bc3aab052dddcd5dd243581d440e022cfdc26
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Fri May 27 18:26:10 2016 +0200
Merging upstream version 4.0.0.
diff --git a/CHANGELOG b/CHANGELOG
index 21c0af1..3fd4af3 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,7 @@
+Version 4.0.0 - 2016-05-02
+* Bug fixes (see mercurial logs for details)
+* Add Python3 support
+
Version 3.8.0 - 2015-11-02
* Bug fixes (see mercurial logs for details)
* Add progress of work
diff --git a/COPYRIGHT b/COPYRIGHT
index dde6c87..60f26e4 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,5 +1,5 @@
-Copyright (C) 2008-2015 Cédric Krier.
-Copyright (C) 2008-2015 B2CK SPRL.
+Copyright (C) 2008-2016 Cédric Krier.
+Copyright (C) 2008-2016 B2CK SPRL.
Copyright (C) 2009-2013 Bertrand Chenal.
This program is free software: you can redistribute it and/or modify
diff --git a/PKG-INFO b/PKG-INFO
index f8b83e7..435f908 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,12 +1,12 @@
Metadata-Version: 1.1
Name: trytond_project
-Version: 3.8.0
+Version: 4.0.0
Summary: Tryton module with 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/3.8/
+Download-URL: http://downloads.tryton.org/4.0/
Description: trytond_project
===============
@@ -55,6 +55,7 @@ Classifier: Intended Audience :: Manufacturing
Classifier: License :: OSI Approved :: GNU General Public License (GPL)
Classifier: Natural Language :: Bulgarian
Classifier: Natural Language :: Catalan
+Classifier: Natural Language :: Chinese (Simplified)
Classifier: Natural Language :: Czech
Classifier: Natural Language :: Dutch
Classifier: Natural Language :: English
@@ -68,6 +69,9 @@ Classifier: Natural Language :: Slovenian
Classifier: Natural Language :: Spanish
Classifier: Operating System :: OS Independent
Classifier: Programming Language :: Python :: 2.7
+Classifier: Programming Language :: Python :: 3.3
+Classifier: Programming Language :: Python :: 3.4
+Classifier: Programming Language :: Python :: 3.5
Classifier: Programming Language :: Python :: Implementation :: CPython
Classifier: Programming Language :: Python :: Implementation :: PyPy
Classifier: Topic :: Office/Business
diff --git a/locale/bg_BG.po b/locale/bg_BG.po
index ff34c8f..dd396e9 100644
--- a/locale/bg_BG.po
+++ b/locale/bg_BG.po
@@ -53,7 +53,7 @@ msgstr ""
msgctxt "field:project.work,name:"
msgid "Name"
-msgstr ""
+msgstr "Име"
msgctxt "field:project.work,parent:"
msgid "Parent"
@@ -137,9 +137,10 @@ msgctxt "help:project.work,total_effort:"
msgid "Estimated total effort for this work and the sub-works"
msgstr "Предполагаеми общо усилия за тази задача и подзадачите"
+#, fuzzy
msgctxt "help:project.work,total_progress:"
msgid "Estimated total progress for this work and the sub-works"
-msgstr ""
+msgstr "Предполагаеми общо усилия за тази задача и подзадачите"
msgctxt "model:ir.action,name:act_open_child_work"
msgid "Tasks"
@@ -167,27 +168,27 @@ msgstr "Задачи"
msgctxt "model:ir.action.act_window.domain,name:act_project_form_done"
msgid "Done"
-msgstr ""
+msgstr "Приключен"
msgctxt "model:ir.action.act_window.domain,name:act_project_form_opened"
msgid "Opened"
-msgstr ""
+msgstr "Отворен"
msgctxt "model:ir.action.act_window.domain,name:act_project_tree_done"
msgid "Done"
-msgstr ""
+msgstr "Приключен"
msgctxt "model:ir.action.act_window.domain,name:act_project_tree_opened"
msgid "Opened"
-msgstr ""
+msgstr "Отворен"
msgctxt "model:ir.action.act_window.domain,name:act_task_form_done"
msgid "Done"
-msgstr ""
+msgstr "Приключен"
msgctxt "model:ir.action.act_window.domain,name:act_task_form_opened"
msgid "Opened"
-msgstr ""
+msgstr "Отворен"
msgctxt "model:ir.ui.menu,name:menu_configuration"
msgid "Configuration"
diff --git a/locale/ca_ES.po b/locale/ca_ES.po
index 78f277b..1acba9c 100644
--- a/locale/ca_ES.po
+++ b/locale/ca_ES.po
@@ -44,7 +44,7 @@ msgstr "Usuari creació"
msgctxt "field:project.work,effort_duration:"
msgid "Effort"
-msgstr "Temps"
+msgstr "Esforç"
msgctxt "field:project.work,id:"
msgid "ID"
@@ -100,7 +100,7 @@ msgstr "Temps"
msgctxt "field:project.work,total_effort:"
msgid "Total Effort"
-msgstr "Temps total"
+msgstr "Esforç total"
msgctxt "field:project.work,total_progress:"
msgid "Total Progress"
diff --git a/locale/de_DE.po b/locale/de_DE.po
index db0b6ee..c9baf83 100644
--- a/locale/de_DE.po
+++ b/locale/de_DE.po
@@ -123,10 +123,6 @@ msgctxt "field:project.work,write_uid:"
msgid "Write User"
msgstr "Letzte Änderung durch"
-msgctxt "field:timesheet.work,timesheet_lines:"
-msgid "Timesheet Lines"
-msgstr "Zeitpositionen"
-
msgctxt "help:project.work,effort_duration:"
msgid "Estimated Effort for this work"
msgstr "Geschätzter Zeitaufwand für diese Aufgabe"
diff --git a/locale/es_CO.po b/locale/es_CO.po
index 1c2cd34..d536144 100644
--- a/locale/es_CO.po
+++ b/locale/es_CO.po
@@ -56,7 +56,7 @@ msgstr ""
msgctxt "field:project.work,name:"
msgid "Name"
-msgstr ""
+msgstr "Nombre"
msgctxt "field:project.work,parent:"
msgid "Parent"
@@ -126,9 +126,10 @@ msgctxt "help:project.work,effort_duration:"
msgid "Estimated Effort for this work"
msgstr "Esfuerzo Estimado para este trabajo"
+#, fuzzy
msgctxt "help:project.work,progress:"
msgid "Estimated progress for this work"
-msgstr ""
+msgstr "Esfuerzo Estimado para este trabajo"
msgctxt "help:project.work,timesheet_duration:"
msgid "Total time spent on this work and the sub-works"
@@ -138,9 +139,10 @@ msgctxt "help:project.work,total_effort:"
msgid "Estimated total effort for this work and the sub-works"
msgstr "Esfuerzo total estimado para esta actividad y sus subactividades"
+#, fuzzy
msgctxt "help:project.work,total_progress:"
msgid "Estimated total progress for this work and the sub-works"
-msgstr ""
+msgstr "Esfuerzo total estimado para esta actividad y sus subactividades"
msgctxt "model:ir.action,name:act_open_child_work"
msgid "Tasks"
@@ -168,27 +170,27 @@ msgstr "Actividades"
msgctxt "model:ir.action.act_window.domain,name:act_project_form_done"
msgid "Done"
-msgstr ""
+msgstr "Hecho"
msgctxt "model:ir.action.act_window.domain,name:act_project_form_opened"
msgid "Opened"
-msgstr ""
+msgstr "Abierto"
msgctxt "model:ir.action.act_window.domain,name:act_project_tree_done"
msgid "Done"
-msgstr ""
+msgstr "Hecho"
msgctxt "model:ir.action.act_window.domain,name:act_project_tree_opened"
msgid "Opened"
-msgstr ""
+msgstr "Abierto"
msgctxt "model:ir.action.act_window.domain,name:act_task_form_done"
msgid "Done"
-msgstr ""
+msgstr "Hecho"
msgctxt "model:ir.action.act_window.domain,name:act_task_form_opened"
msgid "Opened"
-msgstr ""
+msgstr "Abierto"
msgctxt "model:ir.ui.menu,name:menu_configuration"
msgid "Configuration"
diff --git a/locale/es_MX.po b/locale/es_MX.po
index 9bb2a45..0b9306e 100644
--- a/locale/es_MX.po
+++ b/locale/es_MX.po
@@ -54,9 +54,10 @@ msgctxt "field:project.work,left:"
msgid "Left"
msgstr ""
+#, fuzzy
msgctxt "field:project.work,name:"
msgid "Name"
-msgstr ""
+msgstr "Nombre"
msgctxt "field:project.work,parent:"
msgid "Parent"
@@ -126,9 +127,10 @@ msgctxt "help:project.work,effort_duration:"
msgid "Estimated Effort for this work"
msgstr "Tiempo estimado para este trabajo."
+#, fuzzy
msgctxt "help:project.work,progress:"
msgid "Estimated progress for this work"
-msgstr ""
+msgstr "Tiempo estimado para este trabajo."
msgctxt "help:project.work,timesheet_duration:"
msgid "Total time spent on this work and the sub-works"
@@ -138,9 +140,10 @@ msgctxt "help:project.work,total_effort:"
msgid "Estimated total effort for this work and the sub-works"
msgstr "El esfuerzo total estimado para este trabajo y sus subtrabajos."
+#, fuzzy
msgctxt "help:project.work,total_progress:"
msgid "Estimated total progress for this work and the sub-works"
-msgstr ""
+msgstr "El esfuerzo total estimado para este trabajo y sus subtrabajos."
msgctxt "model:ir.action,name:act_open_child_work"
msgid "Tasks"
@@ -166,29 +169,35 @@ msgctxt "model:ir.action,name:act_work_tree"
msgid "Works Efforts"
msgstr "Proyectos y tareas"
+#, fuzzy
msgctxt "model:ir.action.act_window.domain,name:act_project_form_done"
msgid "Done"
-msgstr ""
+msgstr "Finalizado"
+#, fuzzy
msgctxt "model:ir.action.act_window.domain,name:act_project_form_opened"
msgid "Opened"
-msgstr ""
+msgstr "Abierto"
+#, fuzzy
msgctxt "model:ir.action.act_window.domain,name:act_project_tree_done"
msgid "Done"
-msgstr ""
+msgstr "Finalizado"
+#, fuzzy
msgctxt "model:ir.action.act_window.domain,name:act_project_tree_opened"
msgid "Opened"
-msgstr ""
+msgstr "Abierto"
+#, fuzzy
msgctxt "model:ir.action.act_window.domain,name:act_task_form_done"
msgid "Done"
-msgstr ""
+msgstr "Finalizado"
+#, fuzzy
msgctxt "model:ir.action.act_window.domain,name:act_task_form_opened"
msgid "Opened"
-msgstr ""
+msgstr "Abierto"
msgctxt "model:ir.ui.menu,name:menu_configuration"
msgid "Configuration"
@@ -246,14 +255,16 @@ msgctxt "view:project.work:"
msgid "%"
msgstr ""
+#, fuzzy
msgctxt "view:project.work:"
msgid "Children"
-msgstr ""
+msgstr "Hijos"
msgctxt "view:project.work:"
msgid "General"
msgstr ""
+#, fuzzy
msgctxt "view:project.work:"
msgid "Works Efforts"
-msgstr ""
+msgstr "Proyectos y tareas"
diff --git a/locale/nl_NL.po b/locale/lo_LA.po
similarity index 90%
copy from locale/nl_NL.po
copy to locale/lo_LA.po
index ada9c16..72799e6 100644
--- a/locale/nl_NL.po
+++ b/locale/lo_LA.po
@@ -18,20 +18,17 @@ msgid ""
"still opened."
msgstr ""
-#, fuzzy
msgctxt "field:project.work,children:"
msgid "Children"
-msgstr "Onderliggende niveaus"
+msgstr ""
-#, fuzzy
msgctxt "field:project.work,comment:"
msgid "Comment"
-msgstr "Opmerking"
+msgstr ""
-#, fuzzy
msgctxt "field:project.work,company:"
msgid "Company"
-msgstr "Bedrijf"
+msgstr ""
msgctxt "field:project.work,create_date:"
msgid "Create Date"
@@ -57,15 +54,13 @@ msgctxt "field:project.work,name:"
msgid "Name"
msgstr ""
-#, fuzzy
msgctxt "field:project.work,parent:"
msgid "Parent"
-msgstr "Bovenliggend niveau"
+msgstr ""
-#, fuzzy
msgctxt "field:project.work,party:"
msgid "Party"
-msgstr "Relaties"
+msgstr ""
msgctxt "field:project.work,party_address:"
msgid "Contact Address"
@@ -75,29 +70,25 @@ msgctxt "field:project.work,progress:"
msgid "Progress"
msgstr ""
-#, fuzzy
msgctxt "field:project.work,rec_name:"
msgid "Name"
-msgstr "Naam bijlage"
+msgstr ""
msgctxt "field:project.work,right:"
msgid "Right"
msgstr ""
-#, fuzzy
msgctxt "field:project.work,sequence:"
msgid "Sequence"
-msgstr "Reeks"
+msgstr ""
-#, fuzzy
msgctxt "field:project.work,state:"
msgid "State"
-msgstr "Status"
+msgstr ""
-#, fuzzy
msgctxt "field:project.work,timesheet_available:"
msgid "Available on timesheets"
-msgstr "Beschikbaar in tijdregistartie"
+msgstr ""
msgctxt "field:project.work,timesheet_duration:"
msgid "Duration"
@@ -111,15 +102,13 @@ msgctxt "field:project.work,total_progress:"
msgid "Total Progress"
msgstr ""
-#, fuzzy
msgctxt "field:project.work,type:"
msgid "Type"
-msgstr "Type"
+msgstr ""
-#, fuzzy
msgctxt "field:project.work,work:"
msgid "Work"
-msgstr "Werk"
+msgstr ""
msgctxt "field:project.work,write_date:"
msgid "Write Date"
@@ -197,10 +186,9 @@ msgctxt "model:ir.action.act_window.domain,name:act_task_form_opened"
msgid "Opened"
msgstr ""
-#, fuzzy
msgctxt "model:ir.ui.menu,name:menu_configuration"
msgid "Configuration"
-msgstr "Instellingen"
+msgstr ""
msgctxt "model:ir.ui.menu,name:menu_project"
msgid "Project"
@@ -234,15 +222,13 @@ msgctxt "model:res.group,name:group_project_admin"
msgid "Project Administration"
msgstr ""
-#, fuzzy
msgctxt "selection:project.work,state:"
msgid "Done"
-msgstr "Klaar"
+msgstr ""
-#, fuzzy
msgctxt "selection:project.work,state:"
msgid "Opened"
-msgstr "Geopend"
+msgstr ""
msgctxt "selection:project.work,type:"
msgid "Project"
@@ -256,15 +242,13 @@ msgctxt "view:project.work:"
msgid "%"
msgstr ""
-#, fuzzy
msgctxt "view:project.work:"
msgid "Children"
-msgstr "Onderliggende niveaus"
+msgstr ""
-#, fuzzy
msgctxt "view:project.work:"
msgid "General"
-msgstr "Algemeen"
+msgstr ""
msgctxt "view:project.work:"
msgid "Works Efforts"
diff --git a/locale/nl_NL.po b/locale/nl_NL.po
index ada9c16..56726b4 100644
--- a/locale/nl_NL.po
+++ b/locale/nl_NL.po
@@ -53,9 +53,10 @@ msgctxt "field:project.work,left:"
msgid "Left"
msgstr ""
+#, fuzzy
msgctxt "field:project.work,name:"
msgid "Name"
-msgstr ""
+msgstr "Naam bijlage"
#, fuzzy
msgctxt "field:project.work,parent:"
@@ -173,29 +174,35 @@ msgctxt "model:ir.action,name:act_work_tree"
msgid "Works Efforts"
msgstr ""
+#, fuzzy
msgctxt "model:ir.action.act_window.domain,name:act_project_form_done"
msgid "Done"
-msgstr ""
+msgstr "Klaar"
+#, fuzzy
msgctxt "model:ir.action.act_window.domain,name:act_project_form_opened"
msgid "Opened"
-msgstr ""
+msgstr "Geopend"
+#, fuzzy
msgctxt "model:ir.action.act_window.domain,name:act_project_tree_done"
msgid "Done"
-msgstr ""
+msgstr "Klaar"
+#, fuzzy
msgctxt "model:ir.action.act_window.domain,name:act_project_tree_opened"
msgid "Opened"
-msgstr ""
+msgstr "Geopend"
+#, fuzzy
msgctxt "model:ir.action.act_window.domain,name:act_task_form_done"
msgid "Done"
-msgstr ""
+msgstr "Klaar"
+#, fuzzy
msgctxt "model:ir.action.act_window.domain,name:act_task_form_opened"
msgid "Opened"
-msgstr ""
+msgstr "Geopend"
#, fuzzy
msgctxt "model:ir.ui.menu,name:menu_configuration"
diff --git a/locale/ru_RU.po b/locale/ru_RU.po
index 0f50490..ed0421e 100644
--- a/locale/ru_RU.po
+++ b/locale/ru_RU.po
@@ -52,7 +52,7 @@ msgstr ""
msgctxt "field:project.work,name:"
msgid "Name"
-msgstr ""
+msgstr "Наименование"
msgctxt "field:project.work,parent:"
msgid "Parent"
@@ -135,9 +135,10 @@ msgctxt "help:project.work,total_effort:"
msgid "Estimated total effort for this work and the sub-works"
msgstr "Предположительные общие затраты для этой работы и подчиненных работ"
+#, fuzzy
msgctxt "help:project.work,total_progress:"
msgid "Estimated total progress for this work and the sub-works"
-msgstr ""
+msgstr "Предположительные общие затраты для этой работы и подчиненных работ"
msgctxt "model:ir.action,name:act_open_child_work"
msgid "Tasks"
@@ -165,27 +166,27 @@ msgstr "Рабочие затраты"
msgctxt "model:ir.action.act_window.domain,name:act_project_form_done"
msgid "Done"
-msgstr ""
+msgstr "Выполнено"
msgctxt "model:ir.action.act_window.domain,name:act_project_form_opened"
msgid "Opened"
-msgstr ""
+msgstr "Открыт"
msgctxt "model:ir.action.act_window.domain,name:act_project_tree_done"
msgid "Done"
-msgstr ""
+msgstr "Выполнено"
msgctxt "model:ir.action.act_window.domain,name:act_project_tree_opened"
msgid "Opened"
-msgstr ""
+msgstr "Открыт"
msgctxt "model:ir.action.act_window.domain,name:act_task_form_done"
msgid "Done"
-msgstr ""
+msgstr "Выполнено"
msgctxt "model:ir.action.act_window.domain,name:act_task_form_opened"
msgid "Opened"
-msgstr ""
+msgstr "Открыт"
msgctxt "model:ir.ui.menu,name:menu_configuration"
msgid "Configuration"
diff --git a/locale/nl_NL.po b/locale/zh_CN.po
similarity index 90%
copy from locale/nl_NL.po
copy to locale/zh_CN.po
index ada9c16..72799e6 100644
--- a/locale/nl_NL.po
+++ b/locale/zh_CN.po
@@ -18,20 +18,17 @@ msgid ""
"still opened."
msgstr ""
-#, fuzzy
msgctxt "field:project.work,children:"
msgid "Children"
-msgstr "Onderliggende niveaus"
+msgstr ""
-#, fuzzy
msgctxt "field:project.work,comment:"
msgid "Comment"
-msgstr "Opmerking"
+msgstr ""
-#, fuzzy
msgctxt "field:project.work,company:"
msgid "Company"
-msgstr "Bedrijf"
+msgstr ""
msgctxt "field:project.work,create_date:"
msgid "Create Date"
@@ -57,15 +54,13 @@ msgctxt "field:project.work,name:"
msgid "Name"
msgstr ""
-#, fuzzy
msgctxt "field:project.work,parent:"
msgid "Parent"
-msgstr "Bovenliggend niveau"
+msgstr ""
-#, fuzzy
msgctxt "field:project.work,party:"
msgid "Party"
-msgstr "Relaties"
+msgstr ""
msgctxt "field:project.work,party_address:"
msgid "Contact Address"
@@ -75,29 +70,25 @@ msgctxt "field:project.work,progress:"
msgid "Progress"
msgstr ""
-#, fuzzy
msgctxt "field:project.work,rec_name:"
msgid "Name"
-msgstr "Naam bijlage"
+msgstr ""
msgctxt "field:project.work,right:"
msgid "Right"
msgstr ""
-#, fuzzy
msgctxt "field:project.work,sequence:"
msgid "Sequence"
-msgstr "Reeks"
+msgstr ""
-#, fuzzy
msgctxt "field:project.work,state:"
msgid "State"
-msgstr "Status"
+msgstr ""
-#, fuzzy
msgctxt "field:project.work,timesheet_available:"
msgid "Available on timesheets"
-msgstr "Beschikbaar in tijdregistartie"
+msgstr ""
msgctxt "field:project.work,timesheet_duration:"
msgid "Duration"
@@ -111,15 +102,13 @@ msgctxt "field:project.work,total_progress:"
msgid "Total Progress"
msgstr ""
-#, fuzzy
msgctxt "field:project.work,type:"
msgid "Type"
-msgstr "Type"
+msgstr ""
-#, fuzzy
msgctxt "field:project.work,work:"
msgid "Work"
-msgstr "Werk"
+msgstr ""
msgctxt "field:project.work,write_date:"
msgid "Write Date"
@@ -197,10 +186,9 @@ msgctxt "model:ir.action.act_window.domain,name:act_task_form_opened"
msgid "Opened"
msgstr ""
-#, fuzzy
msgctxt "model:ir.ui.menu,name:menu_configuration"
msgid "Configuration"
-msgstr "Instellingen"
+msgstr ""
msgctxt "model:ir.ui.menu,name:menu_project"
msgid "Project"
@@ -234,15 +222,13 @@ msgctxt "model:res.group,name:group_project_admin"
msgid "Project Administration"
msgstr ""
-#, fuzzy
msgctxt "selection:project.work,state:"
msgid "Done"
-msgstr "Klaar"
+msgstr ""
-#, fuzzy
msgctxt "selection:project.work,state:"
msgid "Opened"
-msgstr "Geopend"
+msgstr ""
msgctxt "selection:project.work,type:"
msgid "Project"
@@ -256,15 +242,13 @@ msgctxt "view:project.work:"
msgid "%"
msgstr ""
-#, fuzzy
msgctxt "view:project.work:"
msgid "Children"
-msgstr "Onderliggende niveaus"
+msgstr ""
-#, fuzzy
msgctxt "view:project.work:"
msgid "General"
-msgstr "Algemeen"
+msgstr ""
msgctxt "view:project.work:"
msgid "Works Efforts"
diff --git a/setup.py b/setup.py
index 96cbf8c..b6f7a92 100644
--- a/setup.py
+++ b/setup.py
@@ -5,11 +5,17 @@
from setuptools import setup
import re
import os
-import ConfigParser
+import io
+try:
+ from configparser import ConfigParser
+except ImportError:
+ from ConfigParser import ConfigParser
def read(fname):
- return open(os.path.join(os.path.dirname(__file__), fname)).read()
+ return io.open(
+ os.path.join(os.path.dirname(__file__), fname),
+ 'r', encoding='utf-8').read()
def get_require_version(name):
@@ -21,7 +27,7 @@ def get_require_version(name):
major_version, minor_version + 1)
return require
-config = ConfigParser.ConfigParser()
+config = ConfigParser()
config.readfp(open('tryton.cfg'))
info = dict(config.items('tryton'))
for key in ('depends', 'extras_depend', 'xml'):
@@ -43,7 +49,7 @@ if minor_version % 2:
requires = ['python-sql >= 0.4']
for dep in info.get('depends', []):
- if not re.match(r'(ir|res|webdav)(\W|$)', dep):
+ if not re.match(r'(ir|res)(\W|$)', dep):
requires.append(get_require_version('trytond_%s' % dep))
requires.append(get_require_version('trytond'))
@@ -76,6 +82,7 @@ setup(name=name,
'License :: OSI Approved :: GNU General Public License (GPL)',
'Natural Language :: Bulgarian',
'Natural Language :: Catalan',
+ 'Natural Language :: Chinese (Simplified)',
'Natural Language :: Czech',
'Natural Language :: Dutch',
'Natural Language :: English',
@@ -89,6 +96,9 @@ setup(name=name,
'Natural Language :: Spanish',
'Operating System :: OS Independent',
'Programming Language :: Python :: 2.7',
+ 'Programming Language :: Python :: 3.3',
+ 'Programming Language :: Python :: 3.4',
+ 'Programming Language :: Python :: 3.5',
'Programming Language :: Python :: Implementation :: CPython',
'Programming Language :: Python :: Implementation :: PyPy',
'Topic :: Office/Business',
@@ -102,4 +112,5 @@ setup(name=name,
""",
test_suite='tests',
test_loader='trytond.test_loader:Loader',
+ use_2to3=True,
)
diff --git a/tests/__init__.py b/tests/__init__.py
index 434b207..eb8c40f 100644
--- a/tests/__init__.py
+++ b/tests/__init__.py
@@ -1,6 +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.
-from .test_project import suite
+try:
+ from trytond.modules.project.tests.test_project import suite
+except ImportError:
+ from .test_project import suite
__all__ = ['suite']
diff --git a/tests/test_project.py b/tests/test_project.py
index 4644fe1..0be88ea 100644
--- a/tests/test_project.py
+++ b/tests/test_project.py
@@ -1,50 +1,45 @@
# 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 unittest
-import doctest
import datetime
import trytond.tests.test_tryton
-from trytond.tests.test_tryton import ModuleTestCase
-from trytond.tests.test_tryton import POOL, DB_NAME, USER, CONTEXT
-from trytond.transaction import Transaction
+from trytond.tests.test_tryton import ModuleTestCase, with_transaction
+from trytond.pool import Pool
+
+from trytond.modules.company.tests import create_company, set_company
class ProjectTestCase(ModuleTestCase):
'Test Project module'
module = 'project'
- def setUp(self):
- super(ProjectTestCase, self).setUp()
- trytond.tests.test_tryton.install_module('project')
- self.timesheet_work = POOL.get('timesheet.work')
- self.project_work = POOL.get('project.work')
- self.company = POOL.get('company.company')
-
- def test0010sum_tree(self):
+ @with_transaction()
+ def test_sum_tree(self):
'Test sum_tree'
- with Transaction().start(DB_NAME, USER, context=CONTEXT):
- company, = self.company.search([
- ('rec_name', '=', 'Dunder Mifflin'),
- ])
+ pool = Pool()
+ TimesheetWork = pool.get('timesheet.work')
+ ProjectWork = pool.get('project.work')
- t_work_1, = self.timesheet_work.create([{
+ company = create_company()
+ with set_company(company):
+ t_work_1, = TimesheetWork.create([{
'name': 'Work 1',
'company': company.id,
}])
- p_work_1, = self.project_work.create([{
+ p_work_1, = ProjectWork.create([{
'name': 'Work 1',
'company': company.id,
'work': t_work_1.id,
'effort_duration': datetime.timedelta(hours=1),
}])
- t_work_1_1, = self.timesheet_work.create([{
+ t_work_1_1, = TimesheetWork.create([{
'name': 'Work 1 1',
'company': company.id,
'parent': t_work_1.id,
}])
- p_work_1_1, = self.project_work.create([{
+ p_work_1_1, = ProjectWork.create([{
'name': 'Work 1 1',
'company': company.id,
'parent': p_work_1.id,
@@ -52,12 +47,12 @@ class ProjectTestCase(ModuleTestCase):
'effort_duration': datetime.timedelta(hours=1),
}])
- t_work_1_2, = self.timesheet_work.create([{
+ t_work_1_2, = TimesheetWork.create([{
'name': 'Work 1 1',
'company': company.id,
'parent': t_work_1.id,
}])
- p_work_1_2, = self.project_work.create([{
+ p_work_1_2, = ProjectWork.create([{
'name': 'Work 1 2',
'company': company.id,
'parent': p_work_1.id,
@@ -65,12 +60,12 @@ class ProjectTestCase(ModuleTestCase):
'effort_duration': datetime.timedelta(hours=1),
}])
- t_work_1_1_1, = self.timesheet_work.create([{
+ t_work_1_1_1, = TimesheetWork.create([{
'name': 'Work 1 1 1',
'company': company.id,
'parent': t_work_1_1.id,
}])
- p_work_1_1_1, = self.project_work.create([{
+ p_work_1_1_1, = ProjectWork.create([{
'name': 'Work 1 1 1',
'company': company.id,
'parent': p_work_1_1.id,
@@ -78,12 +73,12 @@ class ProjectTestCase(ModuleTestCase):
'effort_duration': datetime.timedelta(hours=1),
}])
- t_work_1_1_2, = self.timesheet_work.create([{
+ t_work_1_1_2, = TimesheetWork.create([{
'name': 'Work 1 1 2',
'company': company.id,
'parent': t_work_1_1.id,
}])
- p_work_1_1_2, = self.project_work.create([{
+ p_work_1_1_2, = ProjectWork.create([{
'name': 'Work 1 1 2',
'company': company.id,
'parent': p_work_1_1.id,
@@ -91,12 +86,12 @@ class ProjectTestCase(ModuleTestCase):
'effort_duration': datetime.timedelta(hours=1),
}])
- t_work_1_1_3, = self.timesheet_work.create([{
+ t_work_1_1_3, = TimesheetWork.create([{
'name': 'Work 1 1 3',
'company': company.id,
'parent': t_work_1_1.id,
}])
- p_work_1_1_3, = self.project_work.create([{
+ p_work_1_1_3, = ProjectWork.create([{
'name': 'Work 1 1 3',
'company': company.id,
'parent': p_work_1_1.id,
@@ -118,10 +113,6 @@ class ProjectTestCase(ModuleTestCase):
def suite():
suite = trytond.tests.test_tryton.suite()
- from trytond.modules.company.tests import test_company
- for test in test_company.suite():
- if test not in suite and not isinstance(test, doctest.DocTestCase):
- suite.addTest(test)
suite.addTests(unittest.TestLoader().loadTestsFromTestCase(
ProjectTestCase))
return suite
diff --git a/tryton.cfg b/tryton.cfg
index dcf76f4..f9e61a6 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
[tryton]
-version=3.8.0
+version=4.0.0
depends:
company_work_time
ir
diff --git a/trytond_project.egg-info/PKG-INFO b/trytond_project.egg-info/PKG-INFO
index 001b9b5..75ee4e4 100644
--- a/trytond_project.egg-info/PKG-INFO
+++ b/trytond_project.egg-info/PKG-INFO
@@ -1,12 +1,12 @@
Metadata-Version: 1.1
Name: trytond-project
-Version: 3.8.0
+Version: 4.0.0
Summary: Tryton module with 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/3.8/
+Download-URL: http://downloads.tryton.org/4.0/
Description: trytond_project
===============
@@ -55,6 +55,7 @@ Classifier: Intended Audience :: Manufacturing
Classifier: License :: OSI Approved :: GNU General Public License (GPL)
Classifier: Natural Language :: Bulgarian
Classifier: Natural Language :: Catalan
+Classifier: Natural Language :: Chinese (Simplified)
Classifier: Natural Language :: Czech
Classifier: Natural Language :: Dutch
Classifier: Natural Language :: English
@@ -68,6 +69,9 @@ Classifier: Natural Language :: Slovenian
Classifier: Natural Language :: Spanish
Classifier: Operating System :: OS Independent
Classifier: Programming Language :: Python :: 2.7
+Classifier: Programming Language :: Python :: 3.3
+Classifier: Programming Language :: Python :: 3.4
+Classifier: Programming Language :: Python :: 3.5
Classifier: Programming Language :: Python :: Implementation :: CPython
Classifier: Programming Language :: Python :: Implementation :: PyPy
Classifier: Topic :: Office/Business
diff --git a/trytond_project.egg-info/SOURCES.txt b/trytond_project.egg-info/SOURCES.txt
index 574a995..53e625e 100644
--- a/trytond_project.egg-info/SOURCES.txt
+++ b/trytond_project.egg-info/SOURCES.txt
@@ -55,11 +55,13 @@ locale/fr_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/pt_BR.po
locale/ru_RU.po
locale/sl_SI.po
+locale/zh_CN.po
trytond_project.egg-info/PKG-INFO
trytond_project.egg-info/SOURCES.txt
trytond_project.egg-info/dependency_links.txt
diff --git a/trytond_project.egg-info/requires.txt b/trytond_project.egg-info/requires.txt
index 6201d74..39bb037 100644
--- a/trytond_project.egg-info/requires.txt
+++ b/trytond_project.egg-info/requires.txt
@@ -1,5 +1,5 @@
python-sql >= 0.4
-trytond_company_work_time >= 3.8, < 3.9
-trytond_party >= 3.8, < 3.9
-trytond_timesheet >= 3.8, < 3.9
-trytond >= 3.8, < 3.9
\ No newline at end of file
+trytond_company_work_time >= 4.0, < 4.1
+trytond_party >= 4.0, < 4.1
+trytond_timesheet >= 4.0, < 4.1
+trytond >= 4.0, < 4.1
\ No newline at end of file
diff --git a/work.py b/work.py
index 483e8d8..49bd333 100644
--- a/work.py
+++ b/work.py
@@ -71,6 +71,7 @@ class Work(ModelSQL, ModelView):
depends=['type'],
help='Estimated progress for this work')
total_progress = fields.Function(fields.Float('Total Progress',
+ digits=(16, 4),
help='Estimated total progress for this work and the sub-works',
states={
'invisible': Eval('total_progress', None) == None,
@@ -125,9 +126,9 @@ class Work(ModelSQL, ModelView):
def __register__(cls, module_name):
TimesheetWork = Pool().get('timesheet.work')
TableHandler = backend.get('TableHandler')
- cursor = Transaction().cursor
- table_project_work = TableHandler(cursor, cls, module_name)
- table_timesheet_work = TableHandler(cursor, TimesheetWork, module_name)
+ cursor = Transaction().connection.cursor()
+ table_project_work = TableHandler(cls, module_name)
+ table_timesheet_work = TableHandler(TimesheetWork, module_name)
project = cls.__table__()
timesheet = TimesheetWork.__table__()
@@ -283,10 +284,6 @@ class Work(ModelSQL, ModelView):
def on_change_with_company(self, name=None):
return self.work.company.id if self.work else None
- @classmethod
- def search_comany(cls, name, clause):
- return [('work.company',) + tuple(clause[1:])]
-
@fields.depends('work')
def on_change_with_timesheet_available(self, name=None):
return self.work.timesheet_available if self.work else None
@@ -314,7 +311,7 @@ class Work(ModelSQL, ModelView):
@classmethod
def get_total(cls, works, names):
- cursor = Transaction().cursor
+ cursor = Transaction().connection.cursor()
table = cls.__table__()
works = cls.search([
@@ -338,12 +335,14 @@ class Work(ModelSQL, ModelView):
result[name] = cls.sum_tree(works, values, parents)
if 'total_progress' in names:
+ digits = cls.total_progress.digits[1]
total_progress = result['total_progress']
total_effort = result['total_effort']
for work in works:
if total_effort[work.id]:
- total_progress[work.id] /= (
- total_effort[work.id].total_seconds() / 60 / 60)
+ total_progress[work.id] = round(total_progress[work.id] /
+ (total_effort[work.id].total_seconds() / 60 / 60),
+ digits)
else:
total_effort[work.id] = None
return result
--
tryton-modules-project
More information about the tryton-debian-vcs
mailing list