[tryton-debian-vcs] tryton-modules-project branch debian updated. debian/2.8.1-1-5-g79d9878
git repository hosting
tryton-debian-vcs at m9s.biz
Mon Nov 25 19:36:21 UTC 2013
The following commit has been merged in the debian branch:
http://debian.tryton.org/gitweb/?p=packages/tryton-modules-project.git;a=commitdiff;h=debian/2.8.1-1-5-g79d9878
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">
--
tryton-modules-project
More information about the tryton-debian-vcs
mailing list