[tryton-debian-vcs] tryton-modules-project branch debian created. 79d9878d99f37e56556e20482a75cc68f17ec39c
Mathias Behrle
tryton-debian-vcs at alioth.debian.org
Wed Nov 27 17:06:37 UTC 2013
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=79d9878d99f37e56556e20482a75cc68f17ec39c
commit 79d9878d99f37e56556e20482a75cc68f17ec39c
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Mon Nov 25 20:30:21 2013 +0100
Releasing debian version 3.0.0-1.
diff --git a/debian/changelog b/debian/changelog
index 55f60f8..bc73df9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+tryton-modules-project (3.0.0-1) unstable; urgency=low
+
+ * Removing inadvertently commited .pc directory.
+ * Merging upstream version 3.0.0.
+ * Updating to standards version 3.9.5, no changes needed.
+ * Changing to buildsystem pybuild.
+
+ -- Mathias Behrle <mathiasb at m9s.biz> Mon, 25 Nov 2013 17:54:45 +0100
+
tryton-modules-project (2.8.1-1) unstable; urgency=low
* Merging upstream version 2.8.1.
commit bb1153e901786d66fdbc9ee353c9214fdecb00ec
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Sun Nov 24 19:51:51 2013 +0100
Changing to buildsystem pybuild.
diff --git a/debian/control b/debian/control
index b3de941..0ffd5d2 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,8 @@ Section: python
Priority: optional
Maintainer: Debian Tryton Maintainers <maintainers at debian.tryton.org>
Uploaders: Mathias Behrle <mathiasb at m9s.biz>
-Build-Depends: debhelper (>= 9), python (>= 2.6.6-3~), python-setuptools
+Build-Depends:
+ debhelper (>= 9), python (>= 2.6.6-3~), python-setuptools, dh-python
Standards-Version: 3.9.5
Homepage: http://www.tryton.org/
Vcs-Browser: http://debian.tryton.org/gitweb/?p=packages/tryton-modules-project.git
diff --git a/debian/rules b/debian/rules
index 30074ad..5b8c326 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,24 +1,17 @@
#!/usr/bin/make -f
-MAJOR := $(shell python setup.py --version | awk -F "." '{print $$1 "." $$2}')
-PACKAGE_NAME := $(shell python setup.py --name)
-
-%:
- dh ${@} --with python2
+# needed for pbuilder
+export LC_ALL=C.UTF-8
-override_dh_auto_clean:
- dh_auto_clean
+MAJOR := $(shell python setup.py --version | awk -F "." '{print $$1 "." $$2}')
+PACKAGE_NAME := tryton-modules-$(shell python setup.py --name | sed s/^trytond_// | sed s/_/-/g)
+export PYBUILD_DESTDIR_python2=debian/${PACKAGE_NAME}
-override_dh_auto_build:
- mv $(PACKAGE_NAME).egg-info $(PACKAGE_NAME).hen-info
- mv PKG-INFO PKG-INFO.hen
- dh_auto_build
+# Don't run tests for Tryton modules, they try to download dependencies from pypi
+export PYBUILD_DISABLE_python2.7=test
-override_dh_auto_install:
- dh_auto_install
- rm -rf *.egg-info
- mv $(PACKAGE_NAME).hen-info $(PACKAGE_NAME).egg-info
- mv PKG-INFO.hen PKG-INFO
+%:
+ dh ${@} --with python2 --buildsystem=pybuild
override_dh_gencontrol:
dh_gencontrol -- -Vversion:major="$(MAJOR)"
commit ddcc66cfb923f48c490aba3754825283cf3821c2
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Sun Nov 24 19:14:21 2013 +0100
Updating to standards version 3.9.5, no changes needed.
diff --git a/debian/control b/debian/control
index 699446e..b3de941 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: optional
Maintainer: Debian Tryton Maintainers <maintainers at debian.tryton.org>
Uploaders: Mathias Behrle <mathiasb at m9s.biz>
Build-Depends: debhelper (>= 9), python (>= 2.6.6-3~), python-setuptools
-Standards-Version: 3.9.4
+Standards-Version: 3.9.5
Homepage: http://www.tryton.org/
Vcs-Browser: http://debian.tryton.org/gitweb/?p=packages/tryton-modules-project.git
Vcs-Git: git://debian.tryton.org/packages/tryton-modules-project.git
commit e1c36efdabfd043fba2945cbe08d47809177cacb
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Sun Nov 24 17:27:46 2013 +0100
Merging upstream version 3.0.0.
diff --git a/CHANGELOG b/CHANGELOG
index 9eefc80..19b3011 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,4 +1,4 @@
-Version 2.8.1 - 2013-10-01
+Version 3.0.0 - 2013-10-21
* Bug fixes (see mercurial logs for details)
Version 2.8.0 - 2013-04-22
diff --git a/PKG-INFO b/PKG-INFO
index 8ad491d..6ef37f4 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,12 +1,12 @@
Metadata-Version: 1.1
Name: trytond_project
-Version: 2.8.1
+Version: 3.0.0
Summary: Tryton module with projects
Home-page: http://www.tryton.org/
Author: Tryton
Author-email: UNKNOWN
License: GPL-3
-Download-URL: http://downloads.tryton.org/2.8/
+Download-URL: http://downloads.tryton.org/3.0/
Description: trytond_project
===============
@@ -60,6 +60,7 @@ Classifier: Natural Language :: English
Classifier: Natural Language :: French
Classifier: Natural Language :: German
Classifier: Natural Language :: Russian
+Classifier: Natural Language :: Slovenian
Classifier: Natural Language :: Spanish
Classifier: Operating System :: OS Independent
Classifier: Programming Language :: Python :: 2.6
diff --git a/locale/bg_BG.po b/locale/bg_BG.po
index fac5086..d8e0b3a 100644
--- a/locale/bg_BG.po
+++ b/locale/bg_BG.po
@@ -9,13 +9,13 @@ msgstr ""
msgctxt "error:project.work:"
msgid ""
"Work \"%(child)s\" can not be opened because its parent work \"%(parent)s\" "
-"is already done.\""
+"is already done."
msgstr ""
msgctxt "error:project.work:"
msgid ""
"Work \"%(parent)s\" can not be done because its child work \"%(child)s\" is "
-"still opened.\""
+"still opened."
msgstr ""
#, fuzzy
diff --git a/locale/ca_ES.po b/locale/ca_ES.po
index 6ea5161..25bfcd4 100644
--- a/locale/ca_ES.po
+++ b/locale/ca_ES.po
@@ -9,18 +9,18 @@ msgstr "Hi ha d'haver només un part d'hores de treball per tasca/projecte."
msgctxt "error:project.work:"
msgid ""
"Work \"%(child)s\" can not be opened because its parent work \"%(parent)s\" "
-"is already done.\""
+"is already done."
msgstr ""
-"El treball \"%(child)s\" no es pot obrir perque el treball pare "
-"\"%(parent)s\" ja està marcat com acabat."
+"El treball \"%(child)s\" no es pot obrir perquè el treball pare "
+"\"%(parent)s\" ja està realitzat."
msgctxt "error:project.work:"
msgid ""
"Work \"%(parent)s\" can not be done because its child work \"%(child)s\" is "
-"still opened.\""
+"still opened."
msgstr ""
-"El treball \"%(parent)s\" no es pot marcar com acabat perque el treball fill"
-" \"%(child)s\" continua estant obert."
+"El treball \"%(parent)s\" no es pot finalitzar perquè el treball fill "
+"\"%(child)s\" encara està obert."
msgctxt "field:project.work,active:"
msgid "Active"
diff --git a/locale/cs_CZ.po b/locale/cs_CZ.po
index e88af28..aaf9959 100644
--- a/locale/cs_CZ.po
+++ b/locale/cs_CZ.po
@@ -9,13 +9,13 @@ msgstr ""
msgctxt "error:project.work:"
msgid ""
"Work \"%(child)s\" can not be opened because its parent work \"%(parent)s\" "
-"is already done.\""
+"is already done."
msgstr ""
msgctxt "error:project.work:"
msgid ""
"Work \"%(parent)s\" can not be done because its child work \"%(child)s\" is "
-"still opened.\""
+"still opened."
msgstr ""
msgctxt "field:project.work,active:"
diff --git a/locale/de_DE.po b/locale/de_DE.po
index b1e98be..b9a9ce4 100644
--- a/locale/de_DE.po
+++ b/locale/de_DE.po
@@ -10,18 +10,18 @@ msgstr ""
msgctxt "error:project.work:"
msgid ""
"Work \"%(child)s\" can not be opened because its parent work \"%(parent)s\" "
-"is already done.\""
+"is already done."
msgstr ""
-"Aufgabe \"%(child)s\" kann nicht auf Offen gesetzt werden, weil die "
-"übergeordnete Arbeit \"%(parent)s\" bereits erledigt ist."
+"Die Aufgabe \"%(child)s\" kann nicht auf 'Offen' gesetzt werden, weil die "
+"übergeordnete Aufgabe \"%(parent)s\" erledigt ist."
msgctxt "error:project.work:"
msgid ""
"Work \"%(parent)s\" can not be done because its child work \"%(child)s\" is "
-"still opened.\""
+"still opened."
msgstr ""
-"Arbeit \"%(parent)s\" kann nicht auf Erledigt gesetzt werden, weil die "
-"untergeordnete Arbeit \"%(child)s\" noch geöffnet ist."
+"Aufgabe \"%(parent)s\" kann nicht auf 'Erledigt' gesetzt werden, weil die "
+"untergeordnete Aufgabe \"%(child)s\" noch geöffnet ist."
msgctxt "field:project.work,active:"
msgid "Active"
diff --git a/locale/es_AR.po b/locale/es_AR.po
index 8f0c88d..3c4a71e 100644
--- a/locale/es_AR.po
+++ b/locale/es_AR.po
@@ -9,18 +9,18 @@ msgstr "Debe haber sólo un parte de horas de trabajo por tarea/proyecto."
msgctxt "error:project.work:"
msgid ""
"Work \"%(child)s\" can not be opened because its parent work \"%(parent)s\" "
-"is already done.\""
+"is already done."
msgstr ""
"El trabajo «%(child)s» no se puede abrir porque el trabajo padre "
-"«%(parent)s» ya está marcado como terminado."
+"«%(parent)s» ya está realizado."
msgctxt "error:project.work:"
msgid ""
"Work \"%(parent)s\" can not be done because its child work \"%(child)s\" is "
-"still opened.\""
+"still opened."
msgstr ""
-"El trabajo «%(parent)s» no se puede marcar como acabado porque el trabajo "
-"hijo «%(child)s» continua estando abierto."
+"El trabajo «%(parent)s» no se puede finalizar porque el trabajo hijo "
+"«%(child)s» todavÃa se encuentra abierto."
msgctxt "field:project.work,active:"
msgid "Active"
diff --git a/locale/es_CO.po b/locale/es_CO.po
index 183f3d8..0ca41fd 100644
--- a/locale/es_CO.po
+++ b/locale/es_CO.po
@@ -9,18 +9,18 @@ msgstr "Solo deberÃa haber una hoja de registro de tiempo por tarea/proyecto."
msgctxt "error:project.work:"
msgid ""
"Work \"%(child)s\" can not be opened because its parent work \"%(parent)s\" "
-"is already done.\""
+"is already done."
msgstr ""
-"Las actividades \"%(child)s\" no pueden ser abiertas porque su actividad "
-"padre \"%(parent)s\" ya ha sido hecha."
+"La tarea \"%(child)s\" no puede ser abierta porque su tarea padre "
+"\"%(parent)s\" esta actualmente hecho."
msgctxt "error:project.work:"
msgid ""
"Work \"%(parent)s\" can not be done because its child work \"%(child)s\" is "
-"still opened.\""
+"still opened."
msgstr ""
-"La actividad \"%(parent)s\" no puede realizarse porque la actividad hija "
-"\"%(child)s\" esta abierta todavÃa."
+"La tarea \"%(parent)s\" no puede ser hecho porque su tarea hijo "
+"\"%(child)s\" esta todavÃa abierto."
msgctxt "field:project.work,active:"
msgid "Active"
@@ -52,7 +52,7 @@ msgstr "Esfuerzo"
msgctxt "field:project.work,hours:"
msgid "Timesheet Hours"
-msgstr "Horas de Registro de Tiempo"
+msgstr "Registro de Horas"
msgctxt "field:project.work,id:"
msgid "ID"
@@ -96,7 +96,7 @@ msgstr "Tipo"
msgctxt "field:project.work,work:"
msgid "Work"
-msgstr "Actividad"
+msgstr "Tarea"
msgctxt "field:project.work,write_date:"
msgid "Write Date"
@@ -112,11 +112,11 @@ msgstr "Lineas de Registro de Tiempo"
msgctxt "help:project.work,effort:"
msgid "Estimated Effort for this work"
-msgstr "El esfuerzo estimado para esta actividad"
+msgstr "El esfuerzo estimado para esta tarea"
msgctxt "help:project.work,hours:"
msgid "Total time spent on this work"
-msgstr "Tiempo total gastado en este trabajo"
+msgstr "Tiempo total gastado en esta tarea"
msgctxt "help:project.work,total_effort:"
msgid "Estimated total effort for this work and the sub-works"
@@ -152,7 +152,7 @@ msgstr "Configuración"
msgctxt "model:ir.ui.menu,name:menu_project"
msgid "Project"
-msgstr "Proyectos"
+msgstr "Gestión de Proyectos"
msgctxt "model:ir.ui.menu,name:menu_project_form"
msgid "Projects"
@@ -172,7 +172,7 @@ msgstr "Actividades"
msgctxt "model:ir.ui.menu,name:menu_work_tree"
msgid "Works Efforts"
-msgstr "Actividades"
+msgstr "Tareas"
msgctxt "model:project.work,name:"
msgid "Work Effort"
@@ -180,7 +180,7 @@ msgstr "Actividades"
msgctxt "model:res.group,name:group_project_admin"
msgid "Project Administration"
-msgstr "Administración Proyecto"
+msgstr "Administración de Proyecto"
msgctxt "selection:project.work,state:"
msgid "Done"
diff --git a/locale/es_ES.po b/locale/es_ES.po
index 10c7708..6114e70 100644
--- a/locale/es_ES.po
+++ b/locale/es_ES.po
@@ -9,18 +9,18 @@ msgstr "Debe haber sólo un parte de horas de trabajo por tarea/proyecto."
msgctxt "error:project.work:"
msgid ""
"Work \"%(child)s\" can not be opened because its parent work \"%(parent)s\" "
-"is already done.\""
+"is already done."
msgstr ""
-"El trabajo \"%(child)s\" no se puede abrir porque el trabajo padre "
-"\"%(parent)s\" ya está marcado como terminado."
+"El trabajo \"%(child)s\" no puede abrir porque el trabajo padre "
+"\"%(parent)s\" ya está realizado."
msgctxt "error:project.work:"
msgid ""
"Work \"%(parent)s\" can not be done because its child work \"%(child)s\" is "
-"still opened.\""
+"still opened."
msgstr ""
-"El trabajo \"%(parent)s\" no se puede marcar como acabado porque el trabajo "
-"hijo \"%(child)s\" continua estando abierto."
+"El trabajo \"%(parent)s\" no puede finalizar porque el trabajo hijo "
+"\"%(child)s\" todavÃa se encuentra abierto."
msgctxt "field:project.work,active:"
msgid "Active"
diff --git a/locale/fr_FR.po b/locale/fr_FR.po
index 3025d37..d4b2e7c 100644
--- a/locale/fr_FR.po
+++ b/locale/fr_FR.po
@@ -9,18 +9,18 @@ msgstr "Il ne doit y avoir qu'une feuille de présence par tâche/projet."
msgctxt "error:project.work:"
msgid ""
"Work \"%(child)s\" can not be opened because its parent work \"%(parent)s\" "
-"is already done.\""
+"is already done."
msgstr ""
-"Le travail \"%(child)s\" ne peut être ouvert car son traval parent "
-"\"%(parent)s\" est terminé."
+"Le travail \"%(child)s\" ne peut pas être ouvert parce que son travail "
+"parent \"%(parent)s\" est déjà fait."
msgctxt "error:project.work:"
msgid ""
"Work \"%(parent)s\" can not be done because its child work \"%(child)s\" is "
-"still opened.\""
+"still opened."
msgstr ""
-"Le travail \"%(parent)s\" ne peut pas être completé car le travail enfant "
-"\"%(child)s\" est toujours ouvert."
+"Le travail \"%(parent)s\" ne peut pas étre dans l'état \"Fait\" parce que "
+"son travail enfant \"%(child)s\" est toujours ouvert."
msgctxt "field:project.work,active:"
msgid "Active"
@@ -52,7 +52,7 @@ msgstr "Effort"
msgctxt "field:project.work,hours:"
msgid "Timesheet Hours"
-msgstr "Heures"
+msgstr "Heures de présence"
msgctxt "field:project.work,id:"
msgid "ID"
@@ -112,15 +112,15 @@ msgstr "Lignes de feuille de présence"
msgctxt "help:project.work,effort:"
msgid "Estimated Effort for this work"
-msgstr "Effort estimé pour cette activité"
+msgstr "Effort estimé pour ce travail"
msgctxt "help:project.work,hours:"
msgid "Total time spent on this work"
-msgstr "Temps total passé sur cette activité"
+msgstr "Temps total passé sur ce travail"
msgctxt "help:project.work,total_effort:"
msgid "Estimated total effort for this work and the sub-works"
-msgstr "Effort total estimé pour cette activité et ses sous-activités"
+msgstr "Effort total estimé pour ce travail et ses sous-travaux"
msgctxt "model:ir.action,name:act_open_child_work"
msgid "Tasks"
@@ -176,7 +176,7 @@ msgstr "Efforts de travail"
msgctxt "model:project.work,name:"
msgid "Work Effort"
-msgstr "Tâche"
+msgstr "Effort de travail"
msgctxt "model:res.group,name:group_project_admin"
msgid "Project Administration"
@@ -187,14 +187,6 @@ msgid "Done"
msgstr "Fait"
msgctxt "selection:project.work,state:"
-msgid "Done"
-msgstr "Fait"
-
-msgctxt "selection:project.work,state:"
-msgid "Opened"
-msgstr "Ouvert"
-
-msgctxt "selection:project.work,state:"
msgid "Opened"
msgstr "Ouvert"
@@ -203,14 +195,6 @@ msgid "Project"
msgstr "Projet"
msgctxt "selection:project.work,type:"
-msgid "Project"
-msgstr "Projet"
-
-msgctxt "selection:project.work,type:"
-msgid "Task"
-msgstr "Tâche"
-
-msgctxt "selection:project.work,type:"
msgid "Task"
msgstr "Tâche"
@@ -219,14 +203,6 @@ msgid "Children"
msgstr "Enfants"
msgctxt "view:project.work:"
-msgid "Children"
-msgstr "Enfants"
-
-msgctxt "view:project.work:"
-msgid "General"
-msgstr "General"
-
-msgctxt "view:project.work:"
msgid "General"
msgstr "General"
@@ -235,13 +211,5 @@ msgid "Tasks"
msgstr "Tâche"
msgctxt "view:project.work:"
-msgid "Tasks"
-msgstr "Tâche"
-
-msgctxt "view:project.work:"
-msgid "Works Efforts"
-msgstr "Efforts de travail"
-
-msgctxt "view:project.work:"
msgid "Works Efforts"
msgstr "Efforts de travail"
diff --git a/locale/nl_NL.po b/locale/nl_NL.po
index de39548..4a6c475 100644
--- a/locale/nl_NL.po
+++ b/locale/nl_NL.po
@@ -9,13 +9,13 @@ msgstr ""
msgctxt "error:project.work:"
msgid ""
"Work \"%(child)s\" can not be opened because its parent work \"%(parent)s\" "
-"is already done.\""
+"is already done."
msgstr ""
msgctxt "error:project.work:"
msgid ""
"Work \"%(parent)s\" can not be done because its child work \"%(child)s\" is "
-"still opened.\""
+"still opened."
msgstr ""
#, fuzzy
diff --git a/locale/ru_RU.po b/locale/ru_RU.po
index 6247a78..f508a52 100644
--- a/locale/ru_RU.po
+++ b/locale/ru_RU.po
@@ -9,18 +9,14 @@ msgstr "Должен быть только один рабочий табель
msgctxt "error:project.work:"
msgid ""
"Work \"%(child)s\" can not be opened because its parent work \"%(parent)s\" "
-"is already done.\""
+"is already done."
msgstr ""
-"Работа \"%(child)s\" не может быть открыта так как её предок \"%(parent)s\" "
-"уже выполнен."
msgctxt "error:project.work:"
msgid ""
"Work \"%(parent)s\" can not be done because its child work \"%(child)s\" is "
-"still opened.\""
+"still opened."
msgstr ""
-"Работа \"%(parent)s\" не может быть завершена так как её Ð¿Ð¾Ð´Ñ‡Ð¸Ð½ÐµÐ½Ð½Ð°Ñ Ñ€Ð°Ð±Ð¾Ñ‚Ð° "
-"\"%(child)s\" вÑÑ‘ ещё открыты."
msgctxt "field:project.work,active:"
msgid "Active"
diff --git a/locale/cs_CZ.po b/locale/sl_SI.po
similarity index 72%
copy from locale/cs_CZ.po
copy to locale/sl_SI.po
index e88af28..fe5df19 100644
--- a/locale/cs_CZ.po
+++ b/locale/sl_SI.po
@@ -4,204 +4,208 @@ msgstr "Content-Type: text/plain; charset=utf-8\n"
msgctxt "error:project.work:"
msgid "There should be only one timesheet work by task/project."
-msgstr ""
+msgstr "Na nalogo/projekt je možna samo ena evidentirana dejavnost."
msgctxt "error:project.work:"
msgid ""
"Work \"%(child)s\" can not be opened because its parent work \"%(parent)s\" "
-"is already done.\""
+"is already done."
msgstr ""
+"Dejavnosti \"%(child)s\" ni možno odpreti, ker je njena matiÄna dejavnost "
+"\"%(parent)s\" že zaprta."
msgctxt "error:project.work:"
msgid ""
"Work \"%(parent)s\" can not be done because its child work \"%(child)s\" is "
-"still opened.\""
+"still opened."
msgstr ""
+"Dejavnosti \"%(parent)s\" ni možno zakljuÄiti zaradi njenih Å¡e odprtih "
+"poddejavnosti \"%(child)s\"."
msgctxt "field:project.work,active:"
msgid "Active"
-msgstr ""
+msgstr "Aktivno"
msgctxt "field:project.work,children:"
msgid "Children"
-msgstr ""
+msgstr "Poddejavnosti"
msgctxt "field:project.work,comment:"
msgid "Comment"
-msgstr ""
+msgstr "Opomba"
msgctxt "field:project.work,company:"
msgid "Company"
-msgstr ""
+msgstr "Podjetje"
msgctxt "field:project.work,create_date:"
msgid "Create Date"
-msgstr ""
+msgstr "Ustvarjeno"
msgctxt "field:project.work,create_uid:"
msgid "Create User"
-msgstr ""
+msgstr "Ustvaril"
msgctxt "field:project.work,effort:"
msgid "Effort"
-msgstr ""
+msgstr "Ocena"
msgctxt "field:project.work,hours:"
msgid "Timesheet Hours"
-msgstr ""
+msgstr "Dejanske ure"
msgctxt "field:project.work,id:"
msgid "ID"
-msgstr ""
+msgstr "ID"
msgctxt "field:project.work,parent:"
msgid "Parent"
-msgstr ""
+msgstr "MatiÄnia dejavnost"
msgctxt "field:project.work,party:"
msgid "Party"
-msgstr ""
+msgstr "Stranka"
msgctxt "field:project.work,party_address:"
msgid "Contact Address"
-msgstr ""
+msgstr "Kontakt"
msgctxt "field:project.work,rec_name:"
msgid "Name"
-msgstr ""
+msgstr "Ime"
msgctxt "field:project.work,sequence:"
msgid "Sequence"
-msgstr ""
+msgstr "Zap.Å¡t."
msgctxt "field:project.work,state:"
msgid "State"
-msgstr ""
+msgstr "Stanje"
msgctxt "field:project.work,timesheet_available:"
msgid "Available on timesheets"
-msgstr ""
+msgstr "Na evidenci"
msgctxt "field:project.work,total_effort:"
msgid "Total Effort"
-msgstr ""
+msgstr "Ocena skupaj"
msgctxt "field:project.work,type:"
msgid "Type"
-msgstr ""
+msgstr "Vrsta"
msgctxt "field:project.work,work:"
msgid "Work"
-msgstr ""
+msgstr "Dejavnost"
msgctxt "field:project.work,write_date:"
msgid "Write Date"
-msgstr ""
+msgstr "Zapisano"
msgctxt "field:project.work,write_uid:"
msgid "Write User"
-msgstr ""
+msgstr "Zapisal"
msgctxt "help:project.work,effort:"
msgid "Estimated Effort for this work"
-msgstr ""
+msgstr "Ocena za to dejavnost"
msgctxt "help:project.work,hours:"
msgid "Total time spent on this work"
-msgstr ""
+msgstr "Skupni porabljen Äas na tem dejavnosti"
msgctxt "help:project.work,total_effort:"
msgid "Estimated total effort for this work and the sub-works"
-msgstr ""
+msgstr "Skupna ocena za to dejavnost in njene poddejavnosti"
msgctxt "model:ir.action,name:act_open_child_work"
msgid "Tasks"
-msgstr ""
+msgstr "Naloge"
msgctxt "model:ir.action,name:act_project_form"
msgid "Projects"
-msgstr ""
+msgstr "Projekti"
msgctxt "model:ir.action,name:act_project_tree"
msgid "Projects"
-msgstr ""
+msgstr "Projekti"
msgctxt "model:ir.action,name:act_task_form"
msgid "Tasks"
-msgstr ""
+msgstr "Naloge"
msgctxt "model:ir.action,name:act_work_list"
msgid "Works Efforts"
-msgstr ""
+msgstr "Ocene dela"
msgctxt "model:ir.action,name:act_work_tree"
msgid "Works Efforts"
-msgstr ""
+msgstr "Ocene dela"
msgctxt "model:ir.ui.menu,name:menu_configuration"
msgid "Configuration"
-msgstr ""
+msgstr "Nastavitve"
msgctxt "model:ir.ui.menu,name:menu_project"
msgid "Project"
-msgstr ""
+msgstr "Projekt"
msgctxt "model:ir.ui.menu,name:menu_project_form"
msgid "Projects"
-msgstr ""
+msgstr "Projekti"
msgctxt "model:ir.ui.menu,name:menu_project_tree"
msgid "Projects"
-msgstr ""
+msgstr "Projekti"
msgctxt "model:ir.ui.menu,name:menu_task_form"
msgid "Tasks"
-msgstr ""
+msgstr "Naloge"
msgctxt "model:ir.ui.menu,name:menu_work_list"
msgid "Works Efforts"
-msgstr ""
+msgstr "Ocene dela"
msgctxt "model:ir.ui.menu,name:menu_work_tree"
msgid "Works Efforts"
-msgstr ""
+msgstr "Ocene dela"
msgctxt "model:project.work,name:"
msgid "Work Effort"
-msgstr ""
+msgstr "Ocena dela"
msgctxt "model:res.group,name:group_project_admin"
msgid "Project Administration"
-msgstr ""
+msgstr "Projekt - vodenje"
msgctxt "selection:project.work,state:"
msgid "Done"
-msgstr ""
+msgstr "ZakljuÄeno"
msgctxt "selection:project.work,state:"
msgid "Opened"
-msgstr ""
+msgstr "Odprto"
msgctxt "selection:project.work,type:"
msgid "Project"
-msgstr ""
+msgstr "Projekt"
msgctxt "selection:project.work,type:"
msgid "Task"
-msgstr ""
+msgstr "Naloga"
msgctxt "view:project.work:"
msgid "Children"
-msgstr ""
+msgstr "Poddejavnosti"
msgctxt "view:project.work:"
msgid "General"
-msgstr ""
+msgstr "Splošno"
msgctxt "view:project.work:"
msgid "Tasks"
-msgstr ""
+msgstr "Naloge"
msgctxt "view:project.work:"
msgid "Works Efforts"
-msgstr ""
+msgstr "Ocene dela"
diff --git a/setup.py b/setup.py
index c489fbb..30c0354 100644
--- a/setup.py
+++ b/setup.py
@@ -64,6 +64,7 @@ setup(name='trytond_project',
'Natural Language :: French',
'Natural Language :: German',
'Natural Language :: Russian',
+ 'Natural Language :: Slovenian',
'Natural Language :: Spanish',
'Operating System :: OS Independent',
'Programming Language :: Python :: 2.6',
diff --git a/tests/__init__.py b/tests/__init__.py
index f443bdc..f4ef562 100644
--- a/tests/__init__.py
+++ b/tests/__init__.py
@@ -2,3 +2,5 @@
#this repository contains the full copyright notices and license terms.
from .test_project import suite
+
+__all__ = ['suite']
diff --git a/tryton.cfg b/tryton.cfg
index c54cfd5..bca3300 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
[tryton]
-version=2.8.1
+version=3.0.0
depends:
company_work_time
ir
diff --git a/trytond_project.egg-info/PKG-INFO b/trytond_project.egg-info/PKG-INFO
index 1708944..5ed9ed2 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: 2.8.1
+Version: 3.0.0
Summary: Tryton module with projects
Home-page: http://www.tryton.org/
Author: Tryton
Author-email: UNKNOWN
License: GPL-3
-Download-URL: http://downloads.tryton.org/2.8/
+Download-URL: http://downloads.tryton.org/3.0/
Description: trytond_project
===============
@@ -60,6 +60,7 @@ Classifier: Natural Language :: English
Classifier: Natural Language :: French
Classifier: Natural Language :: German
Classifier: Natural Language :: Russian
+Classifier: Natural Language :: Slovenian
Classifier: Natural Language :: Spanish
Classifier: Operating System :: OS Independent
Classifier: Programming Language :: Python :: 2.6
diff --git a/trytond_project.egg-info/SOURCES.txt b/trytond_project.egg-info/SOURCES.txt
index b247979..0739d38 100644
--- a/trytond_project.egg-info/SOURCES.txt
+++ b/trytond_project.egg-info/SOURCES.txt
@@ -24,6 +24,7 @@ locale/es_ES.po
locale/fr_FR.po
locale/nl_NL.po
locale/ru_RU.po
+locale/sl_SI.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 676d1ca..1f7466c 100644
--- a/trytond_project.egg-info/requires.txt
+++ b/trytond_project.egg-info/requires.txt
@@ -1,4 +1,4 @@
-trytond_company_work_time >= 2.8, < 2.9
-trytond_party >= 2.8, < 2.9
-trytond_timesheet >= 2.8, < 2.9
-trytond >= 2.8, < 2.9
\ No newline at end of file
+trytond_company_work_time >= 3.0, < 3.1
+trytond_party >= 3.0, < 3.1
+trytond_timesheet >= 3.0, < 3.1
+trytond >= 3.0, < 3.1
\ No newline at end of file
diff --git a/work.py b/work.py
index 0c604a7..2584fe0 100644
--- a/work.py
+++ b/work.py
@@ -2,7 +2,7 @@
#this repository contains the full copyright notices and license terms.
from trytond.model import ModelView, ModelSQL, fields
from trytond.pyson import Eval
-from trytond.backend import TableHandler
+from trytond import backend
from trytond.transaction import Transaction
from trytond.pool import Pool
@@ -22,8 +22,9 @@ class Work(ModelSQL, ModelView):
('task', 'Task')
],
'Type', required=True, select=True)
- company = fields.Function(fields.Many2One('company.company', 'Company'),
- 'get_company', searcher='search_comany')
+ company = fields.Function(fields.Many2One('company.company', 'Company',
+ on_change_with=['work']),
+ 'on_change_with_company', searcher='search_comany')
party = fields.Many2One('party.party', 'Party',
states={
'invisible': Eval('type') != 'project',
@@ -34,13 +35,14 @@ class Work(ModelSQL, ModelView):
'invisible': Eval('type') != 'project',
}, depends=['party', 'type'])
timesheet_available = fields.Function(
- fields.Boolean('Available on timesheets'), 'get_timesheet_available')
+ fields.Boolean('Available on timesheets', on_change_with=['work']),
+ 'on_change_with_timesheet_available')
hours = fields.Function(fields.Float('Timesheet Hours', digits=(16, 2),
states={
'invisible': ~Eval('timesheet_available'),
},
- depends=['timesheet_available'],
- help="Total time spent on this work"), 'get_hours')
+ depends=['timesheet_available'], on_change_with=['work'],
+ help="Total time spent on this work"), 'on_change_with_hours')
effort = fields.Float("Effort",
states={
'invisible': Eval('type') != 'task',
@@ -56,9 +58,12 @@ class Work(ModelSQL, ModelView):
('opened', 'Opened'),
('done', 'Done'),
], 'State', required=True, select=True)
- sequence = fields.Integer('Sequence',
- order_field='(%(table)s.sequence IS NULL) %(order)s, '
- '%(table)s.sequence %(order)s')
+ sequence = fields.Integer('Sequence')
+
+ @staticmethod
+ def order_sequence(tables):
+ table, _ = tables[None]
+ return [table.sequence == None, table.sequence]
@staticmethod
def default_type():
@@ -75,6 +80,7 @@ class Work(ModelSQL, ModelView):
@classmethod
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)
@@ -85,16 +91,16 @@ class Work(ModelSQL, ModelView):
# Migration from 2.0: copy sequence from timesheet to project
if migrate_sequence:
- cursor.execute(
- 'SELECT t.sequence, t.id '
- 'FROM "%s" AS t '
- 'JOIN "%s" AS p ON (p.work = t.id)' % (
- TimesheetWork._table, cls._table))
+ project = cls.__table__()
+ timesheet = TimesheetWork.__table__()
+ cursor.execute(*timesheet.join(project,
+ condition=project.work == timesheet.id
+ ).select(timesheet.sequence, timesheet.id))
for sequence, id_ in cursor.fetchall():
- sql = ('UPDATE "%s" '
- 'SET sequence = %%s '
- 'WHERE work = %%s' % cls._table)
- cursor.execute(sql, (sequence, id_))
+ cursor.execute(*project.update(
+ columns=[project.sequence],
+ values=[sequence],
+ where=project.work == id_))
# Migration from 2.4: drop required on sequence
table_project_work.not_null_action('sequence', action='remove')
@@ -109,10 +115,10 @@ class Work(ModelSQL, ModelView):
cls._order.insert(0, ('sequence', 'ASC'))
cls._error_messages.update({
'invalid_parent_state': ('Work "%(child)s" can not be opened '
- 'because its parent work "%(parent)s" is already done."'),
+ 'because its parent work "%(parent)s" is already done.'),
'invalid_children_state': ('Work "%(parent)s" can not be '
'done because its child work "%(child)s" is still '
- 'opened."'),
+ 'opened.'),
})
@classmethod
@@ -159,17 +165,17 @@ class Work(ModelSQL, ModelView):
def search_active(cls, name, clause):
return [('work.active',) + tuple(clause[1:])]
- def get_company(self, name):
+ def on_change_with_company(self, name=None):
return self.work.company.id
@classmethod
def search_comany(cls, name, clause):
return [('work.company',) + tuple(clause[1:])]
- def get_timesheet_available(self, name):
+ def on_change_with_timesheet_available(self, name=None):
return self.work.timesheet_available
- def get_hours(self, name):
+ def on_change_with_hours(self, name=None):
return self.work.hours
@classmethod
@@ -267,33 +273,35 @@ class Work(ModelSQL, ModelView):
return [('work', 'in', tw_ids)]
- @staticmethod
- def sum_tree(works, getter):
- leafs = set()
+ @classmethod
+ def sum_tree(cls, works, getter):
result = {}
+ parents = {}
for work in works:
- if not work.children:
- leafs.add(work)
result[work.id] = getter(work)
-
- works = set(works)
+ parent = work.parent
+ if parent:
+ parents[work.id] = parent.id
+ works = set((w.id for w in works))
+ leafs = works - set(parents)
while leafs:
for work in leafs:
works.remove(work)
- if work.parent and work.parent.id in result:
- result[work.parent.id] += result[work.id]
- next_leafs = set(w for w in works)
+ parent = parents.get(work)
+ if parent in result:
+ result[parent] += result[work]
+ next_leafs = set(works)
for work in works:
- if not work.parent:
+ parent = parents.get(work)
+ if not parent:
continue
- if work.parent.id in next_leafs and work.parent in works:
- next_leafs.remove(work.parent)
+ if parent in next_leafs and parent in works:
+ next_leafs.remove(parent)
leafs = next_leafs
return result
@classmethod
def get_total_effort(cls, works, name):
-
works = cls.search([
('parent', 'child_of', [w.id for w in works]),
('active', '=', True),
diff --git a/work.xml b/work.xml
index b539361..36657f8 100644
--- a/work.xml
+++ b/work.xml
@@ -31,7 +31,7 @@ this repository contains the full copyright notices and license terms. -->
<record model="ir.action.act_window" id="act_work_tree">
<field name="name">Works Efforts</field>
<field name="res_model">project.work</field>
- <field name="domain">[('parent', '=', False)]</field>
+ <field name="domain">[('parent', '=', None)]</field>
</record>
<record model="ir.action.act_window.view"
id="act_work_tree_view1">
@@ -70,7 +70,7 @@ this repository contains the full copyright notices and license terms. -->
<record model="ir.action.act_window" id="act_project_tree">
<field name="name">Projects</field>
<field name="res_model">project.work</field>
- <field name="domain">[('parent', '=', False)]</field>
+ <field name="domain">[('parent', '=', None)]</field>
</record>
<record model="ir.action.act_window.view"
id="act_project_tree_view1">
commit d7000e508f862f71ad3ce8a69424cab90f4bc4e7
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Thu Nov 21 12:04:14 2013 +0100
Removing inadvertently commited .pc directory.
diff --git a/.pc/.quilt_patches b/.pc/.quilt_patches
deleted file mode 100644
index 6857a8d..0000000
--- a/.pc/.quilt_patches
+++ /dev/null
@@ -1 +0,0 @@
-debian/patches
diff --git a/.pc/.quilt_series b/.pc/.quilt_series
deleted file mode 100644
index c206706..0000000
--- a/.pc/.quilt_series
+++ /dev/null
@@ -1 +0,0 @@
-series
diff --git a/.pc/.version b/.pc/.version
deleted file mode 100644
index 0cfbf08..0000000
--- a/.pc/.version
+++ /dev/null
@@ -1 +0,0 @@
-2
commit f838e15f4ff58deb6666a43af72834134ea332e4
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Sun Oct 13 21:59:19 2013 +0200
Releasing debian version 2.8.1-1.
diff --git a/debian/changelog b/debian/changelog
index 7b2836d..55f60f8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+tryton-modules-project (2.8.1-1) unstable; urgency=low
+
+ * Merging upstream version 2.8.1.
+
+ -- Mathias Behrle <mathiasb at m9s.biz> Sun, 13 Oct 2013 20:05:40 +0200
+
tryton-modules-project (2.8.0-3) unstable; urgency=low
* Adapting the rules file to work also with git-buildpackage.
commit f0287adccf13e77569d0377add71d277b8eff8ff
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Sun Oct 13 20:01:58 2013 +0200
Merging upstream version 2.8.1.
diff --git a/CHANGELOG b/CHANGELOG
index 0d01140..9eefc80 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 2.8.1 - 2013-10-01
+* Bug fixes (see mercurial logs for details)
+
Version 2.8.0 - 2013-04-22
* Bug fixes (see mercurial logs for details)
diff --git a/PKG-INFO b/PKG-INFO
index 1c2ae49..8ad491d 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: trytond_project
-Version: 2.8.0
+Version: 2.8.1
Summary: Tryton module with projects
Home-page: http://www.tryton.org/
Author: Tryton
diff --git a/tryton.cfg b/tryton.cfg
index 16bb2b5..c54cfd5 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
[tryton]
-version=2.8.0
+version=2.8.1
depends:
company_work_time
ir
diff --git a/trytond_project.egg-info/PKG-INFO b/trytond_project.egg-info/PKG-INFO
index cd94456..1708944 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: 2.8.0
+Version: 2.8.1
Summary: Tryton module with projects
Home-page: http://www.tryton.org/
Author: Tryton
diff --git a/work.py b/work.py
index f01f724..0c604a7 100644
--- a/work.py
+++ b/work.py
@@ -311,11 +311,13 @@ class Work(ModelSQL, ModelView):
for key in timesheet_default.keys():
if key in cls._fields:
del timesheet_default[key]
+ timesheet_default['children'] = None
new_project_works = []
for project_work in project_works:
timesheet_work, = TimesheetWork.copy([project_work.work],
default=timesheet_default)
pwdefault = default.copy()
+ pwdefault['children'] = None
pwdefault['work'] = timesheet_work.id
new_project_works.extend(super(Work, cls).copy([project_work],
default=pwdefault))
commit 4dc5f7a867d528ee98ce5e4b6dc04c323edcc9d6
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Tue Aug 6 16:21:02 2013 +0200
Releasing debian version 2.8.0-3.
diff --git a/debian/changelog b/debian/changelog
index a218b45..7b2836d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+tryton-modules-project (2.8.0-3) unstable; urgency=low
+
+ * Adapting the rules file to work also with git-buildpackage.
+
+ -- Mathias Behrle <mathiasb at m9s.biz> Tue, 06 Aug 2013 13:33:18 +0200
+
tryton-modules-project (2.8.0-2) unstable; urgency=low
* Adding doc/ to docs file.
commit a0010854066a963969044baf14aea711ace96235
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Mon Aug 5 18:06:36 2013 +0200
Adapting the rules file to work also with git-buildpackage.
diff --git a/debian/rules b/debian/rules
index a6a1fb8..30074ad 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,13 +1,24 @@
#!/usr/bin/make -f
MAJOR := $(shell python setup.py --version | awk -F "." '{print $$1 "." $$2}')
+PACKAGE_NAME := $(shell python setup.py --name)
%:
dh ${@} --with python2
override_dh_auto_clean:
dh_auto_clean
+
+override_dh_auto_build:
+ mv $(PACKAGE_NAME).egg-info $(PACKAGE_NAME).hen-info
+ mv PKG-INFO PKG-INFO.hen
+ dh_auto_build
+
+override_dh_auto_install:
+ dh_auto_install
rm -rf *.egg-info
+ mv $(PACKAGE_NAME).hen-info $(PACKAGE_NAME).egg-info
+ mv PKG-INFO.hen PKG-INFO
override_dh_gencontrol:
dh_gencontrol -- -Vversion:major="$(MAJOR)"
commit d414a551c42e23d40c3215c98939944447c689ca
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Fri May 31 19:57:32 2013 +0200
Releasing debian version 2.8.0-2.
diff --git a/debian/changelog b/debian/changelog
index 9b5ed2c..a218b45 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+tryton-modules-project (2.8.0-2) unstable; urgency=low
+
+ * Adding doc/ to docs file.
+ * Simplifying package layout by renaming <pkg_name>.docs to docs.
+ * Removing needless empty line in rules.
+
+ -- Mathias Behrle <mathiasb at m9s.biz> Fri, 31 May 2013 17:26:57 +0200
+
tryton-modules-project (2.8.0-1) experimental; urgency=low
* Merging upstream version 2.8.0.
commit 9fd5b59da411304257cc5df7cc53084ebae76d3f
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Wed May 29 17:19:29 2013 +0200
Removing needless empty line in rules.
diff --git a/debian/rules b/debian/rules
index 0f63ab4..a6a1fb8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,7 +7,6 @@ MAJOR := $(shell python setup.py --version | awk -F "." '{print $$1 "." $$2}')
override_dh_auto_clean:
dh_auto_clean
-
rm -rf *.egg-info
override_dh_gencontrol:
commit e651fbabcc9d3ebae505406e703cb8f313dac326
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Wed May 29 17:01:48 2013 +0200
Simplifying package layout by renaming <pkg_name>.docs to docs.
Thanks to Andreas Tille for this proposal. Since tryton module packages
will most probably stay simple binary packages this change simplifies the
package layout.
diff --git a/debian/tryton-modules-project.docs b/debian/docs
similarity index 100%
rename from debian/tryton-modules-project.docs
rename to debian/docs
commit da4e107eb9e9f2a52e6f34f25f764883f3b690f5
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Tue May 14 18:54:41 2013 +0200
Adding doc/ to docs file.
diff --git a/debian/tryton-modules-project.docs b/debian/tryton-modules-project.docs
new file mode 100644
index 0000000..a2e6bd4
--- /dev/null
+++ b/debian/tryton-modules-project.docs
@@ -0,0 +1 @@
+doc/
commit 42d1e21a485f55ff80939da39e2efa33073ac829
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Thu May 2 17:27:09 2013 +0200
Releasing debian version 2.8.0-1.
diff --git a/debian/changelog b/debian/changelog
index e3460a3..9b5ed2c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+tryton-modules-project (2.8.0-1) experimental; urgency=low
+
+ * Merging upstream version 2.8.0.
+ * Updating copyright.
+
+ -- Mathias Behrle <mathiasb at m9s.biz> Thu, 02 May 2013 15:20:35 +0200
+
tryton-modules-project (2.6.0-4) experimental; urgency=low
* Removing Daniel from Uploaders. Thanks for your work! (Closes: #704392).
commit cc23f1b16ca5d166ee73d74525b54924405abdb8
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Thu May 2 14:13:11 2013 +0200
Updating copyright.
diff --git a/debian/copyright b/debian/copyright
index 3b23cc7..65df71c 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,9 +1,9 @@
Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Files: *
-Copyright: 2008-2012 Cédric Krier
- 2008-2012 B2CK SPRL
- 2009-2012 Bertrand Chenal
+Copyright: 2008-2013 Cédric Krier
+ 2008-2013 B2CK SPRL
+ 2009-2013 Bertrand Chenal
License: GPL-3+
Files: icons/*
commit 02219a0b6cbd100a125ae05ab62e077727943104
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Thu May 2 00:37:09 2013 +0200
Merging upstream version 2.8.0.
diff --git a/CHANGELOG b/CHANGELOG
index 2b987d4..0d01140 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 2.8.0 - 2013-04-22
+* Bug fixes (see mercurial logs for details)
+
Version 2.6.0 - 2012-10-22
* Bug fixes (see mercurial logs for details)
diff --git a/COPYRIGHT b/COPYRIGHT
index bee3ccd..a75d528 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,6 +1,6 @@
-Copyright (C) 2008-2012 Cédric Krier.
-Copyright (C) 2008-2012 B2CK SPRL.
-Copyright (C) 2009-2012 Bertrand Chenal.
+Copyright (C) 2008-2013 Cédric Krier.
+Copyright (C) 2008-2013 B2CK SPRL.
+Copyright (C) 2009-2013 Bertrand Chenal.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff --git a/MANIFEST.in b/MANIFEST.in
index e4632a1..732a76e 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -6,6 +6,7 @@ include CHANGELOG
include LICENSE
include tryton.cfg
include *.xml
+include view/*.xml
include *.odt
include locale/*.po
include doc/*
diff --git a/PKG-INFO b/PKG-INFO
index 4f53dcd..1c2ae49 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,12 +1,12 @@
-Metadata-Version: 1.0
+Metadata-Version: 1.1
Name: trytond_project
-Version: 2.6.0
+Version: 2.8.0
Summary: Tryton module with projects
Home-page: http://www.tryton.org/
Author: Tryton
Author-email: UNKNOWN
License: GPL-3
-Download-URL: http://downloads.tryton.org/2.6/
+Download-URL: http://downloads.tryton.org/2.8/
Description: trytond_project
===============
@@ -53,6 +53,7 @@ Classifier: Intended Audience :: Legal Industry
Classifier: Intended Audience :: Manufacturing
Classifier: License :: OSI Approved :: GNU General Public License (GPL)
Classifier: Natural Language :: Bulgarian
+Classifier: Natural Language :: Catalan
Classifier: Natural Language :: Czech
Classifier: Natural Language :: Dutch
Classifier: Natural Language :: English
diff --git a/locale/bg_BG.po b/locale/bg_BG.po
index a2bc944..fac5086 100644
--- a/locale/bg_BG.po
+++ b/locale/bg_BG.po
@@ -3,8 +3,25 @@ msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
msgctxt "error:project.work:"
-msgid "There should be only one timesheet work by task/project!"
-msgstr "Задача/проект може да имат Ñамо един график за дейноÑÑ‚!"
+msgid "There should be only one timesheet work by task/project."
+msgstr ""
+
+msgctxt "error:project.work:"
+msgid ""
+"Work \"%(child)s\" can not be opened because its parent work \"%(parent)s\" "
+"is already done.\""
+msgstr ""
+
+msgctxt "error:project.work:"
+msgid ""
+"Work \"%(parent)s\" can not be done because its child work \"%(child)s\" is "
+"still opened.\""
+msgstr ""
+
+#, fuzzy
+msgctxt "field:project.work,active:"
+msgid "Active"
+msgstr "Ðктивен"
msgctxt "field:project.work,children:"
msgid "Children"
@@ -14,6 +31,11 @@ msgctxt "field:project.work,comment:"
msgid "Comment"
msgstr "Коментар"
+#, fuzzy
+msgctxt "field:project.work,company:"
+msgid "Company"
+msgstr "Фирма"
+
msgctxt "field:project.work,create_date:"
msgid "Create Date"
msgstr "Създадено на"
@@ -26,6 +48,11 @@ msgctxt "field:project.work,effort:"
msgid "Effort"
msgstr "УÑлие"
+#, fuzzy
+msgctxt "field:project.work,hours:"
+msgid "Timesheet Hours"
+msgstr "ЧаÑове от график"
+
msgctxt "field:project.work,id:"
msgid "ID"
msgstr "ID"
@@ -54,6 +81,11 @@ msgctxt "field:project.work,state:"
msgid "State"
msgstr "СъÑтоÑние"
+#, fuzzy
+msgctxt "field:project.work,timesheet_available:"
+msgid "Available on timesheets"
+msgstr "Ðаличен в график"
+
msgctxt "field:project.work,total_effort:"
msgid "Total Effort"
msgstr "Общо уÑилиÑ"
@@ -82,6 +114,11 @@ msgctxt "help:project.work,effort:"
msgid "Estimated Effort for this work"
msgstr "Оценка на уÑилиÑта за тази работа"
+#, fuzzy
+msgctxt "help:project.work,hours:"
+msgid "Total time spent on this work"
+msgstr "Общо време за изпълнение на тази задача"
+
msgctxt "help:project.work,total_effort:"
msgid "Estimated total effort for this work and the sub-works"
msgstr "Предполагаеми общо уÑÐ¸Ð»Ð¸Ñ Ð·Ð° тази задача и подзадачите"
@@ -171,21 +208,9 @@ msgid "General"
msgstr "ОÑновен"
msgctxt "view:project.work:"
-msgid "Projects"
-msgstr "Проекти"
-
-msgctxt "view:project.work:"
msgid "Tasks"
msgstr "Задачи"
msgctxt "view:project.work:"
-msgid "Timesheet"
-msgstr "График"
-
-msgctxt "view:project.work:"
-msgid "Work Efforts"
-msgstr "ДейноÑти"
-
-msgctxt "view:project.work:"
msgid "Works Efforts"
msgstr "ДейноÑти"
diff --git a/locale/ca_ES.po b/locale/ca_ES.po
index a9595ce..6ea5161 100644
--- a/locale/ca_ES.po
+++ b/locale/ca_ES.po
@@ -3,8 +3,28 @@ msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
msgctxt "error:project.work:"
-msgid "There should be only one timesheet work by task/project!"
-msgstr "Només ha d'haver-hi un full de treball per tasca/projecte"
+msgid "There should be only one timesheet work by task/project."
+msgstr "Hi ha d'haver només un part d'hores de treball per tasca/projecte."
+
+msgctxt "error:project.work:"
+msgid ""
+"Work \"%(child)s\" can not be opened because its parent work \"%(parent)s\" "
+"is already done.\""
+msgstr ""
+"El treball \"%(child)s\" no es pot obrir perque el treball pare "
+"\"%(parent)s\" ja està marcat com acabat."
+
+msgctxt "error:project.work:"
+msgid ""
+"Work \"%(parent)s\" can not be done because its child work \"%(child)s\" is "
+"still opened.\""
+msgstr ""
+"El treball \"%(parent)s\" no es pot marcar com acabat perque el treball fill"
+" \"%(child)s\" continua estant obert."
+
+msgctxt "field:project.work,active:"
+msgid "Active"
+msgstr "Actiu"
msgctxt "field:project.work,children:"
msgid "Children"
@@ -14,6 +34,10 @@ msgctxt "field:project.work,comment:"
msgid "Comment"
msgstr "Comentari"
+msgctxt "field:project.work,company:"
+msgid "Company"
+msgstr "Empresa"
+
msgctxt "field:project.work,create_date:"
msgid "Create Date"
msgstr "Data creació"
@@ -26,6 +50,10 @@ msgctxt "field:project.work,effort:"
msgid "Effort"
msgstr "Esforç"
+msgctxt "field:project.work,hours:"
+msgid "Timesheet Hours"
+msgstr "Hores del full de treball"
+
msgctxt "field:project.work,id:"
msgid "ID"
msgstr "ID"
@@ -54,9 +82,13 @@ msgctxt "field:project.work,state:"
msgid "State"
msgstr "Estat"
+msgctxt "field:project.work,timesheet_available:"
+msgid "Available on timesheets"
+msgstr "Disponible en fulls de treball"
+
msgctxt "field:project.work,total_effort:"
msgid "Total Effort"
-msgstr "Esforç total"
+msgstr "Total esforç"
msgctxt "field:project.work,type:"
msgid "Type"
@@ -64,7 +96,7 @@ msgstr "Tipus"
msgctxt "field:project.work,work:"
msgid "Work"
-msgstr "Activitat"
+msgstr "Treball"
msgctxt "field:project.work,write_date:"
msgid "Write Date"
@@ -80,12 +112,15 @@ msgstr "LÃnies de full de treball"
msgctxt "help:project.work,effort:"
msgid "Estimated Effort for this work"
-msgstr "L'esforç estimat per a aquesta activitat"
+msgstr "L'esforç estimat per a aquest treball"
+
+msgctxt "help:project.work,hours:"
+msgid "Total time spent on this work"
+msgstr "Temps total empleat en aquest treball"
msgctxt "help:project.work,total_effort:"
msgid "Estimated total effort for this work and the sub-works"
-msgstr ""
-"Esforç total estimat per a aquesta activitat i les seves subactivitats"
+msgstr "Esforç total estimat per a aquest treball i les seves subactivitats"
msgctxt "model:ir.action,name:act_open_child_work"
msgid "Tasks"
@@ -105,11 +140,11 @@ msgstr "Tasques"
msgctxt "model:ir.action,name:act_work_list"
msgid "Works Efforts"
-msgstr "Activitats"
+msgstr "Projectes i tasques"
msgctxt "model:ir.action,name:act_work_tree"
msgid "Works Efforts"
-msgstr "Activitats"
+msgstr "Projectes i tasques"
msgctxt "model:ir.ui.menu,name:menu_configuration"
msgid "Configuration"
@@ -133,15 +168,15 @@ msgstr "Tasques"
msgctxt "model:ir.ui.menu,name:menu_work_list"
msgid "Works Efforts"
-msgstr "Activitats"
+msgstr "Projectes i tasques"
msgctxt "model:ir.ui.menu,name:menu_work_tree"
msgid "Works Efforts"
-msgstr "Activitats"
+msgstr "Projectes i tasques"
msgctxt "model:project.work,name:"
msgid "Work Effort"
-msgstr "Activitats"
+msgstr "Projecte i tasca"
msgctxt "model:res.group,name:group_project_admin"
msgid "Project Administration"
@@ -149,7 +184,7 @@ msgstr "Administració de projecte"
msgctxt "selection:project.work,state:"
msgid "Done"
-msgstr "Acabada"
+msgstr "Acabat"
msgctxt "selection:project.work,state:"
msgid "Opened"
@@ -172,33 +207,9 @@ msgid "General"
msgstr "General"
msgctxt "view:project.work:"
-msgid "Other Info"
-msgstr "Informació addicional"
-
-msgctxt "view:project.work:"
-msgid "Projects"
-msgstr "Projectes"
-
-msgctxt "view:project.work:"
msgid "Tasks"
msgstr "Tasques"
msgctxt "view:project.work:"
-msgid "Timesheet"
-msgstr "Full de treball"
-
-msgctxt "view:project.work:"
-msgid "Work"
-msgstr "Activitat"
-
-msgctxt "view:project.work:"
-msgid "Work Efforts"
-msgstr "Activitats"
-
-msgctxt "view:project.work:"
-msgid "Works"
-msgstr "Activitats"
-
-msgctxt "view:project.work:"
msgid "Works Efforts"
-msgstr "Activitats"
+msgstr "Projectes i tasques"
diff --git a/locale/cs_CZ.po b/locale/cs_CZ.po
index 9ba4192..e88af28 100644
--- a/locale/cs_CZ.po
+++ b/locale/cs_CZ.po
@@ -3,7 +3,23 @@ msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
msgctxt "error:project.work:"
-msgid "There should be only one timesheet work by task/project!"
+msgid "There should be only one timesheet work by task/project."
+msgstr ""
+
+msgctxt "error:project.work:"
+msgid ""
+"Work \"%(child)s\" can not be opened because its parent work \"%(parent)s\" "
+"is already done.\""
+msgstr ""
+
+msgctxt "error:project.work:"
+msgid ""
+"Work \"%(parent)s\" can not be done because its child work \"%(child)s\" is "
+"still opened.\""
+msgstr ""
+
+msgctxt "field:project.work,active:"
+msgid "Active"
msgstr ""
msgctxt "field:project.work,children:"
@@ -14,6 +30,10 @@ msgctxt "field:project.work,comment:"
msgid "Comment"
msgstr ""
+msgctxt "field:project.work,company:"
+msgid "Company"
+msgstr ""
+
msgctxt "field:project.work,create_date:"
msgid "Create Date"
msgstr ""
@@ -26,6 +46,10 @@ msgctxt "field:project.work,effort:"
msgid "Effort"
msgstr ""
+msgctxt "field:project.work,hours:"
+msgid "Timesheet Hours"
+msgstr ""
+
msgctxt "field:project.work,id:"
msgid "ID"
msgstr ""
@@ -54,6 +78,10 @@ msgctxt "field:project.work,state:"
msgid "State"
msgstr ""
+msgctxt "field:project.work,timesheet_available:"
+msgid "Available on timesheets"
+msgstr ""
+
msgctxt "field:project.work,total_effort:"
msgid "Total Effort"
msgstr ""
@@ -78,6 +106,10 @@ msgctxt "help:project.work,effort:"
msgid "Estimated Effort for this work"
msgstr ""
+msgctxt "help:project.work,hours:"
+msgid "Total time spent on this work"
+msgstr ""
+
msgctxt "help:project.work,total_effort:"
msgid "Estimated total effort for this work and the sub-works"
msgstr ""
@@ -167,17 +199,9 @@ msgid "General"
msgstr ""
msgctxt "view:project.work:"
-msgid "Projects"
-msgstr ""
-
-msgctxt "view:project.work:"
msgid "Tasks"
msgstr ""
msgctxt "view:project.work:"
-msgid "Timesheet"
-msgstr ""
-
-msgctxt "view:project.work:"
msgid "Works Efforts"
msgstr ""
diff --git a/locale/de_DE.po b/locale/de_DE.po
index 11d924f..b1e98be 100644
--- a/locale/de_DE.po
+++ b/locale/de_DE.po
@@ -3,8 +3,29 @@ msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
msgctxt "error:project.work:"
-msgid "There should be only one timesheet work by task/project!"
-msgstr "Es kann nur ein Zeiterfassungsblatt pro Aufgabe oder Projekt geben!"
+msgid "There should be only one timesheet work by task/project."
+msgstr ""
+"Es kann nur ein Zeiterfassungsblatt pro Aufgabe/Projekt eingetragen werden."
+
+msgctxt "error:project.work:"
+msgid ""
+"Work \"%(child)s\" can not be opened because its parent work \"%(parent)s\" "
+"is already done.\""
+msgstr ""
+"Aufgabe \"%(child)s\" kann nicht auf Offen gesetzt werden, weil die "
+"übergeordnete Arbeit \"%(parent)s\" bereits erledigt ist."
+
+msgctxt "error:project.work:"
+msgid ""
+"Work \"%(parent)s\" can not be done because its child work \"%(child)s\" is "
+"still opened.\""
+msgstr ""
+"Arbeit \"%(parent)s\" kann nicht auf Erledigt gesetzt werden, weil die "
+"untergeordnete Arbeit \"%(child)s\" noch geöffnet ist."
+
+msgctxt "field:project.work,active:"
+msgid "Active"
+msgstr "Aktiv"
msgctxt "field:project.work,children:"
msgid "Children"
@@ -14,6 +35,10 @@ msgctxt "field:project.work,comment:"
msgid "Comment"
msgstr "Kommentar"
+msgctxt "field:project.work,company:"
+msgid "Company"
+msgstr "Unternehmen"
+
msgctxt "field:project.work,create_date:"
msgid "Create Date"
msgstr "Erstellungsdatum"
@@ -26,6 +51,10 @@ msgctxt "field:project.work,effort:"
msgid "Effort"
msgstr "Aufwand (Personenstunden)"
+msgctxt "field:project.work,hours:"
+msgid "Timesheet Hours"
+msgstr "Stunden"
+
msgctxt "field:project.work,id:"
msgid "ID"
msgstr "ID"
@@ -54,6 +83,10 @@ msgctxt "field:project.work,state:"
msgid "State"
msgstr "Status"
+msgctxt "field:project.work,timesheet_available:"
+msgid "Available on timesheets"
+msgstr "Verfügbar für Zeiterfassung"
+
msgctxt "field:project.work,total_effort:"
msgid "Total Effort"
msgstr "Gesamtaufwand (Personenstunden)"
@@ -84,6 +117,10 @@ msgstr ""
"Geschätzter Aufwand für diese Arbeit in Stunden (Format: Personenstunden, "
"-tage, -wochen)"
+msgctxt "help:project.work,hours:"
+msgid "Total time spent on this work"
+msgstr "Gesamtzeit für diese Arbeit"
+
msgctxt "help:project.work,total_effort:"
msgid "Estimated total effort for this work and the sub-works"
msgstr ""
@@ -175,33 +212,9 @@ msgid "General"
msgstr "Allgemein"
msgctxt "view:project.work:"
-msgid "Other Info"
-msgstr "Sonstiges"
-
-msgctxt "view:project.work:"
-msgid "Projects"
-msgstr "Projekte"
-
-msgctxt "view:project.work:"
msgid "Tasks"
msgstr "Aufgaben"
msgctxt "view:project.work:"
-msgid "Timesheet"
-msgstr "Zeiterfassungsblatt"
-
-msgctxt "view:project.work:"
-msgid "Work"
-msgstr "Arbeit"
-
-msgctxt "view:project.work:"
-msgid "Work Efforts"
-msgstr "Arbeitsaufwände"
-
-msgctxt "view:project.work:"
-msgid "Works"
-msgstr "Arbeiten"
-
-msgctxt "view:project.work:"
msgid "Works Efforts"
-msgstr "Arbeiten Aufwände"
+msgstr "Arbeitsaufwände"
diff --git a/locale/es_AR.po b/locale/es_AR.po
index c2fda2c..8f0c88d 100644
--- a/locale/es_AR.po
+++ b/locale/es_AR.po
@@ -3,17 +3,41 @@ msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
msgctxt "error:project.work:"
-msgid "There should be only one timesheet work by task/project!"
-msgstr "¡Solo debe haber un parte de trabajo por tarea/proyecto!"
+msgid "There should be only one timesheet work by task/project."
+msgstr "Debe haber sólo un parte de horas de trabajo por tarea/proyecto."
+
+msgctxt "error:project.work:"
+msgid ""
+"Work \"%(child)s\" can not be opened because its parent work \"%(parent)s\" "
+"is already done.\""
+msgstr ""
+"El trabajo «%(child)s» no se puede abrir porque el trabajo padre "
+"«%(parent)s» ya está marcado como terminado."
+
+msgctxt "error:project.work:"
+msgid ""
+"Work \"%(parent)s\" can not be done because its child work \"%(child)s\" is "
+"still opened.\""
+msgstr ""
+"El trabajo «%(parent)s» no se puede marcar como acabado porque el trabajo "
+"hijo «%(child)s» continua estando abierto."
+
+msgctxt "field:project.work,active:"
+msgid "Active"
+msgstr "Activo"
msgctxt "field:project.work,children:"
msgid "Children"
-msgstr "Hijos"
+msgstr "Tareas"
msgctxt "field:project.work,comment:"
msgid "Comment"
msgstr "Comentario"
+msgctxt "field:project.work,company:"
+msgid "Company"
+msgstr "Empresa"
+
msgctxt "field:project.work,create_date:"
msgid "Create Date"
msgstr "Fecha creación"
@@ -26,6 +50,10 @@ msgctxt "field:project.work,effort:"
msgid "Effort"
msgstr "Esfuerzo"
+msgctxt "field:project.work,hours:"
+msgid "Timesheet Hours"
+msgstr "Horas del parte de trabajo"
+
msgctxt "field:project.work,id:"
msgid "ID"
msgstr "ID"
@@ -54,9 +82,13 @@ msgctxt "field:project.work,state:"
msgid "State"
msgstr "Estado"
+msgctxt "field:project.work,timesheet_available:"
+msgid "Available on timesheets"
+msgstr "Disponible en partes de trabajo"
+
msgctxt "field:project.work,total_effort:"
msgid "Total Effort"
-msgstr "Esfuerzo total"
+msgstr "Total esfuerzo"
msgctxt "field:project.work,type:"
msgid "Type"
@@ -80,7 +112,11 @@ msgstr "LÃneas de parte de trabajo"
msgctxt "help:project.work,effort:"
msgid "Estimated Effort for this work"
-msgstr "El esfuerzo estimado para esta actividad"
+msgstr "Esfuerzo estimado para esta actividad"
+
+msgctxt "help:project.work,hours:"
+msgid "Total time spent on this work"
+msgstr "Tiempo total empleado en este trabajo"
msgctxt "help:project.work,total_effort:"
msgid "Estimated total effort for this work and the sub-works"
@@ -116,7 +152,7 @@ msgstr "Configuración"
msgctxt "model:ir.ui.menu,name:menu_project"
msgid "Project"
-msgstr "Gestión de proyectos"
+msgstr "Proyectos"
msgctxt "model:ir.ui.menu,name:menu_project_form"
msgid "Projects"
@@ -148,7 +184,7 @@ msgstr "Administración de proyecto"
msgctxt "selection:project.work,state:"
msgid "Done"
-msgstr "Terminada"
+msgstr "Realizado"
msgctxt "selection:project.work,state:"
msgid "Opened"
@@ -164,40 +200,16 @@ msgstr "Tarea"
msgctxt "view:project.work:"
msgid "Children"
-msgstr "Hijos"
+msgstr "Tareas"
msgctxt "view:project.work:"
msgid "General"
msgstr "General"
msgctxt "view:project.work:"
-msgid "Other Info"
-msgstr "Información adicional"
-
-msgctxt "view:project.work:"
-msgid "Projects"
-msgstr "Proyectos"
-
-msgctxt "view:project.work:"
msgid "Tasks"
msgstr "Tareas"
msgctxt "view:project.work:"
-msgid "Timesheet"
-msgstr "Parte de trabajo"
-
-msgctxt "view:project.work:"
-msgid "Work"
-msgstr "Actividad"
-
-msgctxt "view:project.work:"
-msgid "Work Efforts"
-msgstr "Actividades"
-
-msgctxt "view:project.work:"
-msgid "Works"
-msgstr "Actividades"
-
-msgctxt "view:project.work:"
msgid "Works Efforts"
msgstr "Actividades"
diff --git a/locale/es_CO.po b/locale/es_CO.po
index a07dda4..183f3d8 100644
--- a/locale/es_CO.po
+++ b/locale/es_CO.po
@@ -3,8 +3,28 @@ msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
msgctxt "error:project.work:"
-msgid "There should be only one timesheet work by task/project!"
-msgstr "¡Solo debe haber un hoja de registro de tiempo por tarea/proyecto!"
+msgid "There should be only one timesheet work by task/project."
+msgstr "Solo deberÃa haber una hoja de registro de tiempo por tarea/proyecto."
+
+msgctxt "error:project.work:"
+msgid ""
+"Work \"%(child)s\" can not be opened because its parent work \"%(parent)s\" "
+"is already done.\""
+msgstr ""
+"Las actividades \"%(child)s\" no pueden ser abiertas porque su actividad "
+"padre \"%(parent)s\" ya ha sido hecha."
+
+msgctxt "error:project.work:"
+msgid ""
+"Work \"%(parent)s\" can not be done because its child work \"%(child)s\" is "
+"still opened.\""
+msgstr ""
+"La actividad \"%(parent)s\" no puede realizarse porque la actividad hija "
+"\"%(child)s\" esta abierta todavÃa."
+
+msgctxt "field:project.work,active:"
+msgid "Active"
+msgstr "Activo"
msgctxt "field:project.work,children:"
msgid "Children"
@@ -14,18 +34,26 @@ msgctxt "field:project.work,comment:"
msgid "Comment"
msgstr "Comentario"
+msgctxt "field:project.work,company:"
+msgid "Company"
+msgstr "CompañÃa"
+
msgctxt "field:project.work,create_date:"
msgid "Create Date"
-msgstr "Fecha creación"
+msgstr "Fecha de Creación"
msgctxt "field:project.work,create_uid:"
msgid "Create User"
-msgstr "Usuario creación"
+msgstr "Creado por Usuario"
msgctxt "field:project.work,effort:"
msgid "Effort"
msgstr "Esfuerzo"
+msgctxt "field:project.work,hours:"
+msgid "Timesheet Hours"
+msgstr "Horas de Registro de Tiempo"
+
msgctxt "field:project.work,id:"
msgid "ID"
msgstr "ID"
@@ -54,6 +82,10 @@ msgctxt "field:project.work,state:"
msgid "State"
msgstr "Estado"
+msgctxt "field:project.work,timesheet_available:"
+msgid "Available on timesheets"
+msgstr "Disponibilidad en los registros de tiempos"
+
msgctxt "field:project.work,total_effort:"
msgid "Total Effort"
msgstr "Esfuerzo total"
@@ -68,11 +100,11 @@ msgstr "Actividad"
msgctxt "field:project.work,write_date:"
msgid "Write Date"
-msgstr "Fecha modificación"
+msgstr "Fecha de Modificación"
msgctxt "field:project.work,write_uid:"
msgid "Write User"
-msgstr "Usuario modificación"
+msgstr "Modificado por Usuario"
msgctxt "field:timesheet.work,timesheet_lines:"
msgid "Timesheet Lines"
@@ -82,6 +114,10 @@ msgctxt "help:project.work,effort:"
msgid "Estimated Effort for this work"
msgstr "El esfuerzo estimado para esta actividad"
+msgctxt "help:project.work,hours:"
+msgid "Total time spent on this work"
+msgstr "Tiempo total gastado en este trabajo"
+
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"
@@ -171,33 +207,9 @@ msgid "General"
msgstr "General"
msgctxt "view:project.work:"
-msgid "Other Info"
-msgstr "Info Adicional"
-
-msgctxt "view:project.work:"
-msgid "Projects"
-msgstr "Proyectos"
-
-msgctxt "view:project.work:"
msgid "Tasks"
msgstr "Tareas"
msgctxt "view:project.work:"
-msgid "Timesheet"
-msgstr "Registro de Tiempo"
-
-msgctxt "view:project.work:"
-msgid "Work"
-msgstr "Actividad"
-
-msgctxt "view:project.work:"
-msgid "Work Efforts"
-msgstr "Actividades"
-
-msgctxt "view:project.work:"
-msgid "Works"
-msgstr "Actividades"
-
-msgctxt "view:project.work:"
msgid "Works Efforts"
msgstr "Actividades"
diff --git a/locale/es_ES.po b/locale/es_ES.po
index 7432be3..10c7708 100644
--- a/locale/es_ES.po
+++ b/locale/es_ES.po
@@ -3,8 +3,28 @@ msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
msgctxt "error:project.work:"
-msgid "There should be only one timesheet work by task/project!"
-msgstr "Sólo debe haber un parte de trabajo por tarea/proyecto."
+msgid "There should be only one timesheet work by task/project."
+msgstr "Debe haber sólo un parte de horas de trabajo por tarea/proyecto."
+
+msgctxt "error:project.work:"
+msgid ""
+"Work \"%(child)s\" can not be opened because its parent work \"%(parent)s\" "
+"is already done.\""
+msgstr ""
+"El trabajo \"%(child)s\" no se puede abrir porque el trabajo padre "
+"\"%(parent)s\" ya está marcado como terminado."
+
+msgctxt "error:project.work:"
+msgid ""
+"Work \"%(parent)s\" can not be done because its child work \"%(child)s\" is "
+"still opened.\""
+msgstr ""
+"El trabajo \"%(parent)s\" no se puede marcar como acabado porque el trabajo "
+"hijo \"%(child)s\" continua estando abierto."
+
+msgctxt "field:project.work,active:"
+msgid "Active"
+msgstr "Activo"
msgctxt "field:project.work,children:"
msgid "Children"
@@ -14,6 +34,10 @@ msgctxt "field:project.work,comment:"
msgid "Comment"
msgstr "Comentario"
+msgctxt "field:project.work,company:"
+msgid "Company"
+msgstr "Empresa"
+
msgctxt "field:project.work,create_date:"
msgid "Create Date"
msgstr "Fecha creación"
@@ -26,6 +50,10 @@ msgctxt "field:project.work,effort:"
msgid "Effort"
msgstr "Esfuerzo"
+msgctxt "field:project.work,hours:"
+msgid "Timesheet Hours"
+msgstr "Horas parte de trabajo"
+
msgctxt "field:project.work,id:"
msgid "ID"
msgstr "ID"
@@ -54,9 +82,13 @@ msgctxt "field:project.work,state:"
msgid "State"
msgstr "Estado"
+msgctxt "field:project.work,timesheet_available:"
+msgid "Available on timesheets"
+msgstr "Disponible en partes de trabajo"
+
msgctxt "field:project.work,total_effort:"
msgid "Total Effort"
-msgstr "Esfuerzo total"
+msgstr "Total esfuerzo"
msgctxt "field:project.work,type:"
msgid "Type"
@@ -64,7 +96,7 @@ msgstr "Tipo"
msgctxt "field:project.work,work:"
msgid "Work"
-msgstr "Actividad"
+msgstr "Trabajo"
msgctxt "field:project.work,write_date:"
msgid "Write Date"
@@ -82,6 +114,10 @@ msgctxt "help:project.work,effort:"
msgid "Estimated Effort for this work"
msgstr "El esfuerzo estimado para esta actividad."
+msgctxt "help:project.work,hours:"
+msgid "Total time spent on this work"
+msgstr "Tiempo total empleado en este trabajo."
+
msgctxt "help:project.work,total_effort:"
msgid "Estimated total effort for this work and the sub-works"
msgstr "El esfuerzo total estimado para esta actividad y sus subactividades."
@@ -104,11 +140,11 @@ msgstr "Tareas"
msgctxt "model:ir.action,name:act_work_list"
msgid "Works Efforts"
-msgstr "Actividades"
+msgstr "Proyectos y tareas"
msgctxt "model:ir.action,name:act_work_tree"
msgid "Works Efforts"
-msgstr "Actividades"
+msgstr "Proyectos y tareas"
msgctxt "model:ir.ui.menu,name:menu_configuration"
msgid "Configuration"
@@ -132,15 +168,15 @@ msgstr "Tareas"
msgctxt "model:ir.ui.menu,name:menu_work_list"
msgid "Works Efforts"
-msgstr "Actividades"
+msgstr "Proyectos y tareas"
msgctxt "model:ir.ui.menu,name:menu_work_tree"
msgid "Works Efforts"
-msgstr "Actividades"
+msgstr "Proyectos y tareas"
msgctxt "model:project.work,name:"
msgid "Work Effort"
-msgstr "Actividades"
+msgstr "Proyecto y tarea"
msgctxt "model:res.group,name:group_project_admin"
msgid "Project Administration"
@@ -148,7 +184,7 @@ msgstr "Administración de proyecto"
msgctxt "selection:project.work,state:"
msgid "Done"
-msgstr "Realizada"
+msgstr "Realizado"
msgctxt "selection:project.work,state:"
msgid "Opened"
@@ -171,33 +207,9 @@ msgid "General"
msgstr "General"
msgctxt "view:project.work:"
-msgid "Other Info"
-msgstr "Información adicional"
-
-msgctxt "view:project.work:"
-msgid "Projects"
-msgstr "Proyectos"
-
-msgctxt "view:project.work:"
msgid "Tasks"
msgstr "Tareas"
msgctxt "view:project.work:"
-msgid "Timesheet"
-msgstr "Parte de trabajo"
-
-msgctxt "view:project.work:"
-msgid "Work"
-msgstr "Actividad"
-
-msgctxt "view:project.work:"
-msgid "Work Efforts"
-msgstr "Actividades"
-
-msgctxt "view:project.work:"
-msgid "Works"
-msgstr "Actividades"
-
-msgctxt "view:project.work:"
msgid "Works Efforts"
-msgstr "Actividades"
+msgstr "Proyectos y tareas"
diff --git a/locale/fr_FR.po b/locale/fr_FR.po
index 17fd3dd..3025d37 100644
--- a/locale/fr_FR.po
+++ b/locale/fr_FR.po
@@ -3,16 +3,28 @@ msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
msgctxt "error:project.work:"
-msgid "There should be only one timesheet work by task/project!"
+msgid "There should be only one timesheet work by task/project."
+msgstr "Il ne doit y avoir qu'une feuille de présence par tâche/projet."
+
+msgctxt "error:project.work:"
+msgid ""
+"Work \"%(child)s\" can not be opened because its parent work \"%(parent)s\" "
+"is already done.\""
msgstr ""
-"Il ne doit y avoir qu'une seule tâche de feuille de présence par "
-"tâche/projet !"
+"Le travail \"%(child)s\" ne peut être ouvert car son traval parent "
+"\"%(parent)s\" est terminé."
msgctxt "error:project.work:"
-msgid "There should be only one timesheet work by task/project!"
+msgid ""
+"Work \"%(parent)s\" can not be done because its child work \"%(child)s\" is "
+"still opened.\""
msgstr ""
-"Il ne doit y avoir qu'une seule tâche de feuille de présence par "
-"tâche/projet !"
+"Le travail \"%(parent)s\" ne peut pas être completé car le travail enfant "
+"\"%(child)s\" est toujours ouvert."
+
+msgctxt "field:project.work,active:"
+msgid "Active"
+msgstr "Actif"
msgctxt "field:project.work,children:"
msgid "Children"
@@ -22,6 +34,10 @@ msgctxt "field:project.work,comment:"
msgid "Comment"
msgstr "Commentaire"
+msgctxt "field:project.work,company:"
+msgid "Company"
+msgstr "Société"
+
msgctxt "field:project.work,create_date:"
msgid "Create Date"
msgstr "Date de création"
@@ -34,6 +50,10 @@ msgctxt "field:project.work,effort:"
msgid "Effort"
msgstr "Effort"
+msgctxt "field:project.work,hours:"
+msgid "Timesheet Hours"
+msgstr "Heures"
+
msgctxt "field:project.work,id:"
msgid "ID"
msgstr "ID"
@@ -62,6 +82,10 @@ msgctxt "field:project.work,state:"
msgid "State"
msgstr "État"
+msgctxt "field:project.work,timesheet_available:"
+msgid "Available on timesheets"
+msgstr "Disponible sur les feuilles de présence"
+
msgctxt "field:project.work,total_effort:"
msgid "Total Effort"
msgstr "Effort total"
@@ -90,6 +114,10 @@ msgctxt "help:project.work,effort:"
msgid "Estimated Effort for this work"
msgstr "Effort estimé pour cette activité"
+msgctxt "help:project.work,hours:"
+msgid "Total time spent on this work"
+msgstr "Temps total passé sur cette activité"
+
msgctxt "help:project.work,total_effort:"
msgid "Estimated total effort for this work and the sub-works"
msgstr "Effort total estimé pour cette activité et ses sous-activités"
@@ -203,14 +231,6 @@ msgid "General"
msgstr "General"
msgctxt "view:project.work:"
-msgid "Other Info"
-msgstr "Autre information"
-
-msgctxt "view:project.work:"
-msgid "Projects"
-msgstr "Projets"
-
-msgctxt "view:project.work:"
msgid "Tasks"
msgstr "Tâche"
@@ -219,26 +239,6 @@ msgid "Tasks"
msgstr "Tâche"
msgctxt "view:project.work:"
-msgid "Timesheet"
-msgstr "Feuille de présence"
-
-msgctxt "view:project.work:"
-msgid "Timesheet"
-msgstr "Feuille de présence"
-
-msgctxt "view:project.work:"
-msgid "Work"
-msgstr "Travail"
-
-msgctxt "view:project.work:"
-msgid "Work Efforts"
-msgstr "Activités"
-
-msgctxt "view:project.work:"
-msgid "Works"
-msgstr "Travaux"
-
-msgctxt "view:project.work:"
msgid "Works Efforts"
msgstr "Efforts de travail"
diff --git a/locale/nl_NL.po b/locale/nl_NL.po
index 7af2951..de39548 100644
--- a/locale/nl_NL.po
+++ b/locale/nl_NL.po
@@ -3,9 +3,26 @@ msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
msgctxt "error:project.work:"
-msgid "There should be only one timesheet work by task/project!"
+msgid "There should be only one timesheet work by task/project."
msgstr ""
+msgctxt "error:project.work:"
+msgid ""
+"Work \"%(child)s\" can not be opened because its parent work \"%(parent)s\" "
+"is already done.\""
+msgstr ""
+
+msgctxt "error:project.work:"
+msgid ""
+"Work \"%(parent)s\" can not be done because its child work \"%(child)s\" is "
+"still opened.\""
+msgstr ""
+
+#, fuzzy
+msgctxt "field:project.work,active:"
+msgid "Active"
+msgstr "Actief"
+
#, fuzzy
msgctxt "field:project.work,children:"
msgid "Children"
@@ -16,6 +33,11 @@ msgctxt "field:project.work,comment:"
msgid "Comment"
msgstr "Opmerking"
+#, fuzzy
+msgctxt "field:project.work,company:"
+msgid "Company"
+msgstr "Bedrijf"
+
msgctxt "field:project.work,create_date:"
msgid "Create Date"
msgstr ""
@@ -28,6 +50,11 @@ msgctxt "field:project.work,effort:"
msgid "Effort"
msgstr ""
+#, fuzzy
+msgctxt "field:project.work,hours:"
+msgid "Timesheet Hours"
+msgstr "Tijdregistratie uren"
+
msgctxt "field:project.work,id:"
msgid "ID"
msgstr ""
@@ -61,6 +88,11 @@ msgctxt "field:project.work,state:"
msgid "State"
msgstr "Status"
+#, fuzzy
+msgctxt "field:project.work,timesheet_available:"
+msgid "Available on timesheets"
+msgstr "Beschikbaar in tijdregistartie"
+
msgctxt "field:project.work,total_effort:"
msgid "Total Effort"
msgstr ""
@@ -87,6 +119,11 @@ msgctxt "help:project.work,effort:"
msgid "Estimated Effort for this work"
msgstr ""
+#, fuzzy
+msgctxt "help:project.work,hours:"
+msgid "Total time spent on this work"
+msgstr "Tijd besteed aan dit werk"
+
msgctxt "help:project.work,total_effort:"
msgid "Estimated total effort for this work and the sub-works"
msgstr ""
@@ -181,18 +218,9 @@ msgid "General"
msgstr "Algemeen"
msgctxt "view:project.work:"
-msgid "Projects"
-msgstr ""
-
-msgctxt "view:project.work:"
msgid "Tasks"
msgstr ""
-#, fuzzy
-msgctxt "view:project.work:"
-msgid "Timesheet"
-msgstr "Tijdverantwoording"
-
msgctxt "view:project.work:"
msgid "Works Efforts"
msgstr ""
diff --git a/locale/ru_RU.po b/locale/ru_RU.po
index 7687e46..6247a78 100644
--- a/locale/ru_RU.po
+++ b/locale/ru_RU.po
@@ -3,194 +3,209 @@ msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
msgctxt "error:project.work:"
-msgid "There should be only one timesheet work by task/project!"
+msgid "There should be only one timesheet work by task/project."
+msgstr "Должен быть только один рабочий табель у задачи/проекта."
+
+msgctxt "error:project.work:"
+msgid ""
+"Work \"%(child)s\" can not be opened because its parent work \"%(parent)s\" "
+"is already done.\""
+msgstr ""
+"Работа \"%(child)s\" не может быть открыта так как её предок \"%(parent)s\" "
+"уже выполнен."
+
+msgctxt "error:project.work:"
+msgid ""
+"Work \"%(parent)s\" can not be done because its child work \"%(child)s\" is "
+"still opened.\""
msgstr ""
+"Работа \"%(parent)s\" не может быть завершена так как её Ð¿Ð¾Ð´Ñ‡Ð¸Ð½ÐµÐ½Ð½Ð°Ñ Ñ€Ð°Ð±Ð¾Ñ‚Ð° "
+"\"%(child)s\" вÑÑ‘ ещё открыты."
+
+msgctxt "field:project.work,active:"
+msgid "Active"
+msgstr "ДейÑтвующий"
-#, fuzzy
msgctxt "field:project.work,children:"
msgid "Children"
msgstr "Подчиненый"
-#, fuzzy
msgctxt "field:project.work,comment:"
msgid "Comment"
msgstr "Комментарии"
+msgctxt "field:project.work,company:"
+msgid "Company"
+msgstr "ОрганизациÑ"
+
msgctxt "field:project.work,create_date:"
msgid "Create Date"
-msgstr ""
+msgstr "Дата ÑозданиÑ"
msgctxt "field:project.work,create_uid:"
msgid "Create User"
-msgstr ""
+msgstr "Создано пользователем"
msgctxt "field:project.work,effort:"
msgid "Effort"
-msgstr ""
+msgstr "Затраты"
+
+msgctxt "field:project.work,hours:"
+msgid "Timesheet Hours"
+msgstr "ЧаÑÑ‹ табелÑ"
msgctxt "field:project.work,id:"
msgid "ID"
-msgstr ""
+msgstr "ID"
-#, fuzzy
msgctxt "field:project.work,parent:"
msgid "Parent"
-msgstr "ОÑновной"
+msgstr "Предок"
-#, fuzzy
msgctxt "field:project.work,party:"
msgid "Party"
-msgstr "Организации"
+msgstr "Контрагент"
-#, fuzzy
msgctxt "field:project.work,party_address:"
msgid "Contact Address"
msgstr "Контактный адреÑ"
-#, fuzzy
msgctxt "field:project.work,rec_name:"
msgid "Name"
msgstr "Ðаименование"
-#, fuzzy
msgctxt "field:project.work,sequence:"
msgid "Sequence"
-msgstr "ПоÑледовательноÑÑ‚ÑŒ"
+msgstr "ÐумерациÑ"
-#, fuzzy
msgctxt "field:project.work,state:"
msgid "State"
-msgstr "СтатуÑ"
+msgstr "СоÑтоÑние"
+
+msgctxt "field:project.work,timesheet_available:"
+msgid "Available on timesheets"
+msgstr "ДоÑтупно в табелÑÑ…"
msgctxt "field:project.work,total_effort:"
msgid "Total Effort"
-msgstr ""
+msgstr "Общие затраты"
-#, fuzzy
msgctxt "field:project.work,type:"
msgid "Type"
msgstr "Тип"
msgctxt "field:project.work,work:"
msgid "Work"
-msgstr ""
+msgstr "Работа"
msgctxt "field:project.work,write_date:"
msgid "Write Date"
-msgstr ""
+msgstr "Дата изменениÑ"
msgctxt "field:project.work,write_uid:"
msgid "Write User"
-msgstr ""
+msgstr "Изменено пользователем"
msgctxt "help:project.work,effort:"
msgid "Estimated Effort for this work"
-msgstr ""
+msgstr "Предположительные затраты Ð´Ð»Ñ Ñтой работы"
+
+msgctxt "help:project.work,hours:"
+msgid "Total time spent on this work"
+msgstr "Общее Ð²Ñ€ÐµÐ¼Ñ Ð¿Ð¾Ñ‚Ñ€Ð°Ñ‡ÐµÐ½Ð½Ð¾Ðµ на Ñту работу"
msgctxt "help:project.work,total_effort:"
msgid "Estimated total effort for this work and the sub-works"
-msgstr ""
+msgstr "Предположительные общие затраты Ð´Ð»Ñ Ñтой работы и подчиненных работ"
msgctxt "model:ir.action,name:act_open_child_work"
msgid "Tasks"
-msgstr ""
+msgstr "Задачи"
msgctxt "model:ir.action,name:act_project_form"
msgid "Projects"
-msgstr ""
+msgstr "Проекты"
msgctxt "model:ir.action,name:act_project_tree"
msgid "Projects"
-msgstr ""
+msgstr "Проекты"
msgctxt "model:ir.action,name:act_task_form"
msgid "Tasks"
-msgstr ""
+msgstr "Задачи"
msgctxt "model:ir.action,name:act_work_list"
msgid "Works Efforts"
-msgstr ""
+msgstr "Рабочие затраты"
msgctxt "model:ir.action,name:act_work_tree"
msgid "Works Efforts"
-msgstr ""
+msgstr "Рабочие затраты"
-#, fuzzy
msgctxt "model:ir.ui.menu,name:menu_configuration"
msgid "Configuration"
msgstr "КонфигурациÑ"
msgctxt "model:ir.ui.menu,name:menu_project"
msgid "Project"
-msgstr ""
+msgstr "Проектирование"
msgctxt "model:ir.ui.menu,name:menu_project_form"
msgid "Projects"
-msgstr ""
+msgstr "Проекты"
msgctxt "model:ir.ui.menu,name:menu_project_tree"
msgid "Projects"
-msgstr ""
+msgstr "Проекты"
msgctxt "model:ir.ui.menu,name:menu_task_form"
msgid "Tasks"
-msgstr ""
+msgstr "Задачи"
msgctxt "model:ir.ui.menu,name:menu_work_list"
msgid "Works Efforts"
-msgstr ""
+msgstr "Рабочие затраты"
msgctxt "model:ir.ui.menu,name:menu_work_tree"
msgid "Works Efforts"
-msgstr ""
+msgstr "Рабочие затраты"
msgctxt "model:project.work,name:"
msgid "Work Effort"
-msgstr ""
+msgstr "Рабочие затраты"
msgctxt "model:res.group,name:group_project_admin"
msgid "Project Administration"
-msgstr ""
+msgstr "ÐдминиÑтрирование проектированиÑ"
-#, fuzzy
msgctxt "selection:project.work,state:"
msgid "Done"
msgstr "Выполнено"
msgctxt "selection:project.work,state:"
msgid "Opened"
-msgstr ""
+msgstr "Открыт"
msgctxt "selection:project.work,type:"
msgid "Project"
-msgstr ""
+msgstr "Проект"
msgctxt "selection:project.work,type:"
msgid "Task"
-msgstr ""
+msgstr "Задача"
-#, fuzzy
msgctxt "view:project.work:"
msgid "Children"
msgstr "Подчиненый"
-#, fuzzy
msgctxt "view:project.work:"
msgid "General"
msgstr "ОÑновной"
msgctxt "view:project.work:"
-msgid "Projects"
-msgstr ""
-
-msgctxt "view:project.work:"
msgid "Tasks"
-msgstr ""
-
-msgctxt "view:project.work:"
-msgid "Timesheet"
-msgstr ""
+msgstr "Задачи"
msgctxt "view:project.work:"
msgid "Works Efforts"
-msgstr ""
+msgstr "Рабочие затраты"
diff --git a/setup.py b/setup.py
index d344a09..c489fbb 100644
--- a/setup.py
+++ b/setup.py
@@ -25,10 +25,10 @@ requires = []
for dep in info.get('depends', []):
if not re.match(r'(ir|res|webdav)(\W|$)', dep):
requires.append('trytond_%s >= %s.%s, < %s.%s' %
- (dep, major_version, minor_version, major_version,
- minor_version + 1))
+ (dep, major_version, minor_version, major_version,
+ minor_version + 1))
requires.append('trytond >= %s.%s, < %s.%s' %
- (major_version, minor_version, major_version, minor_version + 1))
+ (major_version, minor_version, major_version, minor_version + 1))
setup(name='trytond_project',
version=info.get('version', '0.0.1'),
@@ -36,16 +36,16 @@ setup(name='trytond_project',
long_description=read('README'),
author='Tryton',
url='http://www.tryton.org/',
- download_url="http://downloads.tryton.org/" + \
- info.get('version', '0.0.1').rsplit('.', 1)[0] + '/',
+ download_url=("http://downloads.tryton.org/" +
+ info.get('version', '0.0.1').rsplit('.', 1)[0] + '/'),
package_dir={'trytond.modules.project': '.'},
packages=[
'trytond.modules.project',
'trytond.modules.project.tests',
],
package_data={
- 'trytond.modules.project': info.get('xml', []) \
- + ['tryton.cfg', 'locale/*.po', 'icons/*.svg'],
+ 'trytond.modules.project': (info.get('xml', [])
+ + ['tryton.cfg', 'view/*.xml', 'locale/*.po', 'icons/*.svg']),
},
classifiers=[
'Development Status :: 5 - Production/Stable',
@@ -57,6 +57,7 @@ setup(name='trytond_project',
'Intended Audience :: Manufacturing',
'License :: OSI Approved :: GNU General Public License (GPL)',
'Natural Language :: Bulgarian',
+ 'Natural Language :: Catalan',
'Natural Language :: Czech',
'Natural Language :: Dutch',
'Natural Language :: English',
diff --git a/tryton.cfg b/tryton.cfg
index 000c771..16bb2b5 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
[tryton]
-version=2.6.0
+version=2.8.0
depends:
company_work_time
ir
diff --git a/trytond_project.egg-info/PKG-INFO b/trytond_project.egg-info/PKG-INFO
index 54b19d1..cd94456 100644
--- a/trytond_project.egg-info/PKG-INFO
+++ b/trytond_project.egg-info/PKG-INFO
@@ -1,12 +1,12 @@
-Metadata-Version: 1.0
+Metadata-Version: 1.1
Name: trytond-project
-Version: 2.6.0
+Version: 2.8.0
Summary: Tryton module with projects
Home-page: http://www.tryton.org/
Author: Tryton
Author-email: UNKNOWN
License: GPL-3
-Download-URL: http://downloads.tryton.org/2.6/
+Download-URL: http://downloads.tryton.org/2.8/
Description: trytond_project
===============
@@ -53,6 +53,7 @@ Classifier: Intended Audience :: Legal Industry
Classifier: Intended Audience :: Manufacturing
Classifier: License :: OSI Approved :: GNU General Public License (GPL)
Classifier: Natural Language :: Bulgarian
+Classifier: Natural Language :: Catalan
Classifier: Natural Language :: Czech
Classifier: Natural Language :: Dutch
Classifier: Natural Language :: English
diff --git a/trytond_project.egg-info/SOURCES.txt b/trytond_project.egg-info/SOURCES.txt
index 4388ec4..b247979 100644
--- a/trytond_project.egg-info/SOURCES.txt
+++ b/trytond_project.egg-info/SOURCES.txt
@@ -30,4 +30,8 @@ trytond_project.egg-info/dependency_links.txt
trytond_project.egg-info/entry_points.txt
trytond_project.egg-info/not-zip-safe
trytond_project.egg-info/requires.txt
-trytond_project.egg-info/top_level.txt
\ No newline at end of file
+trytond_project.egg-info/top_level.txt
+view/work_form.xml
+view/work_list.xml
+view/work_list2.xml
+view/work_tree.xml
\ No newline at end of file
diff --git a/trytond_project.egg-info/requires.txt b/trytond_project.egg-info/requires.txt
index 655359d..676d1ca 100644
--- a/trytond_project.egg-info/requires.txt
+++ b/trytond_project.egg-info/requires.txt
@@ -1,4 +1,4 @@
-trytond_company_work_time >= 2.6, < 2.7
-trytond_party >= 2.6, < 2.7
-trytond_timesheet >= 2.6, < 2.7
-trytond >= 2.6, < 2.7
\ No newline at end of file
+trytond_company_work_time >= 2.8, < 2.9
+trytond_party >= 2.8, < 2.9
+trytond_timesheet >= 2.8, < 2.9
+trytond >= 2.8, < 2.9
\ No newline at end of file
diff --git a/view/work_form.xml b/view/work_form.xml
new file mode 100644
index 0000000..db8aca2
--- /dev/null
+++ b/view/work_form.xml
@@ -0,0 +1,50 @@
+<?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="Works Efforts" col="6">
+ <label name="work"/>
+ <field name="work" colspan="3"/>
+ <label name="active"/>
+ <field name="active" xexpand="0"/>
+ <label name="type"/>
+ <field name="type"/>
+ <label name="parent"/>
+ <field name="parent"/>
+ <label name="sequence"/>
+ <field name="sequence"/>
+ <label name="company"/>
+ <field name="company"/>
+ <label name="party"/>
+ <field name="party"/>
+ <label name="party_address"/>
+ <field name="party_address"/>
+ <notebook colspan="8">
+ <page string="General" id="general" col="6">
+ <label name="timesheet_available"/>
+ <field name="timesheet_available"/>
+ <newline/>
+ <label name="effort"/>
+ <field name="effort" widget="float_time" float_time="company_work_time"/>
+ <newline/>
+ <label name="hours"/>
+ <field name="hours" widget="float_time" float_time="company_work_time"/>
+ <label name="total_effort"/>
+ <field name="total_effort" widget="float_time" float_time="company_work_time"/>
+ <newline/>
+ <separator name="comment" colspan="6"/>
+ <field name="comment" colspan="6"/>
+ <group col="4" colspan="6" id="state_buttons">
+ <group col="2" colspan="2" id="state">
+ <label name="state"/>
+ <field name="state"/>
+ </group>
+ <group col="20" colspan="2" id="buttons">
+ </group>
+ </group>
+ </page>
+ <page string="Children" id="children"
+ states="{'invisible': Not(Equal(Eval('type'), 'project'))}">
+ <field name="children" colspan="4"/>
+ </page>
+ </notebook>
+</form>
diff --git a/view/work_list.xml b/view/work_list.xml
new file mode 100644
index 0000000..6b28430
--- /dev/null
+++ b/view/work_list.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0"?>
+<!-- This file is part of Tryton. The COPYRIGHT file at the top level of
+this repository contains the full copyright notices and license terms. -->
+<tree string="Works Efforts">
+ <field name="work"/>
+ <field name="hours" widget="float_time" float_time="company_work_time"/>
+ <field name="total_effort" widget="float_time"
+ float_time="company_work_time"/>
+ <field name="type"/>
+ <field name="state"/>
+ <field name="active" tree_invisible="1"/>
+</tree>
diff --git a/view/work_list2.xml b/view/work_list2.xml
new file mode 100644
index 0000000..6f57569
--- /dev/null
+++ b/view/work_list2.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0"?>
+<!-- This file is part of Tryton. The COPYRIGHT file at the top level of
+this repository contains the full copyright notices and license terms. -->
+<tree string="Tasks">
+ <field name="work"/>
+ <field name="hours" widget="float_time" float_time="company_work_time"/>
+ <field name="total_effort" widget="float_time"
+ float_time="company_work_time"/>
+ <field name="state"/>
+ <field name="active" tree_invisible="1"/>
+</tree>
diff --git a/view/work_tree.xml b/view/work_tree.xml
new file mode 100644
index 0000000..dbb8fcd
--- /dev/null
+++ b/view/work_tree.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0"?>
+<!-- This file is part of Tryton. The COPYRIGHT file at the top level of
+this repository contains the full copyright notices and license terms. -->
+<tree string="Works Efforts">
+ <field name="rec_name"/>
+ <field name="hours" widget="float_time" float_time="company_work_time"/>
+ <field name="total_effort" widget="float_time" float_time="company_work_time"/>
+ <field name="type"/>
+ <field name="state"/>
+ <field name="active" tree_invisible="1"/>
+ <field name="parent" tree_invisible="1"/>
+ <field name="children" tree_invisible="1"/>
+</tree>
diff --git a/work.py b/work.py
index 64fdfcf..f01f724 100644
--- a/work.py
+++ b/work.py
@@ -12,14 +12,18 @@ __all__ = ['Work']
class Work(ModelSQL, ModelView):
'Work Effort'
__name__ = 'project.work'
- _inherits = {'timesheet.work': 'work'}
+ _rec_name = 'work'
work = fields.Many2One('timesheet.work', 'Work', required=True,
ondelete='CASCADE')
+ active = fields.Function(fields.Boolean('Active'),
+ 'get_active', setter='set_active', searcher='search_active')
type = fields.Selection([
('project', 'Project'),
('task', 'Task')
],
'Type', required=True, select=True)
+ company = fields.Function(fields.Many2One('company.company', 'Company'),
+ 'get_company', searcher='search_comany')
party = fields.Many2One('party.party', 'Party',
states={
'invisible': Eval('type') != 'project',
@@ -29,6 +33,14 @@ class Work(ModelSQL, ModelView):
states={
'invisible': Eval('type') != 'project',
}, depends=['party', 'type'])
+ timesheet_available = fields.Function(
+ fields.Boolean('Available on timesheets'), 'get_timesheet_available')
+ hours = fields.Function(fields.Float('Timesheet Hours', digits=(16, 2),
+ states={
+ 'invisible': ~Eval('timesheet_available'),
+ },
+ depends=['timesheet_available'],
+ help="Total time spent on this work"), 'get_hours')
effort = fields.Float("Effort",
states={
'invisible': Eval('type') != 'task',
@@ -80,8 +92,8 @@ class Work(ModelSQL, ModelView):
TimesheetWork._table, cls._table))
for sequence, id_ in cursor.fetchall():
sql = ('UPDATE "%s" '
- 'SET sequence = %%s '
- 'WHERE work = %%s' % cls._table)
+ 'SET sequence = %%s '
+ 'WHERE work = %%s' % cls._table)
cursor.execute(sql, (sequence, id_))
# Migration from 2.4: drop required on sequence
@@ -91,23 +103,75 @@ class Work(ModelSQL, ModelView):
def __setup__(cls):
super(Work, cls).__setup__()
cls._sql_constraints += [
- ('work_uniq', 'UNIQUE(work)', 'There should be only one '\
- 'timesheet work by task/project!'),
+ ('work_uniq', 'UNIQUE(work)', 'There should be only one '
+ 'timesheet work by task/project.'),
]
cls._order.insert(0, ('sequence', 'ASC'))
- cls._constraints += [
- ('check_state',
- 'A work can not be closed if its children are still opened'),
- ]
+ cls._error_messages.update({
+ 'invalid_parent_state': ('Work "%(child)s" can not be opened '
+ 'because its parent work "%(parent)s" is already done."'),
+ 'invalid_children_state': ('Work "%(parent)s" can not be '
+ 'done because its child work "%(child)s" is still '
+ 'opened."'),
+ })
+
+ @classmethod
+ def validate(cls, works):
+ super(Work, cls).validate(works)
+ for work in works:
+ work.check_state()
def check_state(self):
- if ((self.state == 'opened'
- and (self.parent and self.parent.state == 'done'))
- or (self.state == 'done'
- and any(c.state == 'opened' for c in self.children))):
- return False
+ if (self.state == 'opened'
+ and (self.parent and self.parent.state == 'done')):
+ self.raise_user_error('invalid_parent_state', {
+ 'child': self.rec_name,
+ 'parent': self.parent.rec_name,
+ })
+ if self.state == 'done':
+ for child in self.children:
+ if child.state == 'opened':
+ self.raise_user_error('invalid_children_state', {
+ 'parent': self.rec_name,
+ 'child': child.rec_name,
+ })
+
+ def get_rec_name(self, name):
+ return self.work.name
+
+ @staticmethod
+ def default_active():
return True
+ def get_active(self, name):
+ return self.work.active
+
+ @classmethod
+ def set_active(self, works, name, value):
+ pool = Pool()
+ Work = pool.get('timesheet.work')
+
+ Work.write([p.work for p in works], {
+ 'active': value,
+ })
+
+ @classmethod
+ def search_active(cls, name, clause):
+ return [('work.active',) + tuple(clause[1:])]
+
+ def get_company(self, name):
+ return self.work.company.id
+
+ @classmethod
+ def search_comany(cls, name, clause):
+ return [('work.company',) + tuple(clause[1:])]
+
+ def get_timesheet_available(self, name):
+ return self.work.timesheet_available
+
+ def get_hours(self, name):
+ return self.work.hours
+
@classmethod
def get_parent(cls, project_works, name):
parents = dict.fromkeys([w.id for w in project_works], None)
@@ -203,41 +267,38 @@ class Work(ModelSQL, ModelView):
return [('work', 'in', tw_ids)]
- @classmethod
- def get_total_effort(cls, works, name):
-
- works = cls.search([
- ('parent', 'child_of', [w.id for w in works]),
- ('active', '=', True),
- ]) + works
- works = set(works)
-
- res = {}
- id2work = {}
+ @staticmethod
+ def sum_tree(works, getter):
leafs = set()
+ result = {}
for work in works:
- res[work.id] = work.effort or 0
- id2work[work.id] = work
if not work.children:
- leafs.add(work.id)
+ leafs.add(work)
+ result[work.id] = getter(work)
+ works = set(works)
while leafs:
- for work_id in leafs:
- work = id2work[work_id]
+ for work in leafs:
works.remove(work)
- if not work.active:
- continue
- if work.parent and work.parent.id in res:
- res[work.parent.id] += res[work_id]
- next_leafs = set((w.id for w in works))
+ if work.parent and work.parent.id in result:
+ result[work.parent.id] += result[work.id]
+ next_leafs = set(w for w in works)
for work in works:
if not work.parent:
continue
if work.parent.id in next_leafs and work.parent in works:
- next_leafs.remove(work.parent.id)
+ next_leafs.remove(work.parent)
leafs = next_leafs
+ return result
+
+ @classmethod
+ def get_total_effort(cls, works, name):
- return res
+ works = cls.search([
+ ('parent', 'child_of', [w.id for w in works]),
+ ('active', '=', True),
+ ]) + works
+ return cls.sum_tree(works, lambda w: w.effort or 0)
@classmethod
def copy(cls, project_works, default=None):
diff --git a/work.xml b/work.xml
index 7a7ba0b..b539361 100644
--- a/work.xml
+++ b/work.xml
@@ -3,113 +3,30 @@
this repository contains the full copyright notices and license terms. -->
<tryton>
<data>
- <!-- default tree view -->
<record model="ir.ui.view" id="work_view_tree">
<field name="model">project.work</field>
<field name="type">tree</field>
<field name="priority" eval="20"/>
<field name="field_childs">children</field>
- <field name="arch" type="xml">
- <![CDATA[
- <tree string="Works Efforts">
- <field name="name"/>
- <field name="hours" widget="float_time" float_time="company_work_time"/>
- <field name="total_effort" widget="float_time" float_time="company_work_time"/>
- <field name="type"/>
- <field name="state"/>
- <field name="active" tree_invisible="1"/>
- <field name="parent" tree_invisible="1"/>
- <field name="children" tree_invisible="1"/>
- </tree>
- ]]>
- </field>
+ <field name="name">work_tree</field>
</record>
<record model="ir.ui.view" id="work_view_list">
<field name="model">project.work</field>
<field name="type">tree</field>
<field name="priority" eval="10"/>
- <field name="arch" type="xml">
- <![CDATA[
- <tree string="Works Efforts">
- <field name="name"/>
- <field name="hours" widget="float_time" float_time="company_work_time"/>
- <field name="total_effort" widget="float_time" float_time="company_work_time"/>
- <field name="type"/>
- <field name="state"/>
- <field name="active" tree_invisible="1"/>
- </tree>
- ]]>
- </field>
+ <field name="name">work_list</field>
</record>
- <!-- list view for tasks (wihtout type field) -->
<record model="ir.ui.view" id="work_view_list2">
<field name="model">project.work</field>
<field name="type">tree</field>
- <field name="arch" type="xml">
- <![CDATA[
- <tree string="Tasks">
- <field name="name"/>
- <field name="hours" widget="float_time" float_time="company_work_time"/>
- <field name="total_effort" widget="float_time" float_time="company_work_time"/>
- <field name="state"/>
- <field name="active" tree_invisible="1"/>
- </tree>
- ]]>
- </field>
+ <field name="name">work_list2</field>
</record>
<record model="ir.ui.view" id="work_view_form">
<field name="model">project.work</field>
<field name="type">form</field>
- <field name="arch" type="xml">
- <![CDATA[
- <form string="Works Efforts" col="6">
- <label name="name"/>
- <field name="name" colspan="3"/>
- <label name="active"/>
- <field name="active" xexpand="0"/>
- <label name="type"/>
- <field name="type"/>
- <label name="parent"/>
- <field name="parent"/>
- <label name="sequence"/>
- <field name="sequence"/>
- <label name="company"/>
- <field name="company"/>
- <label name="party"/>
- <field name="party"/>
- <label name="party_address"/>
- <field name="party_address"/>
- <notebook colspan="8">
- <page string="General" id="general" col="6">
- <group col="2" colspan="6" id="timesheet_available">
- <label name="timesheet_available"/>
- <field name="timesheet_available"/>
- </group>
- <label name="hours"/>
- <field name="hours" widget="float_time" float_time="company_work_time"/>
- <label name="total_effort"/>
- <field name="total_effort" widget="float_time" float_time="company_work_time"/>
- <label name="effort"/>
- <field name="effort" widget="float_time" float_time="company_work_time"/>
- <separator name="comment" colspan="6"/>
- <field name="comment" colspan="6"/>
- </page>
- <page string="Children" id="children"
- states="{'invisible': Not(Equal(Eval('type'), 'project'))}">
- <field name="children" colspan="4"/>
- </page>
- <page string="Timesheet" id="timesheet_lines"
- states="{'invisible': Not(Bool(Eval('timesheet_available')))}">
- <field name="timesheet_lines" colspan="4"/>
- </page>
- </notebook>
- <label name="state"/>
- <field name="state"/>
- </form>
- ]]>
- </field>
+ <field name="name">work_form</field>
</record>
<record model="ir.action.act_window" id="act_work_tree">
<field name="name">Works Efforts</field>
commit 994ce4cf60ea110ed697f75c278f308bff9d2387
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Sat Apr 27 18:44:53 2013 +0200
Releasing debian version 2.6.0-4.
diff --git a/debian/changelog b/debian/changelog
index b480821..e3460a3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+tryton-modules-project (2.6.0-4) experimental; urgency=low
+
+ * Removing Daniel from Uploaders. Thanks for your work! (Closes: #704392).
+ * Improving update of major version in Depends.
+
+ -- Mathias Behrle <mathiasb at m9s.biz> Sat, 27 Apr 2013 15:08:05 +0200
+
tryton-modules-project (2.6.0-3) experimental; urgency=low
* Updating Vcs-Git to correct address.
commit 19187999a133c3d69ea5c6e44589d8fc188cc3e0
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Sat Apr 27 14:54:48 2013 +0200
Improving update of major version in Depends.
Pulling the major version for Depends directly from the package version.
Thanks to Ilya Melnikov for pushing the idea.
diff --git a/debian/control b/debian/control
index 785bd52..699446e 100644
--- a/debian/control
+++ b/debian/control
@@ -13,9 +13,9 @@ X-Python-Version: >= 2.6
Package: tryton-modules-project
Architecture: all
Depends:
- ${misc:Depends}, ${python:Depends}, tryton-server (>= 2.6),
- tryton-modules-party (>= 2.6), tryton-modules-timesheet (>= 2.6),
- python-pkg-resources
+ ${misc:Depends}, ${python:Depends}, tryton-server (>= ${version:major}),
+ tryton-modules-party (>= ${version:major}),
+ tryton-modules-timesheet (>= ${version:major}), python-pkg-resources
Description: Tryton Application Platform (Project Module)
Tryton is a high-level general purpose application platform written in Python
and using PostgreSQL as database engine. It is the core base of a complete
diff --git a/debian/rules b/debian/rules
index 1ae0776..0f63ab4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,5 +1,7 @@
#!/usr/bin/make -f
+MAJOR := $(shell python setup.py --version | awk -F "." '{print $$1 "." $$2}')
+
%:
dh ${@} --with python2
@@ -8,5 +10,8 @@ override_dh_auto_clean:
rm -rf *.egg-info
+override_dh_gencontrol:
+ dh_gencontrol -- -Vversion:major="$(MAJOR)"
+
override_dh_builddeb:
dh_builddeb -- -Zxz -z9
commit e6c455cea217011f65b890063514be16489bb0a7
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Sun Apr 21 23:34:44 2013 +0200
Removing Daniel from Uploaders. Thanks for your work! (Closes: #704392).
diff --git a/debian/control b/debian/control
index 208cab8..785bd52 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: tryton-modules-project
Section: python
Priority: optional
Maintainer: Debian Tryton Maintainers <maintainers at debian.tryton.org>
-Uploaders: Daniel Baumann <daniel at debian.org>, Mathias Behrle <mathiasb at m9s.biz>
+Uploaders: Mathias Behrle <mathiasb at m9s.biz>
Build-Depends: debhelper (>= 9), python (>= 2.6.6-3~), python-setuptools
Standards-Version: 3.9.4
Homepage: http://www.tryton.org/
commit c25480a072f9c8d30707d5c21633bc997ce022d8
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Sat Mar 23 15:04:10 2013 +0100
Releasing debian version 2.6.0-3.
diff --git a/debian/changelog b/debian/changelog
index 587f176..b480821 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+tryton-modules-project (2.6.0-3) experimental; urgency=low
+
+ * Updating Vcs-Git to correct address.
+ * Adding watch file. Thanks to Bart Martens <bartm at debian.org>.
+
+ -- Mathias Behrle <mathiasb at m9s.biz> Sat, 23 Mar 2013 14:01:01 +0100
+
tryton-modules-project (2.6.0-2) experimental; urgency=low
* Removing obsolete Dm-Upload-Allowed
commit f7fb4cc0ee7aabc0912a8e9c8323be25fe46f17b
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Sat Mar 23 13:52:33 2013 +0100
Adding watch file. Thanks to Bart Martens <bartm at debian.org>.
diff --git a/debian/watch b/debian/watch
new file mode 100644
index 0000000..af9f3d8
--- /dev/null
+++ b/debian/watch
@@ -0,0 +1,2 @@
+version=3
+http://downloads.tryton.org/current/ .*trytond_project-(\d.*)\.(?:tgz|tbz2|txz|tar\.(?:gz|bz2|xz))
commit 98bc8fd660903f52ed4b44b76bee953345036b5b
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Sat Feb 23 20:08:11 2013 +0100
Updating Vcs-Git to correct address.
diff --git a/debian/control b/debian/control
index 40f02ed..208cab8 100644
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,7 @@ Build-Depends: debhelper (>= 9), python (>= 2.6.6-3~), python-setuptools
Standards-Version: 3.9.4
Homepage: http://www.tryton.org/
Vcs-Browser: http://debian.tryton.org/gitweb/?p=packages/tryton-modules-project.git
-Vcs-Git: git://debian.tryton.org/git/packages/tryton-modules-project.git
+Vcs-Git: git://debian.tryton.org/packages/tryton-modules-project.git
X-Python-Version: >= 2.6
Package: tryton-modules-project
commit 5829578cd4b4d1e7a0d44ce14a968c42eedf46f0
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Sun Feb 17 13:50:44 2013 +0100
Releasing debian version 2.6.0-2.
diff --git a/debian/changelog b/debian/changelog
index a311c1b..587f176 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+tryton-modules-project (2.6.0-2) experimental; urgency=low
+
+ * Removing obsolete Dm-Upload-Allowed
+ * Updating to Standards-Version: 3.9.4, no changes needed.
+ * Updating copyright.
+
+ -- Mathias Behrle <mathiasb at m9s.biz> Sat, 16 Feb 2013 21:41:28 +0100
+
tryton-modules-project (2.6.0-1) experimental; urgency=low
* Merging upstream version 2.6.0.
commit f91a82e28b69d71042cf2e0eb21735320c05b717
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Sat Feb 16 21:29:20 2013 +0100
Updating copyright.
diff --git a/debian/copyright b/debian/copyright
index 8cb9f16..3b23cc7 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,8 +1,7 @@
Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Files: *
-Copyright:
- 2008-2012 Cedric Krier
+Copyright: 2008-2012 Cédric Krier
2008-2012 B2CK SPRL
2009-2012 Bertrand Chenal
License: GPL-3+
@@ -14,7 +13,7 @@ License: public-domain
Files: debian/*
Copyright:
2009-2012 Daniel Baumann <daniel at debian.org>
- 2011-2012 Mathias Behrle <mathiasb at m9s.biz>
+ 2011-2013 Mathias Behrle <mathiasb at m9s.biz>
License: GPL-3+
License: GPL-3+
commit b4e75525abc439040e2a6e67267ce160976677eb
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Fri Feb 15 19:28:35 2013 +0100
Updating to Standards-Version: 3.9.4, no changes needed.
diff --git a/debian/control b/debian/control
index f9ae267..40f02ed 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: optional
Maintainer: Debian Tryton Maintainers <maintainers at debian.tryton.org>
Uploaders: Daniel Baumann <daniel at debian.org>, Mathias Behrle <mathiasb at m9s.biz>
Build-Depends: debhelper (>= 9), python (>= 2.6.6-3~), python-setuptools
-Standards-Version: 3.9.3
+Standards-Version: 3.9.4
Homepage: http://www.tryton.org/
Vcs-Browser: http://debian.tryton.org/gitweb/?p=packages/tryton-modules-project.git
Vcs-Git: git://debian.tryton.org/git/packages/tryton-modules-project.git
commit 38c8574c9b959b9bebae70bc9fd8138e865776a1
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Wed Feb 13 21:37:13 2013 +0100
Removing obsolete Dm-Upload-Allowed
diff --git a/debian/control b/debian/control
index 306e180..f9ae267 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,6 @@ Section: python
Priority: optional
Maintainer: Debian Tryton Maintainers <maintainers at debian.tryton.org>
Uploaders: Daniel Baumann <daniel at debian.org>, Mathias Behrle <mathiasb at m9s.biz>
-Dm-Upload-Allowed: yes
Build-Depends: debhelper (>= 9), python (>= 2.6.6-3~), python-setuptools
Standards-Version: 3.9.3
Homepage: http://www.tryton.org/
commit 68bceb42cfff703a695bb3385ebdd34f4c123d92
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Wed Oct 24 22:02:08 2012 +0200
Releasing debian version 2.6.0-1.
diff --git a/debian/changelog b/debian/changelog
index da2beee..a311c1b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+tryton-modules-project (2.6.0-1) experimental; urgency=low
+
+ * Merging upstream version 2.6.0.
+ * Bumping versioned tryton depends to 2.6.
+
+ -- Mathias Behrle <mathiasb at m9s.biz> Wed, 24 Oct 2012 14:24:52 +0200
+
tryton-modules-project (2.4.0-2) experimental; urgency=low
[ Daniel Baumann ]
commit 449e773e1b24325735f67a0d5fca21b31e1fc7ea
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Tue Oct 23 19:59:46 2012 +0200
Bumping versioned tryton depends to 2.6.
diff --git a/debian/control b/debian/control
index cc9ef34..306e180 100644
--- a/debian/control
+++ b/debian/control
@@ -14,8 +14,8 @@ X-Python-Version: >= 2.6
Package: tryton-modules-project
Architecture: all
Depends:
- ${misc:Depends}, ${python:Depends}, tryton-server (>= 2.4),
- tryton-modules-party (>= 2.4), tryton-modules-timesheet (>= 2.4),
+ ${misc:Depends}, ${python:Depends}, tryton-server (>= 2.6),
+ tryton-modules-party (>= 2.6), tryton-modules-timesheet (>= 2.6),
python-pkg-resources
Description: Tryton Application Platform (Project Module)
Tryton is a high-level general purpose application platform written in Python
commit 1440a99d88028aec2bef1806366f6f9eb64cd725
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Tue Oct 23 19:53:39 2012 +0200
Merging upstream version 2.6.0.
diff --git a/CHANGELOG b/CHANGELOG
index f5af217..2b987d4 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 2.6.0 - 2012-10-22
+* Bug fixes (see mercurial logs for details)
+
Version 2.4.0 - 2012-04-24
* Bug fixes (see mercurial logs for details)
* Remove usage of type in context
diff --git a/MANIFEST.in b/MANIFEST.in
index 44a0685..e4632a1 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -4,6 +4,7 @@ include TODO
include COPYRIGHT
include CHANGELOG
include LICENSE
+include tryton.cfg
include *.xml
include *.odt
include locale/*.po
diff --git a/PKG-INFO b/PKG-INFO
index b103aa2..4f53dcd 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,15 +1,48 @@
Metadata-Version: 1.0
Name: trytond_project
-Version: 2.4.0
-Summary: Project Module with:
- - Project management
-
+Version: 2.6.0
+Summary: Tryton module with projects
Home-page: http://www.tryton.org/
-Author: B2CK
-Author-email: info at b2ck.com
+Author: Tryton
+Author-email: UNKNOWN
License: GPL-3
-Download-URL: http://downloads.tryton.org/2.4/
-Description: UNKNOWN
+Download-URL: http://downloads.tryton.org/2.6/
+Description: trytond_project
+ ===============
+
+ The project module of the Tryton application platform.
+
+ Installing
+ ----------
+
+ See INSTALL
+
+ Support
+ -------
+
+ If you encounter any problems with Tryton, please don't hesitate to ask
+ questions on the Tryton bug tracker, mailing list, wiki or IRC channel:
+
+ http://bugs.tryton.org/
+ http://groups.tryton.org/
+ http://wiki.tryton.org/
+ irc://irc.freenode.net/tryton
+
+ License
+ -------
+
+ See LICENSE
+
+ Copyright
+ ---------
+
+ See COPYRIGHT
+
+
+ For more information please visit the Tryton web site:
+
+ http://www.tryton.org/
+
Platform: UNKNOWN
Classifier: Development Status :: 5 - Production/Stable
Classifier: Environment :: Plugins
diff --git a/README b/README
index 69576d7..1fb772f 100644
--- a/README
+++ b/README
@@ -2,7 +2,6 @@ trytond_project
===============
The project module of the Tryton application platform.
-See __tryton__.py
Installing
----------
diff --git a/__init__.py b/__init__.py
index 699936e..64de74e 100644
--- a/__init__.py
+++ b/__init__.py
@@ -1,4 +1,11 @@
#This file is part of Tryton. The COPYRIGHT file at the top level of
#this repository contains the full copyright notices and license terms.
+from trytond.pool import Pool
from .work import *
+
+
+def register():
+ Pool.register(
+ Work,
+ module='project', type_='model')
diff --git a/__tryton__.py b/__tryton__.py
deleted file mode 100644
index 17496cc..0000000
--- a/__tryton__.py
+++ /dev/null
@@ -1,58 +0,0 @@
-#This file is part of Tryton. The COPYRIGHT file at the top level of
-#this repository contains the full copyright notices and license terms.
-{
- 'name': 'Project',
- 'name_bg_BG': 'Проект',
- 'name_ca_ES': 'Projectes',
- 'name_de_DE': 'Projekte',
- 'name_es_AR': 'Proyecto',
- 'name_es_CO': 'Proyectos',
- 'name_es_ES': 'Proyectos',
- 'name_fr_FR': 'Projet',
- 'version': '2.4.0',
- 'author': 'B2CK',
- 'email': 'info at b2ck.com',
- 'website': 'http://www.tryton.org/',
- 'description': '''Project Module with:
- - Project management
-''',
- 'description_bg_BG': '''Модул за проекти Ñ:
- - Управление на проекти
-''',
- 'description_ca_ES': '''Mòdul per la gestió de projectes.''',
- 'description_de_DE': '''Projektmodul für:
- - Projektverwaltung
-''',
- 'description_es_AR': '''Módulo de proyecto con:
- - Gestión de proyecto
-''',
- 'description_es_CO': '''Módulo de proyectos con:
- - Gestión de proyectos
-''',
- 'description_es_ES': '''Módulo para la gestión de proyectos.''',
- 'description_fr_FR': '''Module projet avec:
- - Gestion de projet
-''',
- 'depends': [
- 'ir',
- 'timesheet',
- 'party',
- 'company_work_time',
- ],
- 'xml': [
- 'project.xml',
- 'work.xml',
- ],
- 'translation': [
- 'locale/bg_BG.po',
- 'locale/ca_ES.po',
- 'locale/cs_CZ.po',
- 'locale/de_DE.po',
- 'locale/es_AR.po',
- 'locale/es_CO.po',
- 'locale/es_ES.po',
- 'locale/fr_FR.po',
- 'locale/nl_NL.po',
- 'locale/ru_RU.po',
- ],
-}
diff --git a/locale/bg_BG.po b/locale/bg_BG.po
index 51083f5..a2bc944 100644
--- a/locale/bg_BG.po
+++ b/locale/bg_BG.po
@@ -8,7 +8,7 @@ msgstr "Задача/проект може да имат Ñамо един гр
msgctxt "field:project.work,children:"
msgid "Children"
-msgstr "Деца"
+msgstr "ÐаÑледници"
msgctxt "field:project.work,comment:"
msgid "Comment"
@@ -164,7 +164,7 @@ msgstr "Задача"
msgctxt "view:project.work:"
msgid "Children"
-msgstr "Деца"
+msgstr "ÐаÑледници"
msgctxt "view:project.work:"
msgid "General"
diff --git a/locale/ca_ES.po b/locale/ca_ES.po
index eed10a8..a9595ce 100644
--- a/locale/ca_ES.po
+++ b/locale/ca_ES.po
@@ -16,12 +16,11 @@ msgstr "Comentari"
msgctxt "field:project.work,create_date:"
msgid "Create Date"
-msgstr ""
+msgstr "Data creació"
-#, fuzzy
msgctxt "field:project.work,create_uid:"
msgid "Create User"
-msgstr "Crear usuari"
+msgstr "Usuari creació"
msgctxt "field:project.work,effort:"
msgid "Effort"
@@ -29,7 +28,7 @@ msgstr "Esforç"
msgctxt "field:project.work,id:"
msgid "ID"
-msgstr ""
+msgstr "ID"
msgctxt "field:project.work,parent:"
msgid "Parent"
@@ -47,7 +46,6 @@ msgctxt "field:project.work,rec_name:"
msgid "Name"
msgstr "Nom"
-#, fuzzy
msgctxt "field:project.work,sequence:"
msgid "Sequence"
msgstr "Seqüència"
@@ -70,11 +68,11 @@ msgstr "Activitat"
msgctxt "field:project.work,write_date:"
msgid "Write Date"
-msgstr ""
+msgstr "Data modificació"
msgctxt "field:project.work,write_uid:"
msgid "Write User"
-msgstr ""
+msgstr "Usuari modificació"
msgctxt "field:timesheet.work,timesheet_lines:"
msgid "Timesheet Lines"
@@ -97,7 +95,6 @@ msgctxt "model:ir.action,name:act_project_form"
msgid "Projects"
msgstr "Projectes"
-#, fuzzy
msgctxt "model:ir.action,name:act_project_tree"
msgid "Projects"
msgstr "Projectes"
@@ -106,12 +103,10 @@ msgctxt "model:ir.action,name:act_task_form"
msgid "Tasks"
msgstr "Tasques"
-#, fuzzy
msgctxt "model:ir.action,name:act_work_list"
msgid "Works Efforts"
msgstr "Activitats"
-#, fuzzy
msgctxt "model:ir.action,name:act_work_tree"
msgid "Works Efforts"
msgstr "Activitats"
@@ -120,10 +115,9 @@ msgctxt "model:ir.ui.menu,name:menu_configuration"
msgid "Configuration"
msgstr "Configuració"
-#, fuzzy
msgctxt "model:ir.ui.menu,name:menu_project"
msgid "Project"
-msgstr "Gestió de projecte"
+msgstr "Projectes"
msgctxt "model:ir.ui.menu,name:menu_project_form"
msgid "Projects"
@@ -137,12 +131,10 @@ msgctxt "model:ir.ui.menu,name:menu_task_form"
msgid "Tasks"
msgstr "Tasques"
-#, fuzzy
msgctxt "model:ir.ui.menu,name:menu_work_list"
msgid "Works Efforts"
msgstr "Activitats"
-#, fuzzy
msgctxt "model:ir.ui.menu,name:menu_work_tree"
msgid "Works Efforts"
msgstr "Activitats"
diff --git a/locale/es_AR.po b/locale/es_AR.po
index 9545128..c2fda2c 100644
--- a/locale/es_AR.po
+++ b/locale/es_AR.po
@@ -76,7 +76,7 @@ msgstr "Usuario modificación"
msgctxt "field:timesheet.work,timesheet_lines:"
msgid "Timesheet Lines"
-msgstr "Lineas de parte de trabajo"
+msgstr "LÃneas de parte de trabajo"
msgctxt "help:project.work,effort:"
msgid "Estimated Effort for this work"
@@ -116,7 +116,7 @@ msgstr "Configuración"
msgctxt "model:ir.ui.menu,name:menu_project"
msgid "Project"
-msgstr "Gestión de proyecto"
+msgstr "Gestión de proyectos"
msgctxt "model:ir.ui.menu,name:menu_project_form"
msgid "Projects"
diff --git a/locale/es_CO.po b/locale/es_CO.po
index 15cdd9f..a07dda4 100644
--- a/locale/es_CO.po
+++ b/locale/es_CO.po
@@ -4,11 +4,11 @@ msgstr "Content-Type: text/plain; charset=utf-8\n"
msgctxt "error:project.work:"
msgid "There should be only one timesheet work by task/project!"
-msgstr "¡Debe haber sólo una hoja de tiempo por tarea/proyecto!"
+msgstr "¡Solo debe haber un hoja de registro de tiempo por tarea/proyecto!"
msgctxt "field:project.work,children:"
msgid "Children"
-msgstr "Descendientes"
+msgstr "Hijos"
msgctxt "field:project.work,comment:"
msgid "Comment"
@@ -16,12 +16,11 @@ msgstr "Comentario"
msgctxt "field:project.work,create_date:"
msgid "Create Date"
-msgstr ""
+msgstr "Fecha creación"
-#, fuzzy
msgctxt "field:project.work,create_uid:"
msgid "Create User"
-msgstr "Crear usuario"
+msgstr "Usuario creación"
msgctxt "field:project.work,effort:"
msgid "Effort"
@@ -29,7 +28,7 @@ msgstr "Esfuerzo"
msgctxt "field:project.work,id:"
msgid "ID"
-msgstr ""
+msgstr "ID"
msgctxt "field:project.work,parent:"
msgid "Parent"
@@ -47,7 +46,6 @@ msgctxt "field:project.work,rec_name:"
msgid "Name"
msgstr "Nombre"
-#, fuzzy
msgctxt "field:project.work,sequence:"
msgid "Sequence"
msgstr "Secuencia"
@@ -58,7 +56,7 @@ msgstr "Estado"
msgctxt "field:project.work,total_effort:"
msgid "Total Effort"
-msgstr "Esfuerzo Total"
+msgstr "Esfuerzo total"
msgctxt "field:project.work,type:"
msgid "Type"
@@ -66,27 +64,27 @@ msgstr "Tipo"
msgctxt "field:project.work,work:"
msgid "Work"
-msgstr "Trabajo"
+msgstr "Actividad"
msgctxt "field:project.work,write_date:"
msgid "Write Date"
-msgstr ""
+msgstr "Fecha modificación"
msgctxt "field:project.work,write_uid:"
msgid "Write User"
-msgstr ""
+msgstr "Usuario modificación"
msgctxt "field:timesheet.work,timesheet_lines:"
msgid "Timesheet Lines"
-msgstr "Lineas de Hoja de Tiempo"
+msgstr "Lineas de Registro de Tiempo"
msgctxt "help:project.work,effort:"
msgid "Estimated Effort for this work"
-msgstr "Esfuerzo estimado para este trabajo"
+msgstr "El esfuerzo estimado para esta actividad"
msgctxt "help:project.work,total_effort:"
msgid "Estimated total effort for this work and the sub-works"
-msgstr "Esfuerzo total estimado para este trabajo y los sub-trabajos"
+msgstr "Esfuerzo total estimado para esta actividad y sus subactividades"
msgctxt "model:ir.action,name:act_open_child_work"
msgid "Tasks"
@@ -96,7 +94,6 @@ msgctxt "model:ir.action,name:act_project_form"
msgid "Projects"
msgstr "Proyectos"
-#, fuzzy
msgctxt "model:ir.action,name:act_project_tree"
msgid "Projects"
msgstr "Proyectos"
@@ -105,24 +102,21 @@ msgctxt "model:ir.action,name:act_task_form"
msgid "Tasks"
msgstr "Tareas"
-#, fuzzy
msgctxt "model:ir.action,name:act_work_list"
msgid "Works Efforts"
-msgstr "Trabajos"
+msgstr "Actividades"
-#, fuzzy
msgctxt "model:ir.action,name:act_work_tree"
msgid "Works Efforts"
-msgstr "Trabajos"
+msgstr "Actividades"
msgctxt "model:ir.ui.menu,name:menu_configuration"
msgid "Configuration"
msgstr "Configuración"
-#, fuzzy
msgctxt "model:ir.ui.menu,name:menu_project"
msgid "Project"
-msgstr "Gestión de Proyectos"
+msgstr "Proyectos"
msgctxt "model:ir.ui.menu,name:menu_project_form"
msgid "Projects"
@@ -136,23 +130,21 @@ msgctxt "model:ir.ui.menu,name:menu_task_form"
msgid "Tasks"
msgstr "Tareas"
-#, fuzzy
msgctxt "model:ir.ui.menu,name:menu_work_list"
msgid "Works Efforts"
-msgstr "Trabajos"
+msgstr "Actividades"
-#, fuzzy
msgctxt "model:ir.ui.menu,name:menu_work_tree"
msgid "Works Efforts"
-msgstr "Trabajos"
+msgstr "Actividades"
msgctxt "model:project.work,name:"
msgid "Work Effort"
-msgstr "Esfuerzo de Trabajo"
+msgstr "Actividades"
msgctxt "model:res.group,name:group_project_admin"
msgid "Project Administration"
-msgstr "Administración de Proyecto"
+msgstr "Administración Proyecto"
msgctxt "selection:project.work,state:"
msgid "Done"
@@ -172,7 +164,7 @@ msgstr "Tarea"
msgctxt "view:project.work:"
msgid "Children"
-msgstr "Descendientes"
+msgstr "Hijos"
msgctxt "view:project.work:"
msgid "General"
@@ -180,7 +172,7 @@ msgstr "General"
msgctxt "view:project.work:"
msgid "Other Info"
-msgstr "Información Adicional"
+msgstr "Info Adicional"
msgctxt "view:project.work:"
msgid "Projects"
@@ -192,20 +184,20 @@ msgstr "Tareas"
msgctxt "view:project.work:"
msgid "Timesheet"
-msgstr "Hoja de tiempos"
+msgstr "Registro de Tiempo"
msgctxt "view:project.work:"
msgid "Work"
-msgstr "Trabajo"
+msgstr "Actividad"
msgctxt "view:project.work:"
msgid "Work Efforts"
-msgstr "Esfuerzos de Trabajo"
+msgstr "Actividades"
msgctxt "view:project.work:"
msgid "Works"
-msgstr "Trabajos"
+msgstr "Actividades"
msgctxt "view:project.work:"
msgid "Works Efforts"
-msgstr "Esfuerzos de Trabajo"
+msgstr "Actividades"
diff --git a/locale/es_ES.po b/locale/es_ES.po
index 4a64c7d..7432be3 100644
--- a/locale/es_ES.po
+++ b/locale/es_ES.po
@@ -116,7 +116,7 @@ msgstr "Configuración"
msgctxt "model:ir.ui.menu,name:menu_project"
msgid "Project"
-msgstr "Proyecto"
+msgstr "Proyectos"
msgctxt "model:ir.ui.menu,name:menu_project_form"
msgid "Projects"
diff --git a/setup.py b/setup.py
index 5f94e11..d344a09 100644
--- a/setup.py
+++ b/setup.py
@@ -4,8 +4,19 @@
from setuptools import setup
import re
+import os
+import ConfigParser
-info = eval(open('__tryton__.py').read())
+
+def read(fname):
+ return open(os.path.join(os.path.dirname(__file__), fname)).read()
+
+config = ConfigParser.ConfigParser()
+config.readfp(open('tryton.cfg'))
+info = dict(config.items('tryton'))
+for key in ('depends', 'extras_depend', 'xml'):
+ if key in info:
+ info[key] = info[key].strip().splitlines()
major_version, minor_version, _ = info.get('version', '0.0.1').split('.', 2)
major_version = int(major_version)
minor_version = int(minor_version)
@@ -21,22 +32,21 @@ requires.append('trytond >= %s.%s, < %s.%s' %
setup(name='trytond_project',
version=info.get('version', '0.0.1'),
- description=info.get('description', ''),
- author=info.get('author', ''),
- author_email=info.get('email', ''),
- url=info.get('website', ''),
+ description='Tryton module with projects',
+ long_description=read('README'),
+ author='Tryton',
+ url='http://www.tryton.org/',
download_url="http://downloads.tryton.org/" + \
- info.get('version', '0.0.1').rsplit('.', 1)[0] + '/',
+ info.get('version', '0.0.1').rsplit('.', 1)[0] + '/',
package_dir={'trytond.modules.project': '.'},
packages=[
'trytond.modules.project',
'trytond.modules.project.tests',
- ],
+ ],
package_data={
'trytond.modules.project': info.get('xml', []) \
- + info.get('translation', []) \
- + ['icons/*.svg'],
- },
+ + ['tryton.cfg', 'locale/*.po', 'icons/*.svg'],
+ },
classifiers=[
'Development Status :: 5 - Production/Stable',
'Environment :: Plugins',
@@ -58,7 +68,7 @@ setup(name='trytond_project',
'Programming Language :: Python :: 2.6',
'Programming Language :: Python :: 2.7',
'Topic :: Office/Business',
- ],
+ ],
license='GPL-3',
install_requires=requires,
zip_safe=False,
@@ -68,4 +78,4 @@ setup(name='trytond_project',
""",
test_suite='tests',
test_loader='trytond.test_loader:Loader',
-)
+ )
diff --git a/tryton.cfg b/tryton.cfg
new file mode 100644
index 0000000..000c771
--- /dev/null
+++ b/tryton.cfg
@@ -0,0 +1,10 @@
+[tryton]
+version=2.6.0
+depends:
+ company_work_time
+ ir
+ party
+ timesheet
+xml:
+ project.xml
+ work.xml
diff --git a/trytond_project.egg-info/PKG-INFO b/trytond_project.egg-info/PKG-INFO
index 3e6945a..54b19d1 100644
--- a/trytond_project.egg-info/PKG-INFO
+++ b/trytond_project.egg-info/PKG-INFO
@@ -1,15 +1,48 @@
Metadata-Version: 1.0
Name: trytond-project
-Version: 2.4.0
-Summary: Project Module with:
- - Project management
-
+Version: 2.6.0
+Summary: Tryton module with projects
Home-page: http://www.tryton.org/
-Author: B2CK
-Author-email: info at b2ck.com
+Author: Tryton
+Author-email: UNKNOWN
License: GPL-3
-Download-URL: http://downloads.tryton.org/2.4/
-Description: UNKNOWN
+Download-URL: http://downloads.tryton.org/2.6/
+Description: trytond_project
+ ===============
+
+ The project module of the Tryton application platform.
+
+ Installing
+ ----------
+
+ See INSTALL
+
+ Support
+ -------
+
+ If you encounter any problems with Tryton, please don't hesitate to ask
+ questions on the Tryton bug tracker, mailing list, wiki or IRC channel:
+
+ http://bugs.tryton.org/
+ http://groups.tryton.org/
+ http://wiki.tryton.org/
+ irc://irc.freenode.net/tryton
+
+ License
+ -------
+
+ See LICENSE
+
+ Copyright
+ ---------
+
+ See COPYRIGHT
+
+
+ For more information please visit the Tryton web site:
+
+ http://www.tryton.org/
+
Platform: UNKNOWN
Classifier: Development Status :: 5 - Production/Stable
Classifier: Environment :: Plugins
diff --git a/trytond_project.egg-info/SOURCES.txt b/trytond_project.egg-info/SOURCES.txt
index eec1919..4388ec4 100644
--- a/trytond_project.egg-info/SOURCES.txt
+++ b/trytond_project.egg-info/SOURCES.txt
@@ -6,9 +6,9 @@ MANIFEST.in
README
project.xml
setup.py
+tryton.cfg
work.xml
./__init__.py
-./__tryton__.py
./work.py
./tests/__init__.py
./tests/test_project.py
diff --git a/trytond_project.egg-info/requires.txt b/trytond_project.egg-info/requires.txt
index e05bdf2..655359d 100644
--- a/trytond_project.egg-info/requires.txt
+++ b/trytond_project.egg-info/requires.txt
@@ -1,4 +1,4 @@
-trytond_timesheet >= 2.4, < 2.5
-trytond_party >= 2.4, < 2.5
-trytond_company_work_time >= 2.4, < 2.5
-trytond >= 2.4, < 2.5
\ No newline at end of file
+trytond_company_work_time >= 2.6, < 2.7
+trytond_party >= 2.6, < 2.7
+trytond_timesheet >= 2.6, < 2.7
+trytond >= 2.6, < 2.7
\ No newline at end of file
diff --git a/work.py b/work.py
index 43ae08f..64fdfcf 100644
--- a/work.py
+++ b/work.py
@@ -6,13 +6,13 @@ from trytond.backend import TableHandler
from trytond.transaction import Transaction
from trytond.pool import Pool
+__all__ = ['Work']
+
class Work(ModelSQL, ModelView):
'Work Effort'
- _name = 'project.work'
- _description = __doc__
+ __name__ = 'project.work'
_inherits = {'timesheet.work': 'work'}
-
work = fields.Many2One('timesheet.work', 'Work', required=True,
ondelete='CASCADE')
type = fields.Selection([
@@ -44,27 +44,32 @@ class Work(ModelSQL, ModelView):
('opened', 'Opened'),
('done', 'Done'),
], 'State', required=True, select=True)
- sequence = fields.Integer('Sequence', required=True)
+ sequence = fields.Integer('Sequence',
+ order_field='(%(table)s.sequence IS NULL) %(order)s, '
+ '%(table)s.sequence %(order)s')
- def default_type(self):
+ @staticmethod
+ def default_type():
return 'task'
- def default_state(self):
+ @staticmethod
+ def default_state():
return 'opened'
- def default_effort(self):
+ @staticmethod
+ def default_effort():
return 0.0
- def init(self, module_name):
- timesheet_work_obj = Pool().get('timesheet.work')
+ @classmethod
+ def __register__(cls, module_name):
+ TimesheetWork = Pool().get('timesheet.work')
cursor = Transaction().cursor
- table_project_work = TableHandler(cursor, self, module_name)
- table_timesheet_work = TableHandler(cursor, timesheet_work_obj,
- module_name)
+ table_project_work = TableHandler(cursor, cls, module_name)
+ table_timesheet_work = TableHandler(cursor, TimesheetWork, module_name)
migrate_sequence = (not table_project_work.column_exist('sequence')
and table_timesheet_work.column_exist('sequence'))
- super(Work, self).init(module_name)
+ super(Work, cls).__register__(module_name)
# Migration from 2.0: copy sequence from timesheet to project
if migrate_sequence:
@@ -72,76 +77,81 @@ class Work(ModelSQL, ModelView):
'SELECT t.sequence, t.id '
'FROM "%s" AS t '
'JOIN "%s" AS p ON (p.work = t.id)' % (
- timesheet_work_obj._table, self._table))
+ TimesheetWork._table, cls._table))
for sequence, id_ in cursor.fetchall():
sql = ('UPDATE "%s" '
'SET sequence = %%s '
- 'WHERE work = %%s' % self._table)
+ 'WHERE work = %%s' % cls._table)
cursor.execute(sql, (sequence, id_))
- def __init__(self):
- super(Work, self).__init__()
- self._sql_constraints += [
+ # Migration from 2.4: drop required on sequence
+ table_project_work.not_null_action('sequence', action='remove')
+
+ @classmethod
+ def __setup__(cls):
+ super(Work, cls).__setup__()
+ cls._sql_constraints += [
('work_uniq', 'UNIQUE(work)', 'There should be only one '\
'timesheet work by task/project!'),
- ]
- self._order.insert(0, ('sequence', 'ASC'))
- self._constraints += [
+ ]
+ cls._order.insert(0, ('sequence', 'ASC'))
+ cls._constraints += [
('check_state',
'A work can not be closed if its children are still opened'),
]
- def check_state(self, ids):
- for work in self.browse(ids):
- if ((work.state == 'opened'
- and (work.parent and work.parent.state == 'done'))
- or (work.state == 'done'
- and any(c.state == 'opened' for c in work.children))):
- return False
+ def check_state(self):
+ if ((self.state == 'opened'
+ and (self.parent and self.parent.state == 'done'))
+ or (self.state == 'done'
+ and any(c.state == 'opened' for c in self.children))):
+ return False
return True
- def get_parent(self, ids, name):
- res = dict.fromkeys(ids, None)
- project_works = self.browse(ids)
+ @classmethod
+ def get_parent(cls, project_works, name):
+ parents = dict.fromkeys([w.id for w in project_works], None)
# ptw2pw is "parent timesheet work to project works":
ptw2pw = {}
for project_work in project_works:
+ if not project_work.work.parent:
+ continue
if project_work.work.parent.id in ptw2pw:
ptw2pw[project_work.work.parent.id].append(project_work.id)
else:
ptw2pw[project_work.work.parent.id] = [project_work.id]
with Transaction().set_context(active_test=False):
- parent_project_ids = self.search([
+ parent_projects = cls.search([
('work', 'in', ptw2pw.keys()),
])
- parent_projects = self.browse(parent_project_ids)
for parent_project in parent_projects:
if parent_project.work.id in ptw2pw:
child_projects = ptw2pw[parent_project.work.id]
for child_project in child_projects:
- res[child_project] = parent_project.id
+ parents[child_project] = parent_project.id
- return res
+ return parents
- def set_parent(self, ids, name, value):
- timesheet_work_obj = Pool().get('timesheet.work')
+ @classmethod
+ def set_parent(cls, project_works, name, value):
+ TimesheetWork = Pool().get('timesheet.work')
if value:
- project_works = self.browse(ids + [value])
- child_timesheet_work_ids = [x.work.id for x in project_works[:-1]]
+ project_works.append(cls(value))
+ child_timesheet_works = [x.work for x in project_works[:-1]]
parent_timesheet_work_id = project_works[-1].work.id
else:
- child_project_works = self.browse(ids)
- child_timesheet_work_ids = [x.work.id for x in child_project_works]
+ child_timesheet_works = [x.work for x in project_works]
parent_timesheet_work_id = None
- timesheet_work_obj.write(child_timesheet_work_ids, {
+ TimesheetWork.write(child_timesheet_works, {
'parent': parent_timesheet_work_id
})
- def search_parent(self, name, domain=None):
- timesheet_work_obj = Pool().get('timesheet.work')
+ @classmethod
+ def search_parent(cls, name, domain):
+ TimesheetWork = Pool().get('timesheet.work')
project_work_domain = []
timesheet_work_domain = []
@@ -167,11 +177,11 @@ class Work(ModelSQL, ModelView):
if operands:
operands = list(operands)
# filter out non-existing ids:
- operands = self.search([
+ operands = cls.search([
('id', 'in', operands)
])
# create project_work > timesheet_work mapping
- for pw in self.browse(operands):
+ for pw in operands:
pw2tw[pw.id] = pw.work.id
for i, d in enumerate(timesheet_work_domain):
@@ -185,24 +195,22 @@ class Work(ModelSQL, ModelView):
timesheet_work_domain[i] = (d[0], d[1], new_d2)
if project_work_domain:
- pw_ids = self.search(project_work_domain)
- project_works = self.browse(pw_ids)
+ project_works = cls.search(project_work_domain)
timesheet_work_domain.append(
('id', 'in', [pw.work.id for pw in project_works]))
- tw_ids = timesheet_work_obj.search(timesheet_work_domain)
+ tw_ids = [tw.id for tw in TimesheetWork.search(timesheet_work_domain)]
return [('work', 'in', tw_ids)]
- def get_total_effort(self, ids, name):
+ @classmethod
+ def get_total_effort(cls, works, name):
- all_ids = self.search([
- ('parent', 'child_of', ids),
+ works = cls.search([
+ ('parent', 'child_of', [w.id for w in works]),
('active', '=', True),
- ]) + ids
- all_ids = list(set(all_ids))
-
- works = self.browse(all_ids)
+ ]) + works
+ works = set(works)
res = {}
id2work = {}
@@ -214,58 +222,51 @@ class Work(ModelSQL, ModelView):
leafs.add(work.id)
while leafs:
- parents = set()
for work_id in leafs:
work = id2work[work_id]
+ works.remove(work)
if not work.active:
continue
if work.parent and work.parent.id in res:
res[work.parent.id] += res[work_id]
- parents.add(work.parent.id)
- leafs = parents
+ next_leafs = set((w.id for w in works))
+ for work in works:
+ if not work.parent:
+ continue
+ if work.parent.id in next_leafs and work.parent in works:
+ next_leafs.remove(work.parent.id)
+ leafs = next_leafs
return res
- def copy(self, ids, default=None):
- timesheet_work_obj = Pool().get('timesheet.work')
-
- int_id = isinstance(ids, (int, long))
- if int_id:
- ids = [ids]
+ @classmethod
+ def copy(cls, project_works, default=None):
+ TimesheetWork = Pool().get('timesheet.work')
if default is None:
default = {}
timesheet_default = default.copy()
for key in timesheet_default.keys():
- if key in self._columns:
+ if key in cls._fields:
del timesheet_default[key]
- new_ids = []
- for project_work in self.browse(ids):
- timesheet_work_id = timesheet_work_obj.copy(project_work.work.id,
+ new_project_works = []
+ for project_work in project_works:
+ timesheet_work, = TimesheetWork.copy([project_work.work],
default=timesheet_default)
pwdefault = default.copy()
- pwdefault['work'] = timesheet_work_id
- new_ids.append(super(Work, self).copy(project_work.id,
- default=pwdefault))
- if int_id:
- return new_ids[0]
- return new_ids
-
- def delete(self, ids):
- timesheet_work_obj = Pool().get('timesheet.work')
+ pwdefault['work'] = timesheet_work.id
+ new_project_works.extend(super(Work, cls).copy([project_work],
+ default=pwdefault))
+ return new_project_works
- if isinstance(ids, (int, long)):
- ids = [ids]
+ @classmethod
+ def delete(cls, project_works):
+ TimesheetWork = Pool().get('timesheet.work')
# Get the timesheet works linked to the project works
- project_works = self.browse(ids)
- timesheet_work_ids = [pw.work.id for pw in project_works]
-
- res = super(Work, self).delete(ids)
-
- timesheet_work_obj.delete(timesheet_work_ids)
- return res
+ timesheet_works = [pw.work for pw in project_works]
+ super(Work, cls).delete(project_works)
-Work()
+ TimesheetWork.delete(timesheet_works)
diff --git a/work.xml b/work.xml
index 410f9c7..7a7ba0b 100644
--- a/work.xml
+++ b/work.xml
@@ -64,30 +64,29 @@ this repository contains the full copyright notices and license terms. -->
<field name="type">form</field>
<field name="arch" type="xml">
<![CDATA[
- <form string="Works Efforts" col="8">
- <label name="name"/>
- <field name="name" colspan="3"/>
- <label name="parent"/>
- <field name="parent"/>
- <label name="active"/>
- <field name="active" xexpand="0"/>
- <label name="sequence"/>
- <field name="sequence"/>
- <label name="type"/>
- <field name="type"/>
- <label name="state"/>
- <field name="state"/>
- <label name="timesheet_available"/>
- <field name="timesheet_available" xexpand="0"/>
- <label name="company"/>
- <field name="company"/>
+ <form string="Works Efforts" col="6">
+ <label name="name"/>
+ <field name="name" colspan="3"/>
+ <label name="active"/>
+ <field name="active" xexpand="0"/>
+ <label name="type"/>
+ <field name="type"/>
+ <label name="parent"/>
+ <field name="parent"/>
+ <label name="sequence"/>
+ <field name="sequence"/>
+ <label name="company"/>
+ <field name="company"/>
+ <label name="party"/>
+ <field name="party"/>
+ <label name="party_address"/>
+ <field name="party_address"/>
<notebook colspan="8">
<page string="General" id="general" col="6">
- <label name="party"/>
- <field name="party"/>
- <label name="party_address"/>
- <field name="party_address"/>
- <newline/>
+ <group col="2" colspan="6" id="timesheet_available">
+ <label name="timesheet_available"/>
+ <field name="timesheet_available"/>
+ </group>
<label name="hours"/>
<field name="hours" widget="float_time" float_time="company_work_time"/>
<label name="total_effort"/>
@@ -106,6 +105,8 @@ this repository contains the full copyright notices and license terms. -->
<field name="timesheet_lines" colspan="4"/>
</page>
</notebook>
+ <label name="state"/>
+ <field name="state"/>
</form>
]]>
</field>
commit d50b3bcb8f12626b59c1f42fe0ddd9e55e4554cf
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Tue Sep 18 16:07:23 2012 +0200
Releasing debian version 2.4.0-2.
diff --git a/debian/changelog b/debian/changelog
index c21a13a..da2beee 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,17 @@
+tryton-modules-project (2.4.0-2) experimental; urgency=low
+
+ [ Daniel Baumann ]
+ * Updating maintainers field.
+ * Updating vcs fields.
+ * Correcting copyright file to match format version 1.0.
+ * Switching to xz compression.
+ * Updating to debhelper version 9.
+
+ [ Mathias Behrle ]
+ * Merging branch debian-wheezy-2.2.
+
+ -- Mathias Behrle <mathiasb at m9s.biz> Tue, 18 Sep 2012 13:40:43 +0200
+
tryton-modules-project (2.4.0-1) experimental; urgency=low
* Updating to Standards-Version: 3.9.3, no changes needed.
commit 1f52909954a7c5d6c6d56ecb90ef92e8dc1347c5
Author: Daniel Baumann <daniel at debian.org>
Date: Sat Jun 30 18:02:29 2012 +0200
Updating to debhelper version 9.
diff --git a/debian/compat b/debian/compat
index 45a4fb7..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-8
+9
diff --git a/debian/control b/debian/control
index cf47a0e..cc9ef34 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: optional
Maintainer: Debian Tryton Maintainers <maintainers at debian.tryton.org>
Uploaders: Daniel Baumann <daniel at debian.org>, Mathias Behrle <mathiasb at m9s.biz>
Dm-Upload-Allowed: yes
-Build-Depends: debhelper (>= 8), python (>= 2.6.6-3~), python-setuptools
+Build-Depends: debhelper (>= 9), python (>= 2.6.6-3~), python-setuptools
Standards-Version: 3.9.3
Homepage: http://www.tryton.org/
Vcs-Browser: http://debian.tryton.org/gitweb/?p=packages/tryton-modules-project.git
commit 51b90d5031219bd90c74e21ec0b209c5bced041a
Author: Daniel Baumann <daniel at debian.org>
Date: Sat Jun 30 17:54:36 2012 +0200
Switching to xz compression.
diff --git a/debian/rules b/debian/rules
index e32b791..1ae0776 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,3 +7,6 @@ override_dh_auto_clean:
dh_auto_clean
rm -rf *.egg-info
+
+override_dh_builddeb:
+ dh_builddeb -- -Zxz -z9
diff --git a/debian/source/options b/debian/source/options
index d053b65..22a4de9 100644
--- a/debian/source/options
+++ b/debian/source/options
@@ -1,2 +1,2 @@
-compression = gzip
+compression = xz
compression-level = 9
commit 5f241e1b2b9a8387d86c5eb6af4ee5918f400e65
Author: Daniel Baumann <daniel at debian.org>
Date: Sat Jun 30 17:50:24 2012 +0200
Correcting copyright file to match format version 1.0.
diff --git a/debian/copyright b/debian/copyright
index 4d4cb9d..8cb9f16 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -2,9 +2,9 @@ Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Files: *
Copyright:
- (C) 2008-2012 Cedric Krier
- (C) 2008-2012 B2CK SPRL
- (C) 2009-2012 Bertrand Chenal
+ 2008-2012 Cedric Krier
+ 2008-2012 B2CK SPRL
+ 2009-2012 Bertrand Chenal
License: GPL-3+
Files: icons/*
@@ -13,8 +13,8 @@ License: public-domain
Files: debian/*
Copyright:
- (C) 2009-2012 Daniel Baumann <daniel at debian.org>
- (C) 2011-2012 Mathias Behrle <mathiasb at m9s.biz>
+ 2009-2012 Daniel Baumann <daniel at debian.org>
+ 2011-2012 Mathias Behrle <mathiasb at m9s.biz>
License: GPL-3+
License: GPL-3+
commit 67bfc1321f942568506090c8fa3187aff7a19658
Author: Daniel Baumann <daniel at 127011.net>
Date: Sat Jun 30 16:55:04 2012 +0200
Updating vcs fields.
diff --git a/debian/control b/debian/control
index 192e945..cf47a0e 100644
--- a/debian/control
+++ b/debian/control
@@ -7,8 +7,8 @@ Dm-Upload-Allowed: yes
Build-Depends: debhelper (>= 8), python (>= 2.6.6-3~), python-setuptools
Standards-Version: 3.9.3
Homepage: http://www.tryton.org/
-Vcs-Browser: http://git.debian-maintainers.org/?p=tryton/tryton-modules-project.git
-Vcs-Git: git://git.debian-maintainers.org/git/tryton/tryton-modules-project.git
+Vcs-Browser: http://debian.tryton.org/gitweb/?p=packages/tryton-modules-project.git
+Vcs-Git: git://debian.tryton.org/git/packages/tryton-modules-project.git
X-Python-Version: >= 2.6
Package: tryton-modules-project
commit eccd4b29bd73670ee68f5d333587b7138e4f139e
Author: Daniel Baumann <daniel at 127011.net>
Date: Sat Jun 30 16:52:31 2012 +0200
Updating maintainers field.
diff --git a/debian/control b/debian/control
index 69b4182..192e945 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,7 @@
Source: tryton-modules-project
Section: python
Priority: optional
-Maintainer: Debian Tryton Maintainers <tryton at lists.debian-maintainers.org>
+Maintainer: Debian Tryton Maintainers <maintainers at debian.tryton.org>
Uploaders: Daniel Baumann <daniel at debian.org>, Mathias Behrle <mathiasb at m9s.biz>
Dm-Upload-Allowed: yes
Build-Depends: debhelper (>= 8), python (>= 2.6.6-3~), python-setuptools
commit 89a446218d58e3de6965ca4b32a43bd2bd314960
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Sat Apr 28 12:44:06 2012 +0200
Releasing debian version 2.4.0-1.
diff --git a/debian/changelog b/debian/changelog
index dbecce8..c21a13a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+tryton-modules-project (2.4.0-1) experimental; urgency=low
+
+ * Updating to Standards-Version: 3.9.3, no changes needed.
+ * Updating year in copyright.
+ * Adding Format header for DEP5.
+ * Merging upstream version 2.4.0.
+ * Updating Copyright.
+ * Bumping versioned tryton depends to 2.4.
+
+ -- Mathias Behrle <mathiasb at m9s.biz> Thu, 26 Apr 2012 19:31:49 +0200
+
tryton-modules-project (2.2.0-1) unstable; urgency=low
* Bumping X-Python-Version to >=2.6.
commit 111786f4c26fe2e7cfdbac7ce50dd28c28d9d241
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Thu Apr 26 19:11:44 2012 +0200
Bumping versioned tryton depends to 2.4.
diff --git a/debian/control b/debian/control
index b6bc0cd..69b4182 100644
--- a/debian/control
+++ b/debian/control
@@ -14,8 +14,8 @@ X-Python-Version: >= 2.6
Package: tryton-modules-project
Architecture: all
Depends:
- ${misc:Depends}, ${python:Depends}, tryton-server (>= 2.2),
- tryton-modules-party (>= 2.2), tryton-modules-timesheet (>= 2.2),
+ ${misc:Depends}, ${python:Depends}, tryton-server (>= 2.4),
+ tryton-modules-party (>= 2.4), tryton-modules-timesheet (>= 2.4),
python-pkg-resources
Description: Tryton Application Platform (Project Module)
Tryton is a high-level general purpose application platform written in Python
commit 0d899cb56da56a3979c21f6b8b5efaf4f02dc53c
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Wed Apr 25 20:08:13 2012 +0200
Updating Copyright.
diff --git a/debian/copyright b/debian/copyright
index c0fb258..4d4cb9d 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -2,9 +2,9 @@ Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Files: *
Copyright:
- (C) 2008-2011 Cedric Krier
- (C) 2008-2011 B2CK SPRL
- (C) 2009-2011 Bertrand Chenal
+ (C) 2008-2012 Cedric Krier
+ (C) 2008-2012 B2CK SPRL
+ (C) 2009-2012 Bertrand Chenal
License: GPL-3+
Files: icons/*
commit 7f46a21bcb5473750cd381837276bf5337de7809
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Tue Apr 24 19:31:01 2012 +0200
Merging upstream version 2.4.0.
diff --git a/CHANGELOG b/CHANGELOG
index db70548..f5af217 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,7 @@
+Version 2.4.0 - 2012-04-24
+* Bug fixes (see mercurial logs for details)
+* Remove usage of type in context
+
Version 2.2.0 - 2011-10-24
* Bug fixes (see mercurial logs for details)
diff --git a/COPYRIGHT b/COPYRIGHT
index 2ff157b..bee3ccd 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,6 +1,6 @@
-Copyright (C) 2008-2011 Cédric Krier.
-Copyright (C) 2008-2011 B2CK SPRL.
-Copyright (C) 2009-2011 Bertrand Chenal.
+Copyright (C) 2008-2012 Cédric Krier.
+Copyright (C) 2008-2012 B2CK SPRL.
+Copyright (C) 2009-2012 Bertrand Chenal.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff --git a/INSTALL b/INSTALL
index 5a07c8f..95510b8 100644
--- a/INSTALL
+++ b/INSTALL
@@ -4,7 +4,7 @@ Installing trytond_project
Prerequisites
-------------
- * Python 2.5 or later (http://www.python.org/)
+ * Python 2.6 or later (http://www.python.org/)
* trytond (http://www.tryton.org/)
* trytond_timesheet (http://www.tryton.org/)
* trytond_party (http://www.tryton.org/)
diff --git a/PKG-INFO b/PKG-INFO
index 3361dcb..b103aa2 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.0
Name: trytond_project
-Version: 2.2.0
+Version: 2.4.0
Summary: Project Module with:
- Project management
@@ -8,7 +8,7 @@ Home-page: http://www.tryton.org/
Author: B2CK
Author-email: info at b2ck.com
License: GPL-3
-Download-URL: http://downloads.tryton.org/2.2/
+Download-URL: http://downloads.tryton.org/2.4/
Description: UNKNOWN
Platform: UNKNOWN
Classifier: Development Status :: 5 - Production/Stable
diff --git a/__init__.py b/__init__.py
index 78e67a2..699936e 100644
--- a/__init__.py
+++ b/__init__.py
@@ -1,4 +1,4 @@
#This file is part of Tryton. The COPYRIGHT file at the top level of
#this repository contains the full copyright notices and license terms.
-from work import *
+from .work import *
diff --git a/__tryton__.py b/__tryton__.py
index 0664ecc..17496cc 100644
--- a/__tryton__.py
+++ b/__tryton__.py
@@ -3,11 +3,13 @@
{
'name': 'Project',
'name_bg_BG': 'Проект',
+ 'name_ca_ES': 'Projectes',
'name_de_DE': 'Projekte',
+ 'name_es_AR': 'Proyecto',
'name_es_CO': 'Proyectos',
- 'name_es_ES': 'Proyecto',
+ 'name_es_ES': 'Proyectos',
'name_fr_FR': 'Projet',
- 'version': '2.2.0',
+ 'version': '2.4.0',
'author': 'B2CK',
'email': 'info at b2ck.com',
'website': 'http://www.tryton.org/',
@@ -17,15 +19,17 @@
'description_bg_BG': '''Модул за проекти Ñ:
- Управление на проекти
''',
+ 'description_ca_ES': '''Mòdul per la gestió de projectes.''',
'description_de_DE': '''Projektmodul für:
- Projektverwaltung
''',
+ 'description_es_AR': '''Módulo de proyecto con:
+ - Gestión de proyecto
+''',
'description_es_CO': '''Módulo de proyectos con:
- Gestión de proyectos
''',
- 'description_es_ES': '''Módulo de proyecto con:
- - Gestión de proyecto
-''',
+ 'description_es_ES': '''Módulo para la gestión de proyectos.''',
'description_fr_FR': '''Module projet avec:
- Gestion de projet
''',
@@ -41,8 +45,10 @@
],
'translation': [
'locale/bg_BG.po',
+ 'locale/ca_ES.po',
'locale/cs_CZ.po',
'locale/de_DE.po',
+ 'locale/es_AR.po',
'locale/es_CO.po',
'locale/es_ES.po',
'locale/fr_FR.po',
diff --git a/locale/bg_BG.po b/locale/bg_BG.po
index 5fa0022..51083f5 100644
--- a/locale/bg_BG.po
+++ b/locale/bg_BG.po
@@ -2,68 +2,87 @@
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
-msgctxt "error:project.work:0"
+msgctxt "error:project.work:"
msgid "There should be only one timesheet work by task/project!"
msgstr "Задача/проект може да имат Ñамо един график за дейноÑÑ‚!"
-msgctxt "field:project.work,children:0"
+msgctxt "field:project.work,children:"
msgid "Children"
msgstr "Деца"
-msgctxt "field:project.work,comment:0"
+msgctxt "field:project.work,comment:"
msgid "Comment"
msgstr "Коментар"
-msgctxt "field:project.work,effort:0"
+msgctxt "field:project.work,create_date:"
+msgid "Create Date"
+msgstr "Създадено на"
+
+msgctxt "field:project.work,create_uid:"
+msgid "Create User"
+msgstr "Създадено от"
+
+msgctxt "field:project.work,effort:"
msgid "Effort"
msgstr "УÑлие"
-msgctxt "field:project.work,parent:0"
+msgctxt "field:project.work,id:"
+msgid "ID"
+msgstr "ID"
+
+msgctxt "field:project.work,parent:"
msgid "Parent"
msgstr "Родител"
-msgctxt "field:project.work,party:0"
+msgctxt "field:project.work,party:"
msgid "Party"
msgstr "Партньор"
-msgctxt "field:project.work,party_address:0"
+msgctxt "field:project.work,party_address:"
msgid "Contact Address"
msgstr "ÐÐ´Ñ€ÐµÑ Ð·Ð° контакт"
-msgctxt "field:project.work,rec_name:0"
+msgctxt "field:project.work,rec_name:"
msgid "Name"
msgstr "Име"
-#, fuzzy
-msgctxt "field:project.work,sequence:0"
+msgctxt "field:project.work,sequence:"
msgid "Sequence"
msgstr "ПоÑледователноÑÑ‚"
-msgctxt "field:project.work,state:0"
+msgctxt "field:project.work,state:"
msgid "State"
msgstr "СъÑтоÑние"
-msgctxt "field:project.work,total_effort:0"
+msgctxt "field:project.work,total_effort:"
msgid "Total Effort"
msgstr "Общо уÑилиÑ"
-msgctxt "field:project.work,type:0"
+msgctxt "field:project.work,type:"
msgid "Type"
msgstr "Вид"
-msgctxt "field:project.work,work:0"
+msgctxt "field:project.work,work:"
msgid "Work"
msgstr "Задача"
-msgctxt "field:timesheet.work,timesheet_lines:0"
+msgctxt "field:project.work,write_date:"
+msgid "Write Date"
+msgstr "Променено на"
+
+msgctxt "field:project.work,write_uid:"
+msgid "Write User"
+msgstr "Променено от"
+
+msgctxt "field:timesheet.work,timesheet_lines:"
msgid "Timesheet Lines"
msgstr "Редове от график"
-msgctxt "help:project.work,effort:0"
+msgctxt "help:project.work,effort:"
msgid "Estimated Effort for this work"
msgstr "Оценка на уÑилиÑта за тази работа"
-msgctxt "help:project.work,total_effort:0"
+msgctxt "help:project.work,total_effort:"
msgid "Estimated total effort for this work and the sub-works"
msgstr "Предполагаеми общо уÑÐ¸Ð»Ð¸Ñ Ð·Ð° тази задача и подзадачите"
@@ -75,15 +94,14 @@ msgctxt "model:ir.action,name:act_project_form"
msgid "Projects"
msgstr "Проекти"
+msgctxt "model:ir.action,name:act_project_tree"
+msgid "Projects"
+msgstr "Проекти"
+
msgctxt "model:ir.action,name:act_task_form"
msgid "Tasks"
msgstr "Задачи"
-msgctxt "model:ir.action,name:act_work_form"
-msgid "Works"
-msgstr "ДейноÑти"
-
-#, fuzzy
msgctxt "model:ir.action,name:act_work_list"
msgid "Works Efforts"
msgstr "Задачи"
@@ -96,7 +114,6 @@ msgctxt "model:ir.ui.menu,name:menu_configuration"
msgid "Configuration"
msgstr "КонфигурациÑ"
-#, fuzzy
msgctxt "model:ir.ui.menu,name:menu_project"
msgid "Project"
msgstr "Управление на проекти"
@@ -113,7 +130,6 @@ msgctxt "model:ir.ui.menu,name:menu_task_form"
msgid "Tasks"
msgstr "Задачи"
-#, fuzzy
msgctxt "model:ir.ui.menu,name:menu_work_list"
msgid "Works Efforts"
msgstr "Задачи"
@@ -122,7 +138,7 @@ msgctxt "model:ir.ui.menu,name:menu_work_tree"
msgid "Works Efforts"
msgstr "Задачи"
-msgctxt "model:project.work,name:0"
+msgctxt "model:project.work,name:"
msgid "Work Effort"
msgstr "ДейноÑÑ‚"
@@ -130,46 +146,46 @@ msgctxt "model:res.group,name:group_project_admin"
msgid "Project Administration"
msgstr "Управление на проекти"
-msgctxt "selection:project.work,state:0"
+msgctxt "selection:project.work,state:"
msgid "Done"
msgstr "Приключен"
-msgctxt "selection:project.work,state:0"
+msgctxt "selection:project.work,state:"
msgid "Opened"
msgstr "Отворен"
-msgctxt "selection:project.work,type:0"
+msgctxt "selection:project.work,type:"
msgid "Project"
msgstr "Проект"
-msgctxt "selection:project.work,type:0"
+msgctxt "selection:project.work,type:"
msgid "Task"
msgstr "Задача"
-msgctxt "view:project.work:0"
+msgctxt "view:project.work:"
msgid "Children"
msgstr "Деца"
-msgctxt "view:project.work:0"
+msgctxt "view:project.work:"
msgid "General"
msgstr "ОÑновен"
-msgctxt "view:project.work:0"
+msgctxt "view:project.work:"
msgid "Projects"
msgstr "Проекти"
-msgctxt "view:project.work:0"
+msgctxt "view:project.work:"
msgid "Tasks"
msgstr "Задачи"
-msgctxt "view:project.work:0"
+msgctxt "view:project.work:"
msgid "Timesheet"
msgstr "График"
-msgctxt "view:project.work:0"
+msgctxt "view:project.work:"
msgid "Work Efforts"
msgstr "ДейноÑти"
-msgctxt "view:project.work:0"
+msgctxt "view:project.work:"
msgid "Works Efforts"
msgstr "ДейноÑти"
diff --git a/locale/ca_ES.po b/locale/ca_ES.po
new file mode 100644
index 0000000..eed10a8
--- /dev/null
+++ b/locale/ca_ES.po
@@ -0,0 +1,212 @@
+#
+msgid ""
+msgstr "Content-Type: text/plain; charset=utf-8\n"
+
+msgctxt "error:project.work:"
+msgid "There should be only one timesheet work by task/project!"
+msgstr "Només ha d'haver-hi un full de treball per tasca/projecte"
+
+msgctxt "field:project.work,children:"
+msgid "Children"
+msgstr "Fills"
+
+msgctxt "field:project.work,comment:"
+msgid "Comment"
+msgstr "Comentari"
+
+msgctxt "field:project.work,create_date:"
+msgid "Create Date"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:project.work,create_uid:"
+msgid "Create User"
+msgstr "Crear usuari"
+
+msgctxt "field:project.work,effort:"
+msgid "Effort"
+msgstr "Esforç"
+
+msgctxt "field:project.work,id:"
+msgid "ID"
+msgstr ""
+
+msgctxt "field:project.work,parent:"
+msgid "Parent"
+msgstr "Pare"
+
+msgctxt "field:project.work,party:"
+msgid "Party"
+msgstr "Tercer"
+
+msgctxt "field:project.work,party_address:"
+msgid "Contact Address"
+msgstr "Adreça de contacte"
+
+msgctxt "field:project.work,rec_name:"
+msgid "Name"
+msgstr "Nom"
+
+#, fuzzy
+msgctxt "field:project.work,sequence:"
+msgid "Sequence"
+msgstr "Seqüència"
+
+msgctxt "field:project.work,state:"
+msgid "State"
+msgstr "Estat"
+
+msgctxt "field:project.work,total_effort:"
+msgid "Total Effort"
+msgstr "Esforç total"
+
+msgctxt "field:project.work,type:"
+msgid "Type"
+msgstr "Tipus"
+
+msgctxt "field:project.work,work:"
+msgid "Work"
+msgstr "Activitat"
+
+msgctxt "field:project.work,write_date:"
+msgid "Write Date"
+msgstr ""
+
+msgctxt "field:project.work,write_uid:"
+msgid "Write User"
+msgstr ""
+
+msgctxt "field:timesheet.work,timesheet_lines:"
+msgid "Timesheet Lines"
+msgstr "LÃnies de full de treball"
+
+msgctxt "help:project.work,effort:"
+msgid "Estimated Effort for this work"
+msgstr "L'esforç estimat per a aquesta activitat"
+
+msgctxt "help:project.work,total_effort:"
+msgid "Estimated total effort for this work and the sub-works"
+msgstr ""
+"Esforç total estimat per a aquesta activitat i les seves subactivitats"
+
+msgctxt "model:ir.action,name:act_open_child_work"
+msgid "Tasks"
+msgstr "Tasques"
+
+msgctxt "model:ir.action,name:act_project_form"
+msgid "Projects"
+msgstr "Projectes"
+
+#, fuzzy
+msgctxt "model:ir.action,name:act_project_tree"
+msgid "Projects"
+msgstr "Projectes"
+
+msgctxt "model:ir.action,name:act_task_form"
+msgid "Tasks"
+msgstr "Tasques"
+
+#, fuzzy
+msgctxt "model:ir.action,name:act_work_list"
+msgid "Works Efforts"
+msgstr "Activitats"
+
+#, fuzzy
+msgctxt "model:ir.action,name:act_work_tree"
+msgid "Works Efforts"
+msgstr "Activitats"
+
+msgctxt "model:ir.ui.menu,name:menu_configuration"
+msgid "Configuration"
+msgstr "Configuració"
+
+#, fuzzy
+msgctxt "model:ir.ui.menu,name:menu_project"
+msgid "Project"
+msgstr "Gestió de projecte"
+
+msgctxt "model:ir.ui.menu,name:menu_project_form"
+msgid "Projects"
+msgstr "Projectes"
+
+msgctxt "model:ir.ui.menu,name:menu_project_tree"
+msgid "Projects"
+msgstr "Projectes"
+
+msgctxt "model:ir.ui.menu,name:menu_task_form"
+msgid "Tasks"
+msgstr "Tasques"
+
+#, fuzzy
+msgctxt "model:ir.ui.menu,name:menu_work_list"
+msgid "Works Efforts"
+msgstr "Activitats"
+
+#, fuzzy
+msgctxt "model:ir.ui.menu,name:menu_work_tree"
+msgid "Works Efforts"
+msgstr "Activitats"
+
+msgctxt "model:project.work,name:"
+msgid "Work Effort"
+msgstr "Activitats"
+
+msgctxt "model:res.group,name:group_project_admin"
+msgid "Project Administration"
+msgstr "Administració de projecte"
+
+msgctxt "selection:project.work,state:"
+msgid "Done"
+msgstr "Acabada"
+
+msgctxt "selection:project.work,state:"
+msgid "Opened"
+msgstr "Obert"
+
+msgctxt "selection:project.work,type:"
+msgid "Project"
+msgstr "Projecte"
+
+msgctxt "selection:project.work,type:"
+msgid "Task"
+msgstr "Tasca"
+
+msgctxt "view:project.work:"
+msgid "Children"
+msgstr "Fills"
+
+msgctxt "view:project.work:"
+msgid "General"
+msgstr "General"
+
+msgctxt "view:project.work:"
+msgid "Other Info"
+msgstr "Informació addicional"
+
+msgctxt "view:project.work:"
+msgid "Projects"
+msgstr "Projectes"
+
+msgctxt "view:project.work:"
+msgid "Tasks"
+msgstr "Tasques"
+
+msgctxt "view:project.work:"
+msgid "Timesheet"
+msgstr "Full de treball"
+
+msgctxt "view:project.work:"
+msgid "Work"
+msgstr "Activitat"
+
+msgctxt "view:project.work:"
+msgid "Work Efforts"
+msgstr "Activitats"
+
+msgctxt "view:project.work:"
+msgid "Works"
+msgstr "Activitats"
+
+msgctxt "view:project.work:"
+msgid "Works Efforts"
+msgstr "Activitats"
diff --git a/locale/cs_CZ.po b/locale/cs_CZ.po
index 941b26f..9ba4192 100644
--- a/locale/cs_CZ.po
+++ b/locale/cs_CZ.po
@@ -2,63 +2,83 @@
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
-msgctxt "error:project.work:0"
+msgctxt "error:project.work:"
msgid "There should be only one timesheet work by task/project!"
msgstr ""
-msgctxt "field:project.work,children:0"
+msgctxt "field:project.work,children:"
msgid "Children"
msgstr ""
-msgctxt "field:project.work,comment:0"
+msgctxt "field:project.work,comment:"
msgid "Comment"
msgstr ""
-msgctxt "field:project.work,effort:0"
+msgctxt "field:project.work,create_date:"
+msgid "Create Date"
+msgstr ""
+
+msgctxt "field:project.work,create_uid:"
+msgid "Create User"
+msgstr ""
+
+msgctxt "field:project.work,effort:"
msgid "Effort"
msgstr ""
-msgctxt "field:project.work,parent:0"
+msgctxt "field:project.work,id:"
+msgid "ID"
+msgstr ""
+
+msgctxt "field:project.work,parent:"
msgid "Parent"
msgstr ""
-msgctxt "field:project.work,party:0"
+msgctxt "field:project.work,party:"
msgid "Party"
msgstr ""
-msgctxt "field:project.work,party_address:0"
+msgctxt "field:project.work,party_address:"
msgid "Contact Address"
msgstr ""
-msgctxt "field:project.work,rec_name:0"
+msgctxt "field:project.work,rec_name:"
msgid "Name"
msgstr ""
-msgctxt "field:project.work,sequence:0"
+msgctxt "field:project.work,sequence:"
msgid "Sequence"
msgstr ""
-msgctxt "field:project.work,state:0"
+msgctxt "field:project.work,state:"
msgid "State"
msgstr ""
-msgctxt "field:project.work,total_effort:0"
+msgctxt "field:project.work,total_effort:"
msgid "Total Effort"
msgstr ""
-msgctxt "field:project.work,type:0"
+msgctxt "field:project.work,type:"
msgid "Type"
msgstr ""
-msgctxt "field:project.work,work:0"
+msgctxt "field:project.work,work:"
msgid "Work"
msgstr ""
-msgctxt "help:project.work,effort:0"
+msgctxt "field:project.work,write_date:"
+msgid "Write Date"
+msgstr ""
+
+msgctxt "field:project.work,write_uid:"
+msgid "Write User"
+msgstr ""
+
+msgctxt "help:project.work,effort:"
msgid "Estimated Effort for this work"
msgstr ""
-msgctxt "help:project.work,total_effort:0"
+msgctxt "help:project.work,total_effort:"
msgid "Estimated total effort for this work and the sub-works"
msgstr ""
@@ -70,12 +90,12 @@ msgctxt "model:ir.action,name:act_project_form"
msgid "Projects"
msgstr ""
-msgctxt "model:ir.action,name:act_task_form"
-msgid "Tasks"
+msgctxt "model:ir.action,name:act_project_tree"
+msgid "Projects"
msgstr ""
-msgctxt "model:ir.action,name:act_work_form"
-msgid "Works"
+msgctxt "model:ir.action,name:act_task_form"
+msgid "Tasks"
msgstr ""
msgctxt "model:ir.action,name:act_work_list"
@@ -114,7 +134,7 @@ msgctxt "model:ir.ui.menu,name:menu_work_tree"
msgid "Works Efforts"
msgstr ""
-msgctxt "model:project.work,name:0"
+msgctxt "model:project.work,name:"
msgid "Work Effort"
msgstr ""
@@ -122,42 +142,42 @@ msgctxt "model:res.group,name:group_project_admin"
msgid "Project Administration"
msgstr ""
-msgctxt "selection:project.work,state:0"
+msgctxt "selection:project.work,state:"
msgid "Done"
msgstr ""
-msgctxt "selection:project.work,state:0"
+msgctxt "selection:project.work,state:"
msgid "Opened"
msgstr ""
-msgctxt "selection:project.work,type:0"
+msgctxt "selection:project.work,type:"
msgid "Project"
msgstr ""
-msgctxt "selection:project.work,type:0"
+msgctxt "selection:project.work,type:"
msgid "Task"
msgstr ""
-msgctxt "view:project.work:0"
+msgctxt "view:project.work:"
msgid "Children"
msgstr ""
-msgctxt "view:project.work:0"
+msgctxt "view:project.work:"
msgid "General"
msgstr ""
-msgctxt "view:project.work:0"
+msgctxt "view:project.work:"
msgid "Projects"
msgstr ""
-msgctxt "view:project.work:0"
+msgctxt "view:project.work:"
msgid "Tasks"
msgstr ""
-msgctxt "view:project.work:0"
+msgctxt "view:project.work:"
msgid "Timesheet"
msgstr ""
-msgctxt "view:project.work:0"
+msgctxt "view:project.work:"
msgid "Works Efforts"
msgstr ""
diff --git a/locale/de_DE.po b/locale/de_DE.po
index 5e1cd89..11d924f 100644
--- a/locale/de_DE.po
+++ b/locale/de_DE.po
@@ -2,89 +2,89 @@
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
-msgctxt "error:project.work:0"
+msgctxt "error:project.work:"
msgid "There should be only one timesheet work by task/project!"
msgstr "Es kann nur ein Zeiterfassungsblatt pro Aufgabe oder Projekt geben!"
-msgctxt "field:project.work,children:0"
+msgctxt "field:project.work,children:"
msgid "Children"
msgstr "Untergeordnet (Arbeiten)"
-msgctxt "field:project.work,comment:0"
+msgctxt "field:project.work,comment:"
msgid "Comment"
msgstr "Kommentar"
-msgctxt "field:project.work,create_date:0"
-msgid "Creation date"
+msgctxt "field:project.work,create_date:"
+msgid "Create Date"
msgstr "Erstellungsdatum"
-msgctxt "field:project.work,create_uid:0"
-msgid "Creation user"
-msgstr "Ersteller"
+msgctxt "field:project.work,create_uid:"
+msgid "Create User"
+msgstr "Erstellt durch"
-msgctxt "field:project.work,effort:0"
+msgctxt "field:project.work,effort:"
msgid "Effort"
msgstr "Aufwand (Personenstunden)"
-msgctxt "field:project.work,id:0"
+msgctxt "field:project.work,id:"
msgid "ID"
msgstr "ID"
-msgctxt "field:project.work,parent:0"
+msgctxt "field:project.work,parent:"
msgid "Parent"
msgstr "Ãœbergeordnet (Arbeit)"
-msgctxt "field:project.work,party:0"
+msgctxt "field:project.work,party:"
msgid "Party"
msgstr "Partei"
-msgctxt "field:project.work,party_address:0"
+msgctxt "field:project.work,party_address:"
msgid "Contact Address"
msgstr "Kontaktadresse"
-msgctxt "field:project.work,rec_name:0"
+msgctxt "field:project.work,rec_name:"
msgid "Name"
msgstr "Name"
-msgctxt "field:project.work,sequence:0"
+msgctxt "field:project.work,sequence:"
msgid "Sequence"
msgstr "Reihenfolge"
-msgctxt "field:project.work,state:0"
+msgctxt "field:project.work,state:"
msgid "State"
msgstr "Status"
-msgctxt "field:project.work,total_effort:0"
+msgctxt "field:project.work,total_effort:"
msgid "Total Effort"
msgstr "Gesamtaufwand (Personenstunden)"
-msgctxt "field:project.work,type:0"
+msgctxt "field:project.work,type:"
msgid "Type"
msgstr "Typ"
-msgctxt "field:project.work,work:0"
+msgctxt "field:project.work,work:"
msgid "Work"
msgstr "Arbeit"
-msgctxt "field:project.work,write_date:0"
-msgid "Last modification date"
-msgstr "Zuletzt geändert am"
+msgctxt "field:project.work,write_date:"
+msgid "Write Date"
+msgstr "Zuletzt geändert"
-msgctxt "field:project.work,write_uid:0"
-msgid "Last modification by"
-msgstr "Zuletzt geändert von"
+msgctxt "field:project.work,write_uid:"
+msgid "Write User"
+msgstr "Letzte Änderung durch"
-msgctxt "field:timesheet.work,timesheet_lines:0"
+msgctxt "field:timesheet.work,timesheet_lines:"
msgid "Timesheet Lines"
msgstr "Zeitpositionen"
-msgctxt "help:project.work,effort:0"
+msgctxt "help:project.work,effort:"
msgid "Estimated Effort for this work"
msgstr ""
"Geschätzter Aufwand für diese Arbeit in Stunden (Format: Personenstunden, "
"-tage, -wochen)"
-msgctxt "help:project.work,total_effort:0"
+msgctxt "help:project.work,total_effort:"
msgid "Estimated total effort for this work and the sub-works"
msgstr ""
"Geschätzter Gesamtaufwand für diese Arbeit inkl. aller untergeordneten "
@@ -98,14 +98,14 @@ msgctxt "model:ir.action,name:act_project_form"
msgid "Projects"
msgstr "Projekte"
+msgctxt "model:ir.action,name:act_project_tree"
+msgid "Projects"
+msgstr "Projekte"
+
msgctxt "model:ir.action,name:act_task_form"
msgid "Tasks"
msgstr "Aufgaben"
-msgctxt "model:ir.action,name:act_work_form"
-msgid "Works"
-msgstr "Arbeiten"
-
msgctxt "model:ir.action,name:act_work_list"
msgid "Works Efforts"
msgstr "Arbeitsaufwände"
@@ -142,7 +142,7 @@ msgctxt "model:ir.ui.menu,name:menu_work_tree"
msgid "Works Efforts"
msgstr "Arbeitsaufwände"
-msgctxt "model:project.work,name:0"
+msgctxt "model:project.work,name:"
msgid "Work Effort"
msgstr "Arbeitsaufwand"
@@ -150,58 +150,58 @@ msgctxt "model:res.group,name:group_project_admin"
msgid "Project Administration"
msgstr "Projekte Administration"
-msgctxt "selection:project.work,state:0"
+msgctxt "selection:project.work,state:"
msgid "Done"
msgstr "Erledigt"
-msgctxt "selection:project.work,state:0"
+msgctxt "selection:project.work,state:"
msgid "Opened"
msgstr "Offen"
-msgctxt "selection:project.work,type:0"
+msgctxt "selection:project.work,type:"
msgid "Project"
msgstr "Projekt"
-msgctxt "selection:project.work,type:0"
+msgctxt "selection:project.work,type:"
msgid "Task"
msgstr "Aufgabe"
-msgctxt "view:project.work:0"
+msgctxt "view:project.work:"
msgid "Children"
msgstr "Untergeordnet (Arbeiten)"
-msgctxt "view:project.work:0"
+msgctxt "view:project.work:"
msgid "General"
msgstr "Allgemein"
-msgctxt "view:project.work:0"
+msgctxt "view:project.work:"
msgid "Other Info"
msgstr "Sonstiges"
-msgctxt "view:project.work:0"
+msgctxt "view:project.work:"
msgid "Projects"
msgstr "Projekte"
-msgctxt "view:project.work:0"
+msgctxt "view:project.work:"
msgid "Tasks"
msgstr "Aufgaben"
-msgctxt "view:project.work:0"
+msgctxt "view:project.work:"
msgid "Timesheet"
msgstr "Zeiterfassungsblatt"
-msgctxt "view:project.work:0"
+msgctxt "view:project.work:"
msgid "Work"
msgstr "Arbeit"
-msgctxt "view:project.work:0"
+msgctxt "view:project.work:"
msgid "Work Efforts"
msgstr "Arbeitsaufwände"
-msgctxt "view:project.work:0"
+msgctxt "view:project.work:"
msgid "Works"
msgstr "Arbeiten"
-msgctxt "view:project.work:0"
+msgctxt "view:project.work:"
msgid "Works Efforts"
msgstr "Arbeiten Aufwände"
diff --git a/locale/es_ES.po b/locale/es_AR.po
similarity index 60%
copy from locale/es_ES.po
copy to locale/es_AR.po
index e887bdb..9545128 100644
--- a/locale/es_ES.po
+++ b/locale/es_AR.po
@@ -2,68 +2,87 @@
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
-msgctxt "error:project.work:0"
+msgctxt "error:project.work:"
msgid "There should be only one timesheet work by task/project!"
-msgstr "Solo debe haber un parte de trabajo por tarea/proyecto"
+msgstr "¡Solo debe haber un parte de trabajo por tarea/proyecto!"
-msgctxt "field:project.work,children:0"
+msgctxt "field:project.work,children:"
msgid "Children"
msgstr "Hijos"
-msgctxt "field:project.work,comment:0"
+msgctxt "field:project.work,comment:"
msgid "Comment"
msgstr "Comentario"
-msgctxt "field:project.work,effort:0"
+msgctxt "field:project.work,create_date:"
+msgid "Create Date"
+msgstr "Fecha creación"
+
+msgctxt "field:project.work,create_uid:"
+msgid "Create User"
+msgstr "Usuario creación"
+
+msgctxt "field:project.work,effort:"
msgid "Effort"
msgstr "Esfuerzo"
-msgctxt "field:project.work,parent:0"
+msgctxt "field:project.work,id:"
+msgid "ID"
+msgstr "ID"
+
+msgctxt "field:project.work,parent:"
msgid "Parent"
msgstr "Padre"
-msgctxt "field:project.work,party:0"
+msgctxt "field:project.work,party:"
msgid "Party"
-msgstr "Tercero"
+msgstr "Entidad"
-msgctxt "field:project.work,party_address:0"
+msgctxt "field:project.work,party_address:"
msgid "Contact Address"
msgstr "Dirección de contacto"
-msgctxt "field:project.work,rec_name:0"
+msgctxt "field:project.work,rec_name:"
msgid "Name"
msgstr "Nombre"
-#, fuzzy
-msgctxt "field:project.work,sequence:0"
+msgctxt "field:project.work,sequence:"
msgid "Sequence"
msgstr "Secuencia"
-msgctxt "field:project.work,state:0"
+msgctxt "field:project.work,state:"
msgid "State"
msgstr "Estado"
-msgctxt "field:project.work,total_effort:0"
+msgctxt "field:project.work,total_effort:"
msgid "Total Effort"
msgstr "Esfuerzo total"
-msgctxt "field:project.work,type:0"
+msgctxt "field:project.work,type:"
msgid "Type"
msgstr "Tipo"
-msgctxt "field:project.work,work:0"
+msgctxt "field:project.work,work:"
msgid "Work"
msgstr "Actividad"
-msgctxt "field:timesheet.work,timesheet_lines:0"
+msgctxt "field:project.work,write_date:"
+msgid "Write Date"
+msgstr "Fecha modificación"
+
+msgctxt "field:project.work,write_uid:"
+msgid "Write User"
+msgstr "Usuario modificación"
+
+msgctxt "field:timesheet.work,timesheet_lines:"
msgid "Timesheet Lines"
msgstr "Lineas de parte de trabajo"
-msgctxt "help:project.work,effort:0"
+msgctxt "help:project.work,effort:"
msgid "Estimated Effort for this work"
msgstr "El esfuerzo estimado para esta actividad"
-msgctxt "help:project.work,total_effort:0"
+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"
@@ -75,21 +94,18 @@ msgctxt "model:ir.action,name:act_project_form"
msgid "Projects"
msgstr "Proyectos"
+msgctxt "model:ir.action,name:act_project_tree"
+msgid "Projects"
+msgstr "Proyectos"
+
msgctxt "model:ir.action,name:act_task_form"
msgid "Tasks"
msgstr "Tareas"
-#, fuzzy
-msgctxt "model:ir.action,name:act_work_form"
-msgid "Works"
-msgstr "Actividades"
-
-#, fuzzy
msgctxt "model:ir.action,name:act_work_list"
msgid "Works Efforts"
msgstr "Actividades"
-#, fuzzy
msgctxt "model:ir.action,name:act_work_tree"
msgid "Works Efforts"
msgstr "Actividades"
@@ -98,7 +114,6 @@ msgctxt "model:ir.ui.menu,name:menu_configuration"
msgid "Configuration"
msgstr "Configuración"
-#, fuzzy
msgctxt "model:ir.ui.menu,name:menu_project"
msgid "Project"
msgstr "Gestión de proyecto"
@@ -115,17 +130,15 @@ msgctxt "model:ir.ui.menu,name:menu_task_form"
msgid "Tasks"
msgstr "Tareas"
-#, fuzzy
msgctxt "model:ir.ui.menu,name:menu_work_list"
msgid "Works Efforts"
msgstr "Actividades"
-#, fuzzy
msgctxt "model:ir.ui.menu,name:menu_work_tree"
msgid "Works Efforts"
msgstr "Actividades"
-msgctxt "model:project.work,name:0"
+msgctxt "model:project.work,name:"
msgid "Work Effort"
msgstr "Actividades"
@@ -133,58 +146,58 @@ msgctxt "model:res.group,name:group_project_admin"
msgid "Project Administration"
msgstr "Administración de proyecto"
-msgctxt "selection:project.work,state:0"
+msgctxt "selection:project.work,state:"
msgid "Done"
msgstr "Terminada"
-msgctxt "selection:project.work,state:0"
+msgctxt "selection:project.work,state:"
msgid "Opened"
msgstr "Abierto"
-msgctxt "selection:project.work,type:0"
+msgctxt "selection:project.work,type:"
msgid "Project"
msgstr "Proyecto"
-msgctxt "selection:project.work,type:0"
+msgctxt "selection:project.work,type:"
msgid "Task"
msgstr "Tarea"
-msgctxt "view:project.work:0"
+msgctxt "view:project.work:"
msgid "Children"
msgstr "Hijos"
-msgctxt "view:project.work:0"
+msgctxt "view:project.work:"
msgid "General"
msgstr "General"
-msgctxt "view:project.work:0"
+msgctxt "view:project.work:"
msgid "Other Info"
msgstr "Información adicional"
-msgctxt "view:project.work:0"
+msgctxt "view:project.work:"
msgid "Projects"
msgstr "Proyectos"
-msgctxt "view:project.work:0"
+msgctxt "view:project.work:"
msgid "Tasks"
msgstr "Tareas"
-msgctxt "view:project.work:0"
+msgctxt "view:project.work:"
msgid "Timesheet"
msgstr "Parte de trabajo"
-msgctxt "view:project.work:0"
+msgctxt "view:project.work:"
msgid "Work"
msgstr "Actividad"
-msgctxt "view:project.work:0"
+msgctxt "view:project.work:"
msgid "Work Efforts"
msgstr "Actividades"
-msgctxt "view:project.work:0"
+msgctxt "view:project.work:"
msgid "Works"
msgstr "Actividades"
-msgctxt "view:project.work:0"
+msgctxt "view:project.work:"
msgid "Works Efforts"
msgstr "Actividades"
diff --git a/locale/es_CO.po b/locale/es_CO.po
index c9d7bb8..15cdd9f 100644
--- a/locale/es_CO.po
+++ b/locale/es_CO.po
@@ -2,68 +2,89 @@
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
-msgctxt "error:project.work:0"
+msgctxt "error:project.work:"
msgid "There should be only one timesheet work by task/project!"
msgstr "¡Debe haber sólo una hoja de tiempo por tarea/proyecto!"
-msgctxt "field:project.work,children:0"
+msgctxt "field:project.work,children:"
msgid "Children"
msgstr "Descendientes"
-msgctxt "field:project.work,comment:0"
+msgctxt "field:project.work,comment:"
msgid "Comment"
msgstr "Comentario"
-msgctxt "field:project.work,effort:0"
+msgctxt "field:project.work,create_date:"
+msgid "Create Date"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:project.work,create_uid:"
+msgid "Create User"
+msgstr "Crear usuario"
+
+msgctxt "field:project.work,effort:"
msgid "Effort"
msgstr "Esfuerzo"
-msgctxt "field:project.work,parent:0"
+msgctxt "field:project.work,id:"
+msgid "ID"
+msgstr ""
+
+msgctxt "field:project.work,parent:"
msgid "Parent"
msgstr "Padre"
-msgctxt "field:project.work,party:0"
+msgctxt "field:project.work,party:"
msgid "Party"
msgstr "Tercero"
-msgctxt "field:project.work,party_address:0"
+msgctxt "field:project.work,party_address:"
msgid "Contact Address"
msgstr "Dirección de Contacto"
-msgctxt "field:project.work,rec_name:0"
+msgctxt "field:project.work,rec_name:"
msgid "Name"
msgstr "Nombre"
#, fuzzy
-msgctxt "field:project.work,sequence:0"
+msgctxt "field:project.work,sequence:"
msgid "Sequence"
msgstr "Secuencia"
-msgctxt "field:project.work,state:0"
+msgctxt "field:project.work,state:"
msgid "State"
msgstr "Estado"
-msgctxt "field:project.work,total_effort:0"
+msgctxt "field:project.work,total_effort:"
msgid "Total Effort"
msgstr "Esfuerzo Total"
-msgctxt "field:project.work,type:0"
+msgctxt "field:project.work,type:"
msgid "Type"
msgstr "Tipo"
-msgctxt "field:project.work,work:0"
+msgctxt "field:project.work,work:"
msgid "Work"
msgstr "Trabajo"
-msgctxt "field:timesheet.work,timesheet_lines:0"
+msgctxt "field:project.work,write_date:"
+msgid "Write Date"
+msgstr ""
+
+msgctxt "field:project.work,write_uid:"
+msgid "Write User"
+msgstr ""
+
+msgctxt "field:timesheet.work,timesheet_lines:"
msgid "Timesheet Lines"
msgstr "Lineas de Hoja de Tiempo"
-msgctxt "help:project.work,effort:0"
+msgctxt "help:project.work,effort:"
msgid "Estimated Effort for this work"
msgstr "Esfuerzo estimado para este trabajo"
-msgctxt "help:project.work,total_effort:0"
+msgctxt "help:project.work,total_effort:"
msgid "Estimated total effort for this work and the sub-works"
msgstr "Esfuerzo total estimado para este trabajo y los sub-trabajos"
@@ -75,16 +96,16 @@ msgctxt "model:ir.action,name:act_project_form"
msgid "Projects"
msgstr "Proyectos"
+#, fuzzy
+msgctxt "model:ir.action,name:act_project_tree"
+msgid "Projects"
+msgstr "Proyectos"
+
msgctxt "model:ir.action,name:act_task_form"
msgid "Tasks"
msgstr "Tareas"
#, fuzzy
-msgctxt "model:ir.action,name:act_work_form"
-msgid "Works"
-msgstr "Esfuerzos de Trabajo"
-
-#, fuzzy
msgctxt "model:ir.action,name:act_work_list"
msgid "Works Efforts"
msgstr "Trabajos"
@@ -125,7 +146,7 @@ msgctxt "model:ir.ui.menu,name:menu_work_tree"
msgid "Works Efforts"
msgstr "Trabajos"
-msgctxt "model:project.work,name:0"
+msgctxt "model:project.work,name:"
msgid "Work Effort"
msgstr "Esfuerzo de Trabajo"
@@ -133,58 +154,58 @@ msgctxt "model:res.group,name:group_project_admin"
msgid "Project Administration"
msgstr "Administración de Proyecto"
-msgctxt "selection:project.work,state:0"
+msgctxt "selection:project.work,state:"
msgid "Done"
msgstr "Hecho"
-msgctxt "selection:project.work,state:0"
+msgctxt "selection:project.work,state:"
msgid "Opened"
msgstr "Abierto"
-msgctxt "selection:project.work,type:0"
+msgctxt "selection:project.work,type:"
msgid "Project"
msgstr "Proyecto"
-msgctxt "selection:project.work,type:0"
+msgctxt "selection:project.work,type:"
msgid "Task"
msgstr "Tarea"
-msgctxt "view:project.work:0"
+msgctxt "view:project.work:"
msgid "Children"
msgstr "Descendientes"
-msgctxt "view:project.work:0"
+msgctxt "view:project.work:"
msgid "General"
msgstr "General"
-msgctxt "view:project.work:0"
+msgctxt "view:project.work:"
msgid "Other Info"
msgstr "Información Adicional"
-msgctxt "view:project.work:0"
+msgctxt "view:project.work:"
msgid "Projects"
msgstr "Proyectos"
-msgctxt "view:project.work:0"
+msgctxt "view:project.work:"
msgid "Tasks"
msgstr "Tareas"
-msgctxt "view:project.work:0"
+msgctxt "view:project.work:"
msgid "Timesheet"
msgstr "Hoja de tiempos"
-msgctxt "view:project.work:0"
+msgctxt "view:project.work:"
msgid "Work"
msgstr "Trabajo"
-msgctxt "view:project.work:0"
+msgctxt "view:project.work:"
msgid "Work Efforts"
msgstr "Esfuerzos de Trabajo"
-msgctxt "view:project.work:0"
+msgctxt "view:project.work:"
msgid "Works"
msgstr "Trabajos"
-msgctxt "view:project.work:0"
+msgctxt "view:project.work:"
msgid "Works Efforts"
msgstr "Esfuerzos de Trabajo"
diff --git a/locale/es_ES.po b/locale/es_ES.po
index e887bdb..4a64c7d 100644
--- a/locale/es_ES.po
+++ b/locale/es_ES.po
@@ -2,70 +2,89 @@
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
-msgctxt "error:project.work:0"
+msgctxt "error:project.work:"
msgid "There should be only one timesheet work by task/project!"
-msgstr "Solo debe haber un parte de trabajo por tarea/proyecto"
+msgstr "Sólo debe haber un parte de trabajo por tarea/proyecto."
-msgctxt "field:project.work,children:0"
+msgctxt "field:project.work,children:"
msgid "Children"
-msgstr "Hijos"
+msgstr "Tareas"
-msgctxt "field:project.work,comment:0"
+msgctxt "field:project.work,comment:"
msgid "Comment"
msgstr "Comentario"
-msgctxt "field:project.work,effort:0"
+msgctxt "field:project.work,create_date:"
+msgid "Create Date"
+msgstr "Fecha creación"
+
+msgctxt "field:project.work,create_uid:"
+msgid "Create User"
+msgstr "Usuario creación"
+
+msgctxt "field:project.work,effort:"
msgid "Effort"
msgstr "Esfuerzo"
-msgctxt "field:project.work,parent:0"
+msgctxt "field:project.work,id:"
+msgid "ID"
+msgstr "ID"
+
+msgctxt "field:project.work,parent:"
msgid "Parent"
msgstr "Padre"
-msgctxt "field:project.work,party:0"
+msgctxt "field:project.work,party:"
msgid "Party"
msgstr "Tercero"
-msgctxt "field:project.work,party_address:0"
+msgctxt "field:project.work,party_address:"
msgid "Contact Address"
msgstr "Dirección de contacto"
-msgctxt "field:project.work,rec_name:0"
+msgctxt "field:project.work,rec_name:"
msgid "Name"
msgstr "Nombre"
-#, fuzzy
-msgctxt "field:project.work,sequence:0"
+msgctxt "field:project.work,sequence:"
msgid "Sequence"
msgstr "Secuencia"
-msgctxt "field:project.work,state:0"
+msgctxt "field:project.work,state:"
msgid "State"
msgstr "Estado"
-msgctxt "field:project.work,total_effort:0"
+msgctxt "field:project.work,total_effort:"
msgid "Total Effort"
msgstr "Esfuerzo total"
-msgctxt "field:project.work,type:0"
+msgctxt "field:project.work,type:"
msgid "Type"
msgstr "Tipo"
-msgctxt "field:project.work,work:0"
+msgctxt "field:project.work,work:"
msgid "Work"
msgstr "Actividad"
-msgctxt "field:timesheet.work,timesheet_lines:0"
+msgctxt "field:project.work,write_date:"
+msgid "Write Date"
+msgstr "Fecha modificación"
+
+msgctxt "field:project.work,write_uid:"
+msgid "Write User"
+msgstr "Usuario modificación"
+
+msgctxt "field:timesheet.work,timesheet_lines:"
msgid "Timesheet Lines"
-msgstr "Lineas de parte de trabajo"
+msgstr "LÃneas de parte de trabajo"
-msgctxt "help:project.work,effort:0"
+msgctxt "help:project.work,effort:"
msgid "Estimated Effort for this work"
-msgstr "El esfuerzo estimado para esta actividad"
+msgstr "El esfuerzo estimado para esta actividad."
-msgctxt "help:project.work,total_effort:0"
+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"
+msgstr "El esfuerzo total estimado para esta actividad y sus subactividades."
msgctxt "model:ir.action,name:act_open_child_work"
msgid "Tasks"
@@ -75,21 +94,18 @@ msgctxt "model:ir.action,name:act_project_form"
msgid "Projects"
msgstr "Proyectos"
+msgctxt "model:ir.action,name:act_project_tree"
+msgid "Projects"
+msgstr "Proyectos"
+
msgctxt "model:ir.action,name:act_task_form"
msgid "Tasks"
msgstr "Tareas"
-#, fuzzy
-msgctxt "model:ir.action,name:act_work_form"
-msgid "Works"
-msgstr "Actividades"
-
-#, fuzzy
msgctxt "model:ir.action,name:act_work_list"
msgid "Works Efforts"
msgstr "Actividades"
-#, fuzzy
msgctxt "model:ir.action,name:act_work_tree"
msgid "Works Efforts"
msgstr "Actividades"
@@ -98,10 +114,9 @@ msgctxt "model:ir.ui.menu,name:menu_configuration"
msgid "Configuration"
msgstr "Configuración"
-#, fuzzy
msgctxt "model:ir.ui.menu,name:menu_project"
msgid "Project"
-msgstr "Gestión de proyecto"
+msgstr "Proyecto"
msgctxt "model:ir.ui.menu,name:menu_project_form"
msgid "Projects"
@@ -115,17 +130,15 @@ msgctxt "model:ir.ui.menu,name:menu_task_form"
msgid "Tasks"
msgstr "Tareas"
-#, fuzzy
msgctxt "model:ir.ui.menu,name:menu_work_list"
msgid "Works Efforts"
msgstr "Actividades"
-#, fuzzy
msgctxt "model:ir.ui.menu,name:menu_work_tree"
msgid "Works Efforts"
msgstr "Actividades"
-msgctxt "model:project.work,name:0"
+msgctxt "model:project.work,name:"
msgid "Work Effort"
msgstr "Actividades"
@@ -133,58 +146,58 @@ msgctxt "model:res.group,name:group_project_admin"
msgid "Project Administration"
msgstr "Administración de proyecto"
-msgctxt "selection:project.work,state:0"
+msgctxt "selection:project.work,state:"
msgid "Done"
-msgstr "Terminada"
+msgstr "Realizada"
-msgctxt "selection:project.work,state:0"
+msgctxt "selection:project.work,state:"
msgid "Opened"
-msgstr "Abierto"
+msgstr "Abierta"
-msgctxt "selection:project.work,type:0"
+msgctxt "selection:project.work,type:"
msgid "Project"
msgstr "Proyecto"
-msgctxt "selection:project.work,type:0"
+msgctxt "selection:project.work,type:"
msgid "Task"
msgstr "Tarea"
-msgctxt "view:project.work:0"
+msgctxt "view:project.work:"
msgid "Children"
-msgstr "Hijos"
+msgstr "Tareas"
-msgctxt "view:project.work:0"
+msgctxt "view:project.work:"
msgid "General"
msgstr "General"
-msgctxt "view:project.work:0"
+msgctxt "view:project.work:"
msgid "Other Info"
msgstr "Información adicional"
-msgctxt "view:project.work:0"
+msgctxt "view:project.work:"
msgid "Projects"
msgstr "Proyectos"
-msgctxt "view:project.work:0"
+msgctxt "view:project.work:"
msgid "Tasks"
msgstr "Tareas"
-msgctxt "view:project.work:0"
+msgctxt "view:project.work:"
msgid "Timesheet"
msgstr "Parte de trabajo"
-msgctxt "view:project.work:0"
+msgctxt "view:project.work:"
msgid "Work"
msgstr "Actividad"
-msgctxt "view:project.work:0"
+msgctxt "view:project.work:"
msgid "Work Efforts"
msgstr "Actividades"
-msgctxt "view:project.work:0"
+msgctxt "view:project.work:"
msgid "Works"
msgstr "Actividades"
-msgctxt "view:project.work:0"
+msgctxt "view:project.work:"
msgid "Works Efforts"
msgstr "Actividades"
diff --git a/locale/fr_FR.po b/locale/fr_FR.po
index f848efd..17fd3dd 100644
--- a/locale/fr_FR.po
+++ b/locale/fr_FR.po
@@ -2,68 +2,95 @@
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
-msgctxt "error:project.work:0"
+msgctxt "error:project.work:"
msgid "There should be only one timesheet work by task/project!"
msgstr ""
-"Il ne doit y avoir qu'une seule feuille de présence par tâche/projet !"
+"Il ne doit y avoir qu'une seule tâche de feuille de présence par "
+"tâche/projet !"
-msgctxt "field:project.work,children:0"
+msgctxt "error:project.work:"
+msgid "There should be only one timesheet work by task/project!"
+msgstr ""
+"Il ne doit y avoir qu'une seule tâche de feuille de présence par "
+"tâche/projet !"
+
+msgctxt "field:project.work,children:"
msgid "Children"
msgstr "Enfants"
-msgctxt "field:project.work,comment:0"
+msgctxt "field:project.work,comment:"
msgid "Comment"
msgstr "Commentaire"
-msgctxt "field:project.work,effort:0"
+msgctxt "field:project.work,create_date:"
+msgid "Create Date"
+msgstr "Date de création"
+
+msgctxt "field:project.work,create_uid:"
+msgid "Create User"
+msgstr "Créé par"
+
+msgctxt "field:project.work,effort:"
msgid "Effort"
msgstr "Effort"
-msgctxt "field:project.work,parent:0"
+msgctxt "field:project.work,id:"
+msgid "ID"
+msgstr "ID"
+
+msgctxt "field:project.work,parent:"
msgid "Parent"
msgstr "Parent"
-msgctxt "field:project.work,party:0"
+msgctxt "field:project.work,party:"
msgid "Party"
msgstr "Tiers"
-msgctxt "field:project.work,party_address:0"
+msgctxt "field:project.work,party_address:"
msgid "Contact Address"
msgstr "Adresse"
-msgctxt "field:project.work,rec_name:0"
+msgctxt "field:project.work,rec_name:"
msgid "Name"
msgstr "Nom"
-msgctxt "field:project.work,sequence:0"
+msgctxt "field:project.work,sequence:"
msgid "Sequence"
msgstr "Séquence"
-msgctxt "field:project.work,state:0"
+msgctxt "field:project.work,state:"
msgid "State"
msgstr "État"
-msgctxt "field:project.work,total_effort:0"
+msgctxt "field:project.work,total_effort:"
msgid "Total Effort"
msgstr "Effort total"
-msgctxt "field:project.work,type:0"
+msgctxt "field:project.work,type:"
msgid "Type"
msgstr "Type"
-msgctxt "field:project.work,work:0"
+msgctxt "field:project.work,work:"
msgid "Work"
msgstr "Travail"
-msgctxt "field:timesheet.work,timesheet_lines:0"
+msgctxt "field:project.work,write_date:"
+msgid "Write Date"
+msgstr "Date de mise à jour"
+
+msgctxt "field:project.work,write_uid:"
+msgid "Write User"
+msgstr "Mis à jour par"
+
+msgctxt "field:timesheet.work,timesheet_lines:"
msgid "Timesheet Lines"
msgstr "Lignes de feuille de présence"
-msgctxt "help:project.work,effort:0"
+msgctxt "help:project.work,effort:"
msgid "Estimated Effort for this work"
msgstr "Effort estimé pour cette activité"
-msgctxt "help:project.work,total_effort:0"
+msgctxt "help:project.work,total_effort:"
msgid "Estimated total effort for this work and the sub-works"
msgstr "Effort total estimé pour cette activité et ses sous-activités"
@@ -75,14 +102,14 @@ msgctxt "model:ir.action,name:act_project_form"
msgid "Projects"
msgstr "Projets"
+msgctxt "model:ir.action,name:act_project_tree"
+msgid "Projects"
+msgstr "Projets"
+
msgctxt "model:ir.action,name:act_task_form"
msgid "Tasks"
msgstr "Tâches"
-msgctxt "model:ir.action,name:act_work_form"
-msgid "Works"
-msgstr "Travaux"
-
msgctxt "model:ir.action,name:act_work_list"
msgid "Works Efforts"
msgstr "Efforts de travail"
@@ -119,7 +146,7 @@ msgctxt "model:ir.ui.menu,name:menu_work_tree"
msgid "Works Efforts"
msgstr "Efforts de travail"
-msgctxt "model:project.work,name:0"
+msgctxt "model:project.work,name:"
msgid "Work Effort"
msgstr "Tâche"
@@ -127,58 +154,94 @@ msgctxt "model:res.group,name:group_project_admin"
msgid "Project Administration"
msgstr "Administrion de projets"
-msgctxt "selection:project.work,state:0"
+msgctxt "selection:project.work,state:"
+msgid "Done"
+msgstr "Fait"
+
+msgctxt "selection:project.work,state:"
msgid "Done"
msgstr "Fait"
-msgctxt "selection:project.work,state:0"
+msgctxt "selection:project.work,state:"
msgid "Opened"
msgstr "Ouvert"
-msgctxt "selection:project.work,type:0"
+msgctxt "selection:project.work,state:"
+msgid "Opened"
+msgstr "Ouvert"
+
+msgctxt "selection:project.work,type:"
msgid "Project"
msgstr "Projet"
-msgctxt "selection:project.work,type:0"
+msgctxt "selection:project.work,type:"
+msgid "Project"
+msgstr "Projet"
+
+msgctxt "selection:project.work,type:"
+msgid "Task"
+msgstr "Tâche"
+
+msgctxt "selection:project.work,type:"
msgid "Task"
msgstr "Tâche"
-msgctxt "view:project.work:0"
+msgctxt "view:project.work:"
msgid "Children"
msgstr "Enfants"
-msgctxt "view:project.work:0"
+msgctxt "view:project.work:"
+msgid "Children"
+msgstr "Enfants"
+
+msgctxt "view:project.work:"
+msgid "General"
+msgstr "General"
+
+msgctxt "view:project.work:"
msgid "General"
msgstr "General"
-msgctxt "view:project.work:0"
+msgctxt "view:project.work:"
msgid "Other Info"
msgstr "Autre information"
-msgctxt "view:project.work:0"
+msgctxt "view:project.work:"
msgid "Projects"
msgstr "Projets"
-msgctxt "view:project.work:0"
+msgctxt "view:project.work:"
msgid "Tasks"
msgstr "Tâche"
-msgctxt "view:project.work:0"
+msgctxt "view:project.work:"
+msgid "Tasks"
+msgstr "Tâche"
+
+msgctxt "view:project.work:"
+msgid "Timesheet"
+msgstr "Feuille de présence"
+
+msgctxt "view:project.work:"
msgid "Timesheet"
msgstr "Feuille de présence"
-msgctxt "view:project.work:0"
+msgctxt "view:project.work:"
msgid "Work"
msgstr "Travail"
-msgctxt "view:project.work:0"
+msgctxt "view:project.work:"
msgid "Work Efforts"
msgstr "Activités"
-msgctxt "view:project.work:0"
+msgctxt "view:project.work:"
msgid "Works"
msgstr "Travaux"
-msgctxt "view:project.work:0"
+msgctxt "view:project.work:"
+msgid "Works Efforts"
+msgstr "Efforts de travail"
+
+msgctxt "view:project.work:"
msgid "Works Efforts"
msgstr "Efforts de travail"
diff --git a/locale/nl_NL.po b/locale/nl_NL.po
index f273873..7af2951 100644
--- a/locale/nl_NL.po
+++ b/locale/nl_NL.po
@@ -2,72 +2,92 @@
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
-msgctxt "error:project.work:0"
+msgctxt "error:project.work:"
msgid "There should be only one timesheet work by task/project!"
msgstr ""
#, fuzzy
-msgctxt "field:project.work,children:0"
+msgctxt "field:project.work,children:"
msgid "Children"
msgstr "Onderliggende niveaus"
#, fuzzy
-msgctxt "field:project.work,comment:0"
+msgctxt "field:project.work,comment:"
msgid "Comment"
msgstr "Opmerking"
-msgctxt "field:project.work,effort:0"
+msgctxt "field:project.work,create_date:"
+msgid "Create Date"
+msgstr ""
+
+msgctxt "field:project.work,create_uid:"
+msgid "Create User"
+msgstr ""
+
+msgctxt "field:project.work,effort:"
msgid "Effort"
msgstr ""
+msgctxt "field:project.work,id:"
+msgid "ID"
+msgstr ""
+
#, fuzzy
-msgctxt "field:project.work,parent:0"
+msgctxt "field:project.work,parent:"
msgid "Parent"
msgstr "Bovenliggend niveau"
#, fuzzy
-msgctxt "field:project.work,party:0"
+msgctxt "field:project.work,party:"
msgid "Party"
msgstr "Relaties"
-msgctxt "field:project.work,party_address:0"
+msgctxt "field:project.work,party_address:"
msgid "Contact Address"
msgstr ""
#, fuzzy
-msgctxt "field:project.work,rec_name:0"
+msgctxt "field:project.work,rec_name:"
msgid "Name"
msgstr "Naam bijlage"
#, fuzzy
-msgctxt "field:project.work,sequence:0"
+msgctxt "field:project.work,sequence:"
msgid "Sequence"
msgstr "Reeks"
#, fuzzy
-msgctxt "field:project.work,state:0"
+msgctxt "field:project.work,state:"
msgid "State"
msgstr "Status"
-msgctxt "field:project.work,total_effort:0"
+msgctxt "field:project.work,total_effort:"
msgid "Total Effort"
msgstr ""
#, fuzzy
-msgctxt "field:project.work,type:0"
+msgctxt "field:project.work,type:"
msgid "Type"
msgstr "Type"
#, fuzzy
-msgctxt "field:project.work,work:0"
+msgctxt "field:project.work,work:"
msgid "Work"
msgstr "Werk"
-msgctxt "help:project.work,effort:0"
+msgctxt "field:project.work,write_date:"
+msgid "Write Date"
+msgstr ""
+
+msgctxt "field:project.work,write_uid:"
+msgid "Write User"
+msgstr ""
+
+msgctxt "help:project.work,effort:"
msgid "Estimated Effort for this work"
msgstr ""
-msgctxt "help:project.work,total_effort:0"
+msgctxt "help:project.work,total_effort:"
msgid "Estimated total effort for this work and the sub-works"
msgstr ""
@@ -79,15 +99,14 @@ msgctxt "model:ir.action,name:act_project_form"
msgid "Projects"
msgstr ""
+msgctxt "model:ir.action,name:act_project_tree"
+msgid "Projects"
+msgstr ""
+
msgctxt "model:ir.action,name:act_task_form"
msgid "Tasks"
msgstr ""
-#, fuzzy
-msgctxt "model:ir.action,name:act_work_form"
-msgid "Works"
-msgstr "Werken"
-
msgctxt "model:ir.action,name:act_work_list"
msgid "Works Efforts"
msgstr ""
@@ -125,7 +144,7 @@ msgctxt "model:ir.ui.menu,name:menu_work_tree"
msgid "Works Efforts"
msgstr ""
-msgctxt "model:project.work,name:0"
+msgctxt "model:project.work,name:"
msgid "Work Effort"
msgstr ""
@@ -134,46 +153,46 @@ msgid "Project Administration"
msgstr ""
#, fuzzy
-msgctxt "selection:project.work,state:0"
+msgctxt "selection:project.work,state:"
msgid "Done"
msgstr "Klaar"
#, fuzzy
-msgctxt "selection:project.work,state:0"
+msgctxt "selection:project.work,state:"
msgid "Opened"
msgstr "Geopend"
-msgctxt "selection:project.work,type:0"
+msgctxt "selection:project.work,type:"
msgid "Project"
msgstr ""
-msgctxt "selection:project.work,type:0"
+msgctxt "selection:project.work,type:"
msgid "Task"
msgstr ""
#, fuzzy
-msgctxt "view:project.work:0"
+msgctxt "view:project.work:"
msgid "Children"
msgstr "Onderliggende niveaus"
#, fuzzy
-msgctxt "view:project.work:0"
+msgctxt "view:project.work:"
msgid "General"
msgstr "Algemeen"
-msgctxt "view:project.work:0"
+msgctxt "view:project.work:"
msgid "Projects"
msgstr ""
-msgctxt "view:project.work:0"
+msgctxt "view:project.work:"
msgid "Tasks"
msgstr ""
#, fuzzy
-msgctxt "view:project.work:0"
+msgctxt "view:project.work:"
msgid "Timesheet"
msgstr "Tijdverantwoording"
-msgctxt "view:project.work:0"
+msgctxt "view:project.work:"
msgid "Works Efforts"
msgstr ""
diff --git a/locale/ru_RU.po b/locale/ru_RU.po
index 6e11951..7687e46 100644
--- a/locale/ru_RU.po
+++ b/locale/ru_RU.po
@@ -2,72 +2,92 @@
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
-msgctxt "error:project.work:0"
+msgctxt "error:project.work:"
msgid "There should be only one timesheet work by task/project!"
msgstr ""
#, fuzzy
-msgctxt "field:project.work,children:0"
+msgctxt "field:project.work,children:"
msgid "Children"
msgstr "Подчиненый"
#, fuzzy
-msgctxt "field:project.work,comment:0"
+msgctxt "field:project.work,comment:"
msgid "Comment"
msgstr "Комментарии"
-msgctxt "field:project.work,effort:0"
+msgctxt "field:project.work,create_date:"
+msgid "Create Date"
+msgstr ""
+
+msgctxt "field:project.work,create_uid:"
+msgid "Create User"
+msgstr ""
+
+msgctxt "field:project.work,effort:"
msgid "Effort"
msgstr ""
+msgctxt "field:project.work,id:"
+msgid "ID"
+msgstr ""
+
#, fuzzy
-msgctxt "field:project.work,parent:0"
+msgctxt "field:project.work,parent:"
msgid "Parent"
msgstr "ОÑновной"
#, fuzzy
-msgctxt "field:project.work,party:0"
+msgctxt "field:project.work,party:"
msgid "Party"
msgstr "Организации"
#, fuzzy
-msgctxt "field:project.work,party_address:0"
+msgctxt "field:project.work,party_address:"
msgid "Contact Address"
msgstr "Контактный адреÑ"
#, fuzzy
-msgctxt "field:project.work,rec_name:0"
+msgctxt "field:project.work,rec_name:"
msgid "Name"
msgstr "Ðаименование"
#, fuzzy
-msgctxt "field:project.work,sequence:0"
+msgctxt "field:project.work,sequence:"
msgid "Sequence"
msgstr "ПоÑледовательноÑÑ‚ÑŒ"
#, fuzzy
-msgctxt "field:project.work,state:0"
+msgctxt "field:project.work,state:"
msgid "State"
msgstr "СтатуÑ"
-msgctxt "field:project.work,total_effort:0"
+msgctxt "field:project.work,total_effort:"
msgid "Total Effort"
msgstr ""
#, fuzzy
-msgctxt "field:project.work,type:0"
+msgctxt "field:project.work,type:"
msgid "Type"
msgstr "Тип"
-msgctxt "field:project.work,work:0"
+msgctxt "field:project.work,work:"
msgid "Work"
msgstr ""
-msgctxt "help:project.work,effort:0"
+msgctxt "field:project.work,write_date:"
+msgid "Write Date"
+msgstr ""
+
+msgctxt "field:project.work,write_uid:"
+msgid "Write User"
+msgstr ""
+
+msgctxt "help:project.work,effort:"
msgid "Estimated Effort for this work"
msgstr ""
-msgctxt "help:project.work,total_effort:0"
+msgctxt "help:project.work,total_effort:"
msgid "Estimated total effort for this work and the sub-works"
msgstr ""
@@ -79,12 +99,12 @@ msgctxt "model:ir.action,name:act_project_form"
msgid "Projects"
msgstr ""
-msgctxt "model:ir.action,name:act_task_form"
-msgid "Tasks"
+msgctxt "model:ir.action,name:act_project_tree"
+msgid "Projects"
msgstr ""
-msgctxt "model:ir.action,name:act_work_form"
-msgid "Works"
+msgctxt "model:ir.action,name:act_task_form"
+msgid "Tasks"
msgstr ""
msgctxt "model:ir.action,name:act_work_list"
@@ -124,7 +144,7 @@ msgctxt "model:ir.ui.menu,name:menu_work_tree"
msgid "Works Efforts"
msgstr ""
-msgctxt "model:project.work,name:0"
+msgctxt "model:project.work,name:"
msgid "Work Effort"
msgstr ""
@@ -133,44 +153,44 @@ msgid "Project Administration"
msgstr ""
#, fuzzy
-msgctxt "selection:project.work,state:0"
+msgctxt "selection:project.work,state:"
msgid "Done"
msgstr "Выполнено"
-msgctxt "selection:project.work,state:0"
+msgctxt "selection:project.work,state:"
msgid "Opened"
msgstr ""
-msgctxt "selection:project.work,type:0"
+msgctxt "selection:project.work,type:"
msgid "Project"
msgstr ""
-msgctxt "selection:project.work,type:0"
+msgctxt "selection:project.work,type:"
msgid "Task"
msgstr ""
#, fuzzy
-msgctxt "view:project.work:0"
+msgctxt "view:project.work:"
msgid "Children"
msgstr "Подчиненый"
#, fuzzy
-msgctxt "view:project.work:0"
+msgctxt "view:project.work:"
msgid "General"
msgstr "ОÑновной"
-msgctxt "view:project.work:0"
+msgctxt "view:project.work:"
msgid "Projects"
msgstr ""
-msgctxt "view:project.work:0"
+msgctxt "view:project.work:"
msgid "Tasks"
msgstr ""
-msgctxt "view:project.work:0"
+msgctxt "view:project.work:"
msgid "Timesheet"
msgstr ""
-msgctxt "view:project.work:0"
+msgctxt "view:project.work:"
msgid "Works Efforts"
msgstr ""
diff --git a/setup.py b/setup.py
index c98341c..5f94e11 100644
--- a/setup.py
+++ b/setup.py
@@ -12,7 +12,7 @@ minor_version = int(minor_version)
requires = []
for dep in info.get('depends', []):
- if not re.match(r'(ir|res|workflow|webdav)(\W|$)', dep):
+ if not re.match(r'(ir|res|webdav)(\W|$)', dep):
requires.append('trytond_%s >= %s.%s, < %s.%s' %
(dep, major_version, minor_version, major_version,
minor_version + 1))
diff --git a/tests/__init__.py b/tests/__init__.py
index 01c4a1b..f443bdc 100644
--- a/tests/__init__.py
+++ b/tests/__init__.py
@@ -1,4 +1,4 @@
#This file is part of Tryton. The COPYRIGHT file at the top level of
#this repository contains the full copyright notices and license terms.
-from test_project import suite
+from .test_project import suite
diff --git a/tests/test_project.py b/tests/test_project.py
index 081b2e6..b341780 100644
--- a/tests/test_project.py
+++ b/tests/test_project.py
@@ -2,7 +2,8 @@
#This file is part of Tryton. The COPYRIGHT file at the top level of
#this repository contains the full copyright notices and license terms.
-import sys, os
+import sys
+import os
DIR = os.path.abspath(os.path.normpath(os.path.join(__file__,
'..', '..', '..', '..', '..', 'trytond')))
if os.path.isdir(DIR):
@@ -33,9 +34,11 @@ class ProjectTestCase(unittest.TestCase):
'''
test_depends()
+
def suite():
suite = trytond.tests.test_tryton.suite()
- suite.addTests(unittest.TestLoader().loadTestsFromTestCase(ProjectTestCase))
+ suite.addTests(unittest.TestLoader().loadTestsFromTestCase(
+ ProjectTestCase))
return suite
if __name__ == '__main__':
diff --git a/trytond_project.egg-info/PKG-INFO b/trytond_project.egg-info/PKG-INFO
index 412d685..3e6945a 100644
--- a/trytond_project.egg-info/PKG-INFO
+++ b/trytond_project.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.0
Name: trytond-project
-Version: 2.2.0
+Version: 2.4.0
Summary: Project Module with:
- Project management
@@ -8,7 +8,7 @@ Home-page: http://www.tryton.org/
Author: B2CK
Author-email: info at b2ck.com
License: GPL-3
-Download-URL: http://downloads.tryton.org/2.2/
+Download-URL: http://downloads.tryton.org/2.4/
Description: UNKNOWN
Platform: UNKNOWN
Classifier: Development Status :: 5 - Production/Stable
diff --git a/trytond_project.egg-info/SOURCES.txt b/trytond_project.egg-info/SOURCES.txt
index 495ed96..eec1919 100644
--- a/trytond_project.egg-info/SOURCES.txt
+++ b/trytond_project.egg-info/SOURCES.txt
@@ -15,8 +15,10 @@ work.xml
doc/index.rst
icons/tryton-project.svg
locale/bg_BG.po
+locale/ca_ES.po
locale/cs_CZ.po
locale/de_DE.po
+locale/es_AR.po
locale/es_CO.po
locale/es_ES.po
locale/fr_FR.po
diff --git a/trytond_project.egg-info/requires.txt b/trytond_project.egg-info/requires.txt
index 31fc885..e05bdf2 100644
--- a/trytond_project.egg-info/requires.txt
+++ b/trytond_project.egg-info/requires.txt
@@ -1,4 +1,4 @@
-trytond_timesheet >= 2.2, < 2.3
-trytond_party >= 2.2, < 2.3
-trytond_company_work_time >= 2.2, < 2.3
-trytond >= 2.2, < 2.3
\ No newline at end of file
+trytond_timesheet >= 2.4, < 2.5
+trytond_party >= 2.4, < 2.5
+trytond_company_work_time >= 2.4, < 2.5
+trytond >= 2.4, < 2.5
\ No newline at end of file
diff --git a/work.py b/work.py
index bfa4650..43ae08f 100644
--- a/work.py
+++ b/work.py
@@ -1,28 +1,12 @@
#This file is part of Tryton. The COPYRIGHT file at the top level of
#this repository contains the full copyright notices and license terms.
-import copy
from trytond.model import ModelView, ModelSQL, fields
-from trytond.model.modelstorage import OPERATORS
from trytond.pyson import Eval
from trytond.backend import TableHandler
from trytond.transaction import Transaction
from trytond.pool import Pool
-class TimesheetWork(ModelSQL, ModelView):
- _name = 'timesheet.work'
-
- def __init__(self):
- super(TimesheetWork, self).__init__()
-
- self.parent = copy.copy(self.parent)
- self.parent.context = copy.copy(self.parent.context)
- self.parent.context['type'] = Eval('type')
- self._reset_columns()
-
-TimesheetWork()
-
-
class Work(ModelSQL, ModelView):
'Work Effort'
_name = 'project.work'
@@ -35,10 +19,7 @@ class Work(ModelSQL, ModelView):
('project', 'Project'),
('task', 'Task')
],
- 'Type', required=True, select=1,
- states={
- 'invisible': Eval('context', {}).get('type', False),
- })
+ 'Type', required=True, select=True)
party = fields.Many2One('party.party', 'Party',
states={
'invisible': Eval('type') != 'project',
@@ -62,21 +43,18 @@ class Work(ModelSQL, ModelView):
state = fields.Selection([
('opened', 'Opened'),
('done', 'Done'),
- ], 'State',
- states={
- 'invisible': Eval('type') != 'task',
- 'required': Eval('type') == 'task',
- }, select=1, depends=['type'])
- sequence = fields.Integer('Sequence')
+ ], 'State', required=True, select=True)
+ sequence = fields.Integer('Sequence', required=True)
def default_type(self):
- if Transaction().context.get('type') == 'project':
- return 'project'
return 'task'
def default_state(self):
return 'opened'
+ def default_effort(self):
+ return 0.0
+
def init(self, module_name):
timesheet_work_obj = Pool().get('timesheet.work')
cursor = Transaction().cursor
@@ -108,6 +86,19 @@ class Work(ModelSQL, ModelView):
'timesheet work by task/project!'),
]
self._order.insert(0, ('sequence', 'ASC'))
+ self._constraints += [
+ ('check_state',
+ 'A work can not be closed if its children are still opened'),
+ ]
+
+ def check_state(self, ids):
+ for work in self.browse(ids):
+ if ((work.state == 'opened'
+ and (work.parent and work.parent.state == 'done'))
+ or (work.state == 'done'
+ and any(c.state == 'opened' for c in work.children))):
+ return False
+ return True
def get_parent(self, ids, name):
res = dict.fromkeys(ids, None)
@@ -143,7 +134,7 @@ class Work(ModelSQL, ModelView):
else:
child_project_works = self.browse(ids)
child_timesheet_work_ids = [x.work.id for x in child_project_works]
- parent_timesheet_work_id = False
+ parent_timesheet_work_id = None
timesheet_work_obj.write(child_timesheet_work_ids, {
'parent': parent_timesheet_work_id
@@ -165,7 +156,8 @@ class Work(ModelSQL, ModelView):
# we need to convert them to timesheet_work ids
operands = set()
for _, _, operand in timesheet_work_domain:
- if isinstance(operand, (int, long)) and not isinstance(operand, bool):
+ if (isinstance(operand, (int, long))
+ and not isinstance(operand, bool)):
operands.add(operand)
elif isinstance(operand, list):
for o in operand:
@@ -216,7 +208,7 @@ class Work(ModelSQL, ModelView):
id2work = {}
leafs = set()
for work in works:
- res[work.id] = work.effort
+ res[work.id] = work.effort or 0
id2work[work.id] = work
if not work.children:
leafs.add(work.id)
diff --git a/work.xml b/work.xml
index 6d55493..410f9c7 100644
--- a/work.xml
+++ b/work.xml
@@ -59,21 +59,6 @@ this repository contains the full copyright notices and license terms. -->
]]>
</field>
</record>
- <!-- list view for projects (wihtout type and state fields) -->
- <record model="ir.ui.view" id="work_view_list3">
- <field name="model">project.work</field>
- <field name="type">tree</field>
- <field name="arch" type="xml">
- <![CDATA[
- <tree string="Projects">
- <field name="name"/>
- <field name="hours" widget="float_time" float_time="company_work_time"/>
- <field name="total_effort" widget="float_time" float_time="company_work_time"/>
- <field name="active" tree_invisible="1"/>
- </tree>
- ]]>
- </field>
- </record>
<record model="ir.ui.view" id="work_view_form">
<field name="model">project.work</field>
<field name="type">form</field>
@@ -97,35 +82,24 @@ this repository contains the full copyright notices and license terms. -->
<label name="company"/>
<field name="company"/>
<notebook colspan="8">
- <page string="General" id="general">
- <group colspan="2" col="2" id="left">
- <label name="party"/>
- <field name="party"/>
- <label name="hours"/>
- <field name="hours" widget="float_time" float_time="company_work_time"/>
- </group>
- <group colspan="2" col="2" id="right">
- <label name="party_address"/>
- <field name="party_address"/>
- <label name="effort"/>
- <field name="effort" widget="float_time" float_time="company_work_time"/>
- <label name="total_effort"/>
- <field name="total_effort" widget="float_time" float_time="company_work_time"/>
- </group>
- <separator name="comment" colspan="4"/>
- <field name="comment" colspan="4"/>
+ <page string="General" id="general" col="6">
+ <label name="party"/>
+ <field name="party"/>
+ <label name="party_address"/>
+ <field name="party_address"/>
+ <newline/>
+ <label name="hours"/>
+ <field name="hours" widget="float_time" float_time="company_work_time"/>
+ <label name="total_effort"/>
+ <field name="total_effort" widget="float_time" float_time="company_work_time"/>
+ <label name="effort"/>
+ <field name="effort" widget="float_time" float_time="company_work_time"/>
+ <separator name="comment" colspan="6"/>
+ <field name="comment" colspan="6"/>
</page>
<page string="Children" id="children"
states="{'invisible': Not(Equal(Eval('type'), 'project'))}">
- <field name="children" colspan="4">
- <tree string="Children">
- <field name="name"/>
- <field name="hours" widget="float_time" float_time="company_work_time"/>
- <field name="total_effort" widget="float_time" float_time="company_work_time"/>
- <field name="type"/>
- <field name="state"/>
- </tree>
- </field>
+ <field name="children" colspan="4"/>
</page>
<page string="Timesheet" id="timesheet_lines"
states="{'invisible': Not(Bool(Eval('timesheet_available')))}">
@@ -175,30 +149,36 @@ this repository contains the full copyright notices and license terms. -->
<menuitem parent="menu_work_tree"
action="act_work_list" id="menu_work_list"/>
- <record model="ir.action.act_window" id="act_work_form">
- <field name="name">Works</field>
+ <record model="ir.action.act_window" id="act_project_tree">
+ <field name="name">Projects</field>
<field name="res_model">project.work</field>
<field name="domain">[('parent', '=', False)]</field>
</record>
<record model="ir.action.act_window.view"
- id="act_work_form_view1">
+ id="act_project_tree_view1">
<field name="sequence" eval="10"/>
<field name="view" ref="work_view_tree"/>
- <field name="act_window" ref="act_work_tree"/>
+ <field name="act_window" ref="act_project_tree"/>
</record>
- <menuitem parent="menu_project" action="act_work_tree"
- id="menu_project_tree" name="Projects"/>
+ <record model="ir.action.act_window.view"
+ id="act_project_tree_view2">
+ <field name="sequence" eval="20"/>
+ <field name="view" ref="work_view_form"/>
+ <field name="act_window" ref="act_project_tree"/>
+ </record>
+ <menuitem parent="menu_project" action="act_project_tree"
+ id="menu_project_tree"/>
<record model="ir.action.act_window" id="act_project_form">
<field name="name">Projects</field>
<field name="res_model">project.work</field>
<field name="domain">[('type', '=', 'project')]</field>
- <field name="context">{'type': 'project'}</field>
+ <field name="context"></field>
</record>
<record model="ir.action.act_window.view"
id="act_project_form_view1">
<field name="sequence" eval="10"/>
- <field name="view" ref="work_view_list3"/>
+ <field name="view" ref="work_view_list2"/>
<field name="act_window" ref="act_project_form"/>
</record>
<record model="ir.action.act_window.view"
@@ -214,7 +194,7 @@ this repository contains the full copyright notices and license terms. -->
<field name="name">Tasks</field>
<field name="res_model">project.work</field>
<field name="domain">[('type', '=', 'task')]</field>
- <field name="context">{'type': 'task'}</field>
+ <field name="context"></field>
</record>
<record model="ir.action.act_window.view"
id="act_task_form_view1">
@@ -234,7 +214,7 @@ this repository contains the full copyright notices and license terms. -->
<record model="ir.action.act_window" id="act_open_child_work">
<field name="name">Tasks</field>
<field name="res_model">project.work</field>
- <field name="context">{'type': 'task'}</field>
+ <field name="context"></field>
<field name="domain">[('parent', '=', Eval('active_id')), ('type', '=', 'task')]</field>
</record>
<record model="ir.action.keyword"
commit 6d9cb3ec525c1562e7c68f969a01b2ff399a00dc
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Sun Mar 25 15:28:18 2012 +0200
Adding Format header for DEP5.
diff --git a/debian/copyright b/debian/copyright
index f8cd02e..c0fb258 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,3 +1,5 @@
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+
Files: *
Copyright:
(C) 2008-2011 Cedric Krier
commit c99a07a3f9d9d90e5f3523a5b0aa9528058e09ca
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Fri Feb 24 14:01:03 2012 +0100
Updating year in copyright.
diff --git a/debian/copyright b/debian/copyright
index 187d1cf..f8cd02e 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -11,8 +11,8 @@ License: public-domain
Files: debian/*
Copyright:
- (C) 2009-2011 Daniel Baumann <daniel at debian.org>
- (C) 2011 Mathias Behrle <mathiasb at m9s.biz>
+ (C) 2009-2012 Daniel Baumann <daniel at debian.org>
+ (C) 2011-2012 Mathias Behrle <mathiasb at m9s.biz>
License: GPL-3+
License: GPL-3+
commit da6315934c3dc8fa95612aefc6f49fb429d5c398
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Fri Feb 24 13:47:02 2012 +0100
Updating to Standards-Version: 3.9.3, no changes needed.
diff --git a/debian/control b/debian/control
index d79476a..b6bc0cd 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,7 @@ Maintainer: Debian Tryton Maintainers <tryton at lists.debian-maintainers.org>
Uploaders: Daniel Baumann <daniel at debian.org>, Mathias Behrle <mathiasb at m9s.biz>
Dm-Upload-Allowed: yes
Build-Depends: debhelper (>= 8), python (>= 2.6.6-3~), python-setuptools
-Standards-Version: 3.9.2
+Standards-Version: 3.9.3
Homepage: http://www.tryton.org/
Vcs-Browser: http://git.debian-maintainers.org/?p=tryton/tryton-modules-project.git
Vcs-Git: git://git.debian-maintainers.org/git/tryton/tryton-modules-project.git
commit 272dae3adaff9bdd3ec3c5ee042724f65a3d8cc2
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Mon Dec 26 18:16:19 2011 +0100
Releasing debian version 2.2.0-1.
diff --git a/debian/changelog b/debian/changelog
index 82b8ee4..dbecce8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,17 @@
+tryton-modules-project (2.2.0-1) unstable; urgency=low
+
+ * Bumping X-Python-Version to >=2.6.
+ * Updating versioned tryton depends to 2.2.
+ * Updating copyright.
+ * Removing 01-dfsg-icons patch, patch went upstream.
+ * Merging upstream version 2.2.0.
+ * Removing tango-icon-theme from Depends.
+ * Adding Bug URL to dfsg-icons patch.
+ * Rediffing dfsg-icons patch.
+ * Reordering anf fixing license for public-domain.
+
+ -- Mathias Behrle <mathiasb at m9s.biz> Mon, 26 Dec 2011 14:01:56 +0100
+
tryton-modules-project (2.0.0+dfsg-3) unstable; urgency=low
* Removing deprecated XB-Python-Version for dh_python2.
commit 17baa1e711e1ccd08c5582b4eb333be7bd21371f
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Sat Dec 17 13:59:45 2011 +0100
Bumping X-Python-Version to >=2.6.
diff --git a/debian/control b/debian/control
index 932105d..d79476a 100644
--- a/debian/control
+++ b/debian/control
@@ -9,7 +9,7 @@ Standards-Version: 3.9.2
Homepage: http://www.tryton.org/
Vcs-Browser: http://git.debian-maintainers.org/?p=tryton/tryton-modules-project.git
Vcs-Git: git://git.debian-maintainers.org/git/tryton/tryton-modules-project.git
-X-Python-Version: >= 2.5
+X-Python-Version: >= 2.6
Package: tryton-modules-project
Architecture: all
commit 8c140f4abab75a8af2de3040ddf4d2a4cf366d63
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Tue Nov 1 15:19:31 2011 +0100
Updating versioned tryton depends to 2.2.
diff --git a/debian/control b/debian/control
index 01cd2fc..932105d 100644
--- a/debian/control
+++ b/debian/control
@@ -14,8 +14,8 @@ X-Python-Version: >= 2.5
Package: tryton-modules-project
Architecture: all
Depends:
- ${misc:Depends}, ${python:Depends}, tryton-server (>= 2.0),
- tryton-modules-party (>= 2.0), tryton-modules-timesheet (>= 2.0),
+ ${misc:Depends}, ${python:Depends}, tryton-server (>= 2.2),
+ tryton-modules-party (>= 2.2), tryton-modules-timesheet (>= 2.2),
python-pkg-resources
Description: Tryton Application Platform (Project Module)
Tryton is a high-level general purpose application platform written in Python
commit 5bae6d9c77d10d8daba3df83c7c4cea2629f194c
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Tue Nov 1 15:08:54 2011 +0100
Updating copyright.
diff --git a/debian/copyright b/debian/copyright
index 0c09c31..187d1cf 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -33,8 +33,8 @@ License: GPL-3+
can be found in /usr/share/common-licenses/GPL-3 file.
License: public-domain
- The icons used to replace the original not DFSG compatible icons are taken
- from http://tango.freedesktop.org/releases/tango-icon-theme-0.8.90.tar.gz
+ The icons used are generally taken from
+ http://tango.freedesktop.org/releases/tango-icon-theme-0.8.90.tar.gz
.
Upstream Authors: 2005-2009
.
commit d58f84cc2c7de1c0dcc1607deb980bcf7e9bcd5c
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Tue Nov 1 15:08:02 2011 +0100
Removing 01-dfsg-icons patch, patch went upstream.
diff --git a/debian/patches/01-dfsg-icons b/debian/patches/01-dfsg-icons
deleted file mode 100644
index c68ca71..0000000
--- a/debian/patches/01-dfsg-icons
+++ /dev/null
@@ -1,335 +0,0 @@
-Author: Mathias Behrle <mathiasb at m9s.biz>
-Description: Add DFSG compatible icon as a replacement for the original icon.
-Bug: http://bugs.tryton.org/roundup/issue1996
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ tryton-modules-project/icons/tryton-project.svg 2011-08-07 14:07:02.050029839 +0200
-@@ -0,0 +1,329 @@
-+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-+<!-- Created with Inkscape (http://www.inkscape.org/) -->
-+<svg
-+ xmlns:dc="http://purl.org/dc/elements/1.1/"
-+ xmlns:cc="http://creativecommons.org/ns#"
-+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-+ xmlns:svg="http://www.w3.org/2000/svg"
-+ xmlns="http://www.w3.org/2000/svg"
-+ xmlns:xlink="http://www.w3.org/1999/xlink"
-+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-+ width="48"
-+ height="48"
-+ id="svg2"
-+ sodipodi:version="0.32"
-+ inkscape:version="0.46"
-+ version="1.0"
-+ sodipodi:docbase="/home/tigert/cvs/freedesktop.org/tango-icon-theme/scalable/categories"
-+ sodipodi:docname="applications-development.svg"
-+ inkscape:output_extension="org.inkscape.output.svg.inkscape">
-+ <defs
-+ id="defs4">
-+ <inkscape:perspective
-+ sodipodi:type="inkscape:persp3d"
-+ inkscape:vp_x="0 : 24 : 1"
-+ inkscape:vp_y="0 : 1000 : 0"
-+ inkscape:vp_z="48 : 24 : 1"
-+ inkscape:persp3d-origin="24 : 16 : 1"
-+ id="perspective47" />
-+ <linearGradient
-+ inkscape:collect="always"
-+ id="linearGradient2807">
-+ <stop
-+ style="stop-color:#ffffff;stop-opacity:1;"
-+ offset="0"
-+ id="stop2809" />
-+ <stop
-+ style="stop-color:#ffffff;stop-opacity:0;"
-+ offset="1"
-+ id="stop2811" />
-+ </linearGradient>
-+ <linearGradient
-+ id="linearGradient18284">
-+ <stop
-+ style="stop-color:#000000;stop-opacity:1;"
-+ offset="0"
-+ id="stop18286" />
-+ <stop
-+ id="stop20913"
-+ offset="0.5"
-+ style="stop-color:#000000;stop-opacity:1;" />
-+ <stop
-+ id="stop19165"
-+ offset="1"
-+ style="stop-color:#000000;stop-opacity:0;" />
-+ </linearGradient>
-+ <linearGradient
-+ id="linearGradient11202">
-+ <stop
-+ style="stop-color:#c4a000;stop-opacity:1;"
-+ offset="0"
-+ id="stop11204" />
-+ <stop
-+ style="stop-color:#c4a000;stop-opacity:0;"
-+ offset="1"
-+ id="stop11206" />
-+ </linearGradient>
-+ <linearGradient
-+ id="linearGradient8543">
-+ <stop
-+ style="stop-color:#fffef5;stop-opacity:0.94117647;"
-+ offset="0"
-+ id="stop8545" />
-+ <stop
-+ style="stop-color:#fce94f;stop-opacity:0;"
-+ offset="1"
-+ id="stop8547" />
-+ </linearGradient>
-+ <linearGradient
-+ id="linearGradient5012">
-+ <stop
-+ style="stop-color:#fdf188;stop-opacity:1;"
-+ offset="0"
-+ id="stop5014" />
-+ <stop
-+ style="stop-color:#d3bc00;stop-opacity:1;"
-+ offset="1"
-+ id="stop5016" />
-+ </linearGradient>
-+ <radialGradient
-+ inkscape:collect="always"
-+ xlink:href="#linearGradient5012"
-+ id="radialGradient7666"
-+ gradientUnits="userSpaceOnUse"
-+ gradientTransform="matrix(0.136507,-2.396132e-18,-4.484926e-5,7.137743e-2,-23.39816,12.31028)"
-+ cx="336.73767"
-+ cy="-72.420044"
-+ fx="336.73767"
-+ fy="-72.420044"
-+ r="297.21338" />
-+ <radialGradient
-+ inkscape:collect="always"
-+ xlink:href="#linearGradient8543"
-+ id="radialGradient8549"
-+ cx="420.87839"
-+ cy="685.99139"
-+ fx="420.87839"
-+ fy="685.99139"
-+ r="235.88632"
-+ gradientTransform="matrix(0.163532,-1.065754e-2,1.078108e-2,0.165425,-46.18187,-65.65506)"
-+ gradientUnits="userSpaceOnUse" />
-+ <radialGradient
-+ inkscape:collect="always"
-+ xlink:href="#linearGradient8543"
-+ id="radialGradient9434"
-+ cx="500.97794"
-+ cy="286.46918"
-+ fx="500.97794"
-+ fy="286.46918"
-+ r="40.975471"
-+ gradientTransform="matrix(0.224796,1.017229e-2,-9.759474e-3,0.215674,-73.87964,-54.89804)"
-+ gradientUnits="userSpaceOnUse" />
-+ <radialGradient
-+ inkscape:collect="always"
-+ xlink:href="#linearGradient8543"
-+ id="radialGradient10317"
-+ cx="293.81989"
-+ cy="243.06874"
-+ fx="293.81989"
-+ fy="243.06874"
-+ r="48.782982"
-+ gradientTransform="matrix(0.272962,-7.1724e-2,5.616202e-2,0.213737,-78.54657,-24.30491)"
-+ gradientUnits="userSpaceOnUse" />
-+ <radialGradient
-+ inkscape:collect="always"
-+ xlink:href="#linearGradient11202"
-+ id="radialGradient11208"
-+ cx="424.99243"
-+ cy="270.67969"
-+ fx="424.99243"
-+ fy="270.67969"
-+ r="38.451698"
-+ gradientTransform="matrix(8.174351e-2,1.024998e-2,-4.335971e-2,0.345793,6.123413,-84.50421)"
-+ gradientUnits="userSpaceOnUse" />
-+ <radialGradient
-+ inkscape:collect="always"
-+ xlink:href="#linearGradient8543"
-+ id="radialGradient13895"
-+ cx="340.35886"
-+ cy="409.83737"
-+ fx="340.35886"
-+ fy="409.83737"
-+ r="103.26014"
-+ gradientTransform="matrix(0.105628,-4.514018e-2,6.692574e-2,0.156607,-46.01605,-24.35485)"
-+ gradientUnits="userSpaceOnUse" />
-+ <radialGradient
-+ inkscape:collect="always"
-+ xlink:href="#linearGradient18284"
-+ id="radialGradient18290"
-+ cx="29.898689"
-+ cy="45.673546"
-+ fx="29.898689"
-+ fy="45.673546"
-+ r="30.365856"
-+ gradientTransform="matrix(1,0,2.702168e-19,0.415385,-2.283104e-16,26.70146)"
-+ gradientUnits="userSpaceOnUse" />
-+ <radialGradient
-+ inkscape:collect="always"
-+ xlink:href="#linearGradient8543"
-+ id="radialGradient2798"
-+ gradientUnits="userSpaceOnUse"
-+ gradientTransform="matrix(0.101953,-4.272301e-2,9.621296e-2,0.229599,-48.67227,-64.24148)"
-+ cx="131.23691"
-+ cy="424.15677"
-+ fx="131.23691"
-+ fy="424.15677"
-+ r="35.934704" />
-+ <radialGradient
-+ inkscape:collect="always"
-+ xlink:href="#linearGradient2807"
-+ id="radialGradient2813"
-+ cx="15.491823"
-+ cy="10.943316"
-+ fx="15.491823"
-+ fy="10.943316"
-+ r="18.370251"
-+ gradientTransform="matrix(1.402663,1.176399e-16,-9.356816e-17,1.115648,-6.237984,5.33075e-2)"
-+ gradientUnits="userSpaceOnUse" />
-+ </defs>
-+ <sodipodi:namedview
-+ id="base"
-+ pagecolor="#ffffff"
-+ bordercolor="#666666"
-+ borderopacity="0.13333333"
-+ inkscape:pageopacity="0.0"
-+ inkscape:pageshadow="2"
-+ inkscape:zoom="11.313708"
-+ inkscape:cx="13.540158"
-+ inkscape:cy="28.304801"
-+ inkscape:document-units="px"
-+ inkscape:current-layer="layer1"
-+ inkscape:window-width="906"
-+ inkscape:window-height="987"
-+ inkscape:window-x="635"
-+ inkscape:window-y="114"
-+ inkscape:showpageshadow="false"
-+ stroke="#c4a000"
-+ showgrid="false" />
-+ <metadata
-+ id="metadata7">
-+ <rdf:RDF>
-+ <cc:Work
-+ rdf:about="">
-+ <dc:format>image/svg+xml</dc:format>
-+ <dc:type
-+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-+ <dc:contributor>
-+ <cc:Agent>
-+ <dc:title>Henrik Andersen</dc:title>
-+ </cc:Agent>
-+ </dc:contributor>
-+ <dc:title>Developer Tools</dc:title>
-+ <dc:subject>
-+ <rdf:Bag>
-+ <rdf:li>developer</rdf:li>
-+ <rdf:li>dev</rdf:li>
-+ <rdf:li>tool</rdf:li>
-+ <rdf:li>make</rdf:li>
-+ <rdf:li>compile</rdf:li>
-+ <rdf:li>build</rdf:li>
-+ <rdf:li>code</rdf:li>
-+ <rdf:li>hacker</rdf:li>
-+ </rdf:Bag>
-+ </dc:subject>
-+ <dc:creator>
-+ <cc:Agent>
-+ <dc:title>Jakub Steiner</dc:title>
-+ </cc:Agent>
-+ </dc:creator>
-+ <dc:source>http://jimmac.musichall.cz</dc:source>
-+ <cc:license
-+ rdf:resource="http://creativecommons.org/licenses/publicdomain/" />
-+ </cc:Work>
-+ <cc:License
-+ rdf:about="http://creativecommons.org/licenses/publicdomain/">
-+ <cc:permits
-+ rdf:resource="http://creativecommons.org/ns#Reproduction" />
-+ <cc:permits
-+ rdf:resource="http://creativecommons.org/ns#Distribution" />
-+ <cc:permits
-+ rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
-+ </cc:License>
-+ </rdf:RDF>
-+ </metadata>
-+ <g
-+ inkscape:label="Layer 1"
-+ id="layer1"
-+ inkscape:groupmode="layer">
-+ <path
-+ sodipodi:type="arc"
-+ style="opacity:1;fill:url(#radialGradient18290);fill-opacity:1;stroke:none;stroke-width:12.39700031;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-+ id="path17409"
-+ sodipodi:cx="29.898689"
-+ sodipodi:cy="45.673546"
-+ sodipodi:rx="30.365856"
-+ sodipodi:ry="12.613509"
-+ d="M 60.264545 45.673546 A 30.365856 12.613509 0 1 1 -0.4671669,45.673546 A 30.365856 12.613509 0 1 1 60.264545 45.673546 z"
-+ transform="matrix(0.742527,0,-5.812964e-2,1.428611,4.500517,-36.68345)" />
-+ <path
-+ style="fill:url(#radialGradient7666);fill-opacity:1;stroke:#c4a000;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-+ d="M 23.152758,1.1801876 C 20.380218,1.2190783 17.86582,1.8908769 15.634281,3.0196314 C 14.541531,5.1714614 10.9437,7.7293655 9.4689484,8.0015561 C 6.5691703,11.460832 4.6887193,15.805035 3.9754523,19.98162 C 3.9750148,19.984183 3.9758889,19.986781 3.9754523,19.989343 C 2.7890929,21.53906 2.2854415,23.385937 2.5981051,25.521903 C 3.7192795,33.181217 5.8802729,40.410195 10.783201,42.078178 C 17.93763,44.512124 32.65497,43.864025 35.912708,42.536436 C 43.051738,39.62715 43.684161,33.251338 44.80414,25.75618 C 45.109694,23.711348 44.659305,21.914978 43.573539,20.383238 C 43.564583,20.327636 43.555052,20.271764 43.54522,20.215896 C 42.763966,15.777007 40.697859,11.326849 37.602582,7.8466935 C 35.508773,7.62926 31.462964,4.270333 30.483158,2.6229925 C 28.330506,1.7020155 25.961342,1.1801876 23.407632,1.1801876 C 23.322311,1.1801876 23.237595,1.178998 23.152758,1.1801876 z "
-+ id="path3120"
-+ sodipodi:nodetypes="cccscsssscsccsc" />
-+ <path
-+ style="fill:url(#radialGradient8549);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;opacity:0.66666667"
-+ d="M 43.629688,22.792984 C 39.033494,39.233217 10.438199,40.802737 3.7832765,23.04227 C 3.7410682,39.366403 10.103414,44.083889 28.189955,43.247454 C 31.251932,43.106765 38.199775,43.290321 42.804439,34.110678 C 45.042804,22.600278 43.629688,22.792984 43.629688,22.792984 z "
-+ id="path7668"
-+ sodipodi:nodetypes="ccscc" />
-+ <path
-+ style="fill:url(#radialGradient9434);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-+ d="M 34.691565,7.6783057 L 37.192446,8.8037033 C 37.192446,8.8037033 35.882042,18.926343 30.52343,25.288675 C 32.295095,18.832841 34.712405,7.6783057 34.691565,7.6783057 z "
-+ id="path8553"
-+ sodipodi:nodetypes="cccc" />
-+ <path
-+ style="fill:url(#radialGradient10317);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-+ d="M 15.872437,4.1562328 C 17.372967,13.221927 22.374727,23.642261 21.874552,24.163278 C 17.289604,17.181654 15.372261,11.242061 13.871732,6.2403001 C 13.871732,6.1569366 15.872437,4.1770734 15.872437,4.1562328 z "
-+ id="path9436"
-+ sodipodi:nodetypes="cccc" />
-+ <path
-+ style="fill:url(#radialGradient11208);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-+ d="M 30.21082,3.8227818 C 26.126047,20.328594 25.959322,23.079563 25.959322,23.079563 C 25.959322,23.079563 32.294888,6.3236627 32.294888,5.9068495 C 32.294888,5.9068487 30.710997,4.4063209 30.21082,3.8227818 z "
-+ id="path10319"
-+ sodipodi:nodetypes="ccsc" />
-+ <flowRoot
-+ xml:space="preserve"
-+ id="flowRoot12974"><flowRegion
-+ id="flowRegion12976"><rect
-+ id="rect12978"
-+ width="40.055775"
-+ height="16.02231"
-+ x="86.787514"
-+ y="412.80496" /></flowRegion><flowPara
-+ id="flowPara12980" /></flowRoot> <path
-+ style="fill:url(#radialGradient13895);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-+ d="M 16.18209,34.476182 L 16.137416,24.906437 L 30.631143,24.906437 L 32.273747,23.642895 L 15.342282,23.642895 L 15.386956,34.283476 L 16.18209,34.476182 z "
-+ id="path13014"
-+ sodipodi:nodetypes="ccccccc" />
-+ <path
-+ style="fill:#958401;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-+ d="M 31.043495,24.81709 L 31.125176,34.621701 L 31.81132,34.406959 L 31.823298,23.553549 L 31.043495,24.81709 z "
-+ id="path13897"
-+ sodipodi:nodetypes="ccccc" />
-+ <path
-+ style="fill:url(#radialGradient2798);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-+ d="M 4.2551267,24.106065 C 4.2551267,24.106065 6.571777,32.221754 14.476068,32.872102 C 15.581676,35.36252 13.341098,36.996703 13.341098,36.996703 L 9.7315781,36.745641 C 9.7315781,36.745641 3.4928036,28.752699 3.2433694,26.844759 C 2.9939369,24.936822 3.4066529,23.436966 3.4066529,23.436966 L 4.2551267,24.106065 z "
-+ id="path16526"
-+ sodipodi:nodetypes="ccccscc" />
-+ <path
-+ sodipodi:nodetypes="cccscsssscsccsc"
-+ id="path2703"
-+ d="M 23.184204,2.3889904 C 20.570275,2.4256563 18.199721,3.0590226 16.095844,4.1232033 C 15.065608,6.1519314 11.673602,8.563503 10.283218,8.8201221 C 7.5493302,12.0815 5.776456,16.17718 5.1039936,20.11483 C 5.1035812,20.117247 5.1044052,20.119696 5.1039936,20.122112 C 3.9855035,21.583172 3.2455,23.368587 3.5402767,25.382359 C 4.597311,32.603499 6.4678792,39.092036 10.868256,41.021813 C 16.791397,43.619395 32.407978,42.807748 35.479348,41.556108 C 42.209968,38.813256 42.541047,32.625414 43.596954,25.559039 C 43.885028,23.631188 43.460404,21.937585 42.436753,20.493473 C 42.428309,20.441052 42.419324,20.388376 42.410054,20.335704 C 41.673494,16.150755 39.725585,11.955182 36.807382,8.6741189 C 34.833356,8.4691243 31.019,5.3023548 30.095246,3.7492553 C 28.065743,2.8809656 25.832115,2.3889904 23.424497,2.3889904 C 23.344057,2.3889904 23.264188,2.3878689 23.184204,2.3889904 z "
-+ style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:0.99999976;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;opacity:0.74444444" />
-+ <path
-+ style="fill:url(#radialGradient2813);fill-opacity:1.0;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;opacity:0.59444444"
-+ d="M 22.59375,2.78125 C 20.264193,2.8978182 18.152779,3.5062884 16.25,4.46875 C 15.239275,6.4590559 11.895302,8.841991 10.53125,9.09375 C 7.8491405,12.293361 6.1284766,16.293174 5.46875,20.15625 C 5.4683454,20.15862 5.4691538,20.18513 5.46875,20.1875 C 4.3714431,21.62089 4.0107233,23.778648 4.0107233,23.778648 C 8.6959903,27.38371 11.652335,23.99254 18.329596,21.761428 C 30.928876,23.684569 37.077934,20.765483 40.84375,16.09375 C 40.850609,16.085241 40.840294,16.072869 40.84375,16.0625 C 39.852567,13.479666 38.411479,11.016387 36.5625,8.9375 C 34.62586,8.7363873 30.875008,5.6486852 29.96875,4.125 C 27.977684,3.2731547 25.79952,2.78125 23.4375,2.78125 C 23.358584,2.7812501 23.265969,2.7801497 23.1875,2.78125 C 22.987154,2.7840603 22.79117,2.7713713 22.59375,2.78125 z "
-+ id="path2800"
-+ sodipodi:nodetypes="cccssccscccssc" />
-+ </g>
-+</svg>
diff --git a/debian/patches/series b/debian/patches/series
index a127545..e69de29 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +0,0 @@
-01-dfsg-icons
commit e36710751055d8c72a5e617fd132c79cf05e151f
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Mon Oct 31 16:21:03 2011 +0100
Merging upstream version 2.2.0.
diff --git a/CHANGELOG b/CHANGELOG
index b7dc78f..db70548 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 2.2.0 - 2011-10-24
+* Bug fixes (see mercurial logs for details)
+
Version 2.0.0 - 2011-04-27
* Bug fixes (see mercurial logs for details)
diff --git a/MANIFEST.in b/MANIFEST.in
index 47da692..44a0685 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -6,6 +6,6 @@ include CHANGELOG
include LICENSE
include *.xml
include *.odt
-include *.csv
+include locale/*.po
include doc/*
include icons/*
diff --git a/PKG-INFO b/PKG-INFO
index 7841eb8..3361dcb 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.0
Name: trytond_project
-Version: 2.0.0
+Version: 2.2.0
Summary: Project Module with:
- Project management
@@ -8,23 +8,26 @@ Home-page: http://www.tryton.org/
Author: B2CK
Author-email: info at b2ck.com
License: GPL-3
-Download-URL: http://downloads.tryton.org/2.0/
+Download-URL: http://downloads.tryton.org/2.2/
Description: UNKNOWN
Platform: UNKNOWN
Classifier: Development Status :: 5 - Production/Stable
Classifier: Environment :: Plugins
+Classifier: Framework :: Tryton
Classifier: Intended Audience :: Developers
Classifier: Intended Audience :: Financial and Insurance Industry
Classifier: Intended Audience :: Legal Industry
Classifier: Intended Audience :: Manufacturing
Classifier: License :: OSI Approved :: GNU General Public License (GPL)
Classifier: Natural Language :: Bulgarian
+Classifier: Natural Language :: Czech
+Classifier: Natural Language :: Dutch
Classifier: Natural Language :: English
Classifier: Natural Language :: French
Classifier: Natural Language :: German
+Classifier: Natural Language :: Russian
Classifier: Natural Language :: Spanish
Classifier: Operating System :: OS Independent
-Classifier: Programming Language :: Python :: 2.5
Classifier: Programming Language :: Python :: 2.6
Classifier: Programming Language :: Python :: 2.7
Classifier: Topic :: Office/Business
diff --git a/__tryton__.py b/__tryton__.py
index 1dc5653..0664ecc 100644
--- a/__tryton__.py
+++ b/__tryton__.py
@@ -7,7 +7,7 @@
'name_es_CO': 'Proyectos',
'name_es_ES': 'Proyecto',
'name_fr_FR': 'Projet',
- 'version': '2.0.0',
+ 'version': '2.2.0',
'author': 'B2CK',
'email': 'info at b2ck.com',
'website': 'http://www.tryton.org/',
@@ -40,10 +40,13 @@
'work.xml',
],
'translation': [
- 'bg_BG.csv',
- 'de_DE.csv',
- 'es_CO.csv',
- 'es_ES.csv',
- 'fr_FR.csv',
+ 'locale/bg_BG.po',
+ 'locale/cs_CZ.po',
+ 'locale/de_DE.po',
+ 'locale/es_CO.po',
+ 'locale/es_ES.po',
+ 'locale/fr_FR.po',
+ 'locale/nl_NL.po',
+ 'locale/ru_RU.po',
],
}
diff --git a/bg_BG.csv b/bg_BG.csv
deleted file mode 100644
index 8a41b4c..0000000
--- a/bg_BG.csv
+++ /dev/null
@@ -1,44 +0,0 @@
-type,name,res_id,src,value,fuzzy
-error,project.work,0,There should be only one timesheet work by task/project!,Задача/проект може да имат Ñамо един график за дейноÑÑ‚!,0
-field,"project.work,children",0,Children,Деца,0
-field,"project.work,comment",0,Comment,Коментар,0
-field,"project.work,effort",0,Effort,УÑлие,0
-field,"project.work,parent",0,Parent,Родител,0
-field,"project.work,party",0,Party,Партньор,0
-field,"project.work,party_address",0,Contact Address,ÐÐ´Ñ€ÐµÑ Ð·Ð° контакт,0
-field,"project.work,rec_name",0,Name,Име,0
-field,"project.work,state",0,State,СъÑтоÑние,0
-field,"project.work,total_effort",0,Total Effort,Общо уÑилиÑ,0
-field,"project.work,type",0,Type,Вид,0
-field,"project.work,work",0,Work,Задача,0
-field,"timesheet.work,sequence",0,Sequence,ПоÑледователноÑÑ‚,0
-field,"timesheet.work,timesheet_lines",0,Timesheet Lines,Редове от график,0
-help,"project.work,effort",0,Estimated Effort for this work,Оценка на уÑилиÑта за тази работа,0
-help,"project.work,total_effort",0,Estimated total effort for this work and the sub-works,Предполагаеми общо уÑÐ¸Ð»Ð¸Ñ Ð·Ð° тази задача и подзадачите,0
-model,"ir.action,name",act_open_child_work,Tasks,Задачи,0
-model,"ir.action,name",act_project_form,Projects,Проекти,0
-model,"ir.action,name",act_task_form,Tasks,Задачи,0
-model,"ir.action,name",act_work_form,Works,ДейноÑти,0
-model,"ir.action,name",act_work_form_new,Works Efforts,Задачи,0
-model,"ir.action,name",act_work_tree,Works Efforts,Задачи,0
-model,"ir.ui.menu,name",,Works Efforts,ДейноÑти,0
-model,"ir.ui.menu,name",menu_configuration,Configuration,КонфигурациÑ,0
-model,"ir.ui.menu,name",menu_project,Project Management,Управление на проекти,0
-model,"ir.ui.menu,name",menu_project_form,Projects,Проекти,0
-model,"ir.ui.menu,name",menu_project_tree,Projects,Проекти,0
-model,"ir.ui.menu,name",menu_task_form,Tasks,Задачи,0
-model,"ir.ui.menu,name",menu_work_form_new,New Work Effort,Ðова дейноÑÑ‚,0
-model,"ir.ui.menu,name",menu_work_tree,Works Efforts,Задачи,0
-model,"project.work,name",0,Work Effort,ДейноÑÑ‚,0
-model,"res.group,name",group_project_admin,Project Administration,Управление на проекти,0
-selection,"project.work,state",0,Done,Приключен,0
-selection,"project.work,state",0,Opened,Отворен,0
-selection,"project.work,type",0,Project,Проект,0
-selection,"project.work,type",0,Task,Задача,0
-view,project.work,0,Children,Деца,0
-view,project.work,0,General,ОÑновен,0
-view,project.work,0,Projects,Проекти,0
-view,project.work,0,Tasks,Задачи,0
-view,project.work,0,Timesheet,График,0
-view,project.work,0,Work Efforts,ДейноÑти,0
-view,project.work,0,Works Efforts,ДейноÑти,0
diff --git a/de_DE.csv b/de_DE.csv
deleted file mode 100644
index e458356..0000000
--- a/de_DE.csv
+++ /dev/null
@@ -1,53 +0,0 @@
-type,name,res_id,src,value,fuzzy
-error,project.work,0,There should be only one timesheet work by task/project!,Es kann nur ein Zeiterfassungsblatt pro Aufgabe oder Projekt geben!,0
-field,"project.work,children",0,Children,Untergeordnet (Arbeiten),0
-field,"project.work,comment",0,Comment,Kommentar,0
-field,"project.work,create_date",0,Creation date,Erstellungsdatum,0
-field,"project.work,create_uid",0,Creation user,Ersteller,0
-field,"project.work,effort",0,Effort,Aufwand (Personenstunden),0
-field,"project.work,id",0,ID,ID,0
-field,"project.work,parent",0,Parent,Ãœbergeordnet (Arbeit),0
-field,"project.work,party",0,Party,Partei,0
-field,"project.work,party_address",0,Contact Address,Kontaktadresse,0
-field,"project.work,rec_name",0,Name,Name,0
-field,"project.work,state",0,State,Status,0
-field,"project.work,total_effort",0,Total Effort,Gesamtaufwand (Personenstunden),0
-field,"project.work,type",0,Type,Typ,0
-field,"project.work,work",0,Work,Arbeit,0
-field,"project.work,write_date",0,Last modification date,Zuletzt geändert am,0
-field,"project.work,write_uid",0,Last modification by,Zuletzt geändert von,0
-field,"timesheet.work,sequence",0,Sequence,Reihenfolge,0
-field,"timesheet.work,timesheet_lines",0,Timesheet Lines,Zeitpositionen,0
-help,"project.work,effort",0,Estimated Effort for this work,"Geschätzter Aufwand für diese Arbeit in Stunden (Format: Personenstunden, -tage, -wochen)",0
-help,"project.work,total_effort",0,Estimated total effort for this work and the sub-works,"Geschätzter Gesamtaufwand für diese Arbeit inkl. aller untergeordneten Arbeiten in Stunden (Format: Personenstunden, -tage, -wochen)",0
-model,"ir.action,name",act_open_child_work,Tasks,Aufgaben,0
-model,"ir.action,name",act_project_form,Projects,Projekte,0
-model,"ir.action,name",act_task_form,Tasks,Aufgaben,0
-model,"ir.action,name",act_work_form,Works,Arbeiten,0
-model,"ir.action,name",act_work_form_new,Works Efforts,Arbeitsaufwände,0
-model,"ir.action,name",act_work_list,Works Efforts,Arbeitsaufwände,0
-model,"ir.action,name",act_work_tree,Works Efforts,Arbeitsaufwände,0
-model,"ir.ui.menu,name",menu_configuration,Configuration,Einstellungen,0
-model,"ir.ui.menu,name",menu_project,Project Management,Projekte,0
-model,"ir.ui.menu,name",menu_project_form,Projects,Projekte,0
-model,"ir.ui.menu,name",menu_project_tree,Projects,Projekte,0
-model,"ir.ui.menu,name",menu_task_form,Tasks,Aufgaben,0
-model,"ir.ui.menu,name",menu_work_form_new,New Work Effort,Neuer Arbeitsaufwand,0
-model,"ir.ui.menu,name",menu_work_list,Works Efforts,Arbeitsaufwände,0
-model,"ir.ui.menu,name",menu_work_tree,Works Efforts,Arbeitsaufwände,0
-model,"project.work,name",0,Work Effort,Arbeitsaufwand,0
-model,"res.group,name",group_project_admin,Project Administration,Projekte Administration,0
-selection,"project.work,state",0,Done,Erledigt,0
-selection,"project.work,state",0,Opened,Offen,0
-selection,"project.work,type",0,Project,Projekt,0
-selection,"project.work,type",0,Task,Aufgabe,0
-view,project.work,0,Children,Untergeordnet (Arbeiten),0
-view,project.work,0,General,Allgemein,0
-view,project.work,0,Other Info,Sonstiges,0
-view,project.work,0,Projects,Projekte,0
-view,project.work,0,Tasks,Aufgaben,0
-view,project.work,0,Timesheet,Zeiterfassungsblatt,0
-view,project.work,0,Work,Arbeit,0
-view,project.work,0,Work Efforts,Arbeitsaufwände,0
-view,project.work,0,Works,Arbeiten,0
-view,project.work,0,Works Efforts,Arbeiten Aufwände,0
diff --git a/doc/index.rst b/doc/index.rst
index 5c60d51..f3dc561 100644
--- a/doc/index.rst
+++ b/doc/index.rst
@@ -6,7 +6,7 @@ basis for simple project management.
Work
-####
+****
The Work model from the Timesheet module is extended and is used for
creating both projects and tasks. This allows for instance to
diff --git a/es_CO.csv b/es_CO.csv
deleted file mode 100644
index 81b6325..0000000
--- a/es_CO.csv
+++ /dev/null
@@ -1,44 +0,0 @@
-type,name,res_id,src,value,fuzzy
-error,project.work,0,There should be only one timesheet work by task/project!,¡Debe haber sólo una hoja de tiempo por tarea/proyecto!,0
-field,"project.work,children",0,Children,Descendientes,0
-field,"project.work,comment",0,Comment,Comentario,0
-field,"project.work,effort",0,Effort,Esfuerzo,0
-field,"project.work,parent",0,Parent,Padre,0
-field,"project.work,party",0,Party,Tercero,0
-field,"project.work,party_address",0,Contact Address,Dirección de Contacto,0
-field,"project.work,rec_name",0,Name,Nombre,0
-field,"project.work,state",0,State,Estado,0
-field,"project.work,total_effort",0,Total Effort,Esfuerzo Total,0
-field,"project.work,type",0,Type,Tipo,0
-field,"project.work,work",0,Work,Trabajo,0
-field,"timesheet.work,sequence",0,Sequence,Secuencia,0
-field,"timesheet.work,timesheet_lines",0,Timesheet Lines,Lineas de Hoja de Tiempo,0
-help,"project.work,effort",0,Estimated Effort for this work,Esfuerzo estimado para este trabajo,0
-help,"project.work,total_effort",0,Estimated total effort for this work and the sub-works,Esfuerzo total estimado para este trabajo y los sub-trabajos,0
-model,"ir.action,name",act_project_form,Projects,Proyectos,0
-model,"ir.action,name",act_task_form,Tasks,Tareas,0
-model,"ir.action,name",act_open_child_work,Tasks,Tareas,0
-model,"ir.action,name",act_work_tree,Works,Trabajos,0
-model,"ir.action,name",act_work_form,Works Efforts,Esfuerzos de Trabajo,0
-model,"ir.ui.menu,name",menu_configuration,Configuration,Configuración,0
-model,"ir.ui.menu,name",menu_project,Project Management,Gestión de Proyectos,0
-model,"ir.ui.menu,name",menu_project_tree,Projects,Proyectos,0
-model,"ir.ui.menu,name",menu_project_form,Projects,Proyectos,0
-model,"ir.ui.menu,name",menu_task_form,Tasks,Tareas,0
-model,"ir.ui.menu,name",menu_work_form,Works Efforts,Esfuerzos de Trabajo,0
-model,"project.work,name",0,Work Effort,Esfuerzo de Trabajo,0
-model,"res.group,name",group_project_admin,Project Administration,Administración de Proyecto,0
-selection,"project.work,state",0,Done,Hecho,0
-selection,"project.work,state",0,Opened,Abierto,0
-selection,"project.work,type",0,Project,Proyecto,0
-selection,"project.work,type",0,Task,Tarea,0
-view,project.work,0,Children,Descendientes,0
-view,project.work,0,General,General,0
-view,project.work,0,Other Info,Información Adicional,0
-view,project.work,0,Projects,Proyectos,0
-view,project.work,0,Tasks,Tareas,0
-view,project.work,0,Timesheet,Hoja de tiempos,0
-view,project.work,0,Work,Trabajo,0
-view,project.work,0,Work Efforts,Esfuerzos de Trabajo,0
-view,project.work,0,Works,Trabajos,0
-view,project.work,0,Works Efforts,Esfuerzos de Trabajo,0
diff --git a/es_ES.csv b/es_ES.csv
deleted file mode 100644
index 1aedcd6..0000000
--- a/es_ES.csv
+++ /dev/null
@@ -1,44 +0,0 @@
-type,name,res_id,src,value,fuzzy
-error,project.work,0,There should be only one timesheet work by task/project!,Solo debe haber un parte de trabajo por tarea/proyecto,0
-field,"project.work,children",0,Children,Hijos,0
-field,"project.work,comment",0,Comment,Comentario,0
-field,"project.work,effort",0,Effort,Esfuerzo,0
-field,"project.work,parent",0,Parent,Padre,0
-field,"project.work,party",0,Party,Tercero,0
-field,"project.work,party_address",0,Contact Address,Dirección de contacto,0
-field,"project.work,rec_name",0,Name,Nombre,0
-field,"project.work,state",0,State,Estado,0
-field,"project.work,total_effort",0,Total Effort,Esfuerzo total,0
-field,"project.work,type",0,Type,Tipo,0
-field,"project.work,work",0,Work,Actividad,0
-field,"timesheet.work,sequence",0,Sequence,Secuencia,0
-field,"timesheet.work,timesheet_lines",0,Timesheet Lines,Lineas de parte de trabajo,0
-help,"project.work,effort",0,Estimated Effort for this work,El esfuerzo estimado para esta actividad,0
-help,"project.work,total_effort",0,Estimated total effort for this work and the sub-works,Esfuerzo total estimado para esta actividad y sus subactividades,0
-model,"ir.action,name",act_project_form,Projects,Proyectos,0
-model,"ir.action,name",act_task_form,Tasks,Tareas,0
-model,"ir.action,name",act_open_child_work,Tasks,Tareas,0
-model,"ir.action,name",act_work_tree,Works,Actividades,0
-model,"ir.action,name",act_work_form,Works Efforts,Actividades,0
-model,"ir.ui.menu,name",menu_configuration,Configuration,Configuración,0
-model,"ir.ui.menu,name",menu_project,Project Management,Gestión de proyecto,0
-model,"ir.ui.menu,name",menu_project_tree,Projects,Proyectos,0
-model,"ir.ui.menu,name",menu_project_form,Projects,Proyectos,0
-model,"ir.ui.menu,name",menu_task_form,Tasks,Tareas,0
-model,"ir.ui.menu,name",menu_work_form,Works Efforts,Actividades,0
-model,"project.work,name",0,Work Effort,Actividades,0
-model,"res.group,name",group_project_admin,Project Administration,Administración de proyecto,0
-selection,"project.work,state",0,Done,Terminada,0
-selection,"project.work,state",0,Opened,Abierto,0
-selection,"project.work,type",0,Project,Proyecto,0
-selection,"project.work,type",0,Task,Tarea,0
-view,project.work,0,Children,Hijos,0
-view,project.work,0,General,General,0
-view,project.work,0,Other Info,Información adicional,0
-view,project.work,0,Projects,Proyectos,0
-view,project.work,0,Tasks,Tareas,0
-view,project.work,0,Timesheet,Parte de trabajo,0
-view,project.work,0,Work,Actividad,0
-view,project.work,0,Work Efforts,Actividades,0
-view,project.work,0,Works,Actividades,0
-view,project.work,0,Works Efforts,Actividades,0
diff --git a/fr_FR.csv b/fr_FR.csv
deleted file mode 100644
index 6d69d17..0000000
--- a/fr_FR.csv
+++ /dev/null
@@ -1,48 +0,0 @@
-type,name,res_id,src,value,fuzzy
-error,project.work,0,There should be only one timesheet work by task/project!,Il ne doit y avoir qu'une seule feuille de présence par tâche/projet !,0
-field,"project.work,children",0,Children,Enfants,0
-field,"project.work,comment",0,Comment,Commentaire,0
-field,"project.work,effort",0,Effort,Effort,0
-field,"project.work,parent",0,Parent,Parent,0
-field,"project.work,party",0,Party,Tiers,0
-field,"project.work,party_address",0,Contact Address,Adresse,0
-field,"project.work,rec_name",0,Name,Nom,0
-field,"project.work,state",0,State,État,0
-field,"project.work,total_effort",0,Total Effort,Effort total,0
-field,"project.work,type",0,Type,Type,0
-field,"project.work,work",0,Work,Activité,0
-field,"timesheet.work,sequence",0,Sequence,Séquence,0
-field,"timesheet.work,timesheet_lines",0,Timesheet Lines,Lignes de feuille de présence,0
-help,"project.work,effort",0,Estimated Effort for this work,Effort estimé pour cette activité,0
-help,"project.work,total_effort",0,Estimated total effort for this work and the sub-works,Effort total estimé pour cette activité et ses sous-activités,0
-model,"ir.action,name",act_open_child_work,Tasks,Tâches,0
-model,"ir.action,name",act_project_form,Projects,Projets,0
-model,"ir.action,name",act_task_form,Tasks,Tâches,0
-model,"ir.action,name",act_work_form,Works,Activités,0
-model,"ir.action,name",act_work_form_new,Works Efforts,Activités,1
-model,"ir.action,name",act_work_list,Works Efforts,Activités,1
-model,"ir.action,name",act_work_tree,Works Efforts,Activités,0
-model,"ir.ui.menu,name",menu_configuration,Configuration,Configuration,0
-model,"ir.ui.menu,name",menu_project,Project Management,Gestion de projet,0
-model,"ir.ui.menu,name",menu_project_form,Projects,Projets,0
-model,"ir.ui.menu,name",menu_project_tree,Projects,Projets,0
-model,"ir.ui.menu,name",menu_task_form,Tasks,Tâches,0
-model,"ir.ui.menu,name",menu_work_form_new,New Work Effort,Nouvel Effort de travail,0
-model,"ir.ui.menu,name",menu_work_list,Works Efforts,Activités,1
-model,"ir.ui.menu,name",menu_work_tree,Works Efforts,Activités,1
-model,"project.work,name",0,Work Effort,Tâche,0
-model,"res.group,name",group_project_admin,Project Administration,Administrion de projets,0
-selection,"project.work,state",0,Done,Fait,0
-selection,"project.work,state",0,Opened,Ouvert,0
-selection,"project.work,type",0,Project,Projet,0
-selection,"project.work,type",0,Task,Tâche,0
-view,project.work,0,Children,Enfants,0
-view,project.work,0,General,General,0
-view,project.work,0,Other Info,Autre info,0
-view,project.work,0,Projects,Projets,0
-view,project.work,0,Tasks,Tâche,0
-view,project.work,0,Timesheet,Feuille de présence,0
-view,project.work,0,Work,Activités,0
-view,project.work,0,Work Efforts,Activités,0
-view,project.work,0,Works,Activités,0
-view,project.work,0,Works Efforts,Activités,0
diff --git a/icons/__init__.py b/icons/__init__.py
deleted file mode 100644
index e69de29..0000000
diff --git a/icons/tryton-project.svg b/icons/tryton-project.svg
new file mode 100644
index 0000000..f575528
--- /dev/null
+++ b/icons/tryton-project.svg
@@ -0,0 +1,329 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://creativecommons.org/ns#"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:xlink="http://www.w3.org/1999/xlink"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ width="48"
+ height="48"
+ id="svg2"
+ sodipodi:version="0.32"
+ inkscape:version="0.46"
+ version="1.0"
+ sodipodi:docbase="/home/tigert/cvs/freedesktop.org/tango-icon-theme/scalable/categories"
+ sodipodi:docname="applications-development.svg"
+ inkscape:output_extension="org.inkscape.output.svg.inkscape">
+ <defs
+ id="defs4">
+ <inkscape:perspective
+ sodipodi:type="inkscape:persp3d"
+ inkscape:vp_x="0 : 24 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_z="48 : 24 : 1"
+ inkscape:persp3d-origin="24 : 16 : 1"
+ id="perspective47" />
+ <linearGradient
+ inkscape:collect="always"
+ id="linearGradient2807">
+ <stop
+ style="stop-color:#ffffff;stop-opacity:1;"
+ offset="0"
+ id="stop2809" />
+ <stop
+ style="stop-color:#ffffff;stop-opacity:0;"
+ offset="1"
+ id="stop2811" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient18284">
+ <stop
+ style="stop-color:#000000;stop-opacity:1;"
+ offset="0"
+ id="stop18286" />
+ <stop
+ id="stop20913"
+ offset="0.5"
+ style="stop-color:#000000;stop-opacity:1;" />
+ <stop
+ id="stop19165"
+ offset="1"
+ style="stop-color:#000000;stop-opacity:0;" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient11202">
+ <stop
+ style="stop-color:#c4a000;stop-opacity:1;"
+ offset="0"
+ id="stop11204" />
+ <stop
+ style="stop-color:#c4a000;stop-opacity:0;"
+ offset="1"
+ id="stop11206" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient8543">
+ <stop
+ style="stop-color:#fffef5;stop-opacity:0.94117647;"
+ offset="0"
+ id="stop8545" />
+ <stop
+ style="stop-color:#fce94f;stop-opacity:0;"
+ offset="1"
+ id="stop8547" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient5012">
+ <stop
+ style="stop-color:#fdf188;stop-opacity:1;"
+ offset="0"
+ id="stop5014" />
+ <stop
+ style="stop-color:#d3bc00;stop-opacity:1;"
+ offset="1"
+ id="stop5016" />
+ </linearGradient>
+ <radialGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient5012"
+ id="radialGradient7666"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.136507,-2.396132e-18,-4.484926e-5,7.137743e-2,-23.39816,12.31028)"
+ cx="336.73767"
+ cy="-72.420044"
+ fx="336.73767"
+ fy="-72.420044"
+ r="297.21338" />
+ <radialGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient8543"
+ id="radialGradient8549"
+ cx="420.87839"
+ cy="685.99139"
+ fx="420.87839"
+ fy="685.99139"
+ r="235.88632"
+ gradientTransform="matrix(0.163532,-1.065754e-2,1.078108e-2,0.165425,-46.18187,-65.65506)"
+ gradientUnits="userSpaceOnUse" />
+ <radialGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient8543"
+ id="radialGradient9434"
+ cx="500.97794"
+ cy="286.46918"
+ fx="500.97794"
+ fy="286.46918"
+ r="40.975471"
+ gradientTransform="matrix(0.224796,1.017229e-2,-9.759474e-3,0.215674,-73.87964,-54.89804)"
+ gradientUnits="userSpaceOnUse" />
+ <radialGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient8543"
+ id="radialGradient10317"
+ cx="293.81989"
+ cy="243.06874"
+ fx="293.81989"
+ fy="243.06874"
+ r="48.782982"
+ gradientTransform="matrix(0.272962,-7.1724e-2,5.616202e-2,0.213737,-78.54657,-24.30491)"
+ gradientUnits="userSpaceOnUse" />
+ <radialGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient11202"
+ id="radialGradient11208"
+ cx="424.99243"
+ cy="270.67969"
+ fx="424.99243"
+ fy="270.67969"
+ r="38.451698"
+ gradientTransform="matrix(8.174351e-2,1.024998e-2,-4.335971e-2,0.345793,6.123413,-84.50421)"
+ gradientUnits="userSpaceOnUse" />
+ <radialGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient8543"
+ id="radialGradient13895"
+ cx="340.35886"
+ cy="409.83737"
+ fx="340.35886"
+ fy="409.83737"
+ r="103.26014"
+ gradientTransform="matrix(0.105628,-4.514018e-2,6.692574e-2,0.156607,-46.01605,-24.35485)"
+ gradientUnits="userSpaceOnUse" />
+ <radialGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient18284"
+ id="radialGradient18290"
+ cx="29.898689"
+ cy="45.673546"
+ fx="29.898689"
+ fy="45.673546"
+ r="30.365856"
+ gradientTransform="matrix(1,0,2.702168e-19,0.415385,-2.283104e-16,26.70146)"
+ gradientUnits="userSpaceOnUse" />
+ <radialGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient8543"
+ id="radialGradient2798"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.101953,-4.272301e-2,9.621296e-2,0.229599,-48.67227,-64.24148)"
+ cx="131.23691"
+ cy="424.15677"
+ fx="131.23691"
+ fy="424.15677"
+ r="35.934704" />
+ <radialGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient2807"
+ id="radialGradient2813"
+ cx="15.491823"
+ cy="10.943316"
+ fx="15.491823"
+ fy="10.943316"
+ r="18.370251"
+ gradientTransform="matrix(1.402663,1.176399e-16,-9.356816e-17,1.115648,-6.237984,5.33075e-2)"
+ gradientUnits="userSpaceOnUse" />
+ </defs>
+ <sodipodi:namedview
+ id="base"
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="0.13333333"
+ inkscape:pageopacity="0.0"
+ inkscape:pageshadow="2"
+ inkscape:zoom="11.313708"
+ inkscape:cx="13.540158"
+ inkscape:cy="28.304801"
+ inkscape:document-units="px"
+ inkscape:current-layer="layer1"
+ inkscape:window-width="906"
+ inkscape:window-height="987"
+ inkscape:window-x="635"
+ inkscape:window-y="114"
+ inkscape:showpageshadow="false"
+ stroke="#c4a000"
+ showgrid="false" />
+ <metadata
+ id="metadata7">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ <dc:contributor>
+ <cc:Agent>
+ <dc:title>Henrik Andersen</dc:title>
+ </cc:Agent>
+ </dc:contributor>
+ <dc:title>Developer Tools</dc:title>
+ <dc:subject>
+ <rdf:Bag>
+ <rdf:li>developer</rdf:li>
+ <rdf:li>dev</rdf:li>
+ <rdf:li>tool</rdf:li>
+ <rdf:li>make</rdf:li>
+ <rdf:li>compile</rdf:li>
+ <rdf:li>build</rdf:li>
+ <rdf:li>code</rdf:li>
+ <rdf:li>hacker</rdf:li>
+ </rdf:Bag>
+ </dc:subject>
+ <dc:creator>
+ <cc:Agent>
+ <dc:title>Jakub Steiner</dc:title>
+ </cc:Agent>
+ </dc:creator>
+ <dc:source>http://jimmac.musichall.cz</dc:source>
+ <cc:license
+ rdf:resource="http://creativecommons.org/licenses/publicdomain/" />
+ </cc:Work>
+ <cc:License
+ rdf:about="http://creativecommons.org/licenses/publicdomain/">
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#Reproduction" />
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#Distribution" />
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+ </cc:License>
+ </rdf:RDF>
+ </metadata>
+ <g
+ inkscape:label="Layer 1"
+ id="layer1"
+ inkscape:groupmode="layer">
+ <path
+ sodipodi:type="arc"
+ style="opacity:1;fill:url(#radialGradient18290);fill-opacity:1;stroke:none;stroke-width:12.39700031;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ id="path17409"
+ sodipodi:cx="29.898689"
+ sodipodi:cy="45.673546"
+ sodipodi:rx="30.365856"
+ sodipodi:ry="12.613509"
+ d="M 60.264545 45.673546 A 30.365856 12.613509 0 1 1 -0.4671669,45.673546 A 30.365856 12.613509 0 1 1 60.264545 45.673546 z"
+ transform="matrix(0.742527,0,-5.812964e-2,1.428611,4.500517,-36.68345)" />
+ <path
+ style="fill:url(#radialGradient7666);fill-opacity:1;stroke:#c4a000;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+ d="M 23.152758,1.1801876 C 20.380218,1.2190783 17.86582,1.8908769 15.634281,3.0196314 C 14.541531,5.1714614 10.9437,7.7293655 9.4689484,8.0015561 C 6.5691703,11.460832 4.6887193,15.805035 3.9754523,19.98162 C 3.9750148,19.984183 3.9758889,19.986781 3.9754523,19.989343 C 2.7890929,21.53906 2.2854415,23.385937 2.5981051,25.521903 C 3.7192795,33.181217 5.8802729,40.410195 10.783201,42.078178 C 17.93763,44.512124 32.65497,43.864025 35.912708,42.536436 C 43.051738,39.62715 43.684161,33.251338 44.80414,25.75618 C 45.109694,23.711348 44.659305,21.914978 43.573539,20.383238 C 43.564583,20.327636 43.555052,20.271764 43.54522,20.215896 C 42.763966,15.777007 40.697859,11.326849 37.602582,7.8466935 C 35.508773,7.62926 31.462964,4.270333 30.483158,2.6229925 C 28.330506,1.7020155 25.961342,1.1801876 23.407632,1.1801876 C 23.322311,1.1801876 23.237595,1.178998 23.152758,1.1801876 z "
+ id="path3120"
+ sodipodi:nodetypes="cccscsssscsccsc" />
+ <path
+ style="fill:url(#radialGradient8549);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;opacity:0.66666667"
+ d="M 43.629688,22.792984 C 39.033494,39.233217 10.438199,40.802737 3.7832765,23.04227 C 3.7410682,39.366403 10.103414,44.083889 28.189955,43.247454 C 31.251932,43.106765 38.199775,43.290321 42.804439,34.110678 C 45.042804,22.600278 43.629688,22.792984 43.629688,22.792984 z "
+ id="path7668"
+ sodipodi:nodetypes="ccscc" />
+ <path
+ style="fill:url(#radialGradient9434);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ d="M 34.691565,7.6783057 L 37.192446,8.8037033 C 37.192446,8.8037033 35.882042,18.926343 30.52343,25.288675 C 32.295095,18.832841 34.712405,7.6783057 34.691565,7.6783057 z "
+ id="path8553"
+ sodipodi:nodetypes="cccc" />
+ <path
+ style="fill:url(#radialGradient10317);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ d="M 15.872437,4.1562328 C 17.372967,13.221927 22.374727,23.642261 21.874552,24.163278 C 17.289604,17.181654 15.372261,11.242061 13.871732,6.2403001 C 13.871732,6.1569366 15.872437,4.1770734 15.872437,4.1562328 z "
+ id="path9436"
+ sodipodi:nodetypes="cccc" />
+ <path
+ style="fill:url(#radialGradient11208);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ d="M 30.21082,3.8227818 C 26.126047,20.328594 25.959322,23.079563 25.959322,23.079563 C 25.959322,23.079563 32.294888,6.3236627 32.294888,5.9068495 C 32.294888,5.9068487 30.710997,4.4063209 30.21082,3.8227818 z "
+ id="path10319"
+ sodipodi:nodetypes="ccsc" />
+ <flowRoot
+ xml:space="preserve"
+ id="flowRoot12974"><flowRegion
+ id="flowRegion12976"><rect
+ id="rect12978"
+ width="40.055775"
+ height="16.02231"
+ x="86.787514"
+ y="412.80496" /></flowRegion><flowPara
+ id="flowPara12980" /></flowRoot> <path
+ style="fill:url(#radialGradient13895);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ d="M 16.18209,34.476182 L 16.137416,24.906437 L 30.631143,24.906437 L 32.273747,23.642895 L 15.342282,23.642895 L 15.386956,34.283476 L 16.18209,34.476182 z "
+ id="path13014"
+ sodipodi:nodetypes="ccccccc" />
+ <path
+ style="fill:#958401;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ d="M 31.043495,24.81709 L 31.125176,34.621701 L 31.81132,34.406959 L 31.823298,23.553549 L 31.043495,24.81709 z "
+ id="path13897"
+ sodipodi:nodetypes="ccccc" />
+ <path
+ style="fill:url(#radialGradient2798);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ d="M 4.2551267,24.106065 C 4.2551267,24.106065 6.571777,32.221754 14.476068,32.872102 C 15.581676,35.36252 13.341098,36.996703 13.341098,36.996703 L 9.7315781,36.745641 C 9.7315781,36.745641 3.4928036,28.752699 3.2433694,26.844759 C 2.9939369,24.936822 3.4066529,23.436966 3.4066529,23.436966 L 4.2551267,24.106065 z "
+ id="path16526"
+ sodipodi:nodetypes="ccccscc" />
+ <path
+ sodipodi:nodetypes="cccscsssscsccsc"
+ id="path2703"
+ d="M 23.184204,2.3889904 C 20.570275,2.4256563 18.199721,3.0590226 16.095844,4.1232033 C 15.065608,6.1519314 11.673602,8.563503 10.283218,8.8201221 C 7.5493302,12.0815 5.776456,16.17718 5.1039936,20.11483 C 5.1035812,20.117247 5.1044052,20.119696 5.1039936,20.122112 C 3.9855035,21.583172 3.2455,23.368587 3.5402767,25.382359 C 4.597311,32.603499 6.4678792,39.092036 10.868256,41.021813 C 16.791397,43.619395 32.407978,42.807748 35.479348,41.556108 C 42.209968,38.813256 42.541047,32.625414 43.596954,25.559039 C 43.885028,23.631188 43.460404,21.937585 42.436753,20.493473 C 42.428309,20.441052 42.419324,20.388376 42.410054,20.335704 C 41.673494,16.150755 39.725585,11.955182 36.807382,8.6741189 C 34.833356,8.4691243 31.019,5.3023548 30.095246,3.7492553 C 28.065743,2.8809656 25.832115,2.3889904 23.424497,2.3889904 C 23.344057,2.3889904 23.264188,2.3878689 23.184204,2.3889904 z "
+ style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:0.99999976;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;opacity:0.74444444" />
+ <path
+ style="fill:url(#radialGradient2813);fill-opacity:1.0;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;opacity:0.59444444"
+ d="M 22.59375,2.78125 C 20.264193,2.8978182 18.152779,3.5062884 16.25,4.46875 C 15.239275,6.4590559 11.895302,8.841991 10.53125,9.09375 C 7.8491405,12.293361 6.1284766,16.293174 5.46875,20.15625 C 5.4683454,20.15862 5.4691538,20.18513 5.46875,20.1875 C 4.3714431,21.62089 4.0107233,23.778648 4.0107233,23.778648 C 8.6959903,27.38371 11.652335,23.99254 18.329596,21.761428 C 30.928876,23.684569 37.077934,20.765483 40.84375,16.09375 C 40.850609,16.085241 40.840294,16.072869 40.84375,16.0625 C 39.852567,13.479666 38.411479,11.016387 36.5625,8.9375 C 34.62586,8.7363873 30.875008,5.6486852 29.96875,4.125 C 27.977684,3.2731547 25.79952,2.78125 23.4375,2.78125 C 23.358584,2.7812501 23.265969,2.7801497 23.1875,2.78125 C 22.987154,2.7840603 22.79117,2.7713713 22.59375,2.78125 z "
+ id="path2800"
+ sodipodi:nodetypes="cccssccscccssc" />
+ </g>
+</svg>
diff --git a/locale/bg_BG.po b/locale/bg_BG.po
new file mode 100644
index 0000000..5fa0022
--- /dev/null
+++ b/locale/bg_BG.po
@@ -0,0 +1,175 @@
+#
+msgid ""
+msgstr "Content-Type: text/plain; charset=utf-8\n"
+
+msgctxt "error:project.work:0"
+msgid "There should be only one timesheet work by task/project!"
+msgstr "Задача/проект може да имат Ñамо един график за дейноÑÑ‚!"
+
+msgctxt "field:project.work,children:0"
+msgid "Children"
+msgstr "Деца"
+
+msgctxt "field:project.work,comment:0"
+msgid "Comment"
+msgstr "Коментар"
+
+msgctxt "field:project.work,effort:0"
+msgid "Effort"
+msgstr "УÑлие"
+
+msgctxt "field:project.work,parent:0"
+msgid "Parent"
+msgstr "Родител"
+
+msgctxt "field:project.work,party:0"
+msgid "Party"
+msgstr "Партньор"
+
+msgctxt "field:project.work,party_address:0"
+msgid "Contact Address"
+msgstr "ÐÐ´Ñ€ÐµÑ Ð·Ð° контакт"
+
+msgctxt "field:project.work,rec_name:0"
+msgid "Name"
+msgstr "Име"
+
+#, fuzzy
+msgctxt "field:project.work,sequence:0"
+msgid "Sequence"
+msgstr "ПоÑледователноÑÑ‚"
+
+msgctxt "field:project.work,state:0"
+msgid "State"
+msgstr "СъÑтоÑние"
+
+msgctxt "field:project.work,total_effort:0"
+msgid "Total Effort"
+msgstr "Общо уÑилиÑ"
+
+msgctxt "field:project.work,type:0"
+msgid "Type"
+msgstr "Вид"
+
+msgctxt "field:project.work,work:0"
+msgid "Work"
+msgstr "Задача"
+
+msgctxt "field:timesheet.work,timesheet_lines:0"
+msgid "Timesheet Lines"
+msgstr "Редове от график"
+
+msgctxt "help:project.work,effort:0"
+msgid "Estimated Effort for this work"
+msgstr "Оценка на уÑилиÑта за тази работа"
+
+msgctxt "help:project.work,total_effort:0"
+msgid "Estimated total effort for this work and the sub-works"
+msgstr "Предполагаеми общо уÑÐ¸Ð»Ð¸Ñ Ð·Ð° тази задача и подзадачите"
+
+msgctxt "model:ir.action,name:act_open_child_work"
+msgid "Tasks"
+msgstr "Задачи"
+
+msgctxt "model:ir.action,name:act_project_form"
+msgid "Projects"
+msgstr "Проекти"
+
+msgctxt "model:ir.action,name:act_task_form"
+msgid "Tasks"
+msgstr "Задачи"
+
+msgctxt "model:ir.action,name:act_work_form"
+msgid "Works"
+msgstr "ДейноÑти"
+
+#, fuzzy
+msgctxt "model:ir.action,name:act_work_list"
+msgid "Works Efforts"
+msgstr "Задачи"
+
+msgctxt "model:ir.action,name:act_work_tree"
+msgid "Works Efforts"
+msgstr "Задачи"
+
+msgctxt "model:ir.ui.menu,name:menu_configuration"
+msgid "Configuration"
+msgstr "КонфигурациÑ"
+
+#, fuzzy
+msgctxt "model:ir.ui.menu,name:menu_project"
+msgid "Project"
+msgstr "Управление на проекти"
+
+msgctxt "model:ir.ui.menu,name:menu_project_form"
+msgid "Projects"
+msgstr "Проекти"
+
+msgctxt "model:ir.ui.menu,name:menu_project_tree"
+msgid "Projects"
+msgstr "Проекти"
+
+msgctxt "model:ir.ui.menu,name:menu_task_form"
+msgid "Tasks"
+msgstr "Задачи"
+
+#, fuzzy
+msgctxt "model:ir.ui.menu,name:menu_work_list"
+msgid "Works Efforts"
+msgstr "Задачи"
+
+msgctxt "model:ir.ui.menu,name:menu_work_tree"
+msgid "Works Efforts"
+msgstr "Задачи"
+
+msgctxt "model:project.work,name:0"
+msgid "Work Effort"
+msgstr "ДейноÑÑ‚"
+
+msgctxt "model:res.group,name:group_project_admin"
+msgid "Project Administration"
+msgstr "Управление на проекти"
+
+msgctxt "selection:project.work,state:0"
+msgid "Done"
+msgstr "Приключен"
+
+msgctxt "selection:project.work,state:0"
+msgid "Opened"
+msgstr "Отворен"
+
+msgctxt "selection:project.work,type:0"
+msgid "Project"
+msgstr "Проект"
+
+msgctxt "selection:project.work,type:0"
+msgid "Task"
+msgstr "Задача"
+
+msgctxt "view:project.work:0"
+msgid "Children"
+msgstr "Деца"
+
+msgctxt "view:project.work:0"
+msgid "General"
+msgstr "ОÑновен"
+
+msgctxt "view:project.work:0"
+msgid "Projects"
+msgstr "Проекти"
+
+msgctxt "view:project.work:0"
+msgid "Tasks"
+msgstr "Задачи"
+
+msgctxt "view:project.work:0"
+msgid "Timesheet"
+msgstr "График"
+
+msgctxt "view:project.work:0"
+msgid "Work Efforts"
+msgstr "ДейноÑти"
+
+msgctxt "view:project.work:0"
+msgid "Works Efforts"
+msgstr "ДейноÑти"
diff --git a/locale/cs_CZ.po b/locale/cs_CZ.po
new file mode 100644
index 0000000..941b26f
--- /dev/null
+++ b/locale/cs_CZ.po
@@ -0,0 +1,163 @@
+#
+msgid ""
+msgstr "Content-Type: text/plain; charset=utf-8\n"
+
+msgctxt "error:project.work:0"
+msgid "There should be only one timesheet work by task/project!"
+msgstr ""
+
+msgctxt "field:project.work,children:0"
+msgid "Children"
+msgstr ""
+
+msgctxt "field:project.work,comment:0"
+msgid "Comment"
+msgstr ""
+
+msgctxt "field:project.work,effort:0"
+msgid "Effort"
+msgstr ""
+
+msgctxt "field:project.work,parent:0"
+msgid "Parent"
+msgstr ""
+
+msgctxt "field:project.work,party:0"
+msgid "Party"
+msgstr ""
+
+msgctxt "field:project.work,party_address:0"
+msgid "Contact Address"
+msgstr ""
+
+msgctxt "field:project.work,rec_name:0"
+msgid "Name"
+msgstr ""
+
+msgctxt "field:project.work,sequence:0"
+msgid "Sequence"
+msgstr ""
+
+msgctxt "field:project.work,state:0"
+msgid "State"
+msgstr ""
+
+msgctxt "field:project.work,total_effort:0"
+msgid "Total Effort"
+msgstr ""
+
+msgctxt "field:project.work,type:0"
+msgid "Type"
+msgstr ""
+
+msgctxt "field:project.work,work:0"
+msgid "Work"
+msgstr ""
+
+msgctxt "help:project.work,effort:0"
+msgid "Estimated Effort for this work"
+msgstr ""
+
+msgctxt "help:project.work,total_effort:0"
+msgid "Estimated total effort for this work and the sub-works"
+msgstr ""
+
+msgctxt "model:ir.action,name:act_open_child_work"
+msgid "Tasks"
+msgstr ""
+
+msgctxt "model:ir.action,name:act_project_form"
+msgid "Projects"
+msgstr ""
+
+msgctxt "model:ir.action,name:act_task_form"
+msgid "Tasks"
+msgstr ""
+
+msgctxt "model:ir.action,name:act_work_form"
+msgid "Works"
+msgstr ""
+
+msgctxt "model:ir.action,name:act_work_list"
+msgid "Works Efforts"
+msgstr ""
+
+msgctxt "model:ir.action,name:act_work_tree"
+msgid "Works Efforts"
+msgstr ""
+
+msgctxt "model:ir.ui.menu,name:menu_configuration"
+msgid "Configuration"
+msgstr ""
+
+msgctxt "model:ir.ui.menu,name:menu_project"
+msgid "Project"
+msgstr ""
+
+msgctxt "model:ir.ui.menu,name:menu_project_form"
+msgid "Projects"
+msgstr ""
+
+msgctxt "model:ir.ui.menu,name:menu_project_tree"
+msgid "Projects"
+msgstr ""
+
+msgctxt "model:ir.ui.menu,name:menu_task_form"
+msgid "Tasks"
+msgstr ""
+
+msgctxt "model:ir.ui.menu,name:menu_work_list"
+msgid "Works Efforts"
+msgstr ""
+
+msgctxt "model:ir.ui.menu,name:menu_work_tree"
+msgid "Works Efforts"
+msgstr ""
+
+msgctxt "model:project.work,name:0"
+msgid "Work Effort"
+msgstr ""
+
+msgctxt "model:res.group,name:group_project_admin"
+msgid "Project Administration"
+msgstr ""
+
+msgctxt "selection:project.work,state:0"
+msgid "Done"
+msgstr ""
+
+msgctxt "selection:project.work,state:0"
+msgid "Opened"
+msgstr ""
+
+msgctxt "selection:project.work,type:0"
+msgid "Project"
+msgstr ""
+
+msgctxt "selection:project.work,type:0"
+msgid "Task"
+msgstr ""
+
+msgctxt "view:project.work:0"
+msgid "Children"
+msgstr ""
+
+msgctxt "view:project.work:0"
+msgid "General"
+msgstr ""
+
+msgctxt "view:project.work:0"
+msgid "Projects"
+msgstr ""
+
+msgctxt "view:project.work:0"
+msgid "Tasks"
+msgstr ""
+
+msgctxt "view:project.work:0"
+msgid "Timesheet"
+msgstr ""
+
+msgctxt "view:project.work:0"
+msgid "Works Efforts"
+msgstr ""
diff --git a/locale/de_DE.po b/locale/de_DE.po
new file mode 100644
index 0000000..5e1cd89
--- /dev/null
+++ b/locale/de_DE.po
@@ -0,0 +1,207 @@
+#
+msgid ""
+msgstr "Content-Type: text/plain; charset=utf-8\n"
+
+msgctxt "error:project.work:0"
+msgid "There should be only one timesheet work by task/project!"
+msgstr "Es kann nur ein Zeiterfassungsblatt pro Aufgabe oder Projekt geben!"
+
+msgctxt "field:project.work,children:0"
+msgid "Children"
+msgstr "Untergeordnet (Arbeiten)"
+
+msgctxt "field:project.work,comment:0"
+msgid "Comment"
+msgstr "Kommentar"
+
+msgctxt "field:project.work,create_date:0"
+msgid "Creation date"
+msgstr "Erstellungsdatum"
+
+msgctxt "field:project.work,create_uid:0"
+msgid "Creation user"
+msgstr "Ersteller"
+
+msgctxt "field:project.work,effort:0"
+msgid "Effort"
+msgstr "Aufwand (Personenstunden)"
+
+msgctxt "field:project.work,id:0"
+msgid "ID"
+msgstr "ID"
+
+msgctxt "field:project.work,parent:0"
+msgid "Parent"
+msgstr "Ãœbergeordnet (Arbeit)"
+
+msgctxt "field:project.work,party:0"
+msgid "Party"
+msgstr "Partei"
+
+msgctxt "field:project.work,party_address:0"
+msgid "Contact Address"
+msgstr "Kontaktadresse"
+
+msgctxt "field:project.work,rec_name:0"
+msgid "Name"
+msgstr "Name"
+
+msgctxt "field:project.work,sequence:0"
+msgid "Sequence"
+msgstr "Reihenfolge"
+
+msgctxt "field:project.work,state:0"
+msgid "State"
+msgstr "Status"
+
+msgctxt "field:project.work,total_effort:0"
+msgid "Total Effort"
+msgstr "Gesamtaufwand (Personenstunden)"
+
+msgctxt "field:project.work,type:0"
+msgid "Type"
+msgstr "Typ"
+
+msgctxt "field:project.work,work:0"
+msgid "Work"
+msgstr "Arbeit"
+
+msgctxt "field:project.work,write_date:0"
+msgid "Last modification date"
+msgstr "Zuletzt geändert am"
+
+msgctxt "field:project.work,write_uid:0"
+msgid "Last modification by"
+msgstr "Zuletzt geändert von"
+
+msgctxt "field:timesheet.work,timesheet_lines:0"
+msgid "Timesheet Lines"
+msgstr "Zeitpositionen"
+
+msgctxt "help:project.work,effort:0"
+msgid "Estimated Effort for this work"
+msgstr ""
+"Geschätzter Aufwand für diese Arbeit in Stunden (Format: Personenstunden, "
+"-tage, -wochen)"
+
+msgctxt "help:project.work,total_effort:0"
+msgid "Estimated total effort for this work and the sub-works"
+msgstr ""
+"Geschätzter Gesamtaufwand für diese Arbeit inkl. aller untergeordneten "
+"Arbeiten in Stunden (Format: Personenstunden, -tage, -wochen)"
+
+msgctxt "model:ir.action,name:act_open_child_work"
+msgid "Tasks"
+msgstr "Aufgaben"
+
+msgctxt "model:ir.action,name:act_project_form"
+msgid "Projects"
+msgstr "Projekte"
+
+msgctxt "model:ir.action,name:act_task_form"
+msgid "Tasks"
+msgstr "Aufgaben"
+
+msgctxt "model:ir.action,name:act_work_form"
+msgid "Works"
+msgstr "Arbeiten"
+
+msgctxt "model:ir.action,name:act_work_list"
+msgid "Works Efforts"
+msgstr "Arbeitsaufwände"
+
+msgctxt "model:ir.action,name:act_work_tree"
+msgid "Works Efforts"
+msgstr "Arbeitsaufwände"
+
+msgctxt "model:ir.ui.menu,name:menu_configuration"
+msgid "Configuration"
+msgstr "Einstellungen"
+
+msgctxt "model:ir.ui.menu,name:menu_project"
+msgid "Project"
+msgstr "Projekte"
+
+msgctxt "model:ir.ui.menu,name:menu_project_form"
+msgid "Projects"
+msgstr "Projekte"
+
+msgctxt "model:ir.ui.menu,name:menu_project_tree"
+msgid "Projects"
+msgstr "Projekte"
+
+msgctxt "model:ir.ui.menu,name:menu_task_form"
+msgid "Tasks"
+msgstr "Aufgaben"
+
+msgctxt "model:ir.ui.menu,name:menu_work_list"
+msgid "Works Efforts"
+msgstr "Arbeitsaufwände"
+
+msgctxt "model:ir.ui.menu,name:menu_work_tree"
+msgid "Works Efforts"
+msgstr "Arbeitsaufwände"
+
+msgctxt "model:project.work,name:0"
+msgid "Work Effort"
+msgstr "Arbeitsaufwand"
+
+msgctxt "model:res.group,name:group_project_admin"
+msgid "Project Administration"
+msgstr "Projekte Administration"
+
+msgctxt "selection:project.work,state:0"
+msgid "Done"
+msgstr "Erledigt"
+
+msgctxt "selection:project.work,state:0"
+msgid "Opened"
+msgstr "Offen"
+
+msgctxt "selection:project.work,type:0"
+msgid "Project"
+msgstr "Projekt"
+
+msgctxt "selection:project.work,type:0"
+msgid "Task"
+msgstr "Aufgabe"
+
+msgctxt "view:project.work:0"
+msgid "Children"
+msgstr "Untergeordnet (Arbeiten)"
+
+msgctxt "view:project.work:0"
+msgid "General"
+msgstr "Allgemein"
+
+msgctxt "view:project.work:0"
+msgid "Other Info"
+msgstr "Sonstiges"
+
+msgctxt "view:project.work:0"
+msgid "Projects"
+msgstr "Projekte"
+
+msgctxt "view:project.work:0"
+msgid "Tasks"
+msgstr "Aufgaben"
+
+msgctxt "view:project.work:0"
+msgid "Timesheet"
+msgstr "Zeiterfassungsblatt"
+
+msgctxt "view:project.work:0"
+msgid "Work"
+msgstr "Arbeit"
+
+msgctxt "view:project.work:0"
+msgid "Work Efforts"
+msgstr "Arbeitsaufwände"
+
+msgctxt "view:project.work:0"
+msgid "Works"
+msgstr "Arbeiten"
+
+msgctxt "view:project.work:0"
+msgid "Works Efforts"
+msgstr "Arbeiten Aufwände"
diff --git a/locale/es_CO.po b/locale/es_CO.po
new file mode 100644
index 0000000..c9d7bb8
--- /dev/null
+++ b/locale/es_CO.po
@@ -0,0 +1,190 @@
+#
+msgid ""
+msgstr "Content-Type: text/plain; charset=utf-8\n"
+
+msgctxt "error:project.work:0"
+msgid "There should be only one timesheet work by task/project!"
+msgstr "¡Debe haber sólo una hoja de tiempo por tarea/proyecto!"
+
+msgctxt "field:project.work,children:0"
+msgid "Children"
+msgstr "Descendientes"
+
+msgctxt "field:project.work,comment:0"
+msgid "Comment"
+msgstr "Comentario"
+
+msgctxt "field:project.work,effort:0"
+msgid "Effort"
+msgstr "Esfuerzo"
+
+msgctxt "field:project.work,parent:0"
+msgid "Parent"
+msgstr "Padre"
+
+msgctxt "field:project.work,party:0"
+msgid "Party"
+msgstr "Tercero"
+
+msgctxt "field:project.work,party_address:0"
+msgid "Contact Address"
+msgstr "Dirección de Contacto"
+
+msgctxt "field:project.work,rec_name:0"
+msgid "Name"
+msgstr "Nombre"
+
+#, fuzzy
+msgctxt "field:project.work,sequence:0"
+msgid "Sequence"
+msgstr "Secuencia"
+
+msgctxt "field:project.work,state:0"
+msgid "State"
+msgstr "Estado"
+
+msgctxt "field:project.work,total_effort:0"
+msgid "Total Effort"
+msgstr "Esfuerzo Total"
+
+msgctxt "field:project.work,type:0"
+msgid "Type"
+msgstr "Tipo"
+
+msgctxt "field:project.work,work:0"
+msgid "Work"
+msgstr "Trabajo"
+
+msgctxt "field:timesheet.work,timesheet_lines:0"
+msgid "Timesheet Lines"
+msgstr "Lineas de Hoja de Tiempo"
+
+msgctxt "help:project.work,effort:0"
+msgid "Estimated Effort for this work"
+msgstr "Esfuerzo estimado para este trabajo"
+
+msgctxt "help:project.work,total_effort:0"
+msgid "Estimated total effort for this work and the sub-works"
+msgstr "Esfuerzo total estimado para este trabajo y los sub-trabajos"
+
+msgctxt "model:ir.action,name:act_open_child_work"
+msgid "Tasks"
+msgstr "Tareas"
+
+msgctxt "model:ir.action,name:act_project_form"
+msgid "Projects"
+msgstr "Proyectos"
+
+msgctxt "model:ir.action,name:act_task_form"
+msgid "Tasks"
+msgstr "Tareas"
+
+#, fuzzy
+msgctxt "model:ir.action,name:act_work_form"
+msgid "Works"
+msgstr "Esfuerzos de Trabajo"
+
+#, fuzzy
+msgctxt "model:ir.action,name:act_work_list"
+msgid "Works Efforts"
+msgstr "Trabajos"
+
+#, fuzzy
+msgctxt "model:ir.action,name:act_work_tree"
+msgid "Works Efforts"
+msgstr "Trabajos"
+
+msgctxt "model:ir.ui.menu,name:menu_configuration"
+msgid "Configuration"
+msgstr "Configuración"
+
+#, fuzzy
+msgctxt "model:ir.ui.menu,name:menu_project"
+msgid "Project"
+msgstr "Gestión de Proyectos"
+
+msgctxt "model:ir.ui.menu,name:menu_project_form"
+msgid "Projects"
+msgstr "Proyectos"
+
+msgctxt "model:ir.ui.menu,name:menu_project_tree"
+msgid "Projects"
+msgstr "Proyectos"
+
+msgctxt "model:ir.ui.menu,name:menu_task_form"
+msgid "Tasks"
+msgstr "Tareas"
+
+#, fuzzy
+msgctxt "model:ir.ui.menu,name:menu_work_list"
+msgid "Works Efforts"
+msgstr "Trabajos"
+
+#, fuzzy
+msgctxt "model:ir.ui.menu,name:menu_work_tree"
+msgid "Works Efforts"
+msgstr "Trabajos"
+
+msgctxt "model:project.work,name:0"
+msgid "Work Effort"
+msgstr "Esfuerzo de Trabajo"
+
+msgctxt "model:res.group,name:group_project_admin"
+msgid "Project Administration"
+msgstr "Administración de Proyecto"
+
+msgctxt "selection:project.work,state:0"
+msgid "Done"
+msgstr "Hecho"
+
+msgctxt "selection:project.work,state:0"
+msgid "Opened"
+msgstr "Abierto"
+
+msgctxt "selection:project.work,type:0"
+msgid "Project"
+msgstr "Proyecto"
+
+msgctxt "selection:project.work,type:0"
+msgid "Task"
+msgstr "Tarea"
+
+msgctxt "view:project.work:0"
+msgid "Children"
+msgstr "Descendientes"
+
+msgctxt "view:project.work:0"
+msgid "General"
+msgstr "General"
+
+msgctxt "view:project.work:0"
+msgid "Other Info"
+msgstr "Información Adicional"
+
+msgctxt "view:project.work:0"
+msgid "Projects"
+msgstr "Proyectos"
+
+msgctxt "view:project.work:0"
+msgid "Tasks"
+msgstr "Tareas"
+
+msgctxt "view:project.work:0"
+msgid "Timesheet"
+msgstr "Hoja de tiempos"
+
+msgctxt "view:project.work:0"
+msgid "Work"
+msgstr "Trabajo"
+
+msgctxt "view:project.work:0"
+msgid "Work Efforts"
+msgstr "Esfuerzos de Trabajo"
+
+msgctxt "view:project.work:0"
+msgid "Works"
+msgstr "Trabajos"
+
+msgctxt "view:project.work:0"
+msgid "Works Efforts"
+msgstr "Esfuerzos de Trabajo"
diff --git a/locale/es_ES.po b/locale/es_ES.po
new file mode 100644
index 0000000..e887bdb
--- /dev/null
+++ b/locale/es_ES.po
@@ -0,0 +1,190 @@
+#
+msgid ""
+msgstr "Content-Type: text/plain; charset=utf-8\n"
+
+msgctxt "error:project.work:0"
+msgid "There should be only one timesheet work by task/project!"
+msgstr "Solo debe haber un parte de trabajo por tarea/proyecto"
+
+msgctxt "field:project.work,children:0"
+msgid "Children"
+msgstr "Hijos"
+
+msgctxt "field:project.work,comment:0"
+msgid "Comment"
+msgstr "Comentario"
+
+msgctxt "field:project.work,effort:0"
+msgid "Effort"
+msgstr "Esfuerzo"
+
+msgctxt "field:project.work,parent:0"
+msgid "Parent"
+msgstr "Padre"
+
+msgctxt "field:project.work,party:0"
+msgid "Party"
+msgstr "Tercero"
+
+msgctxt "field:project.work,party_address:0"
+msgid "Contact Address"
+msgstr "Dirección de contacto"
+
+msgctxt "field:project.work,rec_name:0"
+msgid "Name"
+msgstr "Nombre"
+
+#, fuzzy
+msgctxt "field:project.work,sequence:0"
+msgid "Sequence"
+msgstr "Secuencia"
+
+msgctxt "field:project.work,state:0"
+msgid "State"
+msgstr "Estado"
+
+msgctxt "field:project.work,total_effort:0"
+msgid "Total Effort"
+msgstr "Esfuerzo total"
+
+msgctxt "field:project.work,type:0"
+msgid "Type"
+msgstr "Tipo"
+
+msgctxt "field:project.work,work:0"
+msgid "Work"
+msgstr "Actividad"
+
+msgctxt "field:timesheet.work,timesheet_lines:0"
+msgid "Timesheet Lines"
+msgstr "Lineas de parte de trabajo"
+
+msgctxt "help:project.work,effort:0"
+msgid "Estimated Effort for this work"
+msgstr "El esfuerzo estimado para esta actividad"
+
+msgctxt "help:project.work,total_effort:0"
+msgid "Estimated total effort for this work and the sub-works"
+msgstr "Esfuerzo total estimado para esta actividad y sus subactividades"
+
+msgctxt "model:ir.action,name:act_open_child_work"
+msgid "Tasks"
+msgstr "Tareas"
+
+msgctxt "model:ir.action,name:act_project_form"
+msgid "Projects"
+msgstr "Proyectos"
+
+msgctxt "model:ir.action,name:act_task_form"
+msgid "Tasks"
+msgstr "Tareas"
+
+#, fuzzy
+msgctxt "model:ir.action,name:act_work_form"
+msgid "Works"
+msgstr "Actividades"
+
+#, fuzzy
+msgctxt "model:ir.action,name:act_work_list"
+msgid "Works Efforts"
+msgstr "Actividades"
+
+#, fuzzy
+msgctxt "model:ir.action,name:act_work_tree"
+msgid "Works Efforts"
+msgstr "Actividades"
+
+msgctxt "model:ir.ui.menu,name:menu_configuration"
+msgid "Configuration"
+msgstr "Configuración"
+
+#, fuzzy
+msgctxt "model:ir.ui.menu,name:menu_project"
+msgid "Project"
+msgstr "Gestión de proyecto"
+
+msgctxt "model:ir.ui.menu,name:menu_project_form"
+msgid "Projects"
+msgstr "Proyectos"
+
+msgctxt "model:ir.ui.menu,name:menu_project_tree"
+msgid "Projects"
+msgstr "Proyectos"
+
+msgctxt "model:ir.ui.menu,name:menu_task_form"
+msgid "Tasks"
+msgstr "Tareas"
+
+#, fuzzy
+msgctxt "model:ir.ui.menu,name:menu_work_list"
+msgid "Works Efforts"
+msgstr "Actividades"
+
+#, fuzzy
+msgctxt "model:ir.ui.menu,name:menu_work_tree"
+msgid "Works Efforts"
+msgstr "Actividades"
+
+msgctxt "model:project.work,name:0"
+msgid "Work Effort"
+msgstr "Actividades"
+
+msgctxt "model:res.group,name:group_project_admin"
+msgid "Project Administration"
+msgstr "Administración de proyecto"
+
+msgctxt "selection:project.work,state:0"
+msgid "Done"
+msgstr "Terminada"
+
+msgctxt "selection:project.work,state:0"
+msgid "Opened"
+msgstr "Abierto"
+
+msgctxt "selection:project.work,type:0"
+msgid "Project"
+msgstr "Proyecto"
+
+msgctxt "selection:project.work,type:0"
+msgid "Task"
+msgstr "Tarea"
+
+msgctxt "view:project.work:0"
+msgid "Children"
+msgstr "Hijos"
+
+msgctxt "view:project.work:0"
+msgid "General"
+msgstr "General"
+
+msgctxt "view:project.work:0"
+msgid "Other Info"
+msgstr "Información adicional"
+
+msgctxt "view:project.work:0"
+msgid "Projects"
+msgstr "Proyectos"
+
+msgctxt "view:project.work:0"
+msgid "Tasks"
+msgstr "Tareas"
+
+msgctxt "view:project.work:0"
+msgid "Timesheet"
+msgstr "Parte de trabajo"
+
+msgctxt "view:project.work:0"
+msgid "Work"
+msgstr "Actividad"
+
+msgctxt "view:project.work:0"
+msgid "Work Efforts"
+msgstr "Actividades"
+
+msgctxt "view:project.work:0"
+msgid "Works"
+msgstr "Actividades"
+
+msgctxt "view:project.work:0"
+msgid "Works Efforts"
+msgstr "Actividades"
diff --git a/locale/fr_FR.po b/locale/fr_FR.po
new file mode 100644
index 0000000..f848efd
--- /dev/null
+++ b/locale/fr_FR.po
@@ -0,0 +1,184 @@
+#
+msgid ""
+msgstr "Content-Type: text/plain; charset=utf-8\n"
+
+msgctxt "error:project.work:0"
+msgid "There should be only one timesheet work by task/project!"
+msgstr ""
+"Il ne doit y avoir qu'une seule feuille de présence par tâche/projet !"
+
+msgctxt "field:project.work,children:0"
+msgid "Children"
+msgstr "Enfants"
+
+msgctxt "field:project.work,comment:0"
+msgid "Comment"
+msgstr "Commentaire"
+
+msgctxt "field:project.work,effort:0"
+msgid "Effort"
+msgstr "Effort"
+
+msgctxt "field:project.work,parent:0"
+msgid "Parent"
+msgstr "Parent"
+
+msgctxt "field:project.work,party:0"
+msgid "Party"
+msgstr "Tiers"
+
+msgctxt "field:project.work,party_address:0"
+msgid "Contact Address"
+msgstr "Adresse"
+
+msgctxt "field:project.work,rec_name:0"
+msgid "Name"
+msgstr "Nom"
+
+msgctxt "field:project.work,sequence:0"
+msgid "Sequence"
+msgstr "Séquence"
+
+msgctxt "field:project.work,state:0"
+msgid "State"
+msgstr "État"
+
+msgctxt "field:project.work,total_effort:0"
+msgid "Total Effort"
+msgstr "Effort total"
+
+msgctxt "field:project.work,type:0"
+msgid "Type"
+msgstr "Type"
+
+msgctxt "field:project.work,work:0"
+msgid "Work"
+msgstr "Travail"
+
+msgctxt "field:timesheet.work,timesheet_lines:0"
+msgid "Timesheet Lines"
+msgstr "Lignes de feuille de présence"
+
+msgctxt "help:project.work,effort:0"
+msgid "Estimated Effort for this work"
+msgstr "Effort estimé pour cette activité"
+
+msgctxt "help:project.work,total_effort:0"
+msgid "Estimated total effort for this work and the sub-works"
+msgstr "Effort total estimé pour cette activité et ses sous-activités"
+
+msgctxt "model:ir.action,name:act_open_child_work"
+msgid "Tasks"
+msgstr "Tâches"
+
+msgctxt "model:ir.action,name:act_project_form"
+msgid "Projects"
+msgstr "Projets"
+
+msgctxt "model:ir.action,name:act_task_form"
+msgid "Tasks"
+msgstr "Tâches"
+
+msgctxt "model:ir.action,name:act_work_form"
+msgid "Works"
+msgstr "Travaux"
+
+msgctxt "model:ir.action,name:act_work_list"
+msgid "Works Efforts"
+msgstr "Efforts de travail"
+
+msgctxt "model:ir.action,name:act_work_tree"
+msgid "Works Efforts"
+msgstr "Efforts de travail"
+
+msgctxt "model:ir.ui.menu,name:menu_configuration"
+msgid "Configuration"
+msgstr "Configuration"
+
+msgctxt "model:ir.ui.menu,name:menu_project"
+msgid "Project"
+msgstr "Projets"
+
+msgctxt "model:ir.ui.menu,name:menu_project_form"
+msgid "Projects"
+msgstr "Projets"
+
+msgctxt "model:ir.ui.menu,name:menu_project_tree"
+msgid "Projects"
+msgstr "Projets"
+
+msgctxt "model:ir.ui.menu,name:menu_task_form"
+msgid "Tasks"
+msgstr "Tâches"
+
+msgctxt "model:ir.ui.menu,name:menu_work_list"
+msgid "Works Efforts"
+msgstr "Efforts de travail"
+
+msgctxt "model:ir.ui.menu,name:menu_work_tree"
+msgid "Works Efforts"
+msgstr "Efforts de travail"
+
+msgctxt "model:project.work,name:0"
+msgid "Work Effort"
+msgstr "Tâche"
+
+msgctxt "model:res.group,name:group_project_admin"
+msgid "Project Administration"
+msgstr "Administrion de projets"
+
+msgctxt "selection:project.work,state:0"
+msgid "Done"
+msgstr "Fait"
+
+msgctxt "selection:project.work,state:0"
+msgid "Opened"
+msgstr "Ouvert"
+
+msgctxt "selection:project.work,type:0"
+msgid "Project"
+msgstr "Projet"
+
+msgctxt "selection:project.work,type:0"
+msgid "Task"
+msgstr "Tâche"
+
+msgctxt "view:project.work:0"
+msgid "Children"
+msgstr "Enfants"
+
+msgctxt "view:project.work:0"
+msgid "General"
+msgstr "General"
+
+msgctxt "view:project.work:0"
+msgid "Other Info"
+msgstr "Autre information"
+
+msgctxt "view:project.work:0"
+msgid "Projects"
+msgstr "Projets"
+
+msgctxt "view:project.work:0"
+msgid "Tasks"
+msgstr "Tâche"
+
+msgctxt "view:project.work:0"
+msgid "Timesheet"
+msgstr "Feuille de présence"
+
+msgctxt "view:project.work:0"
+msgid "Work"
+msgstr "Travail"
+
+msgctxt "view:project.work:0"
+msgid "Work Efforts"
+msgstr "Activités"
+
+msgctxt "view:project.work:0"
+msgid "Works"
+msgstr "Travaux"
+
+msgctxt "view:project.work:0"
+msgid "Works Efforts"
+msgstr "Efforts de travail"
diff --git a/locale/nl_NL.po b/locale/nl_NL.po
new file mode 100644
index 0000000..f273873
--- /dev/null
+++ b/locale/nl_NL.po
@@ -0,0 +1,179 @@
+#
+msgid ""
+msgstr "Content-Type: text/plain; charset=utf-8\n"
+
+msgctxt "error:project.work:0"
+msgid "There should be only one timesheet work by task/project!"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:project.work,children:0"
+msgid "Children"
+msgstr "Onderliggende niveaus"
+
+#, fuzzy
+msgctxt "field:project.work,comment:0"
+msgid "Comment"
+msgstr "Opmerking"
+
+msgctxt "field:project.work,effort:0"
+msgid "Effort"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:project.work,parent:0"
+msgid "Parent"
+msgstr "Bovenliggend niveau"
+
+#, fuzzy
+msgctxt "field:project.work,party:0"
+msgid "Party"
+msgstr "Relaties"
+
+msgctxt "field:project.work,party_address:0"
+msgid "Contact Address"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:project.work,rec_name:0"
+msgid "Name"
+msgstr "Naam bijlage"
+
+#, fuzzy
+msgctxt "field:project.work,sequence:0"
+msgid "Sequence"
+msgstr "Reeks"
+
+#, fuzzy
+msgctxt "field:project.work,state:0"
+msgid "State"
+msgstr "Status"
+
+msgctxt "field:project.work,total_effort:0"
+msgid "Total Effort"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:project.work,type:0"
+msgid "Type"
+msgstr "Type"
+
+#, fuzzy
+msgctxt "field:project.work,work:0"
+msgid "Work"
+msgstr "Werk"
+
+msgctxt "help:project.work,effort:0"
+msgid "Estimated Effort for this work"
+msgstr ""
+
+msgctxt "help:project.work,total_effort:0"
+msgid "Estimated total effort for this work and the sub-works"
+msgstr ""
+
+msgctxt "model:ir.action,name:act_open_child_work"
+msgid "Tasks"
+msgstr ""
+
+msgctxt "model:ir.action,name:act_project_form"
+msgid "Projects"
+msgstr ""
+
+msgctxt "model:ir.action,name:act_task_form"
+msgid "Tasks"
+msgstr ""
+
+#, fuzzy
+msgctxt "model:ir.action,name:act_work_form"
+msgid "Works"
+msgstr "Werken"
+
+msgctxt "model:ir.action,name:act_work_list"
+msgid "Works Efforts"
+msgstr ""
+
+msgctxt "model:ir.action,name:act_work_tree"
+msgid "Works Efforts"
+msgstr ""
+
+#, fuzzy
+msgctxt "model:ir.ui.menu,name:menu_configuration"
+msgid "Configuration"
+msgstr "Instellingen"
+
+msgctxt "model:ir.ui.menu,name:menu_project"
+msgid "Project"
+msgstr ""
+
+msgctxt "model:ir.ui.menu,name:menu_project_form"
+msgid "Projects"
+msgstr ""
+
+msgctxt "model:ir.ui.menu,name:menu_project_tree"
+msgid "Projects"
+msgstr ""
+
+msgctxt "model:ir.ui.menu,name:menu_task_form"
+msgid "Tasks"
+msgstr ""
+
+msgctxt "model:ir.ui.menu,name:menu_work_list"
+msgid "Works Efforts"
+msgstr ""
+
+msgctxt "model:ir.ui.menu,name:menu_work_tree"
+msgid "Works Efforts"
+msgstr ""
+
+msgctxt "model:project.work,name:0"
+msgid "Work Effort"
+msgstr ""
+
+msgctxt "model:res.group,name:group_project_admin"
+msgid "Project Administration"
+msgstr ""
+
+#, fuzzy
+msgctxt "selection:project.work,state:0"
+msgid "Done"
+msgstr "Klaar"
+
+#, fuzzy
+msgctxt "selection:project.work,state:0"
+msgid "Opened"
+msgstr "Geopend"
+
+msgctxt "selection:project.work,type:0"
+msgid "Project"
+msgstr ""
+
+msgctxt "selection:project.work,type:0"
+msgid "Task"
+msgstr ""
+
+#, fuzzy
+msgctxt "view:project.work:0"
+msgid "Children"
+msgstr "Onderliggende niveaus"
+
+#, fuzzy
+msgctxt "view:project.work:0"
+msgid "General"
+msgstr "Algemeen"
+
+msgctxt "view:project.work:0"
+msgid "Projects"
+msgstr ""
+
+msgctxt "view:project.work:0"
+msgid "Tasks"
+msgstr ""
+
+#, fuzzy
+msgctxt "view:project.work:0"
+msgid "Timesheet"
+msgstr "Tijdverantwoording"
+
+msgctxt "view:project.work:0"
+msgid "Works Efforts"
+msgstr ""
diff --git a/locale/ru_RU.po b/locale/ru_RU.po
new file mode 100644
index 0000000..6e11951
--- /dev/null
+++ b/locale/ru_RU.po
@@ -0,0 +1,176 @@
+#
+msgid ""
+msgstr "Content-Type: text/plain; charset=utf-8\n"
+
+msgctxt "error:project.work:0"
+msgid "There should be only one timesheet work by task/project!"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:project.work,children:0"
+msgid "Children"
+msgstr "Подчиненый"
+
+#, fuzzy
+msgctxt "field:project.work,comment:0"
+msgid "Comment"
+msgstr "Комментарии"
+
+msgctxt "field:project.work,effort:0"
+msgid "Effort"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:project.work,parent:0"
+msgid "Parent"
+msgstr "ОÑновной"
+
+#, fuzzy
+msgctxt "field:project.work,party:0"
+msgid "Party"
+msgstr "Организации"
+
+#, fuzzy
+msgctxt "field:project.work,party_address:0"
+msgid "Contact Address"
+msgstr "Контактный адреÑ"
+
+#, fuzzy
+msgctxt "field:project.work,rec_name:0"
+msgid "Name"
+msgstr "Ðаименование"
+
+#, fuzzy
+msgctxt "field:project.work,sequence:0"
+msgid "Sequence"
+msgstr "ПоÑледовательноÑÑ‚ÑŒ"
+
+#, fuzzy
+msgctxt "field:project.work,state:0"
+msgid "State"
+msgstr "СтатуÑ"
+
+msgctxt "field:project.work,total_effort:0"
+msgid "Total Effort"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:project.work,type:0"
+msgid "Type"
+msgstr "Тип"
+
+msgctxt "field:project.work,work:0"
+msgid "Work"
+msgstr ""
+
+msgctxt "help:project.work,effort:0"
+msgid "Estimated Effort for this work"
+msgstr ""
+
+msgctxt "help:project.work,total_effort:0"
+msgid "Estimated total effort for this work and the sub-works"
+msgstr ""
+
+msgctxt "model:ir.action,name:act_open_child_work"
+msgid "Tasks"
+msgstr ""
+
+msgctxt "model:ir.action,name:act_project_form"
+msgid "Projects"
+msgstr ""
+
+msgctxt "model:ir.action,name:act_task_form"
+msgid "Tasks"
+msgstr ""
+
+msgctxt "model:ir.action,name:act_work_form"
+msgid "Works"
+msgstr ""
+
+msgctxt "model:ir.action,name:act_work_list"
+msgid "Works Efforts"
+msgstr ""
+
+msgctxt "model:ir.action,name:act_work_tree"
+msgid "Works Efforts"
+msgstr ""
+
+#, fuzzy
+msgctxt "model:ir.ui.menu,name:menu_configuration"
+msgid "Configuration"
+msgstr "КонфигурациÑ"
+
+msgctxt "model:ir.ui.menu,name:menu_project"
+msgid "Project"
+msgstr ""
+
+msgctxt "model:ir.ui.menu,name:menu_project_form"
+msgid "Projects"
+msgstr ""
+
+msgctxt "model:ir.ui.menu,name:menu_project_tree"
+msgid "Projects"
+msgstr ""
+
+msgctxt "model:ir.ui.menu,name:menu_task_form"
+msgid "Tasks"
+msgstr ""
+
+msgctxt "model:ir.ui.menu,name:menu_work_list"
+msgid "Works Efforts"
+msgstr ""
+
+msgctxt "model:ir.ui.menu,name:menu_work_tree"
+msgid "Works Efforts"
+msgstr ""
+
+msgctxt "model:project.work,name:0"
+msgid "Work Effort"
+msgstr ""
+
+msgctxt "model:res.group,name:group_project_admin"
+msgid "Project Administration"
+msgstr ""
+
+#, fuzzy
+msgctxt "selection:project.work,state:0"
+msgid "Done"
+msgstr "Выполнено"
+
+msgctxt "selection:project.work,state:0"
+msgid "Opened"
+msgstr ""
+
+msgctxt "selection:project.work,type:0"
+msgid "Project"
+msgstr ""
+
+msgctxt "selection:project.work,type:0"
+msgid "Task"
+msgstr ""
+
+#, fuzzy
+msgctxt "view:project.work:0"
+msgid "Children"
+msgstr "Подчиненый"
+
+#, fuzzy
+msgctxt "view:project.work:0"
+msgid "General"
+msgstr "ОÑновной"
+
+msgctxt "view:project.work:0"
+msgid "Projects"
+msgstr ""
+
+msgctxt "view:project.work:0"
+msgid "Tasks"
+msgstr ""
+
+msgctxt "view:project.work:0"
+msgid "Timesheet"
+msgstr ""
+
+msgctxt "view:project.work:0"
+msgid "Works Efforts"
+msgstr ""
diff --git a/project.xml b/project.xml
index 4851004..518d76e 100644
--- a/project.xml
+++ b/project.xml
@@ -6,21 +6,27 @@ this repository contains the full copyright notices and license terms. -->
<record model="res.group" id="group_project_admin">
<field name="name">Project Administration</field>
</record>
- <record model="res.user" id="res.user_admin">
- <field name="groups" eval="[('add', ref('group_project_admin'))]"/>
+ <record model="res.user-res.group" id="user_admin_group_project_admin">
+ <field name="user" ref="res.user_admin"/>
+ <field name="group" ref="group_project_admin"/>
</record>
- <record model="res.user" id="res.user_trigger">
- <field name="groups" eval="[('add', ref('group_project_admin'))]"/>
+ <record model="res.user-res.group" id="user_trigger_group_project_admin">
+ <field name="user" ref="res.user_trigger"/>
+ <field name="group" ref="group_project_admin"/>
</record>
<record model="ir.ui.icon" id="project_icon">
<field name="name">tryton-project</field>
<field name="path">icons/tryton-project.svg</field>
</record>
- <menuitem name="Project Management" sequence="7" id="menu_project"
+ <menuitem name="Project" sequence="7" id="menu_project"
icon="tryton-project"/>
<menuitem name="Configuration" parent="menu_project"
- id="menu_configuration" groups="group_project_admin"
- sequence="10" icon="tryton-preferences"/>
+ id="menu_configuration" sequence="10" icon="tryton-preferences"/>
+ <record model="ir.ui.menu-res.group"
+ id="menu_configuration_group_project_admin">
+ <field name="menu" ref="menu_configuration"/>
+ <field name="group" ref="group_project_admin"/>
+ </record>
</data>
</tryton>
diff --git a/setup.py b/setup.py
index dc3737d..c98341c 100644
--- a/setup.py
+++ b/setup.py
@@ -31,28 +31,30 @@ setup(name='trytond_project',
packages=[
'trytond.modules.project',
'trytond.modules.project.tests',
- 'trytond.modules.project.icons',
],
package_data={
'trytond.modules.project': info.get('xml', []) \
- + info.get('translation', []),
- 'trytond.modules.project.icons': ['tryton-project.svg'],
+ + info.get('translation', []) \
+ + ['icons/*.svg'],
},
classifiers=[
'Development Status :: 5 - Production/Stable',
'Environment :: Plugins',
+ 'Framework :: Tryton',
'Intended Audience :: Developers',
'Intended Audience :: Financial and Insurance Industry',
'Intended Audience :: Legal Industry',
'Intended Audience :: Manufacturing',
'License :: OSI Approved :: GNU General Public License (GPL)',
'Natural Language :: Bulgarian',
+ 'Natural Language :: Czech',
+ 'Natural Language :: Dutch',
'Natural Language :: English',
'Natural Language :: French',
'Natural Language :: German',
+ 'Natural Language :: Russian',
'Natural Language :: Spanish',
'Operating System :: OS Independent',
- 'Programming Language :: Python :: 2.5',
'Programming Language :: Python :: 2.6',
'Programming Language :: Python :: 2.7',
'Topic :: Office/Business',
diff --git a/tests/test_project.py b/tests/test_project.py
index 61ca94d..081b2e6 100644
--- a/tests/test_project.py
+++ b/tests/test_project.py
@@ -10,7 +10,7 @@ if os.path.isdir(DIR):
import unittest
import trytond.tests.test_tryton
-from trytond.tests.test_tryton import test_view
+from trytond.tests.test_tryton import test_view, test_depends
class ProjectTestCase(unittest.TestCase):
@@ -27,6 +27,12 @@ class ProjectTestCase(unittest.TestCase):
'''
test_view('project')
+ def test0006depends(self):
+ '''
+ Test depends.
+ '''
+ test_depends()
+
def suite():
suite = trytond.tests.test_tryton.suite()
suite.addTests(unittest.TestLoader().loadTestsFromTestCase(ProjectTestCase))
diff --git a/trytond_project.egg-info/PKG-INFO b/trytond_project.egg-info/PKG-INFO
index b599a2a..412d685 100644
--- a/trytond_project.egg-info/PKG-INFO
+++ b/trytond_project.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.0
Name: trytond-project
-Version: 2.0.0
+Version: 2.2.0
Summary: Project Module with:
- Project management
@@ -8,23 +8,26 @@ Home-page: http://www.tryton.org/
Author: B2CK
Author-email: info at b2ck.com
License: GPL-3
-Download-URL: http://downloads.tryton.org/2.0/
+Download-URL: http://downloads.tryton.org/2.2/
Description: UNKNOWN
Platform: UNKNOWN
Classifier: Development Status :: 5 - Production/Stable
Classifier: Environment :: Plugins
+Classifier: Framework :: Tryton
Classifier: Intended Audience :: Developers
Classifier: Intended Audience :: Financial and Insurance Industry
Classifier: Intended Audience :: Legal Industry
Classifier: Intended Audience :: Manufacturing
Classifier: License :: OSI Approved :: GNU General Public License (GPL)
Classifier: Natural Language :: Bulgarian
+Classifier: Natural Language :: Czech
+Classifier: Natural Language :: Dutch
Classifier: Natural Language :: English
Classifier: Natural Language :: French
Classifier: Natural Language :: German
+Classifier: Natural Language :: Russian
Classifier: Natural Language :: Spanish
Classifier: Operating System :: OS Independent
-Classifier: Programming Language :: Python :: 2.5
Classifier: Programming Language :: Python :: 2.6
Classifier: Programming Language :: Python :: 2.7
Classifier: Topic :: Office/Business
diff --git a/trytond_project.egg-info/SOURCES.txt b/trytond_project.egg-info/SOURCES.txt
index 770ba7d..495ed96 100644
--- a/trytond_project.egg-info/SOURCES.txt
+++ b/trytond_project.egg-info/SOURCES.txt
@@ -4,26 +4,24 @@ INSTALL
LICENSE
MANIFEST.in
README
-bg_BG.csv
-de_DE.csv
-es_CO.csv
-es_ES.csv
-fr_FR.csv
project.xml
setup.py
work.xml
./__init__.py
./__tryton__.py
./work.py
-./icons/__init__.py
./tests/__init__.py
./tests/test_project.py
doc/index.rst
-icons/LICENSE
-icons/__init__.py
icons/tryton-project.svg
-tests/__init__.py
-tests/test_project.py
+locale/bg_BG.po
+locale/cs_CZ.po
+locale/de_DE.po
+locale/es_CO.po
+locale/es_ES.po
+locale/fr_FR.po
+locale/nl_NL.po
+locale/ru_RU.po
trytond_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 2cedb2b..31fc885 100644
--- a/trytond_project.egg-info/requires.txt
+++ b/trytond_project.egg-info/requires.txt
@@ -1,4 +1,4 @@
-trytond_timesheet >= 2.0, < 2.1
-trytond_party >= 2.0, < 2.1
-trytond_company_work_time >= 2.0, < 2.1
-trytond >= 2.0, < 2.1
\ No newline at end of file
+trytond_timesheet >= 2.2, < 2.3
+trytond_party >= 2.2, < 2.3
+trytond_company_work_time >= 2.2, < 2.3
+trytond >= 2.2, < 2.3
\ No newline at end of file
diff --git a/work.py b/work.py
index 538bf4b..bfa4650 100644
--- a/work.py
+++ b/work.py
@@ -1,28 +1,19 @@
#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 __future__ import with_statement
import copy
from trytond.model import ModelView, ModelSQL, fields
from trytond.model.modelstorage import OPERATORS
-from trytond.pyson import Not, Bool, Eval, Get, Equal
+from trytond.pyson import Eval
+from trytond.backend import TableHandler
from trytond.transaction import Transaction
+from trytond.pool import Pool
class TimesheetWork(ModelSQL, ModelView):
_name = 'timesheet.work'
- timesheet_lines = fields.One2Many('timesheet.line', 'work',
- 'Timesheet Lines',
- depends=['timesheet_available', 'active'],
- states={
- 'invisible': Not(Bool(Eval('timesheet_available'))),
- 'readonly': Not(Bool(Eval('active'))),
- })
- sequence = fields.Integer('Sequence')
-
def __init__(self):
super(TimesheetWork, self).__init__()
- self._order.insert(0, ('sequence', 'ASC'))
self.parent = copy.copy(self.parent)
self.parent.context = copy.copy(self.parent.context)
@@ -44,22 +35,22 @@ class Work(ModelSQL, ModelView):
('project', 'Project'),
('task', 'Task')
],
- 'Type', required=True, select=1,
- states={
- 'invisible': Get(Eval('context', {}), 'type', False),
+ 'Type', required=True, select=1,
+ states={
+ 'invisible': Eval('context', {}).get('type', False),
})
party = fields.Many2One('party.party', 'Party',
- states={
- 'invisible': Not(Equal(Eval('type'), 'project')),
+ states={
+ 'invisible': Eval('type') != 'project',
}, depends=['type'])
party_address = fields.Many2One('party.address', 'Contact Address',
- domain=[('party', '=', Eval('party'))],
- states={
- 'invisible': Not(Equal(Eval('type'), 'project')),
+ domain=[('party', '=', Eval('party'))],
+ states={
+ 'invisible': Eval('type') != 'project',
}, depends=['party', 'type'])
effort = fields.Float("Effort",
- states={
- 'invisible': Not(Equal(Eval('type'), 'task')),
+ states={
+ 'invisible': Eval('type') != 'task',
}, depends=['type'], help="Estimated Effort for this work")
total_effort = fields.Function(fields.Float('Total Effort',
help="Estimated total effort for this work and the sub-works"),
@@ -72,10 +63,11 @@ class Work(ModelSQL, ModelView):
('opened', 'Opened'),
('done', 'Done'),
], 'State',
- states={
- 'invisible': Not(Equal(Eval('type'), 'task')),
- 'required': Equal(Eval('type'), 'task'),
+ states={
+ 'invisible': Eval('type') != 'task',
+ 'required': Eval('type') == 'task',
}, select=1, depends=['type'])
+ sequence = fields.Integer('Sequence')
def default_type(self):
if Transaction().context.get('type') == 'project':
@@ -85,6 +77,30 @@ class Work(ModelSQL, ModelView):
def default_state(self):
return 'opened'
+ def init(self, module_name):
+ timesheet_work_obj = Pool().get('timesheet.work')
+ cursor = Transaction().cursor
+ table_project_work = TableHandler(cursor, self, module_name)
+ table_timesheet_work = TableHandler(cursor, timesheet_work_obj,
+ module_name)
+ migrate_sequence = (not table_project_work.column_exist('sequence')
+ and table_timesheet_work.column_exist('sequence'))
+
+ super(Work, self).init(module_name)
+
+ # Migration from 2.0: copy sequence from timesheet to project
+ if migrate_sequence:
+ cursor.execute(
+ 'SELECT t.sequence, t.id '
+ 'FROM "%s" AS t '
+ 'JOIN "%s" AS p ON (p.work = t.id)' % (
+ timesheet_work_obj._table, self._table))
+ for sequence, id_ in cursor.fetchall():
+ sql = ('UPDATE "%s" '
+ 'SET sequence = %%s '
+ 'WHERE work = %%s' % self._table)
+ cursor.execute(sql, (sequence, id_))
+
def __init__(self):
super(Work, self).__init__()
self._sql_constraints += [
@@ -92,16 +108,6 @@ class Work(ModelSQL, ModelView):
'timesheet work by task/project!'),
]
self._order.insert(0, ('sequence', 'ASC'))
- if 'company' in self._inherit_fields:
- company_field = copy.copy(
- self._inherit_fields['company'])
- company_field[2].states = copy.copy(company_field[2].states)
- company_field[2].states.update({
- 'invisible': Bool(Get(Eval('context', {}), 'type')),
- 'readonly': Not(Bool(Eval('active'))),
- })
-
- self._inherit_fields['company'] = company_field
def get_parent(self, ids, name):
res = dict.fromkeys(ids, None)
@@ -129,7 +135,7 @@ class Work(ModelSQL, ModelView):
return res
def set_parent(self, ids, name, value):
- timesheet_work_obj = self.pool.get('timesheet.work')
+ timesheet_work_obj = Pool().get('timesheet.work')
if value:
project_works = self.browse(ids + [value])
child_timesheet_work_ids = [x.work.id for x in project_works[:-1]]
@@ -144,7 +150,7 @@ class Work(ModelSQL, ModelView):
})
def search_parent(self, name, domain=None):
- timesheet_work_obj = self.pool.get('timesheet.work')
+ timesheet_work_obj = Pool().get('timesheet.work')
project_work_domain = []
timesheet_work_domain = []
@@ -229,7 +235,7 @@ class Work(ModelSQL, ModelView):
return res
def copy(self, ids, default=None):
- timesheet_work_obj = self.pool.get('timesheet.work')
+ timesheet_work_obj = Pool().get('timesheet.work')
int_id = isinstance(ids, (int, long))
if int_id:
@@ -238,10 +244,14 @@ class Work(ModelSQL, ModelView):
if default is None:
default = {}
+ timesheet_default = default.copy()
+ for key in timesheet_default.keys():
+ if key in self._columns:
+ del timesheet_default[key]
new_ids = []
for project_work in self.browse(ids):
timesheet_work_id = timesheet_work_obj.copy(project_work.work.id,
- default=default)
+ default=timesheet_default)
pwdefault = default.copy()
pwdefault['work'] = timesheet_work_id
new_ids.append(super(Work, self).copy(project_work.id,
@@ -251,7 +261,7 @@ class Work(ModelSQL, ModelView):
return new_ids
def delete(self, ids):
- timesheet_work_obj = self.pool.get('timesheet.work')
+ timesheet_work_obj = Pool().get('timesheet.work')
if isinstance(ids, (int, long)):
ids = [ids]
diff --git a/work.xml b/work.xml
index dfd2fba..6d55493 100644
--- a/work.xml
+++ b/work.xml
@@ -12,12 +12,12 @@ this repository contains the full copyright notices and license terms. -->
<field name="arch" type="xml">
<![CDATA[
<tree string="Works Efforts">
- <field name="name" select="1"/>
+ <field name="name"/>
<field name="hours" widget="float_time" float_time="company_work_time"/>
<field name="total_effort" widget="float_time" float_time="company_work_time"/>
- <field name="type" select="1"/>
- <field name="state" select="1"/>
- <field name="active" select="2" tree_invisible="1"/>
+ <field name="type"/>
+ <field name="state"/>
+ <field name="active" tree_invisible="1"/>
<field name="parent" tree_invisible="1"/>
<field name="children" tree_invisible="1"/>
</tree>
@@ -32,12 +32,12 @@ this repository contains the full copyright notices and license terms. -->
<field name="arch" type="xml">
<![CDATA[
<tree string="Works Efforts">
- <field name="name" select="1"/>
+ <field name="name"/>
<field name="hours" widget="float_time" float_time="company_work_time"/>
<field name="total_effort" widget="float_time" float_time="company_work_time"/>
- <field name="type" select="1"/>
- <field name="state" select="1"/>
- <field name="active" select="2" tree_invisible="1"/>
+ <field name="type"/>
+ <field name="state"/>
+ <field name="active" tree_invisible="1"/>
</tree>
]]>
</field>
@@ -50,11 +50,11 @@ this repository contains the full copyright notices and license terms. -->
<field name="arch" type="xml">
<![CDATA[
<tree string="Tasks">
- <field name="name" select="1"/>
+ <field name="name"/>
<field name="hours" widget="float_time" float_time="company_work_time"/>
<field name="total_effort" widget="float_time" float_time="company_work_time"/>
- <field name="state" select="1"/>
- <field name="active" select="2" tree_invisible="1"/>
+ <field name="state"/>
+ <field name="active" tree_invisible="1"/>
</tree>
]]>
</field>
@@ -66,10 +66,10 @@ this repository contains the full copyright notices and license terms. -->
<field name="arch" type="xml">
<![CDATA[
<tree string="Projects">
- <field name="name" select="1"/>
+ <field name="name"/>
<field name="hours" widget="float_time" float_time="company_work_time"/>
<field name="total_effort" widget="float_time" float_time="company_work_time"/>
- <field name="active" select="2" tree_invisible="1"/>
+ <field name="active" tree_invisible="1"/>
</tree>
]]>
</field>
@@ -94,17 +94,19 @@ this repository contains the full copyright notices and license terms. -->
<field name="state"/>
<label name="timesheet_available"/>
<field name="timesheet_available" xexpand="0"/>
- <label name="company"/>
- <field name="company" />
+ <label name="company"/>
+ <field name="company"/>
<notebook colspan="8">
<page string="General" id="general">
- <label name="party"/>
- <field name="party"/>
- <label name="party_address"/>
- <field name="party_address"/>
- <label name="hours"/>
- <field name="hours" widget="float_time" float_time="company_work_time"/>
- <group colspan="2" col="4" id="effort">
+ <group colspan="2" col="2" id="left">
+ <label name="party"/>
+ <field name="party"/>
+ <label name="hours"/>
+ <field name="hours" widget="float_time" float_time="company_work_time"/>
+ </group>
+ <group colspan="2" col="2" id="right">
+ <label name="party_address"/>
+ <field name="party_address"/>
<label name="effort"/>
<field name="effort" widget="float_time" float_time="company_work_time"/>
<label name="total_effort"/>
@@ -173,25 +175,6 @@ this repository contains the full copyright notices and license terms. -->
<menuitem parent="menu_work_tree"
action="act_work_list" id="menu_work_list"/>
- <record model="ir.action.act_window" id="act_work_form_new">
- <field name="name">Works Efforts</field>
- <field name="res_model">project.work</field>
- </record>
- <record model="ir.action.act_window.view"
- id="act_work_form_new_view1">
- <field name="sequence" eval="10"/>
- <field name="view" ref="work_view_form"/>
- <field name="act_window" ref="act_work_form_new"/>
- </record>
- <record model="ir.action.act_window.view"
- id="act_work_form_new_view2">
- <field name="sequence" eval="20"/>
- <field name="view" ref="work_view_list"/>
- <field name="act_window" ref="act_work_form_new"/>
- </record>
- <menuitem name="New Work Effort" parent="menu_work_tree"
- action="act_work_form_new" id="menu_work_form_new"/>
-
<record model="ir.action.act_window" id="act_work_form">
<field name="name">Works</field>
<field name="res_model">project.work</field>
@@ -257,7 +240,7 @@ this repository contains the full copyright notices and license terms. -->
<record model="ir.action.keyword"
id="act_open_project_work_keyword1">
<field name="keyword">form_relate</field>
- <field name="model">project.work,0</field>
+ <field name="model">project.work,-1</field>
<field name="action" ref="act_open_child_work"/>
</record>
<record model="ir.action.act_window.view"
commit a9a3dd530b33e752be394b043f751ff17dd4b27b
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Sun Aug 7 14:09:31 2011 +0200
Removing tango-icon-theme from Depends.
diff --git a/debian/control b/debian/control
index 37af121..01cd2fc 100644
--- a/debian/control
+++ b/debian/control
@@ -16,7 +16,7 @@ Architecture: all
Depends:
${misc:Depends}, ${python:Depends}, tryton-server (>= 2.0),
tryton-modules-party (>= 2.0), tryton-modules-timesheet (>= 2.0),
- python-pkg-resources, tango-icon-theme
+ python-pkg-resources
Description: Tryton Application Platform (Project Module)
Tryton is a high-level general purpose application platform written in Python
and using PostgreSQL as database engine. It is the core base of a complete
commit 6348f5ce895bc96a621e29bf8bbbb7f11097a570
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Sun Aug 7 14:09:03 2011 +0200
Adding Bug URL to dfsg-icons patch.
diff --git a/debian/patches/01-dfsg-icons b/debian/patches/01-dfsg-icons
index 2625225..c68ca71 100644
--- a/debian/patches/01-dfsg-icons
+++ b/debian/patches/01-dfsg-icons
@@ -1,5 +1,6 @@
Author: Mathias Behrle <mathiasb at m9s.biz>
Description: Add DFSG compatible icon as a replacement for the original icon.
+Bug: http://bugs.tryton.org/roundup/issue1996
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ tryton-modules-project/icons/tryton-project.svg 2011-08-07 14:07:02.050029839 +0200
@@ -0,0 +1,329 @@
commit 610d078579f518464cc38fa33ec95bce0bc31ff1
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Sun Aug 7 14:07:19 2011 +0200
Rediffing dfsg-icons patch.
diff --git a/debian/patches/01-dfsg-icons b/debian/patches/01-dfsg-icons
index 70e8a32..2625225 100644
--- a/debian/patches/01-dfsg-icons
+++ b/debian/patches/01-dfsg-icons
@@ -1,7 +1,7 @@
Author: Mathias Behrle <mathiasb at m9s.biz>
Description: Add DFSG compatible icon as a replacement for the original icon.
---- /dev/null
-+++ b/icons/tryton-project.svg
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ tryton-modules-project/icons/tryton-project.svg 2011-08-07 14:07:02.050029839 +0200
@@ -0,0 +1,329 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
commit 35adc452679f5bfec3253c496d3486ab9cc2c5c8
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Wed Jul 27 13:20:53 2011 +0200
Reordering anf fixing license for public-domain.
diff --git a/debian/copyright b/debian/copyright
index 1dd12df..0c09c31 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -7,69 +7,7 @@ License: GPL-3+
Files: icons/*
Copyright: not applicable
-License: public domain
-
-The icons used to replace the original not DFSG compatible icons are taken
-from http://tango.freedesktop.org/releases/tango-icon-theme-0.8.90.tar.gz
-
-Upstream Authors: 2005-2009
-
- Ulisse Perusin <uli.peru at gmail.com>
- Steven Garrity <sgarrity at silverorange.com>
- Lapo Calamandrei <calamandrei at gmail.com>
- Ryan Collier <rcollier at novell.com>
- Rodney Dawes <dobey at novell.com>
- Andreas Nilsson <nisses.mail at home.se>
- Tuomas Kuosmanen <tigert at tigert.com>
- Garrett LeSage <garrett at novell.com>
- Jakub Steiner <jimmac at novell.com>
-
- In the preparation of the 0.8.90 release Novell took care of tracking
- down all the contributors to get them to relicense their artwork
- into Public Domain.
-
- The COPYING file of the tarball states the following:
- | The icons in this repository are herefore released into the Public Domain.
-
- Additionally the copyright status of the files was tracked in the CVS and the
- rdf properties of the SVGs adjusted for all files that were put into Public
- Domain (see rdf:about and rdf:resource). Both fields contain a link to the
- Creative Commons Public Domain Dediciation[0] as reproduced below:
- | Public Domain Dedication
- |
- | Copyright-Only Dedication (based on United States law) or Public Domain
- | Certification
- |
- | The person or persons who have associated work with this document (the
- | "Dedicator" or "Certifier") hereby either (a) certifies that, to the best
- | of his knowledge, the work of authorship identified is in the public
- | domain of the country from which the work is published, or (b)
- | hereby dedicates whatever copyright the dedicators holds in the work
- | of authorship identified below (the "Work") to the public domain. A
- | certifier, moreover, dedicates any copyright interest he may have in
- | the associated work, and for these purposes, is described as a
- | "dedicator" below.
- |
- | A certifier has taken reasonable steps to verify the copyright
- | status of this work. Certifier recognizes that his good faith efforts
- | may not shield him from liability if in fact the work certified is not
- | in the public domain.
- |
- | Dedicator makes this dedication for the benefit of the public at
- | large and to the detriment of the Dedicator's heirs and successors.
- | Dedicator intends this dedication to be an overt act of relinquishment
- | in perpetuity of all present and future rights under copyright law,
- | whether vested or contingent, in the Work. Dedicator understands that
- | such relinquishment of all rights includes the relinquishment of all
- | rights to enforce (by lawsuit or otherwise) those copyrights in the
- | Work.
- |
- | Dedicator recognizes that, once placed in the public domain, the Work
- | may be freely reproduced, distributed, transmitted, used, modified,
- | built upon, or otherwise exploited by anyone for any purpose, commercial
- | or non-commercial, and in any way, including by methods that have not
- | yet been invented or conceived.
- [0] http://creativecommons.org/licenses/publicdomain/
+License: public-domain
Files: debian/*
Copyright:
@@ -93,3 +31,66 @@ License: GPL-3+
.
The complete text of the GNU General Public License
can be found in /usr/share/common-licenses/GPL-3 file.
+
+License: public-domain
+ The icons used to replace the original not DFSG compatible icons are taken
+ from http://tango.freedesktop.org/releases/tango-icon-theme-0.8.90.tar.gz
+ .
+ Upstream Authors: 2005-2009
+ .
+ Ulisse Perusin <uli.peru at gmail.com>
+ Steven Garrity <sgarrity at silverorange.com>
+ Lapo Calamandrei <calamandrei at gmail.com>
+ Ryan Collier <rcollier at novell.com>
+ Rodney Dawes <dobey at novell.com>
+ Andreas Nilsson <nisses.mail at home.se>
+ Tuomas Kuosmanen <tigert at tigert.com>
+ Garrett LeSage <garrett at novell.com>
+ Jakub Steiner <jimmac at novell.com>
+ .
+ In the preparation of the 0.8.90 release Novell took care of tracking
+ down all the contributors to get them to relicense their artwork
+ into Public Domain.
+ .
+ The COPYING file of the tarball states the following:
+ | The icons in this repository are herefore released into the Public Domain.
+ .
+ Additionally the copyright status of the files was tracked in the CVS and the
+ rdf properties of the SVGs adjusted for all files that were put into Public
+ Domain (see rdf:about and rdf:resource). Both fields contain a link to the
+ Creative Commons Public Domain Dediciation[0] as reproduced below:
+ | Public Domain Dedication
+ |
+ | Copyright-Only Dedication (based on United States law) or Public Domain
+ | Certification
+ |
+ | The person or persons who have associated work with this document (the
+ | "Dedicator" or "Certifier") hereby either (a) certifies that, to the best
+ | of his knowledge, the work of authorship identified is in the public
+ | domain of the country from which the work is published, or (b)
+ | hereby dedicates whatever copyright the dedicators holds in the work
+ | of authorship identified below (the "Work") to the public domain. A
+ | certifier, moreover, dedicates any copyright interest he may have in
+ | the associated work, and for these purposes, is described as a
+ | "dedicator" below.
+ |
+ | A certifier has taken reasonable steps to verify the copyright
+ | status of this work. Certifier recognizes that his good faith efforts
+ | may not shield him from liability if in fact the work certified is not
+ | in the public domain.
+ |
+ | Dedicator makes this dedication for the benefit of the public at
+ | large and to the detriment of the Dedicator's heirs and successors.
+ | Dedicator intends this dedication to be an overt act of relinquishment
+ | in perpetuity of all present and future rights under copyright law,
+ | whether vested or contingent, in the Work. Dedicator understands that
+ | such relinquishment of all rights includes the relinquishment of all
+ | rights to enforce (by lawsuit or otherwise) those copyrights in the
+ | Work.
+ |
+ | Dedicator recognizes that, once placed in the public domain, the Work
+ | may be freely reproduced, distributed, transmitted, used, modified,
+ | built upon, or otherwise exploited by anyone for any purpose, commercial
+ | or non-commercial, and in any way, including by methods that have not
+ | yet been invented or conceived.
+ 0] http://creativecommons.org/licenses/publicdomain/
commit 436a2b041ea48b1188ba65c500239bae57946b1a
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Fri Jul 22 13:50:50 2011 +0200
Releasing debian version 2.0.0+dfsg-3.
diff --git a/debian/changelog b/debian/changelog
index 2086968..82b8ee4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+tryton-modules-project (2.0.0+dfsg-3) unstable; urgency=low
+
+ * Removing deprecated XB-Python-Version for dh_python2.
+ * Adding license for icons taken from tango project.
+ * Adding myself to debian copyright.
+
+ -- Mathias Behrle <mathiasb at m9s.biz> Fri, 22 Jul 2011 13:50:43 +0200
+
tryton-modules-project (2.0.0+dfsg-2) unstable; urgency=low
* Patching in DFSG compatible icons instead of linking to them,
commit bd871f1409eb4153dfea624d4a1addf9cead6418
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Fri Jul 22 13:16:25 2011 +0200
Adding myself to debian copyright.
diff --git a/debian/copyright b/debian/copyright
index 2a176ae..1dd12df 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -72,7 +72,9 @@ Upstream Authors: 2005-2009
[0] http://creativecommons.org/licenses/publicdomain/
Files: debian/*
-Copyright: (C) 2009-2011 Daniel Baumann <daniel at debian.org>
+Copyright:
+ (C) 2009-2011 Daniel Baumann <daniel at debian.org>
+ (C) 2011 Mathias Behrle <mathiasb at m9s.biz>
License: GPL-3+
License: GPL-3+
commit 557cca93d7b55cc5ddf2f02fc65287a7e73a5bd5
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Fri Jul 22 13:03:48 2011 +0200
Adding license for icons taken from tango project.
diff --git a/debian/copyright b/debian/copyright
index 25d75e9..2a176ae 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -5,6 +5,72 @@ Copyright:
(C) 2009-2011 Bertrand Chenal
License: GPL-3+
+Files: icons/*
+Copyright: not applicable
+License: public domain
+
+The icons used to replace the original not DFSG compatible icons are taken
+from http://tango.freedesktop.org/releases/tango-icon-theme-0.8.90.tar.gz
+
+Upstream Authors: 2005-2009
+
+ Ulisse Perusin <uli.peru at gmail.com>
+ Steven Garrity <sgarrity at silverorange.com>
+ Lapo Calamandrei <calamandrei at gmail.com>
+ Ryan Collier <rcollier at novell.com>
+ Rodney Dawes <dobey at novell.com>
+ Andreas Nilsson <nisses.mail at home.se>
+ Tuomas Kuosmanen <tigert at tigert.com>
+ Garrett LeSage <garrett at novell.com>
+ Jakub Steiner <jimmac at novell.com>
+
+ In the preparation of the 0.8.90 release Novell took care of tracking
+ down all the contributors to get them to relicense their artwork
+ into Public Domain.
+
+ The COPYING file of the tarball states the following:
+ | The icons in this repository are herefore released into the Public Domain.
+
+ Additionally the copyright status of the files was tracked in the CVS and the
+ rdf properties of the SVGs adjusted for all files that were put into Public
+ Domain (see rdf:about and rdf:resource). Both fields contain a link to the
+ Creative Commons Public Domain Dediciation[0] as reproduced below:
+ | Public Domain Dedication
+ |
+ | Copyright-Only Dedication (based on United States law) or Public Domain
+ | Certification
+ |
+ | The person or persons who have associated work with this document (the
+ | "Dedicator" or "Certifier") hereby either (a) certifies that, to the best
+ | of his knowledge, the work of authorship identified is in the public
+ | domain of the country from which the work is published, or (b)
+ | hereby dedicates whatever copyright the dedicators holds in the work
+ | of authorship identified below (the "Work") to the public domain. A
+ | certifier, moreover, dedicates any copyright interest he may have in
+ | the associated work, and for these purposes, is described as a
+ | "dedicator" below.
+ |
+ | A certifier has taken reasonable steps to verify the copyright
+ | status of this work. Certifier recognizes that his good faith efforts
+ | may not shield him from liability if in fact the work certified is not
+ | in the public domain.
+ |
+ | Dedicator makes this dedication for the benefit of the public at
+ | large and to the detriment of the Dedicator's heirs and successors.
+ | Dedicator intends this dedication to be an overt act of relinquishment
+ | in perpetuity of all present and future rights under copyright law,
+ | whether vested or contingent, in the Work. Dedicator understands that
+ | such relinquishment of all rights includes the relinquishment of all
+ | rights to enforce (by lawsuit or otherwise) those copyrights in the
+ | Work.
+ |
+ | Dedicator recognizes that, once placed in the public domain, the Work
+ | may be freely reproduced, distributed, transmitted, used, modified,
+ | built upon, or otherwise exploited by anyone for any purpose, commercial
+ | or non-commercial, and in any way, including by methods that have not
+ | yet been invented or conceived.
+ [0] http://creativecommons.org/licenses/publicdomain/
+
Files: debian/*
Copyright: (C) 2009-2011 Daniel Baumann <daniel at debian.org>
License: GPL-3+
commit 66ae31d604a0a5cbced000ee54229c0a578ebe5a
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Fri Jul 22 12:26:59 2011 +0200
Removing deprecated XB-Python-Version for dh_python2.
diff --git a/debian/control b/debian/control
index bd4298e..37af121 100644
--- a/debian/control
+++ b/debian/control
@@ -17,7 +17,6 @@ Depends:
${misc:Depends}, ${python:Depends}, tryton-server (>= 2.0),
tryton-modules-party (>= 2.0), tryton-modules-timesheet (>= 2.0),
python-pkg-resources, tango-icon-theme
-XB-Python-Version: ${python:Versions}
Description: Tryton Application Platform (Project Module)
Tryton is a high-level general purpose application platform written in Python
and using PostgreSQL as database engine. It is the core base of a complete
commit 720efc5f6ae07f31e144bec19f9ea47a37a5f5aa
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Sat Jul 16 23:34:43 2011 +0200
Releasing debian version 2.0.0+dfsg-2.
diff --git a/.pc/.quilt_patches b/.pc/.quilt_patches
new file mode 100644
index 0000000..6857a8d
--- /dev/null
+++ b/.pc/.quilt_patches
@@ -0,0 +1 @@
+debian/patches
diff --git a/.pc/.quilt_series b/.pc/.quilt_series
new file mode 100644
index 0000000..c206706
--- /dev/null
+++ b/.pc/.quilt_series
@@ -0,0 +1 @@
+series
diff --git a/.pc/.version b/.pc/.version
new file mode 100644
index 0000000..0cfbf08
--- /dev/null
+++ b/.pc/.version
@@ -0,0 +1 @@
+2
diff --git a/debian/changelog b/debian/changelog
index 0c6194d..2086968 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+tryton-modules-project (2.0.0+dfsg-2) unstable; urgency=low
+
+ * Patching in DFSG compatible icons instead of linking to them,
+ setup.py needs to find them.
+
+ -- Mathias Behrle <mathiasb at m9s.biz> Sat, 16 Jul 2011 23:31:42 +0200
+
tryton-modules-project (2.0.0+dfsg-1) unstable; urgency=low
[ Daniel Baumann ]
commit a4d4f08290c1f7aceee66ddd61214e389d36b0d0
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Sat Jul 16 23:27:27 2011 +0200
Patching in DFSG compatible icons instead of linking to them, setup.py needs to find them.
diff --git a/debian/patches/01-dfsg-icons b/debian/patches/01-dfsg-icons
new file mode 100644
index 0000000..70e8a32
--- /dev/null
+++ b/debian/patches/01-dfsg-icons
@@ -0,0 +1,334 @@
+Author: Mathias Behrle <mathiasb at m9s.biz>
+Description: Add DFSG compatible icon as a replacement for the original icon.
+--- /dev/null
++++ b/icons/tryton-project.svg
+@@ -0,0 +1,329 @@
++<?xml version="1.0" encoding="UTF-8" standalone="no"?>
++<!-- Created with Inkscape (http://www.inkscape.org/) -->
++<svg
++ xmlns:dc="http://purl.org/dc/elements/1.1/"
++ xmlns:cc="http://creativecommons.org/ns#"
++ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
++ xmlns:svg="http://www.w3.org/2000/svg"
++ xmlns="http://www.w3.org/2000/svg"
++ xmlns:xlink="http://www.w3.org/1999/xlink"
++ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
++ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
++ width="48"
++ height="48"
++ id="svg2"
++ sodipodi:version="0.32"
++ inkscape:version="0.46"
++ version="1.0"
++ sodipodi:docbase="/home/tigert/cvs/freedesktop.org/tango-icon-theme/scalable/categories"
++ sodipodi:docname="applications-development.svg"
++ inkscape:output_extension="org.inkscape.output.svg.inkscape">
++ <defs
++ id="defs4">
++ <inkscape:perspective
++ sodipodi:type="inkscape:persp3d"
++ inkscape:vp_x="0 : 24 : 1"
++ inkscape:vp_y="0 : 1000 : 0"
++ inkscape:vp_z="48 : 24 : 1"
++ inkscape:persp3d-origin="24 : 16 : 1"
++ id="perspective47" />
++ <linearGradient
++ inkscape:collect="always"
++ id="linearGradient2807">
++ <stop
++ style="stop-color:#ffffff;stop-opacity:1;"
++ offset="0"
++ id="stop2809" />
++ <stop
++ style="stop-color:#ffffff;stop-opacity:0;"
++ offset="1"
++ id="stop2811" />
++ </linearGradient>
++ <linearGradient
++ id="linearGradient18284">
++ <stop
++ style="stop-color:#000000;stop-opacity:1;"
++ offset="0"
++ id="stop18286" />
++ <stop
++ id="stop20913"
++ offset="0.5"
++ style="stop-color:#000000;stop-opacity:1;" />
++ <stop
++ id="stop19165"
++ offset="1"
++ style="stop-color:#000000;stop-opacity:0;" />
++ </linearGradient>
++ <linearGradient
++ id="linearGradient11202">
++ <stop
++ style="stop-color:#c4a000;stop-opacity:1;"
++ offset="0"
++ id="stop11204" />
++ <stop
++ style="stop-color:#c4a000;stop-opacity:0;"
++ offset="1"
++ id="stop11206" />
++ </linearGradient>
++ <linearGradient
++ id="linearGradient8543">
++ <stop
++ style="stop-color:#fffef5;stop-opacity:0.94117647;"
++ offset="0"
++ id="stop8545" />
++ <stop
++ style="stop-color:#fce94f;stop-opacity:0;"
++ offset="1"
++ id="stop8547" />
++ </linearGradient>
++ <linearGradient
++ id="linearGradient5012">
++ <stop
++ style="stop-color:#fdf188;stop-opacity:1;"
++ offset="0"
++ id="stop5014" />
++ <stop
++ style="stop-color:#d3bc00;stop-opacity:1;"
++ offset="1"
++ id="stop5016" />
++ </linearGradient>
++ <radialGradient
++ inkscape:collect="always"
++ xlink:href="#linearGradient5012"
++ id="radialGradient7666"
++ gradientUnits="userSpaceOnUse"
++ gradientTransform="matrix(0.136507,-2.396132e-18,-4.484926e-5,7.137743e-2,-23.39816,12.31028)"
++ cx="336.73767"
++ cy="-72.420044"
++ fx="336.73767"
++ fy="-72.420044"
++ r="297.21338" />
++ <radialGradient
++ inkscape:collect="always"
++ xlink:href="#linearGradient8543"
++ id="radialGradient8549"
++ cx="420.87839"
++ cy="685.99139"
++ fx="420.87839"
++ fy="685.99139"
++ r="235.88632"
++ gradientTransform="matrix(0.163532,-1.065754e-2,1.078108e-2,0.165425,-46.18187,-65.65506)"
++ gradientUnits="userSpaceOnUse" />
++ <radialGradient
++ inkscape:collect="always"
++ xlink:href="#linearGradient8543"
++ id="radialGradient9434"
++ cx="500.97794"
++ cy="286.46918"
++ fx="500.97794"
++ fy="286.46918"
++ r="40.975471"
++ gradientTransform="matrix(0.224796,1.017229e-2,-9.759474e-3,0.215674,-73.87964,-54.89804)"
++ gradientUnits="userSpaceOnUse" />
++ <radialGradient
++ inkscape:collect="always"
++ xlink:href="#linearGradient8543"
++ id="radialGradient10317"
++ cx="293.81989"
++ cy="243.06874"
++ fx="293.81989"
++ fy="243.06874"
++ r="48.782982"
++ gradientTransform="matrix(0.272962,-7.1724e-2,5.616202e-2,0.213737,-78.54657,-24.30491)"
++ gradientUnits="userSpaceOnUse" />
++ <radialGradient
++ inkscape:collect="always"
++ xlink:href="#linearGradient11202"
++ id="radialGradient11208"
++ cx="424.99243"
++ cy="270.67969"
++ fx="424.99243"
++ fy="270.67969"
++ r="38.451698"
++ gradientTransform="matrix(8.174351e-2,1.024998e-2,-4.335971e-2,0.345793,6.123413,-84.50421)"
++ gradientUnits="userSpaceOnUse" />
++ <radialGradient
++ inkscape:collect="always"
++ xlink:href="#linearGradient8543"
++ id="radialGradient13895"
++ cx="340.35886"
++ cy="409.83737"
++ fx="340.35886"
++ fy="409.83737"
++ r="103.26014"
++ gradientTransform="matrix(0.105628,-4.514018e-2,6.692574e-2,0.156607,-46.01605,-24.35485)"
++ gradientUnits="userSpaceOnUse" />
++ <radialGradient
++ inkscape:collect="always"
++ xlink:href="#linearGradient18284"
++ id="radialGradient18290"
++ cx="29.898689"
++ cy="45.673546"
++ fx="29.898689"
++ fy="45.673546"
++ r="30.365856"
++ gradientTransform="matrix(1,0,2.702168e-19,0.415385,-2.283104e-16,26.70146)"
++ gradientUnits="userSpaceOnUse" />
++ <radialGradient
++ inkscape:collect="always"
++ xlink:href="#linearGradient8543"
++ id="radialGradient2798"
++ gradientUnits="userSpaceOnUse"
++ gradientTransform="matrix(0.101953,-4.272301e-2,9.621296e-2,0.229599,-48.67227,-64.24148)"
++ cx="131.23691"
++ cy="424.15677"
++ fx="131.23691"
++ fy="424.15677"
++ r="35.934704" />
++ <radialGradient
++ inkscape:collect="always"
++ xlink:href="#linearGradient2807"
++ id="radialGradient2813"
++ cx="15.491823"
++ cy="10.943316"
++ fx="15.491823"
++ fy="10.943316"
++ r="18.370251"
++ gradientTransform="matrix(1.402663,1.176399e-16,-9.356816e-17,1.115648,-6.237984,5.33075e-2)"
++ gradientUnits="userSpaceOnUse" />
++ </defs>
++ <sodipodi:namedview
++ id="base"
++ pagecolor="#ffffff"
++ bordercolor="#666666"
++ borderopacity="0.13333333"
++ inkscape:pageopacity="0.0"
++ inkscape:pageshadow="2"
++ inkscape:zoom="11.313708"
++ inkscape:cx="13.540158"
++ inkscape:cy="28.304801"
++ inkscape:document-units="px"
++ inkscape:current-layer="layer1"
++ inkscape:window-width="906"
++ inkscape:window-height="987"
++ inkscape:window-x="635"
++ inkscape:window-y="114"
++ inkscape:showpageshadow="false"
++ stroke="#c4a000"
++ showgrid="false" />
++ <metadata
++ id="metadata7">
++ <rdf:RDF>
++ <cc:Work
++ rdf:about="">
++ <dc:format>image/svg+xml</dc:format>
++ <dc:type
++ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
++ <dc:contributor>
++ <cc:Agent>
++ <dc:title>Henrik Andersen</dc:title>
++ </cc:Agent>
++ </dc:contributor>
++ <dc:title>Developer Tools</dc:title>
++ <dc:subject>
++ <rdf:Bag>
++ <rdf:li>developer</rdf:li>
++ <rdf:li>dev</rdf:li>
++ <rdf:li>tool</rdf:li>
++ <rdf:li>make</rdf:li>
++ <rdf:li>compile</rdf:li>
++ <rdf:li>build</rdf:li>
++ <rdf:li>code</rdf:li>
++ <rdf:li>hacker</rdf:li>
++ </rdf:Bag>
++ </dc:subject>
++ <dc:creator>
++ <cc:Agent>
++ <dc:title>Jakub Steiner</dc:title>
++ </cc:Agent>
++ </dc:creator>
++ <dc:source>http://jimmac.musichall.cz</dc:source>
++ <cc:license
++ rdf:resource="http://creativecommons.org/licenses/publicdomain/" />
++ </cc:Work>
++ <cc:License
++ rdf:about="http://creativecommons.org/licenses/publicdomain/">
++ <cc:permits
++ rdf:resource="http://creativecommons.org/ns#Reproduction" />
++ <cc:permits
++ rdf:resource="http://creativecommons.org/ns#Distribution" />
++ <cc:permits
++ rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
++ </cc:License>
++ </rdf:RDF>
++ </metadata>
++ <g
++ inkscape:label="Layer 1"
++ id="layer1"
++ inkscape:groupmode="layer">
++ <path
++ sodipodi:type="arc"
++ style="opacity:1;fill:url(#radialGradient18290);fill-opacity:1;stroke:none;stroke-width:12.39700031;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
++ id="path17409"
++ sodipodi:cx="29.898689"
++ sodipodi:cy="45.673546"
++ sodipodi:rx="30.365856"
++ sodipodi:ry="12.613509"
++ d="M 60.264545 45.673546 A 30.365856 12.613509 0 1 1 -0.4671669,45.673546 A 30.365856 12.613509 0 1 1 60.264545 45.673546 z"
++ transform="matrix(0.742527,0,-5.812964e-2,1.428611,4.500517,-36.68345)" />
++ <path
++ style="fill:url(#radialGradient7666);fill-opacity:1;stroke:#c4a000;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
++ d="M 23.152758,1.1801876 C 20.380218,1.2190783 17.86582,1.8908769 15.634281,3.0196314 C 14.541531,5.1714614 10.9437,7.7293655 9.4689484,8.0015561 C 6.5691703,11.460832 4.6887193,15.805035 3.9754523,19.98162 C 3.9750148,19.984183 3.9758889,19.986781 3.9754523,19.989343 C 2.7890929,21.53906 2.2854415,23.385937 2.5981051,25.521903 C 3.7192795,33.181217 5.8802729,40.410195 10.783201,42.078178 C 17.93763,44.512124 32.65497,43.864025 35.912708,42.536436 C 43.051738,39.62715 43.684161,33.251338 44.80414,25.75618 C 45.109694,23.711348 44.659305,21.914978 43.573539,20.383238 C 43.564583,20.327636 43.555052,20.271764 43.54522,20.215896 C 42.763966,15.777007 40.697859,11.326849 37.602582,7.8466935 C 35.508773,7.62926 31.462964,4.270333 30.483158,2.6229925 C 28.330506,1.7020155 25.961342,1.1801876 23.407632,1.1801876 C 23.322311,1.1801876 23.237595,1.178998 23.152758,1.1801876 z "
++ id="path3120"
++ sodipodi:nodetypes="cccscsssscsccsc" />
++ <path
++ style="fill:url(#radialGradient8549);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;opacity:0.66666667"
++ d="M 43.629688,22.792984 C 39.033494,39.233217 10.438199,40.802737 3.7832765,23.04227 C 3.7410682,39.366403 10.103414,44.083889 28.189955,43.247454 C 31.251932,43.106765 38.199775,43.290321 42.804439,34.110678 C 45.042804,22.600278 43.629688,22.792984 43.629688,22.792984 z "
++ id="path7668"
++ sodipodi:nodetypes="ccscc" />
++ <path
++ style="fill:url(#radialGradient9434);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
++ d="M 34.691565,7.6783057 L 37.192446,8.8037033 C 37.192446,8.8037033 35.882042,18.926343 30.52343,25.288675 C 32.295095,18.832841 34.712405,7.6783057 34.691565,7.6783057 z "
++ id="path8553"
++ sodipodi:nodetypes="cccc" />
++ <path
++ style="fill:url(#radialGradient10317);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
++ d="M 15.872437,4.1562328 C 17.372967,13.221927 22.374727,23.642261 21.874552,24.163278 C 17.289604,17.181654 15.372261,11.242061 13.871732,6.2403001 C 13.871732,6.1569366 15.872437,4.1770734 15.872437,4.1562328 z "
++ id="path9436"
++ sodipodi:nodetypes="cccc" />
++ <path
++ style="fill:url(#radialGradient11208);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
++ d="M 30.21082,3.8227818 C 26.126047,20.328594 25.959322,23.079563 25.959322,23.079563 C 25.959322,23.079563 32.294888,6.3236627 32.294888,5.9068495 C 32.294888,5.9068487 30.710997,4.4063209 30.21082,3.8227818 z "
++ id="path10319"
++ sodipodi:nodetypes="ccsc" />
++ <flowRoot
++ xml:space="preserve"
++ id="flowRoot12974"><flowRegion
++ id="flowRegion12976"><rect
++ id="rect12978"
++ width="40.055775"
++ height="16.02231"
++ x="86.787514"
++ y="412.80496" /></flowRegion><flowPara
++ id="flowPara12980" /></flowRoot> <path
++ style="fill:url(#radialGradient13895);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
++ d="M 16.18209,34.476182 L 16.137416,24.906437 L 30.631143,24.906437 L 32.273747,23.642895 L 15.342282,23.642895 L 15.386956,34.283476 L 16.18209,34.476182 z "
++ id="path13014"
++ sodipodi:nodetypes="ccccccc" />
++ <path
++ style="fill:#958401;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
++ d="M 31.043495,24.81709 L 31.125176,34.621701 L 31.81132,34.406959 L 31.823298,23.553549 L 31.043495,24.81709 z "
++ id="path13897"
++ sodipodi:nodetypes="ccccc" />
++ <path
++ style="fill:url(#radialGradient2798);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
++ d="M 4.2551267,24.106065 C 4.2551267,24.106065 6.571777,32.221754 14.476068,32.872102 C 15.581676,35.36252 13.341098,36.996703 13.341098,36.996703 L 9.7315781,36.745641 C 9.7315781,36.745641 3.4928036,28.752699 3.2433694,26.844759 C 2.9939369,24.936822 3.4066529,23.436966 3.4066529,23.436966 L 4.2551267,24.106065 z "
++ id="path16526"
++ sodipodi:nodetypes="ccccscc" />
++ <path
++ sodipodi:nodetypes="cccscsssscsccsc"
++ id="path2703"
++ d="M 23.184204,2.3889904 C 20.570275,2.4256563 18.199721,3.0590226 16.095844,4.1232033 C 15.065608,6.1519314 11.673602,8.563503 10.283218,8.8201221 C 7.5493302,12.0815 5.776456,16.17718 5.1039936,20.11483 C 5.1035812,20.117247 5.1044052,20.119696 5.1039936,20.122112 C 3.9855035,21.583172 3.2455,23.368587 3.5402767,25.382359 C 4.597311,32.603499 6.4678792,39.092036 10.868256,41.021813 C 16.791397,43.619395 32.407978,42.807748 35.479348,41.556108 C 42.209968,38.813256 42.541047,32.625414 43.596954,25.559039 C 43.885028,23.631188 43.460404,21.937585 42.436753,20.493473 C 42.428309,20.441052 42.419324,20.388376 42.410054,20.335704 C 41.673494,16.150755 39.725585,11.955182 36.807382,8.6741189 C 34.833356,8.4691243 31.019,5.3023548 30.095246,3.7492553 C 28.065743,2.8809656 25.832115,2.3889904 23.424497,2.3889904 C 23.344057,2.3889904 23.264188,2.3878689 23.184204,2.3889904 z "
++ style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:0.99999976;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;opacity:0.74444444" />
++ <path
++ style="fill:url(#radialGradient2813);fill-opacity:1.0;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;opacity:0.59444444"
++ d="M 22.59375,2.78125 C 20.264193,2.8978182 18.152779,3.5062884 16.25,4.46875 C 15.239275,6.4590559 11.895302,8.841991 10.53125,9.09375 C 7.8491405,12.293361 6.1284766,16.293174 5.46875,20.15625 C 5.4683454,20.15862 5.4691538,20.18513 5.46875,20.1875 C 4.3714431,21.62089 4.0107233,23.778648 4.0107233,23.778648 C 8.6959903,27.38371 11.652335,23.99254 18.329596,21.761428 C 30.928876,23.684569 37.077934,20.765483 40.84375,16.09375 C 40.850609,16.085241 40.840294,16.072869 40.84375,16.0625 C 39.852567,13.479666 38.411479,11.016387 36.5625,8.9375 C 34.62586,8.7363873 30.875008,5.6486852 29.96875,4.125 C 27.977684,3.2731547 25.79952,2.78125 23.4375,2.78125 C 23.358584,2.7812501 23.265969,2.7801497 23.1875,2.78125 C 22.987154,2.7840603 22.79117,2.7713713 22.59375,2.78125 z "
++ id="path2800"
++ sodipodi:nodetypes="cccssccscccssc" />
++ </g>
++</svg>
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..a127545
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+01-dfsg-icons
diff --git a/debian/tryton-modules-project.links b/debian/tryton-modules-project.links
deleted file mode 100644
index 70a8f76..0000000
--- a/debian/tryton-modules-project.links
+++ /dev/null
@@ -1 +0,0 @@
-/usr/share/icons/Tango/scalable/categories/applications-development.svg /usr/share/pyshared/trytond/modules/project/icons/tryton-project.svg
commit 20efdca5f3252f76e0ce948ae88456538730c667
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Thu Jul 14 01:21:18 2011 +0200
Releasing debian version 2.0.0+dfsg-1.
diff --git a/debian/changelog b/debian/changelog
index e6ffac0..0c6194d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,18 @@
+tryton-modules-project (2.0.0+dfsg-1) unstable; urgency=low
+
+ [ Daniel Baumann ]
+ * Removing for new source package version obsoleted README.source file.
+ * Adding options for source package.
+ * Compacting copyright file.
+ * Not wrapping uploaders field, it does not exceed 80 chars.
+
+ [ Mathias Behrle ]
+ * Merging upstream version 2.0.0+dfsg.
+ * Replacing non-DFSG compliant graphics by linking to tango-icon-theme.
+ * Moving from deprecated python-support to dh_python2.
+
+ -- Mathias Behrle <mathiasb at m9s.biz> Thu, 14 Jul 2011 01:20:38 +0200
+
tryton-modules-project (2.0.0-1) unstable; urgency=low
* Updating to standards version 3.9.2.
commit 6fe83e1d95a6d5fb24fb3a27e6af0f239b77bd30
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Wed Jul 13 19:24:30 2011 +0200
Moving from deprecated python-support to dh_python2.
diff --git a/debian/control b/debian/control
index 62b2769..bd4298e 100644
--- a/debian/control
+++ b/debian/control
@@ -4,11 +4,12 @@ Priority: optional
Maintainer: Debian Tryton Maintainers <tryton at lists.debian-maintainers.org>
Uploaders: Daniel Baumann <daniel at debian.org>, Mathias Behrle <mathiasb at m9s.biz>
Dm-Upload-Allowed: yes
-Build-Depends: debhelper (>= 8), python, python-setuptools, python-support
+Build-Depends: debhelper (>= 8), python (>= 2.6.6-3~), python-setuptools
Standards-Version: 3.9.2
Homepage: http://www.tryton.org/
Vcs-Browser: http://git.debian-maintainers.org/?p=tryton/tryton-modules-project.git
Vcs-Git: git://git.debian-maintainers.org/git/tryton/tryton-modules-project.git
+X-Python-Version: >= 2.5
Package: tryton-modules-project
Architecture: all
diff --git a/debian/pycompat b/debian/pycompat
deleted file mode 100644
index 0cfbf08..0000000
--- a/debian/pycompat
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/debian/pyversions b/debian/pyversions
deleted file mode 100644
index b3dc41e..0000000
--- a/debian/pyversions
+++ /dev/null
@@ -1 +0,0 @@
-2.5-
diff --git a/debian/rules b/debian/rules
index 000210b..e32b791 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,4 +1,9 @@
#!/usr/bin/make -f
%:
- dh ${@}
+ dh ${@} --with python2
+
+override_dh_auto_clean:
+ dh_auto_clean
+
+ rm -rf *.egg-info
commit 16ebd5aa44eadb8ae6b66a78f9f968ba58f555b3
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Wed Jul 13 13:49:13 2011 +0200
Replacing non-DFSG compliant graphics by linking to tango-icon-theme.
diff --git a/debian/control b/debian/control
index e590e8d..62b2769 100644
--- a/debian/control
+++ b/debian/control
@@ -15,7 +15,7 @@ Architecture: all
Depends:
${misc:Depends}, ${python:Depends}, tryton-server (>= 2.0),
tryton-modules-party (>= 2.0), tryton-modules-timesheet (>= 2.0),
- python-pkg-resources
+ python-pkg-resources, tango-icon-theme
XB-Python-Version: ${python:Versions}
Description: Tryton Application Platform (Project Module)
Tryton is a high-level general purpose application platform written in Python
diff --git a/debian/tryton-modules-project.links b/debian/tryton-modules-project.links
new file mode 100644
index 0000000..70a8f76
--- /dev/null
+++ b/debian/tryton-modules-project.links
@@ -0,0 +1 @@
+/usr/share/icons/Tango/scalable/categories/applications-development.svg /usr/share/pyshared/trytond/modules/project/icons/tryton-project.svg
commit bcdf9ee5f3a41b45d571c3f13c35ab56c5ce4633
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Tue Jul 12 17:09:07 2011 +0200
Merging upstream version 2.0.0+dfsg.
diff --git a/icons/LICENSE b/icons/LICENSE
deleted file mode 100644
index 11782c0..0000000
--- a/icons/LICENSE
+++ /dev/null
@@ -1,264 +0,0 @@
- [1]Creative Commons
-
- Creative Commons Legal Code
-
- Attribution-ShareAlike 2.0
- CREATIVE COMMONS CORPORATION IS NOT A LAW FIRM AND DOES NOT PROVIDE
- LEGAL SERVICES. DISTRIBUTION OF THIS LICENSE DOES NOT CREATE AN
- ATTORNEY-CLIENT RELATIONSHIP. CREATIVE COMMONS PROVIDES THIS
- INFORMATION ON AN "AS-IS" BASIS. CREATIVE COMMONS MAKES NO WARRANTIES
- REGARDING THE INFORMATION PROVIDED, AND DISCLAIMS LIABILITY FOR
- DAMAGES RESULTING FROM ITS USE.
-
- License
-
- THE WORK (AS DEFINED BELOW) IS PROVIDED UNDER THE TERMS OF THIS
- CREATIVE COMMONS PUBLIC LICENSE ("CCPL" OR "LICENSE"). THE WORK IS
- PROTECTED BY COPYRIGHT AND/OR OTHER APPLICABLE LAW. ANY USE OF THE
- WORK OTHER THAN AS AUTHORIZED UNDER THIS LICENSE OR COPYRIGHT LAW IS
- PROHIBITED.
-
- BY EXERCISING ANY RIGHTS TO THE WORK PROVIDED HERE, YOU ACCEPT AND
- AGREE TO BE BOUND BY THE TERMS OF THIS LICENSE. THE LICENSOR GRANTS
- YOU THE RIGHTS CONTAINED HERE IN CONSIDERATION OF YOUR ACCEPTANCE OF
- SUCH TERMS AND CONDITIONS.
-
- 1. Definitions
- a. "Collective Work" means a work, such as a periodical issue,
- anthology or encyclopedia, in which the Work in its entirety in
- unmodified form, along with a number of other contributions,
- constituting separate and independent works in themselves, are
- assembled into a collective whole. A work that constitutes a
- Collective Work will not be considered a Derivative Work (as
- defined below) for the purposes of this License.
- b. "Derivative Work" means a work based upon the Work or upon the
- Work and other pre-existing works, such as a translation, musical
- arrangement, dramatization, fictionalization, motion picture
- version, sound recording, art reproduction, abridgment,
- condensation, or any other form in which the Work may be recast,
- transformed, or adapted, except that a work that constitutes a
- Collective Work will not be considered a Derivative Work for the
- purpose of this License. For the avoidance of doubt, where the
- Work is a musical composition or sound recording, the
- synchronization of the Work in timed-relation with a moving image
- ("synching") will be considered a Derivative Work for the purpose
- of this License.
- c. "Licensor" means the individual or entity that offers the Work
- under the terms of this License.
- d. "Original Author" means the individual or entity who created the
- Work.
- e. "Work" means the copyrightable work of authorship offered under
- the terms of this License.
- f. "You" means an individual or entity exercising rights under this
- License who has not previously violated the terms of this License
- with respect to the Work, or who has received express permission
- from the Licensor to exercise rights under this License despite a
- previous violation.
- g. "License Elements" means the following high-level license
- attributes as selected by Licensor and indicated in the title of
- this License: Attribution, ShareAlike.
-
- 2. Fair Use Rights. Nothing in this license is intended to reduce,
- limit, or restrict any rights arising from fair use, first sale or
- other limitations on the exclusive rights of the copyright owner under
- copyright law or other applicable laws.
-
- 3. License Grant. Subject to the terms and conditions of this License,
- Licensor hereby grants You a worldwide, royalty-free, non-exclusive,
- perpetual (for the duration of the applicable copyright) license to
- exercise the rights in the Work as stated below:
- a. to reproduce the Work, to incorporate the Work into one or more
- Collective Works, and to reproduce the Work as incorporated in the
- Collective Works;
- b. to create and reproduce Derivative Works;
- c. to distribute copies or phonorecords of, display publicly, perform
- publicly, and perform publicly by means of a digital audio
- transmission the Work including as incorporated in Collective
- Works;
- d. to distribute copies or phonorecords of, display publicly, perform
- publicly, and perform publicly by means of a digital audio
- transmission Derivative Works.
- e. For the avoidance of doubt, where the work is a musical
- composition:
- i. Performance Royalties Under Blanket Licenses. Licensor waives
- the exclusive right to collect, whether individually or via a
- performance rights society (e.g. ASCAP, BMI, SESAC),
- royalties for the public performance or public digital
- performance (e.g. webcast) of the Work.
- ii. Mechanical Rights and Statutory Royalties. Licensor waives
- the exclusive right to collect, whether individually or via a
- music rights society or designated agent (e.g. Harry Fox
- Agency), royalties for any phonorecord You create from the
- Work ("cover version") and distribute, subject to the
- compulsory license created by 17 USC Section 115 of the US
- Copyright Act (or the equivalent in other jurisdictions).
- f. Webcasting Rights and Statutory Royalties. For the avoidance of
- doubt, where the Work is a sound recording, Licensor waives the
- exclusive right to collect, whether individually or via a
- performance-rights society (e.g. SoundExchange), royalties for the
- public digital performance (e.g. webcast) of the Work, subject to
- the compulsory license created by 17 USC Section 114 of the US
- Copyright Act (or the equivalent in other jurisdictions).
-
- The above rights may be exercised in all media and formats whether now
- known or hereafter devised. The above rights include the right to make
- such modifications as are technically necessary to exercise the rights
- in other media and formats. All rights not expressly granted by
- Licensor are hereby reserved.
-
- 4. Restrictions.The license granted in Section 3 above is expressly
- made subject to and limited by the following restrictions:
- a. You may distribute, publicly display, publicly perform, or
- publicly digitally perform the Work only under the terms of this
- License, and You must include a copy of, or the Uniform Resource
- Identifier for, this License with every copy or phonorecord of the
- Work You distribute, publicly display, publicly perform, or
- publicly digitally perform. You may not offer or impose any terms
- on the Work that alter or restrict the terms of this License or
- the recipients' exercise of the rights granted hereunder. You may
- not sublicense the Work. You must keep intact all notices that
- refer to this License and to the disclaimer of warranties. You may
- not distribute, publicly display, publicly perform, or publicly
- digitally perform the Work with any technological measures that
- control access or use of the Work in a manner inconsistent with
- the terms of this License Agreement. The above applies to the Work
- as incorporated in a Collective Work, but this does not require
- the Collective Work apart from the Work itself to be made subject
- to the terms of this License. If You create a Collective Work,
- upon notice from any Licensor You must, to the extent practicable,
- remove from the Collective Work any reference to such Licensor or
- the Original Author, as requested. If You create a Derivative
- Work, upon notice from any Licensor You must, to the extent
- practicable, remove from the Derivative Work any reference to such
- Licensor or the Original Author, as requested.
- b. You may distribute, publicly display, publicly perform, or
- publicly digitally perform a Derivative Work only under the terms
- of this License, a later version of this License with the same
- License Elements as this License, or a Creative Commons iCommons
- license that contains the same License Elements as this License
- (e.g. Attribution-ShareAlike 2.0 Japan). You must include a copy
- of, or the Uniform Resource Identifier for, this License or other
- license specified in the previous sentence with every copy or
- phonorecord of each Derivative Work You distribute, publicly
- display, publicly perform, or publicly digitally perform. You may
- not offer or impose any terms on the Derivative Works that alter
- or restrict the terms of this License or the recipients' exercise
- of the rights granted hereunder, and You must keep intact all
- notices that refer to this License and to the disclaimer of
- warranties. You may not distribute, publicly display, publicly
- perform, or publicly digitally perform the Derivative Work with
- any technological measures that control access or use of the Work
- in a manner inconsistent with the terms of this License Agreement.
- The above applies to the Derivative Work as incorporated in a
- Collective Work, but this does not require the Collective Work
- apart from the Derivative Work itself to be made subject to the
- terms of this License.
- c. If you distribute, publicly display, publicly perform, or publicly
- digitally perform the Work or any Derivative Works or Collective
- Works, You must keep intact all copyright notices for the Work and
- give the Original Author credit reasonable to the medium or means
- You are utilizing by conveying the name (or pseudonym if
- applicable) of the Original Author if supplied; the title of the
- Work if supplied; to the extent reasonably practicable, the
- Uniform Resource Identifier, if any, that Licensor specifies to be
- associated with the Work, unless such URI does not refer to the
- copyright notice or licensing information for the Work; and in the
- case of a Derivative Work, a credit identifying the use of the
- Work in the Derivative Work (e.g., "French translation of the Work
- by Original Author," or "Screenplay based on original Work by
- Original Author"). Such credit may be implemented in any
- reasonable manner; provided, however, that in the case of a
- Derivative Work or Collective Work, at a minimum such credit will
- appear where any other comparable authorship credit appears and in
- a manner at least as prominent as such other comparable authorship
- credit.
-
- 5. Representations, Warranties and Disclaimer
-
- UNLESS OTHERWISE AGREED TO BY THE PARTIES IN WRITING, LICENSOR OFFERS
- THE WORK AS-IS AND MAKES NO REPRESENTATIONS OR WARRANTIES OF ANY KIND
- CONCERNING THE MATERIALS, EXPRESS, IMPLIED, STATUTORY OR OTHERWISE,
- INCLUDING, WITHOUT LIMITATION, WARRANTIES OF TITLE, MERCHANTIBILITY,
- FITNESS FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR THE ABSENCE OF
- LATENT OR OTHER DEFECTS, ACCURACY, OR THE PRESENCE OF ABSENCE OF
- ERRORS, WHETHER OR NOT DISCOVERABLE. SOME JURISDICTIONS DO NOT ALLOW
- THE EXCLUSION OF IMPLIED WARRANTIES, SO SUCH EXCLUSION MAY NOT APPLY
- TO YOU.
-
- 6. Limitation on Liability. EXCEPT TO THE EXTENT REQUIRED BY
- APPLICABLE LAW, IN NO EVENT WILL LICENSOR BE LIABLE TO YOU ON ANY
- LEGAL THEORY FOR ANY SPECIAL, INCIDENTAL, CONSEQUENTIAL, PUNITIVE OR
- EXEMPLARY DAMAGES ARISING OUT OF THIS LICENSE OR THE USE OF THE WORK,
- EVEN IF LICENSOR HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
- 7. Termination
- a. This License and the rights granted hereunder will terminate
- automatically upon any breach by You of the terms of this License.
- Individuals or entities who have received Derivative Works or
- Collective Works from You under this License, however, will not
- have their licenses terminated provided such individuals or
- entities remain in full compliance with those licenses. Sections
- 1, 2, 5, 6, 7, and 8 will survive any termination of this License.
- b. Subject to the above terms and conditions, the license granted
- here is perpetual (for the duration of the applicable copyright in
- the Work). Notwithstanding the above, Licensor reserves the right
- to release the Work under different license terms or to stop
- distributing the Work at any time; provided, however that any such
- election will not serve to withdraw this License (or any other
- license that has been, or is required to be, granted under the
- terms of this License), and this License will continue in full
- force and effect unless terminated as stated above.
-
- 8. Miscellaneous
- a. Each time You distribute or publicly digitally perform the Work or
- a Collective Work, the Licensor offers to the recipient a license
- to the Work on the same terms and conditions as the license
- granted to You under this License.
- b. Each time You distribute or publicly digitally perform a
- Derivative Work, Licensor offers to the recipient a license to the
- original Work on the same terms and conditions as the license
- granted to You under this License.
- c. If any provision of this License is invalid or unenforceable under
- applicable law, it shall not affect the validity or enforceability
- of the remainder of the terms of this License, and without further
- action by the parties to this agreement, such provision shall be
- reformed to the minimum extent necessary to make such provision
- valid and enforceable.
- d. No term or provision of this License shall be deemed waived and no
- breach consented to unless such waiver or consent shall be in
- writing and signed by the party to be charged with such waiver or
- consent.
- e. This License constitutes the entire agreement between the parties
- with respect to the Work licensed here. There are no
- understandings, agreements or representations with respect to the
- Work not specified here. Licensor shall not be bound by any
- additional provisions that may appear in any communication from
- You. This License may not be modified without the mutual written
- agreement of the Licensor and You.
-
- Creative Commons is not a party to this License, and makes no warranty
- whatsoever in connection with the Work. Creative Commons will not be
- liable to You or any party on any legal theory for any damages
- whatsoever, including without limitation any general, special,
- incidental or consequential damages arising in connection to this
- license. Notwithstanding the foregoing two (2) sentences, if Creative
- Commons has expressly identified itself as the Licensor hereunder, it
- shall have all rights and obligations of Licensor.
-
- Except for the limited purpose of indicating to the public that the
- Work is licensed under the CCPL, neither party will use the trademark
- "Creative Commons" or any related trademark or logo of Creative
- Commons without the prior written consent of Creative Commons. Any
- permitted use will be in compliance with Creative Commons'
- then-current trademark usage guidelines, as may be published on its
- website or otherwise made available upon request from time to time.
-
- Creative Commons may be contacted at [2]http://creativecommons.org/.
-
- [3]« Back to Commons Deed
-
-References
-
- 1. http://creativecommons.org/
- 2. http://creativecommons.org/
- 3. http://creativecommons.org/licenses/by-sa/2.0/
diff --git a/icons/tryton-project.svg b/icons/tryton-project.svg
deleted file mode 100644
index 58a8013..0000000
--- a/icons/tryton-project.svg
+++ /dev/null
@@ -1,327 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg
- xmlns:dc="http://purl.org/dc/elements/1.1/"
- xmlns:cc="http://web.resource.org/cc/"
- xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:svg="http://www.w3.org/2000/svg"
- xmlns="http://www.w3.org/2000/svg"
- xmlns:xlink="http://www.w3.org/1999/xlink"
- xmlns:sodipodi="http://inkscape.sourceforge.net/DTD/sodipodi-0.dtd"
- xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- width="48"
- height="48"
- id="svg2"
- sodipodi:version="0.32"
- inkscape:version="0.43+devel"
- version="1.0"
- sodipodi:docbase="/home/tigert/cvs/freedesktop.org/tango-icon-theme/scalable/categories"
- sodipodi:docname="applications-development.svg"
- inkscape:output_extension="org.inkscape.output.svg.inkscape">
- <defs
- id="defs4">
- <linearGradient
- inkscape:collect="always"
- id="linearGradient2807">
- <stop
- style="stop-color:#ffffff;stop-opacity:1;"
- offset="0"
- id="stop2809" />
- <stop
- style="stop-color:#ffffff;stop-opacity:0;"
- offset="1"
- id="stop2811" />
- </linearGradient>
- <linearGradient
- id="linearGradient18284">
- <stop
- style="stop-color:#000000;stop-opacity:1;"
- offset="0"
- id="stop18286" />
- <stop
- id="stop20913"
- offset="0.5"
- style="stop-color:#000000;stop-opacity:1;" />
- <stop
- id="stop19165"
- offset="1"
- style="stop-color:#000000;stop-opacity:0;" />
- </linearGradient>
- <linearGradient
- id="linearGradient11202">
- <stop
- style="stop-color:#c4a000;stop-opacity:1;"
- offset="0"
- id="stop11204" />
- <stop
- style="stop-color:#c4a000;stop-opacity:0;"
- offset="1"
- id="stop11206" />
- </linearGradient>
- <linearGradient
- id="linearGradient8543">
- <stop
- style="stop-color:#fffef5;stop-opacity:0.94117647;"
- offset="0"
- id="stop8545" />
- <stop
- style="stop-color:#fce94f;stop-opacity:0;"
- offset="1"
- id="stop8547" />
- </linearGradient>
- <linearGradient
- id="linearGradient5012">
- <stop
- style="stop-color:#fdf188;stop-opacity:1;"
- offset="0"
- id="stop5014" />
- <stop
- style="stop-color:#d3bc00;stop-opacity:1;"
- offset="1"
- id="stop5016" />
- </linearGradient>
- <radialGradient
- inkscape:collect="always"
- xlink:href="#linearGradient5012"
- id="radialGradient7666"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.136507,-2.396132e-18,-4.484926e-5,7.137743e-2,-23.39816,12.31028)"
- cx="336.73767"
- cy="-72.420044"
- fx="336.73767"
- fy="-72.420044"
- r="297.21338" />
- <radialGradient
- inkscape:collect="always"
- xlink:href="#linearGradient8543"
- id="radialGradient8549"
- cx="420.87839"
- cy="685.99139"
- fx="420.87839"
- fy="685.99139"
- r="235.88632"
- gradientTransform="matrix(0.163532,-1.065754e-2,1.078108e-2,0.165425,-46.18187,-65.65506)"
- gradientUnits="userSpaceOnUse" />
- <radialGradient
- inkscape:collect="always"
- xlink:href="#linearGradient8543"
- id="radialGradient9434"
- cx="500.97794"
- cy="286.46918"
- fx="500.97794"
- fy="286.46918"
- r="40.975471"
- gradientTransform="matrix(0.224796,1.017229e-2,-9.759474e-3,0.215674,-73.87964,-54.89804)"
- gradientUnits="userSpaceOnUse" />
- <radialGradient
- inkscape:collect="always"
- xlink:href="#linearGradient8543"
- id="radialGradient10317"
- cx="293.81989"
- cy="243.06874"
- fx="293.81989"
- fy="243.06874"
- r="48.782982"
- gradientTransform="matrix(0.272962,-7.1724e-2,5.616202e-2,0.213737,-78.54657,-24.30491)"
- gradientUnits="userSpaceOnUse" />
- <radialGradient
- inkscape:collect="always"
- xlink:href="#linearGradient11202"
- id="radialGradient11208"
- cx="424.99243"
- cy="270.67969"
- fx="424.99243"
- fy="270.67969"
- r="38.451698"
- gradientTransform="matrix(8.174351e-2,1.024998e-2,-4.335971e-2,0.345793,6.123413,-84.50421)"
- gradientUnits="userSpaceOnUse" />
- <radialGradient
- inkscape:collect="always"
- xlink:href="#linearGradient8543"
- id="radialGradient13895"
- cx="340.35886"
- cy="409.83737"
- fx="340.35886"
- fy="409.83737"
- r="103.26014"
- gradientTransform="matrix(0.105628,-4.514018e-2,6.692574e-2,0.156607,-46.01605,-24.35485)"
- gradientUnits="userSpaceOnUse" />
- <radialGradient
- inkscape:collect="always"
- xlink:href="#linearGradient18284"
- id="radialGradient18290"
- cx="29.898689"
- cy="45.673546"
- fx="29.898689"
- fy="45.673546"
- r="30.365856"
- gradientTransform="matrix(1,0,2.702168e-19,0.415385,-2.283104e-16,26.70146)"
- gradientUnits="userSpaceOnUse" />
- <radialGradient
- inkscape:collect="always"
- xlink:href="#linearGradient8543"
- id="radialGradient2798"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.101953,-4.272301e-2,9.621296e-2,0.229599,-48.67227,-64.24148)"
- cx="131.23691"
- cy="424.15677"
- fx="131.23691"
- fy="424.15677"
- r="35.934704" />
- <radialGradient
- inkscape:collect="always"
- xlink:href="#linearGradient2807"
- id="radialGradient2813"
- cx="15.491823"
- cy="10.943316"
- fx="15.491823"
- fy="10.943316"
- r="18.370251"
- gradientTransform="matrix(1.402663,1.176399e-16,-9.356816e-17,1.115648,-6.237984,5.33075e-2)"
- gradientUnits="userSpaceOnUse" />
- </defs>
- <sodipodi:namedview
- id="base"
- pagecolor="#ffffff"
- bordercolor="#666666"
- borderopacity="0.13333333"
- inkscape:pageopacity="0.0"
- inkscape:pageshadow="2"
- inkscape:zoom="11.313708"
- inkscape:cx="24.942255"
- inkscape:cy="29.100296"
- inkscape:document-units="px"
- inkscape:current-layer="layer1"
- inkscape:window-width="906"
- inkscape:window-height="987"
- inkscape:window-x="635"
- inkscape:window-y="114"
- inkscape:showpageshadow="false"
- stroke="#c4a000" />
- <metadata
- id="metadata7">
- <rdf:RDF>
- <cc:Work
- rdf:about="">
- <dc:format>image/svg+xml</dc:format>
- <dc:type
- rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
- <dc:contributor>
- <cc:Agent>
- <dc:title>Henrik Andersen</dc:title>
- </cc:Agent>
- </dc:contributor>
- <dc:title>Developer Tools</dc:title>
- <dc:subject>
- <rdf:Bag>
- <rdf:li>developer</rdf:li>
- <rdf:li>dev</rdf:li>
- <rdf:li>tool</rdf:li>
- <rdf:li>make</rdf:li>
- <rdf:li>compile</rdf:li>
- <rdf:li>build</rdf:li>
- <rdf:li>code</rdf:li>
- <rdf:li>hacker</rdf:li>
- </rdf:Bag>
- </dc:subject>
- <dc:creator>
- <cc:Agent>
- <dc:title>Jakub Steiner</dc:title>
- </cc:Agent>
- </dc:creator>
- <dc:source>http://jimmac.musichall.cz</dc:source>
- <cc:license
- rdf:resource="http://creativecommons.org/licenses/by-sa/2.0/" />
- </cc:Work>
- <cc:License
- rdf:about="http://creativecommons.org/licenses/by-sa/2.0/">
- <cc:permits
- rdf:resource="http://web.resource.org/cc/Reproduction" />
- <cc:permits
- rdf:resource="http://web.resource.org/cc/Distribution" />
- <cc:requires
- rdf:resource="http://web.resource.org/cc/Notice" />
- <cc:requires
- rdf:resource="http://web.resource.org/cc/Attribution" />
- <cc:permits
- rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
- <cc:requires
- rdf:resource="http://web.resource.org/cc/ShareAlike" />
- </cc:License>
- </rdf:RDF>
- </metadata>
- <g
- inkscape:label="Layer 1"
- id="layer1"
- inkscape:groupmode="layer">
- <path
- sodipodi:type="arc"
- style="opacity:1;fill:url(#radialGradient18290);fill-opacity:1;stroke:none;stroke-width:12.39700031;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
- id="path17409"
- sodipodi:cx="29.898689"
- sodipodi:cy="45.673546"
- sodipodi:rx="30.365856"
- sodipodi:ry="12.613509"
- d="M 60.264545 45.673546 A 30.365856 12.613509 0 1 1 -0.4671669,45.673546 A 30.365856 12.613509 0 1 1 60.264545 45.673546 z"
- transform="matrix(0.742527,0,-5.812964e-2,1.428611,4.500517,-36.68345)" />
- <path
- style="fill:url(#radialGradient7666);fill-opacity:1;stroke:#c4a000;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
- d="M 23.152758,1.1801876 C 20.380218,1.2190783 17.86582,1.8908769 15.634281,3.0196314 C 14.541531,5.1714614 10.9437,7.7293655 9.4689484,8.0015561 C 6.5691703,11.460832 4.6887193,15.805035 3.9754523,19.98162 C 3.9750148,19.984183 3.9758889,19.986781 3.9754523,19.989343 C 2.7890929,21.53906 2.2854415,23.385937 2.5981051,25.521903 C 3.7192795,33.181217 5.8802729,40.410195 10.783201,42.078178 C 17.93763,44.512124 32.65497,43.864025 35.912708,42.536436 C 43.051738,39.62715 43.684161,33.251338 44.80414,25.75618 C 45.109694,23.711348 44.659305,21.914978 43.573539,20.383238 C 43.564583,20.327636 43.555052,20.271764 43.54522,20.215896 C 42.763966,15.777007 40.697859,11.326849 37.602582,7.8466935 C 35.508773,7.62926 31.462964,4.270333 30.483158,2.6229925 C 28.330506,1.7020155 25.961342,1.1801876 23.407632,1.1801876 C 23.322311,1.1801876 23.237595,1.178998 23.152758,1.1801876 z "
- id="path3120"
- sodipodi:nodetypes="cccscsssscsccsc" />
- <path
- style="fill:url(#radialGradient8549);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;opacity:0.66666667"
- d="M 43.629688,22.792984 C 39.033494,39.233217 10.438199,40.802737 3.7832765,23.04227 C 3.7410682,39.366403 10.103414,44.083889 28.189955,43.247454 C 31.251932,43.106765 38.199775,43.290321 42.804439,34.110678 C 45.042804,22.600278 43.629688,22.792984 43.629688,22.792984 z "
- id="path7668"
- sodipodi:nodetypes="ccscc" />
- <path
- style="fill:url(#radialGradient9434);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- d="M 34.691565,7.6783057 L 37.192446,8.8037033 C 37.192446,8.8037033 35.882042,18.926343 30.52343,25.288675 C 32.295095,18.832841 34.712405,7.6783057 34.691565,7.6783057 z "
- id="path8553"
- sodipodi:nodetypes="cccc" />
- <path
- style="fill:url(#radialGradient10317);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- d="M 15.872437,4.1562328 C 17.372967,13.221927 22.374727,23.642261 21.874552,24.163278 C 17.289604,17.181654 15.372261,11.242061 13.871732,6.2403001 C 13.871732,6.1569366 15.872437,4.1770734 15.872437,4.1562328 z "
- id="path9436"
- sodipodi:nodetypes="cccc" />
- <path
- style="fill:url(#radialGradient11208);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- d="M 30.21082,3.8227818 C 26.126047,20.328594 25.959322,23.079563 25.959322,23.079563 C 25.959322,23.079563 32.294888,6.3236627 32.294888,5.9068495 C 32.294888,5.9068487 30.710997,4.4063209 30.21082,3.8227818 z "
- id="path10319"
- sodipodi:nodetypes="ccsc" />
- <flowRoot
- xml:space="preserve"
- id="flowRoot12974"><flowRegion
- id="flowRegion12976"><rect
- id="rect12978"
- width="40.055775"
- height="16.02231"
- x="86.787514"
- y="412.80496" /></flowRegion><flowPara
- id="flowPara12980" /></flowRoot> <path
- style="fill:url(#radialGradient13895);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- d="M 16.18209,34.476182 L 16.137416,24.906437 L 30.631143,24.906437 L 32.273747,23.642895 L 15.342282,23.642895 L 15.386956,34.283476 L 16.18209,34.476182 z "
- id="path13014"
- sodipodi:nodetypes="ccccccc" />
- <path
- style="fill:#958401;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- d="M 31.043495,24.81709 L 31.125176,34.621701 L 31.81132,34.406959 L 31.823298,23.553549 L 31.043495,24.81709 z "
- id="path13897"
- sodipodi:nodetypes="ccccc" />
- <path
- style="fill:url(#radialGradient2798);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- d="M 4.2551267,24.106065 C 4.2551267,24.106065 6.571777,32.221754 14.476068,32.872102 C 15.581676,35.36252 13.341098,36.996703 13.341098,36.996703 L 9.7315781,36.745641 C 9.7315781,36.745641 3.4928036,28.752699 3.2433694,26.844759 C 2.9939369,24.936822 3.4066529,23.436966 3.4066529,23.436966 L 4.2551267,24.106065 z "
- id="path16526"
- sodipodi:nodetypes="ccccscc" />
- <path
- sodipodi:nodetypes="cccscsssscsccsc"
- id="path2703"
- d="M 23.184204,2.3889904 C 20.570275,2.4256563 18.199721,3.0590226 16.095844,4.1232033 C 15.065608,6.1519314 11.673602,8.563503 10.283218,8.8201221 C 7.5493302,12.0815 5.776456,16.17718 5.1039936,20.11483 C 5.1035812,20.117247 5.1044052,20.119696 5.1039936,20.122112 C 3.9855035,21.583172 3.2455,23.368587 3.5402767,25.382359 C 4.597311,32.603499 6.4678792,39.092036 10.868256,41.021813 C 16.791397,43.619395 32.407978,42.807748 35.479348,41.556108 C 42.209968,38.813256 42.541047,32.625414 43.596954,25.559039 C 43.885028,23.631188 43.460404,21.937585 42.436753,20.493473 C 42.428309,20.441052 42.419324,20.388376 42.410054,20.335704 C 41.673494,16.150755 39.725585,11.955182 36.807382,8.6741189 C 34.833356,8.4691243 31.019,5.3023548 30.095246,3.7492553 C 28.065743,2.8809656 25.832115,2.3889904 23.424497,2.3889904 C 23.344057,2.3889904 23.264188,2.3878689 23.184204,2.3889904 z "
- style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:0.99999976;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;opacity:0.74444444" />
- <path
- style="fill:url(#radialGradient2813);fill-opacity:1.0;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;opacity:0.59444444"
- d="M 22.59375,2.78125 C 20.264193,2.8978182 18.152779,3.5062884 16.25,4.46875 C 15.239275,6.4590559 11.895302,8.841991 10.53125,9.09375 C 7.8491405,12.293361 6.1284766,16.293174 5.46875,20.15625 C 5.4683454,20.15862 5.4691538,20.18513 5.46875,20.1875 C 4.3714431,21.62089 4.0107233,23.778648 4.0107233,23.778648 C 8.6959903,27.38371 11.652335,23.99254 18.329596,21.761428 C 30.928876,23.684569 37.077934,20.765483 40.84375,16.09375 C 40.850609,16.085241 40.840294,16.072869 40.84375,16.0625 C 39.852567,13.479666 38.411479,11.016387 36.5625,8.9375 C 34.62586,8.7363873 30.875008,5.6486852 29.96875,4.125 C 27.977684,3.2731547 25.79952,2.78125 23.4375,2.78125 C 23.358584,2.7812501 23.265969,2.7801497 23.1875,2.78125 C 22.987154,2.7840603 22.79117,2.7713713 22.59375,2.78125 z "
- id="path2800"
- sodipodi:nodetypes="cccssccscccssc" />
- </g>
-</svg>
commit 15182b19738f4b97ae06df1ffe01bf0630585374
Author: Daniel Baumann <daniel at debian.org>
Date: Sun Jul 10 16:01:11 2011 +0200
Not wrapping uploaders field, it does not exceed 80 chars.
diff --git a/debian/control b/debian/control
index 09d545b..e590e8d 100644
--- a/debian/control
+++ b/debian/control
@@ -2,9 +2,7 @@ Source: tryton-modules-project
Section: python
Priority: optional
Maintainer: Debian Tryton Maintainers <tryton at lists.debian-maintainers.org>
-Uploaders:
- Daniel Baumann <daniel at debian.org>,
- Mathias Behrle <mathiasb at m9s.biz>
+Uploaders: Daniel Baumann <daniel at debian.org>, Mathias Behrle <mathiasb at m9s.biz>
Dm-Upload-Allowed: yes
Build-Depends: debhelper (>= 8), python, python-setuptools, python-support
Standards-Version: 3.9.2
commit 5503fa5c3883b6ba64de8613da4f90067a6205ca
Author: Daniel Baumann <daniel at debian.org>
Date: Sun Jul 10 15:54:40 2011 +0200
Compacting copyright file.
diff --git a/debian/copyright b/debian/copyright
index 8b83b5d..25d75e9 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,33 +1,15 @@
-Upstream-Contact: Tryton project <tryton at googlegroups.com>
-Upstream-Homepage: http://downloads.tryton.org/
-Maintainer-Contact: Debian Tryton Maintainers <tryton at lists.debian-maintainers.org>
-Maintainer-Homepage: http://tryton.debian-maintainers.org/
-
Files: *
Copyright:
(C) 2008-2011 Cedric Krier
(C) 2008-2011 B2CK SPRL
(C) 2009-2011 Bertrand Chenal
License: GPL-3+
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 3 of the License, or
- (at your option) any later version.
- .
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- .
- You should have received a copy of the GNU General Public License
- along with this program. If not, see <http://www.gnu.org/licenses/>.
- .
- On Debian systems, the complete text of the GNU General Public License
- can be found in /usr/share/common-licenses/GPL-3 file.
Files: debian/*
Copyright: (C) 2009-2011 Daniel Baumann <daniel at debian.org>
License: GPL-3+
+
+License: GPL-3+
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
@@ -41,5 +23,5 @@ License: GPL-3+
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
.
- On Debian systems, the complete text of the GNU General Public License
+ The complete text of the GNU General Public License
can be found in /usr/share/common-licenses/GPL-3 file.
commit d5a94dc25c1403e73ad30db1113404e2185095ab
Author: Daniel Baumann <daniel at debian.org>
Date: Sun Jul 10 15:38:55 2011 +0200
Adding options for source package.
diff --git a/debian/source/options b/debian/source/options
new file mode 100644
index 0000000..d053b65
--- /dev/null
+++ b/debian/source/options
@@ -0,0 +1,2 @@
+compression = gzip
+compression-level = 9
commit e31c9314cf2c6358d67d29802d2f845372b1588a
Author: Daniel Baumann <daniel at debian.org>
Date: Sun Jul 10 15:38:03 2011 +0200
Removing for new source package version obsoleted README.source file.
diff --git a/debian/README.source b/debian/README.source
deleted file mode 100644
index 18b6b24..0000000
--- a/debian/README.source
+++ /dev/null
@@ -1,37 +0,0 @@
-Package Repositories
---------------------
-
-Backports for the current stable debian distribution as well as snapshots of
-unreleased versions may be available in repositories listed on the maintainers
-homepage. The current URL of the maintainer homepage can be seen in
-debian/copyright.
-
-
-Source Access
--------------
-
-You can obtain the sources of this package with:
-
- $ apt-get source ${PACKAGE}
-
-whereas '${PACKAGE}' has to be replaced with the actual name of the package.
-
-This package is maintained with the Git version control system. The current git
-source tree can be obtained with:
-
- $ git clone ${GIT_URI}
-
-whereas '${GIT_URI}' has to be replaced with the actual URI for the Git
-repository. The current Git URI can be seen in debian/control in the extracted
-package sources.
-
-More information about Git can be found in the git-core package.
-
-This package may use the Quilt patch system to manage all modifications to the
-upstream source. Changes, if any, are stored in the source package as diffs in
-debian/diff and are applied during the build. Current modifications can be
-applied to the source tree with:
-
- $ QUILT_PATCHES=debian/patches quilt push -a
-
-More information about Quilt can be found in the quilt package.
commit 20f10cfc9b5fd36f4a70b4e2a060672b85be8009
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Tue May 24 21:40:05 2011 +0200
Releasing debian version 2.0.0-1.
diff --git a/debian/changelog b/debian/changelog
index ca81585..e6ffac0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+tryton-modules-project (2.0.0-1) unstable; urgency=low
+
+ * Updating to standards version 3.9.2.
+ * Merging upstream version 2.0.0.
+ * Updating Copyright.
+ * Updating versioned tryton depends to 2.0.
+
+ -- Mathias Behrle <mathiasb at m9s.biz> Tue, 24 May 2011 21:35:38 +0200
+
tryton-modules-project (1.8.0-2) unstable; urgency=low
* Changing my email address.
commit 7d5ea2ec8216a0f3ddc99e2979106f01c8e3683a
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Tue May 24 21:21:34 2011 +0200
Updating versioned tryton depends to 2.0.
diff --git a/debian/control b/debian/control
index 02da47c..09d545b 100644
--- a/debian/control
+++ b/debian/control
@@ -15,8 +15,8 @@ Vcs-Git: git://git.debian-maintainers.org/git/tryton/tryton-modules-project.git
Package: tryton-modules-project
Architecture: all
Depends:
- ${misc:Depends}, ${python:Depends}, tryton-server (>= 1.8),
- tryton-modules-party (>= 1.8), tryton-modules-timesheet (>= 1.8),
+ ${misc:Depends}, ${python:Depends}, tryton-server (>= 2.0),
+ tryton-modules-party (>= 2.0), tryton-modules-timesheet (>= 2.0),
python-pkg-resources
XB-Python-Version: ${python:Versions}
Description: Tryton Application Platform (Project Module)
commit 3129e3a5b89e1a75bcece78bfe6ebe57b611e126
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Tue May 24 20:40:04 2011 +0200
Updating Copyright.
diff --git a/debian/copyright b/debian/copyright
index 2ca7de1..8b83b5d 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -5,9 +5,9 @@ Maintainer-Homepage: http://tryton.debian-maintainers.org/
Files: *
Copyright:
- (C) 2008-2010 Cedric Krier
- (C) 2008-2010 B2CK SPRL
- (C) 2009-2010 Bertrand Chenal
+ (C) 2008-2011 Cedric Krier
+ (C) 2008-2011 B2CK SPRL
+ (C) 2009-2011 Bertrand Chenal
License: GPL-3+
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
commit 0ccbe31a7c32a5b9788093ca72fa24bd363b7942
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Tue May 24 19:12:57 2011 +0200
Merging upstream version 2.0.0.
diff --git a/CHANGELOG b/CHANGELOG
index 505414f..b7dc78f 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 2.0.0 - 2011-04-27
+* Bug fixes (see mercurial logs for details)
+
Version 1.8.0 - 2010-11-01
* Bug fixes (see mercurial logs for details)
diff --git a/COPYRIGHT b/COPYRIGHT
index ab06914..2ff157b 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,6 +1,6 @@
-Copyright (C) 2008-2010 Cédric Krier.
-Copyright (C) 2008-2010 B2CK SPRL.
-Copyright (C) 2009-2010 Bertrand Chenal.
+Copyright (C) 2008-2011 Cédric Krier.
+Copyright (C) 2008-2011 B2CK SPRL.
+Copyright (C) 2009-2011 Bertrand Chenal.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff --git a/MANIFEST.in b/MANIFEST.in
index dcb2afa..47da692 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -8,3 +8,4 @@ include *.xml
include *.odt
include *.csv
include doc/*
+include icons/*
diff --git a/PKG-INFO b/PKG-INFO
index d5e1603..7841eb8 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.0
Name: trytond_project
-Version: 1.8.0
+Version: 2.0.0
Summary: Project Module with:
- Project management
@@ -8,7 +8,7 @@ Home-page: http://www.tryton.org/
Author: B2CK
Author-email: info at b2ck.com
License: GPL-3
-Download-URL: http://downloads.tryton.org/1.8/
+Download-URL: http://downloads.tryton.org/2.0/
Description: UNKNOWN
Platform: UNKNOWN
Classifier: Development Status :: 5 - Production/Stable
@@ -18,9 +18,13 @@ Classifier: Intended Audience :: Financial and Insurance Industry
Classifier: Intended Audience :: Legal Industry
Classifier: Intended Audience :: Manufacturing
Classifier: License :: OSI Approved :: GNU General Public License (GPL)
+Classifier: Natural Language :: Bulgarian
Classifier: Natural Language :: English
Classifier: Natural Language :: French
Classifier: Natural Language :: German
+Classifier: Natural Language :: Spanish
Classifier: Operating System :: OS Independent
-Classifier: Programming Language :: Python
+Classifier: Programming Language :: Python :: 2.5
+Classifier: Programming Language :: Python :: 2.6
+Classifier: Programming Language :: Python :: 2.7
Classifier: Topic :: Office/Business
diff --git a/__tryton__.py b/__tryton__.py
index d3a9cae..1dc5653 100644
--- a/__tryton__.py
+++ b/__tryton__.py
@@ -2,17 +2,21 @@
#this repository contains the full copyright notices and license terms.
{
'name': 'Project',
+ 'name_bg_BG': 'Проект',
'name_de_DE': 'Projekte',
'name_es_CO': 'Proyectos',
'name_es_ES': 'Proyecto',
'name_fr_FR': 'Projet',
- 'version': '1.8.0',
+ 'version': '2.0.0',
'author': 'B2CK',
'email': 'info at b2ck.com',
'website': 'http://www.tryton.org/',
'description': '''Project Module with:
- Project management
''',
+ 'description_bg_BG': '''Модул за проекти Ñ:
+ - Управление на проекти
+''',
'description_de_DE': '''Projektmodul für:
- Projektverwaltung
''',
@@ -36,6 +40,7 @@
'work.xml',
],
'translation': [
+ 'bg_BG.csv',
'de_DE.csv',
'es_CO.csv',
'es_ES.csv',
diff --git a/bg_BG.csv b/bg_BG.csv
new file mode 100644
index 0000000..8a41b4c
--- /dev/null
+++ b/bg_BG.csv
@@ -0,0 +1,44 @@
+type,name,res_id,src,value,fuzzy
+error,project.work,0,There should be only one timesheet work by task/project!,Задача/проект може да имат Ñамо един график за дейноÑÑ‚!,0
+field,"project.work,children",0,Children,Деца,0
+field,"project.work,comment",0,Comment,Коментар,0
+field,"project.work,effort",0,Effort,УÑлие,0
+field,"project.work,parent",0,Parent,Родител,0
+field,"project.work,party",0,Party,Партньор,0
+field,"project.work,party_address",0,Contact Address,ÐÐ´Ñ€ÐµÑ Ð·Ð° контакт,0
+field,"project.work,rec_name",0,Name,Име,0
+field,"project.work,state",0,State,СъÑтоÑние,0
+field,"project.work,total_effort",0,Total Effort,Общо уÑилиÑ,0
+field,"project.work,type",0,Type,Вид,0
+field,"project.work,work",0,Work,Задача,0
+field,"timesheet.work,sequence",0,Sequence,ПоÑледователноÑÑ‚,0
+field,"timesheet.work,timesheet_lines",0,Timesheet Lines,Редове от график,0
+help,"project.work,effort",0,Estimated Effort for this work,Оценка на уÑилиÑта за тази работа,0
+help,"project.work,total_effort",0,Estimated total effort for this work and the sub-works,Предполагаеми общо уÑÐ¸Ð»Ð¸Ñ Ð·Ð° тази задача и подзадачите,0
+model,"ir.action,name",act_open_child_work,Tasks,Задачи,0
+model,"ir.action,name",act_project_form,Projects,Проекти,0
+model,"ir.action,name",act_task_form,Tasks,Задачи,0
+model,"ir.action,name",act_work_form,Works,ДейноÑти,0
+model,"ir.action,name",act_work_form_new,Works Efforts,Задачи,0
+model,"ir.action,name",act_work_tree,Works Efforts,Задачи,0
+model,"ir.ui.menu,name",,Works Efforts,ДейноÑти,0
+model,"ir.ui.menu,name",menu_configuration,Configuration,КонфигурациÑ,0
+model,"ir.ui.menu,name",menu_project,Project Management,Управление на проекти,0
+model,"ir.ui.menu,name",menu_project_form,Projects,Проекти,0
+model,"ir.ui.menu,name",menu_project_tree,Projects,Проекти,0
+model,"ir.ui.menu,name",menu_task_form,Tasks,Задачи,0
+model,"ir.ui.menu,name",menu_work_form_new,New Work Effort,Ðова дейноÑÑ‚,0
+model,"ir.ui.menu,name",menu_work_tree,Works Efforts,Задачи,0
+model,"project.work,name",0,Work Effort,ДейноÑÑ‚,0
+model,"res.group,name",group_project_admin,Project Administration,Управление на проекти,0
+selection,"project.work,state",0,Done,Приключен,0
+selection,"project.work,state",0,Opened,Отворен,0
+selection,"project.work,type",0,Project,Проект,0
+selection,"project.work,type",0,Task,Задача,0
+view,project.work,0,Children,Деца,0
+view,project.work,0,General,ОÑновен,0
+view,project.work,0,Projects,Проекти,0
+view,project.work,0,Tasks,Задачи,0
+view,project.work,0,Timesheet,График,0
+view,project.work,0,Work Efforts,ДейноÑти,0
+view,project.work,0,Works Efforts,ДейноÑти,0
diff --git a/de_DE.csv b/de_DE.csv
index bb0eaaa..e458356 100644
--- a/de_DE.csv
+++ b/de_DE.csv
@@ -4,34 +4,38 @@ field,"project.work,children",0,Children,Untergeordnet (Arbeiten),0
field,"project.work,comment",0,Comment,Kommentar,0
field,"project.work,create_date",0,Creation date,Erstellungsdatum,0
field,"project.work,create_uid",0,Creation user,Ersteller,0
-field,"project.work,effort",0,Effort,Aufwand,0
+field,"project.work,effort",0,Effort,Aufwand (Personenstunden),0
field,"project.work,id",0,ID,ID,0
field,"project.work,parent",0,Parent,Ãœbergeordnet (Arbeit),0
field,"project.work,party",0,Party,Partei,0
field,"project.work,party_address",0,Contact Address,Kontaktadresse,0
field,"project.work,rec_name",0,Name,Name,0
field,"project.work,state",0,State,Status,0
-field,"project.work,total_effort",0,Total Effort,Gesamtaufwand,0
+field,"project.work,total_effort",0,Total Effort,Gesamtaufwand (Personenstunden),0
field,"project.work,type",0,Type,Typ,0
field,"project.work,work",0,Work,Arbeit,0
field,"project.work,write_date",0,Last modification date,Zuletzt geändert am,0
field,"project.work,write_uid",0,Last modification by,Zuletzt geändert von,0
field,"timesheet.work,sequence",0,Sequence,Reihenfolge,0
field,"timesheet.work,timesheet_lines",0,Timesheet Lines,Zeitpositionen,0
-help,"project.work,effort",0,Estimated Effort for this work,Geschätzter Aufwand für diese Arbeit in Stunden,0
-help,"project.work,total_effort",0,Estimated total effort for this work and the sub-works,Geschätzter Gesamtaufwand für diese Arbeit inkl. aller untergeordneten Arbeiten in Stunden,0
+help,"project.work,effort",0,Estimated Effort for this work,"Geschätzter Aufwand für diese Arbeit in Stunden (Format: Personenstunden, -tage, -wochen)",0
+help,"project.work,total_effort",0,Estimated total effort for this work and the sub-works,"Geschätzter Gesamtaufwand für diese Arbeit inkl. aller untergeordneten Arbeiten in Stunden (Format: Personenstunden, -tage, -wochen)",0
model,"ir.action,name",act_open_child_work,Tasks,Aufgaben,0
model,"ir.action,name",act_project_form,Projects,Projekte,0
model,"ir.action,name",act_task_form,Tasks,Aufgaben,0
-model,"ir.action,name",act_work_form,Works Efforts,Arbeiten Aufwände,0
-model,"ir.action,name",act_work_tree,Works,Arbeiten,0
+model,"ir.action,name",act_work_form,Works,Arbeiten,0
+model,"ir.action,name",act_work_form_new,Works Efforts,Arbeitsaufwände,0
+model,"ir.action,name",act_work_list,Works Efforts,Arbeitsaufwände,0
+model,"ir.action,name",act_work_tree,Works Efforts,Arbeitsaufwände,0
model,"ir.ui.menu,name",menu_configuration,Configuration,Einstellungen,0
model,"ir.ui.menu,name",menu_project,Project Management,Projekte,0
model,"ir.ui.menu,name",menu_project_form,Projects,Projekte,0
model,"ir.ui.menu,name",menu_project_tree,Projects,Projekte,0
model,"ir.ui.menu,name",menu_task_form,Tasks,Aufgaben,0
-model,"ir.ui.menu,name",menu_work_form,Works Efforts,Arbeiten Aufwände,0
-model,"project.work,name",0,Work Effort,Arbeit Aufwand,0
+model,"ir.ui.menu,name",menu_work_form_new,New Work Effort,Neuer Arbeitsaufwand,0
+model,"ir.ui.menu,name",menu_work_list,Works Efforts,Arbeitsaufwände,0
+model,"ir.ui.menu,name",menu_work_tree,Works Efforts,Arbeitsaufwände,0
+model,"project.work,name",0,Work Effort,Arbeitsaufwand,0
model,"res.group,name",group_project_admin,Project Administration,Projekte Administration,0
selection,"project.work,state",0,Done,Erledigt,0
selection,"project.work,state",0,Opened,Offen,0
@@ -44,6 +48,6 @@ view,project.work,0,Projects,Projekte,0
view,project.work,0,Tasks,Aufgaben,0
view,project.work,0,Timesheet,Zeiterfassungsblatt,0
view,project.work,0,Work,Arbeit,0
-view,project.work,0,Work Efforts,Arbeit Aufwände,0
+view,project.work,0,Work Efforts,Arbeitsaufwände,0
view,project.work,0,Works,Arbeiten,0
view,project.work,0,Works Efforts,Arbeiten Aufwände,0
diff --git a/fr_FR.csv b/fr_FR.csv
index 8fbfa0b..6d69d17 100644
--- a/fr_FR.csv
+++ b/fr_FR.csv
@@ -18,14 +18,18 @@ help,"project.work,total_effort",0,Estimated total effort for this work and the
model,"ir.action,name",act_open_child_work,Tasks,Tâches,0
model,"ir.action,name",act_project_form,Projects,Projets,0
model,"ir.action,name",act_task_form,Tasks,Tâches,0
-model,"ir.action,name",act_work_form,Works Efforts,Activités,0
-model,"ir.action,name",act_work_tree,Works,Activités,0
+model,"ir.action,name",act_work_form,Works,Activités,0
+model,"ir.action,name",act_work_form_new,Works Efforts,Activités,1
+model,"ir.action,name",act_work_list,Works Efforts,Activités,1
+model,"ir.action,name",act_work_tree,Works Efforts,Activités,0
model,"ir.ui.menu,name",menu_configuration,Configuration,Configuration,0
model,"ir.ui.menu,name",menu_project,Project Management,Gestion de projet,0
model,"ir.ui.menu,name",menu_project_form,Projects,Projets,0
model,"ir.ui.menu,name",menu_project_tree,Projects,Projets,0
model,"ir.ui.menu,name",menu_task_form,Tasks,Tâches,0
-model,"ir.ui.menu,name",menu_work_form,Works Efforts,Activités,0
+model,"ir.ui.menu,name",menu_work_form_new,New Work Effort,Nouvel Effort de travail,0
+model,"ir.ui.menu,name",menu_work_list,Works Efforts,Activités,1
+model,"ir.ui.menu,name",menu_work_tree,Works Efforts,Activités,1
model,"project.work,name",0,Work Effort,Tâche,0
model,"res.group,name",group_project_admin,Project Administration,Administrion de projets,0
selection,"project.work,state",0,Done,Fait,0
diff --git a/icons/LICENSE b/icons/LICENSE
new file mode 100644
index 0000000..11782c0
--- /dev/null
+++ b/icons/LICENSE
@@ -0,0 +1,264 @@
+ [1]Creative Commons
+
+ Creative Commons Legal Code
+
+ Attribution-ShareAlike 2.0
+ CREATIVE COMMONS CORPORATION IS NOT A LAW FIRM AND DOES NOT PROVIDE
+ LEGAL SERVICES. DISTRIBUTION OF THIS LICENSE DOES NOT CREATE AN
+ ATTORNEY-CLIENT RELATIONSHIP. CREATIVE COMMONS PROVIDES THIS
+ INFORMATION ON AN "AS-IS" BASIS. CREATIVE COMMONS MAKES NO WARRANTIES
+ REGARDING THE INFORMATION PROVIDED, AND DISCLAIMS LIABILITY FOR
+ DAMAGES RESULTING FROM ITS USE.
+
+ License
+
+ THE WORK (AS DEFINED BELOW) IS PROVIDED UNDER THE TERMS OF THIS
+ CREATIVE COMMONS PUBLIC LICENSE ("CCPL" OR "LICENSE"). THE WORK IS
+ PROTECTED BY COPYRIGHT AND/OR OTHER APPLICABLE LAW. ANY USE OF THE
+ WORK OTHER THAN AS AUTHORIZED UNDER THIS LICENSE OR COPYRIGHT LAW IS
+ PROHIBITED.
+
+ BY EXERCISING ANY RIGHTS TO THE WORK PROVIDED HERE, YOU ACCEPT AND
+ AGREE TO BE BOUND BY THE TERMS OF THIS LICENSE. THE LICENSOR GRANTS
+ YOU THE RIGHTS CONTAINED HERE IN CONSIDERATION OF YOUR ACCEPTANCE OF
+ SUCH TERMS AND CONDITIONS.
+
+ 1. Definitions
+ a. "Collective Work" means a work, such as a periodical issue,
+ anthology or encyclopedia, in which the Work in its entirety in
+ unmodified form, along with a number of other contributions,
+ constituting separate and independent works in themselves, are
+ assembled into a collective whole. A work that constitutes a
+ Collective Work will not be considered a Derivative Work (as
+ defined below) for the purposes of this License.
+ b. "Derivative Work" means a work based upon the Work or upon the
+ Work and other pre-existing works, such as a translation, musical
+ arrangement, dramatization, fictionalization, motion picture
+ version, sound recording, art reproduction, abridgment,
+ condensation, or any other form in which the Work may be recast,
+ transformed, or adapted, except that a work that constitutes a
+ Collective Work will not be considered a Derivative Work for the
+ purpose of this License. For the avoidance of doubt, where the
+ Work is a musical composition or sound recording, the
+ synchronization of the Work in timed-relation with a moving image
+ ("synching") will be considered a Derivative Work for the purpose
+ of this License.
+ c. "Licensor" means the individual or entity that offers the Work
+ under the terms of this License.
+ d. "Original Author" means the individual or entity who created the
+ Work.
+ e. "Work" means the copyrightable work of authorship offered under
+ the terms of this License.
+ f. "You" means an individual or entity exercising rights under this
+ License who has not previously violated the terms of this License
+ with respect to the Work, or who has received express permission
+ from the Licensor to exercise rights under this License despite a
+ previous violation.
+ g. "License Elements" means the following high-level license
+ attributes as selected by Licensor and indicated in the title of
+ this License: Attribution, ShareAlike.
+
+ 2. Fair Use Rights. Nothing in this license is intended to reduce,
+ limit, or restrict any rights arising from fair use, first sale or
+ other limitations on the exclusive rights of the copyright owner under
+ copyright law or other applicable laws.
+
+ 3. License Grant. Subject to the terms and conditions of this License,
+ Licensor hereby grants You a worldwide, royalty-free, non-exclusive,
+ perpetual (for the duration of the applicable copyright) license to
+ exercise the rights in the Work as stated below:
+ a. to reproduce the Work, to incorporate the Work into one or more
+ Collective Works, and to reproduce the Work as incorporated in the
+ Collective Works;
+ b. to create and reproduce Derivative Works;
+ c. to distribute copies or phonorecords of, display publicly, perform
+ publicly, and perform publicly by means of a digital audio
+ transmission the Work including as incorporated in Collective
+ Works;
+ d. to distribute copies or phonorecords of, display publicly, perform
+ publicly, and perform publicly by means of a digital audio
+ transmission Derivative Works.
+ e. For the avoidance of doubt, where the work is a musical
+ composition:
+ i. Performance Royalties Under Blanket Licenses. Licensor waives
+ the exclusive right to collect, whether individually or via a
+ performance rights society (e.g. ASCAP, BMI, SESAC),
+ royalties for the public performance or public digital
+ performance (e.g. webcast) of the Work.
+ ii. Mechanical Rights and Statutory Royalties. Licensor waives
+ the exclusive right to collect, whether individually or via a
+ music rights society or designated agent (e.g. Harry Fox
+ Agency), royalties for any phonorecord You create from the
+ Work ("cover version") and distribute, subject to the
+ compulsory license created by 17 USC Section 115 of the US
+ Copyright Act (or the equivalent in other jurisdictions).
+ f. Webcasting Rights and Statutory Royalties. For the avoidance of
+ doubt, where the Work is a sound recording, Licensor waives the
+ exclusive right to collect, whether individually or via a
+ performance-rights society (e.g. SoundExchange), royalties for the
+ public digital performance (e.g. webcast) of the Work, subject to
+ the compulsory license created by 17 USC Section 114 of the US
+ Copyright Act (or the equivalent in other jurisdictions).
+
+ The above rights may be exercised in all media and formats whether now
+ known or hereafter devised. The above rights include the right to make
+ such modifications as are technically necessary to exercise the rights
+ in other media and formats. All rights not expressly granted by
+ Licensor are hereby reserved.
+
+ 4. Restrictions.The license granted in Section 3 above is expressly
+ made subject to and limited by the following restrictions:
+ a. You may distribute, publicly display, publicly perform, or
+ publicly digitally perform the Work only under the terms of this
+ License, and You must include a copy of, or the Uniform Resource
+ Identifier for, this License with every copy or phonorecord of the
+ Work You distribute, publicly display, publicly perform, or
+ publicly digitally perform. You may not offer or impose any terms
+ on the Work that alter or restrict the terms of this License or
+ the recipients' exercise of the rights granted hereunder. You may
+ not sublicense the Work. You must keep intact all notices that
+ refer to this License and to the disclaimer of warranties. You may
+ not distribute, publicly display, publicly perform, or publicly
+ digitally perform the Work with any technological measures that
+ control access or use of the Work in a manner inconsistent with
+ the terms of this License Agreement. The above applies to the Work
+ as incorporated in a Collective Work, but this does not require
+ the Collective Work apart from the Work itself to be made subject
+ to the terms of this License. If You create a Collective Work,
+ upon notice from any Licensor You must, to the extent practicable,
+ remove from the Collective Work any reference to such Licensor or
+ the Original Author, as requested. If You create a Derivative
+ Work, upon notice from any Licensor You must, to the extent
+ practicable, remove from the Derivative Work any reference to such
+ Licensor or the Original Author, as requested.
+ b. You may distribute, publicly display, publicly perform, or
+ publicly digitally perform a Derivative Work only under the terms
+ of this License, a later version of this License with the same
+ License Elements as this License, or a Creative Commons iCommons
+ license that contains the same License Elements as this License
+ (e.g. Attribution-ShareAlike 2.0 Japan). You must include a copy
+ of, or the Uniform Resource Identifier for, this License or other
+ license specified in the previous sentence with every copy or
+ phonorecord of each Derivative Work You distribute, publicly
+ display, publicly perform, or publicly digitally perform. You may
+ not offer or impose any terms on the Derivative Works that alter
+ or restrict the terms of this License or the recipients' exercise
+ of the rights granted hereunder, and You must keep intact all
+ notices that refer to this License and to the disclaimer of
+ warranties. You may not distribute, publicly display, publicly
+ perform, or publicly digitally perform the Derivative Work with
+ any technological measures that control access or use of the Work
+ in a manner inconsistent with the terms of this License Agreement.
+ The above applies to the Derivative Work as incorporated in a
+ Collective Work, but this does not require the Collective Work
+ apart from the Derivative Work itself to be made subject to the
+ terms of this License.
+ c. If you distribute, publicly display, publicly perform, or publicly
+ digitally perform the Work or any Derivative Works or Collective
+ Works, You must keep intact all copyright notices for the Work and
+ give the Original Author credit reasonable to the medium or means
+ You are utilizing by conveying the name (or pseudonym if
+ applicable) of the Original Author if supplied; the title of the
+ Work if supplied; to the extent reasonably practicable, the
+ Uniform Resource Identifier, if any, that Licensor specifies to be
+ associated with the Work, unless such URI does not refer to the
+ copyright notice or licensing information for the Work; and in the
+ case of a Derivative Work, a credit identifying the use of the
+ Work in the Derivative Work (e.g., "French translation of the Work
+ by Original Author," or "Screenplay based on original Work by
+ Original Author"). Such credit may be implemented in any
+ reasonable manner; provided, however, that in the case of a
+ Derivative Work or Collective Work, at a minimum such credit will
+ appear where any other comparable authorship credit appears and in
+ a manner at least as prominent as such other comparable authorship
+ credit.
+
+ 5. Representations, Warranties and Disclaimer
+
+ UNLESS OTHERWISE AGREED TO BY THE PARTIES IN WRITING, LICENSOR OFFERS
+ THE WORK AS-IS AND MAKES NO REPRESENTATIONS OR WARRANTIES OF ANY KIND
+ CONCERNING THE MATERIALS, EXPRESS, IMPLIED, STATUTORY OR OTHERWISE,
+ INCLUDING, WITHOUT LIMITATION, WARRANTIES OF TITLE, MERCHANTIBILITY,
+ FITNESS FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR THE ABSENCE OF
+ LATENT OR OTHER DEFECTS, ACCURACY, OR THE PRESENCE OF ABSENCE OF
+ ERRORS, WHETHER OR NOT DISCOVERABLE. SOME JURISDICTIONS DO NOT ALLOW
+ THE EXCLUSION OF IMPLIED WARRANTIES, SO SUCH EXCLUSION MAY NOT APPLY
+ TO YOU.
+
+ 6. Limitation on Liability. EXCEPT TO THE EXTENT REQUIRED BY
+ APPLICABLE LAW, IN NO EVENT WILL LICENSOR BE LIABLE TO YOU ON ANY
+ LEGAL THEORY FOR ANY SPECIAL, INCIDENTAL, CONSEQUENTIAL, PUNITIVE OR
+ EXEMPLARY DAMAGES ARISING OUT OF THIS LICENSE OR THE USE OF THE WORK,
+ EVEN IF LICENSOR HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+
+ 7. Termination
+ a. This License and the rights granted hereunder will terminate
+ automatically upon any breach by You of the terms of this License.
+ Individuals or entities who have received Derivative Works or
+ Collective Works from You under this License, however, will not
+ have their licenses terminated provided such individuals or
+ entities remain in full compliance with those licenses. Sections
+ 1, 2, 5, 6, 7, and 8 will survive any termination of this License.
+ b. Subject to the above terms and conditions, the license granted
+ here is perpetual (for the duration of the applicable copyright in
+ the Work). Notwithstanding the above, Licensor reserves the right
+ to release the Work under different license terms or to stop
+ distributing the Work at any time; provided, however that any such
+ election will not serve to withdraw this License (or any other
+ license that has been, or is required to be, granted under the
+ terms of this License), and this License will continue in full
+ force and effect unless terminated as stated above.
+
+ 8. Miscellaneous
+ a. Each time You distribute or publicly digitally perform the Work or
+ a Collective Work, the Licensor offers to the recipient a license
+ to the Work on the same terms and conditions as the license
+ granted to You under this License.
+ b. Each time You distribute or publicly digitally perform a
+ Derivative Work, Licensor offers to the recipient a license to the
+ original Work on the same terms and conditions as the license
+ granted to You under this License.
+ c. If any provision of this License is invalid or unenforceable under
+ applicable law, it shall not affect the validity or enforceability
+ of the remainder of the terms of this License, and without further
+ action by the parties to this agreement, such provision shall be
+ reformed to the minimum extent necessary to make such provision
+ valid and enforceable.
+ d. No term or provision of this License shall be deemed waived and no
+ breach consented to unless such waiver or consent shall be in
+ writing and signed by the party to be charged with such waiver or
+ consent.
+ e. This License constitutes the entire agreement between the parties
+ with respect to the Work licensed here. There are no
+ understandings, agreements or representations with respect to the
+ Work not specified here. Licensor shall not be bound by any
+ additional provisions that may appear in any communication from
+ You. This License may not be modified without the mutual written
+ agreement of the Licensor and You.
+
+ Creative Commons is not a party to this License, and makes no warranty
+ whatsoever in connection with the Work. Creative Commons will not be
+ liable to You or any party on any legal theory for any damages
+ whatsoever, including without limitation any general, special,
+ incidental or consequential damages arising in connection to this
+ license. Notwithstanding the foregoing two (2) sentences, if Creative
+ Commons has expressly identified itself as the Licensor hereunder, it
+ shall have all rights and obligations of Licensor.
+
+ Except for the limited purpose of indicating to the public that the
+ Work is licensed under the CCPL, neither party will use the trademark
+ "Creative Commons" or any related trademark or logo of Creative
+ Commons without the prior written consent of Creative Commons. Any
+ permitted use will be in compliance with Creative Commons'
+ then-current trademark usage guidelines, as may be published on its
+ website or otherwise made available upon request from time to time.
+
+ Creative Commons may be contacted at [2]http://creativecommons.org/.
+
+ [3]« Back to Commons Deed
+
+References
+
+ 1. http://creativecommons.org/
+ 2. http://creativecommons.org/
+ 3. http://creativecommons.org/licenses/by-sa/2.0/
diff --git a/icons/__init__.py b/icons/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/icons/tryton-project.svg b/icons/tryton-project.svg
new file mode 100644
index 0000000..58a8013
--- /dev/null
+++ b/icons/tryton-project.svg
@@ -0,0 +1,327 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://web.resource.org/cc/"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:xlink="http://www.w3.org/1999/xlink"
+ xmlns:sodipodi="http://inkscape.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ width="48"
+ height="48"
+ id="svg2"
+ sodipodi:version="0.32"
+ inkscape:version="0.43+devel"
+ version="1.0"
+ sodipodi:docbase="/home/tigert/cvs/freedesktop.org/tango-icon-theme/scalable/categories"
+ sodipodi:docname="applications-development.svg"
+ inkscape:output_extension="org.inkscape.output.svg.inkscape">
+ <defs
+ id="defs4">
+ <linearGradient
+ inkscape:collect="always"
+ id="linearGradient2807">
+ <stop
+ style="stop-color:#ffffff;stop-opacity:1;"
+ offset="0"
+ id="stop2809" />
+ <stop
+ style="stop-color:#ffffff;stop-opacity:0;"
+ offset="1"
+ id="stop2811" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient18284">
+ <stop
+ style="stop-color:#000000;stop-opacity:1;"
+ offset="0"
+ id="stop18286" />
+ <stop
+ id="stop20913"
+ offset="0.5"
+ style="stop-color:#000000;stop-opacity:1;" />
+ <stop
+ id="stop19165"
+ offset="1"
+ style="stop-color:#000000;stop-opacity:0;" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient11202">
+ <stop
+ style="stop-color:#c4a000;stop-opacity:1;"
+ offset="0"
+ id="stop11204" />
+ <stop
+ style="stop-color:#c4a000;stop-opacity:0;"
+ offset="1"
+ id="stop11206" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient8543">
+ <stop
+ style="stop-color:#fffef5;stop-opacity:0.94117647;"
+ offset="0"
+ id="stop8545" />
+ <stop
+ style="stop-color:#fce94f;stop-opacity:0;"
+ offset="1"
+ id="stop8547" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient5012">
+ <stop
+ style="stop-color:#fdf188;stop-opacity:1;"
+ offset="0"
+ id="stop5014" />
+ <stop
+ style="stop-color:#d3bc00;stop-opacity:1;"
+ offset="1"
+ id="stop5016" />
+ </linearGradient>
+ <radialGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient5012"
+ id="radialGradient7666"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.136507,-2.396132e-18,-4.484926e-5,7.137743e-2,-23.39816,12.31028)"
+ cx="336.73767"
+ cy="-72.420044"
+ fx="336.73767"
+ fy="-72.420044"
+ r="297.21338" />
+ <radialGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient8543"
+ id="radialGradient8549"
+ cx="420.87839"
+ cy="685.99139"
+ fx="420.87839"
+ fy="685.99139"
+ r="235.88632"
+ gradientTransform="matrix(0.163532,-1.065754e-2,1.078108e-2,0.165425,-46.18187,-65.65506)"
+ gradientUnits="userSpaceOnUse" />
+ <radialGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient8543"
+ id="radialGradient9434"
+ cx="500.97794"
+ cy="286.46918"
+ fx="500.97794"
+ fy="286.46918"
+ r="40.975471"
+ gradientTransform="matrix(0.224796,1.017229e-2,-9.759474e-3,0.215674,-73.87964,-54.89804)"
+ gradientUnits="userSpaceOnUse" />
+ <radialGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient8543"
+ id="radialGradient10317"
+ cx="293.81989"
+ cy="243.06874"
+ fx="293.81989"
+ fy="243.06874"
+ r="48.782982"
+ gradientTransform="matrix(0.272962,-7.1724e-2,5.616202e-2,0.213737,-78.54657,-24.30491)"
+ gradientUnits="userSpaceOnUse" />
+ <radialGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient11202"
+ id="radialGradient11208"
+ cx="424.99243"
+ cy="270.67969"
+ fx="424.99243"
+ fy="270.67969"
+ r="38.451698"
+ gradientTransform="matrix(8.174351e-2,1.024998e-2,-4.335971e-2,0.345793,6.123413,-84.50421)"
+ gradientUnits="userSpaceOnUse" />
+ <radialGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient8543"
+ id="radialGradient13895"
+ cx="340.35886"
+ cy="409.83737"
+ fx="340.35886"
+ fy="409.83737"
+ r="103.26014"
+ gradientTransform="matrix(0.105628,-4.514018e-2,6.692574e-2,0.156607,-46.01605,-24.35485)"
+ gradientUnits="userSpaceOnUse" />
+ <radialGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient18284"
+ id="radialGradient18290"
+ cx="29.898689"
+ cy="45.673546"
+ fx="29.898689"
+ fy="45.673546"
+ r="30.365856"
+ gradientTransform="matrix(1,0,2.702168e-19,0.415385,-2.283104e-16,26.70146)"
+ gradientUnits="userSpaceOnUse" />
+ <radialGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient8543"
+ id="radialGradient2798"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.101953,-4.272301e-2,9.621296e-2,0.229599,-48.67227,-64.24148)"
+ cx="131.23691"
+ cy="424.15677"
+ fx="131.23691"
+ fy="424.15677"
+ r="35.934704" />
+ <radialGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient2807"
+ id="radialGradient2813"
+ cx="15.491823"
+ cy="10.943316"
+ fx="15.491823"
+ fy="10.943316"
+ r="18.370251"
+ gradientTransform="matrix(1.402663,1.176399e-16,-9.356816e-17,1.115648,-6.237984,5.33075e-2)"
+ gradientUnits="userSpaceOnUse" />
+ </defs>
+ <sodipodi:namedview
+ id="base"
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="0.13333333"
+ inkscape:pageopacity="0.0"
+ inkscape:pageshadow="2"
+ inkscape:zoom="11.313708"
+ inkscape:cx="24.942255"
+ inkscape:cy="29.100296"
+ inkscape:document-units="px"
+ inkscape:current-layer="layer1"
+ inkscape:window-width="906"
+ inkscape:window-height="987"
+ inkscape:window-x="635"
+ inkscape:window-y="114"
+ inkscape:showpageshadow="false"
+ stroke="#c4a000" />
+ <metadata
+ id="metadata7">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ <dc:contributor>
+ <cc:Agent>
+ <dc:title>Henrik Andersen</dc:title>
+ </cc:Agent>
+ </dc:contributor>
+ <dc:title>Developer Tools</dc:title>
+ <dc:subject>
+ <rdf:Bag>
+ <rdf:li>developer</rdf:li>
+ <rdf:li>dev</rdf:li>
+ <rdf:li>tool</rdf:li>
+ <rdf:li>make</rdf:li>
+ <rdf:li>compile</rdf:li>
+ <rdf:li>build</rdf:li>
+ <rdf:li>code</rdf:li>
+ <rdf:li>hacker</rdf:li>
+ </rdf:Bag>
+ </dc:subject>
+ <dc:creator>
+ <cc:Agent>
+ <dc:title>Jakub Steiner</dc:title>
+ </cc:Agent>
+ </dc:creator>
+ <dc:source>http://jimmac.musichall.cz</dc:source>
+ <cc:license
+ rdf:resource="http://creativecommons.org/licenses/by-sa/2.0/" />
+ </cc:Work>
+ <cc:License
+ rdf:about="http://creativecommons.org/licenses/by-sa/2.0/">
+ <cc:permits
+ rdf:resource="http://web.resource.org/cc/Reproduction" />
+ <cc:permits
+ rdf:resource="http://web.resource.org/cc/Distribution" />
+ <cc:requires
+ rdf:resource="http://web.resource.org/cc/Notice" />
+ <cc:requires
+ rdf:resource="http://web.resource.org/cc/Attribution" />
+ <cc:permits
+ rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
+ <cc:requires
+ rdf:resource="http://web.resource.org/cc/ShareAlike" />
+ </cc:License>
+ </rdf:RDF>
+ </metadata>
+ <g
+ inkscape:label="Layer 1"
+ id="layer1"
+ inkscape:groupmode="layer">
+ <path
+ sodipodi:type="arc"
+ style="opacity:1;fill:url(#radialGradient18290);fill-opacity:1;stroke:none;stroke-width:12.39700031;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ id="path17409"
+ sodipodi:cx="29.898689"
+ sodipodi:cy="45.673546"
+ sodipodi:rx="30.365856"
+ sodipodi:ry="12.613509"
+ d="M 60.264545 45.673546 A 30.365856 12.613509 0 1 1 -0.4671669,45.673546 A 30.365856 12.613509 0 1 1 60.264545 45.673546 z"
+ transform="matrix(0.742527,0,-5.812964e-2,1.428611,4.500517,-36.68345)" />
+ <path
+ style="fill:url(#radialGradient7666);fill-opacity:1;stroke:#c4a000;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+ d="M 23.152758,1.1801876 C 20.380218,1.2190783 17.86582,1.8908769 15.634281,3.0196314 C 14.541531,5.1714614 10.9437,7.7293655 9.4689484,8.0015561 C 6.5691703,11.460832 4.6887193,15.805035 3.9754523,19.98162 C 3.9750148,19.984183 3.9758889,19.986781 3.9754523,19.989343 C 2.7890929,21.53906 2.2854415,23.385937 2.5981051,25.521903 C 3.7192795,33.181217 5.8802729,40.410195 10.783201,42.078178 C 17.93763,44.512124 32.65497,43.864025 35.912708,42.536436 C 43.051738,39.62715 43.684161,33.251338 44.80414,25.75618 C 45.109694,23.711348 44.659305,21.914978 43.573539,20.383238 C 43.564583,20.327636 43.555052,20.271764 43.54522,20.215896 C 42.763966,15.777007 40.697859,11.326849 37.602582,7.8466935 C 35.508773,7.62926 31.462964,4.270333 30.483158,2.6229925 C 28.330506,1.7020155 25.961342,1.1801876 23.407632,1.1801876 C 23.322311,1.1801876 23.237595,1.178998 23.152758,1.1801876 z "
+ id="path3120"
+ sodipodi:nodetypes="cccscsssscsccsc" />
+ <path
+ style="fill:url(#radialGradient8549);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;opacity:0.66666667"
+ d="M 43.629688,22.792984 C 39.033494,39.233217 10.438199,40.802737 3.7832765,23.04227 C 3.7410682,39.366403 10.103414,44.083889 28.189955,43.247454 C 31.251932,43.106765 38.199775,43.290321 42.804439,34.110678 C 45.042804,22.600278 43.629688,22.792984 43.629688,22.792984 z "
+ id="path7668"
+ sodipodi:nodetypes="ccscc" />
+ <path
+ style="fill:url(#radialGradient9434);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ d="M 34.691565,7.6783057 L 37.192446,8.8037033 C 37.192446,8.8037033 35.882042,18.926343 30.52343,25.288675 C 32.295095,18.832841 34.712405,7.6783057 34.691565,7.6783057 z "
+ id="path8553"
+ sodipodi:nodetypes="cccc" />
+ <path
+ style="fill:url(#radialGradient10317);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ d="M 15.872437,4.1562328 C 17.372967,13.221927 22.374727,23.642261 21.874552,24.163278 C 17.289604,17.181654 15.372261,11.242061 13.871732,6.2403001 C 13.871732,6.1569366 15.872437,4.1770734 15.872437,4.1562328 z "
+ id="path9436"
+ sodipodi:nodetypes="cccc" />
+ <path
+ style="fill:url(#radialGradient11208);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ d="M 30.21082,3.8227818 C 26.126047,20.328594 25.959322,23.079563 25.959322,23.079563 C 25.959322,23.079563 32.294888,6.3236627 32.294888,5.9068495 C 32.294888,5.9068487 30.710997,4.4063209 30.21082,3.8227818 z "
+ id="path10319"
+ sodipodi:nodetypes="ccsc" />
+ <flowRoot
+ xml:space="preserve"
+ id="flowRoot12974"><flowRegion
+ id="flowRegion12976"><rect
+ id="rect12978"
+ width="40.055775"
+ height="16.02231"
+ x="86.787514"
+ y="412.80496" /></flowRegion><flowPara
+ id="flowPara12980" /></flowRoot> <path
+ style="fill:url(#radialGradient13895);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ d="M 16.18209,34.476182 L 16.137416,24.906437 L 30.631143,24.906437 L 32.273747,23.642895 L 15.342282,23.642895 L 15.386956,34.283476 L 16.18209,34.476182 z "
+ id="path13014"
+ sodipodi:nodetypes="ccccccc" />
+ <path
+ style="fill:#958401;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ d="M 31.043495,24.81709 L 31.125176,34.621701 L 31.81132,34.406959 L 31.823298,23.553549 L 31.043495,24.81709 z "
+ id="path13897"
+ sodipodi:nodetypes="ccccc" />
+ <path
+ style="fill:url(#radialGradient2798);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ d="M 4.2551267,24.106065 C 4.2551267,24.106065 6.571777,32.221754 14.476068,32.872102 C 15.581676,35.36252 13.341098,36.996703 13.341098,36.996703 L 9.7315781,36.745641 C 9.7315781,36.745641 3.4928036,28.752699 3.2433694,26.844759 C 2.9939369,24.936822 3.4066529,23.436966 3.4066529,23.436966 L 4.2551267,24.106065 z "
+ id="path16526"
+ sodipodi:nodetypes="ccccscc" />
+ <path
+ sodipodi:nodetypes="cccscsssscsccsc"
+ id="path2703"
+ d="M 23.184204,2.3889904 C 20.570275,2.4256563 18.199721,3.0590226 16.095844,4.1232033 C 15.065608,6.1519314 11.673602,8.563503 10.283218,8.8201221 C 7.5493302,12.0815 5.776456,16.17718 5.1039936,20.11483 C 5.1035812,20.117247 5.1044052,20.119696 5.1039936,20.122112 C 3.9855035,21.583172 3.2455,23.368587 3.5402767,25.382359 C 4.597311,32.603499 6.4678792,39.092036 10.868256,41.021813 C 16.791397,43.619395 32.407978,42.807748 35.479348,41.556108 C 42.209968,38.813256 42.541047,32.625414 43.596954,25.559039 C 43.885028,23.631188 43.460404,21.937585 42.436753,20.493473 C 42.428309,20.441052 42.419324,20.388376 42.410054,20.335704 C 41.673494,16.150755 39.725585,11.955182 36.807382,8.6741189 C 34.833356,8.4691243 31.019,5.3023548 30.095246,3.7492553 C 28.065743,2.8809656 25.832115,2.3889904 23.424497,2.3889904 C 23.344057,2.3889904 23.264188,2.3878689 23.184204,2.3889904 z "
+ style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:0.99999976;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;opacity:0.74444444" />
+ <path
+ style="fill:url(#radialGradient2813);fill-opacity:1.0;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;opacity:0.59444444"
+ d="M 22.59375,2.78125 C 20.264193,2.8978182 18.152779,3.5062884 16.25,4.46875 C 15.239275,6.4590559 11.895302,8.841991 10.53125,9.09375 C 7.8491405,12.293361 6.1284766,16.293174 5.46875,20.15625 C 5.4683454,20.15862 5.4691538,20.18513 5.46875,20.1875 C 4.3714431,21.62089 4.0107233,23.778648 4.0107233,23.778648 C 8.6959903,27.38371 11.652335,23.99254 18.329596,21.761428 C 30.928876,23.684569 37.077934,20.765483 40.84375,16.09375 C 40.850609,16.085241 40.840294,16.072869 40.84375,16.0625 C 39.852567,13.479666 38.411479,11.016387 36.5625,8.9375 C 34.62586,8.7363873 30.875008,5.6486852 29.96875,4.125 C 27.977684,3.2731547 25.79952,2.78125 23.4375,2.78125 C 23.358584,2.7812501 23.265969,2.7801497 23.1875,2.78125 C 22.987154,2.7840603 22.79117,2.7713713 22.59375,2.78125 z "
+ id="path2800"
+ sodipodi:nodetypes="cccssccscccssc" />
+ </g>
+</svg>
diff --git a/project.xml b/project.xml
index 0f7d282..4851004 100644
--- a/project.xml
+++ b/project.xml
@@ -13,8 +13,12 @@ this repository contains the full copyright notices and license terms. -->
<field name="groups" eval="[('add', ref('group_project_admin'))]"/>
</record>
+ <record model="ir.ui.icon" id="project_icon">
+ <field name="name">tryton-project</field>
+ <field name="path">icons/tryton-project.svg</field>
+ </record>
<menuitem name="Project Management" sequence="7" id="menu_project"
- icon="tryton-development"/>
+ icon="tryton-project"/>
<menuitem name="Configuration" parent="menu_project"
id="menu_configuration" groups="group_project_admin"
sequence="10" icon="tryton-preferences"/>
diff --git a/setup.py b/setup.py
index 2dd3fd1..dc3737d 100644
--- a/setup.py
+++ b/setup.py
@@ -31,10 +31,12 @@ setup(name='trytond_project',
packages=[
'trytond.modules.project',
'trytond.modules.project.tests',
+ 'trytond.modules.project.icons',
],
package_data={
'trytond.modules.project': info.get('xml', []) \
+ info.get('translation', []),
+ 'trytond.modules.project.icons': ['tryton-project.svg'],
},
classifiers=[
'Development Status :: 5 - Production/Stable',
@@ -44,11 +46,15 @@ setup(name='trytond_project',
'Intended Audience :: Legal Industry',
'Intended Audience :: Manufacturing',
'License :: OSI Approved :: GNU General Public License (GPL)',
+ 'Natural Language :: Bulgarian',
'Natural Language :: English',
'Natural Language :: French',
'Natural Language :: German',
+ 'Natural Language :: Spanish',
'Operating System :: OS Independent',
- 'Programming Language :: Python',
+ 'Programming Language :: Python :: 2.5',
+ 'Programming Language :: Python :: 2.6',
+ 'Programming Language :: Python :: 2.7',
'Topic :: Office/Business',
],
license='GPL-3',
diff --git a/trytond_project.egg-info/PKG-INFO b/trytond_project.egg-info/PKG-INFO
index ec09678..b599a2a 100644
--- a/trytond_project.egg-info/PKG-INFO
+++ b/trytond_project.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.0
Name: trytond-project
-Version: 1.8.0
+Version: 2.0.0
Summary: Project Module with:
- Project management
@@ -8,7 +8,7 @@ Home-page: http://www.tryton.org/
Author: B2CK
Author-email: info at b2ck.com
License: GPL-3
-Download-URL: http://downloads.tryton.org/1.8/
+Download-URL: http://downloads.tryton.org/2.0/
Description: UNKNOWN
Platform: UNKNOWN
Classifier: Development Status :: 5 - Production/Stable
@@ -18,9 +18,13 @@ Classifier: Intended Audience :: Financial and Insurance Industry
Classifier: Intended Audience :: Legal Industry
Classifier: Intended Audience :: Manufacturing
Classifier: License :: OSI Approved :: GNU General Public License (GPL)
+Classifier: Natural Language :: Bulgarian
Classifier: Natural Language :: English
Classifier: Natural Language :: French
Classifier: Natural Language :: German
+Classifier: Natural Language :: Spanish
Classifier: Operating System :: OS Independent
-Classifier: Programming Language :: Python
+Classifier: Programming Language :: Python :: 2.5
+Classifier: Programming Language :: Python :: 2.6
+Classifier: Programming Language :: Python :: 2.7
Classifier: Topic :: Office/Business
diff --git a/trytond_project.egg-info/SOURCES.txt b/trytond_project.egg-info/SOURCES.txt
index fe00c05..770ba7d 100644
--- a/trytond_project.egg-info/SOURCES.txt
+++ b/trytond_project.egg-info/SOURCES.txt
@@ -4,6 +4,7 @@ INSTALL
LICENSE
MANIFEST.in
README
+bg_BG.csv
de_DE.csv
es_CO.csv
es_ES.csv
@@ -14,9 +15,13 @@ work.xml
./__init__.py
./__tryton__.py
./work.py
+./icons/__init__.py
./tests/__init__.py
./tests/test_project.py
doc/index.rst
+icons/LICENSE
+icons/__init__.py
+icons/tryton-project.svg
tests/__init__.py
tests/test_project.py
trytond_project.egg-info/PKG-INFO
diff --git a/trytond_project.egg-info/requires.txt b/trytond_project.egg-info/requires.txt
index 1f9aa7e..2cedb2b 100644
--- a/trytond_project.egg-info/requires.txt
+++ b/trytond_project.egg-info/requires.txt
@@ -1,4 +1,4 @@
-trytond_timesheet >= 1.8, < 1.9
-trytond_party >= 1.8, < 1.9
-trytond_company_work_time >= 1.8, < 1.9
-trytond >= 1.8, < 1.9
\ No newline at end of file
+trytond_timesheet >= 2.0, < 2.1
+trytond_party >= 2.0, < 2.1
+trytond_company_work_time >= 2.0, < 2.1
+trytond >= 2.0, < 2.1
\ No newline at end of file
diff --git a/work.py b/work.py
index 24f0b34..538bf4b 100644
--- a/work.py
+++ b/work.py
@@ -16,7 +16,7 @@ class TimesheetWork(ModelSQL, ModelView):
depends=['timesheet_available', 'active'],
states={
'invisible': Not(Bool(Eval('timesheet_available'))),
- 'readonly': Not(Bool(Eval('not active'))),
+ 'readonly': Not(Bool(Eval('active'))),
})
sequence = fields.Integer('Sequence')
@@ -228,6 +228,27 @@ class Work(ModelSQL, ModelView):
return res
+ def copy(self, ids, default=None):
+ timesheet_work_obj = self.pool.get('timesheet.work')
+
+ int_id = isinstance(ids, (int, long))
+ if int_id:
+ ids = [ids]
+
+ if default is None:
+ default = {}
+
+ new_ids = []
+ for project_work in self.browse(ids):
+ timesheet_work_id = timesheet_work_obj.copy(project_work.work.id,
+ default=default)
+ pwdefault = default.copy()
+ pwdefault['work'] = timesheet_work_id
+ new_ids.append(super(Work, self).copy(project_work.id,
+ default=pwdefault))
+ if int_id:
+ return new_ids[0]
+ return new_ids
def delete(self, ids):
timesheet_work_obj = self.pool.get('timesheet.work')
diff --git a/work.xml b/work.xml
index 3640678..dfd2fba 100644
--- a/work.xml
+++ b/work.xml
@@ -7,6 +7,7 @@ this repository contains the full copyright notices and license terms. -->
<record model="ir.ui.view" id="work_view_tree">
<field name="model">project.work</field>
<field name="type">tree</field>
+ <field name="priority" eval="20"/>
<field name="field_childs">children</field>
<field name="arch" type="xml">
<![CDATA[
@@ -17,12 +18,33 @@ this repository contains the full copyright notices and license terms. -->
<field name="type" select="1"/>
<field name="state" select="1"/>
<field name="active" select="2" tree_invisible="1"/>
+ <field name="parent" tree_invisible="1"/>
+ <field name="children" tree_invisible="1"/>
</tree>
]]>
</field>
</record>
- <!-- tree view for tasks (wihtout type field) -->
- <record model="ir.ui.view" id="work_view_tree2">
+
+ <record model="ir.ui.view" id="work_view_list">
+ <field name="model">project.work</field>
+ <field name="type">tree</field>
+ <field name="priority" eval="10"/>
+ <field name="arch" type="xml">
+ <![CDATA[
+ <tree string="Works Efforts">
+ <field name="name" select="1"/>
+ <field name="hours" widget="float_time" float_time="company_work_time"/>
+ <field name="total_effort" widget="float_time" float_time="company_work_time"/>
+ <field name="type" select="1"/>
+ <field name="state" select="1"/>
+ <field name="active" select="2" tree_invisible="1"/>
+ </tree>
+ ]]>
+ </field>
+ </record>
+
+ <!-- list view for tasks (wihtout type field) -->
+ <record model="ir.ui.view" id="work_view_list2">
<field name="model">project.work</field>
<field name="type">tree</field>
<field name="arch" type="xml">
@@ -37,8 +59,8 @@ this repository contains the full copyright notices and license terms. -->
]]>
</field>
</record>
- <!-- tree view for projects (wihtout type and state fields) -->
- <record model="ir.ui.view" id="work_view_tree3">
+ <!-- list view for projects (wihtout type and state fields) -->
+ <record model="ir.ui.view" id="work_view_list3">
<field name="model">project.work</field>
<field name="type">tree</field>
<field name="arch" type="xml">
@@ -57,7 +79,7 @@ this repository contains the full copyright notices and license terms. -->
<field name="type">form</field>
<field name="arch" type="xml">
<![CDATA[
- <form string="Work Efforts" col="8">
+ <form string="Works Efforts" col="8">
<label name="name"/>
<field name="name" colspan="3"/>
<label name="parent"/>
@@ -112,34 +134,71 @@ this repository contains the full copyright notices and license terms. -->
]]>
</field>
</record>
- <record model="ir.action.act_window" id="act_work_form">
+ <record model="ir.action.act_window" id="act_work_tree">
<field name="name">Works Efforts</field>
<field name="res_model">project.work</field>
- <field name="view_type">form</field>
+ <field name="domain">[('parent', '=', False)]</field>
</record>
<record model="ir.action.act_window.view"
- id="act_work_form_view1">
+ id="act_work_tree_view1">
<field name="sequence" eval="10"/>
<field name="view" ref="work_view_tree"/>
- <field name="act_window" ref="act_work_form"/>
+ <field name="act_window" ref="act_work_tree"/>
</record>
<record model="ir.action.act_window.view"
- id="act_work_form_view2">
+ id="act_work_tree_view2">
<field name="sequence" eval="20"/>
<field name="view" ref="work_view_form"/>
- <field name="act_window" ref="act_work_form"/>
+ <field name="act_window" ref="act_work_tree"/>
</record>
- <menuitem parent="menu_configuration" action="act_work_form"
- id="menu_work_form"/>
+ <menuitem parent="menu_configuration" action="act_work_tree"
+ id="menu_work_tree"/>
- <record model="ir.action.act_window" id="act_work_tree">
+ <record model="ir.action.act_window" id="act_work_list">
+ <field name="name">Works Efforts</field>
+ <field name="res_model">project.work</field>
+ </record>
+ <record model="ir.action.act_window.view"
+ id="act_work_list_view1">
+ <field name="sequence" eval="10"/>
+ <field name="view" ref="work_view_list"/>
+ <field name="act_window" ref="act_work_list"/>
+ </record>
+ <record model="ir.action.act_window.view"
+ id="act_work_list_view2">
+ <field name="sequence" eval="20"/>
+ <field name="view" ref="work_view_form"/>
+ <field name="act_window" ref="act_work_list"/>
+ </record>
+ <menuitem parent="menu_work_tree"
+ action="act_work_list" id="menu_work_list"/>
+
+ <record model="ir.action.act_window" id="act_work_form_new">
+ <field name="name">Works Efforts</field>
+ <field name="res_model">project.work</field>
+ </record>
+ <record model="ir.action.act_window.view"
+ id="act_work_form_new_view1">
+ <field name="sequence" eval="10"/>
+ <field name="view" ref="work_view_form"/>
+ <field name="act_window" ref="act_work_form_new"/>
+ </record>
+ <record model="ir.action.act_window.view"
+ id="act_work_form_new_view2">
+ <field name="sequence" eval="20"/>
+ <field name="view" ref="work_view_list"/>
+ <field name="act_window" ref="act_work_form_new"/>
+ </record>
+ <menuitem name="New Work Effort" parent="menu_work_tree"
+ action="act_work_form_new" id="menu_work_form_new"/>
+
+ <record model="ir.action.act_window" id="act_work_form">
<field name="name">Works</field>
<field name="res_model">project.work</field>
- <field name="view_type">tree</field>
<field name="domain">[('parent', '=', False)]</field>
</record>
<record model="ir.action.act_window.view"
- id="act_work_tree_view1">
+ id="act_work_form_view1">
<field name="sequence" eval="10"/>
<field name="view" ref="work_view_tree"/>
<field name="act_window" ref="act_work_tree"/>
@@ -150,14 +209,13 @@ this repository contains the full copyright notices and license terms. -->
<record model="ir.action.act_window" id="act_project_form">
<field name="name">Projects</field>
<field name="res_model">project.work</field>
- <field name="view_type">form</field>
<field name="domain">[('type', '=', 'project')]</field>
<field name="context">{'type': 'project'}</field>
</record>
<record model="ir.action.act_window.view"
id="act_project_form_view1">
<field name="sequence" eval="10"/>
- <field name="view" ref="work_view_tree3"/>
+ <field name="view" ref="work_view_list3"/>
<field name="act_window" ref="act_project_form"/>
</record>
<record model="ir.action.act_window.view"
@@ -172,14 +230,13 @@ this repository contains the full copyright notices and license terms. -->
<record model="ir.action.act_window" id="act_task_form">
<field name="name">Tasks</field>
<field name="res_model">project.work</field>
- <field name="view_type">form</field>
<field name="domain">[('type', '=', 'task')]</field>
<field name="context">{'type': 'task'}</field>
</record>
<record model="ir.action.act_window.view"
id="act_task_form_view1">
<field name="sequence" eval="10"/>
- <field name="view" ref="work_view_tree2"/>
+ <field name="view" ref="work_view_list2"/>
<field name="act_window" ref="act_task_form"/>
</record>
<record model="ir.action.act_window.view"
@@ -194,7 +251,6 @@ this repository contains the full copyright notices and license terms. -->
<record model="ir.action.act_window" id="act_open_child_work">
<field name="name">Tasks</field>
<field name="res_model">project.work</field>
- <field name="view_type">form</field>
<field name="context">{'type': 'task'}</field>
<field name="domain">[('parent', '=', Eval('active_id')), ('type', '=', 'task')]</field>
</record>
@@ -207,7 +263,7 @@ this repository contains the full copyright notices and license terms. -->
<record model="ir.action.act_window.view"
id="act_open_project_view1">
<field name="sequence" eval="10"/>
- <field name="view" ref="work_view_tree2"/>
+ <field name="view" ref="work_view_list2"/>
<field name="act_window" ref="act_open_child_work"/>
</record>
<record model="ir.action.act_window.view"
commit 96914daad392eec226395c47c484904089b4eb1b
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Tue Apr 26 21:08:54 2011 +0200
Updating to standards version 3.9.2.
diff --git a/debian/control b/debian/control
index ccd1b45..02da47c 100644
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,7 @@ Uploaders:
Mathias Behrle <mathiasb at m9s.biz>
Dm-Upload-Allowed: yes
Build-Depends: debhelper (>= 8), python, python-setuptools, python-support
-Standards-Version: 3.9.1
+Standards-Version: 3.9.2
Homepage: http://www.tryton.org/
Vcs-Browser: http://git.debian-maintainers.org/?p=tryton/tryton-modules-project.git
Vcs-Git: git://git.debian-maintainers.org/git/tryton/tryton-modules-project.git
commit 3ee9a24769c8df99eec70cab3e92520dc5eb1b6f
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Tue Feb 15 13:14:02 2011 +0100
Releasing debian version 1.8.0-2.
diff --git a/debian/changelog b/debian/changelog
index b23b013..ca81585 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+tryton-modules-project (1.8.0-2) unstable; urgency=low
+
+ * Changing my email address.
+ * Setting minimal Python version to 2.5.
+ * Updating Copyright.
+
+ -- Mathias Behrle <mathiasb at m9s.biz> Tue, 15 Feb 2011 13:13:51 +0100
+
tryton-modules-project (1.8.0-1) experimental; urgency=low
* Updating standards version to 3.9.0.
commit 0d9c82ed50bf07cd63fb2b613befd88f8aedffc3
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Tue Feb 15 12:38:44 2011 +0100
Updating Copyright.
diff --git a/debian/copyright b/debian/copyright
index 975dbc8..2ca7de1 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -26,7 +26,7 @@ License: GPL-3+
can be found in /usr/share/common-licenses/GPL-3 file.
Files: debian/*
-Copyright: (C) 2009-2010 Daniel Baumann <daniel at debian.org>
+Copyright: (C) 2009-2011 Daniel Baumann <daniel at debian.org>
License: GPL-3+
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
commit 0a620fe1653ecae0070ed881b89668a9c63b96fc
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Sat Jan 15 17:27:20 2011 +0100
Setting minimal Python version to 2.5.
diff --git a/debian/pyversions b/debian/pyversions
index 8b253bc..b3dc41e 100644
--- a/debian/pyversions
+++ b/debian/pyversions
@@ -1 +1 @@
-2.4-
+2.5-
commit b7358254acf480aa8de452631da5d92750a1652e
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Sat Nov 20 11:48:56 2010 +0100
Changing my email address.
diff --git a/debian/control b/debian/control
index 72df97e..ccd1b45 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: optional
Maintainer: Debian Tryton Maintainers <tryton at lists.debian-maintainers.org>
Uploaders:
Daniel Baumann <daniel at debian.org>,
- Mathias Behrle <mathiasb at mbsolutions.selfip.biz>
+ Mathias Behrle <mathiasb at m9s.biz>
Dm-Upload-Allowed: yes
Build-Depends: debhelper (>= 8), python, python-setuptools, python-support
Standards-Version: 3.9.1
commit 210332e04661e7173205edde25a9a2a5dbbeda57
Author: Daniel Baumann <daniel at debian.org>
Date: Fri Nov 12 13:06:46 2010 +0100
Releasing debian version 1.8.0-1.
diff --git a/debian/changelog b/debian/changelog
index f210d5b..b23b013 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+tryton-modules-project (1.8.0-1) experimental; urgency=low
+
+ * Updating standards version to 3.9.0.
+ * Updating to debhelper version 8.
+ * Updating to standards version 3.9.1.
+ * Switching to source format 3.0 (quilt).
+ * Merging upstream version 1.8.0.
+ * Updating versioned tryton depends to 1.8.
+
+ -- Daniel Baumann <daniel at debian.org> Fri, 12 Nov 2010 13:06:42 +0100
+
tryton-modules-project (1.6.0-1) unstable; urgency=low
[ Daniel Baumann ]
commit 0648afd4c3d6b8e047f6255cfe1410f7486c80b6
Author: Daniel Baumann <daniel at debian.org>
Date: Thu Nov 4 20:16:01 2010 +0100
Updating versioned tryton depends to 1.8.
diff --git a/debian/control b/debian/control
index c016d76..72df97e 100644
--- a/debian/control
+++ b/debian/control
@@ -15,8 +15,8 @@ Vcs-Git: git://git.debian-maintainers.org/git/tryton/tryton-modules-project.git
Package: tryton-modules-project
Architecture: all
Depends:
- ${misc:Depends}, ${python:Depends}, tryton-server (>= 1.6),
- tryton-modules-party (>= 1.6), tryton-modules-timesheet (>= 1.6),
+ ${misc:Depends}, ${python:Depends}, tryton-server (>= 1.8),
+ tryton-modules-party (>= 1.8), tryton-modules-timesheet (>= 1.8),
python-pkg-resources
XB-Python-Version: ${python:Versions}
Description: Tryton Application Platform (Project Module)
commit 32010df4a420bdafddd378c7dc3d79b25ef6179b
Author: Daniel Baumann <daniel at debian.org>
Date: Thu Nov 4 20:13:25 2010 +0100
Merging upstream version 1.8.0.
diff --git a/CHANGELOG b/CHANGELOG
index 6175416..505414f 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 1.8.0 - 2010-11-01
+* Bug fixes (see mercurial logs for details)
+
Version 1.6.0 - 2010-05-13
* Bug fixes (see mercurial logs for details)
diff --git a/INSTALL b/INSTALL
index a3bda33..5a07c8f 100644
--- a/INSTALL
+++ b/INSTALL
@@ -4,7 +4,7 @@ Installing trytond_project
Prerequisites
-------------
- * Python 2.4 or later (http://www.python.org/)
+ * Python 2.5 or later (http://www.python.org/)
* trytond (http://www.tryton.org/)
* trytond_timesheet (http://www.tryton.org/)
* trytond_party (http://www.tryton.org/)
diff --git a/PKG-INFO b/PKG-INFO
index 4234a0b..d5e1603 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.0
Name: trytond_project
-Version: 1.6.0
+Version: 1.8.0
Summary: Project Module with:
- Project management
@@ -8,7 +8,7 @@ Home-page: http://www.tryton.org/
Author: B2CK
Author-email: info at b2ck.com
License: GPL-3
-Download-URL: http://downloads.tryton.org/1.6/
+Download-URL: http://downloads.tryton.org/1.8/
Description: UNKNOWN
Platform: UNKNOWN
Classifier: Development Status :: 5 - Production/Stable
diff --git a/__tryton__.py b/__tryton__.py
index 3233f21..d3a9cae 100644
--- a/__tryton__.py
+++ b/__tryton__.py
@@ -6,7 +6,7 @@
'name_es_CO': 'Proyectos',
'name_es_ES': 'Proyecto',
'name_fr_FR': 'Projet',
- 'version': '1.6.0',
+ 'version': '1.8.0',
'author': 'B2CK',
'email': 'info at b2ck.com',
'website': 'http://www.tryton.org/',
diff --git a/de_DE.csv b/de_DE.csv
index bc02dab..bb0eaaa 100644
--- a/de_DE.csv
+++ b/de_DE.csv
@@ -1,5 +1,5 @@
type,name,res_id,src,value,fuzzy
-error,project.work,0,There should be only one timesheet work by task/project!,Es sollte nur eine Arbeit pro Aufgabe oder Projekt geben!,0
+error,project.work,0,There should be only one timesheet work by task/project!,Es kann nur ein Zeiterfassungsblatt pro Aufgabe oder Projekt geben!,0
field,"project.work,children",0,Children,Untergeordnet (Arbeiten),0
field,"project.work,comment",0,Comment,Kommentar,0
field,"project.work,create_date",0,Creation date,Erstellungsdatum,0
@@ -18,23 +18,23 @@ field,"project.work,write_date",0,Last modification date,Zuletzt geändert am,0
field,"project.work,write_uid",0,Last modification by,Zuletzt geändert von,0
field,"timesheet.work,sequence",0,Sequence,Reihenfolge,0
field,"timesheet.work,timesheet_lines",0,Timesheet Lines,Zeitpositionen,0
-help,"project.work,effort",0,Estimated Effort for this work,Geschätzter Aufwand für diese Arbeit,0
-help,"project.work,total_effort",0,Estimated total effort for this work and the sub-works,Geschätzter Gesamtaufwand für diese Arbeit inkl. untergeordnete Arbeiten,0
+help,"project.work,effort",0,Estimated Effort for this work,Geschätzter Aufwand für diese Arbeit in Stunden,0
+help,"project.work,total_effort",0,Estimated total effort for this work and the sub-works,Geschätzter Gesamtaufwand für diese Arbeit inkl. aller untergeordneten Arbeiten in Stunden,0
+model,"ir.action,name",act_open_child_work,Tasks,Aufgaben,0
model,"ir.action,name",act_project_form,Projects,Projekte,0
model,"ir.action,name",act_task_form,Tasks,Aufgaben,0
-model,"ir.action,name",act_open_child_work,Tasks,Aufgaben,0
-model,"ir.action,name",act_work_tree,Works,Arbeiten,0
model,"ir.action,name",act_work_form,Works Efforts,Arbeiten Aufwände,0
+model,"ir.action,name",act_work_tree,Works,Arbeiten,0
model,"ir.ui.menu,name",menu_configuration,Configuration,Einstellungen,0
model,"ir.ui.menu,name",menu_project,Project Management,Projekte,0
-model,"ir.ui.menu,name",menu_project_tree,Projects,Projekte,0
model,"ir.ui.menu,name",menu_project_form,Projects,Projekte,0
+model,"ir.ui.menu,name",menu_project_tree,Projects,Projekte,0
model,"ir.ui.menu,name",menu_task_form,Tasks,Aufgaben,0
model,"ir.ui.menu,name",menu_work_form,Works Efforts,Arbeiten Aufwände,0
model,"project.work,name",0,Work Effort,Arbeit Aufwand,0
model,"res.group,name",group_project_admin,Project Administration,Projekte Administration,0
selection,"project.work,state",0,Done,Erledigt,0
-selection,"project.work,state",0,Opened,Geöffnet,0
+selection,"project.work,state",0,Opened,Offen,0
selection,"project.work,type",0,Project,Projekt,0
selection,"project.work,type",0,Task,Aufgabe,0
view,project.work,0,Children,Untergeordnet (Arbeiten),0
diff --git a/fr_FR.csv b/fr_FR.csv
index 990001a..8fbfa0b 100644
--- a/fr_FR.csv
+++ b/fr_FR.csv
@@ -15,15 +15,15 @@ field,"timesheet.work,sequence",0,Sequence,Séquence,0
field,"timesheet.work,timesheet_lines",0,Timesheet Lines,Lignes de feuille de présence,0
help,"project.work,effort",0,Estimated Effort for this work,Effort estimé pour cette activité,0
help,"project.work,total_effort",0,Estimated total effort for this work and the sub-works,Effort total estimé pour cette activité et ses sous-activités,0
+model,"ir.action,name",act_open_child_work,Tasks,Tâches,0
model,"ir.action,name",act_project_form,Projects,Projets,0
model,"ir.action,name",act_task_form,Tasks,Tâches,0
-model,"ir.action,name",act_open_child_work,Tasks,Tâches,0
-model,"ir.action,name",act_work_tree,Works,Activités,0
model,"ir.action,name",act_work_form,Works Efforts,Activités,0
+model,"ir.action,name",act_work_tree,Works,Activités,0
model,"ir.ui.menu,name",menu_configuration,Configuration,Configuration,0
model,"ir.ui.menu,name",menu_project,Project Management,Gestion de projet,0
-model,"ir.ui.menu,name",menu_project_tree,Projects,Projets,0
model,"ir.ui.menu,name",menu_project_form,Projects,Projets,0
+model,"ir.ui.menu,name",menu_project_tree,Projects,Projets,0
model,"ir.ui.menu,name",menu_task_form,Tasks,Tâches,0
model,"ir.ui.menu,name",menu_work_form,Works Efforts,Activités,0
model,"project.work,name",0,Work Effort,Tâche,0
diff --git a/project.xml b/project.xml
index 19741be..0f7d282 100644
--- a/project.xml
+++ b/project.xml
@@ -9,6 +9,9 @@ this repository contains the full copyright notices and license terms. -->
<record model="res.user" id="res.user_admin">
<field name="groups" eval="[('add', ref('group_project_admin'))]"/>
</record>
+ <record model="res.user" id="res.user_trigger">
+ <field name="groups" eval="[('add', ref('group_project_admin'))]"/>
+ </record>
<menuitem name="Project Management" sequence="7" id="menu_project"
icon="tryton-development"/>
diff --git a/tests/test_project.py b/tests/test_project.py
index 0fe889e..61ca94d 100644
--- a/tests/test_project.py
+++ b/tests/test_project.py
@@ -25,7 +25,7 @@ class ProjectTestCase(unittest.TestCase):
'''
Test views.
'''
- self.assertRaises(Exception, test_view('project'))
+ test_view('project')
def suite():
suite = trytond.tests.test_tryton.suite()
diff --git a/trytond_project.egg-info/PKG-INFO b/trytond_project.egg-info/PKG-INFO
index b884c44..ec09678 100644
--- a/trytond_project.egg-info/PKG-INFO
+++ b/trytond_project.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.0
Name: trytond-project
-Version: 1.6.0
+Version: 1.8.0
Summary: Project Module with:
- Project management
@@ -8,7 +8,7 @@ Home-page: http://www.tryton.org/
Author: B2CK
Author-email: info at b2ck.com
License: GPL-3
-Download-URL: http://downloads.tryton.org/1.6/
+Download-URL: http://downloads.tryton.org/1.8/
Description: UNKNOWN
Platform: UNKNOWN
Classifier: Development Status :: 5 - Production/Stable
diff --git a/trytond_project.egg-info/requires.txt b/trytond_project.egg-info/requires.txt
index a06f7f9..1f9aa7e 100644
--- a/trytond_project.egg-info/requires.txt
+++ b/trytond_project.egg-info/requires.txt
@@ -1,4 +1,4 @@
-trytond_timesheet >= 1.6, < 1.7
-trytond_party >= 1.6, < 1.7
-trytond_company_work_time >= 1.6, < 1.7
-trytond >= 1.6, < 1.7
\ No newline at end of file
+trytond_timesheet >= 1.8, < 1.9
+trytond_party >= 1.8, < 1.9
+trytond_company_work_time >= 1.8, < 1.9
+trytond >= 1.8, < 1.9
\ No newline at end of file
diff --git a/work.py b/work.py
index d991bf9..24f0b34 100644
--- a/work.py
+++ b/work.py
@@ -1,10 +1,11 @@
#This file is part of Tryton. The COPYRIGHT file at the top level of
#this repository contains the full copyright notices and license terms.
-"Project"
+from __future__ import with_statement
+import copy
from trytond.model import ModelView, ModelSQL, fields
from trytond.model.modelstorage import OPERATORS
from trytond.pyson import Not, Bool, Eval, Get, Equal
-import copy
+from trytond.transaction import Transaction
class TimesheetWork(ModelSQL, ModelView):
@@ -76,12 +77,12 @@ class Work(ModelSQL, ModelView):
'required': Equal(Eval('type'), 'task'),
}, select=1, depends=['type'])
- def default_type(self, cursor, user, context=None):
- if context.get('type') == 'project':
+ def default_type(self):
+ if Transaction().context.get('type') == 'project':
return 'project'
return 'task'
- def default_state(self, cursor, user, context=None):
+ def default_state(self):
return 'opened'
def __init__(self):
@@ -102,9 +103,9 @@ class Work(ModelSQL, ModelView):
self._inherit_fields['company'] = company_field
- def get_parent(self, cursor, user, ids, name, context=None):
+ def get_parent(self, ids, name):
res = dict.fromkeys(ids, None)
- project_works = self.browse(cursor, user, ids, context=context)
+ project_works = self.browse(ids)
# ptw2pw is "parent timesheet work to project works":
ptw2pw = {}
@@ -114,13 +115,11 @@ class Work(ModelSQL, ModelView):
else:
ptw2pw[project_work.work.parent.id] = [project_work.id]
- ctx = context and context.copy() or {}
- ctx['active_test'] = False
- parent_project_ids = self.search(cursor, user, [
- ('work', 'in', ptw2pw.keys()),
- ], context=ctx)
- parent_projects = self.browse(cursor, user, parent_project_ids,
- context=context)
+ with Transaction().set_context(active_test=False):
+ parent_project_ids = self.search([
+ ('work', 'in', ptw2pw.keys()),
+ ])
+ parent_projects = self.browse(parent_project_ids)
for parent_project in parent_projects:
if parent_project.work.id in ptw2pw:
child_projects = ptw2pw[parent_project.work.id]
@@ -129,24 +128,22 @@ class Work(ModelSQL, ModelView):
return res
- def set_parent(self, cursor, user, ids, name, value, context=None):
+ def set_parent(self, ids, name, value):
timesheet_work_obj = self.pool.get('timesheet.work')
if value:
- project_works = self.browse( cursor, user, ids + [value],
- context=context)
+ project_works = self.browse(ids + [value])
child_timesheet_work_ids = [x.work.id for x in project_works[:-1]]
parent_timesheet_work_id = project_works[-1].work.id
else:
- child_project_works = self.browse( cursor, user, ids, context=context)
+ child_project_works = self.browse(ids)
child_timesheet_work_ids = [x.work.id for x in child_project_works]
parent_timesheet_work_id = False
- timesheet_work_obj.write(cursor, user, child_timesheet_work_ids, {
+ timesheet_work_obj.write(child_timesheet_work_ids, {
'parent': parent_timesheet_work_id
- },
- context=context)
+ })
- def search_parent(self, cursor, user, name, domain=None, context=None):
+ def search_parent(self, name, domain=None):
timesheet_work_obj = self.pool.get('timesheet.work')
project_work_domain = []
@@ -172,11 +169,11 @@ class Work(ModelSQL, ModelView):
if operands:
operands = list(operands)
# filter out non-existing ids:
- operands = self.search(cursor, user, [
+ operands = self.search([
('id', 'in', operands)
- ], context=context)
+ ])
# create project_work > timesheet_work mapping
- for pw in self.browse(cursor, user, operands, context=context):
+ for pw in self.browse(operands):
pw2tw[pw.id] = pw.work.id
for i, d in enumerate(timesheet_work_domain):
@@ -190,25 +187,24 @@ class Work(ModelSQL, ModelView):
timesheet_work_domain[i] = (d[0], d[1], new_d2)
if project_work_domain:
- pw_ids = self.search(
- cursor, user, project_work_domain, context=context)
- project_works = self.browse(cursor, user, pw_ids, context=context)
+ pw_ids = self.search(project_work_domain)
+ project_works = self.browse(pw_ids)
timesheet_work_domain.append(
('id', 'in', [pw.work.id for pw in project_works]))
- tw_ids = timesheet_work_obj.search(
- cursor, user, timesheet_work_domain, context=context)
+ tw_ids = timesheet_work_obj.search(timesheet_work_domain)
return [('work', 'in', tw_ids)]
- def get_total_effort(self, cursor, user, ids, name, context=None):
+ def get_total_effort(self, ids, name):
- all_ids = self.search(cursor, user, [
+ all_ids = self.search([
('parent', 'child_of', ids),
- ('active', '=', True)], context=context) + ids
+ ('active', '=', True),
+ ]) + ids
all_ids = list(set(all_ids))
- works = self.browse(cursor, user, all_ids, context=context)
+ works = self.browse(all_ids)
res = {}
id2work = {}
@@ -233,20 +229,19 @@ class Work(ModelSQL, ModelView):
return res
- def delete(self, cursor, user, ids, context=None):
+ def delete(self, ids):
timesheet_work_obj = self.pool.get('timesheet.work')
if isinstance(ids, (int, long)):
ids = [ids]
# Get the timesheet works linked to the project works
- project_works = self.browse(cursor, user, ids, context=context)
+ project_works = self.browse(ids)
timesheet_work_ids = [pw.work.id for pw in project_works]
- res = super(Work, self).delete(cursor, user, ids, context=context)
+ res = super(Work, self).delete(ids)
- timesheet_work_obj.delete(
- cursor, user, timesheet_work_ids, context=context)
+ timesheet_work_obj.delete(timesheet_work_ids)
return res
commit 59d3cf10db417bd91deb31226c0161f5e397601d
Author: Daniel Baumann <daniel at debian.org>
Date: Tue Nov 2 14:27:10 2010 +0100
Switching to source format 3.0 (quilt).
diff --git a/debian/source/format b/debian/source/format
index d3827e7..163aaf8 100644
--- a/debian/source/format
+++ b/debian/source/format
@@ -1 +1 @@
-1.0
+3.0 (quilt)
commit a7020284594bf65a65d4414cc3655e6800923348
Author: Daniel Baumann <daniel at debian.org>
Date: Thu Sep 30 01:05:32 2010 +0200
Updating to standards version 3.9.1.
diff --git a/debian/control b/debian/control
index 2ab1691..c016d76 100644
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,7 @@ Uploaders:
Mathias Behrle <mathiasb at mbsolutions.selfip.biz>
Dm-Upload-Allowed: yes
Build-Depends: debhelper (>= 8), python, python-setuptools, python-support
-Standards-Version: 3.9.0
+Standards-Version: 3.9.1
Homepage: http://www.tryton.org/
Vcs-Browser: http://git.debian-maintainers.org/?p=tryton/tryton-modules-project.git
Vcs-Git: git://git.debian-maintainers.org/git/tryton/tryton-modules-project.git
commit 0d17bd5184046b57783fbcfd41c3fc3e8c1847cf
Author: Daniel Baumann <daniel at debian.org>
Date: Thu Sep 30 01:04:05 2010 +0200
Updating to debhelper version 8.
diff --git a/debian/compat b/debian/compat
index 7f8f011..45a4fb7 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-7
+8
diff --git a/debian/control b/debian/control
index d4da050..2ab1691 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,7 @@ Uploaders:
Daniel Baumann <daniel at debian.org>,
Mathias Behrle <mathiasb at mbsolutions.selfip.biz>
Dm-Upload-Allowed: yes
-Build-Depends: debhelper (>= 7), python, python-setuptools, python-support
+Build-Depends: debhelper (>= 8), python, python-setuptools, python-support
Standards-Version: 3.9.0
Homepage: http://www.tryton.org/
Vcs-Browser: http://git.debian-maintainers.org/?p=tryton/tryton-modules-project.git
commit 3b24158f4389e55a791f0f6070c5d2ad868787a4
Author: Daniel Baumann <daniel at debian.org>
Date: Mon Jun 28 20:35:30 2010 +0200
Updating standards version to 3.9.0.
diff --git a/debian/control b/debian/control
index 826ba1e..d4da050 100644
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,7 @@ Uploaders:
Mathias Behrle <mathiasb at mbsolutions.selfip.biz>
Dm-Upload-Allowed: yes
Build-Depends: debhelper (>= 7), python, python-setuptools, python-support
-Standards-Version: 3.8.4
+Standards-Version: 3.9.0
Homepage: http://www.tryton.org/
Vcs-Browser: http://git.debian-maintainers.org/?p=tryton/tryton-modules-project.git
Vcs-Git: git://git.debian-maintainers.org/git/tryton/tryton-modules-project.git
commit 40c54e52b3c6c79ff767f0bd455025de0c11be5e
Author: Mathias Behrle <mathiasb at mbsolutions.selfip.biz>
Date: Thu May 13 12:22:51 2010 +0200
Releasing debian version 1.6.0-1.
diff --git a/debian/changelog b/debian/changelog
index be8f3eb..f210d5b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+tryton-modules-project (1.6.0-1) unstable; urgency=low
+
+ [ Daniel Baumann ]
+ * Adding Dm-Upload-Allowed in control in preparation for Mathias.
+
+ [ Mathias Behrle ]
+ * Merging upstream version 1.6.0.
+ * Updating copyright.
+ * Updating depends.
+
+ -- Mathias Behrle <mathiasb at mbsolutions.selfip.biz> Thu, 13 May 2010 12:22:38 +0200
+
tryton-modules-project (1.4.0-2) unstable; urgency=low
* Making depends versioned for tryton 1.4.
commit 9dec5baaf39e018b2b616da44a58afce48780d51
Author: Mathias Behrle <mathiasb at mbsolutions.selfip.biz>
Date: Thu May 13 12:22:29 2010 +0200
Updating depends.
diff --git a/debian/control b/debian/control
index 917fcee..826ba1e 100644
--- a/debian/control
+++ b/debian/control
@@ -15,8 +15,8 @@ Vcs-Git: git://git.debian-maintainers.org/git/tryton/tryton-modules-project.git
Package: tryton-modules-project
Architecture: all
Depends:
- ${misc:Depends}, ${python:Depends}, tryton-server (>= 1.4),
- tryton-modules-party (>= 1.4), tryton-modules-timesheet (>= 1.4),
+ ${misc:Depends}, ${python:Depends}, tryton-server (>= 1.6),
+ tryton-modules-party (>= 1.6), tryton-modules-timesheet (>= 1.6),
python-pkg-resources
XB-Python-Version: ${python:Versions}
Description: Tryton Application Platform (Project Module)
commit 04e823d49c9c0b6a2dbf552ceed594db07398887
Author: Mathias Behrle <mathiasb at mbsolutions.selfip.biz>
Date: Thu May 13 12:22:27 2010 +0200
Updating copyright.
diff --git a/debian/copyright b/debian/copyright
index d30d7ce..975dbc8 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -5,9 +5,9 @@ Maintainer-Homepage: http://tryton.debian-maintainers.org/
Files: *
Copyright:
- (C) 2008-2009 Cedric Krier
- (C) 2008-2009 B2CK SPRL
- (C) 2009 Bertrand Chenal
+ (C) 2008-2010 Cedric Krier
+ (C) 2008-2010 B2CK SPRL
+ (C) 2009-2010 Bertrand Chenal
License: GPL-3+
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
commit baa22ae9a11c32ea3d15c0384aa4ca852f48ac7a
Author: Mathias Behrle <mathiasb at mbsolutions.selfip.biz>
Date: Thu May 13 11:29:39 2010 +0200
Merging upstream version 1.6.0.
diff --git a/CHANGELOG b/CHANGELOG
index 931601e..6175416 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,2 +1,5 @@
+Version 1.6.0 - 2010-05-13
+* Bug fixes (see mercurial logs for details)
+
Version 1.4.0 - 2009-10-19
* Initial release
diff --git a/COPYRIGHT b/COPYRIGHT
index 7f81258..ab06914 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,6 +1,6 @@
-Copyright (C) 2008-2009 Cédric Krier.
-Copyright (C) 2008-2009 B2CK SPRL.
-Copyright (C) 2009 Bertrand Chenal.
+Copyright (C) 2008-2010 Cédric Krier.
+Copyright (C) 2008-2010 B2CK SPRL.
+Copyright (C) 2009-2010 Bertrand Chenal.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff --git a/MANIFEST.in b/MANIFEST.in
index b2a140e..dcb2afa 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -7,5 +7,4 @@ include LICENSE
include *.xml
include *.odt
include *.csv
-include tests/*
include doc/*
diff --git a/PKG-INFO b/PKG-INFO
index 50f0550..4234a0b 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.0
Name: trytond_project
-Version: 1.4.0
+Version: 1.6.0
Summary: Project Module with:
- Project management
@@ -8,7 +8,7 @@ Home-page: http://www.tryton.org/
Author: B2CK
Author-email: info at b2ck.com
License: GPL-3
-Download-URL: http://downloads.tryton.org/1.4/
+Download-URL: http://downloads.tryton.org/1.6/
Description: UNKNOWN
Platform: UNKNOWN
Classifier: Development Status :: 5 - Production/Stable
diff --git a/__tryton__.py b/__tryton__.py
index c853d64..3233f21 100644
--- a/__tryton__.py
+++ b/__tryton__.py
@@ -6,7 +6,7 @@
'name_es_CO': 'Proyectos',
'name_es_ES': 'Proyecto',
'name_fr_FR': 'Projet',
- 'version': '1.4.0',
+ 'version': '1.6.0',
'author': 'B2CK',
'email': 'info at b2ck.com',
'website': 'http://www.tryton.org/',
diff --git a/de_DE.csv b/de_DE.csv
index 8f0fd64..bc02dab 100644
--- a/de_DE.csv
+++ b/de_DE.csv
@@ -16,7 +16,7 @@ field,"project.work,type",0,Type,Typ,0
field,"project.work,work",0,Work,Arbeit,0
field,"project.work,write_date",0,Last modification date,Zuletzt geändert am,0
field,"project.work,write_uid",0,Last modification by,Zuletzt geändert von,0
-field,"timesheet.work,sequence",0,Sequence,Sequenz,0
+field,"timesheet.work,sequence",0,Sequence,Reihenfolge,0
field,"timesheet.work,timesheet_lines",0,Timesheet Lines,Zeitpositionen,0
help,"project.work,effort",0,Estimated Effort for this work,Geschätzter Aufwand für diese Arbeit,0
help,"project.work,total_effort",0,Estimated total effort for this work and the sub-works,Geschätzter Gesamtaufwand für diese Arbeit inkl. untergeordnete Arbeiten,0
diff --git a/setup.py b/setup.py
index f2203df..2dd3fd1 100644
--- a/setup.py
+++ b/setup.py
@@ -2,19 +2,22 @@
#This file is part of Tryton. The COPYRIGHT file at the top level of
#this repository contains the full copyright notices and license terms.
-from setuptools import setup, find_packages
+from setuptools import setup
import re
-info = eval(file('__tryton__.py').read())
+info = eval(open('__tryton__.py').read())
+major_version, minor_version, _ = info.get('version', '0.0.1').split('.', 2)
+major_version = int(major_version)
+minor_version = int(minor_version)
requires = []
for dep in info.get('depends', []):
if not re.match(r'(ir|res|workflow|webdav)(\W|$)', dep):
- requires.append('trytond_' + dep)
-
-major_version, minor_version, _ = info.get('version', '0.0.1').split('.', 2)
-requires.append('trytond >= %s.%s' % (major_version, minor_version))
-requires.append('trytond < %s.%s' % (major_version, int(minor_version) + 1))
+ requires.append('trytond_%s >= %s.%s, < %s.%s' %
+ (dep, major_version, minor_version, major_version,
+ minor_version + 1))
+requires.append('trytond >= %s.%s, < %s.%s' %
+ (major_version, minor_version, major_version, minor_version + 1))
setup(name='trytond_project',
version=info.get('version', '0.0.1'),
@@ -27,6 +30,7 @@ setup(name='trytond_project',
package_dir={'trytond.modules.project': '.'},
packages=[
'trytond.modules.project',
+ 'trytond.modules.project.tests',
],
package_data={
'trytond.modules.project': info.get('xml', []) \
@@ -54,4 +58,6 @@ setup(name='trytond_project',
[trytond.modules]
project = trytond.modules.project
""",
+ test_suite='tests',
+ test_loader='trytond.test_loader:Loader',
)
diff --git a/tests/__init__.py b/tests/__init__.py
index 395d003..01c4a1b 100644
--- a/tests/__init__.py
+++ b/tests/__init__.py
@@ -1,4 +1,4 @@
#This file is part of Tryton. The COPYRIGHT file at the top level of
#this repository contains the full copyright notices and license terms.
-from test_project import *
+from test_project import suite
diff --git a/tests/test_project.py b/tests/test_project.py
index 64f7a1e..0fe889e 100644
--- a/tests/test_project.py
+++ b/tests/test_project.py
@@ -10,7 +10,7 @@ if os.path.isdir(DIR):
import unittest
import trytond.tests.test_tryton
-from trytond.tests.test_tryton import RPCProxy, CONTEXT, SOCK, test_view
+from trytond.tests.test_tryton import test_view
class ProjectTestCase(unittest.TestCase):
@@ -28,11 +28,9 @@ class ProjectTestCase(unittest.TestCase):
self.assertRaises(Exception, test_view('project'))
def suite():
- return unittest.TestLoader().loadTestsFromTestCase(ProjectTestCase)
+ suite = trytond.tests.test_tryton.suite()
+ suite.addTests(unittest.TestLoader().loadTestsFromTestCase(ProjectTestCase))
+ return suite
if __name__ == '__main__':
- suiteTrytond = trytond.tests.test_tryton.suite()
- suiteProject = suite()
- alltests = unittest.TestSuite([suiteTrytond, suiteProject])
- unittest.TextTestRunner(verbosity=2).run(alltests)
- SOCK.disconnect()
+ unittest.TextTestRunner(verbosity=2).run(suite())
diff --git a/trytond_project.egg-info/PKG-INFO b/trytond_project.egg-info/PKG-INFO
index dc35494..b884c44 100644
--- a/trytond_project.egg-info/PKG-INFO
+++ b/trytond_project.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.0
Name: trytond-project
-Version: 1.4.0
+Version: 1.6.0
Summary: Project Module with:
- Project management
@@ -8,7 +8,7 @@ Home-page: http://www.tryton.org/
Author: B2CK
Author-email: info at b2ck.com
License: GPL-3
-Download-URL: http://downloads.tryton.org/1.4/
+Download-URL: http://downloads.tryton.org/1.6/
Description: UNKNOWN
Platform: UNKNOWN
Classifier: Development Status :: 5 - Production/Stable
diff --git a/trytond_project.egg-info/SOURCES.txt b/trytond_project.egg-info/SOURCES.txt
index 3279213..fe00c05 100644
--- a/trytond_project.egg-info/SOURCES.txt
+++ b/trytond_project.egg-info/SOURCES.txt
@@ -14,6 +14,8 @@ work.xml
./__init__.py
./__tryton__.py
./work.py
+./tests/__init__.py
+./tests/test_project.py
doc/index.rst
tests/__init__.py
tests/test_project.py
diff --git a/trytond_project.egg-info/requires.txt b/trytond_project.egg-info/requires.txt
index 438098d..a06f7f9 100644
--- a/trytond_project.egg-info/requires.txt
+++ b/trytond_project.egg-info/requires.txt
@@ -1,5 +1,4 @@
-trytond_timesheet
-trytond_party
-trytond_company_work_time
-trytond >= 1.4
-trytond < 1.5
\ No newline at end of file
+trytond_timesheet >= 1.6, < 1.7
+trytond_party >= 1.6, < 1.7
+trytond_company_work_time >= 1.6, < 1.7
+trytond >= 1.6, < 1.7
\ No newline at end of file
diff --git a/work.py b/work.py
index 86ac657..d991bf9 100644
--- a/work.py
+++ b/work.py
@@ -3,6 +3,7 @@
"Project"
from trytond.model import ModelView, ModelSQL, fields
from trytond.model.modelstorage import OPERATORS
+from trytond.pyson import Not, Bool, Eval, Get, Equal
import copy
@@ -13,8 +14,8 @@ class TimesheetWork(ModelSQL, ModelView):
'Timesheet Lines',
depends=['timesheet_available', 'active'],
states={
- 'invisible': 'not bool(timesheet_available)',
- 'readonly': '''not active'''
+ 'invisible': Not(Bool(Eval('timesheet_available'))),
+ 'readonly': Not(Bool(Eval('not active'))),
})
sequence = fields.Integer('Sequence')
@@ -23,16 +24,8 @@ class TimesheetWork(ModelSQL, ModelView):
self._order.insert(0, ('sequence', 'ASC'))
self.parent = copy.copy(self.parent)
- if not self.parent.context:
- self.parent.context = "{'type': locals().get('type')}"
- elif 'type' not in self.parent.context:
- sep = ''
- if self.parent.context[-2] != ',':
- sep = ','
- self.parent.context = self.parent.context[:-1] + \
- sep + "'type': locals().get('type')" + \
- self.parent.context[-1:]
-
+ self.parent.context = copy.copy(self.parent.context)
+ self.parent.context['type'] = Eval('type')
self._reset_columns()
TimesheetWork()
@@ -52,36 +45,35 @@ class Work(ModelSQL, ModelView):
],
'Type', required=True, select=1,
states={
- 'invisible': 'context.get("type", False)',
+ 'invisible': Get(Eval('context', {}), 'type', False),
})
party = fields.Many2One('party.party', 'Party',
states={
- 'invisible': "type!= 'project'"
+ 'invisible': Not(Equal(Eval('type'), 'project')),
}, depends=['type'])
party_address = fields.Many2One('party.address', 'Contact Address',
- domain=["('party', '=', party)"],
+ domain=[('party', '=', Eval('party'))],
states={
- 'invisible': "type != 'project'"
+ 'invisible': Not(Equal(Eval('type'), 'project')),
}, depends=['party', 'type'])
effort = fields.Float("Effort",
states={
- 'invisible': "type != 'task'"
+ 'invisible': Not(Equal(Eval('type'), 'task')),
}, depends=['type'], help="Estimated Effort for this work")
- total_effort = fields.Function('get_total_effort', type='float',
- string='Total Effort',
- help="Estimated total effort for this work and the sub-works")
+ total_effort = fields.Function(fields.Float('Total Effort',
+ help="Estimated total effort for this work and the sub-works"),
+ 'get_total_effort')
comment = fields.Text('Comment')
- parent = fields.Function('get_parent', fnct_inv='set_parent',
- fnct_search='search_parent', string='Parent',
- relation='project.work', type="many2one")
+ parent = fields.Function(fields.Many2One('project.work', 'Parent'),
+ 'get_parent', setter='set_parent', searcher='search_parent')
children = fields.One2Many('project.work', 'parent', 'Children')
state = fields.Selection([
('opened', 'Opened'),
('done', 'Done'),
], 'State',
states={
- 'invisible': "type != 'task'",
- 'required': "type == 'task'",
+ 'invisible': Not(Equal(Eval('type'), 'task')),
+ 'required': Equal(Eval('type'), 'task'),
}, select=1, depends=['type'])
def default_type(self, cursor, user, context=None):
@@ -102,15 +94,15 @@ class Work(ModelSQL, ModelView):
if 'company' in self._inherit_fields:
company_field = copy.copy(
self._inherit_fields['company'])
-
- company_field[2].states={
- 'invisible': 'context.get("type", False)',
- 'readonly': '''not active'''
- }
+ company_field[2].states = copy.copy(company_field[2].states)
+ company_field[2].states.update({
+ 'invisible': Bool(Get(Eval('context', {}), 'type')),
+ 'readonly': Not(Bool(Eval('active'))),
+ })
self._inherit_fields['company'] = company_field
- def get_parent(self, cursor, user, ids, name, arg, context=None):
+ def get_parent(self, cursor, user, ids, name, context=None):
res = dict.fromkeys(ids, None)
project_works = self.browse(cursor, user, ids, context=context)
@@ -137,19 +129,19 @@ class Work(ModelSQL, ModelView):
return res
- def set_parent(self, cursor, user, id, name, value, arg, context=None):
+ def set_parent(self, cursor, user, ids, name, value, context=None):
timesheet_work_obj = self.pool.get('timesheet.work')
if value:
- child_project_work, parent_project_work = self.browse(
- cursor, user, [id, value], context=context)
- child_timesheet_work_id = child_project_work.work.id
- parent_timesheet_work_id = parent_project_work.work.id
+ project_works = self.browse( cursor, user, ids + [value],
+ context=context)
+ child_timesheet_work_ids = [x.work.id for x in project_works[:-1]]
+ parent_timesheet_work_id = project_works[-1].work.id
else:
- child_project_work = self.browse( cursor, user, id, context=context)
- child_timesheet_work_id = child_project_work.work.id
+ child_project_works = self.browse( cursor, user, ids, context=context)
+ child_timesheet_work_ids = [x.work.id for x in child_project_works]
parent_timesheet_work_id = False
- timesheet_work_obj.write(cursor, user, child_timesheet_work_id, {
+ timesheet_work_obj.write(cursor, user, child_timesheet_work_ids, {
'parent': parent_timesheet_work_id
},
context=context)
@@ -159,13 +151,12 @@ class Work(ModelSQL, ModelView):
project_work_domain = []
timesheet_work_domain = []
- for field, operator, operand in domain:
- if field.startswith('parent.'):
- project_work_domain.append(
- (field.replace('parent.', ''), operator, operand))
- elif field == 'parent':
- timesheet_work_domain.append(
- (field, operator, operand))
+ if domain[0].startswith('parent.'):
+ project_work_domain.append(
+ (domain[0].replace('parent.', ''),)
+ + domain[1:])
+ elif domain[0] == 'parent':
+ timesheet_work_domain.append(domain)
# ids timesheet_work_domain in operand are project_work ids,
# we need to convert them to timesheet_work ids
@@ -210,7 +201,7 @@ class Work(ModelSQL, ModelView):
return [('work', 'in', tw_ids)]
- def get_total_effort(self, cursor, user, ids, name, arg, context=None):
+ def get_total_effort(self, cursor, user, ids, name, context=None):
all_ids = self.search(cursor, user, [
('parent', 'child_of', ids),
diff --git a/work.xml b/work.xml
index a2697ca..3640678 100644
--- a/work.xml
+++ b/work.xml
@@ -92,7 +92,7 @@ this repository contains the full copyright notices and license terms. -->
<field name="comment" colspan="4"/>
</page>
<page string="Children" id="children"
- states="{'invisible': '''type != 'project' '''}">
+ states="{'invisible': Not(Equal(Eval('type'), 'project'))}">
<field name="children" colspan="4">
<tree string="Children">
<field name="name"/>
@@ -104,7 +104,7 @@ this repository contains the full copyright notices and license terms. -->
</field>
</page>
<page string="Timesheet" id="timesheet_lines"
- states="{'invisible': '''not bool(timesheet_available) '''}">
+ states="{'invisible': Not(Bool(Eval('timesheet_available')))}">
<field name="timesheet_lines" colspan="4"/>
</page>
</notebook>
@@ -196,7 +196,7 @@ this repository contains the full copyright notices and license terms. -->
<field name="res_model">project.work</field>
<field name="view_type">form</field>
<field name="context">{'type': 'task'}</field>
- <field name="domain">[('parent', '=', active_id), ('type', '=', 'task')]</field>
+ <field name="domain">[('parent', '=', Eval('active_id')), ('type', '=', 'task')]</field>
</record>
<record model="ir.action.keyword"
id="act_open_project_work_keyword1">
commit a3b46160dec02d5e2c422dc20637bd8f240b424f
Author: Daniel Baumann <daniel at debian.org>
Date: Fri Apr 9 14:31:33 2010 +0200
Adding Dm-Upload-Allowed in control in preparation for Mathias.
diff --git a/debian/control b/debian/control
index 827136d..917fcee 100644
--- a/debian/control
+++ b/debian/control
@@ -5,6 +5,7 @@ Maintainer: Debian Tryton Maintainers <tryton at lists.debian-maintainers.org>
Uploaders:
Daniel Baumann <daniel at debian.org>,
Mathias Behrle <mathiasb at mbsolutions.selfip.biz>
+Dm-Upload-Allowed: yes
Build-Depends: debhelper (>= 7), python, python-setuptools, python-support
Standards-Version: 3.8.4
Homepage: http://www.tryton.org/
commit 089f4d1f70ea2cd05cc19f66ed0ad58953d831b1
Author: Daniel Baumann <daniel at debian.org>
Date: Sat Feb 20 10:46:14 2010 +0100
Releasing debian version 1.4.0-2.
diff --git a/debian/changelog b/debian/changelog
index 7de4dd9..be8f3eb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+tryton-modules-project (1.4.0-2) unstable; urgency=low
+
+ * Making depends versioned for tryton 1.4.
+ * Adding explicit debian source version 1.0 until switch to 3.0.
+ * Updating year in copyright file.
+ * Removing unneeded python-all-dev from build-depends.
+ * Updating to standards 3.8.4.
+ * Updating README.source.
+
+ -- Daniel Baumann <daniel at debian.org> Sat, 20 Feb 2010 10:46:10 +0100
+
tryton-modules-project (1.4.0-1) unstable; urgency=low
* Initial release.
commit a585a77dfe73077acd3be5a55d059fad34035910
Author: Daniel Baumann <daniel at debian.org>
Date: Sat Feb 20 10:45:53 2010 +0100
Updating README.source.
diff --git a/debian/README.source b/debian/README.source
index dcc7ba3..18b6b24 100644
--- a/debian/README.source
+++ b/debian/README.source
@@ -32,6 +32,6 @@ upstream source. Changes, if any, are stored in the source package as diffs in
debian/diff and are applied during the build. Current modifications can be
applied to the source tree with:
- $ quilt push -a
+ $ QUILT_PATCHES=debian/patches quilt push -a
More information about Quilt can be found in the quilt package.
commit dce95c817ddbb53d8c2fd2ea3df08fe239c5ae9d
Author: Daniel Baumann <daniel at debian.org>
Date: Thu Jan 28 07:53:22 2010 +0100
Updating to standards 3.8.4.
diff --git a/debian/control b/debian/control
index 1cc22dc..827136d 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,7 @@ Uploaders:
Daniel Baumann <daniel at debian.org>,
Mathias Behrle <mathiasb at mbsolutions.selfip.biz>
Build-Depends: debhelper (>= 7), python, python-setuptools, python-support
-Standards-Version: 3.8.3
+Standards-Version: 3.8.4
Homepage: http://www.tryton.org/
Vcs-Browser: http://git.debian-maintainers.org/?p=tryton/tryton-modules-project.git
Vcs-Git: git://git.debian-maintainers.org/git/tryton/tryton-modules-project.git
commit f154b0528475f14879e72bdee3a28bac418fa1ca
Author: Daniel Baumann <daniel at debian.org>
Date: Mon Jan 25 10:12:28 2010 +0100
Removing unneeded python-all-dev from build-depends.
diff --git a/debian/control b/debian/control
index 4293d0f..1cc22dc 100644
--- a/debian/control
+++ b/debian/control
@@ -5,8 +5,7 @@ Maintainer: Debian Tryton Maintainers <tryton at lists.debian-maintainers.org>
Uploaders:
Daniel Baumann <daniel at debian.org>,
Mathias Behrle <mathiasb at mbsolutions.selfip.biz>
-Build-Depends:
- debhelper (>= 7), python, python-all-dev, python-setuptools, python-support
+Build-Depends: debhelper (>= 7), python, python-setuptools, python-support
Standards-Version: 3.8.3
Homepage: http://www.tryton.org/
Vcs-Browser: http://git.debian-maintainers.org/?p=tryton/tryton-modules-project.git
commit 85c973d3ee9360815a3b030404e892d995e89b73
Author: Daniel Baumann <daniel at debian.org>
Date: Sat Jan 2 11:35:31 2010 +0100
Updating year in copyright file.
diff --git a/debian/copyright b/debian/copyright
index f5d6e13..d30d7ce 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -26,7 +26,7 @@ License: GPL-3+
can be found in /usr/share/common-licenses/GPL-3 file.
Files: debian/*
-Copyright: (C) 2009 Daniel Baumann <daniel at debian.org>
+Copyright: (C) 2009-2010 Daniel Baumann <daniel at debian.org>
License: GPL-3+
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
commit afd5d8a4d434251d0a6b6b593328bc21159eb3f2
Author: Daniel Baumann <daniel at debian.org>
Date: Sat Dec 12 10:06:37 2009 +0100
Adding explicit debian source version 1.0 until switch to 3.0.
diff --git a/debian/source/format b/debian/source/format
new file mode 100644
index 0000000..d3827e7
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+1.0
commit dab163873d42eaa9f346a51c0126b4e524bc8f31
Author: Daniel Baumann <daniel at debian.org>
Date: Wed Nov 4 12:22:20 2009 +0100
Making depends versioned for tryton 1.4.
diff --git a/debian/control b/debian/control
index d025214..4293d0f 100644
--- a/debian/control
+++ b/debian/control
@@ -15,8 +15,9 @@ Vcs-Git: git://git.debian-maintainers.org/git/tryton/tryton-modules-project.git
Package: tryton-modules-project
Architecture: all
Depends:
- ${misc:Depends}, ${python:Depends}, tryton-server, tryton-modules-party,
- tryton-modules-timesheet, python-pkg-resources
+ ${misc:Depends}, ${python:Depends}, tryton-server (>= 1.4),
+ tryton-modules-party (>= 1.4), tryton-modules-timesheet (>= 1.4),
+ python-pkg-resources
XB-Python-Version: ${python:Versions}
Description: Tryton Application Platform (Project Module)
Tryton is a high-level general purpose application platform written in Python
commit 2249efd8b55b24487e3893662d7f4f4635020a54
Author: Daniel Baumann <daniel at debian.org>
Date: Mon Oct 19 22:54:53 2009 +0200
Adding debian version 1.4.0-1.
diff --git a/CHANGELOG b/CHANGELOG
new file mode 100644
index 0000000..931601e
--- /dev/null
+++ b/CHANGELOG
@@ -0,0 +1,2 @@
+Version 1.4.0 - 2009-10-19
+* Initial release
diff --git a/COPYRIGHT b/COPYRIGHT
new file mode 100644
index 0000000..7f81258
--- /dev/null
+++ b/COPYRIGHT
@@ -0,0 +1,16 @@
+Copyright (C) 2008-2009 Cédric Krier.
+Copyright (C) 2008-2009 B2CK SPRL.
+Copyright (C) 2009 Bertrand Chenal.
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program. If not, see <http://www.gnu.org/licenses/>.
diff --git a/INSTALL b/INSTALL
new file mode 100644
index 0000000..a3bda33
--- /dev/null
+++ b/INSTALL
@@ -0,0 +1,31 @@
+Installing trytond_project
+==========================
+
+Prerequisites
+-------------
+
+ * Python 2.4 or later (http://www.python.org/)
+ * trytond (http://www.tryton.org/)
+ * trytond_timesheet (http://www.tryton.org/)
+ * trytond_party (http://www.tryton.org/)
+
+Installation
+------------
+
+Once you've downloaded and unpacked the trytond_project source release, enter the
+directory where the archive was unpacked, and run:
+
+ python setup.py install
+
+Note that you may need administrator/root privileges for this step, as
+this command will by default attempt to install module to the Python
+site-packages directory on your system.
+
+For advanced options, please refer to the easy_install and/or the distutils
+documentation:
+
+ http://peak.telecommunity.com/DevCenter/EasyInstall
+ http://docs.python.org/inst/inst.html
+
+To use without installation, extract the archive into ``trytond/modules`` with
+the directory name project.
diff --git a/LICENSE b/LICENSE
new file mode 100644
index 0000000..94a9ed0
--- /dev/null
+++ b/LICENSE
@@ -0,0 +1,674 @@
+ GNU GENERAL PUBLIC LICENSE
+ Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+ Preamble
+
+ The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
+
+ The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works. By contrast,
+the GNU General Public License is intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users. We, the Free Software Foundation, use the
+GNU General Public License for most of our software; it applies also to
+any other work released this way by its authors. You can apply it to
+your programs, too.
+
+ When we speak of free software, we are referring to freedom, not
+price. Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+ To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights. Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+you modify it: responsibilities to respect the freedom of others.
+
+ For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received. You must make sure that they, too, receive
+or can get the source code. And you must show them these terms so they
+know their rights.
+
+ Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
+
+ For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software. For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
+
+ Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the manufacturer
+can do so. This is fundamentally incompatible with the aim of
+protecting users' freedom to change the software. The systematic
+pattern of such abuse occurs in the area of products for individuals to
+use, which is precisely where it is most unacceptable. Therefore, we
+have designed this version of the GPL to prohibit the practice for those
+products. If such problems arise substantially in other domains, we
+stand ready to extend this provision to those domains in future versions
+of the GPL, as needed to protect the freedom of users.
+
+ Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish to
+avoid the special danger that patents applied to a free program could
+make it effectively proprietary. To prevent this, the GPL assures that
+patents cannot be used to render the program non-free.
+
+ The precise terms and conditions for copying, distribution and
+modification follow.
+
+ TERMS AND CONDITIONS
+
+ 0. Definitions.
+
+ "This License" refers to version 3 of the GNU General Public License.
+
+ "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+ "The Program" refers to any copyrightable work licensed under this
+License. Each licensee is addressed as "you". "Licensees" and
+"recipients" may be individuals or organizations.
+
+ To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy. The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+ A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+ To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy. Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+ To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies. Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+ An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License. If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+ 1. Source Code.
+
+ The "source code" for a work means the preferred form of the work
+for making modifications to it. "Object code" means any non-source
+form of a work.
+
+ A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+ The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form. A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+ The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities. However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work. For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+ The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+ The Corresponding Source for a work in source code form is that
+same work.
+
+ 2. Basic Permissions.
+
+ All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met. This License explicitly affirms your unlimited
+permission to run the unmodified Program. The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work. This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+ You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force. You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright. Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+ Conveying under any other circumstances is permitted solely under
+the conditions stated below. Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+ 3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+ No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+ When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+ 4. Conveying Verbatim Copies.
+
+ You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+ You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+ 5. Conveying Modified Source Versions.
+
+ You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+ a) The work must carry prominent notices stating that you modified
+ it, and giving a relevant date.
+
+ b) The work must carry prominent notices stating that it is
+ released under this License and any conditions added under section
+ 7. This requirement modifies the requirement in section 4 to
+ "keep intact all notices".
+
+ c) You must license the entire work, as a whole, under this
+ License to anyone who comes into possession of a copy. This
+ License will therefore apply, along with any applicable section 7
+ additional terms, to the whole of the work, and all its parts,
+ regardless of how they are packaged. This License gives no
+ permission to license the work in any other way, but it does not
+ invalidate such permission if you have separately received it.
+
+ d) If the work has interactive user interfaces, each must display
+ Appropriate Legal Notices; however, if the Program has interactive
+ interfaces that do not display Appropriate Legal Notices, your
+ work need not make them do so.
+
+ A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit. Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+ 6. Conveying Non-Source Forms.
+
+ You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+ a) Convey the object code in, or embodied in, a physical product
+ (including a physical distribution medium), accompanied by the
+ Corresponding Source fixed on a durable physical medium
+ customarily used for software interchange.
+
+ b) Convey the object code in, or embodied in, a physical product
+ (including a physical distribution medium), accompanied by a
+ written offer, valid for at least three years and valid for as
+ long as you offer spare parts or customer support for that product
+ model, to give anyone who possesses the object code either (1) a
+ copy of the Corresponding Source for all the software in the
+ product that is covered by this License, on a durable physical
+ medium customarily used for software interchange, for a price no
+ more than your reasonable cost of physically performing this
+ conveying of source, or (2) access to copy the
+ Corresponding Source from a network server at no charge.
+
+ c) Convey individual copies of the object code with a copy of the
+ written offer to provide the Corresponding Source. This
+ alternative is allowed only occasionally and noncommercially, and
+ only if you received the object code with such an offer, in accord
+ with subsection 6b.
+
+ d) Convey the object code by offering access from a designated
+ place (gratis or for a charge), and offer equivalent access to the
+ Corresponding Source in the same way through the same place at no
+ further charge. You need not require recipients to copy the
+ Corresponding Source along with the object code. If the place to
+ copy the object code is a network server, the Corresponding Source
+ may be on a different server (operated by you or a third party)
+ that supports equivalent copying facilities, provided you maintain
+ clear directions next to the object code saying where to find the
+ Corresponding Source. Regardless of what server hosts the
+ Corresponding Source, you remain obligated to ensure that it is
+ available for as long as needed to satisfy these requirements.
+
+ e) Convey the object code using peer-to-peer transmission, provided
+ you inform other peers where the object code and Corresponding
+ Source of the work are being offered to the general public at no
+ charge under subsection 6d.
+
+ A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+ A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling. In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage. For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product. A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+ "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source. The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+ If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information. But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+ The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed. Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+ Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+ 7. Additional Terms.
+
+ "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law. If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+ When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it. (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.) You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+ Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+ a) Disclaiming warranty or limiting liability differently from the
+ terms of sections 15 and 16 of this License; or
+
+ b) Requiring preservation of specified reasonable legal notices or
+ author attributions in that material or in the Appropriate Legal
+ Notices displayed by works containing it; or
+
+ c) Prohibiting misrepresentation of the origin of that material, or
+ requiring that modified versions of such material be marked in
+ reasonable ways as different from the original version; or
+
+ d) Limiting the use for publicity purposes of names of licensors or
+ authors of the material; or
+
+ e) Declining to grant rights under trademark law for use of some
+ trade names, trademarks, or service marks; or
+
+ f) Requiring indemnification of licensors and authors of that
+ material by anyone who conveys the material (or modified versions of
+ it) with contractual assumptions of liability to the recipient, for
+ any liability that these contractual assumptions directly impose on
+ those licensors and authors.
+
+ All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10. If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term. If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+ If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+ Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+ 8. Termination.
+
+ You may not propagate or modify a covered work except as expressly
+provided under this License. Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+ However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+ Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+ Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License. If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+ 9. Acceptance Not Required for Having Copies.
+
+ You are not required to accept this License in order to receive or
+run a copy of the Program. Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance. However,
+nothing other than this License grants you permission to propagate or
+modify any covered work. These actions infringe copyright if you do
+not accept this License. Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+ 10. Automatic Licensing of Downstream Recipients.
+
+ Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License. You are not responsible
+for enforcing compliance by third parties with this License.
+
+ An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations. If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+ You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License. For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+ 11. Patents.
+
+ A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based. The
+work thus licensed is called the contributor's "contributor version".
+
+ A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version. For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+ Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+ In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement). To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+ If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients. "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+ If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+ A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License. You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+ Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+ 12. No Surrender of Others' Freedom.
+
+ If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License. If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all. For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+ 13. Use with the GNU Affero General Public License.
+
+ Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU Affero General Public License into a single
+combined work, and to convey the resulting work. The terms of this
+License will continue to apply to the part which is the covered work,
+but the special requirements of the GNU Affero General Public License,
+section 13, concerning interaction through a network will apply to the
+combination as such.
+
+ 14. Revised Versions of this License.
+
+ The Free Software Foundation may publish revised and/or new versions of
+the GNU General Public License from time to time. Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+ Each version is given a distinguishing version number. If the
+Program specifies that a certain numbered version of the GNU General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation. If the Program does not specify a version number of the
+GNU General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+ If the Program specifies that a proxy can decide which future
+versions of the GNU General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+ Later license versions may give you additional or different
+permissions. However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+ 15. Disclaimer of Warranty.
+
+ THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+ 16. Limitation of Liability.
+
+ IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+ 17. Interpretation of Sections 15 and 16.
+
+ If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+ END OF TERMS AND CONDITIONS
+
+ How to Apply These Terms to Your New Programs
+
+ If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+ To do so, attach the following notices to the program. It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+ <one line to give the program's name and a brief idea of what it does.>
+ Copyright (C) <year> <name of author>
+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper mail.
+
+ If the program does terminal interaction, make it output a short
+notice like this when it starts in an interactive mode:
+
+ <program> Copyright (C) <year> <name of author>
+ This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+ This is free software, and you are welcome to redistribute it
+ under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License. Of course, your program's commands
+might be different; for a GUI interface, you would use an "about box".
+
+ You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU GPL, see
+<http://www.gnu.org/licenses/>.
+
+ The GNU General Public License does not permit incorporating your program
+into proprietary programs. If your program is a subroutine library, you
+may consider it more useful to permit linking proprietary applications with
+the library. If this is what you want to do, use the GNU Lesser General
+Public License instead of this License. But first, please read
+<http://www.gnu.org/philosophy/why-not-lgpl.html>.
diff --git a/MANIFEST.in b/MANIFEST.in
new file mode 100644
index 0000000..b2a140e
--- /dev/null
+++ b/MANIFEST.in
@@ -0,0 +1,11 @@
+include INSTALL
+include README
+include TODO
+include COPYRIGHT
+include CHANGELOG
+include LICENSE
+include *.xml
+include *.odt
+include *.csv
+include tests/*
+include doc/*
diff --git a/PKG-INFO b/PKG-INFO
new file mode 100644
index 0000000..50f0550
--- /dev/null
+++ b/PKG-INFO
@@ -0,0 +1,26 @@
+Metadata-Version: 1.0
+Name: trytond_project
+Version: 1.4.0
+Summary: Project Module with:
+ - Project management
+
+Home-page: http://www.tryton.org/
+Author: B2CK
+Author-email: info at b2ck.com
+License: GPL-3
+Download-URL: http://downloads.tryton.org/1.4/
+Description: UNKNOWN
+Platform: UNKNOWN
+Classifier: Development Status :: 5 - Production/Stable
+Classifier: Environment :: Plugins
+Classifier: Intended Audience :: Developers
+Classifier: Intended Audience :: Financial and Insurance Industry
+Classifier: Intended Audience :: Legal Industry
+Classifier: Intended Audience :: Manufacturing
+Classifier: License :: OSI Approved :: GNU General Public License (GPL)
+Classifier: Natural Language :: English
+Classifier: Natural Language :: French
+Classifier: Natural Language :: German
+Classifier: Operating System :: OS Independent
+Classifier: Programming Language :: Python
+Classifier: Topic :: Office/Business
diff --git a/README b/README
new file mode 100644
index 0000000..69576d7
--- /dev/null
+++ b/README
@@ -0,0 +1,36 @@
+trytond_project
+===============
+
+The project module of the Tryton application platform.
+See __tryton__.py
+
+Installing
+----------
+
+See INSTALL
+
+Support
+-------
+
+If you encounter any problems with Tryton, please don't hesitate to ask
+questions on the Tryton bug tracker, mailing list, wiki or IRC channel:
+
+ http://bugs.tryton.org/
+ http://groups.tryton.org/
+ http://wiki.tryton.org/
+ irc://irc.freenode.net/tryton
+
+License
+-------
+
+See LICENSE
+
+Copyright
+---------
+
+See COPYRIGHT
+
+
+For more information please visit the Tryton web site:
+
+ http://www.tryton.org/
diff --git a/__init__.py b/__init__.py
new file mode 100644
index 0000000..78e67a2
--- /dev/null
+++ b/__init__.py
@@ -0,0 +1,4 @@
+#This file is part of Tryton. The COPYRIGHT file at the top level of
+#this repository contains the full copyright notices and license terms.
+
+from work import *
diff --git a/__tryton__.py b/__tryton__.py
new file mode 100644
index 0000000..c853d64
--- /dev/null
+++ b/__tryton__.py
@@ -0,0 +1,44 @@
+#This file is part of Tryton. The COPYRIGHT file at the top level of
+#this repository contains the full copyright notices and license terms.
+{
+ 'name': 'Project',
+ 'name_de_DE': 'Projekte',
+ 'name_es_CO': 'Proyectos',
+ 'name_es_ES': 'Proyecto',
+ 'name_fr_FR': 'Projet',
+ 'version': '1.4.0',
+ 'author': 'B2CK',
+ 'email': 'info at b2ck.com',
+ 'website': 'http://www.tryton.org/',
+ 'description': '''Project Module with:
+ - Project management
+''',
+ 'description_de_DE': '''Projektmodul für:
+ - Projektverwaltung
+''',
+ 'description_es_CO': '''Módulo de proyectos con:
+ - Gestión de proyectos
+''',
+ 'description_es_ES': '''Módulo de proyecto con:
+ - Gestión de proyecto
+''',
+ 'description_fr_FR': '''Module projet avec:
+ - Gestion de projet
+''',
+ 'depends': [
+ 'ir',
+ 'timesheet',
+ 'party',
+ 'company_work_time',
+ ],
+ 'xml': [
+ 'project.xml',
+ 'work.xml',
+ ],
+ 'translation': [
+ 'de_DE.csv',
+ 'es_CO.csv',
+ 'es_ES.csv',
+ 'fr_FR.csv',
+ ],
+}
diff --git a/de_DE.csv b/de_DE.csv
new file mode 100644
index 0000000..8f0fd64
--- /dev/null
+++ b/de_DE.csv
@@ -0,0 +1,49 @@
+type,name,res_id,src,value,fuzzy
+error,project.work,0,There should be only one timesheet work by task/project!,Es sollte nur eine Arbeit pro Aufgabe oder Projekt geben!,0
+field,"project.work,children",0,Children,Untergeordnet (Arbeiten),0
+field,"project.work,comment",0,Comment,Kommentar,0
+field,"project.work,create_date",0,Creation date,Erstellungsdatum,0
+field,"project.work,create_uid",0,Creation user,Ersteller,0
+field,"project.work,effort",0,Effort,Aufwand,0
+field,"project.work,id",0,ID,ID,0
+field,"project.work,parent",0,Parent,Ãœbergeordnet (Arbeit),0
+field,"project.work,party",0,Party,Partei,0
+field,"project.work,party_address",0,Contact Address,Kontaktadresse,0
+field,"project.work,rec_name",0,Name,Name,0
+field,"project.work,state",0,State,Status,0
+field,"project.work,total_effort",0,Total Effort,Gesamtaufwand,0
+field,"project.work,type",0,Type,Typ,0
+field,"project.work,work",0,Work,Arbeit,0
+field,"project.work,write_date",0,Last modification date,Zuletzt geändert am,0
+field,"project.work,write_uid",0,Last modification by,Zuletzt geändert von,0
+field,"timesheet.work,sequence",0,Sequence,Sequenz,0
+field,"timesheet.work,timesheet_lines",0,Timesheet Lines,Zeitpositionen,0
+help,"project.work,effort",0,Estimated Effort for this work,Geschätzter Aufwand für diese Arbeit,0
+help,"project.work,total_effort",0,Estimated total effort for this work and the sub-works,Geschätzter Gesamtaufwand für diese Arbeit inkl. untergeordnete Arbeiten,0
+model,"ir.action,name",act_project_form,Projects,Projekte,0
+model,"ir.action,name",act_task_form,Tasks,Aufgaben,0
+model,"ir.action,name",act_open_child_work,Tasks,Aufgaben,0
+model,"ir.action,name",act_work_tree,Works,Arbeiten,0
+model,"ir.action,name",act_work_form,Works Efforts,Arbeiten Aufwände,0
+model,"ir.ui.menu,name",menu_configuration,Configuration,Einstellungen,0
+model,"ir.ui.menu,name",menu_project,Project Management,Projekte,0
+model,"ir.ui.menu,name",menu_project_tree,Projects,Projekte,0
+model,"ir.ui.menu,name",menu_project_form,Projects,Projekte,0
+model,"ir.ui.menu,name",menu_task_form,Tasks,Aufgaben,0
+model,"ir.ui.menu,name",menu_work_form,Works Efforts,Arbeiten Aufwände,0
+model,"project.work,name",0,Work Effort,Arbeit Aufwand,0
+model,"res.group,name",group_project_admin,Project Administration,Projekte Administration,0
+selection,"project.work,state",0,Done,Erledigt,0
+selection,"project.work,state",0,Opened,Geöffnet,0
+selection,"project.work,type",0,Project,Projekt,0
+selection,"project.work,type",0,Task,Aufgabe,0
+view,project.work,0,Children,Untergeordnet (Arbeiten),0
+view,project.work,0,General,Allgemein,0
+view,project.work,0,Other Info,Sonstiges,0
+view,project.work,0,Projects,Projekte,0
+view,project.work,0,Tasks,Aufgaben,0
+view,project.work,0,Timesheet,Zeiterfassungsblatt,0
+view,project.work,0,Work,Arbeit,0
+view,project.work,0,Work Efforts,Arbeit Aufwände,0
+view,project.work,0,Works,Arbeiten,0
+view,project.work,0,Works Efforts,Arbeiten Aufwände,0
diff --git a/debian/README.source b/debian/README.source
new file mode 100644
index 0000000..dcc7ba3
--- /dev/null
+++ b/debian/README.source
@@ -0,0 +1,37 @@
+Package Repositories
+--------------------
+
+Backports for the current stable debian distribution as well as snapshots of
+unreleased versions may be available in repositories listed on the maintainers
+homepage. The current URL of the maintainer homepage can be seen in
+debian/copyright.
+
+
+Source Access
+-------------
+
+You can obtain the sources of this package with:
+
+ $ apt-get source ${PACKAGE}
+
+whereas '${PACKAGE}' has to be replaced with the actual name of the package.
+
+This package is maintained with the Git version control system. The current git
+source tree can be obtained with:
+
+ $ git clone ${GIT_URI}
+
+whereas '${GIT_URI}' has to be replaced with the actual URI for the Git
+repository. The current Git URI can be seen in debian/control in the extracted
+package sources.
+
+More information about Git can be found in the git-core package.
+
+This package may use the Quilt patch system to manage all modifications to the
+upstream source. Changes, if any, are stored in the source package as diffs in
+debian/diff and are applied during the build. Current modifications can be
+applied to the source tree with:
+
+ $ quilt push -a
+
+More information about Quilt can be found in the quilt package.
diff --git a/debian/changelog b/debian/changelog
new file mode 100644
index 0000000..7de4dd9
--- /dev/null
+++ b/debian/changelog
@@ -0,0 +1,5 @@
+tryton-modules-project (1.4.0-1) unstable; urgency=low
+
+ * Initial release.
+
+ -- Daniel Baumann <daniel at debian.org> Tue, 20 Oct 2009 12:45:48 +0200
diff --git a/debian/compat b/debian/compat
new file mode 100644
index 0000000..7f8f011
--- /dev/null
+++ b/debian/compat
@@ -0,0 +1 @@
+7
diff --git a/debian/control b/debian/control
new file mode 100644
index 0000000..d025214
--- /dev/null
+++ b/debian/control
@@ -0,0 +1,26 @@
+Source: tryton-modules-project
+Section: python
+Priority: optional
+Maintainer: Debian Tryton Maintainers <tryton at lists.debian-maintainers.org>
+Uploaders:
+ Daniel Baumann <daniel at debian.org>,
+ Mathias Behrle <mathiasb at mbsolutions.selfip.biz>
+Build-Depends:
+ debhelper (>= 7), python, python-all-dev, python-setuptools, python-support
+Standards-Version: 3.8.3
+Homepage: http://www.tryton.org/
+Vcs-Browser: http://git.debian-maintainers.org/?p=tryton/tryton-modules-project.git
+Vcs-Git: git://git.debian-maintainers.org/git/tryton/tryton-modules-project.git
+
+Package: tryton-modules-project
+Architecture: all
+Depends:
+ ${misc:Depends}, ${python:Depends}, tryton-server, tryton-modules-party,
+ tryton-modules-timesheet, python-pkg-resources
+XB-Python-Version: ${python:Versions}
+Description: Tryton Application Platform (Project Module)
+ Tryton is a high-level general purpose application platform written in Python
+ and using PostgreSQL as database engine. It is the core base of a complete
+ business solution.
+ .
+ This module adds the possibility to manage projects.
diff --git a/debian/copyright b/debian/copyright
new file mode 100644
index 0000000..f5d6e13
--- /dev/null
+++ b/debian/copyright
@@ -0,0 +1,45 @@
+Upstream-Contact: Tryton project <tryton at googlegroups.com>
+Upstream-Homepage: http://downloads.tryton.org/
+Maintainer-Contact: Debian Tryton Maintainers <tryton at lists.debian-maintainers.org>
+Maintainer-Homepage: http://tryton.debian-maintainers.org/
+
+Files: *
+Copyright:
+ (C) 2008-2009 Cedric Krier
+ (C) 2008-2009 B2CK SPRL
+ (C) 2009 Bertrand Chenal
+License: GPL-3+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+ .
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+ .
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+ .
+ On Debian systems, the complete text of the GNU General Public License
+ can be found in /usr/share/common-licenses/GPL-3 file.
+
+Files: debian/*
+Copyright: (C) 2009 Daniel Baumann <daniel at debian.org>
+License: GPL-3+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+ .
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+ .
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+ .
+ On Debian systems, the complete text of the GNU General Public License
+ can be found in /usr/share/common-licenses/GPL-3 file.
diff --git a/debian/pycompat b/debian/pycompat
new file mode 100644
index 0000000..0cfbf08
--- /dev/null
+++ b/debian/pycompat
@@ -0,0 +1 @@
+2
diff --git a/debian/pyversions b/debian/pyversions
new file mode 100644
index 0000000..8b253bc
--- /dev/null
+++ b/debian/pyversions
@@ -0,0 +1 @@
+2.4-
diff --git a/debian/rules b/debian/rules
new file mode 100755
index 0000000..000210b
--- /dev/null
+++ b/debian/rules
@@ -0,0 +1,4 @@
+#!/usr/bin/make -f
+
+%:
+ dh ${@}
diff --git a/doc/index.rst b/doc/index.rst
new file mode 100644
index 0000000..5c60d51
--- /dev/null
+++ b/doc/index.rst
@@ -0,0 +1,29 @@
+Project Module
+##############
+
+The Project module provides the concepts of project and task and the
+basis for simple project management.
+
+
+Work
+####
+
+The Work model from the Timesheet module is extended and is used for
+creating both projects and tasks. This allows for instance to
+transform a task into a project if it gets bigger and need to be
+split. The following fields are added to the work model:
+
+
+- Type: Can be *Project* or *Task*.
+- State: Can be *Opened* or *Done*.
+- Parent and Children: Define the tree structure of projects and
+ tasks.
+- Party and Party Address: The optional party (and the contact
+ address) for which the project is made. Available on projects.
+- Effort: The estimated effort of a task.
+- Total Effort: Available on projects. Gives the total effort of the
+ sub-tasks (I.E. tasks of the project and tasks of the sub-projects)
+ of the current project.
+- Timesheet Lines: The list of timesheet lines associated to the
+ current project or the current task.
+- Comment: A description.
diff --git a/es_CO.csv b/es_CO.csv
new file mode 100644
index 0000000..81b6325
--- /dev/null
+++ b/es_CO.csv
@@ -0,0 +1,44 @@
+type,name,res_id,src,value,fuzzy
+error,project.work,0,There should be only one timesheet work by task/project!,¡Debe haber sólo una hoja de tiempo por tarea/proyecto!,0
+field,"project.work,children",0,Children,Descendientes,0
+field,"project.work,comment",0,Comment,Comentario,0
+field,"project.work,effort",0,Effort,Esfuerzo,0
+field,"project.work,parent",0,Parent,Padre,0
+field,"project.work,party",0,Party,Tercero,0
+field,"project.work,party_address",0,Contact Address,Dirección de Contacto,0
+field,"project.work,rec_name",0,Name,Nombre,0
+field,"project.work,state",0,State,Estado,0
+field,"project.work,total_effort",0,Total Effort,Esfuerzo Total,0
+field,"project.work,type",0,Type,Tipo,0
+field,"project.work,work",0,Work,Trabajo,0
+field,"timesheet.work,sequence",0,Sequence,Secuencia,0
+field,"timesheet.work,timesheet_lines",0,Timesheet Lines,Lineas de Hoja de Tiempo,0
+help,"project.work,effort",0,Estimated Effort for this work,Esfuerzo estimado para este trabajo,0
+help,"project.work,total_effort",0,Estimated total effort for this work and the sub-works,Esfuerzo total estimado para este trabajo y los sub-trabajos,0
+model,"ir.action,name",act_project_form,Projects,Proyectos,0
+model,"ir.action,name",act_task_form,Tasks,Tareas,0
+model,"ir.action,name",act_open_child_work,Tasks,Tareas,0
+model,"ir.action,name",act_work_tree,Works,Trabajos,0
+model,"ir.action,name",act_work_form,Works Efforts,Esfuerzos de Trabajo,0
+model,"ir.ui.menu,name",menu_configuration,Configuration,Configuración,0
+model,"ir.ui.menu,name",menu_project,Project Management,Gestión de Proyectos,0
+model,"ir.ui.menu,name",menu_project_tree,Projects,Proyectos,0
+model,"ir.ui.menu,name",menu_project_form,Projects,Proyectos,0
+model,"ir.ui.menu,name",menu_task_form,Tasks,Tareas,0
+model,"ir.ui.menu,name",menu_work_form,Works Efforts,Esfuerzos de Trabajo,0
+model,"project.work,name",0,Work Effort,Esfuerzo de Trabajo,0
+model,"res.group,name",group_project_admin,Project Administration,Administración de Proyecto,0
+selection,"project.work,state",0,Done,Hecho,0
+selection,"project.work,state",0,Opened,Abierto,0
+selection,"project.work,type",0,Project,Proyecto,0
+selection,"project.work,type",0,Task,Tarea,0
+view,project.work,0,Children,Descendientes,0
+view,project.work,0,General,General,0
+view,project.work,0,Other Info,Información Adicional,0
+view,project.work,0,Projects,Proyectos,0
+view,project.work,0,Tasks,Tareas,0
+view,project.work,0,Timesheet,Hoja de tiempos,0
+view,project.work,0,Work,Trabajo,0
+view,project.work,0,Work Efforts,Esfuerzos de Trabajo,0
+view,project.work,0,Works,Trabajos,0
+view,project.work,0,Works Efforts,Esfuerzos de Trabajo,0
diff --git a/es_ES.csv b/es_ES.csv
new file mode 100644
index 0000000..1aedcd6
--- /dev/null
+++ b/es_ES.csv
@@ -0,0 +1,44 @@
+type,name,res_id,src,value,fuzzy
+error,project.work,0,There should be only one timesheet work by task/project!,Solo debe haber un parte de trabajo por tarea/proyecto,0
+field,"project.work,children",0,Children,Hijos,0
+field,"project.work,comment",0,Comment,Comentario,0
+field,"project.work,effort",0,Effort,Esfuerzo,0
+field,"project.work,parent",0,Parent,Padre,0
+field,"project.work,party",0,Party,Tercero,0
+field,"project.work,party_address",0,Contact Address,Dirección de contacto,0
+field,"project.work,rec_name",0,Name,Nombre,0
+field,"project.work,state",0,State,Estado,0
+field,"project.work,total_effort",0,Total Effort,Esfuerzo total,0
+field,"project.work,type",0,Type,Tipo,0
+field,"project.work,work",0,Work,Actividad,0
+field,"timesheet.work,sequence",0,Sequence,Secuencia,0
+field,"timesheet.work,timesheet_lines",0,Timesheet Lines,Lineas de parte de trabajo,0
+help,"project.work,effort",0,Estimated Effort for this work,El esfuerzo estimado para esta actividad,0
+help,"project.work,total_effort",0,Estimated total effort for this work and the sub-works,Esfuerzo total estimado para esta actividad y sus subactividades,0
+model,"ir.action,name",act_project_form,Projects,Proyectos,0
+model,"ir.action,name",act_task_form,Tasks,Tareas,0
+model,"ir.action,name",act_open_child_work,Tasks,Tareas,0
+model,"ir.action,name",act_work_tree,Works,Actividades,0
+model,"ir.action,name",act_work_form,Works Efforts,Actividades,0
+model,"ir.ui.menu,name",menu_configuration,Configuration,Configuración,0
+model,"ir.ui.menu,name",menu_project,Project Management,Gestión de proyecto,0
+model,"ir.ui.menu,name",menu_project_tree,Projects,Proyectos,0
+model,"ir.ui.menu,name",menu_project_form,Projects,Proyectos,0
+model,"ir.ui.menu,name",menu_task_form,Tasks,Tareas,0
+model,"ir.ui.menu,name",menu_work_form,Works Efforts,Actividades,0
+model,"project.work,name",0,Work Effort,Actividades,0
+model,"res.group,name",group_project_admin,Project Administration,Administración de proyecto,0
+selection,"project.work,state",0,Done,Terminada,0
+selection,"project.work,state",0,Opened,Abierto,0
+selection,"project.work,type",0,Project,Proyecto,0
+selection,"project.work,type",0,Task,Tarea,0
+view,project.work,0,Children,Hijos,0
+view,project.work,0,General,General,0
+view,project.work,0,Other Info,Información adicional,0
+view,project.work,0,Projects,Proyectos,0
+view,project.work,0,Tasks,Tareas,0
+view,project.work,0,Timesheet,Parte de trabajo,0
+view,project.work,0,Work,Actividad,0
+view,project.work,0,Work Efforts,Actividades,0
+view,project.work,0,Works,Actividades,0
+view,project.work,0,Works Efforts,Actividades,0
diff --git a/fr_FR.csv b/fr_FR.csv
new file mode 100644
index 0000000..990001a
--- /dev/null
+++ b/fr_FR.csv
@@ -0,0 +1,44 @@
+type,name,res_id,src,value,fuzzy
+error,project.work,0,There should be only one timesheet work by task/project!,Il ne doit y avoir qu'une seule feuille de présence par tâche/projet !,0
+field,"project.work,children",0,Children,Enfants,0
+field,"project.work,comment",0,Comment,Commentaire,0
+field,"project.work,effort",0,Effort,Effort,0
+field,"project.work,parent",0,Parent,Parent,0
+field,"project.work,party",0,Party,Tiers,0
+field,"project.work,party_address",0,Contact Address,Adresse,0
+field,"project.work,rec_name",0,Name,Nom,0
+field,"project.work,state",0,State,État,0
+field,"project.work,total_effort",0,Total Effort,Effort total,0
+field,"project.work,type",0,Type,Type,0
+field,"project.work,work",0,Work,Activité,0
+field,"timesheet.work,sequence",0,Sequence,Séquence,0
+field,"timesheet.work,timesheet_lines",0,Timesheet Lines,Lignes de feuille de présence,0
+help,"project.work,effort",0,Estimated Effort for this work,Effort estimé pour cette activité,0
+help,"project.work,total_effort",0,Estimated total effort for this work and the sub-works,Effort total estimé pour cette activité et ses sous-activités,0
+model,"ir.action,name",act_project_form,Projects,Projets,0
+model,"ir.action,name",act_task_form,Tasks,Tâches,0
+model,"ir.action,name",act_open_child_work,Tasks,Tâches,0
+model,"ir.action,name",act_work_tree,Works,Activités,0
+model,"ir.action,name",act_work_form,Works Efforts,Activités,0
+model,"ir.ui.menu,name",menu_configuration,Configuration,Configuration,0
+model,"ir.ui.menu,name",menu_project,Project Management,Gestion de projet,0
+model,"ir.ui.menu,name",menu_project_tree,Projects,Projets,0
+model,"ir.ui.menu,name",menu_project_form,Projects,Projets,0
+model,"ir.ui.menu,name",menu_task_form,Tasks,Tâches,0
+model,"ir.ui.menu,name",menu_work_form,Works Efforts,Activités,0
+model,"project.work,name",0,Work Effort,Tâche,0
+model,"res.group,name",group_project_admin,Project Administration,Administrion de projets,0
+selection,"project.work,state",0,Done,Fait,0
+selection,"project.work,state",0,Opened,Ouvert,0
+selection,"project.work,type",0,Project,Projet,0
+selection,"project.work,type",0,Task,Tâche,0
+view,project.work,0,Children,Enfants,0
+view,project.work,0,General,General,0
+view,project.work,0,Other Info,Autre info,0
+view,project.work,0,Projects,Projets,0
+view,project.work,0,Tasks,Tâche,0
+view,project.work,0,Timesheet,Feuille de présence,0
+view,project.work,0,Work,Activités,0
+view,project.work,0,Work Efforts,Activités,0
+view,project.work,0,Works,Activités,0
+view,project.work,0,Works Efforts,Activités,0
diff --git a/project.xml b/project.xml
new file mode 100644
index 0000000..19741be
--- /dev/null
+++ b/project.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0"?>
+<!-- This file is part of Tryton. The COPYRIGHT file at the top level of
+this repository contains the full copyright notices and license terms. -->
+<tryton>
+ <data>
+ <record model="res.group" id="group_project_admin">
+ <field name="name">Project Administration</field>
+ </record>
+ <record model="res.user" id="res.user_admin">
+ <field name="groups" eval="[('add', ref('group_project_admin'))]"/>
+ </record>
+
+ <menuitem name="Project Management" sequence="7" id="menu_project"
+ icon="tryton-development"/>
+ <menuitem name="Configuration" parent="menu_project"
+ id="menu_configuration" groups="group_project_admin"
+ sequence="10" icon="tryton-preferences"/>
+ </data>
+</tryton>
diff --git a/setup.cfg b/setup.cfg
new file mode 100644
index 0000000..861a9f5
--- /dev/null
+++ b/setup.cfg
@@ -0,0 +1,5 @@
+[egg_info]
+tag_build =
+tag_date = 0
+tag_svn_revision = 0
+
diff --git a/setup.py b/setup.py
new file mode 100644
index 0000000..f2203df
--- /dev/null
+++ b/setup.py
@@ -0,0 +1,57 @@
+#!/usr/bin/env python
+#This file is part of Tryton. The COPYRIGHT file at the top level of
+#this repository contains the full copyright notices and license terms.
+
+from setuptools import setup, find_packages
+import re
+
+info = eval(file('__tryton__.py').read())
+
+requires = []
+for dep in info.get('depends', []):
+ if not re.match(r'(ir|res|workflow|webdav)(\W|$)', dep):
+ requires.append('trytond_' + dep)
+
+major_version, minor_version, _ = info.get('version', '0.0.1').split('.', 2)
+requires.append('trytond >= %s.%s' % (major_version, minor_version))
+requires.append('trytond < %s.%s' % (major_version, int(minor_version) + 1))
+
+setup(name='trytond_project',
+ version=info.get('version', '0.0.1'),
+ description=info.get('description', ''),
+ author=info.get('author', ''),
+ author_email=info.get('email', ''),
+ url=info.get('website', ''),
+ download_url="http://downloads.tryton.org/" + \
+ info.get('version', '0.0.1').rsplit('.', 1)[0] + '/',
+ package_dir={'trytond.modules.project': '.'},
+ packages=[
+ 'trytond.modules.project',
+ ],
+ package_data={
+ 'trytond.modules.project': info.get('xml', []) \
+ + info.get('translation', []),
+ },
+ classifiers=[
+ 'Development Status :: 5 - Production/Stable',
+ 'Environment :: Plugins',
+ 'Intended Audience :: Developers',
+ 'Intended Audience :: Financial and Insurance Industry',
+ 'Intended Audience :: Legal Industry',
+ 'Intended Audience :: Manufacturing',
+ 'License :: OSI Approved :: GNU General Public License (GPL)',
+ 'Natural Language :: English',
+ 'Natural Language :: French',
+ 'Natural Language :: German',
+ 'Operating System :: OS Independent',
+ 'Programming Language :: Python',
+ 'Topic :: Office/Business',
+ ],
+ license='GPL-3',
+ install_requires=requires,
+ zip_safe=False,
+ entry_points="""
+ [trytond.modules]
+ project = trytond.modules.project
+ """,
+)
diff --git a/tests/__init__.py b/tests/__init__.py
new file mode 100644
index 0000000..395d003
--- /dev/null
+++ b/tests/__init__.py
@@ -0,0 +1,4 @@
+#This file is part of Tryton. The COPYRIGHT file at the top level of
+#this repository contains the full copyright notices and license terms.
+
+from test_project import *
diff --git a/tests/test_project.py b/tests/test_project.py
new file mode 100644
index 0000000..64f7a1e
--- /dev/null
+++ b/tests/test_project.py
@@ -0,0 +1,38 @@
+#!/usr/bin/env python
+#This file is part of Tryton. The COPYRIGHT file at the top level of
+#this repository contains the full copyright notices and license terms.
+
+import sys, os
+DIR = os.path.abspath(os.path.normpath(os.path.join(__file__,
+ '..', '..', '..', '..', '..', 'trytond')))
+if os.path.isdir(DIR):
+ sys.path.insert(0, os.path.dirname(DIR))
+
+import unittest
+import trytond.tests.test_tryton
+from trytond.tests.test_tryton import RPCProxy, CONTEXT, SOCK, test_view
+
+
+class ProjectTestCase(unittest.TestCase):
+ '''
+ Test Project module.
+ '''
+
+ def setUp(self):
+ trytond.tests.test_tryton.install_module('project')
+
+ def test0005views(self):
+ '''
+ Test views.
+ '''
+ self.assertRaises(Exception, test_view('project'))
+
+def suite():
+ return unittest.TestLoader().loadTestsFromTestCase(ProjectTestCase)
+
+if __name__ == '__main__':
+ suiteTrytond = trytond.tests.test_tryton.suite()
+ suiteProject = suite()
+ alltests = unittest.TestSuite([suiteTrytond, suiteProject])
+ unittest.TextTestRunner(verbosity=2).run(alltests)
+ SOCK.disconnect()
diff --git a/trytond_project.egg-info/PKG-INFO b/trytond_project.egg-info/PKG-INFO
new file mode 100644
index 0000000..dc35494
--- /dev/null
+++ b/trytond_project.egg-info/PKG-INFO
@@ -0,0 +1,26 @@
+Metadata-Version: 1.0
+Name: trytond-project
+Version: 1.4.0
+Summary: Project Module with:
+ - Project management
+
+Home-page: http://www.tryton.org/
+Author: B2CK
+Author-email: info at b2ck.com
+License: GPL-3
+Download-URL: http://downloads.tryton.org/1.4/
+Description: UNKNOWN
+Platform: UNKNOWN
+Classifier: Development Status :: 5 - Production/Stable
+Classifier: Environment :: Plugins
+Classifier: Intended Audience :: Developers
+Classifier: Intended Audience :: Financial and Insurance Industry
+Classifier: Intended Audience :: Legal Industry
+Classifier: Intended Audience :: Manufacturing
+Classifier: License :: OSI Approved :: GNU General Public License (GPL)
+Classifier: Natural Language :: English
+Classifier: Natural Language :: French
+Classifier: Natural Language :: German
+Classifier: Operating System :: OS Independent
+Classifier: Programming Language :: Python
+Classifier: Topic :: Office/Business
diff --git a/trytond_project.egg-info/SOURCES.txt b/trytond_project.egg-info/SOURCES.txt
new file mode 100644
index 0000000..3279213
--- /dev/null
+++ b/trytond_project.egg-info/SOURCES.txt
@@ -0,0 +1,26 @@
+CHANGELOG
+COPYRIGHT
+INSTALL
+LICENSE
+MANIFEST.in
+README
+de_DE.csv
+es_CO.csv
+es_ES.csv
+fr_FR.csv
+project.xml
+setup.py
+work.xml
+./__init__.py
+./__tryton__.py
+./work.py
+doc/index.rst
+tests/__init__.py
+tests/test_project.py
+trytond_project.egg-info/PKG-INFO
+trytond_project.egg-info/SOURCES.txt
+trytond_project.egg-info/dependency_links.txt
+trytond_project.egg-info/entry_points.txt
+trytond_project.egg-info/not-zip-safe
+trytond_project.egg-info/requires.txt
+trytond_project.egg-info/top_level.txt
\ No newline at end of file
diff --git a/trytond_project.egg-info/dependency_links.txt b/trytond_project.egg-info/dependency_links.txt
new file mode 100644
index 0000000..8b13789
--- /dev/null
+++ b/trytond_project.egg-info/dependency_links.txt
@@ -0,0 +1 @@
+
diff --git a/trytond_project.egg-info/entry_points.txt b/trytond_project.egg-info/entry_points.txt
new file mode 100644
index 0000000..d94d988
--- /dev/null
+++ b/trytond_project.egg-info/entry_points.txt
@@ -0,0 +1,4 @@
+
+ [trytond.modules]
+ project = trytond.modules.project
+
\ No newline at end of file
diff --git a/trytond_project.egg-info/not-zip-safe b/trytond_project.egg-info/not-zip-safe
new file mode 100644
index 0000000..8b13789
--- /dev/null
+++ b/trytond_project.egg-info/not-zip-safe
@@ -0,0 +1 @@
+
diff --git a/trytond_project.egg-info/requires.txt b/trytond_project.egg-info/requires.txt
new file mode 100644
index 0000000..438098d
--- /dev/null
+++ b/trytond_project.egg-info/requires.txt
@@ -0,0 +1,5 @@
+trytond_timesheet
+trytond_party
+trytond_company_work_time
+trytond >= 1.4
+trytond < 1.5
\ No newline at end of file
diff --git a/trytond_project.egg-info/top_level.txt b/trytond_project.egg-info/top_level.txt
new file mode 100644
index 0000000..93df119
--- /dev/null
+++ b/trytond_project.egg-info/top_level.txt
@@ -0,0 +1 @@
+trytond
diff --git a/work.py b/work.py
new file mode 100644
index 0000000..86ac657
--- /dev/null
+++ b/work.py
@@ -0,0 +1,262 @@
+#This file is part of Tryton. The COPYRIGHT file at the top level of
+#this repository contains the full copyright notices and license terms.
+"Project"
+from trytond.model import ModelView, ModelSQL, fields
+from trytond.model.modelstorage import OPERATORS
+import copy
+
+
+class TimesheetWork(ModelSQL, ModelView):
+ _name = 'timesheet.work'
+
+ timesheet_lines = fields.One2Many('timesheet.line', 'work',
+ 'Timesheet Lines',
+ depends=['timesheet_available', 'active'],
+ states={
+ 'invisible': 'not bool(timesheet_available)',
+ 'readonly': '''not active'''
+ })
+ sequence = fields.Integer('Sequence')
+
+ def __init__(self):
+ super(TimesheetWork, self).__init__()
+ self._order.insert(0, ('sequence', 'ASC'))
+
+ self.parent = copy.copy(self.parent)
+ if not self.parent.context:
+ self.parent.context = "{'type': locals().get('type')}"
+ elif 'type' not in self.parent.context:
+ sep = ''
+ if self.parent.context[-2] != ',':
+ sep = ','
+ self.parent.context = self.parent.context[:-1] + \
+ sep + "'type': locals().get('type')" + \
+ self.parent.context[-1:]
+
+ self._reset_columns()
+
+TimesheetWork()
+
+
+class Work(ModelSQL, ModelView):
+ 'Work Effort'
+ _name = 'project.work'
+ _description = __doc__
+ _inherits = {'timesheet.work': 'work'}
+
+ work = fields.Many2One('timesheet.work', 'Work', required=True,
+ ondelete='CASCADE')
+ type = fields.Selection([
+ ('project', 'Project'),
+ ('task', 'Task')
+ ],
+ 'Type', required=True, select=1,
+ states={
+ 'invisible': 'context.get("type", False)',
+ })
+ party = fields.Many2One('party.party', 'Party',
+ states={
+ 'invisible': "type!= 'project'"
+ }, depends=['type'])
+ party_address = fields.Many2One('party.address', 'Contact Address',
+ domain=["('party', '=', party)"],
+ states={
+ 'invisible': "type != 'project'"
+ }, depends=['party', 'type'])
+ effort = fields.Float("Effort",
+ states={
+ 'invisible': "type != 'task'"
+ }, depends=['type'], help="Estimated Effort for this work")
+ total_effort = fields.Function('get_total_effort', type='float',
+ string='Total Effort',
+ help="Estimated total effort for this work and the sub-works")
+ comment = fields.Text('Comment')
+ parent = fields.Function('get_parent', fnct_inv='set_parent',
+ fnct_search='search_parent', string='Parent',
+ relation='project.work', type="many2one")
+ children = fields.One2Many('project.work', 'parent', 'Children')
+ state = fields.Selection([
+ ('opened', 'Opened'),
+ ('done', 'Done'),
+ ], 'State',
+ states={
+ 'invisible': "type != 'task'",
+ 'required': "type == 'task'",
+ }, select=1, depends=['type'])
+
+ def default_type(self, cursor, user, context=None):
+ if context.get('type') == 'project':
+ return 'project'
+ return 'task'
+
+ def default_state(self, cursor, user, context=None):
+ return 'opened'
+
+ def __init__(self):
+ super(Work, self).__init__()
+ self._sql_constraints += [
+ ('work_uniq', 'UNIQUE(work)', 'There should be only one '\
+ 'timesheet work by task/project!'),
+ ]
+ self._order.insert(0, ('sequence', 'ASC'))
+ if 'company' in self._inherit_fields:
+ company_field = copy.copy(
+ self._inherit_fields['company'])
+
+ company_field[2].states={
+ 'invisible': 'context.get("type", False)',
+ 'readonly': '''not active'''
+ }
+
+ self._inherit_fields['company'] = company_field
+
+ def get_parent(self, cursor, user, ids, name, arg, context=None):
+ res = dict.fromkeys(ids, None)
+ project_works = self.browse(cursor, user, ids, context=context)
+
+ # ptw2pw is "parent timesheet work to project works":
+ ptw2pw = {}
+ for project_work in project_works:
+ if project_work.work.parent.id in ptw2pw:
+ ptw2pw[project_work.work.parent.id].append(project_work.id)
+ else:
+ ptw2pw[project_work.work.parent.id] = [project_work.id]
+
+ ctx = context and context.copy() or {}
+ ctx['active_test'] = False
+ parent_project_ids = self.search(cursor, user, [
+ ('work', 'in', ptw2pw.keys()),
+ ], context=ctx)
+ parent_projects = self.browse(cursor, user, parent_project_ids,
+ context=context)
+ for parent_project in parent_projects:
+ if parent_project.work.id in ptw2pw:
+ child_projects = ptw2pw[parent_project.work.id]
+ for child_project in child_projects:
+ res[child_project] = parent_project.id
+
+ return res
+
+ def set_parent(self, cursor, user, id, name, value, arg, context=None):
+ timesheet_work_obj = self.pool.get('timesheet.work')
+ if value:
+ child_project_work, parent_project_work = self.browse(
+ cursor, user, [id, value], context=context)
+ child_timesheet_work_id = child_project_work.work.id
+ parent_timesheet_work_id = parent_project_work.work.id
+ else:
+ child_project_work = self.browse( cursor, user, id, context=context)
+ child_timesheet_work_id = child_project_work.work.id
+ parent_timesheet_work_id = False
+
+ timesheet_work_obj.write(cursor, user, child_timesheet_work_id, {
+ 'parent': parent_timesheet_work_id
+ },
+ context=context)
+
+ def search_parent(self, cursor, user, name, domain=None, context=None):
+ timesheet_work_obj = self.pool.get('timesheet.work')
+
+ project_work_domain = []
+ timesheet_work_domain = []
+ for field, operator, operand in domain:
+ if field.startswith('parent.'):
+ project_work_domain.append(
+ (field.replace('parent.', ''), operator, operand))
+ elif field == 'parent':
+ timesheet_work_domain.append(
+ (field, operator, operand))
+
+ # ids timesheet_work_domain in operand are project_work ids,
+ # we need to convert them to timesheet_work ids
+ operands = set()
+ for _, _, operand in timesheet_work_domain:
+ if isinstance(operand, (int, long)) and not isinstance(operand, bool):
+ operands.add(operand)
+ elif isinstance(operand, list):
+ for o in operand:
+ if isinstance(o, (int, long)) and not isinstance(o, bool):
+ operands.add(o)
+ pw2tw = {}
+ if operands:
+ operands = list(operands)
+ # filter out non-existing ids:
+ operands = self.search(cursor, user, [
+ ('id', 'in', operands)
+ ], context=context)
+ # create project_work > timesheet_work mapping
+ for pw in self.browse(cursor, user, operands, context=context):
+ pw2tw[pw.id] = pw.work.id
+
+ for i, d in enumerate(timesheet_work_domain):
+ if isinstance(d[2], (int, long)):
+ new_d2 = pw2tw.get(d[2], 0)
+ elif isinstance(d[2], list):
+ new_d2 = []
+ for item in d[2]:
+ item = pw2tw.get(item, 0)
+ new_d2.append(item)
+ timesheet_work_domain[i] = (d[0], d[1], new_d2)
+
+ if project_work_domain:
+ pw_ids = self.search(
+ cursor, user, project_work_domain, context=context)
+ project_works = self.browse(cursor, user, pw_ids, context=context)
+ timesheet_work_domain.append(
+ ('id', 'in', [pw.work.id for pw in project_works]))
+
+ tw_ids = timesheet_work_obj.search(
+ cursor, user, timesheet_work_domain, context=context)
+
+ return [('work', 'in', tw_ids)]
+
+ def get_total_effort(self, cursor, user, ids, name, arg, context=None):
+
+ all_ids = self.search(cursor, user, [
+ ('parent', 'child_of', ids),
+ ('active', '=', True)], context=context) + ids
+ all_ids = list(set(all_ids))
+
+ works = self.browse(cursor, user, all_ids, context=context)
+
+ res = {}
+ id2work = {}
+ leafs = set()
+ for work in works:
+ res[work.id] = work.effort
+ id2work[work.id] = work
+ if not work.children:
+ leafs.add(work.id)
+
+ while leafs:
+ parents = set()
+ for work_id in leafs:
+ work = id2work[work_id]
+ if not work.active:
+ continue
+ if work.parent and work.parent.id in res:
+ res[work.parent.id] += res[work_id]
+ parents.add(work.parent.id)
+ leafs = parents
+
+ return res
+
+
+ def delete(self, cursor, user, ids, context=None):
+ timesheet_work_obj = self.pool.get('timesheet.work')
+
+ if isinstance(ids, (int, long)):
+ ids = [ids]
+
+ # Get the timesheet works linked to the project works
+ project_works = self.browse(cursor, user, ids, context=context)
+ timesheet_work_ids = [pw.work.id for pw in project_works]
+
+ res = super(Work, self).delete(cursor, user, ids, context=context)
+
+ timesheet_work_obj.delete(
+ cursor, user, timesheet_work_ids, context=context)
+ return res
+
+
+Work()
diff --git a/work.xml b/work.xml
new file mode 100644
index 0000000..a2697ca
--- /dev/null
+++ b/work.xml
@@ -0,0 +1,237 @@
+<?xml version="1.0"?>
+<!-- This file is part of Tryton. The COPYRIGHT file at the top level of
+this repository contains the full copyright notices and license terms. -->
+<tryton>
+ <data>
+ <!-- default tree view -->
+ <record model="ir.ui.view" id="work_view_tree">
+ <field name="model">project.work</field>
+ <field name="type">tree</field>
+ <field name="field_childs">children</field>
+ <field name="arch" type="xml">
+ <![CDATA[
+ <tree string="Works Efforts">
+ <field name="name" select="1"/>
+ <field name="hours" widget="float_time" float_time="company_work_time"/>
+ <field name="total_effort" widget="float_time" float_time="company_work_time"/>
+ <field name="type" select="1"/>
+ <field name="state" select="1"/>
+ <field name="active" select="2" tree_invisible="1"/>
+ </tree>
+ ]]>
+ </field>
+ </record>
+ <!-- tree view for tasks (wihtout type field) -->
+ <record model="ir.ui.view" id="work_view_tree2">
+ <field name="model">project.work</field>
+ <field name="type">tree</field>
+ <field name="arch" type="xml">
+ <![CDATA[
+ <tree string="Tasks">
+ <field name="name" select="1"/>
+ <field name="hours" widget="float_time" float_time="company_work_time"/>
+ <field name="total_effort" widget="float_time" float_time="company_work_time"/>
+ <field name="state" select="1"/>
+ <field name="active" select="2" tree_invisible="1"/>
+ </tree>
+ ]]>
+ </field>
+ </record>
+ <!-- tree view for projects (wihtout type and state fields) -->
+ <record model="ir.ui.view" id="work_view_tree3">
+ <field name="model">project.work</field>
+ <field name="type">tree</field>
+ <field name="arch" type="xml">
+ <![CDATA[
+ <tree string="Projects">
+ <field name="name" select="1"/>
+ <field name="hours" widget="float_time" float_time="company_work_time"/>
+ <field name="total_effort" widget="float_time" float_time="company_work_time"/>
+ <field name="active" select="2" tree_invisible="1"/>
+ </tree>
+ ]]>
+ </field>
+ </record>
+ <record model="ir.ui.view" id="work_view_form">
+ <field name="model">project.work</field>
+ <field name="type">form</field>
+ <field name="arch" type="xml">
+ <![CDATA[
+ <form string="Work Efforts" col="8">
+ <label name="name"/>
+ <field name="name" colspan="3"/>
+ <label name="parent"/>
+ <field name="parent"/>
+ <label name="active"/>
+ <field name="active" xexpand="0"/>
+ <label name="sequence"/>
+ <field name="sequence"/>
+ <label name="type"/>
+ <field name="type"/>
+ <label name="state"/>
+ <field name="state"/>
+ <label name="timesheet_available"/>
+ <field name="timesheet_available" xexpand="0"/>
+ <label name="company"/>
+ <field name="company" />
+ <notebook colspan="8">
+ <page string="General" id="general">
+ <label name="party"/>
+ <field name="party"/>
+ <label name="party_address"/>
+ <field name="party_address"/>
+ <label name="hours"/>
+ <field name="hours" widget="float_time" float_time="company_work_time"/>
+ <group colspan="2" col="4" id="effort">
+ <label name="effort"/>
+ <field name="effort" widget="float_time" float_time="company_work_time"/>
+ <label name="total_effort"/>
+ <field name="total_effort" widget="float_time" float_time="company_work_time"/>
+ </group>
+ <separator name="comment" colspan="4"/>
+ <field name="comment" colspan="4"/>
+ </page>
+ <page string="Children" id="children"
+ states="{'invisible': '''type != 'project' '''}">
+ <field name="children" colspan="4">
+ <tree string="Children">
+ <field name="name"/>
+ <field name="hours" widget="float_time" float_time="company_work_time"/>
+ <field name="total_effort" widget="float_time" float_time="company_work_time"/>
+ <field name="type"/>
+ <field name="state"/>
+ </tree>
+ </field>
+ </page>
+ <page string="Timesheet" id="timesheet_lines"
+ states="{'invisible': '''not bool(timesheet_available) '''}">
+ <field name="timesheet_lines" colspan="4"/>
+ </page>
+ </notebook>
+ </form>
+ ]]>
+ </field>
+ </record>
+ <record model="ir.action.act_window" id="act_work_form">
+ <field name="name">Works Efforts</field>
+ <field name="res_model">project.work</field>
+ <field name="view_type">form</field>
+ </record>
+ <record model="ir.action.act_window.view"
+ id="act_work_form_view1">
+ <field name="sequence" eval="10"/>
+ <field name="view" ref="work_view_tree"/>
+ <field name="act_window" ref="act_work_form"/>
+ </record>
+ <record model="ir.action.act_window.view"
+ id="act_work_form_view2">
+ <field name="sequence" eval="20"/>
+ <field name="view" ref="work_view_form"/>
+ <field name="act_window" ref="act_work_form"/>
+ </record>
+ <menuitem parent="menu_configuration" action="act_work_form"
+ id="menu_work_form"/>
+
+ <record model="ir.action.act_window" id="act_work_tree">
+ <field name="name">Works</field>
+ <field name="res_model">project.work</field>
+ <field name="view_type">tree</field>
+ <field name="domain">[('parent', '=', False)]</field>
+ </record>
+ <record model="ir.action.act_window.view"
+ id="act_work_tree_view1">
+ <field name="sequence" eval="10"/>
+ <field name="view" ref="work_view_tree"/>
+ <field name="act_window" ref="act_work_tree"/>
+ </record>
+ <menuitem parent="menu_project" action="act_work_tree"
+ id="menu_project_tree" name="Projects"/>
+
+ <record model="ir.action.act_window" id="act_project_form">
+ <field name="name">Projects</field>
+ <field name="res_model">project.work</field>
+ <field name="view_type">form</field>
+ <field name="domain">[('type', '=', 'project')]</field>
+ <field name="context">{'type': 'project'}</field>
+ </record>
+ <record model="ir.action.act_window.view"
+ id="act_project_form_view1">
+ <field name="sequence" eval="10"/>
+ <field name="view" ref="work_view_tree3"/>
+ <field name="act_window" ref="act_project_form"/>
+ </record>
+ <record model="ir.action.act_window.view"
+ id="act_project_form_view2">
+ <field name="sequence" eval="20"/>
+ <field name="view" ref="work_view_form"/>
+ <field name="act_window" ref="act_project_form"/>
+ </record>
+ <menuitem parent="menu_project_tree" action="act_project_form"
+ id="menu_project_form"/>
+
+ <record model="ir.action.act_window" id="act_task_form">
+ <field name="name">Tasks</field>
+ <field name="res_model">project.work</field>
+ <field name="view_type">form</field>
+ <field name="domain">[('type', '=', 'task')]</field>
+ <field name="context">{'type': 'task'}</field>
+ </record>
+ <record model="ir.action.act_window.view"
+ id="act_task_form_view1">
+ <field name="sequence" eval="10"/>
+ <field name="view" ref="work_view_tree2"/>
+ <field name="act_window" ref="act_task_form"/>
+ </record>
+ <record model="ir.action.act_window.view"
+ id="act_task_form_view2">
+ <field name="sequence" eval="20"/>
+ <field name="view" ref="work_view_form"/>
+ <field name="act_window" ref="act_task_form"/>
+ </record>
+ <menuitem parent="menu_project_tree" action="act_task_form"
+ id="menu_task_form"/>
+
+ <record model="ir.action.act_window" id="act_open_child_work">
+ <field name="name">Tasks</field>
+ <field name="res_model">project.work</field>
+ <field name="view_type">form</field>
+ <field name="context">{'type': 'task'}</field>
+ <field name="domain">[('parent', '=', active_id), ('type', '=', 'task')]</field>
+ </record>
+ <record model="ir.action.keyword"
+ id="act_open_project_work_keyword1">
+ <field name="keyword">form_relate</field>
+ <field name="model">project.work,0</field>
+ <field name="action" ref="act_open_child_work"/>
+ </record>
+ <record model="ir.action.act_window.view"
+ id="act_open_project_view1">
+ <field name="sequence" eval="10"/>
+ <field name="view" ref="work_view_tree2"/>
+ <field name="act_window" ref="act_open_child_work"/>
+ </record>
+ <record model="ir.action.act_window.view"
+ id="act_open_project_view2">
+ <field name="sequence" eval="20"/>
+ <field name="view" ref="work_view_form"/>
+ <field name="act_window" ref="act_open_child_work"/>
+ </record>
+
+ <record model="ir.model.access" id="access_work">
+ <field name="model" search="[('model', '=', 'project.work')]"/>
+ <field name="perm_read" eval="True"/>
+ <field name="perm_write" eval="False"/>
+ <field name="perm_create" eval="False"/>
+ <field name="perm_delete" eval="False"/>
+ </record>
+ <record model="ir.model.access" id="access_work_admin">
+ <field name="model" search="[('model', '=', 'project.work')]"/>
+ <field name="group" ref="group_project_admin"/>
+ <field name="perm_read" eval="True"/>
+ <field name="perm_write" eval="True"/>
+ <field name="perm_create" eval="True"/>
+ <field name="perm_delete" eval="True"/>
+ </record>
+
+ </data>
+</tryton>
--
tryton-modules-project
More information about the tryton-debian-vcs
mailing list