[tryton-debian-vcs] tryton-modules-project-plan branch upstream updated. upstream/2.8.2-1-g144052d
git repository hosting
tryton-debian-vcs at m9s.biz
Mon Nov 25 19:36:34 UTC 2013
The following commit has been merged in the upstream branch:
http://debian.tryton.org/gitweb/?p=packages/tryton-modules-project-plan.git;a=commitdiff;h=upstream/2.8.2-1-g144052d
commit 144052d71acaf6030979ebfb53de3a3490120e51
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Sun Nov 24 17:27:49 2013 +0100
Adding upstream version 3.0.0.
diff --git a/CHANGELOG b/CHANGELOG
index 33ef60f..aa80594 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,7 +1,4 @@
-Version 2.8.2 - 2013-07-22
-* Bug fixes (see mercurial logs for details)
-
-Version 2.8.1 - 2013-06-09
+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 204e836..9da5349 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,12 +1,12 @@
Metadata-Version: 1.1
Name: trytond_project_plan
-Version: 2.8.2
+Version: 3.0.0
Summary: Tryton module to add planning capabilities on 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_plan
====================
@@ -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 a2dbd75..b460bcf 100644
--- a/locale/bg_BG.po
+++ b/locale/bg_BG.po
@@ -159,10 +159,6 @@ msgctxt "field:project.work,predecessors:"
msgid "Predecessors"
msgstr "Предшественици"
-msgctxt "field:project.work,requests:"
-msgid "Requests"
-msgstr "Заявки"
-
msgctxt "field:project.work,successors:"
msgid "Successors"
msgstr "Наследници"
@@ -179,10 +175,6 @@ msgctxt "model:project.predecessor_successor,name:"
msgid "Predecessor - Successor"
msgstr "Предшественик - Наследник"
-msgctxt "model:res.request.link,name:request_link_work"
-msgid "Work"
-msgstr "Задача"
-
msgctxt "view:project.allocation:"
msgid "Allocation"
msgstr "Разпределение"
@@ -198,7 +190,3 @@ msgstr "Разпределения"
msgctxt "view:project.work:"
msgid "Plan"
msgstr "План"
-
-msgctxt "view:project.work:"
-msgid "Requests"
-msgstr "Заявки"
diff --git a/locale/ca_ES.po b/locale/ca_ES.po
index 7ba2b67..5213b29 100644
--- a/locale/ca_ES.po
+++ b/locale/ca_ES.po
@@ -158,10 +158,6 @@ msgctxt "field:project.work,predecessors:"
msgid "Predecessors"
msgstr "Predecessors"
-msgctxt "field:project.work,requests:"
-msgid "Requests"
-msgstr "Sol·licituds"
-
msgctxt "field:project.work,successors:"
msgid "Successors"
msgstr "Successors"
@@ -178,10 +174,6 @@ msgctxt "model:project.predecessor_successor,name:"
msgid "Predecessor - Successor"
msgstr "Predecessor - Successor"
-msgctxt "model:res.request.link,name:request_link_work"
-msgid "Work"
-msgstr "Treball"
-
msgctxt "view:project.allocation:"
msgid "Allocation"
msgstr "Assignació"
@@ -197,7 +189,3 @@ msgstr "Assignacions"
msgctxt "view:project.work:"
msgid "Plan"
msgstr "Planificació"
-
-msgctxt "view:project.work:"
-msgid "Requests"
-msgstr "Sol·licituds"
diff --git a/locale/cs_CZ.po b/locale/cs_CZ.po
index 4814d25..aa10f8b 100644
--- a/locale/cs_CZ.po
+++ b/locale/cs_CZ.po
@@ -158,10 +158,6 @@ msgctxt "field:project.work,predecessors:"
msgid "Predecessors"
msgstr ""
-msgctxt "field:project.work,requests:"
-msgid "Requests"
-msgstr ""
-
msgctxt "field:project.work,successors:"
msgid "Successors"
msgstr ""
@@ -178,10 +174,6 @@ msgctxt "model:project.predecessor_successor,name:"
msgid "Predecessor - Successor"
msgstr ""
-msgctxt "model:res.request.link,name:request_link_work"
-msgid "Work"
-msgstr ""
-
msgctxt "view:project.allocation:"
msgid "Allocation"
msgstr ""
@@ -197,7 +189,3 @@ msgstr ""
msgctxt "view:project.work:"
msgid "Plan"
msgstr ""
-
-msgctxt "view:project.work:"
-msgid "Requests"
-msgstr ""
diff --git a/locale/de_DE.po b/locale/de_DE.po
index 4b41b1c..00a312e 100644
--- a/locale/de_DE.po
+++ b/locale/de_DE.po
@@ -158,10 +158,6 @@ msgctxt "field:project.work,predecessors:"
msgid "Predecessors"
msgstr "Vorgänger"
-msgctxt "field:project.work,requests:"
-msgid "Requests"
-msgstr "Anfragen"
-
msgctxt "field:project.work,successors:"
msgid "Successors"
msgstr "Nachfolger"
@@ -178,10 +174,6 @@ msgctxt "model:project.predecessor_successor,name:"
msgid "Predecessor - Successor"
msgstr "Vorgänger - Nachfolger"
-msgctxt "model:res.request.link,name:request_link_work"
-msgid "Work"
-msgstr "Arbeit"
-
msgctxt "view:project.allocation:"
msgid "Allocation"
msgstr "Zuordnung"
@@ -197,7 +189,3 @@ msgstr "Zuordnungen"
msgctxt "view:project.work:"
msgid "Plan"
msgstr "Plan"
-
-msgctxt "view:project.work:"
-msgid "Requests"
-msgstr "Anfragen"
diff --git a/locale/es_AR.po b/locale/es_AR.po
index 4df1da4..a432d56 100644
--- a/locale/es_AR.po
+++ b/locale/es_AR.po
@@ -158,10 +158,6 @@ msgctxt "field:project.work,predecessors:"
msgid "Predecessors"
msgstr "Predecesores"
-msgctxt "field:project.work,requests:"
-msgid "Requests"
-msgstr "Solicitudes"
-
msgctxt "field:project.work,successors:"
msgid "Successors"
msgstr "Sucesores"
@@ -178,10 +174,6 @@ msgctxt "model:project.predecessor_successor,name:"
msgid "Predecessor - Successor"
msgstr "Predecesor - Sucesor"
-msgctxt "model:res.request.link,name:request_link_work"
-msgid "Work"
-msgstr "Actividad"
-
msgctxt "view:project.allocation:"
msgid "Allocation"
msgstr "Asignación"
@@ -197,7 +189,3 @@ msgstr "Asignaciones"
msgctxt "view:project.work:"
msgid "Plan"
msgstr "Planificación"
-
-msgctxt "view:project.work:"
-msgid "Requests"
-msgstr "Solicitudes"
diff --git a/locale/es_CO.po b/locale/es_CO.po
index 8b266c4..630d1ad 100644
--- a/locale/es_CO.po
+++ b/locale/es_CO.po
@@ -32,7 +32,7 @@ msgstr "Nombre"
msgctxt "field:project.allocation,work:"
msgid "Work"
-msgstr "Trabajo"
+msgstr "Tarea"
msgctxt "field:project.allocation,write_date:"
msgid "Write Date"
@@ -158,10 +158,6 @@ msgctxt "field:project.work,predecessors:"
msgid "Predecessors"
msgstr "Predecesores"
-msgctxt "field:project.work,requests:"
-msgid "Requests"
-msgstr "Solicitudes"
-
msgctxt "field:project.work,successors:"
msgid "Successors"
msgstr "Sucesores"
@@ -178,10 +174,6 @@ msgctxt "model:project.predecessor_successor,name:"
msgid "Predecessor - Successor"
msgstr "Predecesor - Sucesor"
-msgctxt "model:res.request.link,name:request_link_work"
-msgid "Work"
-msgstr "Trabajo"
-
msgctxt "view:project.allocation:"
msgid "Allocation"
msgstr "Cuota"
@@ -197,7 +189,3 @@ msgstr "Cuotas"
msgctxt "view:project.work:"
msgid "Plan"
msgstr "Plan"
-
-msgctxt "view:project.work:"
-msgid "Requests"
-msgstr "Solicitudes"
diff --git a/locale/es_ES.po b/locale/es_ES.po
index c1e6b7f..e470ad5 100644
--- a/locale/es_ES.po
+++ b/locale/es_ES.po
@@ -158,10 +158,6 @@ msgctxt "field:project.work,predecessors:"
msgid "Predecessors"
msgstr "Predecesores"
-msgctxt "field:project.work,requests:"
-msgid "Requests"
-msgstr "Solicitudes"
-
msgctxt "field:project.work,successors:"
msgid "Successors"
msgstr "Sucesores"
@@ -178,10 +174,6 @@ msgctxt "model:project.predecessor_successor,name:"
msgid "Predecessor - Successor"
msgstr "Predecesor - Sucesor"
-msgctxt "model:res.request.link,name:request_link_work"
-msgid "Work"
-msgstr "Trabajo"
-
msgctxt "view:project.allocation:"
msgid "Allocation"
msgstr "Asignación"
@@ -197,7 +189,3 @@ msgstr "Asignaciones"
msgctxt "view:project.work:"
msgid "Plan"
msgstr "Planificación"
-
-msgctxt "view:project.work:"
-msgid "Requests"
-msgstr "Solicitudes"
diff --git a/locale/fr_FR.po b/locale/fr_FR.po
index 6b087cf..4ec0006 100644
--- a/locale/fr_FR.po
+++ b/locale/fr_FR.po
@@ -158,10 +158,6 @@ msgctxt "field:project.work,predecessors:"
msgid "Predecessors"
msgstr "Prédécesseurs"
-msgctxt "field:project.work,requests:"
-msgid "Requests"
-msgstr "Demandes"
-
msgctxt "field:project.work,successors:"
msgid "Successors"
msgstr "Successeurs"
@@ -178,14 +174,6 @@ msgctxt "model:project.predecessor_successor,name:"
msgid "Predecessor - Successor"
msgstr "Prédécesseur - Successeur"
-msgctxt "model:res.request.link,name:request_link_work"
-msgid "Work"
-msgstr "Travail"
-
-msgctxt "view:project.allocation:"
-msgid "Allocation"
-msgstr "Répartition"
-
msgctxt "view:project.allocation:"
msgid "Allocation"
msgstr "Répartition"
@@ -194,30 +182,10 @@ msgctxt "view:project.allocation:"
msgid "Allocations"
msgstr "Répartitions"
-msgctxt "view:project.allocation:"
-msgid "Allocations"
-msgstr "Répartitions"
-
msgctxt "view:project.work:"
msgid "Allocations"
msgstr "Répartitions"
msgctxt "view:project.work:"
-msgid "Allocations"
-msgstr "Répartitions"
-
-msgctxt "view:project.work:"
-msgid "Plan"
-msgstr "Planification"
-
-msgctxt "view:project.work:"
msgid "Plan"
msgstr "Planification"
-
-msgctxt "view:project.work:"
-msgid "Requests"
-msgstr "Demandes"
-
-msgctxt "view:project.work:"
-msgid "Requests"
-msgstr "Demandes"
diff --git a/locale/nl_NL.po b/locale/nl_NL.po
index 749c549..6da7003 100644
--- a/locale/nl_NL.po
+++ b/locale/nl_NL.po
@@ -163,10 +163,6 @@ msgctxt "field:project.work,predecessors:"
msgid "Predecessors"
msgstr ""
-msgctxt "field:project.work,requests:"
-msgid "Requests"
-msgstr ""
-
msgctxt "field:project.work,successors:"
msgid "Successors"
msgstr ""
@@ -183,11 +179,6 @@ msgctxt "model:project.predecessor_successor,name:"
msgid "Predecessor - Successor"
msgstr ""
-#, fuzzy
-msgctxt "model:res.request.link,name:request_link_work"
-msgid "Work"
-msgstr "Werk"
-
msgctxt "view:project.allocation:"
msgid "Allocation"
msgstr ""
@@ -203,7 +194,3 @@ msgstr ""
msgctxt "view:project.work:"
msgid "Plan"
msgstr ""
-
-msgctxt "view:project.work:"
-msgid "Requests"
-msgstr ""
diff --git a/locale/ru_RU.po b/locale/ru_RU.po
index c04f549..4bd4607 100644
--- a/locale/ru_RU.po
+++ b/locale/ru_RU.po
@@ -158,10 +158,6 @@ msgctxt "field:project.work,predecessors:"
msgid "Predecessors"
msgstr "Предки"
-msgctxt "field:project.work,requests:"
-msgid "Requests"
-msgstr "Сообщения"
-
msgctxt "field:project.work,successors:"
msgid "Successors"
msgstr "Потомки"
@@ -178,10 +174,6 @@ msgctxt "model:project.predecessor_successor,name:"
msgid "Predecessor - Successor"
msgstr "Предок - Потомок"
-msgctxt "model:res.request.link,name:request_link_work"
-msgid "Work"
-msgstr "Работа"
-
msgctxt "view:project.allocation:"
msgid "Allocation"
msgstr "Распределение"
@@ -197,7 +189,3 @@ msgstr "Распределения"
msgctxt "view:project.work:"
msgid "Plan"
msgstr "План"
-
-msgctxt "view:project.work:"
-msgid "Requests"
-msgstr "Сообщения"
diff --git a/locale/cs_CZ.po b/locale/sl_SI.po
similarity index 75%
copy from locale/cs_CZ.po
copy to locale/sl_SI.po
index 4814d25..0846705 100644
--- a/locale/cs_CZ.po
+++ b/locale/sl_SI.po
@@ -4,200 +4,188 @@ msgstr "Content-Type: text/plain; charset=utf-8\n"
msgctxt "error:project.allocation:"
msgid "Percentage must be greater than zero"
-msgstr ""
+msgstr "Odstotek mora biti večji od nič"
msgctxt "field:project.allocation,create_date:"
msgid "Create Date"
-msgstr ""
+msgstr "Ustvarjeno"
msgctxt "field:project.allocation,create_uid:"
msgid "Create User"
-msgstr ""
+msgstr "Ustvaril"
msgctxt "field:project.allocation,employee:"
msgid "Employee"
-msgstr ""
+msgstr "Zaposlenec"
msgctxt "field:project.allocation,id:"
msgid "ID"
-msgstr ""
+msgstr "ID"
msgctxt "field:project.allocation,percentage:"
msgid "Percentage"
-msgstr ""
+msgstr "Delež"
msgctxt "field:project.allocation,rec_name:"
msgid "Name"
-msgstr ""
+msgstr "Ime"
msgctxt "field:project.allocation,work:"
msgid "Work"
-msgstr ""
+msgstr "Dejavnost"
msgctxt "field:project.allocation,write_date:"
msgid "Write Date"
-msgstr ""
+msgstr "Zapisano"
msgctxt "field:project.allocation,write_uid:"
msgid "Write User"
-msgstr ""
+msgstr "Zapisal"
msgctxt "field:project.predecessor_successor,create_date:"
msgid "Create Date"
-msgstr ""
+msgstr "Ustvarjeno"
msgctxt "field:project.predecessor_successor,create_uid:"
msgid "Create User"
-msgstr ""
+msgstr "Ustvaril"
msgctxt "field:project.predecessor_successor,id:"
msgid "ID"
-msgstr ""
+msgstr "ID"
msgctxt "field:project.predecessor_successor,predecessor:"
msgid "Predecessor"
-msgstr ""
+msgstr "Predhodnik"
msgctxt "field:project.predecessor_successor,rec_name:"
msgid "Name"
-msgstr ""
+msgstr "Ime"
msgctxt "field:project.predecessor_successor,successor:"
msgid "Successor"
-msgstr ""
+msgstr "Naslednik"
msgctxt "field:project.predecessor_successor,write_date:"
msgid "Write Date"
-msgstr ""
+msgstr "Zapisano"
msgctxt "field:project.predecessor_successor,write_uid:"
msgid "Write User"
-msgstr ""
+msgstr "Zapisal"
msgctxt "field:project.work,actual_finish_date:"
msgid "Actual Finish"
-msgstr ""
+msgstr "Dejanski konec"
msgctxt "field:project.work,actual_finish_time:"
msgid "Actual Finish Time"
-msgstr ""
+msgstr "Dejanski končni čas"
msgctxt "field:project.work,actual_start_date:"
msgid "Actual Start"
-msgstr ""
+msgstr "Dejanski začetek"
msgctxt "field:project.work,actual_start_time:"
msgid "Actual Start Time"
-msgstr ""
+msgstr "Dejanski začetni čas"
msgctxt "field:project.work,allocations:"
msgid "Allocations"
-msgstr ""
+msgstr "Razporeditve"
msgctxt "field:project.work,back_leveling_delay:"
msgid "Back Leveling Delay"
-msgstr ""
+msgstr "Izravnalna zakasnitev nazaj"
msgctxt "field:project.work,constraint_finish_date:"
msgid "Constraint Finish"
-msgstr ""
+msgstr "Omejen konec"
msgctxt "field:project.work,constraint_finish_time:"
msgid "Constraint Finish Time"
-msgstr ""
+msgstr "Omejen končni čas"
msgctxt "field:project.work,constraint_start_date:"
msgid "Constraint Start"
-msgstr ""
+msgstr "Omejen začetek"
msgctxt "field:project.work,constraint_start_time:"
msgid "Constraint Start Time"
-msgstr ""
+msgstr "Omejen začetni čas"
msgctxt "field:project.work,duration:"
msgid "Duration"
-msgstr ""
+msgstr "Trajanje"
msgctxt "field:project.work,early_finish_date:"
msgid "Early Finish"
-msgstr ""
+msgstr "Zgodnji konec"
msgctxt "field:project.work,early_finish_time:"
msgid "Early Finish Time"
-msgstr ""
+msgstr "Predčasni končni čas"
msgctxt "field:project.work,early_start_date:"
msgid "Early Start"
-msgstr ""
+msgstr "Predčasni začetek"
msgctxt "field:project.work,early_start_time:"
msgid "Early Start Time"
-msgstr ""
+msgstr "Predčasni začetni čas"
msgctxt "field:project.work,late_finish_date:"
msgid "Late Finish"
-msgstr ""
+msgstr "Zakasneli konec"
msgctxt "field:project.work,late_finish_time:"
msgid "Late Finish Time"
-msgstr ""
+msgstr "Zakasneli končni čas"
msgctxt "field:project.work,late_start_date:"
msgid "Late Start"
-msgstr ""
+msgstr "Zakasneli začetek"
msgctxt "field:project.work,late_start_time:"
msgid "Late Start Time"
-msgstr ""
+msgstr "Zakasneli začetni čas"
msgctxt "field:project.work,leveling_delay:"
msgid "Leveling Delay"
-msgstr ""
+msgstr "Izravnalna zakasnitev"
msgctxt "field:project.work,predecessors:"
msgid "Predecessors"
-msgstr ""
-
-msgctxt "field:project.work,requests:"
-msgid "Requests"
-msgstr ""
+msgstr "Predhodniki"
msgctxt "field:project.work,successors:"
msgid "Successors"
-msgstr ""
+msgstr "Nasledniki"
msgctxt "model:ir.action,name:wizard_leveling"
msgid "Tasks Leveling"
-msgstr ""
+msgstr "Izravnava nalog"
msgctxt "model:project.allocation,name:"
msgid "Allocation"
-msgstr ""
+msgstr "Razporeditev"
msgctxt "model:project.predecessor_successor,name:"
msgid "Predecessor - Successor"
-msgstr ""
-
-msgctxt "model:res.request.link,name:request_link_work"
-msgid "Work"
-msgstr ""
+msgstr "Predhodnik - Naslednik"
msgctxt "view:project.allocation:"
msgid "Allocation"
-msgstr ""
+msgstr "Razporeditev"
msgctxt "view:project.allocation:"
msgid "Allocations"
-msgstr ""
+msgstr "Razporeditve"
msgctxt "view:project.work:"
msgid "Allocations"
-msgstr ""
+msgstr "Razporeditve"
msgctxt "view:project.work:"
msgid "Plan"
-msgstr ""
-
-msgctxt "view:project.work:"
-msgid "Requests"
-msgstr ""
+msgstr "Planiranje"
diff --git a/setup.py b/setup.py
index ab66efc..caa2737 100644
--- a/setup.py
+++ b/setup.py
@@ -64,6 +64,7 @@ setup(name='trytond_project_plan',
'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 3bc7b90..6ba206d 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_plan import suite
+
+__all__ = ['suite']
diff --git a/tryton.cfg b/tryton.cfg
index 1eb5ca9..07263a1 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
[tryton]
-version=2.8.2
+version=3.0.0
depends:
ir
company
diff --git a/trytond_project_plan.egg-info/PKG-INFO b/trytond_project_plan.egg-info/PKG-INFO
index d384cc5..8880099 100644
--- a/trytond_project_plan.egg-info/PKG-INFO
+++ b/trytond_project_plan.egg-info/PKG-INFO
@@ -1,12 +1,12 @@
Metadata-Version: 1.1
Name: trytond-project-plan
-Version: 2.8.2
+Version: 3.0.0
Summary: Tryton module to add planning capabilities on 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_plan
====================
@@ -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_plan.egg-info/SOURCES.txt b/trytond_project_plan.egg-info/SOURCES.txt
index b8900b0..8d35729 100644
--- a/trytond_project_plan.egg-info/SOURCES.txt
+++ b/trytond_project_plan.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_plan.egg-info/PKG-INFO
trytond_project_plan.egg-info/SOURCES.txt
trytond_project_plan.egg-info/dependency_links.txt
diff --git a/trytond_project_plan.egg-info/requires.txt b/trytond_project_plan.egg-info/requires.txt
index 4453741..cc7dd7c 100644
--- a/trytond_project_plan.egg-info/requires.txt
+++ b/trytond_project_plan.egg-info/requires.txt
@@ -1,4 +1,4 @@
-trytond_company >= 2.8, < 2.9
-trytond_project >= 2.8, < 2.9
-trytond_timesheet >= 2.8, < 2.9
-trytond >= 2.8, < 2.9
\ No newline at end of file
+trytond_company >= 3.0, < 3.1
+trytond_project >= 3.0, < 3.1
+trytond_timesheet >= 3.0, < 3.1
+trytond >= 3.0, < 3.1
\ No newline at end of file
diff --git a/view/work_form.xml b/view/work_form.xml
index ffc5dc9..8229a96 100644
--- a/view/work_form.xml
+++ b/view/work_form.xml
@@ -30,8 +30,5 @@ this repository contains the full copyright notices and license terms. -->
states="{'invisible': Not(Equal(Eval('type'), 'task'))}" >
<field name="allocations" colspan="4"/>
</page>
- <page string="Requests" id="requests">
- <field name="requests"/>
- </page>
</xpath>
</data>
diff --git a/work.py b/work.py
index 1082314..824ccda 100644
--- a/work.py
+++ b/work.py
@@ -34,8 +34,8 @@ class Work:
('id', '!=', Eval('id')),
],
depends=['parent', 'id'])
- leveling_delay = fields.Float("Leveling Delay")
- back_leveling_delay = fields.Float("Back Leveling Delay")
+ leveling_delay = fields.Float("Leveling Delay", required=True)
+ back_leveling_delay = fields.Float("Back Leveling Delay", required=True)
allocations = fields.One2Many('project.allocation', 'work', 'Allocations',
states={
'invisible': Eval('type') != 'task',
@@ -67,8 +67,6 @@ class Work:
constraint_finish_date = fields.Function(fields.Date('Constraint Finish',
depends=['type']), 'get_function_fields',
setter='set_function_fields')
- requests = fields.Function(fields.One2Many('res.request', None,
- 'Requests'), 'get_function_fields', setter='set_function_fields')
@classmethod
def __setup__(cls):
@@ -77,42 +75,24 @@ class Work:
@classmethod
def validate(cls, works):
super(Work, cls).validate(works)
- cls.check_recursion(works)
+ cls.check_recursion(works, parent='successors')
- @classmethod
- def check_recursion(cls, records, parent='successors'):
- return super(Work, cls).check_recursion(records, parent=parent)
+ @staticmethod
+ def default_leveling_delay():
+ return 0.0
+
+ @staticmethod
+ def default_back_leveling_delay():
+ return 0.0
@classmethod
def get_function_fields(cls, works, names):
'''
Function to compute function fields
'''
- RequestReference = Pool().get('res.request.reference')
-
- cursor = Transaction().cursor
-
res = {}
ids = [w.id for w in works]
- if 'requests' in names:
- requests = dict((i, []) for i in ids)
-
- for i in range(0, len(ids), cursor.IN_MAX):
- sub_ids = ids[i:i + cursor.IN_MAX]
-
- req_refs = RequestReference.search([
- ('reference', 'in', [
- 'project.work,%s' % i for i in sub_ids
- ]
- ),
- ])
- for req_ref in req_refs:
- work_id = req_ref.reference.id
- requests[work_id].append(req_ref.request.id)
-
- res['requests'] = requests
-
if 'duration' in names:
all_works = cls.search([
('parent', 'child_of', ids),
@@ -173,70 +153,6 @@ class Work:
@classmethod
def set_function_fields(cls, works, name, value):
- pool = Pool()
- Request = pool.get('res.request')
- RequestReference = pool.get('res.request.reference')
-
- if name == 'requests':
- currents = dict((req.id, req) for work in works for req in
- work.requests)
- if not value:
- return
- for v in value:
- to_unlink = []
- to_link = []
- operator = v[0]
-
- target_ids = len(v) > 1 and v[1] or []
- if operator == 'create':
- request, = Request.create(v[1])
- to_link.append(request.id)
- elif operator == 'write':
- Request.write([Request(v[1])], v[2])
- elif operator == 'delete':
- Request.delete([Request(v[1])])
- elif operator == 'delete_all':
- target_ids = []
- for work in works:
- refs = RequestReference.search([
- ('reference', '=', str(work)),
- ])
- target_ids.extend(ref.request.id for ref in refs)
- Request.delete(Request.browse(target_ids))
- elif operator == 'unlink':
- to_unlink.extend((i for i in target_ids if i in currents))
- elif operator == 'add':
- to_link.extend((i for i in target_ids if i not in
- currents))
- elif operator == 'unlink_all':
- to_unlink.extend(currents)
- elif operator == 'set':
- to_link.extend((i for i in target_ids
- if i not in currents))
- to_unlink.extend((i for i in currents
- if i not in target_ids))
- else:
- raise Exception('Operation not supported')
-
- req_refs = []
- for i in to_unlink:
- request = currents[i]
- for ref in request.references:
- if ref.reference in works:
- req_refs.append(ref)
- RequestReference.delete(req_refs)
-
- to_create = []
- for i in to_link:
- for work in works:
- to_create.append({
- 'request': i,
- 'reference': str(work),
- })
- if to_create:
- RequestReference.create(to_create)
- return
-
fun_fields = ('actual_start_date', 'actual_finish_date',
'constraint_start_date', 'constraint_finish_date')
db_fields = ('actual_start_time', 'actual_finish_time',
@@ -486,7 +402,7 @@ class Work:
if constraint_finish:
late_finish = self.add_hours(work.company, constraint_finish,
- -(work.back_leveling_delay or 0.0))
+ -work.back_leveling_delay)
else:
late_finish = None
diff --git a/work.xml b/work.xml
index 9d318e6..b297ec6 100644
--- a/work.xml
+++ b/work.xml
@@ -21,9 +21,5 @@ this repository contains the full copyright notices and license terms. -->
<field name="action" ref="wizard_leveling"/>
</record>
- <record model="res.request.link" id="request_link_work">
- <field name="name">Work</field>
- <field name="model">project.work</field>
- </record>
</data>
</tryton>
--
tryton-modules-project-plan
More information about the tryton-debian-vcs
mailing list