[tryton-debian-vcs] tryton-modules-project branch debian updated. debian/4.2.0-1-2-gf6a6d96
Mathias Behrle
tryton-debian-vcs at alioth.debian.org
Wed Jun 7 13:34:48 UTC 2017
The following commit has been merged in the debian branch:
https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi/?p=tryton/tryton-modules-project.git;a=commitdiff;h=debian/4.2.0-1-2-gf6a6d96
commit f6a6d961a49ff8e7c0b2eb819013dedfbbd7e862
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Wed Jun 7 15:26:51 2017 +0200
Merging upstream version 4.4.0.
diff --git a/CHANGELOG b/CHANGELOG
index c08094f..dad43de 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 4.4.0 - 2017-05-01
+* Bug fixes (see mercurial logs for details)
+
Version 4.2.0 - 2016-11-28
* Bug fixes (see mercurial logs for details)
* Use origin on Timesheet Work
diff --git a/COPYRIGHT b/COPYRIGHT
index 60f26e4..30adae7 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,5 +1,5 @@
-Copyright (C) 2008-2016 Cédric Krier.
-Copyright (C) 2008-2016 B2CK SPRL.
+Copyright (C) 2008-2017 Cédric Krier.
+Copyright (C) 2008-2017 B2CK SPRL.
Copyright (C) 2009-2013 Bertrand Chenal.
This program is free software: you can redistribute it and/or modify
diff --git a/PKG-INFO b/PKG-INFO
index 7feabf4..2045993 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,12 +1,12 @@
Metadata-Version: 1.1
Name: trytond_project
-Version: 4.2.0
+Version: 4.4.0
Summary: Tryton module with projects
Home-page: http://www.tryton.org/
Author: Tryton
Author-email: issue_tracker at tryton.org
License: GPL-3
-Download-URL: http://downloads.tryton.org/4.2/
+Download-URL: http://downloads.tryton.org/4.4/
Description: trytond_project
===============
@@ -52,7 +52,7 @@ 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: License :: OSI Approved :: GNU General Public License v3 or later (GPLv3+)
Classifier: Natural Language :: Bulgarian
Classifier: Natural Language :: Catalan
Classifier: Natural Language :: Chinese (Simplified)
diff --git a/locale/bg.po b/locale/bg.po
index 2f68f4e..ff521e5 100644
--- a/locale/bg.po
+++ b/locale/bg.po
@@ -165,6 +165,10 @@ msgctxt "model:ir.action,name:act_task_form"
msgid "Tasks"
msgstr "Задачи"
+msgctxt "model:ir.action,name:act_timesheet_line_form_work"
+msgid "Timesheet Lines"
+msgstr ""
+
msgctxt "model:ir.action,name:act_work_list"
msgid "Works Efforts"
msgstr "Задачи"
diff --git a/locale/ca.po b/locale/ca.po
index dd892ff..cbaeadd 100644
--- a/locale/ca.po
+++ b/locale/ca.po
@@ -162,6 +162,10 @@ msgctxt "model:ir.action,name:act_task_form"
msgid "Tasks"
msgstr "Tasques"
+msgctxt "model:ir.action,name:act_timesheet_line_form_work"
+msgid "Timesheet Lines"
+msgstr "Línies de full de treball"
+
msgctxt "model:ir.action,name:act_work_list"
msgid "Works Efforts"
msgstr "Projectes i tasques"
diff --git a/locale/cs.po b/locale/cs.po
index 8ec6990..76f2039 100644
--- a/locale/cs.po
+++ b/locale/cs.po
@@ -160,6 +160,10 @@ msgctxt "model:ir.action,name:act_task_form"
msgid "Tasks"
msgstr ""
+msgctxt "model:ir.action,name:act_timesheet_line_form_work"
+msgid "Timesheet Lines"
+msgstr ""
+
msgctxt "model:ir.action,name:act_work_list"
msgid "Works Efforts"
msgstr ""
diff --git a/locale/de.po b/locale/de.po
index 6f05312..4d71fd4 100644
--- a/locale/de.po
+++ b/locale/de.po
@@ -166,6 +166,10 @@ msgctxt "model:ir.action,name:act_task_form"
msgid "Tasks"
msgstr "Aufgaben"
+msgctxt "model:ir.action,name:act_timesheet_line_form_work"
+msgid "Timesheet Lines"
+msgstr "Zeilen der Zeiterfassung"
+
msgctxt "model:ir.action,name:act_work_list"
msgid "Works Efforts"
msgstr "Aufgaben Aufwände"
diff --git a/locale/es.po b/locale/es.po
index 89b2bf9..f430bdb 100644
--- a/locale/es.po
+++ b/locale/es.po
@@ -162,6 +162,10 @@ msgctxt "model:ir.action,name:act_task_form"
msgid "Tasks"
msgstr "Tareas"
+msgctxt "model:ir.action,name:act_timesheet_line_form_work"
+msgid "Timesheet Lines"
+msgstr "Lineas de parte de trabajo"
+
msgctxt "model:ir.action,name:act_work_list"
msgid "Works Efforts"
msgstr "Proyectos y tareas"
diff --git a/locale/es_419.po b/locale/es_419.po
index b56a5fc..e634697 100644
--- a/locale/es_419.po
+++ b/locale/es_419.po
@@ -32,7 +32,7 @@ msgstr ""
msgctxt "field:project.work,create_uid:"
msgid "Create User"
-msgstr ""
+msgstr "Creado por usuario"
msgctxt "field:project.work,effort_duration:"
msgid "Effort"
@@ -88,7 +88,7 @@ msgstr ""
msgctxt "field:project.work,timesheet_duration:"
msgid "Duration"
-msgstr ""
+msgstr "Duración"
msgctxt "field:project.work,timesheet_end_date:"
msgid "Timesheet End"
@@ -104,7 +104,7 @@ msgstr ""
msgctxt "field:project.work,total_effort:"
msgid "Total Effort"
-msgstr ""
+msgstr "Esfuerzo total"
msgctxt "field:project.work,total_progress:"
msgid "Total Progress"
@@ -120,7 +120,7 @@ msgstr ""
msgctxt "field:project.work,write_uid:"
msgid "Write User"
-msgstr ""
+msgstr "Modificado por usuario"
msgctxt "help:project.work,effort_duration:"
msgid "Estimated Effort for this work"
@@ -136,116 +136,121 @@ msgstr ""
msgctxt "help:project.work,total_effort:"
msgid "Estimated total effort for this work and the sub-works"
-msgstr ""
+msgstr "Esfuerzo total estimado para este trabajo y sus subtrabajos"
+#, fuzzy
msgctxt "help:project.work,total_progress:"
msgid "Estimated total progress for this work and the sub-works"
-msgstr ""
+msgstr "Esfuerzo total estimado para este trabajo y sus subtrabajos"
msgctxt "model:ir.action,name:act_open_child_work"
msgid "Tasks"
-msgstr "Tasks"
+msgstr ""
+#, fuzzy
msgctxt "model:ir.action,name:act_project_form"
msgid "Projects"
-msgstr "Projects"
+msgstr "Proyectos"
+#, fuzzy
msgctxt "model:ir.action,name:act_project_tree"
msgid "Projects"
-msgstr "Projects"
+msgstr "Proyectos"
msgctxt "model:ir.action,name:act_task_form"
msgid "Tasks"
-msgstr "Tasks"
+msgstr ""
+
+msgctxt "model:ir.action,name:act_timesheet_line_form_work"
+msgid "Timesheet Lines"
+msgstr ""
msgctxt "model:ir.action,name:act_work_list"
msgid "Works Efforts"
-msgstr "Works Efforts"
+msgstr ""
msgctxt "model:ir.action,name:act_work_tree"
msgid "Works Efforts"
-msgstr "Works Efforts"
+msgstr ""
msgctxt "model:ir.action.act_window.domain,name:act_project_form_done"
msgid "Done"
-msgstr "Done"
+msgstr ""
msgctxt "model:ir.action.act_window.domain,name:act_project_form_opened"
msgid "Opened"
-msgstr "Opened"
+msgstr ""
msgctxt "model:ir.action.act_window.domain,name:act_project_tree_done"
msgid "Done"
-msgstr "Done"
+msgstr ""
msgctxt "model:ir.action.act_window.domain,name:act_project_tree_opened"
msgid "Opened"
-msgstr "Opened"
+msgstr ""
msgctxt "model:ir.action.act_window.domain,name:act_task_form_done"
msgid "Done"
-msgstr "Done"
+msgstr ""
msgctxt "model:ir.action.act_window.domain,name:act_task_form_opened"
msgid "Opened"
-msgstr "Opened"
+msgstr ""
msgctxt "model:ir.ui.menu,name:menu_configuration"
msgid "Configuration"
-msgstr "Configuration"
+msgstr ""
+#, fuzzy
msgctxt "model:ir.ui.menu,name:menu_project"
msgid "Project"
-msgstr "Project"
+msgstr "Proyectos"
+#, fuzzy
msgctxt "model:ir.ui.menu,name:menu_project_form"
msgid "Projects"
-msgstr "Projects"
+msgstr "Proyectos"
msgctxt "model:ir.ui.menu,name:menu_project_tree"
msgid "Projects"
-msgstr "Projects"
+msgstr "Proyectos"
msgctxt "model:ir.ui.menu,name:menu_task_form"
msgid "Tasks"
-msgstr "Tasks"
+msgstr ""
msgctxt "model:ir.ui.menu,name:menu_work_list"
msgid "Works Efforts"
-msgstr "Works Efforts"
+msgstr ""
msgctxt "model:ir.ui.menu,name:menu_work_tree"
msgid "Works Efforts"
-msgstr "Works Efforts"
+msgstr ""
-#, fuzzy
msgctxt "model:project.work,name:"
msgid "Work Effort"
-msgstr "Works Efforts"
+msgstr ""
msgctxt "model:res.group,name:group_project_admin"
msgid "Project Administration"
-msgstr "Project Administration"
+msgstr ""
-#, fuzzy
msgctxt "selection:project.work,state:"
msgid "Done"
-msgstr "Done"
+msgstr ""
-#, fuzzy
msgctxt "selection:project.work,state:"
msgid "Opened"
-msgstr "Opened"
+msgstr ""
#, fuzzy
msgctxt "selection:project.work,type:"
msgid "Project"
-msgstr "Project"
+msgstr "Proyectos"
-#, fuzzy
msgctxt "selection:project.work,type:"
msgid "Task"
-msgstr "Tasks"
+msgstr ""
msgctxt "view:project.work:"
msgid "%"
diff --git a/locale/fr.po b/locale/fr.po
index 1716a74..9936c66 100644
--- a/locale/fr.po
+++ b/locale/fr.po
@@ -162,6 +162,10 @@ msgctxt "model:ir.action,name:act_task_form"
msgid "Tasks"
msgstr "Tâches"
+msgctxt "model:ir.action,name:act_timesheet_line_form_work"
+msgid "Timesheet Lines"
+msgstr "Lignes de feuille de présence"
+
msgctxt "model:ir.action,name:act_work_list"
msgid "Works Efforts"
msgstr "Efforts de travail"
diff --git a/locale/hu_HU.po b/locale/hu_HU.po
index f030efb..f0d420d 100644
--- a/locale/hu_HU.po
+++ b/locale/hu_HU.po
@@ -176,6 +176,10 @@ msgctxt "model:ir.action,name:act_task_form"
msgid "Tasks"
msgstr ""
+msgctxt "model:ir.action,name:act_timesheet_line_form_work"
+msgid "Timesheet Lines"
+msgstr ""
+
msgctxt "model:ir.action,name:act_work_list"
msgid "Works Efforts"
msgstr ""
diff --git a/locale/it_IT.po b/locale/it_IT.po
index a2f9fe7..02761d4 100644
--- a/locale/it_IT.po
+++ b/locale/it_IT.po
@@ -175,6 +175,10 @@ msgctxt "model:ir.action,name:act_task_form"
msgid "Tasks"
msgstr ""
+msgctxt "model:ir.action,name:act_timesheet_line_form_work"
+msgid "Timesheet Lines"
+msgstr ""
+
msgctxt "model:ir.action,name:act_work_list"
msgid "Works Efforts"
msgstr ""
diff --git a/locale/ja_JP.po b/locale/ja_JP.po
index b56a5fc..86f0d7e 100644
--- a/locale/ja_JP.po
+++ b/locale/ja_JP.po
@@ -158,6 +158,10 @@ msgctxt "model:ir.action,name:act_task_form"
msgid "Tasks"
msgstr "Tasks"
+msgctxt "model:ir.action,name:act_timesheet_line_form_work"
+msgid "Timesheet Lines"
+msgstr ""
+
msgctxt "model:ir.action,name:act_work_list"
msgid "Works Efforts"
msgstr "Works Efforts"
diff --git a/locale/lo.po b/locale/lo.po
index 7ea7867..3909401 100644
--- a/locale/lo.po
+++ b/locale/lo.po
@@ -176,6 +176,10 @@ msgctxt "model:ir.action,name:act_task_form"
msgid "Tasks"
msgstr ""
+msgctxt "model:ir.action,name:act_timesheet_line_form_work"
+msgid "Timesheet Lines"
+msgstr ""
+
msgctxt "model:ir.action,name:act_work_list"
msgid "Works Efforts"
msgstr ""
diff --git a/locale/lt.po b/locale/lt.po
index 8ec6990..76f2039 100644
--- a/locale/lt.po
+++ b/locale/lt.po
@@ -160,6 +160,10 @@ msgctxt "model:ir.action,name:act_task_form"
msgid "Tasks"
msgstr ""
+msgctxt "model:ir.action,name:act_timesheet_line_form_work"
+msgid "Timesheet Lines"
+msgstr ""
+
msgctxt "model:ir.action,name:act_work_list"
msgid "Works Efforts"
msgstr ""
diff --git a/locale/nl.po b/locale/nl.po
index db4a63b..c2dea18 100644
--- a/locale/nl.po
+++ b/locale/nl.po
@@ -177,6 +177,10 @@ msgctxt "model:ir.action,name:act_task_form"
msgid "Tasks"
msgstr ""
+msgctxt "model:ir.action,name:act_timesheet_line_form_work"
+msgid "Timesheet Lines"
+msgstr ""
+
msgctxt "model:ir.action,name:act_work_list"
msgid "Works Efforts"
msgstr ""
diff --git a/locale/pl.po b/locale/pl.po
index 23f7a54..2a23d1e 100644
--- a/locale/pl.po
+++ b/locale/pl.po
@@ -46,9 +46,10 @@ msgctxt "field:project.work,left:"
msgid "Left"
msgstr ""
+#, fuzzy
msgctxt "field:project.work,name:"
msgid "Name"
-msgstr ""
+msgstr "Nazwa"
msgctxt "field:project.work,parent:"
msgid "Parent"
@@ -158,6 +159,10 @@ msgctxt "model:ir.action,name:act_task_form"
msgid "Tasks"
msgstr "Zadania"
+msgctxt "model:ir.action,name:act_timesheet_line_form_work"
+msgid "Timesheet Lines"
+msgstr ""
+
msgctxt "model:ir.action,name:act_work_list"
msgid "Works Efforts"
msgstr "Works Efforts"
diff --git a/locale/pt_BR.po b/locale/pt_BR.po
index 523f0a5..b28f0d5 100644
--- a/locale/pt_BR.po
+++ b/locale/pt_BR.po
@@ -56,7 +56,7 @@ msgstr "Nome"
msgctxt "field:project.work,parent:"
msgid "Parent"
-msgstr "Parente"
+msgstr "Pai"
msgctxt "field:project.work,party:"
msgid "Party"
@@ -94,19 +94,17 @@ msgctxt "field:project.work,timesheet_duration:"
msgid "Duration"
msgstr "Duração"
-#, fuzzy
msgctxt "field:project.work,timesheet_end_date:"
msgid "Timesheet End"
msgstr "Fim do Horário de Trabalho"
-#, fuzzy
msgctxt "field:project.work,timesheet_start_date:"
msgid "Timesheet Start"
msgstr "Início do Horário de Trabalho"
msgctxt "field:project.work,timesheet_works:"
msgid "Timesheet Works"
-msgstr ""
+msgstr "Horários de Trabalho"
msgctxt "field:project.work,total_effort:"
msgid "Total Effort"
@@ -164,6 +162,10 @@ msgctxt "model:ir.action,name:act_task_form"
msgid "Tasks"
msgstr "Tarefas"
+msgctxt "model:ir.action,name:act_timesheet_line_form_work"
+msgid "Timesheet Lines"
+msgstr "Lançamentos de Horários"
+
msgctxt "model:ir.action,name:act_work_list"
msgid "Works Efforts"
msgstr "Esforços dos trabalhos"
@@ -178,7 +180,7 @@ msgstr "Feito"
msgctxt "model:ir.action.act_window.domain,name:act_project_form_opened"
msgid "Opened"
-msgstr "Abriu"
+msgstr "Aberto"
msgctxt "model:ir.action.act_window.domain,name:act_project_tree_done"
msgid "Done"
@@ -186,7 +188,7 @@ msgstr "Feito"
msgctxt "model:ir.action.act_window.domain,name:act_project_tree_opened"
msgid "Opened"
-msgstr "Abriu"
+msgstr "Aberto"
msgctxt "model:ir.action.act_window.domain,name:act_task_form_done"
msgid "Done"
@@ -238,7 +240,7 @@ msgstr "Feito"
msgctxt "selection:project.work,state:"
msgid "Opened"
-msgstr "Abriu"
+msgstr "Aberto"
msgctxt "selection:project.work,type:"
msgid "Project"
@@ -254,7 +256,7 @@ msgstr "%"
msgctxt "view:project.work:"
msgid "Children"
-msgstr "Criança"
+msgstr "Filhos"
msgctxt "view:project.work:"
msgid "General"
diff --git a/locale/ru.po b/locale/ru.po
index c4e2c6a..d829184 100644
--- a/locale/ru.po
+++ b/locale/ru.po
@@ -164,6 +164,10 @@ msgctxt "model:ir.action,name:act_task_form"
msgid "Tasks"
msgstr "Задачи"
+msgctxt "model:ir.action,name:act_timesheet_line_form_work"
+msgid "Timesheet Lines"
+msgstr ""
+
msgctxt "model:ir.action,name:act_work_list"
msgid "Works Efforts"
msgstr "Рабочие затраты"
diff --git a/locale/sl.po b/locale/sl.po
index f8bc58f..d35c984 100644
--- a/locale/sl.po
+++ b/locale/sl.po
@@ -94,19 +94,17 @@ msgctxt "field:project.work,timesheet_duration:"
msgid "Duration"
msgstr "Trajanje"
-#, fuzzy
msgctxt "field:project.work,timesheet_end_date:"
msgid "Timesheet End"
msgstr "Konec evidence"
-#, fuzzy
msgctxt "field:project.work,timesheet_start_date:"
msgid "Timesheet Start"
msgstr "Začetek evidence"
msgctxt "field:project.work,timesheet_works:"
msgid "Timesheet Works"
-msgstr ""
+msgstr "Evidentirane naloge"
msgctxt "field:project.work,total_effort:"
msgid "Total Effort"
@@ -164,6 +162,10 @@ msgctxt "model:ir.action,name:act_task_form"
msgid "Tasks"
msgstr "Naloge"
+msgctxt "model:ir.action,name:act_timesheet_line_form_work"
+msgid "Timesheet Lines"
+msgstr "Postavke evidence"
+
msgctxt "model:ir.action,name:act_work_list"
msgid "Works Efforts"
msgstr "Ocene nalog"
diff --git a/locale/zh_CN.po b/locale/zh_CN.po
index 5c1ed4e..d1f9e51 100644
--- a/locale/zh_CN.po
+++ b/locale/zh_CN.po
@@ -170,6 +170,10 @@ msgctxt "model:ir.action,name:act_task_form"
msgid "Tasks"
msgstr ""
+msgctxt "model:ir.action,name:act_timesheet_line_form_work"
+msgid "Timesheet Lines"
+msgstr ""
+
msgctxt "model:ir.action,name:act_work_list"
msgid "Works Efforts"
msgstr ""
diff --git a/setup.py b/setup.py
index 13dbcc6..5ccd60a 100644
--- a/setup.py
+++ b/setup.py
@@ -79,7 +79,7 @@ setup(name=name,
'Intended Audience :: Financial and Insurance Industry',
'Intended Audience :: Legal Industry',
'Intended Audience :: Manufacturing',
- 'License :: OSI Approved :: GNU General Public License (GPL)',
+ 'License :: OSI Approved :: GNU General Public License v3 or later (GPLv3+)',
'Natural Language :: Bulgarian',
'Natural Language :: Catalan',
'Natural Language :: Chinese (Simplified)',
diff --git a/timesheet.xml b/timesheet.xml
new file mode 100644
index 0000000..f25b357
--- /dev/null
+++ b/timesheet.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0"?>
+<!-- This file is part of Tryton. The COPYRIGHT file at the top level of
+this repository contains the full copyright notices and license terms. -->
+<tryton>
+ <data>
+ <record model="ir.action.act_window" id="act_timesheet_line_form_work">
+ <field name="name">Timesheet Lines</field>
+ <field name="res_model">timesheet.line</field>
+ <field name="domain"
+ eval="[If(Eval('active_ids', []) == [Eval('active_id')], ('work.origin.id', '=', Eval('active_id'), 'project.work'), ('work.origin.id', 'in', Eval('active_ids'), 'project.work'))]"
+ pyson="1"/>
+ </record>
+ <record model="ir.action.keyword"
+ id="act_timesheet_line_form_work_keyword1">
+ <field name="keyword">form_relate</field>
+ <field name="model">project.work,-1</field>
+ <field name="action" ref="act_timesheet_line_form_work"/>
+ </record>
+ </data>
+</tryton>
diff --git a/tryton.cfg b/tryton.cfg
index ecdbf02..d9569f9 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
[tryton]
-version=4.2.0
+version=4.4.0
depends:
company_work_time
ir
@@ -8,3 +8,4 @@ depends:
xml:
project.xml
work.xml
+ timesheet.xml
diff --git a/trytond_project.egg-info/PKG-INFO b/trytond_project.egg-info/PKG-INFO
index b94701a..271e6a3 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: 4.2.0
+Version: 4.4.0
Summary: Tryton module with projects
Home-page: http://www.tryton.org/
Author: Tryton
Author-email: issue_tracker at tryton.org
License: GPL-3
-Download-URL: http://downloads.tryton.org/4.2/
+Download-URL: http://downloads.tryton.org/4.4/
Description: trytond_project
===============
@@ -52,7 +52,7 @@ 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: License :: OSI Approved :: GNU General Public License v3 or later (GPLv3+)
Classifier: Natural Language :: Bulgarian
Classifier: Natural Language :: Catalan
Classifier: Natural Language :: Chinese (Simplified)
diff --git a/trytond_project.egg-info/SOURCES.txt b/trytond_project.egg-info/SOURCES.txt
index d1d462a..4f8730a 100644
--- a/trytond_project.egg-info/SOURCES.txt
+++ b/trytond_project.egg-info/SOURCES.txt
@@ -6,12 +6,14 @@ MANIFEST.in
README
project.xml
setup.py
+timesheet.xml
tryton.cfg
work.xml
./__init__.py
./party.py
./project.xml
./timesheet.py
+./timesheet.xml
./tryton.cfg
./work.py
./work.xml
diff --git a/trytond_project.egg-info/requires.txt b/trytond_project.egg-info/requires.txt
index 27d3f98..a2972d3 100644
--- a/trytond_project.egg-info/requires.txt
+++ b/trytond_project.egg-info/requires.txt
@@ -1,5 +1,5 @@
python-sql >= 0.4
-trytond_company_work_time >= 4.2, < 4.3
-trytond_party >= 4.2, < 4.3
-trytond_timesheet >= 4.2, < 4.3
-trytond >= 4.2, < 4.3
+trytond_company_work_time >= 4.4, < 4.5
+trytond_party >= 4.4, < 4.5
+trytond_timesheet >= 4.4, < 4.5
+trytond >= 4.4, < 4.5
diff --git a/view/work_form.xml b/view/work_form.xml
index ff43713..d9ec388 100644
--- a/view/work_form.xml
+++ b/view/work_form.xml
@@ -44,7 +44,7 @@ this repository contains the full copyright notices and license terms. -->
<label name="state"/>
<field name="state"/>
</group>
- <group col="20" colspan="2" id="buttons">
+ <group col="-1" colspan="2" id="buttons">
</group>
</group>
</page>
diff --git a/work.py b/work.py
index cdb95a0..7363e23 100644
--- a/work.py
+++ b/work.py
@@ -58,9 +58,7 @@ class Work(sequence_ordered(), ModelSQL, ModelView):
help="Total time spent on this work and the sub-works"),
'get_total')
effort_duration = fields.TimeDelta('Effort', 'company_work_time',
- states={
- 'invisible': Eval('type') != 'task',
- }, depends=['type'], help="Estimated Effort for this work")
+ help="Estimated Effort for this work")
total_effort = fields.Function(fields.TimeDelta('Total Effort',
'company_work_time',
help="Estimated total effort for this work and the sub-works"),
@@ -73,10 +71,6 @@ class Work(sequence_ordered(), ModelSQL, ModelView):
('progress', '<=', 1),
],
],
- states={
- 'invisible': Eval('type') != 'task',
- },
- depends=['type'],
help='Estimated progress for this work')
total_progress = fields.Function(fields.Float('Total Progress',
digits=(16, 4),
@@ -419,8 +413,6 @@ class Work(sequence_ordered(), ModelSQL, ModelView):
@classmethod
def copy(cls, project_works, default=None):
- TimesheetWork = Pool().get('timesheet.work')
-
if default is None:
default = {}
diff --git a/work.xml b/work.xml
index 575e055..8a961cf 100644
--- a/work.xml
+++ b/work.xml
@@ -187,7 +187,7 @@ this repository contains the full copyright notices and license terms. -->
<field name="res_model">project.work</field>
<field name="context"></field>
<field name="domain"
- eval="[('parent', 'in', Eval('active_ids')), ('type', '=', 'task')]"
+ eval="[('type', '=', 'task'), If(Eval('active_ids', []) == [Eval('active_id')], ('parent', '=', Eval('active_id')), ('parent', 'in', Eval('active_ids')))]"
pyson="1"/>
</record>
<record model="ir.action.keyword"
--
tryton-modules-project
More information about the tryton-debian-vcs
mailing list