[tryton-debian-vcs] tryton-modules-project-plan branch upstream created. 144052d71acaf6030979ebfb53de3a3490120e51
Mathias Behrle
tryton-debian-vcs at alioth.debian.org
Wed Nov 27 17:07:03 UTC 2013
The following commit has been merged in the upstream branch:
https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi/?p=tryton/tryton-modules-project-plan.git;a=commitdiff;h=144052d71acaf6030979ebfb53de3a3490120e51
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>
commit b2d4742e39c56d4f48cfd291905f66de85c19bb4
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Mon Aug 5 18:49:18 2013 +0200
Adding upstream version 2.8.2.
diff --git a/CHANGELOG b/CHANGELOG
index a326be3..33ef60f 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 2.8.2 - 2013-07-22
+* Bug fixes (see mercurial logs for details)
+
Version 2.8.1 - 2013-06-09
* Bug fixes (see mercurial logs for details)
diff --git a/PKG-INFO b/PKG-INFO
index 9e52b64..204e836 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: trytond_project_plan
-Version: 2.8.1
+Version: 2.8.2
Summary: Tryton module to add planning capabilities on projects
Home-page: http://www.tryton.org/
Author: Tryton
diff --git a/tryton.cfg b/tryton.cfg
index 4228c90..1eb5ca9 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
[tryton]
-version=2.8.1
+version=2.8.2
depends:
ir
company
diff --git a/trytond_project_plan.egg-info/PKG-INFO b/trytond_project_plan.egg-info/PKG-INFO
index 0f7f179..d384cc5 100644
--- a/trytond_project_plan.egg-info/PKG-INFO
+++ b/trytond_project_plan.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: trytond-project-plan
-Version: 2.8.1
+Version: 2.8.2
Summary: Tryton module to add planning capabilities on projects
Home-page: http://www.tryton.org/
Author: Tryton
diff --git a/work.py b/work.py
index 2ff7dfa..1082314 100644
--- a/work.py
+++ b/work.py
@@ -598,9 +598,8 @@ class Work:
yield sibling, delay
- parent = self.parent and self.parent.id or None
siblings = self.search([
- ('parent', '=', parent.id)
+ ('parent', '=', self.parent.id if self.parent else None)
])
refkey = get_key(self)
@@ -617,8 +616,8 @@ class Work:
'back_leveling_delay': delay,
})
- if parent:
- parent.compute_dates()
+ if self.parent:
+ self.parent.compute_dates()
@classmethod
def write(cls, works, values):
commit 5ca8d32f977e181bd4adcd84e99f67389303fcb1
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Mon Jun 10 13:44:10 2013 +0200
Adding upstream version 2.8.1.
diff --git a/CHANGELOG b/CHANGELOG
index c168a1d..a326be3 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 2.8.1 - 2013-06-09
+* 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 87e9c61..9e52b64 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: trytond_project_plan
-Version: 2.8.0
+Version: 2.8.1
Summary: Tryton module to add planning capabilities on projects
Home-page: http://www.tryton.org/
Author: Tryton
diff --git a/tryton.cfg b/tryton.cfg
index fba36ae..4228c90 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
[tryton]
-version=2.8.0
+version=2.8.1
depends:
ir
company
diff --git a/trytond_project_plan.egg-info/PKG-INFO b/trytond_project_plan.egg-info/PKG-INFO
index 1654cd6..0f7f179 100644
--- a/trytond_project_plan.egg-info/PKG-INFO
+++ b/trytond_project_plan.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: trytond-project-plan
-Version: 2.8.0
+Version: 2.8.1
Summary: Tryton module to add planning capabilities on projects
Home-page: http://www.tryton.org/
Author: Tryton
diff --git a/work.py b/work.py
index 0ba1fee..2ff7dfa 100644
--- a/work.py
+++ b/work.py
@@ -486,7 +486,7 @@ class Work:
if constraint_finish:
late_finish = self.add_hours(work.company, constraint_finish,
- -work.back_leveling_delay)
+ -(work.back_leveling_delay or 0.0))
else:
late_finish = None
commit d2c433eea0fa828d04685b89b9fff532e1560acf
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Thu May 2 00:37:10 2013 +0200
Adding upstream version 2.8.0.
diff --git a/CHANGELOG b/CHANGELOG
index 13d6b8d..c168a1d 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 fe93a1f..fa3aaf4 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,6 +1,6 @@
-Copyright (C) 2009-2012 Bertrand Chenal.
-Copyright (C) 2009-2012 Cédric Krier.
-Copyright (C) 2009-2012 B2CK SPRL.
+Copyright (C) 2009-2013 Bertrand Chenal.
+Copyright (C) 2009-2013 Cédric Krier.
+Copyright (C) 2009-2013 B2CK SPRL.
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 3e52948..99c60a7 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -6,6 +6,7 @@ include COPYRIGHT
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 598237f..87e9c61 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,12 +1,12 @@
-Metadata-Version: 1.0
+Metadata-Version: 1.1
Name: trytond_project_plan
-Version: 2.6.0
+Version: 2.8.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.6/
+Download-URL: http://downloads.tryton.org/2.8/
Description: trytond_project_plan
====================
@@ -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/allocation.py b/allocation.py
index 51dfc69..f39c9c8 100644
--- a/allocation.py
+++ b/allocation.py
@@ -43,10 +43,12 @@ class Allocation(ModelSQL, ModelView):
work.compute_dates()
@classmethod
- def create(cls, values):
- allocation = super(Allocation, cls).create(values)
- allocation.work.reset_leveling()
- allocation.work.compute_dates()
+ def create(cls, vlist):
+ allocations = super(Allocation, cls).create(vlist)
+ for allocation in allocations:
+ allocation.work.reset_leveling()
+ allocation.work.compute_dates()
+ return allocations
@classmethod
def delete(cls, allocations):
diff --git a/allocation.xml b/allocation.xml
index fc83e93..f42992e 100644
--- a/allocation.xml
+++ b/allocation.xml
@@ -7,32 +7,13 @@ this repository contains the full copyright notices and license terms. -->
<record model="ir.ui.view" id="allocation_view_form">
<field name="model">project.allocation</field>
<field name="type">form</field>
- <field name="arch" type="xml">
- <![CDATA[
- <form string="Allocation">
- <label name="employee"/>
- <field name="employee"/>
- <label name="percentage"/>
- <field name="percentage"/>
- <label name="work"/>
- <field name="work"/>
- </form>
- ]]>
- </field>
+ <field name="name">allocation_form</field>
</record>
<record model="ir.ui.view" id="allocation_view_tree">
<field name="model">project.allocation</field>
<field name="type">tree</field>
<field name="priority" eval="8"/>
- <field name="arch" type="xml">
- <![CDATA[
- <tree string="Allocations">
- <field name="employee"/>
- <field name="percentage"/>
- <field name="work"/>
- </tree>
- ]]>
- </field>
+ <field name="name">allocation_tree</field>
</record>
</data>
</tryton>
diff --git a/locale/bg_BG.po b/locale/bg_BG.po
index f69fe2d..a2dbd75 100644
--- a/locale/bg_BG.po
+++ b/locale/bg_BG.po
@@ -6,10 +6,6 @@ msgctxt "error:project.allocation:"
msgid "Percentage must be greater than zero"
msgstr ""
-msgctxt "error:project.work:"
-msgid "You can not create recursive dependencies!"
-msgstr "Не може да създавате взаимно вложени зависимости!"
-
msgctxt "field:project.allocation,create_date:"
msgid "Create Date"
msgstr "Създадено на"
@@ -98,8 +94,9 @@ msgctxt "field:project.work,allocations:"
msgid "Allocations"
msgstr "Разпределения"
+#, fuzzy
msgctxt "field:project.work,back_leveling_delay:"
-msgid "Leveling Delay"
+msgid "Back Leveling Delay"
msgstr "Изравняване на закъснение"
msgctxt "field:project.work,constraint_finish_date:"
diff --git a/locale/ca_ES.po b/locale/ca_ES.po
index a31a579..7ba2b67 100644
--- a/locale/ca_ES.po
+++ b/locale/ca_ES.po
@@ -4,20 +4,15 @@ msgstr "Content-Type: text/plain; charset=utf-8\n"
msgctxt "error:project.allocation:"
msgid "Percentage must be greater than zero"
-msgstr ""
-
-msgctxt "error:project.work:"
-msgid "You can not create recursive dependencies!"
-msgstr "No pot crear dependències recursives"
+msgstr "El percentatge ha de ser més gran que zero."
msgctxt "field:project.allocation,create_date:"
msgid "Create Date"
msgstr "Data creació"
-#, fuzzy
msgctxt "field:project.allocation,create_uid:"
msgid "Create User"
-msgstr "Crear usuari"
+msgstr "Usuari creació"
msgctxt "field:project.allocation,employee:"
msgid "Employee"
@@ -37,7 +32,7 @@ msgstr "Nom"
msgctxt "field:project.allocation,work:"
msgid "Work"
-msgstr "Activitat"
+msgstr "Treball"
msgctxt "field:project.allocation,write_date:"
msgid "Write Date"
@@ -51,10 +46,9 @@ msgctxt "field:project.predecessor_successor,create_date:"
msgid "Create Date"
msgstr "Data creació"
-#, fuzzy
msgctxt "field:project.predecessor_successor,create_uid:"
msgid "Create User"
-msgstr "Crear usuari"
+msgstr "Usuari creació"
msgctxt "field:project.predecessor_successor,id:"
msgid "ID"
@@ -101,7 +95,7 @@ msgid "Allocations"
msgstr "Assignacions"
msgctxt "field:project.work,back_leveling_delay:"
-msgid "Leveling Delay"
+msgid "Back Leveling Delay"
msgstr "Retard de l'anivellació"
msgctxt "field:project.work,constraint_finish_date:"
@@ -126,15 +120,15 @@ msgstr "Durada"
msgctxt "field:project.work,early_finish_date:"
msgid "Early Finish"
-msgstr "Finalització prematura"
+msgstr "Finalització avançada"
msgctxt "field:project.work,early_finish_time:"
msgid "Early Finish Time"
-msgstr "Hora de finalització prematura"
+msgstr "Hora de finalització avançada"
msgctxt "field:project.work,early_start_date:"
msgid "Early Start"
-msgstr "Inici prematur"
+msgstr "Inici avançat"
msgctxt "field:project.work,early_start_time:"
msgid "Early Start Time"
@@ -142,19 +136,19 @@ msgstr "Temps d'inici prematur"
msgctxt "field:project.work,late_finish_date:"
msgid "Late Finish"
-msgstr "Finalització tardana"
+msgstr "Finalització amb retard"
msgctxt "field:project.work,late_finish_time:"
msgid "Late Finish Time"
-msgstr "Hora de finalització tardana"
+msgstr "Hora de finalització amb retard"
msgctxt "field:project.work,late_start_date:"
msgid "Late Start"
-msgstr "Inici tardà"
+msgstr "Inici amb retard"
msgctxt "field:project.work,late_start_time:"
msgid "Late Start Time"
-msgstr "Hora d'inici tardana"
+msgstr "Hora d'inici amb retard"
msgctxt "field:project.work,leveling_delay:"
msgid "Leveling Delay"
@@ -186,7 +180,7 @@ msgstr "Predecessor - Successor"
msgctxt "model:res.request.link,name:request_link_work"
msgid "Work"
-msgstr "Activitat"
+msgstr "Treball"
msgctxt "view:project.allocation:"
msgid "Allocation"
@@ -202,7 +196,7 @@ msgstr "Assignacions"
msgctxt "view:project.work:"
msgid "Plan"
-msgstr "Pla"
+msgstr "Planificació"
msgctxt "view:project.work:"
msgid "Requests"
diff --git a/locale/cs_CZ.po b/locale/cs_CZ.po
index dc70094..4814d25 100644
--- a/locale/cs_CZ.po
+++ b/locale/cs_CZ.po
@@ -6,10 +6,6 @@ msgctxt "error:project.allocation:"
msgid "Percentage must be greater than zero"
msgstr ""
-msgctxt "error:project.work:"
-msgid "You can not create recursive dependencies!"
-msgstr ""
-
msgctxt "field:project.allocation,create_date:"
msgid "Create Date"
msgstr ""
@@ -99,7 +95,7 @@ msgid "Allocations"
msgstr ""
msgctxt "field:project.work,back_leveling_delay:"
-msgid "Leveling Delay"
+msgid "Back Leveling Delay"
msgstr ""
msgctxt "field:project.work,constraint_finish_date:"
diff --git a/locale/de_DE.po b/locale/de_DE.po
index 31e83a9..4b41b1c 100644
--- a/locale/de_DE.po
+++ b/locale/de_DE.po
@@ -6,10 +6,6 @@ msgctxt "error:project.allocation:"
msgid "Percentage must be greater than zero"
msgstr "Prozentsatz muss größer als 0 sein."
-msgctxt "error:project.work:"
-msgid "You can not create recursive dependencies!"
-msgstr "Abhängigkeiten können nicht rekursiv angelegt werden!"
-
msgctxt "field:project.allocation,create_date:"
msgid "Create Date"
msgstr "Erstellungsdatum"
@@ -99,7 +95,7 @@ msgid "Allocations"
msgstr "Zuordnungen"
msgctxt "field:project.work,back_leveling_delay:"
-msgid "Leveling Delay"
+msgid "Back Leveling Delay"
msgstr "Verzögerung Abgleich"
msgctxt "field:project.work,constraint_finish_date:"
@@ -172,7 +168,7 @@ msgstr "Nachfolger"
msgctxt "model:ir.action,name:wizard_leveling"
msgid "Tasks Leveling"
-msgstr "Aufgaben abgleichen"
+msgstr "Aufgabenabgleich"
msgctxt "model:project.allocation,name:"
msgid "Allocation"
diff --git a/locale/es_AR.po b/locale/es_AR.po
index 1602ff4..4df1da4 100644
--- a/locale/es_AR.po
+++ b/locale/es_AR.po
@@ -6,10 +6,6 @@ msgctxt "error:project.allocation:"
msgid "Percentage must be greater than zero"
msgstr "El porcentaje debe ser mayor que cero"
-msgctxt "error:project.work:"
-msgid "You can not create recursive dependencies!"
-msgstr "¡No puede crear dependencias recursivas!"
-
msgctxt "field:project.allocation,create_date:"
msgid "Create Date"
msgstr "Fecha creación"
@@ -99,7 +95,7 @@ msgid "Allocations"
msgstr "Asignaciones"
msgctxt "field:project.work,back_leveling_delay:"
-msgid "Leveling Delay"
+msgid "Back Leveling Delay"
msgstr "Retraso de la nivelación"
msgctxt "field:project.work,constraint_finish_date:"
@@ -108,7 +104,7 @@ msgstr "Restricción de finalización"
msgctxt "field:project.work,constraint_finish_time:"
msgid "Constraint Finish Time"
-msgstr "Restricción de hora de finalización"
+msgstr "Restricción hora de finalización"
msgctxt "field:project.work,constraint_start_date:"
msgid "Constraint Start"
@@ -116,7 +112,7 @@ msgstr "Restricción de inicio"
msgctxt "field:project.work,constraint_start_time:"
msgid "Constraint Start Time"
-msgstr "Restricción de tiempo de inicio"
+msgstr "Restricción hora de inicio"
msgctxt "field:project.work,duration:"
msgid "Duration"
@@ -124,35 +120,35 @@ msgstr "Duración"
msgctxt "field:project.work,early_finish_date:"
msgid "Early Finish"
-msgstr "Finalización prematura"
+msgstr "Finalización anticipada"
msgctxt "field:project.work,early_finish_time:"
msgid "Early Finish Time"
-msgstr "Hora de finalización prematura"
+msgstr "Hora de finalización anticipada"
msgctxt "field:project.work,early_start_date:"
msgid "Early Start"
-msgstr "Inicio prematuro"
+msgstr "Inicio anticipado"
msgctxt "field:project.work,early_start_time:"
msgid "Early Start Time"
-msgstr "Tiempo de inicio prematuro"
+msgstr "Hora de inicio anticipado"
msgctxt "field:project.work,late_finish_date:"
msgid "Late Finish"
-msgstr "Finalización tardía"
+msgstr "Finalización con retraso"
msgctxt "field:project.work,late_finish_time:"
msgid "Late Finish Time"
-msgstr "Hora de finalización tardía"
+msgstr "Hora de finalización con retraso"
msgctxt "field:project.work,late_start_date:"
msgid "Late Start"
-msgstr "Inicio tardío"
+msgstr "Inicio con retraso"
msgctxt "field:project.work,late_start_time:"
msgid "Late Start Time"
-msgstr "Hora de inicio tardía"
+msgstr "Hora de inicio con retraso"
msgctxt "field:project.work,leveling_delay:"
msgid "Leveling Delay"
@@ -200,7 +196,7 @@ msgstr "Asignaciones"
msgctxt "view:project.work:"
msgid "Plan"
-msgstr "Plan"
+msgstr "Planificación"
msgctxt "view:project.work:"
msgid "Requests"
diff --git a/locale/es_CO.po b/locale/es_CO.po
index b13dced..8b266c4 100644
--- a/locale/es_CO.po
+++ b/locale/es_CO.po
@@ -4,11 +4,7 @@ msgstr "Content-Type: text/plain; charset=utf-8\n"
msgctxt "error:project.allocation:"
msgid "Percentage must be greater than zero"
-msgstr ""
-
-msgctxt "error:project.work:"
-msgid "You can not create recursive dependencies!"
-msgstr "¡No puede crear dependencias recursivas!"
+msgstr "El porcentaje debe ser mayor que cero."
msgctxt "field:project.allocation,create_date:"
msgid "Create Date"
@@ -99,7 +95,7 @@ msgid "Allocations"
msgstr "Cuotas"
msgctxt "field:project.work,back_leveling_delay:"
-msgid "Leveling Delay"
+msgid "Back Leveling Delay"
msgstr "Retardo de Escalamiento"
msgctxt "field:project.work,constraint_finish_date:"
@@ -176,7 +172,7 @@ msgstr "Escalamiento de Tareas"
msgctxt "model:project.allocation,name:"
msgid "Allocation"
-msgstr "Cuotas"
+msgstr "Cuota"
msgctxt "model:project.predecessor_successor,name:"
msgid "Predecessor - Successor"
diff --git a/locale/es_ES.po b/locale/es_ES.po
index 002593c..c1e6b7f 100644
--- a/locale/es_ES.po
+++ b/locale/es_ES.po
@@ -4,11 +4,7 @@ msgstr "Content-Type: text/plain; charset=utf-8\n"
msgctxt "error:project.allocation:"
msgid "Percentage must be greater than zero"
-msgstr ""
-
-msgctxt "error:project.work:"
-msgid "You can not create recursive dependencies!"
-msgstr "No puede crear dependencias recursivas."
+msgstr "El porcentaje debe ser mayor que cero."
msgctxt "field:project.allocation,create_date:"
msgid "Create Date"
@@ -36,7 +32,7 @@ msgstr "Nombre"
msgctxt "field:project.allocation,work:"
msgid "Work"
-msgstr "Actividad"
+msgstr "Trabajo"
msgctxt "field:project.allocation,write_date:"
msgid "Write Date"
@@ -99,7 +95,7 @@ msgid "Allocations"
msgstr "Asignaciones"
msgctxt "field:project.work,back_leveling_delay:"
-msgid "Leveling Delay"
+msgid "Back Leveling Delay"
msgstr "Retraso de la nivelación"
msgctxt "field:project.work,constraint_finish_date:"
@@ -124,35 +120,35 @@ msgstr "Duración"
msgctxt "field:project.work,early_finish_date:"
msgid "Early Finish"
-msgstr "Finalización prematura"
+msgstr "Finalización anticipada"
msgctxt "field:project.work,early_finish_time:"
msgid "Early Finish Time"
-msgstr "Hora de finalización prematura"
+msgstr "Hora de finalización anticipada"
msgctxt "field:project.work,early_start_date:"
msgid "Early Start"
-msgstr "Inicio prematuro"
+msgstr "Inicio anticipado"
msgctxt "field:project.work,early_start_time:"
msgid "Early Start Time"
-msgstr "Hora de inicio prematura"
+msgstr "Hora de inicio anticipado"
msgctxt "field:project.work,late_finish_date:"
msgid "Late Finish"
-msgstr "Finalización tardía"
+msgstr "Finalización con retraso"
msgctxt "field:project.work,late_finish_time:"
msgid "Late Finish Time"
-msgstr "Hora de finalización tardía"
+msgstr "Hora de finalización con retraso"
msgctxt "field:project.work,late_start_date:"
msgid "Late Start"
-msgstr "Inicio tardío"
+msgstr "Inicio con retraso"
msgctxt "field:project.work,late_start_time:"
msgid "Late Start Time"
-msgstr "Hora de inicio tardía"
+msgstr "Hora de inicio con retraso"
msgctxt "field:project.work,leveling_delay:"
msgid "Leveling Delay"
@@ -184,7 +180,7 @@ msgstr "Predecesor - Sucesor"
msgctxt "model:res.request.link,name:request_link_work"
msgid "Work"
-msgstr "Actividad"
+msgstr "Trabajo"
msgctxt "view:project.allocation:"
msgid "Allocation"
@@ -200,7 +196,7 @@ msgstr "Asignaciones"
msgctxt "view:project.work:"
msgid "Plan"
-msgstr "Plan"
+msgstr "Planificación"
msgctxt "view:project.work:"
msgid "Requests"
diff --git a/locale/fr_FR.po b/locale/fr_FR.po
index 019538a..6b087cf 100644
--- a/locale/fr_FR.po
+++ b/locale/fr_FR.po
@@ -6,14 +6,6 @@ msgctxt "error:project.allocation:"
msgid "Percentage must be greater than zero"
msgstr "Le pourcentage doit être supérieur à zéro"
-msgctxt "error:project.work:"
-msgid "You can not create recursive dependencies!"
-msgstr "Vous ne pouvez pas créer des dépendances récursives !"
-
-msgctxt "error:project.work:"
-msgid "You can not create recursive dependencies!"
-msgstr "Vous ne pouvez pas créer des dépendances récursives !"
-
msgctxt "field:project.allocation,create_date:"
msgid "Create Date"
msgstr "Date de création"
@@ -103,8 +95,8 @@ msgid "Allocations"
msgstr "Répartitions"
msgctxt "field:project.work,back_leveling_delay:"
-msgid "Leveling Delay"
-msgstr "Délais de décalage"
+msgid "Back Leveling Delay"
+msgstr "Délais rétro-décalage"
msgctxt "field:project.work,constraint_finish_date:"
msgid "Constraint Finish"
diff --git a/locale/nl_NL.po b/locale/nl_NL.po
index 7075ce5..749c549 100644
--- a/locale/nl_NL.po
+++ b/locale/nl_NL.po
@@ -6,10 +6,6 @@ msgctxt "error:project.allocation:"
msgid "Percentage must be greater than zero"
msgstr ""
-msgctxt "error:project.work:"
-msgid "You can not create recursive dependencies!"
-msgstr ""
-
msgctxt "field:project.allocation,create_date:"
msgid "Create Date"
msgstr ""
@@ -104,7 +100,7 @@ msgid "Allocations"
msgstr ""
msgctxt "field:project.work,back_leveling_delay:"
-msgid "Leveling Delay"
+msgid "Back Leveling Delay"
msgstr ""
msgctxt "field:project.work,constraint_finish_date:"
diff --git a/locale/ru_RU.po b/locale/ru_RU.po
index 2d71ea6..c04f549 100644
--- a/locale/ru_RU.po
+++ b/locale/ru_RU.po
@@ -4,209 +4,200 @@ msgstr "Content-Type: text/plain; charset=utf-8\n"
msgctxt "error:project.allocation:"
msgid "Percentage must be greater than zero"
-msgstr ""
-
-msgctxt "error:project.work:"
-msgid "You can not create recursive dependencies!"
-msgstr ""
+msgstr "Процент должен быть больше нуля"
msgctxt "field:project.allocation,create_date:"
msgid "Create Date"
-msgstr ""
+msgstr "Дата создания"
msgctxt "field:project.allocation,create_uid:"
msgid "Create User"
-msgstr ""
+msgstr "Создано пользователем"
-#, fuzzy
msgctxt "field:project.allocation,employee:"
msgid "Employee"
msgstr "Сотрудник"
msgctxt "field:project.allocation,id:"
msgid "ID"
-msgstr ""
+msgstr "ID"
msgctxt "field:project.allocation,percentage:"
msgid "Percentage"
-msgstr ""
+msgstr "Процент"
-#, fuzzy
msgctxt "field:project.allocation,rec_name:"
msgid "Name"
msgstr "Наименование"
msgctxt "field:project.allocation,work:"
msgid "Work"
-msgstr ""
+msgstr "Работа"
msgctxt "field:project.allocation,write_date:"
msgid "Write Date"
-msgstr ""
+msgstr "Дата изменения"
msgctxt "field:project.allocation,write_uid:"
msgid "Write User"
-msgstr ""
+msgstr "Изменено пользователем"
msgctxt "field:project.predecessor_successor,create_date:"
msgid "Create Date"
-msgstr ""
+msgstr "Дата создания"
msgctxt "field:project.predecessor_successor,create_uid:"
msgid "Create User"
-msgstr ""
+msgstr "Создано пользователем"
msgctxt "field:project.predecessor_successor,id:"
msgid "ID"
-msgstr ""
+msgstr "ID"
msgctxt "field:project.predecessor_successor,predecessor:"
msgid "Predecessor"
-msgstr ""
+msgstr "Предок"
-#, fuzzy
msgctxt "field:project.predecessor_successor,rec_name:"
msgid "Name"
msgstr "Наименование"
msgctxt "field:project.predecessor_successor,successor:"
msgid "Successor"
-msgstr ""
+msgstr "Потомок"
msgctxt "field:project.predecessor_successor,write_date:"
msgid "Write Date"
-msgstr ""
+msgstr "Дата изменения"
msgctxt "field:project.predecessor_successor,write_uid:"
msgid "Write User"
-msgstr ""
+msgstr "Изменено пользователем"
msgctxt "field:project.work,actual_finish_date:"
msgid "Actual Finish"
-msgstr ""
+msgstr "Фактически завершен"
msgctxt "field:project.work,actual_finish_time:"
msgid "Actual Finish Time"
-msgstr ""
+msgstr "Фактически завершен (время)"
msgctxt "field:project.work,actual_start_date:"
msgid "Actual Start"
-msgstr ""
+msgstr "Фактически начат"
msgctxt "field:project.work,actual_start_time:"
msgid "Actual Start Time"
-msgstr ""
+msgstr "Фактически начат (время)"
msgctxt "field:project.work,allocations:"
msgid "Allocations"
-msgstr ""
+msgstr "Распределения"
msgctxt "field:project.work,back_leveling_delay:"
-msgid "Leveling Delay"
-msgstr ""
+msgid "Back Leveling Delay"
+msgstr "Обратная выравнивающая задержка"
msgctxt "field:project.work,constraint_finish_date:"
msgid "Constraint Finish"
-msgstr ""
+msgstr "Порог завершения"
msgctxt "field:project.work,constraint_finish_time:"
msgid "Constraint Finish Time"
-msgstr ""
+msgstr "Порог завершения (время)"
msgctxt "field:project.work,constraint_start_date:"
msgid "Constraint Start"
-msgstr ""
+msgstr "Порог начала"
msgctxt "field:project.work,constraint_start_time:"
msgid "Constraint Start Time"
-msgstr ""
+msgstr "Порог начала (время)"
msgctxt "field:project.work,duration:"
msgid "Duration"
-msgstr ""
+msgstr "Продолжительность"
msgctxt "field:project.work,early_finish_date:"
msgid "Early Finish"
-msgstr ""
+msgstr "Досрочное завершение"
msgctxt "field:project.work,early_finish_time:"
msgid "Early Finish Time"
-msgstr ""
+msgstr "Досрочное завершение (время)"
msgctxt "field:project.work,early_start_date:"
msgid "Early Start"
-msgstr ""
+msgstr "Досрочное начало"
msgctxt "field:project.work,early_start_time:"
msgid "Early Start Time"
-msgstr ""
+msgstr "Досрочное начало (время)"
msgctxt "field:project.work,late_finish_date:"
msgid "Late Finish"
-msgstr ""
+msgstr "Позднее завершение"
msgctxt "field:project.work,late_finish_time:"
msgid "Late Finish Time"
-msgstr ""
+msgstr "Позднее завершение (время)"
msgctxt "field:project.work,late_start_date:"
msgid "Late Start"
-msgstr ""
+msgstr "Позднее начало"
msgctxt "field:project.work,late_start_time:"
msgid "Late Start Time"
-msgstr ""
+msgstr "Позднее начало (время)"
msgctxt "field:project.work,leveling_delay:"
msgid "Leveling Delay"
-msgstr ""
+msgstr "Выравнивающая задержка"
msgctxt "field:project.work,predecessors:"
msgid "Predecessors"
-msgstr ""
+msgstr "Предки"
-#, fuzzy
msgctxt "field:project.work,requests:"
msgid "Requests"
msgstr "Сообщения"
msgctxt "field:project.work,successors:"
msgid "Successors"
-msgstr ""
+msgstr "Потомки"
msgctxt "model:ir.action,name:wizard_leveling"
msgid "Tasks Leveling"
-msgstr ""
+msgstr "Выравнивание задач"
msgctxt "model:project.allocation,name:"
msgid "Allocation"
-msgstr ""
+msgstr "Распределение"
msgctxt "model:project.predecessor_successor,name:"
msgid "Predecessor - Successor"
-msgstr ""
+msgstr "Предок - Потомок"
msgctxt "model:res.request.link,name:request_link_work"
msgid "Work"
-msgstr ""
+msgstr "Работа"
msgctxt "view:project.allocation:"
msgid "Allocation"
-msgstr ""
+msgstr "Распределение"
msgctxt "view:project.allocation:"
msgid "Allocations"
-msgstr ""
+msgstr "Распределения"
msgctxt "view:project.work:"
msgid "Allocations"
-msgstr ""
+msgstr "Распределения"
msgctxt "view:project.work:"
msgid "Plan"
-msgstr ""
+msgstr "План"
-#, fuzzy
msgctxt "view:project.work:"
msgid "Requests"
msgstr "Сообщения"
diff --git a/setup.py b/setup.py
index 0b8e26a..ab66efc 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_plan',
version=info.get('version', '0.0.1'),
@@ -36,16 +36,16 @@ setup(name='trytond_project_plan',
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_plan': '.'},
packages=[
'trytond.modules.project_plan',
'trytond.modules.project_plan.tests',
],
package_data={
- 'trytond.modules.project_plan': info.get('xml', []) \
- + ['tryton.cfg', 'locale/*.po'],
+ 'trytond.modules.project_plan': (info.get('xml', [])
+ + ['tryton.cfg', 'view/*.xml', 'locale/*.po']),
},
classifiers=[
'Development Status :: 5 - Production/Stable',
@@ -57,6 +57,7 @@ setup(name='trytond_project_plan',
'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 632593d..fba36ae 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
[tryton]
-version=2.6.0
+version=2.8.0
depends:
ir
company
diff --git a/trytond_project_plan.egg-info/PKG-INFO b/trytond_project_plan.egg-info/PKG-INFO
index 56b1b75..1654cd6 100644
--- a/trytond_project_plan.egg-info/PKG-INFO
+++ b/trytond_project_plan.egg-info/PKG-INFO
@@ -1,12 +1,12 @@
-Metadata-Version: 1.0
+Metadata-Version: 1.1
Name: trytond-project-plan
-Version: 2.6.0
+Version: 2.8.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.6/
+Download-URL: http://downloads.tryton.org/2.8/
Description: trytond_project_plan
====================
@@ -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_plan.egg-info/SOURCES.txt b/trytond_project_plan.egg-info/SOURCES.txt
index 1c502b9..b8900b0 100644
--- a/trytond_project_plan.egg-info/SOURCES.txt
+++ b/trytond_project_plan.egg-info/SOURCES.txt
@@ -30,4 +30,7 @@ trytond_project_plan.egg-info/dependency_links.txt
trytond_project_plan.egg-info/entry_points.txt
trytond_project_plan.egg-info/not-zip-safe
trytond_project_plan.egg-info/requires.txt
-trytond_project_plan.egg-info/top_level.txt
\ No newline at end of file
+trytond_project_plan.egg-info/top_level.txt
+view/allocation_form.xml
+view/allocation_tree.xml
+view/work_form.xml
\ No newline at end of file
diff --git a/trytond_project_plan.egg-info/requires.txt b/trytond_project_plan.egg-info/requires.txt
index 19a6639..4453741 100644
--- a/trytond_project_plan.egg-info/requires.txt
+++ b/trytond_project_plan.egg-info/requires.txt
@@ -1,4 +1,4 @@
-trytond_company >= 2.6, < 2.7
-trytond_project >= 2.6, < 2.7
-trytond_timesheet >= 2.6, < 2.7
-trytond >= 2.6, < 2.7
\ No newline at end of file
+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
diff --git a/view/allocation_form.xml b/view/allocation_form.xml
new file mode 100644
index 0000000..43e34a5
--- /dev/null
+++ b/view/allocation_form.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. -->
+<form string="Allocation">
+ <label name="employee"/>
+ <field name="employee"/>
+ <label name="percentage"/>
+ <field name="percentage"/>
+ <label name="work"/>
+ <field name="work"/>
+</form>
diff --git a/view/allocation_tree.xml b/view/allocation_tree.xml
new file mode 100644
index 0000000..9645d60
--- /dev/null
+++ b/view/allocation_tree.xml
@@ -0,0 +1,8 @@
+<?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="Allocations">
+ <field name="employee"/>
+ <field name="percentage"/>
+ <field name="work"/>
+</tree>
diff --git a/view/work_form.xml b/view/work_form.xml
new file mode 100644
index 0000000..ffc5dc9
--- /dev/null
+++ b/view/work_form.xml
@@ -0,0 +1,37 @@
+<?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. -->
+<data>
+ <xpath expr="/form/notebook/page[@id='children']" position="after">
+ <page string="Plan" id="plan">
+ <label name="constraint_start_date"/>
+ <field name="constraint_start_date"/>
+ <label name="constraint_finish_date"/>
+ <field name="constraint_finish_date"/>
+ <label name="early_start_date"/>
+ <field name="early_start_date"/>
+ <label name="early_finish_date"/>
+ <field name="early_finish_date"/>
+ <label name="late_start_date"/>
+ <field name="late_start_date"/>
+ <label name="late_finish_date"/>
+ <field name="late_finish_date"/>
+ <label name="actual_start_date"/>
+ <field name="actual_start_date"/>
+ <label name="actual_finish_date"/>
+ <field name="actual_finish_date"/>
+ <label name="duration"/>
+ <field name="duration" widget="float_time" float_time="company_work_time"/>
+ <newline/>
+ <field name="predecessors" colspan="2"/>
+ <field name="successors" colspan="2"/>
+ </page>
+ <page string="Allocations" id="allocations"
+ 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 0708b8c..0ba1fee 100644
--- a/work.py
+++ b/work.py
@@ -35,7 +35,7 @@ class Work:
],
depends=['parent', 'id'])
leveling_delay = fields.Float("Leveling Delay")
- back_leveling_delay = fields.Float("Leveling Delay")
+ back_leveling_delay = fields.Float("Back Leveling Delay")
allocations = fields.One2Many('project.allocation', 'work', 'Allocations',
states={
'invisible': Eval('type') != 'task',
@@ -73,13 +73,11 @@ class Work:
@classmethod
def __setup__(cls):
super(Work, cls).__setup__()
- cls._constraints += [
- ('check_recursion', 'recursive_dependency'),
- ]
- cls._error_messages.update({
- 'recursive_dependency': 'You can not create recursive '
- 'dependencies!',
- })
+
+ @classmethod
+ def validate(cls, works):
+ super(Work, cls).validate(works)
+ cls.check_recursion(works)
@classmethod
def check_recursion(cls, records, parent='successors'):
@@ -110,8 +108,8 @@ class Work:
),
])
for req_ref in req_refs:
- _, work_id = req_ref.reference.split(',')
- requests[int(work_id)].append(req_ref.request.id)
+ work_id = req_ref.reference.id
+ requests[work_id].append(req_ref.request.id)
res['requests'] = requests
@@ -191,7 +189,8 @@ class Work:
target_ids = len(v) > 1 and v[1] or []
if operator == 'create':
- to_link.append(Request.create(v[1]).id)
+ request, = Request.create(v[1])
+ to_link.append(request.id)
elif operator == 'write':
Request.write([Request(v[1])], v[2])
elif operator == 'delete':
@@ -227,12 +226,15 @@ class Work:
req_refs.append(ref)
RequestReference.delete(req_refs)
+ to_create = []
for i in to_link:
for work in works:
- RequestReference.create({
+ to_create.append({
'request': i,
'reference': str(work),
})
+ if to_create:
+ RequestReference.create(to_create)
return
fun_fields = ('actual_start_date', 'actual_finish_date',
@@ -242,10 +244,10 @@ class Work:
for fun_field, db_field in zip(fun_fields, db_fields):
if fun_field == name:
cls.write(works, {
- db_field: value \
- and datetime.datetime.combine(value,
- datetime.time()) \
- or None,
+ db_field: (value
+ and datetime.datetime.combine(value,
+ datetime.time())
+ or None),
})
break
@@ -344,7 +346,7 @@ class Work:
mindate = lambda x, y: x and y and min(x, y) or x or y
# propagate constraint_start_time
- constraint_start = reduce(maxdate, (pred.early_finish_time \
+ constraint_start = reduce(maxdate, (pred.early_finish_time
for pred in self.predecessors), None)
if constraint_start is None and self.parent:
@@ -425,7 +427,7 @@ class Work:
parent = work
# propagate constraint_finish_time
- constraint_finish = reduce(mindate, (succ.late_start_time \
+ constraint_finish = reduce(mindate, (succ.late_start_time
for succ in self.successors), None)
if constraint_finish is None and self.parent:
@@ -632,11 +634,12 @@ class Work:
work.compute_dates()
@classmethod
- def create(cls, values):
- work = super(Work, cls).create(values)
- work.reset_leveling()
- work.compute_dates()
- return work
+ def create(cls, vlist):
+ works = super(Work, cls).create(vlist)
+ for work in works:
+ work.reset_leveling()
+ work.compute_dates()
+ return works
@classmethod
def delete(cls, works):
@@ -692,15 +695,16 @@ class PredecessorSuccessor(ModelSQL):
parent.compute_dates()
@classmethod
- def create(cls, values):
- pred_succ = super(PredecessorSuccessor, cls).create(values)
+ def create(cls, vlist):
+ pred_succs = super(PredecessorSuccessor, cls).create(vlist)
- pred_succ.predecessor.reset_leveling()
- pred_succ.successor.reset_leveling()
+ for pred_succ in pred_succs:
+ pred_succ.predecessor.reset_leveling()
+ pred_succ.successor.reset_leveling()
- if pred_succ.predecessor.parent:
- pred_succ.predecessor.parent.compute_dates()
- return pred_succ
+ if pred_succ.predecessor.parent:
+ pred_succ.predecessor.parent.compute_dates()
+ return pred_succs
class Leveling(Wizard):
diff --git a/work.xml b/work.xml
index 42f56ce..9d318e6 100644
--- a/work.xml
+++ b/work.xml
@@ -7,45 +7,7 @@ this repository contains the full copyright notices and license terms. -->
<record model="ir.ui.view" id="work_view_form">
<field name="model">project.work</field>
<field name="inherit" ref="project.work_view_form"/>
- <field name="arch" type="xml">
- <![CDATA[
- <data>
- <xpath expr="/form/notebook/page[@id="timesheet_lines"]"
- position="after">
- <page string="Plan" id="plan">
- <label name="constraint_start_date"/>
- <field name="constraint_start_date"/>
- <label name="constraint_finish_date"/>
- <field name="constraint_finish_date"/>
- <label name="early_start_date"/>
- <field name="early_start_date"/>
- <label name="early_finish_date"/>
- <field name="early_finish_date"/>
- <label name="late_start_date"/>
- <field name="late_start_date"/>
- <label name="late_finish_date"/>
- <field name="late_finish_date"/>
- <label name="actual_start_date"/>
- <field name="actual_start_date"/>
- <label name="actual_finish_date"/>
- <field name="actual_finish_date"/>
- <label name="duration"/>
- <field name="duration" widget="float_time" float_time="company_work_time"/>
- <newline/>
- <field name="predecessors" colspan="2"/>
- <field name="successors" colspan="2"/>
- </page>
- <page string="Allocations" id="allocations"
- states="{'invisible': Not(Equal(Eval('type'), 'task'))}" >
- <field name="allocations" colspan="4"/>
- </page>
- <page string="Requests" id="requests">
- <field name="requests"/>
- </page>
- </xpath>
- </data>
- ]]>
- </field>
+ <field name="name">work_form</field>
</record>
<record model="ir.action.wizard" id="wizard_leveling">
@@ -63,6 +25,5 @@ this repository contains the full copyright notices and license terms. -->
<field name="name">Work</field>
<field name="model">project.work</field>
</record>
-
</data>
</tryton>
commit 0e7ceb057ac0bf225a7696469a37314924a18995
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Tue Oct 23 19:53:39 2012 +0200
Adding upstream version 2.6.0.
diff --git a/CHANGELOG b/CHANGELOG
index 2a1a7bf..13d6b8d 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)
diff --git a/MANIFEST.in b/MANIFEST.in
index 4aec982..3e52948 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -4,6 +4,7 @@ include TODO
include CHANGELOG
include COPYRIGHT
include LICENSE
+include tryton.cfg
include *.xml
include *.odt
include locale/*.po
diff --git a/PKG-INFO b/PKG-INFO
index 9d59b9f..598237f 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,14 +1,48 @@
Metadata-Version: 1.0
Name: trytond_project_plan
-Version: 2.4.0
-Summary: Add planning capabilities on projects.
-
+Version: 2.6.0
+Summary: Tryton module to add planning capabilities on 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_plan
+ ====================
+
+ The project_plan 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 aaa8386..2f0d88a 100644
--- a/README
+++ b/README
@@ -2,7 +2,6 @@ trytond_project_plan
====================
The project_plan module of the Tryton application platform.
-See __tryton__.py
Installing
----------
diff --git a/__init__.py b/__init__.py
index 7b2b745..09faa0b 100644
--- a/__init__.py
+++ b/__init__.py
@@ -1,5 +1,17 @@
#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 .allocation import *
from .work import *
+
+
+def register():
+ Pool.register(
+ Allocation,
+ Work,
+ PredecessorSuccessor,
+ module='project_plan', type_='model')
+ Pool.register(
+ Leveling,
+ module='project_plan', type_='wizard')
diff --git a/__tryton__.py b/__tryton__.py
deleted file mode 100644
index 6f716be..0000000
--- a/__tryton__.py
+++ /dev/null
@@ -1,54 +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 Plan',
- 'name_bg_BG': 'Планиране на проекти',
- 'name_ca_ES': 'Planificació de projectes',
- 'name_de_DE': 'Projekte Planung',
- 'name_es_AR': 'Planificación de proyecto',
- 'name_es_CO': 'Planeación de Proyectos',
- 'name_es_ES': 'Planificación de proyecto',
- 'name_fr_FR': 'Planification de projet',
- 'version': '2.4.0',
- 'author': 'B2CK',
- 'email': 'info at b2ck.com',
- 'website': 'http://www.tryton.org/',
- 'description': '''Add planning capabilities on projects.
-''',
- 'description_bg_BG': '''Добавя възможност за планиране на проекти
-''',
- 'description_ca_ES': '''Afegeix la capacitat de planificació de
-projectes.''',
- 'description_de_DE': '''Projektmodul Planung:
- - Fügt Planungsmöglichkeiten für Projekte hinzu
-''',
- 'description_es_AR': '''Añade la capacidad de planificación de proyectos.
-''',
- 'description_es_CO': '''Añadir posibilidad de planeación de proyectos.
-''',
- 'description_es_ES': 'Añade la capacidad de planificación de proyectos.',
- 'description_fr_FR': '''Ajoute des fonctionnalités de planification à la gestion de projet.
-''',
- 'depends': [
- 'ir',
- 'company',
- 'project',
- 'timesheet',
- ],
- 'xml': [
- 'work.xml',
- 'allocation.xml',
- ],
- 'translation': [
- 'locale/cs_CZ.po',
- 'locale/bg_BG.po',
- 'locale/ca_ES.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/allocation.py b/allocation.py
index 4c3bffb..51dfc69 100644
--- a/allocation.py
+++ b/allocation.py
@@ -3,57 +3,57 @@
from trytond.model import ModelView, ModelSQL, fields
from trytond.pool import Pool
+__all__ = ['Allocation']
+
class Allocation(ModelSQL, ModelView):
'Allocation'
- _name = 'project.allocation'
- _description = __doc__
+ __name__ = 'project.allocation'
_rec_name = 'employee'
-
employee = fields.Many2One('company.employee', 'Employee', required=True,
select=True)
work = fields.Many2One('project.work', 'Work', required=True,
select=True)
percentage = fields.Float('Percentage', digits=(16, 2), required=True)
- def default_percentage(self):
+ @classmethod
+ def __setup__(cls):
+ super(Allocation, cls).__setup__()
+ cls._sql_constraints += [
+ ('percentage_positive', 'CHECK(percentage > 0)',
+ 'Percentage must be greater than zero')
+ ]
+
+ @staticmethod
+ def default_percentage():
return 100
- def write(self, ids, values):
- work_obj = Pool().get('project.work')
- res = super(Allocation, self).write(ids, values)
+ @classmethod
+ def write(cls, allocations, values):
+ Work = Pool().get('project.work')
+ super(Allocation, cls).write(allocations, values)
- if isinstance(ids, (int, long)):
- ids = [ids]
- work_ids = work_obj.search([
- ('allocations', 'in', ids),
+ works = Work.search([
+ ('allocations', 'in', [a.id for a in allocations]),
])
- for work_id in work_ids:
- work_obj.reset_leveling(work_id)
- for work_id in work_ids:
- work_obj.compute_dates(work_id)
-
- return res
-
- def create(self, values):
- work_obj = Pool().get('project.work')
- allocation_id = super(Allocation, self).create(values)
- allocation = self.browse(allocation_id)
- work_obj.reset_leveling(allocation.work.id)
- work_obj.compute_dates(allocation.work.id)
-
- def delete(self, ids):
- work_obj = Pool().get('project.work')
- allocations = self.browse(ids)
- work_ids = [a.work.id for a in allocations]
- res = super(Allocation, self).delete(ids)
-
- for work_id in work_ids:
- work_obj.reset_leveling(work_id)
- for work_id in work_ids:
- work_obj.compute_dates(work_id)
-
- return res
-
-Allocation()
+ for work in works:
+ work.reset_leveling()
+ for work in works:
+ work.compute_dates()
+
+ @classmethod
+ def create(cls, values):
+ allocation = super(Allocation, cls).create(values)
+ allocation.work.reset_leveling()
+ allocation.work.compute_dates()
+
+ @classmethod
+ def delete(cls, allocations):
+ works = [a.work for a in allocations]
+ super(Allocation, cls).delete(allocations)
+
+ for work in works:
+ work.reset_leveling()
+ for work in works:
+ work.compute_dates()
diff --git a/locale/bg_BG.po b/locale/bg_BG.po
index 7350a50..f69fe2d 100644
--- a/locale/bg_BG.po
+++ b/locale/bg_BG.po
@@ -2,6 +2,10 @@
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
+msgctxt "error:project.allocation:"
+msgid "Percentage must be greater than zero"
+msgstr ""
+
msgctxt "error:project.work:"
msgid "You can not create recursive dependencies!"
msgstr "Не може да създавате взаимно вложени зависимости!"
diff --git a/locale/ca_ES.po b/locale/ca_ES.po
index 0cc28cb..a31a579 100644
--- a/locale/ca_ES.po
+++ b/locale/ca_ES.po
@@ -2,13 +2,17 @@
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
+msgctxt "error:project.allocation:"
+msgid "Percentage must be greater than zero"
+msgstr ""
+
msgctxt "error:project.work:"
msgid "You can not create recursive dependencies!"
msgstr "No pot crear dependències recursives"
msgctxt "field:project.allocation,create_date:"
msgid "Create Date"
-msgstr ""
+msgstr "Data creació"
#, fuzzy
msgctxt "field:project.allocation,create_uid:"
@@ -21,7 +25,7 @@ msgstr "Empleat"
msgctxt "field:project.allocation,id:"
msgid "ID"
-msgstr ""
+msgstr "ID"
msgctxt "field:project.allocation,percentage:"
msgid "Percentage"
@@ -37,15 +41,15 @@ msgstr "Activitat"
msgctxt "field:project.allocation,write_date:"
msgid "Write Date"
-msgstr ""
+msgstr "Data modificació"
msgctxt "field:project.allocation,write_uid:"
msgid "Write User"
-msgstr ""
+msgstr "Usuari modificació"
msgctxt "field:project.predecessor_successor,create_date:"
msgid "Create Date"
-msgstr ""
+msgstr "Data creació"
#, fuzzy
msgctxt "field:project.predecessor_successor,create_uid:"
@@ -54,7 +58,7 @@ msgstr "Crear usuari"
msgctxt "field:project.predecessor_successor,id:"
msgid "ID"
-msgstr ""
+msgstr "ID"
msgctxt "field:project.predecessor_successor,predecessor:"
msgid "Predecessor"
@@ -70,11 +74,11 @@ msgstr "Successor"
msgctxt "field:project.predecessor_successor,write_date:"
msgid "Write Date"
-msgstr ""
+msgstr "Data modificació"
msgctxt "field:project.predecessor_successor,write_uid:"
msgid "Write User"
-msgstr ""
+msgstr "Usuari modificació"
msgctxt "field:project.work,actual_finish_date:"
msgid "Actual Finish"
@@ -138,7 +142,7 @@ msgstr "Temps d'inici prematur"
msgctxt "field:project.work,late_finish_date:"
msgid "Late Finish"
-msgstr ""
+msgstr "Finalització tardana"
msgctxt "field:project.work,late_finish_time:"
msgid "Late Finish Time"
diff --git a/locale/cs_CZ.po b/locale/cs_CZ.po
index 6eb376a..dc70094 100644
--- a/locale/cs_CZ.po
+++ b/locale/cs_CZ.po
@@ -2,6 +2,10 @@
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
+msgctxt "error:project.allocation:"
+msgid "Percentage must be greater than zero"
+msgstr ""
+
msgctxt "error:project.work:"
msgid "You can not create recursive dependencies!"
msgstr ""
diff --git a/locale/de_DE.po b/locale/de_DE.po
index 607ae0f..31e83a9 100644
--- a/locale/de_DE.po
+++ b/locale/de_DE.po
@@ -2,6 +2,10 @@
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
+msgctxt "error:project.allocation:"
+msgid "Percentage must be greater than zero"
+msgstr "Prozentsatz muss größer als 0 sein."
+
msgctxt "error:project.work:"
msgid "You can not create recursive dependencies!"
msgstr "Abhängigkeiten können nicht rekursiv angelegt werden!"
diff --git a/locale/es_AR.po b/locale/es_AR.po
index ecdfa2b..1602ff4 100644
--- a/locale/es_AR.po
+++ b/locale/es_AR.po
@@ -2,6 +2,10 @@
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
+msgctxt "error:project.allocation:"
+msgid "Percentage must be greater than zero"
+msgstr "El porcentaje debe ser mayor que cero"
+
msgctxt "error:project.work:"
msgid "You can not create recursive dependencies!"
msgstr "¡No puede crear dependencias recursivas!"
diff --git a/locale/es_CO.po b/locale/es_CO.po
index 2149b6e..b13dced 100644
--- a/locale/es_CO.po
+++ b/locale/es_CO.po
@@ -2,18 +2,21 @@
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
+msgctxt "error:project.allocation:"
+msgid "Percentage must be greater than zero"
+msgstr ""
+
msgctxt "error:project.work:"
msgid "You can not create recursive dependencies!"
msgstr "¡No puede crear dependencias recursivas!"
msgctxt "field:project.allocation,create_date:"
msgid "Create Date"
-msgstr ""
+msgstr "Fecha de Creación"
-#, fuzzy
msgctxt "field:project.allocation,create_uid:"
msgid "Create User"
-msgstr "Crear usuario"
+msgstr "Creado por Usuario"
msgctxt "field:project.allocation,employee:"
msgid "Employee"
@@ -21,7 +24,7 @@ msgstr "Empleado"
msgctxt "field:project.allocation,id:"
msgid "ID"
-msgstr ""
+msgstr "ID"
msgctxt "field:project.allocation,percentage:"
msgid "Percentage"
@@ -37,24 +40,23 @@ msgstr "Trabajo"
msgctxt "field:project.allocation,write_date:"
msgid "Write Date"
-msgstr ""
+msgstr "Fecha de Modificación"
msgctxt "field:project.allocation,write_uid:"
msgid "Write User"
-msgstr ""
+msgstr "Modificado por Usuario"
msgctxt "field:project.predecessor_successor,create_date:"
msgid "Create Date"
-msgstr ""
+msgstr "Fecha de Creación"
-#, fuzzy
msgctxt "field:project.predecessor_successor,create_uid:"
msgid "Create User"
-msgstr "Crear usuario"
+msgstr "Creado por Usuario"
msgctxt "field:project.predecessor_successor,id:"
msgid "ID"
-msgstr ""
+msgstr "ID"
msgctxt "field:project.predecessor_successor,predecessor:"
msgid "Predecessor"
@@ -70,11 +72,11 @@ msgstr "Sucesor"
msgctxt "field:project.predecessor_successor,write_date:"
msgid "Write Date"
-msgstr ""
+msgstr "Fecha de Modificación"
msgctxt "field:project.predecessor_successor,write_uid:"
msgid "Write User"
-msgstr ""
+msgstr "Modificado por Usuario"
msgctxt "field:project.work,actual_finish_date:"
msgid "Actual Finish"
diff --git a/locale/es_ES.po b/locale/es_ES.po
index ec7eb6e..002593c 100644
--- a/locale/es_ES.po
+++ b/locale/es_ES.po
@@ -2,6 +2,10 @@
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
+msgctxt "error:project.allocation:"
+msgid "Percentage must be greater than zero"
+msgstr ""
+
msgctxt "error:project.work:"
msgid "You can not create recursive dependencies!"
msgstr "No puede crear dependencias recursivas."
diff --git a/locale/fr_FR.po b/locale/fr_FR.po
index 474dd63..019538a 100644
--- a/locale/fr_FR.po
+++ b/locale/fr_FR.po
@@ -2,6 +2,10 @@
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
+msgctxt "error:project.allocation:"
+msgid "Percentage must be greater than zero"
+msgstr "Le pourcentage doit être supérieur à zéro"
+
msgctxt "error:project.work:"
msgid "You can not create recursive dependencies!"
msgstr "Vous ne pouvez pas créer des dépendances récursives !"
diff --git a/locale/nl_NL.po b/locale/nl_NL.po
index 3b86945..7075ce5 100644
--- a/locale/nl_NL.po
+++ b/locale/nl_NL.po
@@ -2,6 +2,10 @@
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
+msgctxt "error:project.allocation:"
+msgid "Percentage must be greater than zero"
+msgstr ""
+
msgctxt "error:project.work:"
msgid "You can not create recursive dependencies!"
msgstr ""
diff --git a/locale/ru_RU.po b/locale/ru_RU.po
index a5b87ee..2d71ea6 100644
--- a/locale/ru_RU.po
+++ b/locale/ru_RU.po
@@ -2,6 +2,10 @@
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
+msgctxt "error:project.allocation:"
+msgid "Percentage must be greater than zero"
+msgstr ""
+
msgctxt "error:project.work:"
msgid "You can not create recursive dependencies!"
msgstr ""
diff --git a/setup.py b/setup.py
index 8f9199b..0b8e26a 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,21 +32,21 @@ requires.append('trytond >= %s.%s, < %s.%s' %
setup(name='trytond_project_plan',
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 to add planning capabilities on 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_plan': '.'},
packages=[
'trytond.modules.project_plan',
'trytond.modules.project_plan.tests',
- ],
+ ],
package_data={
'trytond.modules.project_plan': info.get('xml', []) \
- + info.get('translation', []),
- },
+ + ['tryton.cfg', 'locale/*.po'],
+ },
classifiers=[
'Development Status :: 5 - Production/Stable',
'Environment :: Plugins',
@@ -57,7 +68,7 @@ setup(name='trytond_project_plan',
'Programming Language :: Python :: 2.6',
'Programming Language :: Python :: 2.7',
'Topic :: Office/Business',
- ],
+ ],
license='GPL-3',
install_requires=requires,
zip_safe=False,
@@ -67,4 +78,4 @@ setup(name='trytond_project_plan',
""",
test_suite='tests',
test_loader='trytond.test_loader:Loader',
-)
+ )
diff --git a/tryton.cfg b/tryton.cfg
new file mode 100644
index 0000000..632593d
--- /dev/null
+++ b/tryton.cfg
@@ -0,0 +1,10 @@
+[tryton]
+version=2.6.0
+depends:
+ ir
+ company
+ project
+ timesheet
+xml:
+ work.xml
+ allocation.xml
diff --git a/trytond_project_plan.egg-info/PKG-INFO b/trytond_project_plan.egg-info/PKG-INFO
index 2164707..56b1b75 100644
--- a/trytond_project_plan.egg-info/PKG-INFO
+++ b/trytond_project_plan.egg-info/PKG-INFO
@@ -1,14 +1,48 @@
Metadata-Version: 1.0
Name: trytond-project-plan
-Version: 2.4.0
-Summary: Add planning capabilities on projects.
-
+Version: 2.6.0
+Summary: Tryton module to add planning capabilities on 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_plan
+ ====================
+
+ The project_plan 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_plan.egg-info/SOURCES.txt b/trytond_project_plan.egg-info/SOURCES.txt
index 4efb8a1..1c502b9 100644
--- a/trytond_project_plan.egg-info/SOURCES.txt
+++ b/trytond_project_plan.egg-info/SOURCES.txt
@@ -6,9 +6,9 @@ MANIFEST.in
README
allocation.xml
setup.py
+tryton.cfg
work.xml
./__init__.py
-./__tryton__.py
./allocation.py
./work.py
./tests/__init__.py
diff --git a/trytond_project_plan.egg-info/requires.txt b/trytond_project_plan.egg-info/requires.txt
index dffedbc..19a6639 100644
--- a/trytond_project_plan.egg-info/requires.txt
+++ b/trytond_project_plan.egg-info/requires.txt
@@ -1,4 +1,4 @@
-trytond_company >= 2.4, < 2.5
-trytond_project >= 2.4, < 2.5
-trytond_timesheet >= 2.4, < 2.5
-trytond >= 2.4, < 2.5
\ No newline at end of file
+trytond_company >= 2.6, < 2.7
+trytond_project >= 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 d92782d..0708b8c 100644
--- a/work.py
+++ b/work.py
@@ -3,20 +3,23 @@
import datetime
from collections import deque, defaultdict
from heapq import heappop, heappush
-from trytond.model import ModelView, ModelSQL, fields
+
+from trytond.model import ModelSQL, fields
from trytond.wizard import Wizard, StateTransition
from trytond.pyson import Eval
from trytond.transaction import Transaction
-from trytond.pool import Pool
+from trytond.pool import Pool, PoolMeta
+
+__all__ = ['Work', 'PredecessorSuccessor', 'Leveling']
+__metaclass__ = PoolMeta
def intfloor(x):
return int(round(x, 4))
-class Work(ModelSQL, ModelView):
- _name = 'project.work'
-
+class Work:
+ __name__ = 'project.work'
predecessors = fields.Many2Many('project.predecessor_successor',
'successor', 'predecessor', 'Predecessors',
domain=[
@@ -67,47 +70,45 @@ class Work(ModelSQL, ModelView):
requests = fields.Function(fields.One2Many('res.request', None,
'Requests'), 'get_function_fields', setter='set_function_fields')
- def __init__(self):
- super(Work, self).__init__()
- self._constraints += [
+ @classmethod
+ def __setup__(cls):
+ super(Work, cls).__setup__()
+ cls._constraints += [
('check_recursion', 'recursive_dependency'),
]
- self._error_messages.update({
+ cls._error_messages.update({
'recursive_dependency': 'You can not create recursive '
'dependencies!',
})
- def check_recursion(self, ids, parent='parent'):
- return super(Work, self).check_recursion(ids, parent='successors')
+ @classmethod
+ def check_recursion(cls, records, parent='successors'):
+ return super(Work, cls).check_recursion(records, parent=parent)
- def get_function_fields(self, ids, names):
+ @classmethod
+ def get_function_fields(cls, works, names):
'''
Function to compute function fields
-
- :param ids: the ids of the works
- :param names: the list of field name to compute
- :return: a dictionary with all field names as key and
- a dictionary as value with id as key
'''
- req_ref_obj = Pool().get('res.request.reference')
+ 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_ref_ids = req_ref_obj.search([
+ req_refs = RequestReference.search([
('reference', 'in', [
'project.work,%s' % i for i in sub_ids
]
),
])
- req_refs = req_ref_obj.browse(req_ref_ids)
for req_ref in req_refs:
_, work_id = req_ref.reference.split(',')
requests[int(work_id)].append(req_ref.request.id)
@@ -115,17 +116,15 @@ class Work(ModelSQL, ModelView):
res['requests'] = requests
if 'duration' in names:
- all_ids = self.search([
+ all_works = cls.search([
('parent', 'child_of', ids),
- ('active', '=', True)]) + ids
- all_ids = list(set(all_ids))
-
- works = self.browse(all_ids)
+ ('active', '=', True)]) + works
+ all_works = set(all_works)
durations = {}
id2work = {}
leafs = set()
- for work in works:
+ for work in all_works:
id2work[work.id] = work
if not work.children:
leafs.add(work.id)
@@ -139,15 +138,20 @@ class Work(ModelSQL, ModelView):
durations[work.id] = work.effort / (total_allocation / 100.0)
while leafs:
- parents = set()
for work_id in leafs:
work = id2work[work_id]
+ all_works.remove(work)
if not work.active:
continue
if work.parent and work.parent.id in durations:
durations[work.parent.id] += durations[work_id]
- parents.add(work.parent.id)
- leafs = parents
+ next_leafs = set(w.id for w in all_works)
+ for work in all_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
res['duration'] = durations
fun_fields = ('early_start_date', 'early_finish_date',
@@ -159,25 +163,23 @@ class Work(ModelSQL, ModelView):
'actual_start_time', 'actual_finish_time',
'constraint_start_time', 'constraint_finish_time')
- works = None
for fun_field, db_field in zip(fun_fields, db_fields):
if fun_field in names:
values = {}
- if works is None:
- works = self.browse(ids)
for work in works:
- values[work.id] = work[db_field] \
- and work[db_field].date() or None
+ values[work.id] = getattr(work, db_field) \
+ and getattr(work, db_field).date() or None
res[fun_field] = values
return res
- def set_function_fields(self, ids, name, value):
- request_obj = Pool().get('res.request')
- req_ref_obj = Pool().get('res.request.reference')
+ @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':
- works = self.browse(ids)
currents = dict((req.id, req) for work in works for req in
work.requests)
if not value:
@@ -189,21 +191,19 @@ class Work(ModelSQL, ModelView):
target_ids = len(v) > 1 and v[1] or []
if operator == 'create':
- to_link.append(request_obj.create(v[1]))
+ to_link.append(Request.create(v[1]).id)
elif operator == 'write':
- request_obj.write(v[1], v[2])
+ Request.write([Request(v[1])], v[2])
elif operator == 'delete':
- request_obj.delete(v[1])
+ Request.delete([Request(v[1])])
elif operator == 'delete_all':
target_ids = []
- for record_id in ids:
- ref_ids = req_ref_obj.search([
- ('reference', '=',
- 'project.work,%s' % record_id),
+ for work in works:
+ refs = RequestReference.search([
+ ('reference', '=', str(work)),
])
- refs = req_ref_obj.browse(ref_ids)
target_ids.extend(ref.request.id for ref in refs)
- request_obj.delete(target_ids)
+ 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':
@@ -219,19 +219,19 @@ class Work(ModelSQL, ModelView):
else:
raise Exception('Operation not supported')
- req_ref_ids = []
+ req_refs = []
for i in to_unlink:
request = currents[i]
for ref in request.references:
- if int(ref.reference.split(',')[1]) in ids:
- req_ref_ids.append(ref.id)
- req_ref_obj.delete(req_ref_ids)
+ if ref.reference in works:
+ req_refs.append(ref)
+ RequestReference.delete(req_refs)
for i in to_link:
- for record_id in ids:
- req_ref_obj.create({
+ for work in works:
+ RequestReference.create({
'request': i,
- 'reference': 'project.work,%s' % record_id,
+ 'reference': str(work),
})
return
@@ -241,7 +241,7 @@ class Work(ModelSQL, ModelView):
'constraint_start_time', 'constraint_finish_time')
for fun_field, db_field in zip(fun_fields, db_fields):
if fun_field == name:
- self.write(ids, {
+ cls.write(works, {
db_field: value \
and datetime.datetime.combine(value,
datetime.time()) \
@@ -249,13 +249,14 @@ class Work(ModelSQL, ModelView):
})
break
- def add_minutes(self, company, date, minutes):
+ @classmethod
+ def add_minutes(cls, company, date, minutes):
minutes = int(round(minutes))
minutes = date.minute + minutes
hours = minutes // 60
if hours:
- date = self.add_hours(company, date, hours)
+ date = cls.add_hours(company, date, hours)
minutes = minutes % 60
@@ -269,17 +270,18 @@ class Work(ModelSQL, ModelView):
return date
- def add_hours(self, company, date, hours):
+ @classmethod
+ def add_hours(cls, company, date, hours):
while hours:
if hours != intfloor(hours):
minutes = (hours - intfloor(hours)) * 60
- date = self.add_minutes(company, date, minutes)
+ date = cls.add_minutes(company, date, minutes)
hours = intfloor(hours)
hours = date.hour + hours
days = hours // company.hours_per_work_day
if days:
- date = self.add_days(company, date, days)
+ date = cls.add_days(company, date, days)
hours = hours % company.hours_per_work_day
@@ -295,13 +297,14 @@ class Work(ModelSQL, ModelView):
return date
- def add_days(self, company, date, days):
+ @classmethod
+ def add_days(cls, company, date, days):
day_per_week = company.hours_per_work_week / company.hours_per_work_day
while days:
if days != intfloor(days):
hours = (days - intfloor(days)) * company.hours_per_work_day
- date = self.add_hours(company, date, hours)
+ date = cls.add_hours(company, date, hours)
days = intfloor(days)
days = date.weekday() + days
@@ -310,7 +313,7 @@ class Work(ModelSQL, ModelView):
days = days % day_per_week
if weeks:
- date = self.add_weeks(company, date, weeks)
+ date = cls.add_weeks(company, date, weeks)
date += datetime.timedelta(days=-date.weekday() + intfloor(days))
@@ -318,39 +321,39 @@ class Work(ModelSQL, ModelView):
return date
- def add_weeks(self, company, date, weeks):
+ @classmethod
+ def add_weeks(cls, company, date, weeks):
day_per_week = company.hours_per_work_week / company.hours_per_work_day
if weeks != intfloor(weeks):
days = (weeks - intfloor(weeks)) * day_per_week
if days:
- date = self.add_days(company, date, days)
+ date = cls.add_days(company, date, days)
date += datetime.timedelta(days=7 * intfloor(weeks))
return date
- def compute_dates(self, work_id):
- active_work = self.browse(work_id)
+ def compute_dates(self):
values = {}
get_early_finish = lambda work: values.get(work, {}).get(
- 'early_finish_time', work['early_finish_time'])
+ 'early_finish_time', work.early_finish_time)
get_late_start = lambda work: values.get(work, {}).get(
- 'late_start_time', work['late_start_time'])
+ 'late_start_time', work.late_start_time)
maxdate = lambda x, y: x and y and max(x, y) or x or y
mindate = lambda x, y: x and y and min(x, y) or x or y
# propagate constraint_start_time
constraint_start = reduce(maxdate, (pred.early_finish_time \
- for pred in active_work.predecessors), None)
+ for pred in self.predecessors), None)
- if constraint_start is None and active_work.parent:
- constraint_start = active_work.parent.early_start_time
+ if constraint_start is None and self.parent:
+ constraint_start = self.parent.early_start_time
constraint_start = maxdate(constraint_start,
- active_work.constraint_start_time)
+ self.constraint_start_time)
- works = deque([(active_work, constraint_start)])
+ works = deque([(self, constraint_start)])
work2children = {}
parent = None
@@ -423,15 +426,15 @@ class Work(ModelSQL, ModelView):
# propagate constraint_finish_time
constraint_finish = reduce(mindate, (succ.late_start_time \
- for succ in active_work.successors), None)
+ for succ in self.successors), None)
- if constraint_finish is None and active_work.parent:
- constraint_finish = active_work.parent.late_finish_time
+ if constraint_finish is None and self.parent:
+ constraint_finish = self.parent.late_finish_time
constraint_finish = mindate(constraint_finish,
- active_work.constraint_finish_time)
+ self.constraint_finish_time)
- works = deque([(active_work, constraint_finish)])
+ works = deque([(self, constraint_finish)])
work2children = {}
parent = None
@@ -507,31 +510,29 @@ class Work(ModelSQL, ModelView):
for work, val in values.iteritems():
write_cond = False
for field in write_fields:
- if field in val and work[field] != val[field]:
+ if field in val and getattr(work, field) != val[field]:
write_cond = True
break
if write_cond:
- self.write(work.id, val)
+ self.write([work], val)
- def reset_leveling(self, work_id):
+ def reset_leveling(self):
get_key = lambda w: (set(p.id for p in w.predecessors),
set(s.id for s in w.successors))
- work = self.browse(work_id)
- parent_id = work.parent and work.parent.id or None
- sibling_ids = self.search([
+ parent_id = self.parent and self.parent.id or None
+ siblings = self.search([
('parent', '=', parent_id)
])
- siblings = self.browse(sibling_ids)
to_clean = []
- ref_key = get_key(work)
+ ref_key = get_key(self)
for sibling in siblings:
if sibling.leveling_delay == sibling.back_leveling_delay == 0:
continue
if get_key(sibling) == ref_key:
- to_clean.append(sibling.id)
+ to_clean.append(sibling)
if to_clean:
self.write(to_clean, {
@@ -539,7 +540,7 @@ class Work(ModelSQL, ModelView):
'back_leveling_delay': 0,
})
- def create_leveling(self, work_id):
+ def create_leveling(self):
# define some helper functions
get_key = lambda w: (set(p.id for p in w.predecessors),
set(s.id for s in w.successors))
@@ -595,140 +596,120 @@ class Work(ModelSQL, ModelView):
yield sibling, delay
- work = self.browse(work_id)
- parent_id = work.parent and work.parent.id or None
- sibling_ids = self.search([
- ('parent', '=', parent_id)
+ parent = self.parent and self.parent.id or None
+ siblings = self.search([
+ ('parent', '=', parent.id)
])
- refkey = get_key(work)
- siblings = [s for s in self.browse(sibling_ids)
- if get_key(s) == refkey]
+ refkey = get_key(self)
+ siblings = [s for s in siblings if get_key(s) == refkey]
for sibling, delay in compute_delays(siblings):
- self.write(sibling.id, {
+ self.write([sibling], {
'leveling_delay': delay,
})
siblings.reverse()
for sibling, delay in compute_delays(siblings):
- self.write(sibling.id, {
+ self.write([sibling], {
'back_leveling_delay': delay,
})
- if parent_id:
- self.compute_dates(parent_id)
+ if parent:
+ parent.compute_dates()
- def write(self, ids, values):
- res = super(Work, self).write(ids, values)
- if isinstance(ids, (int, long)):
- ids = [ids]
+ @classmethod
+ def write(cls, works, values):
+ super(Work, cls).write(works, values)
if 'effort' in values:
- for work_id in ids:
- self.reset_leveling(work_id)
+ for work in works:
+ work.reset_leveling()
fields = ('constraint_start_time', 'constraint_finish_time',
'effort')
if reduce(lambda x, y: x or y in values, fields, False):
- for work_id in ids:
- self.compute_dates(work_id)
- return res
+ for work in works:
+ work.compute_dates()
- def create(self, values):
- work_id = super(Work, self).create(values)
- self.reset_leveling(work_id)
- self.compute_dates(work_id)
- return work_id
+ @classmethod
+ def create(cls, values):
+ work = super(Work, cls).create(values)
+ work.reset_leveling()
+ work.compute_dates()
+ return work
- def delete(self, ids):
- if isinstance(ids, (int, long)):
- ids = [ids]
- works = self.browse(ids)
+ @classmethod
+ def delete(cls, works):
to_update = set()
for work in works:
- if work.parent and work.parent.id not in ids:
- to_update.add(work.parent.id)
- to_update.update(c.id for c in work.parent.children \
- if c.id not in ids)
- res = super(Work, self).delete(ids)
+ if work.parent and work.parent not in works:
+ to_update.add(work.parent)
+ to_update.update(c for c in work.parent.children
+ if c not in works)
+ super(Work, cls).delete(works)
- for work_id in to_update:
- self.reset_leveling(work_id)
- self.compute_dates(work_id)
-
- return res
-Work()
+ for work in to_update:
+ work.reset_leveling()
+ work.compute_dates()
class PredecessorSuccessor(ModelSQL):
'Predecessor - Successor'
- _name = 'project.predecessor_successor'
- _description = __doc__
-
+ __name__ = 'project.predecessor_successor'
predecessor = fields.Many2One('project.work', 'Predecessor',
ondelete='CASCADE', required=True, select=True)
successor = fields.Many2One('project.work', 'Successor',
ondelete='CASCADE', required=True, select=True)
- def write(self, ids, values):
- work_obj = Pool().get('project.work')
- res = super(PredecessorSuccessor, self).write(ids, values)
-
- for work_id in values.itervalues():
- work_obj.reset_leveling(work_id)
- for work_id in values.itervalues():
- work_obj.compute_dates(work_id)
- return res
+ @classmethod
+ def write(cls, pred_succs, values):
+ Work = Pool().get('project.work')
+ super(PredecessorSuccessor, cls).write(pred_succs, values)
- def delete(self, ids):
- work_obj = Pool().get('project.work')
- if isinstance(ids, (int, long)):
- ids = [ids]
+ works = Work.browse(values.itervalues())
+ for work in works:
+ work.reset_leveling()
+ for work in works:
+ work.compute_dates()
- work_ids = set()
- parent_ids = set()
- pred_succs = self.browse(ids)
+ @classmethod
+ def delete(cls, pred_succs):
+ works = set()
+ parents = set()
for pred_succ in pred_succs:
- work_ids.update((pred_succ.predecessor.id,
- pred_succ.successor.id))
+ works.update((pred_succ.predecessor,
+ pred_succ.successor))
if pred_succ.predecessor.parent:
- parent_ids.add(pred_succ.predecessor.parent.id)
+ parents.add(pred_succ.predecessor.parent)
- res = super(PredecessorSuccessor, self).delete(ids)
+ super(PredecessorSuccessor, cls).delete(pred_succs)
- for work_id in work_ids:
- work_obj.reset_leveling(work_id)
-
- for parent_id in parent_ids:
- work_obj.compute_dates(parent_id)
+ for work in works:
+ work.reset_leveling()
- return res
+ for parent in parents:
+ parent.compute_dates()
- def create(self, values):
- work_obj = Pool().get('project.work')
- ps_id = super(PredecessorSuccessor, self).create(values)
+ @classmethod
+ def create(cls, values):
+ pred_succ = super(PredecessorSuccessor, cls).create(values)
- pred_succ = self.browse(ps_id)
- work_obj.reset_leveling(pred_succ.predecessor.id)
- work_obj.reset_leveling(pred_succ.successor.id)
+ pred_succ.predecessor.reset_leveling()
+ pred_succ.successor.reset_leveling()
if pred_succ.predecessor.parent:
- work_obj.compute_dates(pred_succ.predecessor.parent.id)
- return id
-
-PredecessorSuccessor()
+ pred_succ.predecessor.parent.compute_dates()
+ return pred_succ
class Leveling(Wizard):
'Tasks Leveling'
- _name = 'project_plan.work.leveling'
+ __name__ = 'project_plan.work.leveling'
start_state = 'leveling'
leveling = StateTransition()
- def transition_leveling(self, session):
- work_obj = Pool().get('project.work')
- work_obj.create_leveling(Transaction().context['active_id'])
+ def transition_leveling(self):
+ Work = Pool().get('project.work')
+ Work(Transaction().context['active_id']).create_leveling()
return 'end'
-
-Leveling()
commit 4216ecaa4a56ffee14550c33989ddc2821bbd0e5
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Tue Apr 24 19:31:01 2012 +0200
Adding upstream version 2.4.0.
diff --git a/CHANGELOG b/CHANGELOG
index 0db227b..2a1a7bf 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 2.4.0 - 2012-04-24
+* Bug fixes (see mercurial logs for details)
+
Version 2.2.0 - 2011-10-25
* Bug fixes (see mercurial logs for details)
diff --git a/COPYRIGHT b/COPYRIGHT
index 8d81a8f..fe93a1f 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,6 +1,6 @@
-Copyright (C) 2009-2011 Bertrand Chenal.
-Copyright (C) 2009-2011 Cédric Krier.
-Copyright (C) 2009-2011 B2CK SPRL.
+Copyright (C) 2009-2012 Bertrand Chenal.
+Copyright (C) 2009-2012 Cédric Krier.
+Copyright (C) 2009-2012 B2CK SPRL.
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 ee14053..b777896 100644
--- a/INSTALL
+++ b/INSTALL
@@ -4,7 +4,7 @@ Installing trytond_project_plan
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_company (http://www.tryton.org/)
* trytond_timesheet (http://www.tryton.org/)
diff --git a/PKG-INFO b/PKG-INFO
index e2c1551..9d59b9f 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,13 +1,13 @@
Metadata-Version: 1.0
Name: trytond_project_plan
-Version: 2.2.0
+Version: 2.4.0
Summary: Add planning capabilities on projects.
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 82f48d4..7b2b745 100644
--- a/__init__.py
+++ b/__init__.py
@@ -1,5 +1,5 @@
#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 allocation import *
-from work import *
+from .allocation import *
+from .work import *
diff --git a/__tryton__.py b/__tryton__.py
index 41e4a8a..6f716be 100644
--- a/__tryton__.py
+++ b/__tryton__.py
@@ -3,11 +3,13 @@
{
'name': 'Project Plan',
'name_bg_BG': 'Планиране на проекти',
+ 'name_ca_ES': 'Planificació de projectes',
'name_de_DE': 'Projekte Planung',
+ 'name_es_AR': 'Planificación de proyecto',
'name_es_CO': 'Planeación de Proyectos',
'name_es_ES': 'Planificación de proyecto',
'name_fr_FR': 'Planification de projet',
- 'version': '2.2.0',
+ 'version': '2.4.0',
'author': 'B2CK',
'email': 'info at b2ck.com',
'website': 'http://www.tryton.org/',
@@ -15,9 +17,13 @@
''',
'description_bg_BG': '''Добавя възможност за планиране на проекти
''',
+ 'description_ca_ES': '''Afegeix la capacitat de planificació de
+projectes.''',
'description_de_DE': '''Projektmodul Planung:
- Fügt Planungsmöglichkeiten für Projekte hinzu
''',
+ 'description_es_AR': '''Añade la capacidad de planificación de proyectos.
+''',
'description_es_CO': '''Añadir posibilidad de planeación de proyectos.
''',
'description_es_ES': 'Añade la capacidad de planificación de proyectos.',
@@ -36,7 +42,9 @@
'translation': [
'locale/cs_CZ.po',
'locale/bg_BG.po',
+ 'locale/ca_ES.po',
'locale/de_DE.po',
+ 'locale/es_AR.po',
'locale/es_CO.po',
'locale/es_ES.po',
'locale/fr_FR.po',
diff --git a/allocation.py b/allocation.py
index c4910b0..4c3bffb 100644
--- a/allocation.py
+++ b/allocation.py
@@ -11,9 +11,9 @@ class Allocation(ModelSQL, ModelView):
_rec_name = 'employee'
employee = fields.Many2One('company.employee', 'Employee', required=True,
- select=1)
+ select=True)
work = fields.Many2One('project.work', 'Work', required=True,
- select=1)
+ select=True)
percentage = fields.Float('Percentage', digits=(16, 2), required=True)
def default_percentage(self):
diff --git a/locale/bg_BG.po b/locale/bg_BG.po
index ce7af6b..7350a50 100644
--- a/locale/bg_BG.po
+++ b/locale/bg_BG.po
@@ -2,127 +2,167 @@
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
-msgctxt "error:project.work:0"
+msgctxt "error:project.work:"
msgid "You can not create recursive dependencies!"
msgstr "Не може да създавате взаимно вложени зависимости!"
-msgctxt "field:project.allocation,employee:0"
+msgctxt "field:project.allocation,create_date:"
+msgid "Create Date"
+msgstr "Създадено на"
+
+msgctxt "field:project.allocation,create_uid:"
+msgid "Create User"
+msgstr "Създадено от"
+
+msgctxt "field:project.allocation,employee:"
msgid "Employee"
msgstr "Служител"
-msgctxt "field:project.allocation,percentage:0"
+msgctxt "field:project.allocation,id:"
+msgid "ID"
+msgstr "ID"
+
+msgctxt "field:project.allocation,percentage:"
msgid "Percentage"
msgstr "Процент"
-msgctxt "field:project.allocation,rec_name:0"
+msgctxt "field:project.allocation,rec_name:"
msgid "Name"
msgstr "Име"
-msgctxt "field:project.allocation,work:0"
+msgctxt "field:project.allocation,work:"
msgid "Work"
msgstr "Задача"
-msgctxt "field:project.predecessor_successor,predecessor:0"
+msgctxt "field:project.allocation,write_date:"
+msgid "Write Date"
+msgstr "Променено на"
+
+msgctxt "field:project.allocation,write_uid:"
+msgid "Write User"
+msgstr "Променено от"
+
+msgctxt "field:project.predecessor_successor,create_date:"
+msgid "Create Date"
+msgstr "Създадено на"
+
+msgctxt "field:project.predecessor_successor,create_uid:"
+msgid "Create User"
+msgstr "Създадено от"
+
+msgctxt "field:project.predecessor_successor,id:"
+msgid "ID"
+msgstr "ID"
+
+msgctxt "field:project.predecessor_successor,predecessor:"
msgid "Predecessor"
msgstr "Предшественик"
-msgctxt "field:project.predecessor_successor,rec_name:0"
+msgctxt "field:project.predecessor_successor,rec_name:"
msgid "Name"
msgstr "Име"
-msgctxt "field:project.predecessor_successor,successor:0"
+msgctxt "field:project.predecessor_successor,successor:"
msgid "Successor"
msgstr "Наследник"
-msgctxt "field:project.work,actual_finish_date:0"
+msgctxt "field:project.predecessor_successor,write_date:"
+msgid "Write Date"
+msgstr "Променено на"
+
+msgctxt "field:project.predecessor_successor,write_uid:"
+msgid "Write User"
+msgstr "Променено от"
+
+msgctxt "field:project.work,actual_finish_date:"
msgid "Actual Finish"
msgstr "Действително завършване"
-msgctxt "field:project.work,actual_finish_time:0"
+msgctxt "field:project.work,actual_finish_time:"
msgid "Actual Finish Time"
msgstr "Време на действително завършване"
-msgctxt "field:project.work,actual_start_date:0"
+msgctxt "field:project.work,actual_start_date:"
msgid "Actual Start"
-msgstr "Дейсъвително започване"
+msgstr "Действително започване"
-msgctxt "field:project.work,actual_start_time:0"
+msgctxt "field:project.work,actual_start_time:"
msgid "Actual Start Time"
msgstr "Време на действително започване"
-msgctxt "field:project.work,allocations:0"
+msgctxt "field:project.work,allocations:"
msgid "Allocations"
msgstr "Разпределения"
-msgctxt "field:project.work,back_leveling_delay:0"
+msgctxt "field:project.work,back_leveling_delay:"
msgid "Leveling Delay"
msgstr "Изравняване на закъснение"
-msgctxt "field:project.work,constraint_finish_date:0"
+msgctxt "field:project.work,constraint_finish_date:"
msgid "Constraint Finish"
msgstr "Ограничение за край"
-msgctxt "field:project.work,constraint_finish_time:0"
+msgctxt "field:project.work,constraint_finish_time:"
msgid "Constraint Finish Time"
msgstr "Ограничение за време на завършване"
-msgctxt "field:project.work,constraint_start_date:0"
+msgctxt "field:project.work,constraint_start_date:"
msgid "Constraint Start"
msgstr "Ограничение за начало"
-msgctxt "field:project.work,constraint_start_time:0"
+msgctxt "field:project.work,constraint_start_time:"
msgid "Constraint Start Time"
msgstr "Ограничение за начално време"
-msgctxt "field:project.work,duration:0"
+msgctxt "field:project.work,duration:"
msgid "Duration"
msgstr "Продължителност"
-msgctxt "field:project.work,early_finish_date:0"
+msgctxt "field:project.work,early_finish_date:"
msgid "Early Finish"
msgstr "По-рано завършване"
-msgctxt "field:project.work,early_finish_time:0"
+msgctxt "field:project.work,early_finish_time:"
msgid "Early Finish Time"
msgstr "Време на по-рано приключване"
-msgctxt "field:project.work,early_start_date:0"
+msgctxt "field:project.work,early_start_date:"
msgid "Early Start"
msgstr "По-рано начало"
-msgctxt "field:project.work,early_start_time:0"
+msgctxt "field:project.work,early_start_time:"
msgid "Early Start Time"
msgstr "По-ранно време на започване"
-msgctxt "field:project.work,late_finish_date:0"
+msgctxt "field:project.work,late_finish_date:"
msgid "Late Finish"
msgstr "По-късно завършване"
-msgctxt "field:project.work,late_finish_time:0"
+msgctxt "field:project.work,late_finish_time:"
msgid "Late Finish Time"
msgstr "Време на по-късно завършване"
-msgctxt "field:project.work,late_start_date:0"
+msgctxt "field:project.work,late_start_date:"
msgid "Late Start"
msgstr "По-късно начало "
-msgctxt "field:project.work,late_start_time:0"
+msgctxt "field:project.work,late_start_time:"
msgid "Late Start Time"
msgstr "Време на по-късно начало"
-msgctxt "field:project.work,leveling_delay:0"
+msgctxt "field:project.work,leveling_delay:"
msgid "Leveling Delay"
msgstr "Изравняване на закъснение"
-msgctxt "field:project.work,predecessors:0"
+msgctxt "field:project.work,predecessors:"
msgid "Predecessors"
msgstr "Предшественици"
-msgctxt "field:project.work,requests:0"
+msgctxt "field:project.work,requests:"
msgid "Requests"
msgstr "Заявки"
-msgctxt "field:project.work,successors:0"
+msgctxt "field:project.work,successors:"
msgid "Successors"
msgstr "Наследници"
@@ -130,11 +170,11 @@ msgctxt "model:ir.action,name:wizard_leveling"
msgid "Tasks Leveling"
msgstr "Изравняване на задачи"
-msgctxt "model:project.allocation,name:0"
+msgctxt "model:project.allocation,name:"
msgid "Allocation"
msgstr "Разпределние"
-msgctxt "model:project.predecessor_successor,name:0"
+msgctxt "model:project.predecessor_successor,name:"
msgid "Predecessor - Successor"
msgstr "Предшественик - Наследник"
@@ -142,22 +182,22 @@ msgctxt "model:res.request.link,name:request_link_work"
msgid "Work"
msgstr "Задача"
-msgctxt "view:project.allocation:0"
+msgctxt "view:project.allocation:"
msgid "Allocation"
msgstr "Разпределение"
-msgctxt "view:project.allocation:0"
+msgctxt "view:project.allocation:"
msgid "Allocations"
msgstr "Разпределения"
-msgctxt "view:project.work:0"
+msgctxt "view:project.work:"
msgid "Allocations"
msgstr "Разпределения"
-msgctxt "view:project.work:0"
+msgctxt "view:project.work:"
msgid "Plan"
msgstr "План"
-msgctxt "view:project.work:0"
+msgctxt "view:project.work:"
msgid "Requests"
msgstr "Заявки"
diff --git a/locale/ca_ES.po b/locale/ca_ES.po
new file mode 100644
index 0000000..0cc28cb
--- /dev/null
+++ b/locale/ca_ES.po
@@ -0,0 +1,205 @@
+#
+msgid ""
+msgstr "Content-Type: text/plain; charset=utf-8\n"
+
+msgctxt "error:project.work:"
+msgid "You can not create recursive dependencies!"
+msgstr "No pot crear dependències recursives"
+
+msgctxt "field:project.allocation,create_date:"
+msgid "Create Date"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:project.allocation,create_uid:"
+msgid "Create User"
+msgstr "Crear usuari"
+
+msgctxt "field:project.allocation,employee:"
+msgid "Employee"
+msgstr "Empleat"
+
+msgctxt "field:project.allocation,id:"
+msgid "ID"
+msgstr ""
+
+msgctxt "field:project.allocation,percentage:"
+msgid "Percentage"
+msgstr "Percentatge"
+
+msgctxt "field:project.allocation,rec_name:"
+msgid "Name"
+msgstr "Nom"
+
+msgctxt "field:project.allocation,work:"
+msgid "Work"
+msgstr "Activitat"
+
+msgctxt "field:project.allocation,write_date:"
+msgid "Write Date"
+msgstr ""
+
+msgctxt "field:project.allocation,write_uid:"
+msgid "Write User"
+msgstr ""
+
+msgctxt "field:project.predecessor_successor,create_date:"
+msgid "Create Date"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:project.predecessor_successor,create_uid:"
+msgid "Create User"
+msgstr "Crear usuari"
+
+msgctxt "field:project.predecessor_successor,id:"
+msgid "ID"
+msgstr ""
+
+msgctxt "field:project.predecessor_successor,predecessor:"
+msgid "Predecessor"
+msgstr "Predecessor"
+
+msgctxt "field:project.predecessor_successor,rec_name:"
+msgid "Name"
+msgstr "Nom"
+
+msgctxt "field:project.predecessor_successor,successor:"
+msgid "Successor"
+msgstr "Successor"
+
+msgctxt "field:project.predecessor_successor,write_date:"
+msgid "Write Date"
+msgstr ""
+
+msgctxt "field:project.predecessor_successor,write_uid:"
+msgid "Write User"
+msgstr ""
+
+msgctxt "field:project.work,actual_finish_date:"
+msgid "Actual Finish"
+msgstr "Finalització real"
+
+msgctxt "field:project.work,actual_finish_time:"
+msgid "Actual Finish Time"
+msgstr "Hora de finalització real"
+
+msgctxt "field:project.work,actual_start_date:"
+msgid "Actual Start"
+msgstr "Inici real"
+
+msgctxt "field:project.work,actual_start_time:"
+msgid "Actual Start Time"
+msgstr "Hora d'inici real"
+
+msgctxt "field:project.work,allocations:"
+msgid "Allocations"
+msgstr "Assignacions"
+
+msgctxt "field:project.work,back_leveling_delay:"
+msgid "Leveling Delay"
+msgstr "Retard de l'anivellació"
+
+msgctxt "field:project.work,constraint_finish_date:"
+msgid "Constraint Finish"
+msgstr "Restricció de finalització"
+
+msgctxt "field:project.work,constraint_finish_time:"
+msgid "Constraint Finish Time"
+msgstr "Restricció d'hora de finalització"
+
+msgctxt "field:project.work,constraint_start_date:"
+msgid "Constraint Start"
+msgstr "Restricció d'inici"
+
+msgctxt "field:project.work,constraint_start_time:"
+msgid "Constraint Start Time"
+msgstr "Restricció de temps d'inici"
+
+msgctxt "field:project.work,duration:"
+msgid "Duration"
+msgstr "Durada"
+
+msgctxt "field:project.work,early_finish_date:"
+msgid "Early Finish"
+msgstr "Finalització prematura"
+
+msgctxt "field:project.work,early_finish_time:"
+msgid "Early Finish Time"
+msgstr "Hora de finalització prematura"
+
+msgctxt "field:project.work,early_start_date:"
+msgid "Early Start"
+msgstr "Inici prematur"
+
+msgctxt "field:project.work,early_start_time:"
+msgid "Early Start Time"
+msgstr "Temps d'inici prematur"
+
+msgctxt "field:project.work,late_finish_date:"
+msgid "Late Finish"
+msgstr ""
+
+msgctxt "field:project.work,late_finish_time:"
+msgid "Late Finish Time"
+msgstr "Hora de finalització tardana"
+
+msgctxt "field:project.work,late_start_date:"
+msgid "Late Start"
+msgstr "Inici tardà"
+
+msgctxt "field:project.work,late_start_time:"
+msgid "Late Start Time"
+msgstr "Hora d'inici tardana"
+
+msgctxt "field:project.work,leveling_delay:"
+msgid "Leveling Delay"
+msgstr "Retard d'anivellació"
+
+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"
+
+msgctxt "model:ir.action,name:wizard_leveling"
+msgid "Tasks Leveling"
+msgstr "Anivellació de tasques"
+
+msgctxt "model:project.allocation,name:"
+msgid "Allocation"
+msgstr "Assignació"
+
+msgctxt "model:project.predecessor_successor,name:"
+msgid "Predecessor - Successor"
+msgstr "Predecessor - Successor"
+
+msgctxt "model:res.request.link,name:request_link_work"
+msgid "Work"
+msgstr "Activitat"
+
+msgctxt "view:project.allocation:"
+msgid "Allocation"
+msgstr "Assignació"
+
+msgctxt "view:project.allocation:"
+msgid "Allocations"
+msgstr "Assignacions"
+
+msgctxt "view:project.work:"
+msgid "Allocations"
+msgstr "Assignacions"
+
+msgctxt "view:project.work:"
+msgid "Plan"
+msgstr "Pla"
+
+msgctxt "view:project.work:"
+msgid "Requests"
+msgstr "Sol·licituds"
diff --git a/locale/cs_CZ.po b/locale/cs_CZ.po
index 15edbb7..6eb376a 100644
--- a/locale/cs_CZ.po
+++ b/locale/cs_CZ.po
@@ -2,127 +2,167 @@
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
-msgctxt "error:project.work:0"
+msgctxt "error:project.work:"
msgid "You can not create recursive dependencies!"
msgstr ""
-msgctxt "field:project.allocation,employee:0"
+msgctxt "field:project.allocation,create_date:"
+msgid "Create Date"
+msgstr ""
+
+msgctxt "field:project.allocation,create_uid:"
+msgid "Create User"
+msgstr ""
+
+msgctxt "field:project.allocation,employee:"
msgid "Employee"
msgstr ""
-msgctxt "field:project.allocation,percentage:0"
+msgctxt "field:project.allocation,id:"
+msgid "ID"
+msgstr ""
+
+msgctxt "field:project.allocation,percentage:"
msgid "Percentage"
msgstr ""
-msgctxt "field:project.allocation,rec_name:0"
+msgctxt "field:project.allocation,rec_name:"
msgid "Name"
msgstr ""
-msgctxt "field:project.allocation,work:0"
+msgctxt "field:project.allocation,work:"
msgid "Work"
msgstr ""
-msgctxt "field:project.predecessor_successor,predecessor:0"
+msgctxt "field:project.allocation,write_date:"
+msgid "Write Date"
+msgstr ""
+
+msgctxt "field:project.allocation,write_uid:"
+msgid "Write User"
+msgstr ""
+
+msgctxt "field:project.predecessor_successor,create_date:"
+msgid "Create Date"
+msgstr ""
+
+msgctxt "field:project.predecessor_successor,create_uid:"
+msgid "Create User"
+msgstr ""
+
+msgctxt "field:project.predecessor_successor,id:"
+msgid "ID"
+msgstr ""
+
+msgctxt "field:project.predecessor_successor,predecessor:"
msgid "Predecessor"
msgstr ""
-msgctxt "field:project.predecessor_successor,rec_name:0"
+msgctxt "field:project.predecessor_successor,rec_name:"
msgid "Name"
msgstr ""
-msgctxt "field:project.predecessor_successor,successor:0"
+msgctxt "field:project.predecessor_successor,successor:"
msgid "Successor"
msgstr ""
-msgctxt "field:project.work,actual_finish_date:0"
+msgctxt "field:project.predecessor_successor,write_date:"
+msgid "Write Date"
+msgstr ""
+
+msgctxt "field:project.predecessor_successor,write_uid:"
+msgid "Write User"
+msgstr ""
+
+msgctxt "field:project.work,actual_finish_date:"
msgid "Actual Finish"
msgstr ""
-msgctxt "field:project.work,actual_finish_time:0"
+msgctxt "field:project.work,actual_finish_time:"
msgid "Actual Finish Time"
msgstr ""
-msgctxt "field:project.work,actual_start_date:0"
+msgctxt "field:project.work,actual_start_date:"
msgid "Actual Start"
msgstr ""
-msgctxt "field:project.work,actual_start_time:0"
+msgctxt "field:project.work,actual_start_time:"
msgid "Actual Start Time"
msgstr ""
-msgctxt "field:project.work,allocations:0"
+msgctxt "field:project.work,allocations:"
msgid "Allocations"
msgstr ""
-msgctxt "field:project.work,back_leveling_delay:0"
+msgctxt "field:project.work,back_leveling_delay:"
msgid "Leveling Delay"
msgstr ""
-msgctxt "field:project.work,constraint_finish_date:0"
+msgctxt "field:project.work,constraint_finish_date:"
msgid "Constraint Finish"
msgstr ""
-msgctxt "field:project.work,constraint_finish_time:0"
+msgctxt "field:project.work,constraint_finish_time:"
msgid "Constraint Finish Time"
msgstr ""
-msgctxt "field:project.work,constraint_start_date:0"
+msgctxt "field:project.work,constraint_start_date:"
msgid "Constraint Start"
msgstr ""
-msgctxt "field:project.work,constraint_start_time:0"
+msgctxt "field:project.work,constraint_start_time:"
msgid "Constraint Start Time"
msgstr ""
-msgctxt "field:project.work,duration:0"
+msgctxt "field:project.work,duration:"
msgid "Duration"
msgstr ""
-msgctxt "field:project.work,early_finish_date:0"
+msgctxt "field:project.work,early_finish_date:"
msgid "Early Finish"
msgstr ""
-msgctxt "field:project.work,early_finish_time:0"
+msgctxt "field:project.work,early_finish_time:"
msgid "Early Finish Time"
msgstr ""
-msgctxt "field:project.work,early_start_date:0"
+msgctxt "field:project.work,early_start_date:"
msgid "Early Start"
msgstr ""
-msgctxt "field:project.work,early_start_time:0"
+msgctxt "field:project.work,early_start_time:"
msgid "Early Start Time"
msgstr ""
-msgctxt "field:project.work,late_finish_date:0"
+msgctxt "field:project.work,late_finish_date:"
msgid "Late Finish"
msgstr ""
-msgctxt "field:project.work,late_finish_time:0"
+msgctxt "field:project.work,late_finish_time:"
msgid "Late Finish Time"
msgstr ""
-msgctxt "field:project.work,late_start_date:0"
+msgctxt "field:project.work,late_start_date:"
msgid "Late Start"
msgstr ""
-msgctxt "field:project.work,late_start_time:0"
+msgctxt "field:project.work,late_start_time:"
msgid "Late Start Time"
msgstr ""
-msgctxt "field:project.work,leveling_delay:0"
+msgctxt "field:project.work,leveling_delay:"
msgid "Leveling Delay"
msgstr ""
-msgctxt "field:project.work,predecessors:0"
+msgctxt "field:project.work,predecessors:"
msgid "Predecessors"
msgstr ""
-msgctxt "field:project.work,requests:0"
+msgctxt "field:project.work,requests:"
msgid "Requests"
msgstr ""
-msgctxt "field:project.work,successors:0"
+msgctxt "field:project.work,successors:"
msgid "Successors"
msgstr ""
@@ -130,11 +170,11 @@ msgctxt "model:ir.action,name:wizard_leveling"
msgid "Tasks Leveling"
msgstr ""
-msgctxt "model:project.allocation,name:0"
+msgctxt "model:project.allocation,name:"
msgid "Allocation"
msgstr ""
-msgctxt "model:project.predecessor_successor,name:0"
+msgctxt "model:project.predecessor_successor,name:"
msgid "Predecessor - Successor"
msgstr ""
@@ -142,22 +182,22 @@ msgctxt "model:res.request.link,name:request_link_work"
msgid "Work"
msgstr ""
-msgctxt "view:project.allocation:0"
+msgctxt "view:project.allocation:"
msgid "Allocation"
msgstr ""
-msgctxt "view:project.allocation:0"
+msgctxt "view:project.allocation:"
msgid "Allocations"
msgstr ""
-msgctxt "view:project.work:0"
+msgctxt "view:project.work:"
msgid "Allocations"
msgstr ""
-msgctxt "view:project.work:0"
+msgctxt "view:project.work:"
msgid "Plan"
msgstr ""
-msgctxt "view:project.work:0"
+msgctxt "view:project.work:"
msgid "Requests"
msgstr ""
diff --git a/locale/de_DE.po b/locale/de_DE.po
index 401ee5b..607ae0f 100644
--- a/locale/de_DE.po
+++ b/locale/de_DE.po
@@ -2,127 +2,167 @@
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
-msgctxt "error:project.work:0"
+msgctxt "error:project.work:"
msgid "You can not create recursive dependencies!"
msgstr "Abhängigkeiten können nicht rekursiv angelegt werden!"
-msgctxt "field:project.allocation,employee:0"
+msgctxt "field:project.allocation,create_date:"
+msgid "Create Date"
+msgstr "Erstellungsdatum"
+
+msgctxt "field:project.allocation,create_uid:"
+msgid "Create User"
+msgstr "Erstellt durch"
+
+msgctxt "field:project.allocation,employee:"
msgid "Employee"
msgstr "Mitarbeiter"
-msgctxt "field:project.allocation,percentage:0"
+msgctxt "field:project.allocation,id:"
+msgid "ID"
+msgstr "ID"
+
+msgctxt "field:project.allocation,percentage:"
msgid "Percentage"
msgstr "Prozentsatz"
-msgctxt "field:project.allocation,rec_name:0"
+msgctxt "field:project.allocation,rec_name:"
msgid "Name"
msgstr "Name"
-msgctxt "field:project.allocation,work:0"
+msgctxt "field:project.allocation,work:"
msgid "Work"
msgstr "Arbeit"
-msgctxt "field:project.predecessor_successor,predecessor:0"
+msgctxt "field:project.allocation,write_date:"
+msgid "Write Date"
+msgstr "Zuletzt geändert"
+
+msgctxt "field:project.allocation,write_uid:"
+msgid "Write User"
+msgstr "Letzte Änderung durch"
+
+msgctxt "field:project.predecessor_successor,create_date:"
+msgid "Create Date"
+msgstr "Erstellungsdatum"
+
+msgctxt "field:project.predecessor_successor,create_uid:"
+msgid "Create User"
+msgstr "Erstellt durch"
+
+msgctxt "field:project.predecessor_successor,id:"
+msgid "ID"
+msgstr "ID"
+
+msgctxt "field:project.predecessor_successor,predecessor:"
msgid "Predecessor"
msgstr "Vorgänger"
-msgctxt "field:project.predecessor_successor,rec_name:0"
+msgctxt "field:project.predecessor_successor,rec_name:"
msgid "Name"
msgstr "Name"
-msgctxt "field:project.predecessor_successor,successor:0"
+msgctxt "field:project.predecessor_successor,successor:"
msgid "Successor"
msgstr "Nachfolger"
-msgctxt "field:project.work,actual_finish_date:0"
+msgctxt "field:project.predecessor_successor,write_date:"
+msgid "Write Date"
+msgstr "Zuletzt geändert"
+
+msgctxt "field:project.predecessor_successor,write_uid:"
+msgid "Write User"
+msgstr "Letzte Änderung durch"
+
+msgctxt "field:project.work,actual_finish_date:"
msgid "Actual Finish"
msgstr "Tatsächliches Enddatum"
-msgctxt "field:project.work,actual_finish_time:0"
+msgctxt "field:project.work,actual_finish_time:"
msgid "Actual Finish Time"
msgstr "Tatsächliche Endzeit"
-msgctxt "field:project.work,actual_start_date:0"
+msgctxt "field:project.work,actual_start_date:"
msgid "Actual Start"
msgstr "Tatsächliches Startdatum"
-msgctxt "field:project.work,actual_start_time:0"
+msgctxt "field:project.work,actual_start_time:"
msgid "Actual Start Time"
msgstr "Tatsächliche Startzeit"
-msgctxt "field:project.work,allocations:0"
+msgctxt "field:project.work,allocations:"
msgid "Allocations"
msgstr "Zuordnungen"
-msgctxt "field:project.work,back_leveling_delay:0"
+msgctxt "field:project.work,back_leveling_delay:"
msgid "Leveling Delay"
msgstr "Verzögerung Abgleich"
-msgctxt "field:project.work,constraint_finish_date:0"
+msgctxt "field:project.work,constraint_finish_date:"
msgid "Constraint Finish"
msgstr "Fixes Enddatum"
-msgctxt "field:project.work,constraint_finish_time:0"
+msgctxt "field:project.work,constraint_finish_time:"
msgid "Constraint Finish Time"
msgstr "Fixe Endzeit"
-msgctxt "field:project.work,constraint_start_date:0"
+msgctxt "field:project.work,constraint_start_date:"
msgid "Constraint Start"
msgstr "Fixes Startdatum"
-msgctxt "field:project.work,constraint_start_time:0"
+msgctxt "field:project.work,constraint_start_time:"
msgid "Constraint Start Time"
msgstr "Fixe Startzeit"
-msgctxt "field:project.work,duration:0"
+msgctxt "field:project.work,duration:"
msgid "Duration"
msgstr "Dauer"
-msgctxt "field:project.work,early_finish_date:0"
+msgctxt "field:project.work,early_finish_date:"
msgid "Early Finish"
msgstr "Frühestes Enddatum"
-msgctxt "field:project.work,early_finish_time:0"
+msgctxt "field:project.work,early_finish_time:"
msgid "Early Finish Time"
msgstr "Früheste Endzeit"
-msgctxt "field:project.work,early_start_date:0"
+msgctxt "field:project.work,early_start_date:"
msgid "Early Start"
msgstr "Frühestes Startdatum"
-msgctxt "field:project.work,early_start_time:0"
+msgctxt "field:project.work,early_start_time:"
msgid "Early Start Time"
msgstr "Früheste Startzeit"
-msgctxt "field:project.work,late_finish_date:0"
+msgctxt "field:project.work,late_finish_date:"
msgid "Late Finish"
msgstr "Spätestes Enddatum"
-msgctxt "field:project.work,late_finish_time:0"
+msgctxt "field:project.work,late_finish_time:"
msgid "Late Finish Time"
msgstr "Späteste Endzeit"
-msgctxt "field:project.work,late_start_date:0"
+msgctxt "field:project.work,late_start_date:"
msgid "Late Start"
msgstr "Spätestes Startdatum"
-msgctxt "field:project.work,late_start_time:0"
+msgctxt "field:project.work,late_start_time:"
msgid "Late Start Time"
msgstr "Späteste Startzeit"
-msgctxt "field:project.work,leveling_delay:0"
+msgctxt "field:project.work,leveling_delay:"
msgid "Leveling Delay"
msgstr "Verzögerung Abgleich"
-msgctxt "field:project.work,predecessors:0"
+msgctxt "field:project.work,predecessors:"
msgid "Predecessors"
msgstr "Vorgänger"
-msgctxt "field:project.work,requests:0"
+msgctxt "field:project.work,requests:"
msgid "Requests"
msgstr "Anfragen"
-msgctxt "field:project.work,successors:0"
+msgctxt "field:project.work,successors:"
msgid "Successors"
msgstr "Nachfolger"
@@ -130,11 +170,11 @@ msgctxt "model:ir.action,name:wizard_leveling"
msgid "Tasks Leveling"
msgstr "Aufgaben abgleichen"
-msgctxt "model:project.allocation,name:0"
+msgctxt "model:project.allocation,name:"
msgid "Allocation"
msgstr "Zuordnung"
-msgctxt "model:project.predecessor_successor,name:0"
+msgctxt "model:project.predecessor_successor,name:"
msgid "Predecessor - Successor"
msgstr "Vorgänger - Nachfolger"
@@ -142,22 +182,22 @@ msgctxt "model:res.request.link,name:request_link_work"
msgid "Work"
msgstr "Arbeit"
-msgctxt "view:project.allocation:0"
+msgctxt "view:project.allocation:"
msgid "Allocation"
msgstr "Zuordnung"
-msgctxt "view:project.allocation:0"
+msgctxt "view:project.allocation:"
msgid "Allocations"
msgstr "Zuordnungen"
-msgctxt "view:project.work:0"
+msgctxt "view:project.work:"
msgid "Allocations"
msgstr "Zuordnungen"
-msgctxt "view:project.work:0"
+msgctxt "view:project.work:"
msgid "Plan"
msgstr "Plan"
-msgctxt "view:project.work:0"
+msgctxt "view:project.work:"
msgid "Requests"
msgstr "Anfragen"
diff --git a/locale/es_AR.po b/locale/es_AR.po
new file mode 100644
index 0000000..ecdfa2b
--- /dev/null
+++ b/locale/es_AR.po
@@ -0,0 +1,203 @@
+#
+msgid ""
+msgstr "Content-Type: text/plain; charset=utf-8\n"
+
+msgctxt "error:project.work:"
+msgid "You can not create recursive dependencies!"
+msgstr "¡No puede crear dependencias recursivas!"
+
+msgctxt "field:project.allocation,create_date:"
+msgid "Create Date"
+msgstr "Fecha creación"
+
+msgctxt "field:project.allocation,create_uid:"
+msgid "Create User"
+msgstr "Usuario creación"
+
+msgctxt "field:project.allocation,employee:"
+msgid "Employee"
+msgstr "Empleado"
+
+msgctxt "field:project.allocation,id:"
+msgid "ID"
+msgstr "ID"
+
+msgctxt "field:project.allocation,percentage:"
+msgid "Percentage"
+msgstr "Porcentaje"
+
+msgctxt "field:project.allocation,rec_name:"
+msgid "Name"
+msgstr "Nombre"
+
+msgctxt "field:project.allocation,work:"
+msgid "Work"
+msgstr "Actividad"
+
+msgctxt "field:project.allocation,write_date:"
+msgid "Write Date"
+msgstr "Fecha modificación"
+
+msgctxt "field:project.allocation,write_uid:"
+msgid "Write User"
+msgstr "Usuario modificación"
+
+msgctxt "field:project.predecessor_successor,create_date:"
+msgid "Create Date"
+msgstr "Fecha creación"
+
+msgctxt "field:project.predecessor_successor,create_uid:"
+msgid "Create User"
+msgstr "Usuario creación"
+
+msgctxt "field:project.predecessor_successor,id:"
+msgid "ID"
+msgstr "ID"
+
+msgctxt "field:project.predecessor_successor,predecessor:"
+msgid "Predecessor"
+msgstr "Predecesor"
+
+msgctxt "field:project.predecessor_successor,rec_name:"
+msgid "Name"
+msgstr "Nombre"
+
+msgctxt "field:project.predecessor_successor,successor:"
+msgid "Successor"
+msgstr "Sucesor"
+
+msgctxt "field:project.predecessor_successor,write_date:"
+msgid "Write Date"
+msgstr "Fecha modificación"
+
+msgctxt "field:project.predecessor_successor,write_uid:"
+msgid "Write User"
+msgstr "Usuario modificación"
+
+msgctxt "field:project.work,actual_finish_date:"
+msgid "Actual Finish"
+msgstr "Finalización real"
+
+msgctxt "field:project.work,actual_finish_time:"
+msgid "Actual Finish Time"
+msgstr "Hora de finalización real"
+
+msgctxt "field:project.work,actual_start_date:"
+msgid "Actual Start"
+msgstr "Inicio real"
+
+msgctxt "field:project.work,actual_start_time:"
+msgid "Actual Start Time"
+msgstr "Hora de inicio real"
+
+msgctxt "field:project.work,allocations:"
+msgid "Allocations"
+msgstr "Asignaciones"
+
+msgctxt "field:project.work,back_leveling_delay:"
+msgid "Leveling Delay"
+msgstr "Retraso de la nivelación"
+
+msgctxt "field:project.work,constraint_finish_date:"
+msgid "Constraint Finish"
+msgstr "Restricción de finalización"
+
+msgctxt "field:project.work,constraint_finish_time:"
+msgid "Constraint Finish Time"
+msgstr "Restricción de hora de finalización"
+
+msgctxt "field:project.work,constraint_start_date:"
+msgid "Constraint Start"
+msgstr "Restricción de inicio"
+
+msgctxt "field:project.work,constraint_start_time:"
+msgid "Constraint Start Time"
+msgstr "Restricción de tiempo de inicio"
+
+msgctxt "field:project.work,duration:"
+msgid "Duration"
+msgstr "Duración"
+
+msgctxt "field:project.work,early_finish_date:"
+msgid "Early Finish"
+msgstr "Finalización prematura"
+
+msgctxt "field:project.work,early_finish_time:"
+msgid "Early Finish Time"
+msgstr "Hora de finalización prematura"
+
+msgctxt "field:project.work,early_start_date:"
+msgid "Early Start"
+msgstr "Inicio prematuro"
+
+msgctxt "field:project.work,early_start_time:"
+msgid "Early Start Time"
+msgstr "Tiempo de inicio prematuro"
+
+msgctxt "field:project.work,late_finish_date:"
+msgid "Late Finish"
+msgstr "Finalización tardía"
+
+msgctxt "field:project.work,late_finish_time:"
+msgid "Late Finish Time"
+msgstr "Hora de finalización tardía"
+
+msgctxt "field:project.work,late_start_date:"
+msgid "Late Start"
+msgstr "Inicio tardío"
+
+msgctxt "field:project.work,late_start_time:"
+msgid "Late Start Time"
+msgstr "Hora de inicio tardía"
+
+msgctxt "field:project.work,leveling_delay:"
+msgid "Leveling Delay"
+msgstr "Retraso de nivelación"
+
+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"
+
+msgctxt "model:ir.action,name:wizard_leveling"
+msgid "Tasks Leveling"
+msgstr "Nivelación de tareas"
+
+msgctxt "model:project.allocation,name:"
+msgid "Allocation"
+msgstr "Asignación"
+
+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"
+
+msgctxt "view:project.allocation:"
+msgid "Allocations"
+msgstr "Asignaciones"
+
+msgctxt "view:project.work:"
+msgid "Allocations"
+msgstr "Asignaciones"
+
+msgctxt "view:project.work:"
+msgid "Plan"
+msgstr "Plan"
+
+msgctxt "view:project.work:"
+msgid "Requests"
+msgstr "Solicitudes"
diff --git a/locale/es_CO.po b/locale/es_CO.po
index 6005342..2149b6e 100644
--- a/locale/es_CO.po
+++ b/locale/es_CO.po
@@ -2,127 +2,169 @@
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
-msgctxt "error:project.work:0"
+msgctxt "error:project.work:"
msgid "You can not create recursive dependencies!"
msgstr "¡No puede crear dependencias recursivas!"
-msgctxt "field:project.allocation,employee:0"
+msgctxt "field:project.allocation,create_date:"
+msgid "Create Date"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:project.allocation,create_uid:"
+msgid "Create User"
+msgstr "Crear usuario"
+
+msgctxt "field:project.allocation,employee:"
msgid "Employee"
msgstr "Empleado"
-msgctxt "field:project.allocation,percentage:0"
+msgctxt "field:project.allocation,id:"
+msgid "ID"
+msgstr ""
+
+msgctxt "field:project.allocation,percentage:"
msgid "Percentage"
msgstr "Porcentaje"
-msgctxt "field:project.allocation,rec_name:0"
+msgctxt "field:project.allocation,rec_name:"
msgid "Name"
msgstr "Nombre"
-msgctxt "field:project.allocation,work:0"
+msgctxt "field:project.allocation,work:"
msgid "Work"
msgstr "Trabajo"
-msgctxt "field:project.predecessor_successor,predecessor:0"
+msgctxt "field:project.allocation,write_date:"
+msgid "Write Date"
+msgstr ""
+
+msgctxt "field:project.allocation,write_uid:"
+msgid "Write User"
+msgstr ""
+
+msgctxt "field:project.predecessor_successor,create_date:"
+msgid "Create Date"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:project.predecessor_successor,create_uid:"
+msgid "Create User"
+msgstr "Crear usuario"
+
+msgctxt "field:project.predecessor_successor,id:"
+msgid "ID"
+msgstr ""
+
+msgctxt "field:project.predecessor_successor,predecessor:"
msgid "Predecessor"
msgstr "Predecesor"
-msgctxt "field:project.predecessor_successor,rec_name:0"
+msgctxt "field:project.predecessor_successor,rec_name:"
msgid "Name"
msgstr "Nombre"
-msgctxt "field:project.predecessor_successor,successor:0"
+msgctxt "field:project.predecessor_successor,successor:"
msgid "Successor"
msgstr "Sucesor"
-msgctxt "field:project.work,actual_finish_date:0"
+msgctxt "field:project.predecessor_successor,write_date:"
+msgid "Write Date"
+msgstr ""
+
+msgctxt "field:project.predecessor_successor,write_uid:"
+msgid "Write User"
+msgstr ""
+
+msgctxt "field:project.work,actual_finish_date:"
msgid "Actual Finish"
msgstr "Fin Actual"
-msgctxt "field:project.work,actual_finish_time:0"
+msgctxt "field:project.work,actual_finish_time:"
msgid "Actual Finish Time"
msgstr "Tiempo del Actual Fin"
-msgctxt "field:project.work,actual_start_date:0"
+msgctxt "field:project.work,actual_start_date:"
msgid "Actual Start"
msgstr "Comienzo Actual"
-msgctxt "field:project.work,actual_start_time:0"
+msgctxt "field:project.work,actual_start_time:"
msgid "Actual Start Time"
msgstr "Tiempo del Actual Comienzo"
-msgctxt "field:project.work,allocations:0"
+msgctxt "field:project.work,allocations:"
msgid "Allocations"
msgstr "Cuotas"
-msgctxt "field:project.work,back_leveling_delay:0"
+msgctxt "field:project.work,back_leveling_delay:"
msgid "Leveling Delay"
msgstr "Retardo de Escalamiento"
-msgctxt "field:project.work,constraint_finish_date:0"
+msgctxt "field:project.work,constraint_finish_date:"
msgid "Constraint Finish"
msgstr "Final de la Restricción"
-msgctxt "field:project.work,constraint_finish_time:0"
+msgctxt "field:project.work,constraint_finish_time:"
msgid "Constraint Finish Time"
msgstr "Tiempo Final de la Restricción"
-msgctxt "field:project.work,constraint_start_date:0"
+msgctxt "field:project.work,constraint_start_date:"
msgid "Constraint Start"
msgstr "Comienzo de la Restricción"
-msgctxt "field:project.work,constraint_start_time:0"
+msgctxt "field:project.work,constraint_start_time:"
msgid "Constraint Start Time"
msgstr "Tiempo del Comienzo de la Restricción"
-msgctxt "field:project.work,duration:0"
+msgctxt "field:project.work,duration:"
msgid "Duration"
msgstr "Duración"
-msgctxt "field:project.work,early_finish_date:0"
+msgctxt "field:project.work,early_finish_date:"
msgid "Early Finish"
msgstr "Final Temprano"
-msgctxt "field:project.work,early_finish_time:0"
+msgctxt "field:project.work,early_finish_time:"
msgid "Early Finish Time"
msgstr "Tiempo del Temprano Final"
-msgctxt "field:project.work,early_start_date:0"
+msgctxt "field:project.work,early_start_date:"
msgid "Early Start"
msgstr "Comienzo Temprano"
-msgctxt "field:project.work,early_start_time:0"
+msgctxt "field:project.work,early_start_time:"
msgid "Early Start Time"
msgstr "Tiempo el Temprano Comienzo"
-msgctxt "field:project.work,late_finish_date:0"
+msgctxt "field:project.work,late_finish_date:"
msgid "Late Finish"
msgstr "Final Tardío"
-msgctxt "field:project.work,late_finish_time:0"
+msgctxt "field:project.work,late_finish_time:"
msgid "Late Finish Time"
msgstr "Tiempo del Tardío Final"
-msgctxt "field:project.work,late_start_date:0"
+msgctxt "field:project.work,late_start_date:"
msgid "Late Start"
msgstr "Comienzo Tardío"
-msgctxt "field:project.work,late_start_time:0"
+msgctxt "field:project.work,late_start_time:"
msgid "Late Start Time"
msgstr "Tiempo del Tardío Comienzo"
-msgctxt "field:project.work,leveling_delay:0"
+msgctxt "field:project.work,leveling_delay:"
msgid "Leveling Delay"
msgstr "Retardo del Escalamiento"
-msgctxt "field:project.work,predecessors:0"
+msgctxt "field:project.work,predecessors:"
msgid "Predecessors"
msgstr "Predecesores"
-msgctxt "field:project.work,requests:0"
+msgctxt "field:project.work,requests:"
msgid "Requests"
msgstr "Solicitudes"
-msgctxt "field:project.work,successors:0"
+msgctxt "field:project.work,successors:"
msgid "Successors"
msgstr "Sucesores"
@@ -130,11 +172,11 @@ msgctxt "model:ir.action,name:wizard_leveling"
msgid "Tasks Leveling"
msgstr "Escalamiento de Tareas"
-msgctxt "model:project.allocation,name:0"
+msgctxt "model:project.allocation,name:"
msgid "Allocation"
msgstr "Cuotas"
-msgctxt "model:project.predecessor_successor,name:0"
+msgctxt "model:project.predecessor_successor,name:"
msgid "Predecessor - Successor"
msgstr "Predecesor - Sucesor"
@@ -142,22 +184,22 @@ msgctxt "model:res.request.link,name:request_link_work"
msgid "Work"
msgstr "Trabajo"
-msgctxt "view:project.allocation:0"
+msgctxt "view:project.allocation:"
msgid "Allocation"
msgstr "Cuota"
-msgctxt "view:project.allocation:0"
+msgctxt "view:project.allocation:"
msgid "Allocations"
msgstr "Cuotas"
-msgctxt "view:project.work:0"
+msgctxt "view:project.work:"
msgid "Allocations"
msgstr "Cuotas"
-msgctxt "view:project.work:0"
+msgctxt "view:project.work:"
msgid "Plan"
msgstr "Plan"
-msgctxt "view:project.work:0"
+msgctxt "view:project.work:"
msgid "Requests"
msgstr "Solicitudes"
diff --git a/locale/es_ES.po b/locale/es_ES.po
index 85c374c..ec7eb6e 100644
--- a/locale/es_ES.po
+++ b/locale/es_ES.po
@@ -2,127 +2,167 @@
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
-msgctxt "error:project.work:0"
+msgctxt "error:project.work:"
msgid "You can not create recursive dependencies!"
-msgstr "No puede crear dependencias recursivas"
+msgstr "No puede crear dependencias recursivas."
-msgctxt "field:project.allocation,employee:0"
+msgctxt "field:project.allocation,create_date:"
+msgid "Create Date"
+msgstr "Fecha creación"
+
+msgctxt "field:project.allocation,create_uid:"
+msgid "Create User"
+msgstr "Usuario creación"
+
+msgctxt "field:project.allocation,employee:"
msgid "Employee"
msgstr "Empleado"
-msgctxt "field:project.allocation,percentage:0"
+msgctxt "field:project.allocation,id:"
+msgid "ID"
+msgstr "ID"
+
+msgctxt "field:project.allocation,percentage:"
msgid "Percentage"
msgstr "Porcentaje"
-msgctxt "field:project.allocation,rec_name:0"
+msgctxt "field:project.allocation,rec_name:"
msgid "Name"
msgstr "Nombre"
-msgctxt "field:project.allocation,work:0"
+msgctxt "field:project.allocation,work:"
msgid "Work"
msgstr "Actividad"
-msgctxt "field:project.predecessor_successor,predecessor:0"
+msgctxt "field:project.allocation,write_date:"
+msgid "Write Date"
+msgstr "Fecha modificación"
+
+msgctxt "field:project.allocation,write_uid:"
+msgid "Write User"
+msgstr "Usuario modificación"
+
+msgctxt "field:project.predecessor_successor,create_date:"
+msgid "Create Date"
+msgstr "Fecha creación"
+
+msgctxt "field:project.predecessor_successor,create_uid:"
+msgid "Create User"
+msgstr "Usuario creación"
+
+msgctxt "field:project.predecessor_successor,id:"
+msgid "ID"
+msgstr "ID"
+
+msgctxt "field:project.predecessor_successor,predecessor:"
msgid "Predecessor"
msgstr "Predecesor"
-msgctxt "field:project.predecessor_successor,rec_name:0"
+msgctxt "field:project.predecessor_successor,rec_name:"
msgid "Name"
msgstr "Nombre"
-msgctxt "field:project.predecessor_successor,successor:0"
+msgctxt "field:project.predecessor_successor,successor:"
msgid "Successor"
msgstr "Sucesor"
-msgctxt "field:project.work,actual_finish_date:0"
+msgctxt "field:project.predecessor_successor,write_date:"
+msgid "Write Date"
+msgstr "Fecha modificación"
+
+msgctxt "field:project.predecessor_successor,write_uid:"
+msgid "Write User"
+msgstr "Usuario modificación"
+
+msgctxt "field:project.work,actual_finish_date:"
msgid "Actual Finish"
msgstr "Finalización real"
-msgctxt "field:project.work,actual_finish_time:0"
+msgctxt "field:project.work,actual_finish_time:"
msgid "Actual Finish Time"
msgstr "Hora de finalización real"
-msgctxt "field:project.work,actual_start_date:0"
+msgctxt "field:project.work,actual_start_date:"
msgid "Actual Start"
msgstr "Inicio real"
-msgctxt "field:project.work,actual_start_time:0"
+msgctxt "field:project.work,actual_start_time:"
msgid "Actual Start Time"
msgstr "Hora de inicio real"
-msgctxt "field:project.work,allocations:0"
+msgctxt "field:project.work,allocations:"
msgid "Allocations"
msgstr "Asignaciones"
-msgctxt "field:project.work,back_leveling_delay:0"
+msgctxt "field:project.work,back_leveling_delay:"
msgid "Leveling Delay"
msgstr "Retraso de la nivelación"
-msgctxt "field:project.work,constraint_finish_date:0"
+msgctxt "field:project.work,constraint_finish_date:"
msgid "Constraint Finish"
msgstr "Restricción de finalización"
-msgctxt "field:project.work,constraint_finish_time:0"
+msgctxt "field:project.work,constraint_finish_time:"
msgid "Constraint Finish Time"
-msgstr "Restricción de hora de finalización"
+msgstr "Restricción hora de finalización"
-msgctxt "field:project.work,constraint_start_date:0"
+msgctxt "field:project.work,constraint_start_date:"
msgid "Constraint Start"
msgstr "Restricción de inicio"
-msgctxt "field:project.work,constraint_start_time:0"
+msgctxt "field:project.work,constraint_start_time:"
msgid "Constraint Start Time"
-msgstr "Restricción de tiempo de inicio"
+msgstr "Restricción hora de inicio"
-msgctxt "field:project.work,duration:0"
+msgctxt "field:project.work,duration:"
msgid "Duration"
msgstr "Duración"
-msgctxt "field:project.work,early_finish_date:0"
+msgctxt "field:project.work,early_finish_date:"
msgid "Early Finish"
msgstr "Finalización prematura"
-msgctxt "field:project.work,early_finish_time:0"
+msgctxt "field:project.work,early_finish_time:"
msgid "Early Finish Time"
msgstr "Hora de finalización prematura"
-msgctxt "field:project.work,early_start_date:0"
+msgctxt "field:project.work,early_start_date:"
msgid "Early Start"
msgstr "Inicio prematuro"
-msgctxt "field:project.work,early_start_time:0"
+msgctxt "field:project.work,early_start_time:"
msgid "Early Start Time"
-msgstr "Tiempo de inicio prematuro"
+msgstr "Hora de inicio prematura"
-msgctxt "field:project.work,late_finish_date:0"
+msgctxt "field:project.work,late_finish_date:"
msgid "Late Finish"
-msgstr ""
+msgstr "Finalización tardía"
-msgctxt "field:project.work,late_finish_time:0"
+msgctxt "field:project.work,late_finish_time:"
msgid "Late Finish Time"
msgstr "Hora de finalización tardía"
-msgctxt "field:project.work,late_start_date:0"
+msgctxt "field:project.work,late_start_date:"
msgid "Late Start"
msgstr "Inicio tardío"
-msgctxt "field:project.work,late_start_time:0"
+msgctxt "field:project.work,late_start_time:"
msgid "Late Start Time"
msgstr "Hora de inicio tardía"
-msgctxt "field:project.work,leveling_delay:0"
+msgctxt "field:project.work,leveling_delay:"
msgid "Leveling Delay"
msgstr "Retraso de nivelación"
-msgctxt "field:project.work,predecessors:0"
+msgctxt "field:project.work,predecessors:"
msgid "Predecessors"
msgstr "Predecesores"
-msgctxt "field:project.work,requests:0"
+msgctxt "field:project.work,requests:"
msgid "Requests"
msgstr "Solicitudes"
-msgctxt "field:project.work,successors:0"
+msgctxt "field:project.work,successors:"
msgid "Successors"
msgstr "Sucesores"
@@ -130,11 +170,11 @@ msgctxt "model:ir.action,name:wizard_leveling"
msgid "Tasks Leveling"
msgstr "Nivelación de tareas"
-msgctxt "model:project.allocation,name:0"
+msgctxt "model:project.allocation,name:"
msgid "Allocation"
msgstr "Asignación"
-msgctxt "model:project.predecessor_successor,name:0"
+msgctxt "model:project.predecessor_successor,name:"
msgid "Predecessor - Successor"
msgstr "Predecesor - Sucesor"
@@ -142,22 +182,22 @@ msgctxt "model:res.request.link,name:request_link_work"
msgid "Work"
msgstr "Actividad"
-msgctxt "view:project.allocation:0"
+msgctxt "view:project.allocation:"
msgid "Allocation"
msgstr "Asignación"
-msgctxt "view:project.allocation:0"
+msgctxt "view:project.allocation:"
msgid "Allocations"
msgstr "Asignaciones"
-msgctxt "view:project.work:0"
+msgctxt "view:project.work:"
msgid "Allocations"
msgstr "Asignaciones"
-msgctxt "view:project.work:0"
+msgctxt "view:project.work:"
msgid "Plan"
msgstr "Plan"
-msgctxt "view:project.work:0"
+msgctxt "view:project.work:"
msgid "Requests"
msgstr "Solicitudes"
diff --git a/locale/fr_FR.po b/locale/fr_FR.po
index 8503c70..474dd63 100644
--- a/locale/fr_FR.po
+++ b/locale/fr_FR.po
@@ -2,127 +2,171 @@
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
-msgctxt "error:project.work:0"
+msgctxt "error:project.work:"
msgid "You can not create recursive dependencies!"
msgstr "Vous ne pouvez pas créer des dépendances récursives !"
-msgctxt "field:project.allocation,employee:0"
+msgctxt "error:project.work:"
+msgid "You can not create recursive dependencies!"
+msgstr "Vous ne pouvez pas créer des dépendances récursives !"
+
+msgctxt "field:project.allocation,create_date:"
+msgid "Create Date"
+msgstr "Date de création"
+
+msgctxt "field:project.allocation,create_uid:"
+msgid "Create User"
+msgstr "Créé par"
+
+msgctxt "field:project.allocation,employee:"
msgid "Employee"
msgstr "Employé"
-msgctxt "field:project.allocation,percentage:0"
+msgctxt "field:project.allocation,id:"
+msgid "ID"
+msgstr "ID"
+
+msgctxt "field:project.allocation,percentage:"
msgid "Percentage"
msgstr "Pourcentage"
-msgctxt "field:project.allocation,rec_name:0"
+msgctxt "field:project.allocation,rec_name:"
msgid "Name"
msgstr "Nom"
-msgctxt "field:project.allocation,work:0"
+msgctxt "field:project.allocation,work:"
msgid "Work"
msgstr "Travail"
-msgctxt "field:project.predecessor_successor,predecessor:0"
+msgctxt "field:project.allocation,write_date:"
+msgid "Write Date"
+msgstr "Date de mise à jour"
+
+msgctxt "field:project.allocation,write_uid:"
+msgid "Write User"
+msgstr "Mis à jour par"
+
+msgctxt "field:project.predecessor_successor,create_date:"
+msgid "Create Date"
+msgstr "Date de création"
+
+msgctxt "field:project.predecessor_successor,create_uid:"
+msgid "Create User"
+msgstr "Créé par"
+
+msgctxt "field:project.predecessor_successor,id:"
+msgid "ID"
+msgstr "ID"
+
+msgctxt "field:project.predecessor_successor,predecessor:"
msgid "Predecessor"
msgstr "Prédécesseur"
-msgctxt "field:project.predecessor_successor,rec_name:0"
+msgctxt "field:project.predecessor_successor,rec_name:"
msgid "Name"
msgstr "Nom"
-msgctxt "field:project.predecessor_successor,successor:0"
+msgctxt "field:project.predecessor_successor,successor:"
msgid "Successor"
msgstr "Successeur"
-msgctxt "field:project.work,actual_finish_date:0"
+msgctxt "field:project.predecessor_successor,write_date:"
+msgid "Write Date"
+msgstr "Date de mise à jour"
+
+msgctxt "field:project.predecessor_successor,write_uid:"
+msgid "Write User"
+msgstr "Mis à jour par"
+
+msgctxt "field:project.work,actual_finish_date:"
msgid "Actual Finish"
msgstr "Fin réelle"
-msgctxt "field:project.work,actual_finish_time:0"
+msgctxt "field:project.work,actual_finish_time:"
msgid "Actual Finish Time"
msgstr "Fin réelle"
-msgctxt "field:project.work,actual_start_date:0"
+msgctxt "field:project.work,actual_start_date:"
msgid "Actual Start"
msgstr "Début réel"
-msgctxt "field:project.work,actual_start_time:0"
+msgctxt "field:project.work,actual_start_time:"
msgid "Actual Start Time"
msgstr "Début réel"
-msgctxt "field:project.work,allocations:0"
+msgctxt "field:project.work,allocations:"
msgid "Allocations"
msgstr "Répartitions"
-msgctxt "field:project.work,back_leveling_delay:0"
+msgctxt "field:project.work,back_leveling_delay:"
msgid "Leveling Delay"
msgstr "Délais de décalage"
-msgctxt "field:project.work,constraint_finish_date:0"
+msgctxt "field:project.work,constraint_finish_date:"
msgid "Constraint Finish"
msgstr "Fin imposée"
-msgctxt "field:project.work,constraint_finish_time:0"
+msgctxt "field:project.work,constraint_finish_time:"
msgid "Constraint Finish Time"
msgstr "Fin imposée"
-msgctxt "field:project.work,constraint_start_date:0"
+msgctxt "field:project.work,constraint_start_date:"
msgid "Constraint Start"
msgstr "Début imposé"
-msgctxt "field:project.work,constraint_start_time:0"
+msgctxt "field:project.work,constraint_start_time:"
msgid "Constraint Start Time"
msgstr "Début imposé"
-msgctxt "field:project.work,duration:0"
+msgctxt "field:project.work,duration:"
msgid "Duration"
msgstr "Durée"
-msgctxt "field:project.work,early_finish_date:0"
+msgctxt "field:project.work,early_finish_date:"
msgid "Early Finish"
msgstr "Fin au plus tôt"
-msgctxt "field:project.work,early_finish_time:0"
+msgctxt "field:project.work,early_finish_time:"
msgid "Early Finish Time"
msgstr "Fin au plus tôt"
-msgctxt "field:project.work,early_start_date:0"
+msgctxt "field:project.work,early_start_date:"
msgid "Early Start"
msgstr "Départ au plus tôt"
-msgctxt "field:project.work,early_start_time:0"
+msgctxt "field:project.work,early_start_time:"
msgid "Early Start Time"
msgstr "Départ au plus tôt"
-msgctxt "field:project.work,late_finish_date:0"
+msgctxt "field:project.work,late_finish_date:"
msgid "Late Finish"
msgstr "Fin au plus tard"
-msgctxt "field:project.work,late_finish_time:0"
+msgctxt "field:project.work,late_finish_time:"
msgid "Late Finish Time"
msgstr "Fin au plus tard"
-msgctxt "field:project.work,late_start_date:0"
+msgctxt "field:project.work,late_start_date:"
msgid "Late Start"
msgstr "Début au plus tard"
-msgctxt "field:project.work,late_start_time:0"
+msgctxt "field:project.work,late_start_time:"
msgid "Late Start Time"
msgstr "au plus tard"
-msgctxt "field:project.work,leveling_delay:0"
+msgctxt "field:project.work,leveling_delay:"
msgid "Leveling Delay"
msgstr "Délais décalage"
-msgctxt "field:project.work,predecessors:0"
+msgctxt "field:project.work,predecessors:"
msgid "Predecessors"
msgstr "Prédécesseurs"
-msgctxt "field:project.work,requests:0"
+msgctxt "field:project.work,requests:"
msgid "Requests"
msgstr "Demandes"
-msgctxt "field:project.work,successors:0"
+msgctxt "field:project.work,successors:"
msgid "Successors"
msgstr "Successeurs"
@@ -130,11 +174,11 @@ msgctxt "model:ir.action,name:wizard_leveling"
msgid "Tasks Leveling"
msgstr "Décalage des tâches"
-msgctxt "model:project.allocation,name:0"
+msgctxt "model:project.allocation,name:"
msgid "Allocation"
msgstr "Répartition"
-msgctxt "model:project.predecessor_successor,name:0"
+msgctxt "model:project.predecessor_successor,name:"
msgid "Predecessor - Successor"
msgstr "Prédécesseur - Successeur"
@@ -142,22 +186,42 @@ msgctxt "model:res.request.link,name:request_link_work"
msgid "Work"
msgstr "Travail"
-msgctxt "view:project.allocation:0"
+msgctxt "view:project.allocation:"
+msgid "Allocation"
+msgstr "Répartition"
+
+msgctxt "view:project.allocation:"
msgid "Allocation"
msgstr "Répartition"
-msgctxt "view:project.allocation:0"
+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:0"
+msgctxt "view:project.work:"
msgid "Allocations"
msgstr "Répartitions"
-msgctxt "view:project.work:0"
+msgctxt "view:project.work:"
+msgid "Plan"
+msgstr "Planification"
+
+msgctxt "view:project.work:"
msgid "Plan"
msgstr "Planification"
-msgctxt "view:project.work:0"
+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 0731bea..3b86945 100644
--- a/locale/nl_NL.po
+++ b/locale/nl_NL.po
@@ -2,132 +2,172 @@
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
-msgctxt "error:project.work:0"
+msgctxt "error:project.work:"
msgid "You can not create recursive dependencies!"
msgstr ""
+msgctxt "field:project.allocation,create_date:"
+msgid "Create Date"
+msgstr ""
+
+msgctxt "field:project.allocation,create_uid:"
+msgid "Create User"
+msgstr ""
+
#, fuzzy
-msgctxt "field:project.allocation,employee:0"
+msgctxt "field:project.allocation,employee:"
msgid "Employee"
msgstr "Werknemer"
+msgctxt "field:project.allocation,id:"
+msgid "ID"
+msgstr ""
+
#, fuzzy
-msgctxt "field:project.allocation,percentage:0"
+msgctxt "field:project.allocation,percentage:"
msgid "Percentage"
msgstr "Percentage"
#, fuzzy
-msgctxt "field:project.allocation,rec_name:0"
+msgctxt "field:project.allocation,rec_name:"
msgid "Name"
msgstr "Naam bijlage"
#, fuzzy
-msgctxt "field:project.allocation,work:0"
+msgctxt "field:project.allocation,work:"
msgid "Work"
msgstr "Werk"
-msgctxt "field:project.predecessor_successor,predecessor:0"
+msgctxt "field:project.allocation,write_date:"
+msgid "Write Date"
+msgstr ""
+
+msgctxt "field:project.allocation,write_uid:"
+msgid "Write User"
+msgstr ""
+
+msgctxt "field:project.predecessor_successor,create_date:"
+msgid "Create Date"
+msgstr ""
+
+msgctxt "field:project.predecessor_successor,create_uid:"
+msgid "Create User"
+msgstr ""
+
+msgctxt "field:project.predecessor_successor,id:"
+msgid "ID"
+msgstr ""
+
+msgctxt "field:project.predecessor_successor,predecessor:"
msgid "Predecessor"
msgstr ""
#, fuzzy
-msgctxt "field:project.predecessor_successor,rec_name:0"
+msgctxt "field:project.predecessor_successor,rec_name:"
msgid "Name"
msgstr "Naam bijlage"
-msgctxt "field:project.predecessor_successor,successor:0"
+msgctxt "field:project.predecessor_successor,successor:"
msgid "Successor"
msgstr ""
-msgctxt "field:project.work,actual_finish_date:0"
+msgctxt "field:project.predecessor_successor,write_date:"
+msgid "Write Date"
+msgstr ""
+
+msgctxt "field:project.predecessor_successor,write_uid:"
+msgid "Write User"
+msgstr ""
+
+msgctxt "field:project.work,actual_finish_date:"
msgid "Actual Finish"
msgstr ""
-msgctxt "field:project.work,actual_finish_time:0"
+msgctxt "field:project.work,actual_finish_time:"
msgid "Actual Finish Time"
msgstr ""
-msgctxt "field:project.work,actual_start_date:0"
+msgctxt "field:project.work,actual_start_date:"
msgid "Actual Start"
msgstr ""
-msgctxt "field:project.work,actual_start_time:0"
+msgctxt "field:project.work,actual_start_time:"
msgid "Actual Start Time"
msgstr ""
-msgctxt "field:project.work,allocations:0"
+msgctxt "field:project.work,allocations:"
msgid "Allocations"
msgstr ""
-msgctxt "field:project.work,back_leveling_delay:0"
+msgctxt "field:project.work,back_leveling_delay:"
msgid "Leveling Delay"
msgstr ""
-msgctxt "field:project.work,constraint_finish_date:0"
+msgctxt "field:project.work,constraint_finish_date:"
msgid "Constraint Finish"
msgstr ""
-msgctxt "field:project.work,constraint_finish_time:0"
+msgctxt "field:project.work,constraint_finish_time:"
msgid "Constraint Finish Time"
msgstr ""
-msgctxt "field:project.work,constraint_start_date:0"
+msgctxt "field:project.work,constraint_start_date:"
msgid "Constraint Start"
msgstr ""
-msgctxt "field:project.work,constraint_start_time:0"
+msgctxt "field:project.work,constraint_start_time:"
msgid "Constraint Start Time"
msgstr ""
-msgctxt "field:project.work,duration:0"
+msgctxt "field:project.work,duration:"
msgid "Duration"
msgstr ""
-msgctxt "field:project.work,early_finish_date:0"
+msgctxt "field:project.work,early_finish_date:"
msgid "Early Finish"
msgstr ""
-msgctxt "field:project.work,early_finish_time:0"
+msgctxt "field:project.work,early_finish_time:"
msgid "Early Finish Time"
msgstr ""
-msgctxt "field:project.work,early_start_date:0"
+msgctxt "field:project.work,early_start_date:"
msgid "Early Start"
msgstr ""
-msgctxt "field:project.work,early_start_time:0"
+msgctxt "field:project.work,early_start_time:"
msgid "Early Start Time"
msgstr ""
-msgctxt "field:project.work,late_finish_date:0"
+msgctxt "field:project.work,late_finish_date:"
msgid "Late Finish"
msgstr ""
-msgctxt "field:project.work,late_finish_time:0"
+msgctxt "field:project.work,late_finish_time:"
msgid "Late Finish Time"
msgstr ""
-msgctxt "field:project.work,late_start_date:0"
+msgctxt "field:project.work,late_start_date:"
msgid "Late Start"
msgstr ""
-msgctxt "field:project.work,late_start_time:0"
+msgctxt "field:project.work,late_start_time:"
msgid "Late Start Time"
msgstr ""
-msgctxt "field:project.work,leveling_delay:0"
+msgctxt "field:project.work,leveling_delay:"
msgid "Leveling Delay"
msgstr ""
-msgctxt "field:project.work,predecessors:0"
+msgctxt "field:project.work,predecessors:"
msgid "Predecessors"
msgstr ""
-msgctxt "field:project.work,requests:0"
+msgctxt "field:project.work,requests:"
msgid "Requests"
msgstr ""
-msgctxt "field:project.work,successors:0"
+msgctxt "field:project.work,successors:"
msgid "Successors"
msgstr ""
@@ -135,11 +175,11 @@ msgctxt "model:ir.action,name:wizard_leveling"
msgid "Tasks Leveling"
msgstr ""
-msgctxt "model:project.allocation,name:0"
+msgctxt "model:project.allocation,name:"
msgid "Allocation"
msgstr ""
-msgctxt "model:project.predecessor_successor,name:0"
+msgctxt "model:project.predecessor_successor,name:"
msgid "Predecessor - Successor"
msgstr ""
@@ -148,22 +188,22 @@ msgctxt "model:res.request.link,name:request_link_work"
msgid "Work"
msgstr "Werk"
-msgctxt "view:project.allocation:0"
+msgctxt "view:project.allocation:"
msgid "Allocation"
msgstr ""
-msgctxt "view:project.allocation:0"
+msgctxt "view:project.allocation:"
msgid "Allocations"
msgstr ""
-msgctxt "view:project.work:0"
+msgctxt "view:project.work:"
msgid "Allocations"
msgstr ""
-msgctxt "view:project.work:0"
+msgctxt "view:project.work:"
msgid "Plan"
msgstr ""
-msgctxt "view:project.work:0"
+msgctxt "view:project.work:"
msgid "Requests"
msgstr ""
diff --git a/locale/ru_RU.po b/locale/ru_RU.po
index c2e77c4..a5b87ee 100644
--- a/locale/ru_RU.po
+++ b/locale/ru_RU.po
@@ -2,131 +2,171 @@
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
-msgctxt "error:project.work:0"
+msgctxt "error:project.work:"
msgid "You can not create recursive dependencies!"
msgstr ""
+msgctxt "field:project.allocation,create_date:"
+msgid "Create Date"
+msgstr ""
+
+msgctxt "field:project.allocation,create_uid:"
+msgid "Create User"
+msgstr ""
+
#, fuzzy
-msgctxt "field:project.allocation,employee:0"
+msgctxt "field:project.allocation,employee:"
msgid "Employee"
msgstr "Сотрудник"
-msgctxt "field:project.allocation,percentage:0"
+msgctxt "field:project.allocation,id:"
+msgid "ID"
+msgstr ""
+
+msgctxt "field:project.allocation,percentage:"
msgid "Percentage"
msgstr ""
#, fuzzy
-msgctxt "field:project.allocation,rec_name:0"
+msgctxt "field:project.allocation,rec_name:"
msgid "Name"
msgstr "Наименование"
-msgctxt "field:project.allocation,work:0"
+msgctxt "field:project.allocation,work:"
msgid "Work"
msgstr ""
-msgctxt "field:project.predecessor_successor,predecessor:0"
+msgctxt "field:project.allocation,write_date:"
+msgid "Write Date"
+msgstr ""
+
+msgctxt "field:project.allocation,write_uid:"
+msgid "Write User"
+msgstr ""
+
+msgctxt "field:project.predecessor_successor,create_date:"
+msgid "Create Date"
+msgstr ""
+
+msgctxt "field:project.predecessor_successor,create_uid:"
+msgid "Create User"
+msgstr ""
+
+msgctxt "field:project.predecessor_successor,id:"
+msgid "ID"
+msgstr ""
+
+msgctxt "field:project.predecessor_successor,predecessor:"
msgid "Predecessor"
msgstr ""
#, fuzzy
-msgctxt "field:project.predecessor_successor,rec_name:0"
+msgctxt "field:project.predecessor_successor,rec_name:"
msgid "Name"
msgstr "Наименование"
-msgctxt "field:project.predecessor_successor,successor:0"
+msgctxt "field:project.predecessor_successor,successor:"
msgid "Successor"
msgstr ""
-msgctxt "field:project.work,actual_finish_date:0"
+msgctxt "field:project.predecessor_successor,write_date:"
+msgid "Write Date"
+msgstr ""
+
+msgctxt "field:project.predecessor_successor,write_uid:"
+msgid "Write User"
+msgstr ""
+
+msgctxt "field:project.work,actual_finish_date:"
msgid "Actual Finish"
msgstr ""
-msgctxt "field:project.work,actual_finish_time:0"
+msgctxt "field:project.work,actual_finish_time:"
msgid "Actual Finish Time"
msgstr ""
-msgctxt "field:project.work,actual_start_date:0"
+msgctxt "field:project.work,actual_start_date:"
msgid "Actual Start"
msgstr ""
-msgctxt "field:project.work,actual_start_time:0"
+msgctxt "field:project.work,actual_start_time:"
msgid "Actual Start Time"
msgstr ""
-msgctxt "field:project.work,allocations:0"
+msgctxt "field:project.work,allocations:"
msgid "Allocations"
msgstr ""
-msgctxt "field:project.work,back_leveling_delay:0"
+msgctxt "field:project.work,back_leveling_delay:"
msgid "Leveling Delay"
msgstr ""
-msgctxt "field:project.work,constraint_finish_date:0"
+msgctxt "field:project.work,constraint_finish_date:"
msgid "Constraint Finish"
msgstr ""
-msgctxt "field:project.work,constraint_finish_time:0"
+msgctxt "field:project.work,constraint_finish_time:"
msgid "Constraint Finish Time"
msgstr ""
-msgctxt "field:project.work,constraint_start_date:0"
+msgctxt "field:project.work,constraint_start_date:"
msgid "Constraint Start"
msgstr ""
-msgctxt "field:project.work,constraint_start_time:0"
+msgctxt "field:project.work,constraint_start_time:"
msgid "Constraint Start Time"
msgstr ""
-msgctxt "field:project.work,duration:0"
+msgctxt "field:project.work,duration:"
msgid "Duration"
msgstr ""
-msgctxt "field:project.work,early_finish_date:0"
+msgctxt "field:project.work,early_finish_date:"
msgid "Early Finish"
msgstr ""
-msgctxt "field:project.work,early_finish_time:0"
+msgctxt "field:project.work,early_finish_time:"
msgid "Early Finish Time"
msgstr ""
-msgctxt "field:project.work,early_start_date:0"
+msgctxt "field:project.work,early_start_date:"
msgid "Early Start"
msgstr ""
-msgctxt "field:project.work,early_start_time:0"
+msgctxt "field:project.work,early_start_time:"
msgid "Early Start Time"
msgstr ""
-msgctxt "field:project.work,late_finish_date:0"
+msgctxt "field:project.work,late_finish_date:"
msgid "Late Finish"
msgstr ""
-msgctxt "field:project.work,late_finish_time:0"
+msgctxt "field:project.work,late_finish_time:"
msgid "Late Finish Time"
msgstr ""
-msgctxt "field:project.work,late_start_date:0"
+msgctxt "field:project.work,late_start_date:"
msgid "Late Start"
msgstr ""
-msgctxt "field:project.work,late_start_time:0"
+msgctxt "field:project.work,late_start_time:"
msgid "Late Start Time"
msgstr ""
-msgctxt "field:project.work,leveling_delay:0"
+msgctxt "field:project.work,leveling_delay:"
msgid "Leveling Delay"
msgstr ""
-msgctxt "field:project.work,predecessors:0"
+msgctxt "field:project.work,predecessors:"
msgid "Predecessors"
msgstr ""
#, fuzzy
-msgctxt "field:project.work,requests:0"
+msgctxt "field:project.work,requests:"
msgid "Requests"
msgstr "Сообщения"
-msgctxt "field:project.work,successors:0"
+msgctxt "field:project.work,successors:"
msgid "Successors"
msgstr ""
@@ -134,11 +174,11 @@ msgctxt "model:ir.action,name:wizard_leveling"
msgid "Tasks Leveling"
msgstr ""
-msgctxt "model:project.allocation,name:0"
+msgctxt "model:project.allocation,name:"
msgid "Allocation"
msgstr ""
-msgctxt "model:project.predecessor_successor,name:0"
+msgctxt "model:project.predecessor_successor,name:"
msgid "Predecessor - Successor"
msgstr ""
@@ -146,23 +186,23 @@ msgctxt "model:res.request.link,name:request_link_work"
msgid "Work"
msgstr ""
-msgctxt "view:project.allocation:0"
+msgctxt "view:project.allocation:"
msgid "Allocation"
msgstr ""
-msgctxt "view:project.allocation:0"
+msgctxt "view:project.allocation:"
msgid "Allocations"
msgstr ""
-msgctxt "view:project.work:0"
+msgctxt "view:project.work:"
msgid "Allocations"
msgstr ""
-msgctxt "view:project.work:0"
+msgctxt "view:project.work:"
msgid "Plan"
msgstr ""
#, fuzzy
-msgctxt "view:project.work:0"
+msgctxt "view:project.work:"
msgid "Requests"
msgstr "Сообщения"
diff --git a/setup.py b/setup.py
index bc5ed2a..8f9199b 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 2d8bd59..3bc7b90 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_plan import suite
+from .test_project_plan import suite
diff --git a/tests/test_project_plan.py b/tests/test_project_plan.py
index dbc1c27..b1ab311 100644
--- a/tests/test_project_plan.py
+++ b/tests/test_project_plan.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,6 +34,7 @@ class ProjectPlanTestCase(unittest.TestCase):
'''
test_depends()
+
def suite():
suite = trytond.tests.test_tryton.suite()
suite.addTests(unittest.TestLoader().loadTestsFromTestCase(
diff --git a/trytond_project_plan.egg-info/PKG-INFO b/trytond_project_plan.egg-info/PKG-INFO
index bc9a528..2164707 100644
--- a/trytond_project_plan.egg-info/PKG-INFO
+++ b/trytond_project_plan.egg-info/PKG-INFO
@@ -1,13 +1,13 @@
Metadata-Version: 1.0
Name: trytond-project-plan
-Version: 2.2.0
+Version: 2.4.0
Summary: Add planning capabilities on projects.
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_plan.egg-info/SOURCES.txt b/trytond_project_plan.egg-info/SOURCES.txt
index 19be75b..4efb8a1 100644
--- a/trytond_project_plan.egg-info/SOURCES.txt
+++ b/trytond_project_plan.egg-info/SOURCES.txt
@@ -15,8 +15,10 @@ work.xml
./tests/test_project_plan.py
doc/index.rst
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_plan.egg-info/requires.txt b/trytond_project_plan.egg-info/requires.txt
index 7752a72..dffedbc 100644
--- a/trytond_project_plan.egg-info/requires.txt
+++ b/trytond_project_plan.egg-info/requires.txt
@@ -1,4 +1,4 @@
-trytond_company >= 2.2, < 2.3
-trytond_project >= 2.2, < 2.3
-trytond_timesheet >= 2.2, < 2.3
-trytond >= 2.2, < 2.3
\ No newline at end of file
+trytond_company >= 2.4, < 2.5
+trytond_project >= 2.4, < 2.5
+trytond_timesheet >= 2.4, < 2.5
+trytond >= 2.4, < 2.5
\ No newline at end of file
diff --git a/work.py b/work.py
index ea436f0..d92782d 100644
--- a/work.py
+++ b/work.py
@@ -4,7 +4,7 @@ import datetime
from collections import deque, defaultdict
from heapq import heappop, heappush
from trytond.model import ModelView, ModelSQL, fields
-from trytond.wizard import Wizard
+from trytond.wizard import Wizard, StateTransition
from trytond.pyson import Eval
from trytond.transaction import Transaction
from trytond.pool import Pool
@@ -150,7 +150,6 @@ class Work(ModelSQL, ModelView):
leafs = parents
res['duration'] = durations
-
fun_fields = ('early_start_date', 'early_finish_date',
'late_start_date', 'late_finish_date',
'actual_start_date', 'actual_finish_date',
@@ -246,7 +245,7 @@ class Work(ModelSQL, ModelView):
db_field: value \
and datetime.datetime.combine(value,
datetime.time()) \
- or False,
+ or None,
})
break
@@ -271,10 +270,8 @@ class Work(ModelSQL, ModelView):
return date
def add_hours(self, company, date, hours):
- day_per_week = company.hours_per_work_week / company.hours_per_work_day
-
while hours:
- if hours != intfloor(hours):
+ if hours != intfloor(hours):
minutes = (hours - intfloor(hours)) * 60
date = self.add_minutes(company, date, minutes)
hours = intfloor(hours)
@@ -302,7 +299,7 @@ class Work(ModelSQL, ModelView):
day_per_week = company.hours_per_work_week / company.hours_per_work_day
while days:
- if days != intfloor(days):
+ if days != intfloor(days):
hours = (days - intfloor(days)) * company.hours_per_work_day
date = self.add_hours(company, date, hours)
days = intfloor(days)
@@ -315,7 +312,7 @@ class Work(ModelSQL, ModelView):
if weeks:
date = self.add_weeks(company, date, weeks)
- date += datetime.timedelta(days= -date.weekday() + intfloor(days))
+ date += datetime.timedelta(days=-date.weekday() + intfloor(days))
days = days - intfloor(days)
@@ -324,12 +321,12 @@ class Work(ModelSQL, ModelView):
def add_weeks(self, company, date, weeks):
day_per_week = company.hours_per_work_week / company.hours_per_work_day
- if weeks != intfloor(weeks):
+ if weeks != intfloor(weeks):
days = (weeks - intfloor(weeks)) * day_per_week
if days:
date = self.add_days(company, date, days)
- date += datetime.timedelta(days= 7 * intfloor(weeks))
+ date += datetime.timedelta(days=7 * intfloor(weeks))
return date
@@ -340,9 +337,8 @@ class Work(ModelSQL, ModelView):
'early_finish_time', work['early_finish_time'])
get_late_start = lambda work: values.get(work, {}).get(
'late_start_time', work['late_start_time'])
- maxdate = lambda x,y: x and y and max(x,y) or x or y
- mindate = lambda x,y: x and y and min(x,y) or x or y
-
+ maxdate = lambda x, y: x and y and max(x, y) or x or y
+ mindate = lambda x, y: x and y and min(x, y) or x or y
# propagate constraint_start_time
constraint_start = reduce(maxdate, (pred.early_finish_time \
@@ -523,7 +519,7 @@ class Work(ModelSQL, ModelView):
set(s.id for s in w.successors))
work = self.browse(work_id)
- parent_id = work.parent and work.parent.id or False
+ parent_id = work.parent and work.parent.id or None
sibling_ids = self.search([
('parent', '=', parent_id)
])
@@ -547,11 +543,13 @@ class Work(ModelSQL, ModelView):
# define some helper functions
get_key = lambda w: (set(p.id for p in w.predecessors),
set(s.id for s in w.successors))
- over_alloc = lambda current_alloc, work: \
- reduce(lambda res, alloc: res or current_alloc[alloc.employee.id] + \
- alloc.percentage > 100,
- work.allocations,
- False)
+ over_alloc = lambda current_alloc, work: (
+ reduce(lambda res, alloc: (res
+ or (current_alloc[alloc.employee.id]
+ + alloc.percentage) > 100),
+ work.allocations,
+ False))
+
def sum_allocs(current_alloc, work):
res = defaultdict(float)
for alloc in work.allocations:
@@ -598,13 +596,14 @@ class Work(ModelSQL, ModelView):
yield sibling, delay
work = self.browse(work_id)
- parent_id = work.parent and work.parent.id or False
+ parent_id = work.parent and work.parent.id or None
sibling_ids = self.search([
('parent', '=', parent_id)
])
refkey = get_key(work)
- siblings = [s for s in self.browse(sibling_ids) if get_key(s) == refkey]
+ siblings = [s for s in self.browse(sibling_ids)
+ if get_key(s) == refkey]
for sibling, delay in compute_delays(siblings):
self.write(sibling.id, {
@@ -630,7 +629,7 @@ class Work(ModelSQL, ModelView):
self.reset_leveling(work_id)
fields = ('constraint_start_time', 'constraint_finish_time',
'effort')
- if reduce(lambda x, y : x or y in values, fields, False):
+ if reduce(lambda x, y: x or y in values, fields, False):
for work_id in ids:
self.compute_dates(work_id)
return res
@@ -661,16 +660,15 @@ class Work(ModelSQL, ModelView):
Work()
-
class PredecessorSuccessor(ModelSQL):
'Predecessor - Successor'
_name = 'project.predecessor_successor'
_description = __doc__
predecessor = fields.Many2One('project.work', 'Predecessor',
- ondelete='CASCADE', required=True, select=1)
+ ondelete='CASCADE', required=True, select=True)
successor = fields.Many2One('project.work', 'Successor',
- ondelete='CASCADE', required=True, select=1)
+ ondelete='CASCADE', required=True, select=True)
def write(self, ids, values):
work_obj = Pool().get('project.work')
@@ -725,20 +723,12 @@ PredecessorSuccessor()
class Leveling(Wizard):
'Tasks Leveling'
_name = 'project_plan.work.leveling'
+ start_state = 'leveling'
+ leveling = StateTransition()
- states = {
- 'init': {
- 'result': {
- 'type': 'action',
- 'action': '_leveling',
- 'state': 'end',
- },
- },
- }
-
- def _leveling(self, data):
+ def transition_leveling(self, session):
work_obj = Pool().get('project.work')
- work_obj.create_leveling(data['id'])
- return {}
+ work_obj.create_leveling(Transaction().context['active_id'])
+ return 'end'
Leveling()
commit 8460572582ec664ebaa937bc5a3b90d69983528d
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Mon Oct 31 16:21:16 2011 +0100
Adding upstream version 2.2.0.
diff --git a/CHANGELOG b/CHANGELOG
index e9a6914..0db227b 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,4 +1,4 @@
-Version 2.0.1 - 2011-10-01
+Version 2.2.0 - 2011-10-25
* Bug fixes (see mercurial logs for details)
Version 2.0.0 - 2011-04-27
diff --git a/MANIFEST.in b/MANIFEST.in
index 7b252be..4aec982 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -6,5 +6,5 @@ include COPYRIGHT
include LICENSE
include *.xml
include *.odt
-include *.csv
+include locale/*.po
include doc/*
diff --git a/PKG-INFO b/PKG-INFO
index 990f470..e2c1551 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,29 +1,32 @@
Metadata-Version: 1.0
Name: trytond_project_plan
-Version: 2.0.1
+Version: 2.2.0
Summary: Add planning capabilities on projects.
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 7e8f281..41e4a8a 100644
--- a/__tryton__.py
+++ b/__tryton__.py
@@ -7,7 +7,7 @@
'name_es_CO': 'Planeación de Proyectos',
'name_es_ES': 'Planificación de proyecto',
'name_fr_FR': 'Planification de projet',
- 'version': '2.0.1',
+ 'version': '2.2.0',
'author': 'B2CK',
'email': 'info at b2ck.com',
'website': 'http://www.tryton.org/',
@@ -34,10 +34,13 @@
'allocation.xml',
],
'translation': [
- 'bg_BG.csv',
- 'de_DE.csv',
- 'es_CO.csv',
- 'es_ES.csv',
- 'fr_FR.csv',
+ 'locale/cs_CZ.po',
+ 'locale/bg_BG.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/allocation.py b/allocation.py
index fd4d5b2..c4910b0 100644
--- a/allocation.py
+++ b/allocation.py
@@ -1,6 +1,7 @@
#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.model import ModelView, ModelSQL, fields
+from trytond.pool import Pool
class Allocation(ModelSQL, ModelView):
@@ -19,7 +20,7 @@ class Allocation(ModelSQL, ModelView):
return 100
def write(self, ids, values):
- work_obj = self.pool.get('project.work')
+ work_obj = Pool().get('project.work')
res = super(Allocation, self).write(ids, values)
if isinstance(ids, (int, long)):
@@ -36,14 +37,14 @@ class Allocation(ModelSQL, ModelView):
return res
def create(self, values):
- work_obj = self.pool.get('project.work')
+ work_obj = Pool().get('project.work')
allocation_id = super(Allocation, self).create(values)
allocation = self.browse(allocation_id)
work_obj.reset_leveling(allocation.work.id)
work_obj.compute_dates(allocation.work.id)
def delete(self, ids):
- work_obj = self.pool.get('project.work')
+ work_obj = Pool().get('project.work')
allocations = self.browse(ids)
work_ids = [a.work.id for a in allocations]
res = super(Allocation, self).delete(ids)
diff --git a/bg_BG.csv b/bg_BG.csv
deleted file mode 100644
index e666071..0000000
--- a/bg_BG.csv
+++ /dev/null
@@ -1,41 +0,0 @@
-type,name,res_id,src,value,fuzzy
-error,project.work,0,You can not create recursive dependencies!,Не може да създавате взаимно вложени зависимости!,0
-field,"project.allocation,employee",0,Employee,Служител,0
-field,"project.allocation,percentage",0,Percentage,Процент,0
-field,"project.allocation,rec_name",0,Name,Име,0
-field,"project.allocation,work",0,Work,Задача,0
-field,"project.predecessor_successor,predecessor",0,Predecessor,Предшественик,0
-field,"project.predecessor_successor,rec_name",0,Name,Име,0
-field,"project.predecessor_successor,successor",0,Successor,Наследник,0
-field,"project.work,actual_finish_date",0,Actual Finish,Действително завършване,0
-field,"project.work,actual_finish_time",0,Actual Finish Time,Време на действително завършване,0
-field,"project.work,actual_start_date",0,Actual Start,Дейсъвително започване,0
-field,"project.work,actual_start_time",0,Actual Start Time,Време на действително започване,0
-field,"project.work,allocations",0,Allocations,Разпределения,0
-field,"project.work,back_leveling_delay",0,Leveling Delay,Изравняване на закъснение,0
-field,"project.work,constraint_finish_date",0,Constraint Finish,Ограничение за край,0
-field,"project.work,constraint_finish_time",0,Constraint Finish Time,Ограничение за време на завършване,0
-field,"project.work,constraint_start_date",0,Constraint Start,Ограничение за начало,0
-field,"project.work,constraint_start_time",0,Constraint Start Time,Ограничение за начално време,0
-field,"project.work,duration",0,Duration,Продължителност,0
-field,"project.work,early_finish_date",0,Early Finish,По-рано завършване,0
-field,"project.work,early_finish_time",0,Early Finish Time,Време на по-рано приключване,0
-field,"project.work,early_start_date",0,Early Start,По-рано начало,0
-field,"project.work,early_start_time",0,Early Start Time,По-ранно време на започване,0
-field,"project.work,late_finish_date",0,Late Finish,По-късно завършване,0
-field,"project.work,late_finish_time",0,Late Finish Time,Време на по-късно завършване,0
-field,"project.work,late_start_date",0,Late Start,По-късно начало ,0
-field,"project.work,late_start_time",0,Late Start Time,Време на по-късно начало,0
-field,"project.work,leveling_delay",0,Leveling Delay,Изравняване на закъснение,0
-field,"project.work,predecessors",0,Predecessors,Предшественици,0
-field,"project.work,requests",0,Requests,Заявки,0
-field,"project.work,successors",0,Successors,Наследници,0
-model,"ir.action,name",wizard_leveling,Tasks Leveling,Изравняване на задачи,0
-model,"project.allocation,name",0,Allocation,Разпределние,0
-model,"project.predecessor_successor,name",0,Predecessor - Successor,Предшественик - Наследник,0
-model,"res.request.link,name",request_link_work,Work,Задача,0
-view,project.allocation,0,Allocation,Разпределение,0
-view,project.allocation,0,Allocations,Разпределения,0
-view,project.work,0,Allocations,Разпределения,0
-view,project.work,0,Plan,План,0
-view,project.work,0,Requests,Заявки,0
diff --git a/de_DE.csv b/de_DE.csv
deleted file mode 100644
index 578e53f..0000000
--- a/de_DE.csv
+++ /dev/null
@@ -1,41 +0,0 @@
-type,name,res_id,src,value,fuzzy
-error,project.work,0,You can not create recursive dependencies!,Abhängigkeiten können nicht rekursiv angelegt werden!,0
-field,"project.allocation,employee",0,Employee,Mitarbeiter,0
-field,"project.allocation,percentage",0,Percentage,Prozentsatz,0
-field,"project.allocation,rec_name",0,Name,Name,0
-field,"project.allocation,work",0,Work,Arbeit,0
-field,"project.predecessor_successor,predecessor",0,Predecessor,Vorgänger,0
-field,"project.predecessor_successor,rec_name",0,Name,Name,0
-field,"project.predecessor_successor,successor",0,Successor,Nachfolger,0
-field,"project.work,actual_finish_date",0,Actual Finish,Tatsächliches Enddatum,0
-field,"project.work,actual_finish_time",0,Actual Finish Time,Tatsächliche Endzeit,0
-field,"project.work,actual_start_date",0,Actual Start,Tatsächliches Startdatum,0
-field,"project.work,actual_start_time",0,Actual Start Time,Tatsächliche Startzeit,0
-field,"project.work,allocations",0,Allocations,Zuordnungen,0
-field,"project.work,back_leveling_delay",0,Leveling Delay,Verzögerung Abgleich,0
-field,"project.work,constraint_finish_date",0,Constraint Finish,Fixes Enddatum,0
-field,"project.work,constraint_finish_time",0,Constraint Finish Time,Fixe Endzeit,0
-field,"project.work,constraint_start_date",0,Constraint Start,Fixes Startdatum,0
-field,"project.work,constraint_start_time",0,Constraint Start Time,Fixe Startzeit,0
-field,"project.work,duration",0,Duration,Dauer,0
-field,"project.work,early_finish_date",0,Early Finish,Frühestes Enddatum,0
-field,"project.work,early_finish_time",0,Early Finish Time,Früheste Endzeit,0
-field,"project.work,early_start_date",0,Early Start,Frühestes Startdatum,0
-field,"project.work,early_start_time",0,Early Start Time,Früheste Startzeit,0
-field,"project.work,late_finish_date",0,Late Finish,Spätestes Enddatum,0
-field,"project.work,late_finish_time",0,Late Finish Time,Späteste Endzeit,0
-field,"project.work,late_start_date",0,Late Start,Spätestes Startdatum,0
-field,"project.work,late_start_time",0,Late Start Time,Späteste Startzeit,0
-field,"project.work,leveling_delay",0,Leveling Delay,Verzögerung Abgleich,0
-field,"project.work,predecessors",0,Predecessors,Vorgänger,0
-field,"project.work,requests",0,Requests,Anfragen,0
-field,"project.work,successors",0,Successors,Nachfolger,0
-model,"ir.action,name",wizard_leveling,Tasks Leveling,Aufgaben abgleichen,0
-model,"project.allocation,name",0,Allocation,Zuordnung,0
-model,"project.predecessor_successor,name",0,Predecessor - Successor,Vorgänger - Nachfolger,0
-model,"res.request.link,name",request_link_work,Work,Arbeit,0
-view,project.allocation,0,Allocation,Zuordnung,0
-view,project.allocation,0,Allocations,Zuordnungen,0
-view,project.work,0,Allocations,Zuordnungen,0
-view,project.work,0,Plan,Plan,0
-view,project.work,0,Requests,Anfragen,0
diff --git a/doc/index.rst b/doc/index.rst
index ffad83d..a150590 100644
--- a/doc/index.rst
+++ b/doc/index.rst
@@ -6,7 +6,7 @@ module.
Allocation
-##########
+**********
An allocation links together an employee, a task and a percentage. It
defines which part of his time the employee should dedicate to this
@@ -14,7 +14,7 @@ task.
Work
-####
+****
The Work model is extended to support planning features:
diff --git a/es_CO.csv b/es_CO.csv
deleted file mode 100644
index a4f0202..0000000
--- a/es_CO.csv
+++ /dev/null
@@ -1,41 +0,0 @@
-type,name,res_id,src,value,fuzzy
-error,project.work,0,You can not create recursive dependencies!,¡No puede crear dependencias recursivas!,0
-field,"project.allocation,employee",0,Employee,Empleado,0
-field,"project.allocation,percentage",0,Percentage,Porcentaje,0
-field,"project.allocation,rec_name",0,Name,Nombre,0
-field,"project.allocation,work",0,Work,Trabajo,0
-field,"project.predecessor_successor,predecessor",0,Predecessor,Predecesor,0
-field,"project.predecessor_successor,rec_name",0,Name,Nombre,0
-field,"project.predecessor_successor,successor",0,Successor,Sucesor,0
-field,"project.work,actual_finish_date",0,Actual Finish,Fin Actual,0
-field,"project.work,actual_finish_time",0,Actual Finish Time,Tiempo del Actual Fin,0
-field,"project.work,actual_start_date",0,Actual Start,Comienzo Actual,0
-field,"project.work,actual_start_time",0,Actual Start Time,Tiempo del Actual Comienzo,0
-field,"project.work,allocations",0,Allocations,Cuotas,0
-field,"project.work,back_leveling_delay",0,Leveling Delay,Retardo de Escalamiento,0
-field,"project.work,constraint_finish_date",0,Constraint Finish,Final de la Restricción,0
-field,"project.work,constraint_finish_time",0,Constraint Finish Time,Tiempo Final de la Restricción,0
-field,"project.work,constraint_start_date",0,Constraint Start,Comienzo de la Restricción,0
-field,"project.work,constraint_start_time",0,Constraint Start Time,Tiempo del Comienzo de la Restricción,0
-field,"project.work,duration",0,Duration,Duración,0
-field,"project.work,early_finish_date",0,Early Finish,Final Temprano,0
-field,"project.work,early_finish_time",0,Early Finish Time,Tiempo del Temprano Final,0
-field,"project.work,early_start_date",0,Early Start,Comienzo Temprano,0
-field,"project.work,early_start_time",0,Early Start Time,Tiempo el Temprano Comienzo,0
-field,"project.work,late_finish_date",0,Late Finish,Final Tardío,0
-field,"project.work,late_finish_time",0,Late Finish Time,Tiempo del Tardío Final,0
-field,"project.work,late_start_date",0,Late Start,Comienzo Tardío,0
-field,"project.work,late_start_time",0,Late Start Time,Tiempo del Tardío Comienzo,0
-field,"project.work,leveling_delay",0,Leveling Delay,Retardo del Escalamiento,0
-field,"project.work,predecessors",0,Predecessors,Predecesores,0
-field,"project.work,requests",0,Requests,Solicitudes,0
-field,"project.work,successors",0,Successors,Sucesores,0
-model,"ir.action,name",wizard_leveling,Tasks Leveling,Escalamiento de Tareas,0
-model,"project.allocation,name",0,Allocation,Cuotas,0
-model,"project.predecessor_successor,name",0,Predecessor - Successor,Predecesor - Sucesor,0
-model,"res.request.link,name",request_link_work,Work,Trabajo,0
-view,project.allocation,0,Allocation,Cuota,0
-view,project.allocation,0,Allocations,Cuotas,0
-view,project.work,0,Allocations,Cuotas,0
-view,project.work,0,Plan,Plan,0
-view,project.work,0,Requests,Solicitudes,0
diff --git a/es_ES.csv b/es_ES.csv
deleted file mode 100644
index 3a2f21c..0000000
--- a/es_ES.csv
+++ /dev/null
@@ -1,41 +0,0 @@
-type,name,res_id,src,value,fuzzy
-error,project.work,0,You can not create recursive dependencies!,No puede crear dependencias recursivas,0
-field,"project.allocation,employee",0,Employee,Empleado,0
-field,"project.allocation,percentage",0,Percentage,Porcentaje,0
-field,"project.allocation,rec_name",0,Name,Nombre,0
-field,"project.allocation,work",0,Work,Actividad,0
-field,"project.predecessor_successor,predecessor",0,Predecessor,Predecesor,0
-field,"project.predecessor_successor,rec_name",0,Name,Nombre,0
-field,"project.predecessor_successor,successor",0,Successor,Sucesor,0
-field,"project.work,actual_finish_date",0,Actual Finish,Finalización real,0
-field,"project.work,actual_finish_time",0,Actual Finish Time,Hora de finalización real,0
-field,"project.work,actual_start_date",0,Actual Start,Inicio real,0
-field,"project.work,actual_start_time",0,Actual Start Time,Hora de inicio real,0
-field,"project.work,allocations",0,Allocations,Asignaciones,0
-field,"project.work,back_leveling_delay",0,Leveling Delay,Retraso de la nivelación,0
-field,"project.work,constraint_finish_date",0,Constraint Finish,Restricción de finalización,0
-field,"project.work,constraint_finish_time",0,Constraint Finish Time,Restricción de hora de finalización,0
-field,"project.work,constraint_start_date",0,Constraint Start,Restricción de inicio,0
-field,"project.work,constraint_start_time",0,Constraint Start Time,Restricción de tiempo de inicio,0
-field,"project.work,duration",0,Duration,Duración,0
-field,"project.work,early_finish_date",0,Early Finish,Finalización prematura,0
-field,"project.work,early_finish_time",0,Early Finish Time,Hora de finalización prematura,0
-field,"project.work,early_start_date",0,Early Start,Inicio prematuro,0
-field,"project.work,early_start_time",0,Early Start Time,Tiempo de inicio prematuro,0
-field,"project.work,late_finish_date",0,Late Finish,,0
-field,"project.work,late_finish_time",0,Late Finish Time,Hora de finalización tardía,0
-field,"project.work,late_start_date",0,Late Start,Inicio tardío,0
-field,"project.work,late_start_time",0,Late Start Time,Hora de inicio tardía,0
-field,"project.work,leveling_delay",0,Leveling Delay,Retraso de nivelación,0
-field,"project.work,predecessors",0,Predecessors,Predecesores,0
-field,"project.work,requests",0,Requests,Solicitudes,0
-field,"project.work,successors",0,Successors,Sucesores,0
-model,"ir.action,name",wizard_leveling,Tasks Leveling,Nivelación de tareas,0
-model,"project.allocation,name",0,Allocation,Asignación,0
-model,"project.predecessor_successor,name",0,Predecessor - Successor,Predecesor - Sucesor,0
-model,"res.request.link,name",request_link_work,Work,Actividad,0
-view,project.allocation,0,Allocation,Asignación,0
-view,project.allocation,0,Allocations,Asignaciones,0
-view,project.work,0,Allocations,Asignaciones,0
-view,project.work,0,Plan,Plan,0
-view,project.work,0,Requests,Solicitudes,0
diff --git a/fr_FR.csv b/fr_FR.csv
deleted file mode 100644
index 6116795..0000000
--- a/fr_FR.csv
+++ /dev/null
@@ -1,41 +0,0 @@
-type,name,res_id,src,value,fuzzy
-error,project.work,0,You can not create recursive dependencies!,Vous ne pouvez pas créer des dépendances récursives !,0
-field,"project.allocation,employee",0,Employee,Employé,1
-field,"project.allocation,percentage",0,Percentage,Pourcentage,1
-field,"project.allocation,rec_name",0,Name,Nom,1
-field,"project.allocation,work",0,Work,Tâche,1
-field,"project.predecessor_successor,predecessor",0,Predecessor,Prédécesseur,0
-field,"project.predecessor_successor,rec_name",0,Name,Nom,1
-field,"project.predecessor_successor,successor",0,Successor,Successeur,0
-field,"project.work,actual_finish_date",0,Actual Finish,Fin réelle,0
-field,"project.work,actual_finish_time",0,Actual Finish Time,Fin réelle,0
-field,"project.work,actual_start_date",0,Actual Start,Début réel,0
-field,"project.work,actual_start_time",0,Actual Start Time,Début réel,0
-field,"project.work,allocations",0,Allocations,Répartitions,0
-field,"project.work,back_leveling_delay",0,Leveling Delay,Délais de décalage,0
-field,"project.work,constraint_finish_date",0,Constraint Finish,Fin imposée,0
-field,"project.work,constraint_finish_time",0,Constraint Finish Time,Fin imposée,0
-field,"project.work,constraint_start_date",0,Constraint Start,Début imposé,0
-field,"project.work,constraint_start_time",0,Constraint Start Time,Début imposé,0
-field,"project.work,duration",0,Duration,Durée,0
-field,"project.work,early_finish_date",0,Early Finish,Fin au plus tôt,0
-field,"project.work,early_finish_time",0,Early Finish Time,Fin au plus tôt,0
-field,"project.work,early_start_date",0,Early Start,Départ au plus tôt,0
-field,"project.work,early_start_time",0,Early Start Time,Départ au plus tôt,0
-field,"project.work,late_finish_date",0,Late Finish,Fin au plus tard,0
-field,"project.work,late_finish_time",0,Late Finish Time,Fin au plus tard,0
-field,"project.work,late_start_date",0,Late Start,Début au plus tard,0
-field,"project.work,late_start_time",0,Late Start Time,au plus tard,0
-field,"project.work,leveling_delay",0,Leveling Delay,Délais décalage,0
-field,"project.work,predecessors",0,Predecessors,Prédécesseurs,0
-field,"project.work,requests",0,Requests,Demandes,1
-field,"project.work,successors",0,Successors,Successeurs,0
-model,"ir.action,name",wizard_leveling,Tasks Leveling,Décalage des tâches,0
-model,"project.allocation,name",0,Allocation,Répartition,0
-model,"project.predecessor_successor,name",0,Predecessor - Successor,Prédécesseur - Successeur,0
-model,"res.request.link,name",request_link_work,Work,Tâche,1
-view,project.allocation,0,Allocation,Répartition,0
-view,project.allocation,0,Allocations,Répartitions,0
-view,project.work,0,Allocations,Répartitions,0
-view,project.work,0,Plan,Planification,0
-view,project.work,0,Requests,Demandes,1
diff --git a/locale/bg_BG.po b/locale/bg_BG.po
new file mode 100644
index 0000000..ce7af6b
--- /dev/null
+++ b/locale/bg_BG.po
@@ -0,0 +1,163 @@
+#
+msgid ""
+msgstr "Content-Type: text/plain; charset=utf-8\n"
+
+msgctxt "error:project.work:0"
+msgid "You can not create recursive dependencies!"
+msgstr "Не може да създавате взаимно вложени зависимости!"
+
+msgctxt "field:project.allocation,employee:0"
+msgid "Employee"
+msgstr "Служител"
+
+msgctxt "field:project.allocation,percentage:0"
+msgid "Percentage"
+msgstr "Процент"
+
+msgctxt "field:project.allocation,rec_name:0"
+msgid "Name"
+msgstr "Име"
+
+msgctxt "field:project.allocation,work:0"
+msgid "Work"
+msgstr "Задача"
+
+msgctxt "field:project.predecessor_successor,predecessor:0"
+msgid "Predecessor"
+msgstr "Предшественик"
+
+msgctxt "field:project.predecessor_successor,rec_name:0"
+msgid "Name"
+msgstr "Име"
+
+msgctxt "field:project.predecessor_successor,successor:0"
+msgid "Successor"
+msgstr "Наследник"
+
+msgctxt "field:project.work,actual_finish_date:0"
+msgid "Actual Finish"
+msgstr "Действително завършване"
+
+msgctxt "field:project.work,actual_finish_time:0"
+msgid "Actual Finish Time"
+msgstr "Време на действително завършване"
+
+msgctxt "field:project.work,actual_start_date:0"
+msgid "Actual Start"
+msgstr "Дейсъвително започване"
+
+msgctxt "field:project.work,actual_start_time:0"
+msgid "Actual Start Time"
+msgstr "Време на действително започване"
+
+msgctxt "field:project.work,allocations:0"
+msgid "Allocations"
+msgstr "Разпределения"
+
+msgctxt "field:project.work,back_leveling_delay:0"
+msgid "Leveling Delay"
+msgstr "Изравняване на закъснение"
+
+msgctxt "field:project.work,constraint_finish_date:0"
+msgid "Constraint Finish"
+msgstr "Ограничение за край"
+
+msgctxt "field:project.work,constraint_finish_time:0"
+msgid "Constraint Finish Time"
+msgstr "Ограничение за време на завършване"
+
+msgctxt "field:project.work,constraint_start_date:0"
+msgid "Constraint Start"
+msgstr "Ограничение за начало"
+
+msgctxt "field:project.work,constraint_start_time:0"
+msgid "Constraint Start Time"
+msgstr "Ограничение за начално време"
+
+msgctxt "field:project.work,duration:0"
+msgid "Duration"
+msgstr "Продължителност"
+
+msgctxt "field:project.work,early_finish_date:0"
+msgid "Early Finish"
+msgstr "По-рано завършване"
+
+msgctxt "field:project.work,early_finish_time:0"
+msgid "Early Finish Time"
+msgstr "Време на по-рано приключване"
+
+msgctxt "field:project.work,early_start_date:0"
+msgid "Early Start"
+msgstr "По-рано начало"
+
+msgctxt "field:project.work,early_start_time:0"
+msgid "Early Start Time"
+msgstr "По-ранно време на започване"
+
+msgctxt "field:project.work,late_finish_date:0"
+msgid "Late Finish"
+msgstr "По-късно завършване"
+
+msgctxt "field:project.work,late_finish_time:0"
+msgid "Late Finish Time"
+msgstr "Време на по-късно завършване"
+
+msgctxt "field:project.work,late_start_date:0"
+msgid "Late Start"
+msgstr "По-късно начало "
+
+msgctxt "field:project.work,late_start_time:0"
+msgid "Late Start Time"
+msgstr "Време на по-късно начало"
+
+msgctxt "field:project.work,leveling_delay:0"
+msgid "Leveling Delay"
+msgstr "Изравняване на закъснение"
+
+msgctxt "field:project.work,predecessors:0"
+msgid "Predecessors"
+msgstr "Предшественици"
+
+msgctxt "field:project.work,requests:0"
+msgid "Requests"
+msgstr "Заявки"
+
+msgctxt "field:project.work,successors:0"
+msgid "Successors"
+msgstr "Наследници"
+
+msgctxt "model:ir.action,name:wizard_leveling"
+msgid "Tasks Leveling"
+msgstr "Изравняване на задачи"
+
+msgctxt "model:project.allocation,name:0"
+msgid "Allocation"
+msgstr "Разпределние"
+
+msgctxt "model:project.predecessor_successor,name:0"
+msgid "Predecessor - Successor"
+msgstr "Предшественик - Наследник"
+
+msgctxt "model:res.request.link,name:request_link_work"
+msgid "Work"
+msgstr "Задача"
+
+msgctxt "view:project.allocation:0"
+msgid "Allocation"
+msgstr "Разпределение"
+
+msgctxt "view:project.allocation:0"
+msgid "Allocations"
+msgstr "Разпределения"
+
+msgctxt "view:project.work:0"
+msgid "Allocations"
+msgstr "Разпределения"
+
+msgctxt "view:project.work:0"
+msgid "Plan"
+msgstr "План"
+
+msgctxt "view:project.work:0"
+msgid "Requests"
+msgstr "Заявки"
diff --git a/locale/cs_CZ.po b/locale/cs_CZ.po
new file mode 100644
index 0000000..15edbb7
--- /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 "You can not create recursive dependencies!"
+msgstr ""
+
+msgctxt "field:project.allocation,employee:0"
+msgid "Employee"
+msgstr ""
+
+msgctxt "field:project.allocation,percentage:0"
+msgid "Percentage"
+msgstr ""
+
+msgctxt "field:project.allocation,rec_name:0"
+msgid "Name"
+msgstr ""
+
+msgctxt "field:project.allocation,work:0"
+msgid "Work"
+msgstr ""
+
+msgctxt "field:project.predecessor_successor,predecessor:0"
+msgid "Predecessor"
+msgstr ""
+
+msgctxt "field:project.predecessor_successor,rec_name:0"
+msgid "Name"
+msgstr ""
+
+msgctxt "field:project.predecessor_successor,successor:0"
+msgid "Successor"
+msgstr ""
+
+msgctxt "field:project.work,actual_finish_date:0"
+msgid "Actual Finish"
+msgstr ""
+
+msgctxt "field:project.work,actual_finish_time:0"
+msgid "Actual Finish Time"
+msgstr ""
+
+msgctxt "field:project.work,actual_start_date:0"
+msgid "Actual Start"
+msgstr ""
+
+msgctxt "field:project.work,actual_start_time:0"
+msgid "Actual Start Time"
+msgstr ""
+
+msgctxt "field:project.work,allocations:0"
+msgid "Allocations"
+msgstr ""
+
+msgctxt "field:project.work,back_leveling_delay:0"
+msgid "Leveling Delay"
+msgstr ""
+
+msgctxt "field:project.work,constraint_finish_date:0"
+msgid "Constraint Finish"
+msgstr ""
+
+msgctxt "field:project.work,constraint_finish_time:0"
+msgid "Constraint Finish Time"
+msgstr ""
+
+msgctxt "field:project.work,constraint_start_date:0"
+msgid "Constraint Start"
+msgstr ""
+
+msgctxt "field:project.work,constraint_start_time:0"
+msgid "Constraint Start Time"
+msgstr ""
+
+msgctxt "field:project.work,duration:0"
+msgid "Duration"
+msgstr ""
+
+msgctxt "field:project.work,early_finish_date:0"
+msgid "Early Finish"
+msgstr ""
+
+msgctxt "field:project.work,early_finish_time:0"
+msgid "Early Finish Time"
+msgstr ""
+
+msgctxt "field:project.work,early_start_date:0"
+msgid "Early Start"
+msgstr ""
+
+msgctxt "field:project.work,early_start_time:0"
+msgid "Early Start Time"
+msgstr ""
+
+msgctxt "field:project.work,late_finish_date:0"
+msgid "Late Finish"
+msgstr ""
+
+msgctxt "field:project.work,late_finish_time:0"
+msgid "Late Finish Time"
+msgstr ""
+
+msgctxt "field:project.work,late_start_date:0"
+msgid "Late Start"
+msgstr ""
+
+msgctxt "field:project.work,late_start_time:0"
+msgid "Late Start Time"
+msgstr ""
+
+msgctxt "field:project.work,leveling_delay:0"
+msgid "Leveling Delay"
+msgstr ""
+
+msgctxt "field:project.work,predecessors:0"
+msgid "Predecessors"
+msgstr ""
+
+msgctxt "field:project.work,requests:0"
+msgid "Requests"
+msgstr ""
+
+msgctxt "field:project.work,successors:0"
+msgid "Successors"
+msgstr ""
+
+msgctxt "model:ir.action,name:wizard_leveling"
+msgid "Tasks Leveling"
+msgstr ""
+
+msgctxt "model:project.allocation,name:0"
+msgid "Allocation"
+msgstr ""
+
+msgctxt "model:project.predecessor_successor,name:0"
+msgid "Predecessor - Successor"
+msgstr ""
+
+msgctxt "model:res.request.link,name:request_link_work"
+msgid "Work"
+msgstr ""
+
+msgctxt "view:project.allocation:0"
+msgid "Allocation"
+msgstr ""
+
+msgctxt "view:project.allocation:0"
+msgid "Allocations"
+msgstr ""
+
+msgctxt "view:project.work:0"
+msgid "Allocations"
+msgstr ""
+
+msgctxt "view:project.work:0"
+msgid "Plan"
+msgstr ""
+
+msgctxt "view:project.work:0"
+msgid "Requests"
+msgstr ""
diff --git a/locale/de_DE.po b/locale/de_DE.po
new file mode 100644
index 0000000..401ee5b
--- /dev/null
+++ b/locale/de_DE.po
@@ -0,0 +1,163 @@
+#
+msgid ""
+msgstr "Content-Type: text/plain; charset=utf-8\n"
+
+msgctxt "error:project.work:0"
+msgid "You can not create recursive dependencies!"
+msgstr "Abhängigkeiten können nicht rekursiv angelegt werden!"
+
+msgctxt "field:project.allocation,employee:0"
+msgid "Employee"
+msgstr "Mitarbeiter"
+
+msgctxt "field:project.allocation,percentage:0"
+msgid "Percentage"
+msgstr "Prozentsatz"
+
+msgctxt "field:project.allocation,rec_name:0"
+msgid "Name"
+msgstr "Name"
+
+msgctxt "field:project.allocation,work:0"
+msgid "Work"
+msgstr "Arbeit"
+
+msgctxt "field:project.predecessor_successor,predecessor:0"
+msgid "Predecessor"
+msgstr "Vorgänger"
+
+msgctxt "field:project.predecessor_successor,rec_name:0"
+msgid "Name"
+msgstr "Name"
+
+msgctxt "field:project.predecessor_successor,successor:0"
+msgid "Successor"
+msgstr "Nachfolger"
+
+msgctxt "field:project.work,actual_finish_date:0"
+msgid "Actual Finish"
+msgstr "Tatsächliches Enddatum"
+
+msgctxt "field:project.work,actual_finish_time:0"
+msgid "Actual Finish Time"
+msgstr "Tatsächliche Endzeit"
+
+msgctxt "field:project.work,actual_start_date:0"
+msgid "Actual Start"
+msgstr "Tatsächliches Startdatum"
+
+msgctxt "field:project.work,actual_start_time:0"
+msgid "Actual Start Time"
+msgstr "Tatsächliche Startzeit"
+
+msgctxt "field:project.work,allocations:0"
+msgid "Allocations"
+msgstr "Zuordnungen"
+
+msgctxt "field:project.work,back_leveling_delay:0"
+msgid "Leveling Delay"
+msgstr "Verzögerung Abgleich"
+
+msgctxt "field:project.work,constraint_finish_date:0"
+msgid "Constraint Finish"
+msgstr "Fixes Enddatum"
+
+msgctxt "field:project.work,constraint_finish_time:0"
+msgid "Constraint Finish Time"
+msgstr "Fixe Endzeit"
+
+msgctxt "field:project.work,constraint_start_date:0"
+msgid "Constraint Start"
+msgstr "Fixes Startdatum"
+
+msgctxt "field:project.work,constraint_start_time:0"
+msgid "Constraint Start Time"
+msgstr "Fixe Startzeit"
+
+msgctxt "field:project.work,duration:0"
+msgid "Duration"
+msgstr "Dauer"
+
+msgctxt "field:project.work,early_finish_date:0"
+msgid "Early Finish"
+msgstr "Frühestes Enddatum"
+
+msgctxt "field:project.work,early_finish_time:0"
+msgid "Early Finish Time"
+msgstr "Früheste Endzeit"
+
+msgctxt "field:project.work,early_start_date:0"
+msgid "Early Start"
+msgstr "Frühestes Startdatum"
+
+msgctxt "field:project.work,early_start_time:0"
+msgid "Early Start Time"
+msgstr "Früheste Startzeit"
+
+msgctxt "field:project.work,late_finish_date:0"
+msgid "Late Finish"
+msgstr "Spätestes Enddatum"
+
+msgctxt "field:project.work,late_finish_time:0"
+msgid "Late Finish Time"
+msgstr "Späteste Endzeit"
+
+msgctxt "field:project.work,late_start_date:0"
+msgid "Late Start"
+msgstr "Spätestes Startdatum"
+
+msgctxt "field:project.work,late_start_time:0"
+msgid "Late Start Time"
+msgstr "Späteste Startzeit"
+
+msgctxt "field:project.work,leveling_delay:0"
+msgid "Leveling Delay"
+msgstr "Verzögerung Abgleich"
+
+msgctxt "field:project.work,predecessors:0"
+msgid "Predecessors"
+msgstr "Vorgänger"
+
+msgctxt "field:project.work,requests:0"
+msgid "Requests"
+msgstr "Anfragen"
+
+msgctxt "field:project.work,successors:0"
+msgid "Successors"
+msgstr "Nachfolger"
+
+msgctxt "model:ir.action,name:wizard_leveling"
+msgid "Tasks Leveling"
+msgstr "Aufgaben abgleichen"
+
+msgctxt "model:project.allocation,name:0"
+msgid "Allocation"
+msgstr "Zuordnung"
+
+msgctxt "model:project.predecessor_successor,name:0"
+msgid "Predecessor - Successor"
+msgstr "Vorgänger - Nachfolger"
+
+msgctxt "model:res.request.link,name:request_link_work"
+msgid "Work"
+msgstr "Arbeit"
+
+msgctxt "view:project.allocation:0"
+msgid "Allocation"
+msgstr "Zuordnung"
+
+msgctxt "view:project.allocation:0"
+msgid "Allocations"
+msgstr "Zuordnungen"
+
+msgctxt "view:project.work:0"
+msgid "Allocations"
+msgstr "Zuordnungen"
+
+msgctxt "view:project.work:0"
+msgid "Plan"
+msgstr "Plan"
+
+msgctxt "view:project.work:0"
+msgid "Requests"
+msgstr "Anfragen"
diff --git a/locale/es_CO.po b/locale/es_CO.po
new file mode 100644
index 0000000..6005342
--- /dev/null
+++ b/locale/es_CO.po
@@ -0,0 +1,163 @@
+#
+msgid ""
+msgstr "Content-Type: text/plain; charset=utf-8\n"
+
+msgctxt "error:project.work:0"
+msgid "You can not create recursive dependencies!"
+msgstr "¡No puede crear dependencias recursivas!"
+
+msgctxt "field:project.allocation,employee:0"
+msgid "Employee"
+msgstr "Empleado"
+
+msgctxt "field:project.allocation,percentage:0"
+msgid "Percentage"
+msgstr "Porcentaje"
+
+msgctxt "field:project.allocation,rec_name:0"
+msgid "Name"
+msgstr "Nombre"
+
+msgctxt "field:project.allocation,work:0"
+msgid "Work"
+msgstr "Trabajo"
+
+msgctxt "field:project.predecessor_successor,predecessor:0"
+msgid "Predecessor"
+msgstr "Predecesor"
+
+msgctxt "field:project.predecessor_successor,rec_name:0"
+msgid "Name"
+msgstr "Nombre"
+
+msgctxt "field:project.predecessor_successor,successor:0"
+msgid "Successor"
+msgstr "Sucesor"
+
+msgctxt "field:project.work,actual_finish_date:0"
+msgid "Actual Finish"
+msgstr "Fin Actual"
+
+msgctxt "field:project.work,actual_finish_time:0"
+msgid "Actual Finish Time"
+msgstr "Tiempo del Actual Fin"
+
+msgctxt "field:project.work,actual_start_date:0"
+msgid "Actual Start"
+msgstr "Comienzo Actual"
+
+msgctxt "field:project.work,actual_start_time:0"
+msgid "Actual Start Time"
+msgstr "Tiempo del Actual Comienzo"
+
+msgctxt "field:project.work,allocations:0"
+msgid "Allocations"
+msgstr "Cuotas"
+
+msgctxt "field:project.work,back_leveling_delay:0"
+msgid "Leveling Delay"
+msgstr "Retardo de Escalamiento"
+
+msgctxt "field:project.work,constraint_finish_date:0"
+msgid "Constraint Finish"
+msgstr "Final de la Restricción"
+
+msgctxt "field:project.work,constraint_finish_time:0"
+msgid "Constraint Finish Time"
+msgstr "Tiempo Final de la Restricción"
+
+msgctxt "field:project.work,constraint_start_date:0"
+msgid "Constraint Start"
+msgstr "Comienzo de la Restricción"
+
+msgctxt "field:project.work,constraint_start_time:0"
+msgid "Constraint Start Time"
+msgstr "Tiempo del Comienzo de la Restricción"
+
+msgctxt "field:project.work,duration:0"
+msgid "Duration"
+msgstr "Duración"
+
+msgctxt "field:project.work,early_finish_date:0"
+msgid "Early Finish"
+msgstr "Final Temprano"
+
+msgctxt "field:project.work,early_finish_time:0"
+msgid "Early Finish Time"
+msgstr "Tiempo del Temprano Final"
+
+msgctxt "field:project.work,early_start_date:0"
+msgid "Early Start"
+msgstr "Comienzo Temprano"
+
+msgctxt "field:project.work,early_start_time:0"
+msgid "Early Start Time"
+msgstr "Tiempo el Temprano Comienzo"
+
+msgctxt "field:project.work,late_finish_date:0"
+msgid "Late Finish"
+msgstr "Final Tardío"
+
+msgctxt "field:project.work,late_finish_time:0"
+msgid "Late Finish Time"
+msgstr "Tiempo del Tardío Final"
+
+msgctxt "field:project.work,late_start_date:0"
+msgid "Late Start"
+msgstr "Comienzo Tardío"
+
+msgctxt "field:project.work,late_start_time:0"
+msgid "Late Start Time"
+msgstr "Tiempo del Tardío Comienzo"
+
+msgctxt "field:project.work,leveling_delay:0"
+msgid "Leveling Delay"
+msgstr "Retardo del Escalamiento"
+
+msgctxt "field:project.work,predecessors:0"
+msgid "Predecessors"
+msgstr "Predecesores"
+
+msgctxt "field:project.work,requests:0"
+msgid "Requests"
+msgstr "Solicitudes"
+
+msgctxt "field:project.work,successors:0"
+msgid "Successors"
+msgstr "Sucesores"
+
+msgctxt "model:ir.action,name:wizard_leveling"
+msgid "Tasks Leveling"
+msgstr "Escalamiento de Tareas"
+
+msgctxt "model:project.allocation,name:0"
+msgid "Allocation"
+msgstr "Cuotas"
+
+msgctxt "model:project.predecessor_successor,name:0"
+msgid "Predecessor - Successor"
+msgstr "Predecesor - Sucesor"
+
+msgctxt "model:res.request.link,name:request_link_work"
+msgid "Work"
+msgstr "Trabajo"
+
+msgctxt "view:project.allocation:0"
+msgid "Allocation"
+msgstr "Cuota"
+
+msgctxt "view:project.allocation:0"
+msgid "Allocations"
+msgstr "Cuotas"
+
+msgctxt "view:project.work:0"
+msgid "Allocations"
+msgstr "Cuotas"
+
+msgctxt "view:project.work:0"
+msgid "Plan"
+msgstr "Plan"
+
+msgctxt "view:project.work:0"
+msgid "Requests"
+msgstr "Solicitudes"
diff --git a/locale/es_ES.po b/locale/es_ES.po
new file mode 100644
index 0000000..85c374c
--- /dev/null
+++ b/locale/es_ES.po
@@ -0,0 +1,163 @@
+#
+msgid ""
+msgstr "Content-Type: text/plain; charset=utf-8\n"
+
+msgctxt "error:project.work:0"
+msgid "You can not create recursive dependencies!"
+msgstr "No puede crear dependencias recursivas"
+
+msgctxt "field:project.allocation,employee:0"
+msgid "Employee"
+msgstr "Empleado"
+
+msgctxt "field:project.allocation,percentage:0"
+msgid "Percentage"
+msgstr "Porcentaje"
+
+msgctxt "field:project.allocation,rec_name:0"
+msgid "Name"
+msgstr "Nombre"
+
+msgctxt "field:project.allocation,work:0"
+msgid "Work"
+msgstr "Actividad"
+
+msgctxt "field:project.predecessor_successor,predecessor:0"
+msgid "Predecessor"
+msgstr "Predecesor"
+
+msgctxt "field:project.predecessor_successor,rec_name:0"
+msgid "Name"
+msgstr "Nombre"
+
+msgctxt "field:project.predecessor_successor,successor:0"
+msgid "Successor"
+msgstr "Sucesor"
+
+msgctxt "field:project.work,actual_finish_date:0"
+msgid "Actual Finish"
+msgstr "Finalización real"
+
+msgctxt "field:project.work,actual_finish_time:0"
+msgid "Actual Finish Time"
+msgstr "Hora de finalización real"
+
+msgctxt "field:project.work,actual_start_date:0"
+msgid "Actual Start"
+msgstr "Inicio real"
+
+msgctxt "field:project.work,actual_start_time:0"
+msgid "Actual Start Time"
+msgstr "Hora de inicio real"
+
+msgctxt "field:project.work,allocations:0"
+msgid "Allocations"
+msgstr "Asignaciones"
+
+msgctxt "field:project.work,back_leveling_delay:0"
+msgid "Leveling Delay"
+msgstr "Retraso de la nivelación"
+
+msgctxt "field:project.work,constraint_finish_date:0"
+msgid "Constraint Finish"
+msgstr "Restricción de finalización"
+
+msgctxt "field:project.work,constraint_finish_time:0"
+msgid "Constraint Finish Time"
+msgstr "Restricción de hora de finalización"
+
+msgctxt "field:project.work,constraint_start_date:0"
+msgid "Constraint Start"
+msgstr "Restricción de inicio"
+
+msgctxt "field:project.work,constraint_start_time:0"
+msgid "Constraint Start Time"
+msgstr "Restricción de tiempo de inicio"
+
+msgctxt "field:project.work,duration:0"
+msgid "Duration"
+msgstr "Duración"
+
+msgctxt "field:project.work,early_finish_date:0"
+msgid "Early Finish"
+msgstr "Finalización prematura"
+
+msgctxt "field:project.work,early_finish_time:0"
+msgid "Early Finish Time"
+msgstr "Hora de finalización prematura"
+
+msgctxt "field:project.work,early_start_date:0"
+msgid "Early Start"
+msgstr "Inicio prematuro"
+
+msgctxt "field:project.work,early_start_time:0"
+msgid "Early Start Time"
+msgstr "Tiempo de inicio prematuro"
+
+msgctxt "field:project.work,late_finish_date:0"
+msgid "Late Finish"
+msgstr ""
+
+msgctxt "field:project.work,late_finish_time:0"
+msgid "Late Finish Time"
+msgstr "Hora de finalización tardía"
+
+msgctxt "field:project.work,late_start_date:0"
+msgid "Late Start"
+msgstr "Inicio tardío"
+
+msgctxt "field:project.work,late_start_time:0"
+msgid "Late Start Time"
+msgstr "Hora de inicio tardía"
+
+msgctxt "field:project.work,leveling_delay:0"
+msgid "Leveling Delay"
+msgstr "Retraso de nivelación"
+
+msgctxt "field:project.work,predecessors:0"
+msgid "Predecessors"
+msgstr "Predecesores"
+
+msgctxt "field:project.work,requests:0"
+msgid "Requests"
+msgstr "Solicitudes"
+
+msgctxt "field:project.work,successors:0"
+msgid "Successors"
+msgstr "Sucesores"
+
+msgctxt "model:ir.action,name:wizard_leveling"
+msgid "Tasks Leveling"
+msgstr "Nivelación de tareas"
+
+msgctxt "model:project.allocation,name:0"
+msgid "Allocation"
+msgstr "Asignación"
+
+msgctxt "model:project.predecessor_successor,name:0"
+msgid "Predecessor - Successor"
+msgstr "Predecesor - Sucesor"
+
+msgctxt "model:res.request.link,name:request_link_work"
+msgid "Work"
+msgstr "Actividad"
+
+msgctxt "view:project.allocation:0"
+msgid "Allocation"
+msgstr "Asignación"
+
+msgctxt "view:project.allocation:0"
+msgid "Allocations"
+msgstr "Asignaciones"
+
+msgctxt "view:project.work:0"
+msgid "Allocations"
+msgstr "Asignaciones"
+
+msgctxt "view:project.work:0"
+msgid "Plan"
+msgstr "Plan"
+
+msgctxt "view:project.work:0"
+msgid "Requests"
+msgstr "Solicitudes"
diff --git a/locale/fr_FR.po b/locale/fr_FR.po
new file mode 100644
index 0000000..8503c70
--- /dev/null
+++ b/locale/fr_FR.po
@@ -0,0 +1,163 @@
+#
+msgid ""
+msgstr "Content-Type: text/plain; charset=utf-8\n"
+
+msgctxt "error:project.work:0"
+msgid "You can not create recursive dependencies!"
+msgstr "Vous ne pouvez pas créer des dépendances récursives !"
+
+msgctxt "field:project.allocation,employee:0"
+msgid "Employee"
+msgstr "Employé"
+
+msgctxt "field:project.allocation,percentage:0"
+msgid "Percentage"
+msgstr "Pourcentage"
+
+msgctxt "field:project.allocation,rec_name:0"
+msgid "Name"
+msgstr "Nom"
+
+msgctxt "field:project.allocation,work:0"
+msgid "Work"
+msgstr "Travail"
+
+msgctxt "field:project.predecessor_successor,predecessor:0"
+msgid "Predecessor"
+msgstr "Prédécesseur"
+
+msgctxt "field:project.predecessor_successor,rec_name:0"
+msgid "Name"
+msgstr "Nom"
+
+msgctxt "field:project.predecessor_successor,successor:0"
+msgid "Successor"
+msgstr "Successeur"
+
+msgctxt "field:project.work,actual_finish_date:0"
+msgid "Actual Finish"
+msgstr "Fin réelle"
+
+msgctxt "field:project.work,actual_finish_time:0"
+msgid "Actual Finish Time"
+msgstr "Fin réelle"
+
+msgctxt "field:project.work,actual_start_date:0"
+msgid "Actual Start"
+msgstr "Début réel"
+
+msgctxt "field:project.work,actual_start_time:0"
+msgid "Actual Start Time"
+msgstr "Début réel"
+
+msgctxt "field:project.work,allocations:0"
+msgid "Allocations"
+msgstr "Répartitions"
+
+msgctxt "field:project.work,back_leveling_delay:0"
+msgid "Leveling Delay"
+msgstr "Délais de décalage"
+
+msgctxt "field:project.work,constraint_finish_date:0"
+msgid "Constraint Finish"
+msgstr "Fin imposée"
+
+msgctxt "field:project.work,constraint_finish_time:0"
+msgid "Constraint Finish Time"
+msgstr "Fin imposée"
+
+msgctxt "field:project.work,constraint_start_date:0"
+msgid "Constraint Start"
+msgstr "Début imposé"
+
+msgctxt "field:project.work,constraint_start_time:0"
+msgid "Constraint Start Time"
+msgstr "Début imposé"
+
+msgctxt "field:project.work,duration:0"
+msgid "Duration"
+msgstr "Durée"
+
+msgctxt "field:project.work,early_finish_date:0"
+msgid "Early Finish"
+msgstr "Fin au plus tôt"
+
+msgctxt "field:project.work,early_finish_time:0"
+msgid "Early Finish Time"
+msgstr "Fin au plus tôt"
+
+msgctxt "field:project.work,early_start_date:0"
+msgid "Early Start"
+msgstr "Départ au plus tôt"
+
+msgctxt "field:project.work,early_start_time:0"
+msgid "Early Start Time"
+msgstr "Départ au plus tôt"
+
+msgctxt "field:project.work,late_finish_date:0"
+msgid "Late Finish"
+msgstr "Fin au plus tard"
+
+msgctxt "field:project.work,late_finish_time:0"
+msgid "Late Finish Time"
+msgstr "Fin au plus tard"
+
+msgctxt "field:project.work,late_start_date:0"
+msgid "Late Start"
+msgstr "Début au plus tard"
+
+msgctxt "field:project.work,late_start_time:0"
+msgid "Late Start Time"
+msgstr "au plus tard"
+
+msgctxt "field:project.work,leveling_delay:0"
+msgid "Leveling Delay"
+msgstr "Délais décalage"
+
+msgctxt "field:project.work,predecessors:0"
+msgid "Predecessors"
+msgstr "Prédécesseurs"
+
+msgctxt "field:project.work,requests:0"
+msgid "Requests"
+msgstr "Demandes"
+
+msgctxt "field:project.work,successors:0"
+msgid "Successors"
+msgstr "Successeurs"
+
+msgctxt "model:ir.action,name:wizard_leveling"
+msgid "Tasks Leveling"
+msgstr "Décalage des tâches"
+
+msgctxt "model:project.allocation,name:0"
+msgid "Allocation"
+msgstr "Répartition"
+
+msgctxt "model:project.predecessor_successor,name:0"
+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:0"
+msgid "Allocation"
+msgstr "Répartition"
+
+msgctxt "view:project.allocation:0"
+msgid "Allocations"
+msgstr "Répartitions"
+
+msgctxt "view:project.work:0"
+msgid "Allocations"
+msgstr "Répartitions"
+
+msgctxt "view:project.work:0"
+msgid "Plan"
+msgstr "Planification"
+
+msgctxt "view:project.work:0"
+msgid "Requests"
+msgstr "Demandes"
diff --git a/locale/nl_NL.po b/locale/nl_NL.po
new file mode 100644
index 0000000..0731bea
--- /dev/null
+++ b/locale/nl_NL.po
@@ -0,0 +1,169 @@
+#
+msgid ""
+msgstr "Content-Type: text/plain; charset=utf-8\n"
+
+msgctxt "error:project.work:0"
+msgid "You can not create recursive dependencies!"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:project.allocation,employee:0"
+msgid "Employee"
+msgstr "Werknemer"
+
+#, fuzzy
+msgctxt "field:project.allocation,percentage:0"
+msgid "Percentage"
+msgstr "Percentage"
+
+#, fuzzy
+msgctxt "field:project.allocation,rec_name:0"
+msgid "Name"
+msgstr "Naam bijlage"
+
+#, fuzzy
+msgctxt "field:project.allocation,work:0"
+msgid "Work"
+msgstr "Werk"
+
+msgctxt "field:project.predecessor_successor,predecessor:0"
+msgid "Predecessor"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:project.predecessor_successor,rec_name:0"
+msgid "Name"
+msgstr "Naam bijlage"
+
+msgctxt "field:project.predecessor_successor,successor:0"
+msgid "Successor"
+msgstr ""
+
+msgctxt "field:project.work,actual_finish_date:0"
+msgid "Actual Finish"
+msgstr ""
+
+msgctxt "field:project.work,actual_finish_time:0"
+msgid "Actual Finish Time"
+msgstr ""
+
+msgctxt "field:project.work,actual_start_date:0"
+msgid "Actual Start"
+msgstr ""
+
+msgctxt "field:project.work,actual_start_time:0"
+msgid "Actual Start Time"
+msgstr ""
+
+msgctxt "field:project.work,allocations:0"
+msgid "Allocations"
+msgstr ""
+
+msgctxt "field:project.work,back_leveling_delay:0"
+msgid "Leveling Delay"
+msgstr ""
+
+msgctxt "field:project.work,constraint_finish_date:0"
+msgid "Constraint Finish"
+msgstr ""
+
+msgctxt "field:project.work,constraint_finish_time:0"
+msgid "Constraint Finish Time"
+msgstr ""
+
+msgctxt "field:project.work,constraint_start_date:0"
+msgid "Constraint Start"
+msgstr ""
+
+msgctxt "field:project.work,constraint_start_time:0"
+msgid "Constraint Start Time"
+msgstr ""
+
+msgctxt "field:project.work,duration:0"
+msgid "Duration"
+msgstr ""
+
+msgctxt "field:project.work,early_finish_date:0"
+msgid "Early Finish"
+msgstr ""
+
+msgctxt "field:project.work,early_finish_time:0"
+msgid "Early Finish Time"
+msgstr ""
+
+msgctxt "field:project.work,early_start_date:0"
+msgid "Early Start"
+msgstr ""
+
+msgctxt "field:project.work,early_start_time:0"
+msgid "Early Start Time"
+msgstr ""
+
+msgctxt "field:project.work,late_finish_date:0"
+msgid "Late Finish"
+msgstr ""
+
+msgctxt "field:project.work,late_finish_time:0"
+msgid "Late Finish Time"
+msgstr ""
+
+msgctxt "field:project.work,late_start_date:0"
+msgid "Late Start"
+msgstr ""
+
+msgctxt "field:project.work,late_start_time:0"
+msgid "Late Start Time"
+msgstr ""
+
+msgctxt "field:project.work,leveling_delay:0"
+msgid "Leveling Delay"
+msgstr ""
+
+msgctxt "field:project.work,predecessors:0"
+msgid "Predecessors"
+msgstr ""
+
+msgctxt "field:project.work,requests:0"
+msgid "Requests"
+msgstr ""
+
+msgctxt "field:project.work,successors:0"
+msgid "Successors"
+msgstr ""
+
+msgctxt "model:ir.action,name:wizard_leveling"
+msgid "Tasks Leveling"
+msgstr ""
+
+msgctxt "model:project.allocation,name:0"
+msgid "Allocation"
+msgstr ""
+
+msgctxt "model:project.predecessor_successor,name:0"
+msgid "Predecessor - Successor"
+msgstr ""
+
+#, fuzzy
+msgctxt "model:res.request.link,name:request_link_work"
+msgid "Work"
+msgstr "Werk"
+
+msgctxt "view:project.allocation:0"
+msgid "Allocation"
+msgstr ""
+
+msgctxt "view:project.allocation:0"
+msgid "Allocations"
+msgstr ""
+
+msgctxt "view:project.work:0"
+msgid "Allocations"
+msgstr ""
+
+msgctxt "view:project.work:0"
+msgid "Plan"
+msgstr ""
+
+msgctxt "view:project.work:0"
+msgid "Requests"
+msgstr ""
diff --git a/locale/ru_RU.po b/locale/ru_RU.po
new file mode 100644
index 0000000..c2e77c4
--- /dev/null
+++ b/locale/ru_RU.po
@@ -0,0 +1,168 @@
+#
+msgid ""
+msgstr "Content-Type: text/plain; charset=utf-8\n"
+
+msgctxt "error:project.work:0"
+msgid "You can not create recursive dependencies!"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:project.allocation,employee:0"
+msgid "Employee"
+msgstr "Сотрудник"
+
+msgctxt "field:project.allocation,percentage:0"
+msgid "Percentage"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:project.allocation,rec_name:0"
+msgid "Name"
+msgstr "Наименование"
+
+msgctxt "field:project.allocation,work:0"
+msgid "Work"
+msgstr ""
+
+msgctxt "field:project.predecessor_successor,predecessor:0"
+msgid "Predecessor"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:project.predecessor_successor,rec_name:0"
+msgid "Name"
+msgstr "Наименование"
+
+msgctxt "field:project.predecessor_successor,successor:0"
+msgid "Successor"
+msgstr ""
+
+msgctxt "field:project.work,actual_finish_date:0"
+msgid "Actual Finish"
+msgstr ""
+
+msgctxt "field:project.work,actual_finish_time:0"
+msgid "Actual Finish Time"
+msgstr ""
+
+msgctxt "field:project.work,actual_start_date:0"
+msgid "Actual Start"
+msgstr ""
+
+msgctxt "field:project.work,actual_start_time:0"
+msgid "Actual Start Time"
+msgstr ""
+
+msgctxt "field:project.work,allocations:0"
+msgid "Allocations"
+msgstr ""
+
+msgctxt "field:project.work,back_leveling_delay:0"
+msgid "Leveling Delay"
+msgstr ""
+
+msgctxt "field:project.work,constraint_finish_date:0"
+msgid "Constraint Finish"
+msgstr ""
+
+msgctxt "field:project.work,constraint_finish_time:0"
+msgid "Constraint Finish Time"
+msgstr ""
+
+msgctxt "field:project.work,constraint_start_date:0"
+msgid "Constraint Start"
+msgstr ""
+
+msgctxt "field:project.work,constraint_start_time:0"
+msgid "Constraint Start Time"
+msgstr ""
+
+msgctxt "field:project.work,duration:0"
+msgid "Duration"
+msgstr ""
+
+msgctxt "field:project.work,early_finish_date:0"
+msgid "Early Finish"
+msgstr ""
+
+msgctxt "field:project.work,early_finish_time:0"
+msgid "Early Finish Time"
+msgstr ""
+
+msgctxt "field:project.work,early_start_date:0"
+msgid "Early Start"
+msgstr ""
+
+msgctxt "field:project.work,early_start_time:0"
+msgid "Early Start Time"
+msgstr ""
+
+msgctxt "field:project.work,late_finish_date:0"
+msgid "Late Finish"
+msgstr ""
+
+msgctxt "field:project.work,late_finish_time:0"
+msgid "Late Finish Time"
+msgstr ""
+
+msgctxt "field:project.work,late_start_date:0"
+msgid "Late Start"
+msgstr ""
+
+msgctxt "field:project.work,late_start_time:0"
+msgid "Late Start Time"
+msgstr ""
+
+msgctxt "field:project.work,leveling_delay:0"
+msgid "Leveling Delay"
+msgstr ""
+
+msgctxt "field:project.work,predecessors:0"
+msgid "Predecessors"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:project.work,requests:0"
+msgid "Requests"
+msgstr "Сообщения"
+
+msgctxt "field:project.work,successors:0"
+msgid "Successors"
+msgstr ""
+
+msgctxt "model:ir.action,name:wizard_leveling"
+msgid "Tasks Leveling"
+msgstr ""
+
+msgctxt "model:project.allocation,name:0"
+msgid "Allocation"
+msgstr ""
+
+msgctxt "model:project.predecessor_successor,name:0"
+msgid "Predecessor - Successor"
+msgstr ""
+
+msgctxt "model:res.request.link,name:request_link_work"
+msgid "Work"
+msgstr ""
+
+msgctxt "view:project.allocation:0"
+msgid "Allocation"
+msgstr ""
+
+msgctxt "view:project.allocation:0"
+msgid "Allocations"
+msgstr ""
+
+msgctxt "view:project.work:0"
+msgid "Allocations"
+msgstr ""
+
+msgctxt "view:project.work:0"
+msgid "Plan"
+msgstr ""
+
+#, fuzzy
+msgctxt "view:project.work:0"
+msgid "Requests"
+msgstr "Сообщения"
diff --git a/setup.py b/setup.py
index 75b32f5..bc5ed2a 100644
--- a/setup.py
+++ b/setup.py
@@ -39,18 +39,21 @@ setup(name='trytond_project_plan',
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_plan.py b/tests/test_project_plan.py
index 1893839..dbc1c27 100644
--- a/tests/test_project_plan.py
+++ b/tests/test_project_plan.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 ProjectPlanTestCase(unittest.TestCase):
@@ -27,6 +27,12 @@ class ProjectPlanTestCase(unittest.TestCase):
'''
test_view('project_plan')
+ def test0006depends(self):
+ '''
+ Test depends.
+ '''
+ test_depends()
+
def suite():
suite = trytond.tests.test_tryton.suite()
suite.addTests(unittest.TestLoader().loadTestsFromTestCase(
diff --git a/trytond_project_plan.egg-info/PKG-INFO b/trytond_project_plan.egg-info/PKG-INFO
index 95a172e..bc9a528 100644
--- a/trytond_project_plan.egg-info/PKG-INFO
+++ b/trytond_project_plan.egg-info/PKG-INFO
@@ -1,29 +1,32 @@
Metadata-Version: 1.0
Name: trytond-project-plan
-Version: 2.0.1
+Version: 2.2.0
Summary: Add planning capabilities on projects.
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_plan.egg-info/SOURCES.txt b/trytond_project_plan.egg-info/SOURCES.txt
index 0e96702..19be75b 100644
--- a/trytond_project_plan.egg-info/SOURCES.txt
+++ b/trytond_project_plan.egg-info/SOURCES.txt
@@ -5,11 +5,6 @@ LICENSE
MANIFEST.in
README
allocation.xml
-bg_BG.csv
-de_DE.csv
-es_CO.csv
-es_ES.csv
-fr_FR.csv
setup.py
work.xml
./__init__.py
@@ -19,6 +14,14 @@ work.xml
./tests/__init__.py
./tests/test_project_plan.py
doc/index.rst
+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_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 a57cd04..7752a72 100644
--- a/trytond_project_plan.egg-info/requires.txt
+++ b/trytond_project_plan.egg-info/requires.txt
@@ -1,4 +1,4 @@
-trytond_company >= 2.0, < 2.1
-trytond_project >= 2.0, < 2.1
-trytond_timesheet >= 2.0, < 2.1
-trytond >= 2.0, < 2.1
\ No newline at end of file
+trytond_company >= 2.2, < 2.3
+trytond_project >= 2.2, < 2.3
+trytond_timesheet >= 2.2, < 2.3
+trytond >= 2.2, < 2.3
\ No newline at end of file
diff --git a/work.py b/work.py
index 9181291..ea436f0 100644
--- a/work.py
+++ b/work.py
@@ -5,8 +5,9 @@ from collections import deque, defaultdict
from heapq import heappop, heappush
from trytond.model import ModelView, ModelSQL, fields
from trytond.wizard import Wizard
-from trytond.pyson import Eval, Not, Equal
+from trytond.pyson import Eval
from trytond.transaction import Transaction
+from trytond.pool import Pool
def intfloor(x):
@@ -17,22 +18,24 @@ class Work(ModelSQL, ModelView):
_name = 'project.work'
predecessors = fields.Many2Many('project.predecessor_successor',
- 'successor', 'predecessor', 'Predecessors',
- domain=[
- ('parent', '=', Eval('parent')),
- ('id', '!=', Eval('active_id')),
- ])
+ 'successor', 'predecessor', 'Predecessors',
+ domain=[
+ ('parent', '=', Eval('parent')),
+ ('id', '!=', Eval('id')),
+ ],
+ depends=['parent', 'id'])
successors = fields.Many2Many('project.predecessor_successor',
- 'predecessor', 'successor', 'Successors',
- domain=[
- ('parent', '=', Eval('parent')),
- ('id', '!=', Eval('active_id')),
- ])
+ 'predecessor', 'successor', 'Successors',
+ domain=[
+ ('parent', '=', Eval('parent')),
+ ('id', '!=', Eval('id')),
+ ],
+ depends=['parent', 'id'])
leveling_delay = fields.Float("Leveling Delay")
back_leveling_delay = fields.Float("Leveling Delay")
allocations = fields.One2Many('project.allocation', 'work', 'Allocations',
- states={
- 'invisible': Not(Equal(Eval('type'), 'task')),
+ states={
+ 'invisible': Eval('type') != 'task',
}, depends=['type'])
duration = fields.Function(fields.Float('Duration'), 'get_function_fields')
early_start_time = fields.DateTime("Early Start Time", readonly=True)
@@ -86,7 +89,7 @@ class Work(ModelSQL, ModelView):
:return: a dictionary with all field names as key and
a dictionary as value with id as key
'''
- req_ref_obj = self.pool.get('res.request.reference')
+ req_ref_obj = Pool().get('res.request.reference')
cursor = Transaction().cursor
@@ -171,8 +174,8 @@ class Work(ModelSQL, ModelView):
return res
def set_function_fields(self, ids, name, value):
- request_obj = self.pool.get('res.request')
- req_ref_obj = self.pool.get('res.request.reference')
+ request_obj = Pool().get('res.request')
+ req_ref_obj = Pool().get('res.request.reference')
if name == 'requests':
works = self.browse(ids)
@@ -186,20 +189,34 @@ class Work(ModelSQL, ModelView):
operator = v[0]
target_ids = len(v) > 1 and v[1] or []
- if 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))
+ if operator == 'create':
+ to_link.append(request_obj.create(v[1]))
+ elif operator == 'write':
+ request_obj.write(v[1], v[2])
+ elif operator == 'delete':
+ request_obj.delete(v[1])
+ elif operator == 'delete_all':
+ target_ids = []
+ for record_id in ids:
+ ref_ids = req_ref_obj.search([
+ ('reference', '=',
+ 'project.work,%s' % record_id),
+ ])
+ refs = req_ref_obj.browse(ref_ids)
+ target_ids.extend(ref.request.id for ref in refs)
+ request_obj.delete(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':
- to_unlink.extend((i for i in target_ids if i in currents))
elif operator == 'unlink_all':
to_unlink.extend(currents)
- elif operator == 'delete':
- request_obj.delete(to_delete)
+ 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')
@@ -656,7 +673,7 @@ class PredecessorSuccessor(ModelSQL):
ondelete='CASCADE', required=True, select=1)
def write(self, ids, values):
- work_obj = self.pool.get('project.work')
+ work_obj = Pool().get('project.work')
res = super(PredecessorSuccessor, self).write(ids, values)
for work_id in values.itervalues():
@@ -666,7 +683,7 @@ class PredecessorSuccessor(ModelSQL):
return res
def delete(self, ids):
- work_obj = self.pool.get('project.work')
+ work_obj = Pool().get('project.work')
if isinstance(ids, (int, long)):
ids = [ids]
@@ -691,7 +708,7 @@ class PredecessorSuccessor(ModelSQL):
return res
def create(self, values):
- work_obj = self.pool.get('project.work')
+ work_obj = Pool().get('project.work')
ps_id = super(PredecessorSuccessor, self).create(values)
pred_succ = self.browse(ps_id)
@@ -720,7 +737,7 @@ class Leveling(Wizard):
}
def _leveling(self, data):
- work_obj = self.pool.get('project.work')
+ work_obj = Pool().get('project.work')
work_obj.create_leveling(data['id'])
return {}
diff --git a/work.xml b/work.xml
index fabc727..42f56ce 100644
--- a/work.xml
+++ b/work.xml
@@ -32,14 +32,11 @@ this repository contains the full copyright notices and license terms. -->
<label name="duration"/>
<field name="duration" widget="float_time" float_time="company_work_time"/>
<newline/>
- <separator name="predecessors" colspan="2"/>
- <separator name="successors" colspan="2"/>
<field name="predecessors" colspan="2"/>
<field name="successors" colspan="2"/>
</page>
<page string="Allocations" id="allocations"
states="{'invisible': Not(Equal(Eval('type'), 'task'))}" >
- <separator name="allocations" colspan="4"/>
<field name="allocations" colspan="4"/>
</page>
<page string="Requests" id="requests">
@@ -58,7 +55,7 @@ this repository contains the full copyright notices and license terms. -->
</record>
<record model="ir.action.keyword" id="leveling_keyword">
<field name="keyword">form_action</field>
- <field name="model">project.work,0</field>
+ <field name="model">project.work,-1</field>
<field name="action" ref="wizard_leveling"/>
</record>
commit 1d8f48db16aa89065c9a60f1e98bcb4f094065ea
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Mon Oct 3 14:15:58 2011 +0200
Adding upstream version 2.0.1.
diff --git a/CHANGELOG b/CHANGELOG
index e632ecd..e9a6914 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 2.0.1 - 2011-10-01
+* Bug fixes (see mercurial logs for details)
+
Version 2.0.0 - 2011-04-27
* Bug fixes (see mercurial logs for details)
diff --git a/PKG-INFO b/PKG-INFO
index 1592589..990f470 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.0
Name: trytond_project_plan
-Version: 2.0.0
+Version: 2.0.1
Summary: Add planning capabilities on projects.
Home-page: http://www.tryton.org/
diff --git a/__tryton__.py b/__tryton__.py
index 9839f92..7e8f281 100644
--- a/__tryton__.py
+++ b/__tryton__.py
@@ -7,7 +7,7 @@
'name_es_CO': 'Planeación de Proyectos',
'name_es_ES': 'Planificación de proyecto',
'name_fr_FR': 'Planification de projet',
- 'version': '2.0.0',
+ 'version': '2.0.1',
'author': 'B2CK',
'email': 'info at b2ck.com',
'website': 'http://www.tryton.org/',
diff --git a/trytond_project_plan.egg-info/PKG-INFO b/trytond_project_plan.egg-info/PKG-INFO
index 325d962..95a172e 100644
--- a/trytond_project_plan.egg-info/PKG-INFO
+++ b/trytond_project_plan.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.0
Name: trytond-project-plan
-Version: 2.0.0
+Version: 2.0.1
Summary: Add planning capabilities on projects.
Home-page: http://www.tryton.org/
diff --git a/work.py b/work.py
index c0f8b8e..9181291 100644
--- a/work.py
+++ b/work.py
@@ -178,6 +178,8 @@ class Work(ModelSQL, ModelView):
works = self.browse(ids)
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 = []
commit 9e0cc26bae57e53e9a4756e6602a120fb67dd420
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Tue May 24 19:12:57 2011 +0200
Adding upstream version 2.0.0.
diff --git a/CHANGELOG b/CHANGELOG
index f1fa2df..e632ecd 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 1ab70ff..8d81a8f 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,6 +1,6 @@
-Copyright (C) 2009-2010 Bertrand Chenal.
-Copyright (C) 2009-2010 Cédric Krier.
-Copyright (C) 2009-2010 B2CK SPRL.
+Copyright (C) 2009-2011 Bertrand Chenal.
+Copyright (C) 2009-2011 Cédric Krier.
+Copyright (C) 2009-2011 B2CK SPRL.
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/PKG-INFO b/PKG-INFO
index 3d2a0fe..1592589 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,13 +1,13 @@
Metadata-Version: 1.0
Name: trytond_project_plan
-Version: 1.8.0
+Version: 2.0.0
Summary: Add planning capabilities on projects.
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
@@ -17,8 +17,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 f6eed5a..9839f92 100644
--- a/__tryton__.py
+++ b/__tryton__.py
@@ -2,16 +2,19 @@
#this repository contains the full copyright notices and license terms.
{
'name': 'Project Plan',
+ 'name_bg_BG': 'Планиране на проекти',
'name_de_DE': 'Projekte Planung',
'name_es_CO': 'Planeación de Proyectos',
'name_es_ES': 'Planificación de proyecto',
'name_fr_FR': 'Planification de projet',
- 'version': '1.8.0',
+ 'version': '2.0.0',
'author': 'B2CK',
'email': 'info at b2ck.com',
'website': 'http://www.tryton.org/',
'description': '''Add planning capabilities on projects.
''',
+ 'description_bg_BG': '''Добавя възможност за планиране на проекти
+''',
'description_de_DE': '''Projektmodul Planung:
- Fügt Planungsmöglichkeiten für Projekte hinzu
''',
@@ -31,6 +34,7 @@
'allocation.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..e666071
--- /dev/null
+++ b/bg_BG.csv
@@ -0,0 +1,41 @@
+type,name,res_id,src,value,fuzzy
+error,project.work,0,You can not create recursive dependencies!,Не може да създавате взаимно вложени зависимости!,0
+field,"project.allocation,employee",0,Employee,Служител,0
+field,"project.allocation,percentage",0,Percentage,Процент,0
+field,"project.allocation,rec_name",0,Name,Име,0
+field,"project.allocation,work",0,Work,Задача,0
+field,"project.predecessor_successor,predecessor",0,Predecessor,Предшественик,0
+field,"project.predecessor_successor,rec_name",0,Name,Име,0
+field,"project.predecessor_successor,successor",0,Successor,Наследник,0
+field,"project.work,actual_finish_date",0,Actual Finish,Действително завършване,0
+field,"project.work,actual_finish_time",0,Actual Finish Time,Време на действително завършване,0
+field,"project.work,actual_start_date",0,Actual Start,Дейсъвително започване,0
+field,"project.work,actual_start_time",0,Actual Start Time,Време на действително започване,0
+field,"project.work,allocations",0,Allocations,Разпределения,0
+field,"project.work,back_leveling_delay",0,Leveling Delay,Изравняване на закъснение,0
+field,"project.work,constraint_finish_date",0,Constraint Finish,Ограничение за край,0
+field,"project.work,constraint_finish_time",0,Constraint Finish Time,Ограничение за време на завършване,0
+field,"project.work,constraint_start_date",0,Constraint Start,Ограничение за начало,0
+field,"project.work,constraint_start_time",0,Constraint Start Time,Ограничение за начално време,0
+field,"project.work,duration",0,Duration,Продължителност,0
+field,"project.work,early_finish_date",0,Early Finish,По-рано завършване,0
+field,"project.work,early_finish_time",0,Early Finish Time,Време на по-рано приключване,0
+field,"project.work,early_start_date",0,Early Start,По-рано начало,0
+field,"project.work,early_start_time",0,Early Start Time,По-ранно време на започване,0
+field,"project.work,late_finish_date",0,Late Finish,По-късно завършване,0
+field,"project.work,late_finish_time",0,Late Finish Time,Време на по-късно завършване,0
+field,"project.work,late_start_date",0,Late Start,По-късно начало ,0
+field,"project.work,late_start_time",0,Late Start Time,Време на по-късно начало,0
+field,"project.work,leveling_delay",0,Leveling Delay,Изравняване на закъснение,0
+field,"project.work,predecessors",0,Predecessors,Предшественици,0
+field,"project.work,requests",0,Requests,Заявки,0
+field,"project.work,successors",0,Successors,Наследници,0
+model,"ir.action,name",wizard_leveling,Tasks Leveling,Изравняване на задачи,0
+model,"project.allocation,name",0,Allocation,Разпределние,0
+model,"project.predecessor_successor,name",0,Predecessor - Successor,Предшественик - Наследник,0
+model,"res.request.link,name",request_link_work,Work,Задача,0
+view,project.allocation,0,Allocation,Разпределение,0
+view,project.allocation,0,Allocations,Разпределения,0
+view,project.work,0,Allocations,Разпределения,0
+view,project.work,0,Plan,План,0
+view,project.work,0,Requests,Заявки,0
diff --git a/setup.py b/setup.py
index 160220d..75b32f5 100644
--- a/setup.py
+++ b/setup.py
@@ -44,10 +44,15 @@ setup(name='trytond_project_plan',
'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_plan.egg-info/PKG-INFO b/trytond_project_plan.egg-info/PKG-INFO
index 62f0722..325d962 100644
--- a/trytond_project_plan.egg-info/PKG-INFO
+++ b/trytond_project_plan.egg-info/PKG-INFO
@@ -1,13 +1,13 @@
Metadata-Version: 1.0
Name: trytond-project-plan
-Version: 1.8.0
+Version: 2.0.0
Summary: Add planning capabilities on projects.
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
@@ -17,8 +17,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_plan.egg-info/SOURCES.txt b/trytond_project_plan.egg-info/SOURCES.txt
index 9f24ce5..0e96702 100644
--- a/trytond_project_plan.egg-info/SOURCES.txt
+++ b/trytond_project_plan.egg-info/SOURCES.txt
@@ -5,6 +5,7 @@ LICENSE
MANIFEST.in
README
allocation.xml
+bg_BG.csv
de_DE.csv
es_CO.csv
es_ES.csv
diff --git a/trytond_project_plan.egg-info/requires.txt b/trytond_project_plan.egg-info/requires.txt
index 3824d97..a57cd04 100644
--- a/trytond_project_plan.egg-info/requires.txt
+++ b/trytond_project_plan.egg-info/requires.txt
@@ -1,4 +1,4 @@
-trytond_company >= 1.8, < 1.9
-trytond_project >= 1.8, < 1.9
-trytond_timesheet >= 1.8, < 1.9
-trytond >= 1.8, < 1.9
\ No newline at end of file
+trytond_company >= 2.0, < 2.1
+trytond_project >= 2.0, < 2.1
+trytond_timesheet >= 2.0, < 2.1
+trytond >= 2.0, < 2.1
\ No newline at end of file
commit 946fadfa7acc2b2b2b81111b13bd81a6678df604
Author: Daniel Baumann <daniel at debian.org>
Date: Thu Nov 4 20:12:28 2010 +0100
Adding upstream version 1.8.0.
diff --git a/CHANGELOG b/CHANGELOG
index 6761693..f1fa2df 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,2 +1,5 @@
+Version 1.8.0 - 2010-11-01
+* Bug fixes (see mercurial logs for details)
+
Version 1.6.0 - 2010-05-13
* Initial release
diff --git a/INSTALL b/INSTALL
index 5291a4f..ee14053 100644
--- a/INSTALL
+++ b/INSTALL
@@ -4,7 +4,7 @@ Installing trytond_project_plan
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_company (http://www.tryton.org/)
* trytond_timesheet (http://www.tryton.org/)
diff --git a/PKG-INFO b/PKG-INFO
index b382ff3..3d2a0fe 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,13 +1,13 @@
Metadata-Version: 1.0
Name: trytond_project_plan
-Version: 1.6.0
+Version: 1.8.0
Summary: Add planning capabilities on projects.
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 c6cb50e..f6eed5a 100644
--- a/__tryton__.py
+++ b/__tryton__.py
@@ -6,7 +6,7 @@
'name_es_CO': 'Planeación de Proyectos',
'name_es_ES': 'Planificación de proyecto',
'name_fr_FR': 'Planification de projet',
- 'version': '1.6.0',
+ 'version': '1.8.0',
'author': 'B2CK',
'email': 'info at b2ck.com',
'website': 'http://www.tryton.org/',
diff --git a/allocation.py b/allocation.py
index c739b72..fd4d5b2 100644
--- a/allocation.py
+++ b/allocation.py
@@ -1,6 +1,5 @@
#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.model import ModelView, ModelSQL, fields
@@ -8,7 +7,6 @@ class Allocation(ModelSQL, ModelView):
'Allocation'
_name = 'project.allocation'
_description = __doc__
-
_rec_name = 'employee'
employee = fields.Many2One('company.employee', 'Employee', required=True,
@@ -17,50 +15,44 @@ class Allocation(ModelSQL, ModelView):
select=1)
percentage = fields.Float('Percentage', digits=(16, 2), required=True)
- def default_percentage(self, cursor, user_id, context=None):
+ def default_percentage(self):
return 100
- def write(self, cursor, user, ids, values, context=None):
+ def write(self, ids, values):
work_obj = self.pool.get('project.work')
- res = super(Allocation, self).write(cursor, user, ids, values,
- context=context)
+ res = super(Allocation, self).write(ids, values)
if isinstance(ids, (int, long)):
ids = [ids]
- work_ids = work_obj.search(cursor, user, [
+ work_ids = work_obj.search([
('allocations', 'in', ids),
- ], context=context)
+ ])
for work_id in work_ids:
- work_obj.reset_leveling(cursor, user, work_id, context=context)
+ work_obj.reset_leveling(work_id)
for work_id in work_ids:
- work_obj.compute_dates(cursor, user, work_id, context=context)
+ work_obj.compute_dates(work_id)
return res
- def create(self, cursor, user, values, context=None):
+ def create(self, values):
work_obj = self.pool.get('project.work')
- allocation_id = super(Allocation, self).create(cursor, user, values,
- context=context)
- allocation = self.browse(cursor, user, allocation_id, context=context)
- work_obj.reset_leveling(cursor, user, allocation.work.id,
- context=context)
- work_obj.compute_dates(cursor, user, allocation.work.id,
- context=context)
+ allocation_id = super(Allocation, self).create(values)
+ allocation = self.browse(allocation_id)
+ work_obj.reset_leveling(allocation.work.id)
+ work_obj.compute_dates(allocation.work.id)
- def delete(self, cursor, user, ids, context=None):
+ def delete(self, ids):
work_obj = self.pool.get('project.work')
- allocations = self.browse(cursor, user, ids, context=context)
+ allocations = self.browse(ids)
work_ids = [a.work.id for a in allocations]
- res = super(Allocation, self).delete(cursor, user, ids,
- context=context)
+ res = super(Allocation, self).delete(ids)
for work_id in work_ids:
- work_obj.reset_leveling(cursor, user, work_id, context=context)
+ work_obj.reset_leveling(work_id)
for work_id in work_ids:
- work_obj.compute_dates(cursor, user, work_id, context=context)
+ work_obj.compute_dates(work_id)
return res
-
Allocation()
diff --git a/de_DE.csv b/de_DE.csv
index 92f0066..578e53f 100644
--- a/de_DE.csv
+++ b/de_DE.csv
@@ -1,5 +1,5 @@
type,name,res_id,src,value,fuzzy
-error,project.work,0,You can not create recursive dependencies!,Es können keine rekursiven Abhängigkeiten erstellt werden!,0
+error,project.work,0,You can not create recursive dependencies!,Abhängigkeiten können nicht rekursiv angelegt werden!,0
field,"project.allocation,employee",0,Employee,Mitarbeiter,0
field,"project.allocation,percentage",0,Percentage,Prozentsatz,0
field,"project.allocation,rec_name",0,Name,Name,0
@@ -7,16 +7,16 @@ field,"project.allocation,work",0,Work,Arbeit,0
field,"project.predecessor_successor,predecessor",0,Predecessor,Vorgänger,0
field,"project.predecessor_successor,rec_name",0,Name,Name,0
field,"project.predecessor_successor,successor",0,Successor,Nachfolger,0
-field,"project.work,actual_finish_date",0,Actual Finish,Reales Enddatum,0
-field,"project.work,actual_finish_time",0,Actual Finish Time,Reale Endzeit,0
-field,"project.work,actual_start_date",0,Actual Start,Reales Startdatum,0
-field,"project.work,actual_start_time",0,Actual Start Time,Reale Startzeit,0
+field,"project.work,actual_finish_date",0,Actual Finish,Tatsächliches Enddatum,0
+field,"project.work,actual_finish_time",0,Actual Finish Time,Tatsächliche Endzeit,0
+field,"project.work,actual_start_date",0,Actual Start,Tatsächliches Startdatum,0
+field,"project.work,actual_start_time",0,Actual Start Time,Tatsächliche Startzeit,0
field,"project.work,allocations",0,Allocations,Zuordnungen,0
field,"project.work,back_leveling_delay",0,Leveling Delay,Verzögerung Abgleich,0
-field,"project.work,constraint_finish_date",0,Constraint Finish,Bedingung Enddatum,0
-field,"project.work,constraint_finish_time",0,Constraint Finish Time,Bedingung Endzeit,0
-field,"project.work,constraint_start_date",0,Constraint Start,Bedingung Startdatum,0
-field,"project.work,constraint_start_time",0,Constraint Start Time,Bedingung Startzeit,0
+field,"project.work,constraint_finish_date",0,Constraint Finish,Fixes Enddatum,0
+field,"project.work,constraint_finish_time",0,Constraint Finish Time,Fixe Endzeit,0
+field,"project.work,constraint_start_date",0,Constraint Start,Fixes Startdatum,0
+field,"project.work,constraint_start_time",0,Constraint Start Time,Fixe Startzeit,0
field,"project.work,duration",0,Duration,Dauer,0
field,"project.work,early_finish_date",0,Early Finish,Frühestes Enddatum,0
field,"project.work,early_finish_time",0,Early Finish Time,Früheste Endzeit,0
diff --git a/tests/test_project_plan.py b/tests/test_project_plan.py
index 93b768c..1893839 100644
--- a/tests/test_project_plan.py
+++ b/tests/test_project_plan.py
@@ -25,7 +25,7 @@ class ProjectPlanTestCase(unittest.TestCase):
'''
Test views.
'''
- self.assertRaises(Exception, test_view('project_plan'))
+ test_view('project_plan')
def suite():
suite = trytond.tests.test_tryton.suite()
diff --git a/trytond_project_plan.egg-info/PKG-INFO b/trytond_project_plan.egg-info/PKG-INFO
index 654dc2d..62f0722 100644
--- a/trytond_project_plan.egg-info/PKG-INFO
+++ b/trytond_project_plan.egg-info/PKG-INFO
@@ -1,13 +1,13 @@
Metadata-Version: 1.0
Name: trytond-project-plan
-Version: 1.6.0
+Version: 1.8.0
Summary: Add planning capabilities on projects.
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_plan.egg-info/requires.txt b/trytond_project_plan.egg-info/requires.txt
index 0b54410..3824d97 100644
--- a/trytond_project_plan.egg-info/requires.txt
+++ b/trytond_project_plan.egg-info/requires.txt
@@ -1,4 +1,4 @@
-trytond_company >= 1.6, < 1.7
-trytond_project >= 1.6, < 1.7
-trytond_timesheet >= 1.6, < 1.7
-trytond >= 1.6, < 1.7
\ No newline at end of file
+trytond_company >= 1.8, < 1.9
+trytond_project >= 1.8, < 1.9
+trytond_timesheet >= 1.8, < 1.9
+trytond >= 1.8, < 1.9
\ No newline at end of file
diff --git a/work.py b/work.py
index 18d13a5..c0f8b8e 100644
--- a/work.py
+++ b/work.py
@@ -1,12 +1,13 @@
#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 datetime
+from collections import deque, defaultdict
+from heapq import heappop, heappush
from trytond.model import ModelView, ModelSQL, fields
from trytond.wizard import Wizard
from trytond.pyson import Eval, Not, Equal
-from collections import deque, defaultdict
-from heapq import heappop, heappush
-import datetime
+from trytond.transaction import Transaction
+
def intfloor(x):
return int(round(x, 4))
@@ -73,25 +74,22 @@ class Work(ModelSQL, ModelView):
'dependencies!',
})
- def check_recursion(self,cursor, user, ids, parent='parent'):
- return super(Work, self).check_recursion(cursor, user, ids,
- parent='successors')
+ def check_recursion(self, ids, parent='parent'):
+ return super(Work, self).check_recursion(ids, parent='successors')
- def get_function_fields(self, cursor, user, ids, names, context=None):
+ def get_function_fields(self, ids, names):
'''
Function to compute function fields
- :param cursor: the database cursor
- :param user: the user id
:param ids: the ids of the works
:param names: the list of field name to compute
- :param args: optional argument
- :param context: the context
:return: a dictionary with all field names as key and
a dictionary as value with id as key
'''
req_ref_obj = self.pool.get('res.request.reference')
+ cursor = Transaction().cursor
+
res = {}
if 'requests' in names:
@@ -100,14 +98,13 @@ class Work(ModelSQL, ModelView):
for i in range(0, len(ids), cursor.IN_MAX):
sub_ids = ids[i:i + cursor.IN_MAX]
- req_ref_ids = req_ref_obj.search(cursor, user, [
+ req_ref_ids = req_ref_obj.search([
('reference', 'in', [
'project.work,%s' % i for i in sub_ids
]
),
- ], context=context)
- req_refs = req_ref_obj.browse(cursor, user, req_ref_ids,
- context=context)
+ ])
+ req_refs = req_ref_obj.browse(req_ref_ids)
for req_ref in req_refs:
_, work_id = req_ref.reference.split(',')
requests[int(work_id)].append(req_ref.request.id)
@@ -115,12 +112,12 @@ class Work(ModelSQL, ModelView):
res['requests'] = requests
if 'duration' in names:
- 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)
durations = {}
id2work = {}
@@ -165,7 +162,7 @@ class Work(ModelSQL, ModelView):
if fun_field in names:
values = {}
if works is None:
- works = self.browse(cursor, user, ids, context=context)
+ works = self.browse(ids)
for work in works:
values[work.id] = work[db_field] \
and work[db_field].date() or None
@@ -173,13 +170,12 @@ class Work(ModelSQL, ModelView):
return res
- def set_function_fields(self, cursor, user, ids, name, value,
- context=None):
+ def set_function_fields(self, ids, name, value):
request_obj = self.pool.get('res.request')
req_ref_obj = self.pool.get('res.request.reference')
if name == 'requests':
- works = self.browse(cursor, user, ids, context=context)
+ works = self.browse(ids)
currents = dict((req.id, req) for work in works for req in
work.requests)
for v in value:
@@ -201,8 +197,7 @@ class Work(ModelSQL, ModelView):
elif operator == 'unlink_all':
to_unlink.extend(currents)
elif operator == 'delete':
- request_obj.delete(cursor, user, to_delete,
- context=context)
+ request_obj.delete(to_delete)
else:
raise Exception('Operation not supported')
@@ -212,15 +207,14 @@ class Work(ModelSQL, ModelView):
for ref in request.references:
if int(ref.reference.split(',')[1]) in ids:
req_ref_ids.append(ref.id)
- req_ref_obj.delete(cursor, user, req_ref_ids,
- context=context)
+ req_ref_obj.delete(req_ref_ids)
for i in to_link:
for record_id in ids:
- req_ref_obj.create(cursor, user, {
+ req_ref_obj.create({
'request': i,
'reference': 'project.work,%s' % record_id,
- }, context=context)
+ })
return
fun_fields = ('actual_start_date', 'actual_finish_date',
@@ -229,22 +223,21 @@ class Work(ModelSQL, ModelView):
'constraint_start_time', 'constraint_finish_time')
for fun_field, db_field in zip(fun_fields, db_fields):
if fun_field == name:
- self.write(cursor, user, ids, {
+ self.write(ids, {
db_field: value \
and datetime.datetime.combine(value,
datetime.time()) \
or False,
- }, context=context)
+ })
break
- def add_minutes(self, cursor, user, company, date, minutes, context=None):
+ def add_minutes(self, company, date, minutes):
minutes = int(round(minutes))
minutes = date.minute + minutes
hours = minutes // 60
if hours:
- date = self.add_hours(cursor, user, company, date, hours,
- context=context)
+ date = self.add_hours(company, date, hours)
minutes = minutes % 60
@@ -258,21 +251,19 @@ class Work(ModelSQL, ModelView):
return date
- def add_hours(self, cursor, user, company, date, hours, context=None):
+ def add_hours(self, company, date, hours):
day_per_week = company.hours_per_work_week / company.hours_per_work_day
while hours:
if hours != intfloor(hours):
minutes = (hours - intfloor(hours)) * 60
- date = self.add_minutes(cursor, user, company, date, minutes,
- context=context)
+ date = self.add_minutes(company, date, minutes)
hours = intfloor(hours)
hours = date.hour + hours
days = hours // company.hours_per_work_day
if days:
- date = self.add_days(cursor, user, company, date, days,
- context=context)
+ date = self.add_days(company, date, days)
hours = hours % company.hours_per_work_day
@@ -288,14 +279,13 @@ class Work(ModelSQL, ModelView):
return date
- def add_days(self, cursor, user, company, date, days, context=None):
+ def add_days(self, company, date, days):
day_per_week = company.hours_per_work_week / company.hours_per_work_day
while days:
if days != intfloor(days):
hours = (days - intfloor(days)) * company.hours_per_work_day
- date = self.add_hours(cursor, user, company, date, hours,
- context=context)
+ date = self.add_hours(company, date, hours)
days = intfloor(days)
days = date.weekday() + days
@@ -304,8 +294,7 @@ class Work(ModelSQL, ModelView):
days = days % day_per_week
if weeks:
- date = self.add_weeks(cursor, user, company, date, weeks,
- context=context)
+ date = self.add_weeks(company, date, weeks)
date += datetime.timedelta(days= -date.weekday() + intfloor(days))
@@ -313,21 +302,20 @@ class Work(ModelSQL, ModelView):
return date
- def add_weeks(self, cursor, user, company, date, weeks, context=None):
+ def add_weeks(self, company, date, weeks):
day_per_week = company.hours_per_work_week / company.hours_per_work_day
if weeks != intfloor(weeks):
days = (weeks - intfloor(weeks)) * day_per_week
if days:
- date = self.add_days(cursor, user, company, date, days,
- context=context)
+ date = self.add_days(company, date, days)
date += datetime.timedelta(days= 7 * intfloor(weeks))
return date
- def compute_dates(self, cursor, user, work_id, context=None):
- active_work = self.browse(cursor, user, work_id, context=context)
+ def compute_dates(self, work_id):
+ active_work = self.browse(work_id)
values = {}
get_early_finish = lambda work: values.get(work, {}).get(
'early_finish_time', work['early_finish_time'])
@@ -363,9 +351,9 @@ class Work(ModelSQL, ModelView):
else:
early_finish_time = None
if values[work]['early_start_time']:
- early_finish_time = self.add_hours(cursor, user,
- work.company, values[work]['early_start_time'],
- work.duration, context=context)
+ early_finish_time = self.add_hours(work.company,
+ values[work]['early_start_time'],
+ work.duration)
values[work]['early_finish_time'] = early_finish_time
# Propagate constraint_start on successors
@@ -397,9 +385,8 @@ class Work(ModelSQL, ModelView):
work.constraint_start_time)
if constraint_start:
- early_start = self.add_hours(cursor, user,
- work.company, constraint_start, work.leveling_delay,
- context=context)
+ early_start = self.add_hours(work.company, constraint_start,
+ work.leveling_delay)
else:
early_start = None
@@ -444,9 +431,9 @@ class Work(ModelSQL, ModelView):
else:
late_start_time = None
if values[work]['late_finish_time']:
- late_start_time = self.add_hours(cursor, user,
- work.company, values[work]['late_finish_time'],
- -work.duration, context=context)
+ late_start_time = self.add_hours(work.company,
+ values[work]['late_finish_time'],
+ -work.duration)
values[work]['late_start_time'] = late_start_time
# Propagate constraint_finish on predecessors
@@ -478,9 +465,8 @@ class Work(ModelSQL, ModelView):
work.constraint_finish_time)
if constraint_finish:
- late_finish = self.add_hours(cursor, user, work.company,
- constraint_finish, -work.back_leveling_delay,
- context=context)
+ late_finish = self.add_hours(work.company, constraint_finish,
+ -work.back_leveling_delay)
else:
late_finish = None
@@ -511,19 +497,18 @@ class Work(ModelSQL, ModelView):
break
if write_cond:
- self.write(cursor, user, work.id, val, context=context)
+ self.write(work.id, val)
- def reset_leveling(self, cursor, user, work_id, context=None):
+ def reset_leveling(self, work_id):
get_key = lambda w: (set(p.id for p in w.predecessors),
set(s.id for s in w.successors))
- work = self.browse(cursor, user, work_id, context=context)
+ work = self.browse(work_id)
parent_id = work.parent and work.parent.id or False
- sibling_ids = self.search(cursor, user, [
+ sibling_ids = self.search([
('parent', '=', parent_id)
- ], context=context)
- siblings = self.browse(cursor, user, sibling_ids,
- context=context)
+ ])
+ siblings = self.browse(sibling_ids)
to_clean = []
ref_key = get_key(work)
@@ -534,12 +519,12 @@ class Work(ModelSQL, ModelView):
to_clean.append(sibling.id)
if to_clean:
- self.write(cursor, user, to_clean, {
+ self.write(to_clean, {
'leveling_delay': 0,
'back_leveling_delay': 0,
- }, context=context)
+ })
- def create_leveling(self, cursor, user, work_id, context=None):
+ def create_leveling(self, work_id):
# define some helper functions
get_key = lambda w: (set(p.id for p in w.predecessors),
set(s.id for s in w.successors))
@@ -593,70 +578,65 @@ class Work(ModelSQL, ModelView):
yield sibling, delay
- work = self.browse(cursor, user, work_id, context=context)
+ work = self.browse(work_id)
parent_id = work.parent and work.parent.id or False
- sibling_ids = self.search(cursor, user, [
+ sibling_ids = self.search([
('parent', '=', parent_id)
- ], context=context)
+ ])
refkey = get_key(work)
- siblings = [s for s in self.browse(cursor, user, sibling_ids,
- context=context) if get_key(s) == refkey]
+ siblings = [s for s in self.browse(sibling_ids) if get_key(s) == refkey]
for sibling, delay in compute_delays(siblings):
- self.write(cursor, user, sibling.id, {
+ self.write(sibling.id, {
'leveling_delay': delay,
- }, context=context)
+ })
siblings.reverse()
for sibling, delay in compute_delays(siblings):
- self.write(cursor, user, sibling.id, {
+ self.write(sibling.id, {
'back_leveling_delay': delay,
- }, context=context)
+ })
if parent_id:
- self.compute_dates(cursor, user, parent_id, context=context)
+ self.compute_dates(parent_id)
- def write(self, cursor, user, ids, values, context=None):
- res = super(Work, self).write(cursor, user, ids, values,
- context=context)
+ def write(self, ids, values):
+ res = super(Work, self).write(ids, values)
if isinstance(ids, (int, long)):
ids = [ids]
if 'effort' in values:
for work_id in ids:
- self.reset_leveling(cursor, user, work_id,
- context=context)
+ self.reset_leveling(work_id)
fields = ('constraint_start_time', 'constraint_finish_time',
'effort')
if reduce(lambda x, y : x or y in values, fields, False):
for work_id in ids:
- self.compute_dates(cursor, user, work_id,
- context=context)
+ self.compute_dates(work_id)
return res
- def create(self, cursor, user, values, context=None):
- work_id = super(Work, self).create(cursor, user, values,
- context=context)
- self.reset_leveling(cursor, user, work_id, context=context)
- self.compute_dates(cursor, user, work_id, context=context)
+ def create(self, values):
+ work_id = super(Work, self).create(values)
+ self.reset_leveling(work_id)
+ self.compute_dates(work_id)
return work_id
- def delete(self, cursor, user, ids, context=None):
+ def delete(self, ids):
if isinstance(ids, (int, long)):
ids = [ids]
- works = self.browse(cursor, user, ids, context=context)
+ works = self.browse(ids)
to_update = set()
for work in works:
if work.parent and work.parent.id not in ids:
to_update.add(work.parent.id)
to_update.update(c.id for c in work.parent.children \
if c.id not in ids)
- res = super(Work, self).delete(cursor, user, ids, context=context)
+ res = super(Work, self).delete(ids)
for work_id in to_update:
- self.reset_leveling(cursor, user, work_id, context=context)
- self.compute_dates(cursor, user, work_id, context=context)
+ self.reset_leveling(work_id)
+ self.compute_dates(work_id)
return res
Work()
@@ -673,27 +653,24 @@ class PredecessorSuccessor(ModelSQL):
successor = fields.Many2One('project.work', 'Successor',
ondelete='CASCADE', required=True, select=1)
- def write(self, cursor, user, ids, values, context=None):
+ def write(self, ids, values):
work_obj = self.pool.get('project.work')
- res = super(PredecessorSuccessor, self).write(cursor, user, ids, values,
- context=context)
+ res = super(PredecessorSuccessor, self).write(ids, values)
for work_id in values.itervalues():
- work_obj.reset_leveling(cursor, user, work_id,
- context=context)
+ work_obj.reset_leveling(work_id)
for work_id in values.itervalues():
- work_obj.compute_dates(cursor, user, work_id,
- context=context)
+ work_obj.compute_dates(work_id)
return res
- def delete(self, cursor, user, ids, context=None):
+ def delete(self, ids):
work_obj = self.pool.get('project.work')
if isinstance(ids, (int, long)):
ids = [ids]
work_ids = set()
parent_ids = set()
- pred_succs = self.browse(cursor, user, ids, context=context)
+ pred_succs = self.browse(ids)
for pred_succ in pred_succs:
work_ids.update((pred_succ.predecessor.id,
pred_succ.successor.id))
@@ -701,31 +678,26 @@ class PredecessorSuccessor(ModelSQL):
if pred_succ.predecessor.parent:
parent_ids.add(pred_succ.predecessor.parent.id)
- res = super(PredecessorSuccessor, self).delete(cursor, user, ids,
- context=context)
+ res = super(PredecessorSuccessor, self).delete(ids)
for work_id in work_ids:
- work_obj.reset_leveling(cursor, user, work_id, context=context)
+ work_obj.reset_leveling(work_id)
for parent_id in parent_ids:
- work_obj.compute_dates(cursor, user, parent_id, context=context)
+ work_obj.compute_dates(parent_id)
return res
- def create(self, cursor, user, values, context=None):
+ def create(self, values):
work_obj = self.pool.get('project.work')
- ps_id = super(PredecessorSuccessor, self).create(cursor, user, values,
- context=context)
+ ps_id = super(PredecessorSuccessor, self).create(values)
- pred_succ = self.browse(cursor, user, ps_id, context=context)
- work_obj.reset_leveling(cursor, user, pred_succ.predecessor.id,
- context=context)
- work_obj.reset_leveling(cursor, user, pred_succ.successor.id,
- context=context)
+ pred_succ = self.browse(ps_id)
+ work_obj.reset_leveling(pred_succ.predecessor.id)
+ work_obj.reset_leveling(pred_succ.successor.id)
if pred_succ.predecessor.parent:
- work_obj.compute_dates(cursor, user, pred_succ.predecessor.parent.id,
- context=context)
+ work_obj.compute_dates(pred_succ.predecessor.parent.id)
return id
PredecessorSuccessor()
@@ -745,9 +717,9 @@ class Leveling(Wizard):
},
}
- def _leveling(self, cursor, user, data, context=None):
+ def _leveling(self, data):
work_obj = self.pool.get('project.work')
- work_obj.create_leveling(cursor, user, data['id'], context=context)
+ work_obj.create_leveling(data['id'])
return {}
Leveling()
commit 16a4a0db7b91b7a2d5b97922607e3de6ef2f58b8
Author: Daniel Baumann <daniel at debian.org>
Date: Thu May 13 21:00:24 2010 +0200
Adding upstream version 1.6.0.
diff --git a/CHANGELOG b/CHANGELOG
new file mode 100644
index 0000000..6761693
--- /dev/null
+++ b/CHANGELOG
@@ -0,0 +1,2 @@
+Version 1.6.0 - 2010-05-13
+* Initial release
diff --git a/COPYRIGHT b/COPYRIGHT
new file mode 100644
index 0000000..1ab70ff
--- /dev/null
+++ b/COPYRIGHT
@@ -0,0 +1,16 @@
+Copyright (C) 2009-2010 Bertrand Chenal.
+Copyright (C) 2009-2010 Cédric Krier.
+Copyright (C) 2009-2010 B2CK SPRL.
+
+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..5291a4f
--- /dev/null
+++ b/INSTALL
@@ -0,0 +1,32 @@
+Installing trytond_project_plan
+===============================
+
+Prerequisites
+-------------
+
+ * Python 2.4 or later (http://www.python.org/)
+ * trytond (http://www.tryton.org/)
+ * trytond_company (http://www.tryton.org/)
+ * trytond_timesheet (http://www.tryton.org/)
+ * trytond_project (http://www.tryton.org/)
+
+Installation
+------------
+
+Once you've downloaded and unpacked the trytond_project_plan 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_plan.
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..7b252be
--- /dev/null
+++ b/MANIFEST.in
@@ -0,0 +1,10 @@
+include INSTALL
+include README
+include TODO
+include CHANGELOG
+include COPYRIGHT
+include LICENSE
+include *.xml
+include *.odt
+include *.csv
+include doc/*
diff --git a/PKG-INFO b/PKG-INFO
new file mode 100644
index 0000000..b382ff3
--- /dev/null
+++ b/PKG-INFO
@@ -0,0 +1,24 @@
+Metadata-Version: 1.0
+Name: trytond_project_plan
+Version: 1.6.0
+Summary: Add planning capabilities on projects.
+
+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/
+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 :: 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..aaa8386
--- /dev/null
+++ b/README
@@ -0,0 +1,36 @@
+trytond_project_plan
+====================
+
+The project_plan 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..82f48d4
--- /dev/null
+++ b/__init__.py
@@ -0,0 +1,5 @@
+#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 allocation import *
+from work import *
diff --git a/__tryton__.py b/__tryton__.py
new file mode 100644
index 0000000..c6cb50e
--- /dev/null
+++ b/__tryton__.py
@@ -0,0 +1,39 @@
+#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 Plan',
+ 'name_de_DE': 'Projekte Planung',
+ 'name_es_CO': 'Planeación de Proyectos',
+ 'name_es_ES': 'Planificación de proyecto',
+ 'name_fr_FR': 'Planification de projet',
+ 'version': '1.6.0',
+ 'author': 'B2CK',
+ 'email': 'info at b2ck.com',
+ 'website': 'http://www.tryton.org/',
+ 'description': '''Add planning capabilities on projects.
+''',
+ 'description_de_DE': '''Projektmodul Planung:
+ - Fügt Planungsmöglichkeiten für Projekte hinzu
+''',
+ 'description_es_CO': '''Añadir posibilidad de planeación de proyectos.
+''',
+ 'description_es_ES': 'Añade la capacidad de planificación de proyectos.',
+ 'description_fr_FR': '''Ajoute des fonctionnalités de planification à la gestion de projet.
+''',
+ 'depends': [
+ 'ir',
+ 'company',
+ 'project',
+ 'timesheet',
+ ],
+ 'xml': [
+ 'work.xml',
+ 'allocation.xml',
+ ],
+ 'translation': [
+ 'de_DE.csv',
+ 'es_CO.csv',
+ 'es_ES.csv',
+ 'fr_FR.csv',
+ ],
+}
diff --git a/allocation.py b/allocation.py
new file mode 100644
index 0000000..c739b72
--- /dev/null
+++ b/allocation.py
@@ -0,0 +1,66 @@
+#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.model import ModelView, ModelSQL, fields
+
+
+class Allocation(ModelSQL, ModelView):
+ 'Allocation'
+ _name = 'project.allocation'
+ _description = __doc__
+
+ _rec_name = 'employee'
+
+ employee = fields.Many2One('company.employee', 'Employee', required=True,
+ select=1)
+ work = fields.Many2One('project.work', 'Work', required=True,
+ select=1)
+ percentage = fields.Float('Percentage', digits=(16, 2), required=True)
+
+ def default_percentage(self, cursor, user_id, context=None):
+ return 100
+
+ def write(self, cursor, user, ids, values, context=None):
+ work_obj = self.pool.get('project.work')
+ res = super(Allocation, self).write(cursor, user, ids, values,
+ context=context)
+
+ if isinstance(ids, (int, long)):
+ ids = [ids]
+ work_ids = work_obj.search(cursor, user, [
+ ('allocations', 'in', ids),
+ ], context=context)
+
+ for work_id in work_ids:
+ work_obj.reset_leveling(cursor, user, work_id, context=context)
+ for work_id in work_ids:
+ work_obj.compute_dates(cursor, user, work_id, context=context)
+
+ return res
+
+ def create(self, cursor, user, values, context=None):
+ work_obj = self.pool.get('project.work')
+ allocation_id = super(Allocation, self).create(cursor, user, values,
+ context=context)
+ allocation = self.browse(cursor, user, allocation_id, context=context)
+ work_obj.reset_leveling(cursor, user, allocation.work.id,
+ context=context)
+ work_obj.compute_dates(cursor, user, allocation.work.id,
+ context=context)
+
+ def delete(self, cursor, user, ids, context=None):
+ work_obj = self.pool.get('project.work')
+ allocations = self.browse(cursor, user, ids, context=context)
+ work_ids = [a.work.id for a in allocations]
+ res = super(Allocation, self).delete(cursor, user, ids,
+ context=context)
+
+ for work_id in work_ids:
+ work_obj.reset_leveling(cursor, user, work_id, context=context)
+ for work_id in work_ids:
+ work_obj.compute_dates(cursor, user, work_id, context=context)
+
+ return res
+
+
+Allocation()
diff --git a/allocation.xml b/allocation.xml
new file mode 100644
index 0000000..fc83e93
--- /dev/null
+++ b/allocation.xml
@@ -0,0 +1,38 @@
+<?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.ui.view" id="allocation_view_form">
+ <field name="model">project.allocation</field>
+ <field name="type">form</field>
+ <field name="arch" type="xml">
+ <![CDATA[
+ <form string="Allocation">
+ <label name="employee"/>
+ <field name="employee"/>
+ <label name="percentage"/>
+ <field name="percentage"/>
+ <label name="work"/>
+ <field name="work"/>
+ </form>
+ ]]>
+ </field>
+ </record>
+ <record model="ir.ui.view" id="allocation_view_tree">
+ <field name="model">project.allocation</field>
+ <field name="type">tree</field>
+ <field name="priority" eval="8"/>
+ <field name="arch" type="xml">
+ <![CDATA[
+ <tree string="Allocations">
+ <field name="employee"/>
+ <field name="percentage"/>
+ <field name="work"/>
+ </tree>
+ ]]>
+ </field>
+ </record>
+ </data>
+</tryton>
diff --git a/de_DE.csv b/de_DE.csv
new file mode 100644
index 0000000..92f0066
--- /dev/null
+++ b/de_DE.csv
@@ -0,0 +1,41 @@
+type,name,res_id,src,value,fuzzy
+error,project.work,0,You can not create recursive dependencies!,Es können keine rekursiven Abhängigkeiten erstellt werden!,0
+field,"project.allocation,employee",0,Employee,Mitarbeiter,0
+field,"project.allocation,percentage",0,Percentage,Prozentsatz,0
+field,"project.allocation,rec_name",0,Name,Name,0
+field,"project.allocation,work",0,Work,Arbeit,0
+field,"project.predecessor_successor,predecessor",0,Predecessor,Vorgänger,0
+field,"project.predecessor_successor,rec_name",0,Name,Name,0
+field,"project.predecessor_successor,successor",0,Successor,Nachfolger,0
+field,"project.work,actual_finish_date",0,Actual Finish,Reales Enddatum,0
+field,"project.work,actual_finish_time",0,Actual Finish Time,Reale Endzeit,0
+field,"project.work,actual_start_date",0,Actual Start,Reales Startdatum,0
+field,"project.work,actual_start_time",0,Actual Start Time,Reale Startzeit,0
+field,"project.work,allocations",0,Allocations,Zuordnungen,0
+field,"project.work,back_leveling_delay",0,Leveling Delay,Verzögerung Abgleich,0
+field,"project.work,constraint_finish_date",0,Constraint Finish,Bedingung Enddatum,0
+field,"project.work,constraint_finish_time",0,Constraint Finish Time,Bedingung Endzeit,0
+field,"project.work,constraint_start_date",0,Constraint Start,Bedingung Startdatum,0
+field,"project.work,constraint_start_time",0,Constraint Start Time,Bedingung Startzeit,0
+field,"project.work,duration",0,Duration,Dauer,0
+field,"project.work,early_finish_date",0,Early Finish,Frühestes Enddatum,0
+field,"project.work,early_finish_time",0,Early Finish Time,Früheste Endzeit,0
+field,"project.work,early_start_date",0,Early Start,Frühestes Startdatum,0
+field,"project.work,early_start_time",0,Early Start Time,Früheste Startzeit,0
+field,"project.work,late_finish_date",0,Late Finish,Spätestes Enddatum,0
+field,"project.work,late_finish_time",0,Late Finish Time,Späteste Endzeit,0
+field,"project.work,late_start_date",0,Late Start,Spätestes Startdatum,0
+field,"project.work,late_start_time",0,Late Start Time,Späteste Startzeit,0
+field,"project.work,leveling_delay",0,Leveling Delay,Verzögerung Abgleich,0
+field,"project.work,predecessors",0,Predecessors,Vorgänger,0
+field,"project.work,requests",0,Requests,Anfragen,0
+field,"project.work,successors",0,Successors,Nachfolger,0
+model,"ir.action,name",wizard_leveling,Tasks Leveling,Aufgaben abgleichen,0
+model,"project.allocation,name",0,Allocation,Zuordnung,0
+model,"project.predecessor_successor,name",0,Predecessor - Successor,Vorgänger - Nachfolger,0
+model,"res.request.link,name",request_link_work,Work,Arbeit,0
+view,project.allocation,0,Allocation,Zuordnung,0
+view,project.allocation,0,Allocations,Zuordnungen,0
+view,project.work,0,Allocations,Zuordnungen,0
+view,project.work,0,Plan,Plan,0
+view,project.work,0,Requests,Anfragen,0
diff --git a/doc/index.rst b/doc/index.rst
new file mode 100644
index 0000000..ffad83d
--- /dev/null
+++ b/doc/index.rst
@@ -0,0 +1,38 @@
+Project Plan Module
+###################
+
+The Project Plan module adds planning features on top of the Project
+module.
+
+
+Allocation
+##########
+
+An allocation links together an employee, a task and a percentage. It
+defines which part of his time the employee should dedicate to this
+task.
+
+
+Work
+####
+
+The Work model is extended to support planning features:
+
+- Tasks dependencies: Each work may have predecessor and
+ successors. Predecessor and successor must share the same parent
+ project.
+- tasks leveling, I.E. automatically delay some task to avoid
+ overallocation of resources.
+- Early Start and Late End computation: If Constraint Start and
+ Constraint End are set on a work, on its parent work or on one of
+ the predecessors/successors, the Early Start and Late End dates (but
+ also Late Start and Early Finish dates) are computed automatically.
+- Resource allocation: Each task may allocate one or more resource
+ (I.E. a certain amount of time of an employee).
+- Requests: On each work, a list of request is available, allowing to
+ exchange and follow various information about the work execution.
+
+
+The *Task Leveling* wizard allow to level a group of tasks to avoid
+eventual overallocation of resources, It will delay some tasks
+depending on task precedencies and task sequences.
diff --git a/es_CO.csv b/es_CO.csv
new file mode 100644
index 0000000..a4f0202
--- /dev/null
+++ b/es_CO.csv
@@ -0,0 +1,41 @@
+type,name,res_id,src,value,fuzzy
+error,project.work,0,You can not create recursive dependencies!,¡No puede crear dependencias recursivas!,0
+field,"project.allocation,employee",0,Employee,Empleado,0
+field,"project.allocation,percentage",0,Percentage,Porcentaje,0
+field,"project.allocation,rec_name",0,Name,Nombre,0
+field,"project.allocation,work",0,Work,Trabajo,0
+field,"project.predecessor_successor,predecessor",0,Predecessor,Predecesor,0
+field,"project.predecessor_successor,rec_name",0,Name,Nombre,0
+field,"project.predecessor_successor,successor",0,Successor,Sucesor,0
+field,"project.work,actual_finish_date",0,Actual Finish,Fin Actual,0
+field,"project.work,actual_finish_time",0,Actual Finish Time,Tiempo del Actual Fin,0
+field,"project.work,actual_start_date",0,Actual Start,Comienzo Actual,0
+field,"project.work,actual_start_time",0,Actual Start Time,Tiempo del Actual Comienzo,0
+field,"project.work,allocations",0,Allocations,Cuotas,0
+field,"project.work,back_leveling_delay",0,Leveling Delay,Retardo de Escalamiento,0
+field,"project.work,constraint_finish_date",0,Constraint Finish,Final de la Restricción,0
+field,"project.work,constraint_finish_time",0,Constraint Finish Time,Tiempo Final de la Restricción,0
+field,"project.work,constraint_start_date",0,Constraint Start,Comienzo de la Restricción,0
+field,"project.work,constraint_start_time",0,Constraint Start Time,Tiempo del Comienzo de la Restricción,0
+field,"project.work,duration",0,Duration,Duración,0
+field,"project.work,early_finish_date",0,Early Finish,Final Temprano,0
+field,"project.work,early_finish_time",0,Early Finish Time,Tiempo del Temprano Final,0
+field,"project.work,early_start_date",0,Early Start,Comienzo Temprano,0
+field,"project.work,early_start_time",0,Early Start Time,Tiempo el Temprano Comienzo,0
+field,"project.work,late_finish_date",0,Late Finish,Final Tardío,0
+field,"project.work,late_finish_time",0,Late Finish Time,Tiempo del Tardío Final,0
+field,"project.work,late_start_date",0,Late Start,Comienzo Tardío,0
+field,"project.work,late_start_time",0,Late Start Time,Tiempo del Tardío Comienzo,0
+field,"project.work,leveling_delay",0,Leveling Delay,Retardo del Escalamiento,0
+field,"project.work,predecessors",0,Predecessors,Predecesores,0
+field,"project.work,requests",0,Requests,Solicitudes,0
+field,"project.work,successors",0,Successors,Sucesores,0
+model,"ir.action,name",wizard_leveling,Tasks Leveling,Escalamiento de Tareas,0
+model,"project.allocation,name",0,Allocation,Cuotas,0
+model,"project.predecessor_successor,name",0,Predecessor - Successor,Predecesor - Sucesor,0
+model,"res.request.link,name",request_link_work,Work,Trabajo,0
+view,project.allocation,0,Allocation,Cuota,0
+view,project.allocation,0,Allocations,Cuotas,0
+view,project.work,0,Allocations,Cuotas,0
+view,project.work,0,Plan,Plan,0
+view,project.work,0,Requests,Solicitudes,0
diff --git a/es_ES.csv b/es_ES.csv
new file mode 100644
index 0000000..3a2f21c
--- /dev/null
+++ b/es_ES.csv
@@ -0,0 +1,41 @@
+type,name,res_id,src,value,fuzzy
+error,project.work,0,You can not create recursive dependencies!,No puede crear dependencias recursivas,0
+field,"project.allocation,employee",0,Employee,Empleado,0
+field,"project.allocation,percentage",0,Percentage,Porcentaje,0
+field,"project.allocation,rec_name",0,Name,Nombre,0
+field,"project.allocation,work",0,Work,Actividad,0
+field,"project.predecessor_successor,predecessor",0,Predecessor,Predecesor,0
+field,"project.predecessor_successor,rec_name",0,Name,Nombre,0
+field,"project.predecessor_successor,successor",0,Successor,Sucesor,0
+field,"project.work,actual_finish_date",0,Actual Finish,Finalización real,0
+field,"project.work,actual_finish_time",0,Actual Finish Time,Hora de finalización real,0
+field,"project.work,actual_start_date",0,Actual Start,Inicio real,0
+field,"project.work,actual_start_time",0,Actual Start Time,Hora de inicio real,0
+field,"project.work,allocations",0,Allocations,Asignaciones,0
+field,"project.work,back_leveling_delay",0,Leveling Delay,Retraso de la nivelación,0
+field,"project.work,constraint_finish_date",0,Constraint Finish,Restricción de finalización,0
+field,"project.work,constraint_finish_time",0,Constraint Finish Time,Restricción de hora de finalización,0
+field,"project.work,constraint_start_date",0,Constraint Start,Restricción de inicio,0
+field,"project.work,constraint_start_time",0,Constraint Start Time,Restricción de tiempo de inicio,0
+field,"project.work,duration",0,Duration,Duración,0
+field,"project.work,early_finish_date",0,Early Finish,Finalización prematura,0
+field,"project.work,early_finish_time",0,Early Finish Time,Hora de finalización prematura,0
+field,"project.work,early_start_date",0,Early Start,Inicio prematuro,0
+field,"project.work,early_start_time",0,Early Start Time,Tiempo de inicio prematuro,0
+field,"project.work,late_finish_date",0,Late Finish,,0
+field,"project.work,late_finish_time",0,Late Finish Time,Hora de finalización tardía,0
+field,"project.work,late_start_date",0,Late Start,Inicio tardío,0
+field,"project.work,late_start_time",0,Late Start Time,Hora de inicio tardía,0
+field,"project.work,leveling_delay",0,Leveling Delay,Retraso de nivelación,0
+field,"project.work,predecessors",0,Predecessors,Predecesores,0
+field,"project.work,requests",0,Requests,Solicitudes,0
+field,"project.work,successors",0,Successors,Sucesores,0
+model,"ir.action,name",wizard_leveling,Tasks Leveling,Nivelación de tareas,0
+model,"project.allocation,name",0,Allocation,Asignación,0
+model,"project.predecessor_successor,name",0,Predecessor - Successor,Predecesor - Sucesor,0
+model,"res.request.link,name",request_link_work,Work,Actividad,0
+view,project.allocation,0,Allocation,Asignación,0
+view,project.allocation,0,Allocations,Asignaciones,0
+view,project.work,0,Allocations,Asignaciones,0
+view,project.work,0,Plan,Plan,0
+view,project.work,0,Requests,Solicitudes,0
diff --git a/fr_FR.csv b/fr_FR.csv
new file mode 100644
index 0000000..6116795
--- /dev/null
+++ b/fr_FR.csv
@@ -0,0 +1,41 @@
+type,name,res_id,src,value,fuzzy
+error,project.work,0,You can not create recursive dependencies!,Vous ne pouvez pas créer des dépendances récursives !,0
+field,"project.allocation,employee",0,Employee,Employé,1
+field,"project.allocation,percentage",0,Percentage,Pourcentage,1
+field,"project.allocation,rec_name",0,Name,Nom,1
+field,"project.allocation,work",0,Work,Tâche,1
+field,"project.predecessor_successor,predecessor",0,Predecessor,Prédécesseur,0
+field,"project.predecessor_successor,rec_name",0,Name,Nom,1
+field,"project.predecessor_successor,successor",0,Successor,Successeur,0
+field,"project.work,actual_finish_date",0,Actual Finish,Fin réelle,0
+field,"project.work,actual_finish_time",0,Actual Finish Time,Fin réelle,0
+field,"project.work,actual_start_date",0,Actual Start,Début réel,0
+field,"project.work,actual_start_time",0,Actual Start Time,Début réel,0
+field,"project.work,allocations",0,Allocations,Répartitions,0
+field,"project.work,back_leveling_delay",0,Leveling Delay,Délais de décalage,0
+field,"project.work,constraint_finish_date",0,Constraint Finish,Fin imposée,0
+field,"project.work,constraint_finish_time",0,Constraint Finish Time,Fin imposée,0
+field,"project.work,constraint_start_date",0,Constraint Start,Début imposé,0
+field,"project.work,constraint_start_time",0,Constraint Start Time,Début imposé,0
+field,"project.work,duration",0,Duration,Durée,0
+field,"project.work,early_finish_date",0,Early Finish,Fin au plus tôt,0
+field,"project.work,early_finish_time",0,Early Finish Time,Fin au plus tôt,0
+field,"project.work,early_start_date",0,Early Start,Départ au plus tôt,0
+field,"project.work,early_start_time",0,Early Start Time,Départ au plus tôt,0
+field,"project.work,late_finish_date",0,Late Finish,Fin au plus tard,0
+field,"project.work,late_finish_time",0,Late Finish Time,Fin au plus tard,0
+field,"project.work,late_start_date",0,Late Start,Début au plus tard,0
+field,"project.work,late_start_time",0,Late Start Time,au plus tard,0
+field,"project.work,leveling_delay",0,Leveling Delay,Délais décalage,0
+field,"project.work,predecessors",0,Predecessors,Prédécesseurs,0
+field,"project.work,requests",0,Requests,Demandes,1
+field,"project.work,successors",0,Successors,Successeurs,0
+model,"ir.action,name",wizard_leveling,Tasks Leveling,Décalage des tâches,0
+model,"project.allocation,name",0,Allocation,Répartition,0
+model,"project.predecessor_successor,name",0,Predecessor - Successor,Prédécesseur - Successeur,0
+model,"res.request.link,name",request_link_work,Work,Tâche,1
+view,project.allocation,0,Allocation,Répartition,0
+view,project.allocation,0,Allocations,Répartitions,0
+view,project.work,0,Allocations,Répartitions,0
+view,project.work,0,Plan,Planification,0
+view,project.work,0,Requests,Demandes,1
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..160220d
--- /dev/null
+++ b/setup.py
@@ -0,0 +1,62 @@
+#!/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
+import re
+
+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_%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_plan',
+ 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_plan': '.'},
+ packages=[
+ 'trytond.modules.project_plan',
+ 'trytond.modules.project_plan.tests',
+ ],
+ package_data={
+ 'trytond.modules.project_plan': 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 :: 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_plan = trytond.modules.project_plan
+ """,
+ test_suite='tests',
+ test_loader='trytond.test_loader:Loader',
+)
diff --git a/tests/__init__.py b/tests/__init__.py
new file mode 100644
index 0000000..2d8bd59
--- /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_plan import suite
diff --git a/tests/test_project_plan.py b/tests/test_project_plan.py
new file mode 100644
index 0000000..93b768c
--- /dev/null
+++ b/tests/test_project_plan.py
@@ -0,0 +1,37 @@
+#!/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 test_view
+
+
+class ProjectPlanTestCase(unittest.TestCase):
+ '''
+ Test ProjectPlan module.
+ '''
+
+ def setUp(self):
+ trytond.tests.test_tryton.install_module('project_plan')
+
+ def test0005views(self):
+ '''
+ Test views.
+ '''
+ self.assertRaises(Exception, test_view('project_plan'))
+
+def suite():
+ suite = trytond.tests.test_tryton.suite()
+ suite.addTests(unittest.TestLoader().loadTestsFromTestCase(
+ ProjectPlanTestCase))
+ return suite
+
+if __name__ == '__main__':
+ unittest.TextTestRunner(verbosity=2).run(suite())
diff --git a/trytond_project_plan.egg-info/PKG-INFO b/trytond_project_plan.egg-info/PKG-INFO
new file mode 100644
index 0000000..654dc2d
--- /dev/null
+++ b/trytond_project_plan.egg-info/PKG-INFO
@@ -0,0 +1,24 @@
+Metadata-Version: 1.0
+Name: trytond-project-plan
+Version: 1.6.0
+Summary: Add planning capabilities on projects.
+
+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/
+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 :: German
+Classifier: Operating System :: OS Independent
+Classifier: Programming Language :: Python
+Classifier: Topic :: Office/Business
diff --git a/trytond_project_plan.egg-info/SOURCES.txt b/trytond_project_plan.egg-info/SOURCES.txt
new file mode 100644
index 0000000..9f24ce5
--- /dev/null
+++ b/trytond_project_plan.egg-info/SOURCES.txt
@@ -0,0 +1,27 @@
+CHANGELOG
+COPYRIGHT
+INSTALL
+LICENSE
+MANIFEST.in
+README
+allocation.xml
+de_DE.csv
+es_CO.csv
+es_ES.csv
+fr_FR.csv
+setup.py
+work.xml
+./__init__.py
+./__tryton__.py
+./allocation.py
+./work.py
+./tests/__init__.py
+./tests/test_project_plan.py
+doc/index.rst
+trytond_project_plan.egg-info/PKG-INFO
+trytond_project_plan.egg-info/SOURCES.txt
+trytond_project_plan.egg-info/dependency_links.txt
+trytond_project_plan.egg-info/entry_points.txt
+trytond_project_plan.egg-info/not-zip-safe
+trytond_project_plan.egg-info/requires.txt
+trytond_project_plan.egg-info/top_level.txt
\ No newline at end of file
diff --git a/trytond_project_plan.egg-info/dependency_links.txt b/trytond_project_plan.egg-info/dependency_links.txt
new file mode 100644
index 0000000..8b13789
--- /dev/null
+++ b/trytond_project_plan.egg-info/dependency_links.txt
@@ -0,0 +1 @@
+
diff --git a/trytond_project_plan.egg-info/entry_points.txt b/trytond_project_plan.egg-info/entry_points.txt
new file mode 100644
index 0000000..75e275a
--- /dev/null
+++ b/trytond_project_plan.egg-info/entry_points.txt
@@ -0,0 +1,4 @@
+
+ [trytond.modules]
+ project_plan = trytond.modules.project_plan
+
\ No newline at end of file
diff --git a/trytond_project_plan.egg-info/not-zip-safe b/trytond_project_plan.egg-info/not-zip-safe
new file mode 100644
index 0000000..8b13789
--- /dev/null
+++ b/trytond_project_plan.egg-info/not-zip-safe
@@ -0,0 +1 @@
+
diff --git a/trytond_project_plan.egg-info/requires.txt b/trytond_project_plan.egg-info/requires.txt
new file mode 100644
index 0000000..0b54410
--- /dev/null
+++ b/trytond_project_plan.egg-info/requires.txt
@@ -0,0 +1,4 @@
+trytond_company >= 1.6, < 1.7
+trytond_project >= 1.6, < 1.7
+trytond_timesheet >= 1.6, < 1.7
+trytond >= 1.6, < 1.7
\ No newline at end of file
diff --git a/trytond_project_plan.egg-info/top_level.txt b/trytond_project_plan.egg-info/top_level.txt
new file mode 100644
index 0000000..93df119
--- /dev/null
+++ b/trytond_project_plan.egg-info/top_level.txt
@@ -0,0 +1 @@
+trytond
diff --git a/work.py b/work.py
new file mode 100644
index 0000000..18d13a5
--- /dev/null
+++ b/work.py
@@ -0,0 +1,753 @@
+#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.model import ModelView, ModelSQL, fields
+from trytond.wizard import Wizard
+from trytond.pyson import Eval, Not, Equal
+from collections import deque, defaultdict
+from heapq import heappop, heappush
+import datetime
+
+def intfloor(x):
+ return int(round(x, 4))
+
+
+class Work(ModelSQL, ModelView):
+ _name = 'project.work'
+
+ predecessors = fields.Many2Many('project.predecessor_successor',
+ 'successor', 'predecessor', 'Predecessors',
+ domain=[
+ ('parent', '=', Eval('parent')),
+ ('id', '!=', Eval('active_id')),
+ ])
+ successors = fields.Many2Many('project.predecessor_successor',
+ 'predecessor', 'successor', 'Successors',
+ domain=[
+ ('parent', '=', Eval('parent')),
+ ('id', '!=', Eval('active_id')),
+ ])
+ leveling_delay = fields.Float("Leveling Delay")
+ back_leveling_delay = fields.Float("Leveling Delay")
+ allocations = fields.One2Many('project.allocation', 'work', 'Allocations',
+ states={
+ 'invisible': Not(Equal(Eval('type'), 'task')),
+ }, depends=['type'])
+ duration = fields.Function(fields.Float('Duration'), 'get_function_fields')
+ early_start_time = fields.DateTime("Early Start Time", readonly=True)
+ late_start_time = fields.DateTime("Late Start Time", readonly=True)
+ early_finish_time = fields.DateTime("Early Finish Time", readonly=True)
+ late_finish_time = fields.DateTime("Late Finish Time", readonly=True)
+ actual_start_time = fields.DateTime("Actual Start Time")
+ actual_finish_time = fields.DateTime("Actual Finish Time")
+ constraint_start_time = fields.DateTime("Constraint Start Time")
+ constraint_finish_time = fields.DateTime("Constraint Finish Time")
+ early_start_date = fields.Function(fields.Date('Early Start'),
+ 'get_function_fields')
+ late_start_date = fields.Function(fields.Date('Late Start'),
+ 'get_function_fields')
+ early_finish_date = fields.Function(fields.Date('Early Finish'),
+ 'get_function_fields')
+ late_finish_date = fields.Function(fields.Date('Late Finish'),
+ 'get_function_fields')
+ actual_start_date = fields.Function(fields.Date('Actual Start'),
+ 'get_function_fields', setter='set_function_fields')
+ actual_finish_date = fields.Function(fields.Date('Actual Finish'),
+ 'get_function_fields', setter='set_function_fields')
+ constraint_start_date = fields.Function(fields.Date('Constraint Start',
+ depends=['type']), 'get_function_fields',
+ setter='set_function_fields')
+ 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')
+
+ def __init__(self):
+ super(Work, self).__init__()
+ self._constraints += [
+ ('check_recursion', 'recursive_dependency'),
+ ]
+ self._error_messages.update({
+ 'recursive_dependency': 'You can not create recursive '
+ 'dependencies!',
+ })
+
+ def check_recursion(self,cursor, user, ids, parent='parent'):
+ return super(Work, self).check_recursion(cursor, user, ids,
+ parent='successors')
+
+ def get_function_fields(self, cursor, user, ids, names, context=None):
+ '''
+ Function to compute function fields
+
+ :param cursor: the database cursor
+ :param user: the user id
+ :param ids: the ids of the works
+ :param names: the list of field name to compute
+ :param args: optional argument
+ :param context: the context
+ :return: a dictionary with all field names as key and
+ a dictionary as value with id as key
+ '''
+ req_ref_obj = self.pool.get('res.request.reference')
+
+ res = {}
+
+ 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_ref_ids = req_ref_obj.search(cursor, user, [
+ ('reference', 'in', [
+ 'project.work,%s' % i for i in sub_ids
+ ]
+ ),
+ ], context=context)
+ req_refs = req_ref_obj.browse(cursor, user, req_ref_ids,
+ context=context)
+ for req_ref in req_refs:
+ _, work_id = req_ref.reference.split(',')
+ requests[int(work_id)].append(req_ref.request.id)
+
+ res['requests'] = requests
+
+ if 'duration' in names:
+ 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)
+
+ durations = {}
+ id2work = {}
+ leafs = set()
+ for work in works:
+ id2work[work.id] = work
+ if not work.children:
+ leafs.add(work.id)
+
+ total_allocation = 0
+ if not work.allocations:
+ durations[work.id] = work.effort
+ continue
+ for allocation in work.allocations:
+ total_allocation += allocation.percentage
+ durations[work.id] = work.effort / (total_allocation / 100.0)
+
+ 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 durations:
+ durations[work.parent.id] += durations[work_id]
+ parents.add(work.parent.id)
+ leafs = parents
+ res['duration'] = durations
+
+
+ fun_fields = ('early_start_date', 'early_finish_date',
+ 'late_start_date', 'late_finish_date',
+ 'actual_start_date', 'actual_finish_date',
+ 'constraint_start_date', 'constraint_finish_date')
+ db_fields = ('early_start_time', 'early_finish_time',
+ 'late_start_time', 'late_finish_time',
+ 'actual_start_time', 'actual_finish_time',
+ 'constraint_start_time', 'constraint_finish_time')
+
+ works = None
+ for fun_field, db_field in zip(fun_fields, db_fields):
+ if fun_field in names:
+ values = {}
+ if works is None:
+ works = self.browse(cursor, user, ids, context=context)
+ for work in works:
+ values[work.id] = work[db_field] \
+ and work[db_field].date() or None
+ res[fun_field] = values
+
+ return res
+
+ def set_function_fields(self, cursor, user, ids, name, value,
+ context=None):
+ request_obj = self.pool.get('res.request')
+ req_ref_obj = self.pool.get('res.request.reference')
+
+ if name == 'requests':
+ works = self.browse(cursor, user, ids, context=context)
+ currents = dict((req.id, req) for work in works for req in
+ work.requests)
+ for v in value:
+ to_unlink = []
+ to_link = []
+ operator = v[0]
+
+ target_ids = len(v) > 1 and v[1] or []
+ if 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))
+ elif operator == 'add':
+ to_link.extend((i for i in target_ids if i not in
+ currents))
+ elif operator == 'unlink':
+ to_unlink.extend((i for i in target_ids if i in currents))
+ elif operator == 'unlink_all':
+ to_unlink.extend(currents)
+ elif operator == 'delete':
+ request_obj.delete(cursor, user, to_delete,
+ context=context)
+ else:
+ raise Exception('Operation not supported')
+
+ req_ref_ids = []
+ for i in to_unlink:
+ request = currents[i]
+ for ref in request.references:
+ if int(ref.reference.split(',')[1]) in ids:
+ req_ref_ids.append(ref.id)
+ req_ref_obj.delete(cursor, user, req_ref_ids,
+ context=context)
+
+ for i in to_link:
+ for record_id in ids:
+ req_ref_obj.create(cursor, user, {
+ 'request': i,
+ 'reference': 'project.work,%s' % record_id,
+ }, context=context)
+ return
+
+ fun_fields = ('actual_start_date', 'actual_finish_date',
+ 'constraint_start_date', 'constraint_finish_date')
+ db_fields = ('actual_start_time', 'actual_finish_time',
+ 'constraint_start_time', 'constraint_finish_time')
+ for fun_field, db_field in zip(fun_fields, db_fields):
+ if fun_field == name:
+ self.write(cursor, user, ids, {
+ db_field: value \
+ and datetime.datetime.combine(value,
+ datetime.time()) \
+ or False,
+ }, context=context)
+ break
+
+ def add_minutes(self, cursor, user, company, date, minutes, context=None):
+ minutes = int(round(minutes))
+ minutes = date.minute + minutes
+
+ hours = minutes // 60
+ if hours:
+ date = self.add_hours(cursor, user, company, date, hours,
+ context=context)
+
+ minutes = minutes % 60
+
+ date = datetime.datetime(
+ date.year,
+ date.month,
+ date.day,
+ date.hour,
+ minutes,
+ date.second)
+
+ return date
+
+ def add_hours(self, cursor, user, company, date, hours, context=None):
+ day_per_week = company.hours_per_work_week / company.hours_per_work_day
+
+ while hours:
+ if hours != intfloor(hours):
+ minutes = (hours - intfloor(hours)) * 60
+ date = self.add_minutes(cursor, user, company, date, minutes,
+ context=context)
+ hours = intfloor(hours)
+
+ hours = date.hour + hours
+ days = hours // company.hours_per_work_day
+ if days:
+ date = self.add_days(cursor, user, company, date, days,
+ context=context)
+
+ hours = hours % company.hours_per_work_day
+
+ date = datetime.datetime(
+ date.year,
+ date.month,
+ date.day,
+ intfloor(hours),
+ date.minute,
+ date.second)
+
+ hours = hours - intfloor(hours)
+
+ return date
+
+ def add_days(self, cursor, user, company, date, days, context=None):
+ day_per_week = company.hours_per_work_week / company.hours_per_work_day
+
+ while days:
+ if days != intfloor(days):
+ hours = (days - intfloor(days)) * company.hours_per_work_day
+ date = self.add_hours(cursor, user, company, date, hours,
+ context=context)
+ days = intfloor(days)
+
+ days = date.weekday() + days
+
+ weeks = days // day_per_week
+ days = days % day_per_week
+
+ if weeks:
+ date = self.add_weeks(cursor, user, company, date, weeks,
+ context=context)
+
+ date += datetime.timedelta(days= -date.weekday() + intfloor(days))
+
+ days = days - intfloor(days)
+
+ return date
+
+ def add_weeks(self, cursor, user, company, date, weeks, context=None):
+ day_per_week = company.hours_per_work_week / company.hours_per_work_day
+
+ if weeks != intfloor(weeks):
+ days = (weeks - intfloor(weeks)) * day_per_week
+ if days:
+ date = self.add_days(cursor, user, company, date, days,
+ context=context)
+
+ date += datetime.timedelta(days= 7 * intfloor(weeks))
+
+ return date
+
+ def compute_dates(self, cursor, user, work_id, context=None):
+ active_work = self.browse(cursor, user, work_id, context=context)
+ values = {}
+ get_early_finish = lambda work: values.get(work, {}).get(
+ 'early_finish_time', work['early_finish_time'])
+ get_late_start = lambda work: values.get(work, {}).get(
+ 'late_start_time', work['late_start_time'])
+ maxdate = lambda x,y: x and y and max(x,y) or x or y
+ mindate = lambda x,y: x and y and min(x,y) or x or y
+
+
+ # propagate constraint_start_time
+ constraint_start = reduce(maxdate, (pred.early_finish_time \
+ for pred in active_work.predecessors), None)
+
+ if constraint_start is None and active_work.parent:
+ constraint_start = active_work.parent.early_start_time
+
+ constraint_start = maxdate(constraint_start,
+ active_work.constraint_start_time)
+
+ works = deque([(active_work, constraint_start)])
+ work2children = {}
+ parent = None
+
+ while works or parent:
+ if parent:
+ work = parent
+ parent = None
+
+ # Compute early_finish
+ if work.children:
+ early_finish_time = reduce(
+ maxdate, map(get_early_finish, work.children), None)
+ else:
+ early_finish_time = None
+ if values[work]['early_start_time']:
+ early_finish_time = self.add_hours(cursor, user,
+ work.company, values[work]['early_start_time'],
+ work.duration, context=context)
+ values[work]['early_finish_time'] = early_finish_time
+
+ # Propagate constraint_start on successors
+ for w in work.successors:
+ works.append((w, early_finish_time))
+
+ if not work.parent:
+ continue
+
+ # housecleaning work2children
+ if work.parent not in work2children:
+ work2children[work.parent] = set()
+ work2children[work.parent].update(work.successors)
+
+ if work in work2children[work.parent]:
+ work2children[work.parent].remove(work)
+
+ # if no sibling continue to walk up the tree
+ if not work2children.get(work.parent):
+ if not work.parent in values:
+ values[work.parent] = {}
+ parent = work.parent
+
+ continue
+
+ work, constraint_start = works.popleft()
+ # take constraint define on the work into account
+ constraint_start = maxdate(constraint_start,
+ work.constraint_start_time)
+
+ if constraint_start:
+ early_start = self.add_hours(cursor, user,
+ work.company, constraint_start, work.leveling_delay,
+ context=context)
+ else:
+ early_start = None
+
+ # update values
+ if not work in values:
+ values[work] = {}
+ values[work]['early_start_time'] = early_start
+
+ # Loop on children if they exist
+ if work.children and work not in work2children:
+ work2children[work] = set(work.children)
+ # Propagate constraint_start on children
+ for w in work.children:
+ if w.predecessors:
+ continue
+ works.append((w, early_start))
+ else:
+ parent = work
+
+ # propagate constraint_finish_time
+ constraint_finish = reduce(mindate, (succ.late_start_time \
+ for succ in active_work.successors), None)
+
+ if constraint_finish is None and active_work.parent:
+ constraint_finish = active_work.parent.late_finish_time
+
+ constraint_finish = mindate(constraint_finish,
+ active_work.constraint_finish_time)
+
+ works = deque([(active_work, constraint_finish)])
+ work2children = {}
+ parent = None
+
+ while works or parent:
+ if parent:
+ work = parent
+ parent = None
+
+ # Compute late_start
+ if work.children:
+ reduce(mindate, map(get_late_start, work.children), None)
+ else:
+ late_start_time = None
+ if values[work]['late_finish_time']:
+ late_start_time = self.add_hours(cursor, user,
+ work.company, values[work]['late_finish_time'],
+ -work.duration, context=context)
+ values[work]['late_start_time'] = late_start_time
+
+ # Propagate constraint_finish on predecessors
+ for w in work.predecessors:
+ works.append((w, late_start_time))
+
+ if not work.parent:
+ continue
+
+ # housecleaning work2children
+ if work.parent not in work2children:
+ work2children[work.parent] = set()
+ work2children[work.parent].update(work.predecessors)
+
+ if work in work2children[work.parent]:
+ work2children[work.parent].remove(work)
+
+ # if no sibling continue to walk up the tree
+ if not work2children.get(work.parent):
+ if not work.parent in values:
+ values[work.parent] = {}
+ parent = work.parent
+
+ continue
+
+ work, constraint_finish = works.popleft()
+ # take constraint define on the work into account
+ constraint_finish = mindate(constraint_finish,
+ work.constraint_finish_time)
+
+ if constraint_finish:
+ late_finish = self.add_hours(cursor, user, work.company,
+ constraint_finish, -work.back_leveling_delay,
+ context=context)
+ else:
+ late_finish = None
+
+ # update values
+ if not work in values:
+ values[work] = {}
+ values[work]['late_finish_time'] = late_finish
+
+ # Loop on children if they exist
+ if work.children and work not in work2children:
+ work2children[work] = set(work.children)
+ # Propagate constraint_start on children
+ for w in work.children:
+ if w.successors:
+ continue
+ works.append((w, late_finish))
+ else:
+ parent = work
+
+ # write values
+ write_fields = ('early_start_time', 'early_finish_time',
+ 'late_start_time', 'late_finish_time')
+ for work, val in values.iteritems():
+ write_cond = False
+ for field in write_fields:
+ if field in val and work[field] != val[field]:
+ write_cond = True
+ break
+
+ if write_cond:
+ self.write(cursor, user, work.id, val, context=context)
+
+ def reset_leveling(self, cursor, user, work_id, context=None):
+ get_key = lambda w: (set(p.id for p in w.predecessors),
+ set(s.id for s in w.successors))
+
+ work = self.browse(cursor, user, work_id, context=context)
+ parent_id = work.parent and work.parent.id or False
+ sibling_ids = self.search(cursor, user, [
+ ('parent', '=', parent_id)
+ ], context=context)
+ siblings = self.browse(cursor, user, sibling_ids,
+ context=context)
+ to_clean = []
+
+ ref_key = get_key(work)
+ for sibling in siblings:
+ if sibling.leveling_delay == sibling.back_leveling_delay == 0:
+ continue
+ if get_key(sibling) == ref_key:
+ to_clean.append(sibling.id)
+
+ if to_clean:
+ self.write(cursor, user, to_clean, {
+ 'leveling_delay': 0,
+ 'back_leveling_delay': 0,
+ }, context=context)
+
+ def create_leveling(self, cursor, user, work_id, context=None):
+ # define some helper functions
+ get_key = lambda w: (set(p.id for p in w.predecessors),
+ set(s.id for s in w.successors))
+ over_alloc = lambda current_alloc, work: \
+ reduce(lambda res, alloc: res or current_alloc[alloc.employee.id] + \
+ alloc.percentage > 100,
+ work.allocations,
+ False)
+ def sum_allocs(current_alloc, work):
+ res = defaultdict(float)
+ for alloc in work.allocations:
+ empl = alloc.employee.id
+ res[empl] = current_alloc[empl] + alloc.percentage
+ return res
+
+ def compute_delays(siblings):
+ # time_line is a list [[end_delay, allocations], ...], this
+ # mean that allocations is valid between the preceding end_delay
+ # (or 0 if it doesn't exist) and the current end_delay.
+ timeline = []
+ for sibling in siblings:
+ delay = 0
+ ignored = []
+ overloaded = []
+ item = None
+
+ while timeline:
+ # item is [end_delay, allocations]
+ item = heappop(timeline)
+ if over_alloc(item[1], sibling):
+ ignored.extend(overloaded)
+ ignored.append(item)
+ delay = item[0]
+ continue
+ elif item[1] >= delay + sibling.duration:
+ overloaded.append(item)
+ else:
+ #Succes!
+ break
+
+ heappush(timeline,
+ [delay + sibling.duration,
+ sum_allocs(defaultdict(float), sibling),
+ sibling.id])
+
+ for i in ignored:
+ heappush(timeline, i)
+ for i in overloaded:
+ i[1] = sum_allocs(i[1], sibling)
+ heappush(timeline, i)
+
+ yield sibling, delay
+
+ work = self.browse(cursor, user, work_id, context=context)
+ parent_id = work.parent and work.parent.id or False
+ sibling_ids = self.search(cursor, user, [
+ ('parent', '=', parent_id)
+ ], context=context)
+
+ refkey = get_key(work)
+ siblings = [s for s in self.browse(cursor, user, sibling_ids,
+ context=context) if get_key(s) == refkey]
+
+ for sibling, delay in compute_delays(siblings):
+ self.write(cursor, user, sibling.id, {
+ 'leveling_delay': delay,
+ }, context=context)
+
+ siblings.reverse()
+ for sibling, delay in compute_delays(siblings):
+ self.write(cursor, user, sibling.id, {
+ 'back_leveling_delay': delay,
+ }, context=context)
+
+ if parent_id:
+ self.compute_dates(cursor, user, parent_id, context=context)
+
+ def write(self, cursor, user, ids, values, context=None):
+ res = super(Work, self).write(cursor, user, ids, values,
+ context=context)
+ if isinstance(ids, (int, long)):
+ ids = [ids]
+
+ if 'effort' in values:
+ for work_id in ids:
+ self.reset_leveling(cursor, user, work_id,
+ context=context)
+ fields = ('constraint_start_time', 'constraint_finish_time',
+ 'effort')
+ if reduce(lambda x, y : x or y in values, fields, False):
+ for work_id in ids:
+ self.compute_dates(cursor, user, work_id,
+ context=context)
+ return res
+
+ def create(self, cursor, user, values, context=None):
+ work_id = super(Work, self).create(cursor, user, values,
+ context=context)
+ self.reset_leveling(cursor, user, work_id, context=context)
+ self.compute_dates(cursor, user, work_id, context=context)
+ return work_id
+
+ def delete(self, cursor, user, ids, context=None):
+ if isinstance(ids, (int, long)):
+ ids = [ids]
+ works = self.browse(cursor, user, ids, context=context)
+ to_update = set()
+ for work in works:
+ if work.parent and work.parent.id not in ids:
+ to_update.add(work.parent.id)
+ to_update.update(c.id for c in work.parent.children \
+ if c.id not in ids)
+ res = super(Work, self).delete(cursor, user, ids, context=context)
+
+ for work_id in to_update:
+ self.reset_leveling(cursor, user, work_id, context=context)
+ self.compute_dates(cursor, user, work_id, context=context)
+
+ return res
+Work()
+
+
+
+class PredecessorSuccessor(ModelSQL):
+ 'Predecessor - Successor'
+ _name = 'project.predecessor_successor'
+ _description = __doc__
+
+ predecessor = fields.Many2One('project.work', 'Predecessor',
+ ondelete='CASCADE', required=True, select=1)
+ successor = fields.Many2One('project.work', 'Successor',
+ ondelete='CASCADE', required=True, select=1)
+
+ def write(self, cursor, user, ids, values, context=None):
+ work_obj = self.pool.get('project.work')
+ res = super(PredecessorSuccessor, self).write(cursor, user, ids, values,
+ context=context)
+
+ for work_id in values.itervalues():
+ work_obj.reset_leveling(cursor, user, work_id,
+ context=context)
+ for work_id in values.itervalues():
+ work_obj.compute_dates(cursor, user, work_id,
+ context=context)
+ return res
+
+ def delete(self, cursor, user, ids, context=None):
+ work_obj = self.pool.get('project.work')
+ if isinstance(ids, (int, long)):
+ ids = [ids]
+
+ work_ids = set()
+ parent_ids = set()
+ pred_succs = self.browse(cursor, user, ids, context=context)
+ for pred_succ in pred_succs:
+ work_ids.update((pred_succ.predecessor.id,
+ pred_succ.successor.id))
+
+ if pred_succ.predecessor.parent:
+ parent_ids.add(pred_succ.predecessor.parent.id)
+
+ res = super(PredecessorSuccessor, self).delete(cursor, user, ids,
+ context=context)
+
+ for work_id in work_ids:
+ work_obj.reset_leveling(cursor, user, work_id, context=context)
+
+ for parent_id in parent_ids:
+ work_obj.compute_dates(cursor, user, parent_id, context=context)
+
+ return res
+
+ def create(self, cursor, user, values, context=None):
+ work_obj = self.pool.get('project.work')
+ ps_id = super(PredecessorSuccessor, self).create(cursor, user, values,
+ context=context)
+
+ pred_succ = self.browse(cursor, user, ps_id, context=context)
+ work_obj.reset_leveling(cursor, user, pred_succ.predecessor.id,
+ context=context)
+ work_obj.reset_leveling(cursor, user, pred_succ.successor.id,
+ context=context)
+
+ if pred_succ.predecessor.parent:
+ work_obj.compute_dates(cursor, user, pred_succ.predecessor.parent.id,
+ context=context)
+ return id
+
+PredecessorSuccessor()
+
+
+class Leveling(Wizard):
+ 'Tasks Leveling'
+ _name = 'project_plan.work.leveling'
+
+ states = {
+ 'init': {
+ 'result': {
+ 'type': 'action',
+ 'action': '_leveling',
+ 'state': 'end',
+ },
+ },
+ }
+
+ def _leveling(self, cursor, user, data, context=None):
+ work_obj = self.pool.get('project.work')
+ work_obj.create_leveling(cursor, user, data['id'], context=context)
+ return {}
+
+Leveling()
diff --git a/work.xml b/work.xml
new file mode 100644
index 0000000..fabc727
--- /dev/null
+++ b/work.xml
@@ -0,0 +1,71 @@
+<?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.ui.view" id="work_view_form">
+ <field name="model">project.work</field>
+ <field name="inherit" ref="project.work_view_form"/>
+ <field name="arch" type="xml">
+ <![CDATA[
+ <data>
+ <xpath expr="/form/notebook/page[@id="timesheet_lines"]"
+ position="after">
+ <page string="Plan" id="plan">
+ <label name="constraint_start_date"/>
+ <field name="constraint_start_date"/>
+ <label name="constraint_finish_date"/>
+ <field name="constraint_finish_date"/>
+ <label name="early_start_date"/>
+ <field name="early_start_date"/>
+ <label name="early_finish_date"/>
+ <field name="early_finish_date"/>
+ <label name="late_start_date"/>
+ <field name="late_start_date"/>
+ <label name="late_finish_date"/>
+ <field name="late_finish_date"/>
+ <label name="actual_start_date"/>
+ <field name="actual_start_date"/>
+ <label name="actual_finish_date"/>
+ <field name="actual_finish_date"/>
+ <label name="duration"/>
+ <field name="duration" widget="float_time" float_time="company_work_time"/>
+ <newline/>
+ <separator name="predecessors" colspan="2"/>
+ <separator name="successors" colspan="2"/>
+ <field name="predecessors" colspan="2"/>
+ <field name="successors" colspan="2"/>
+ </page>
+ <page string="Allocations" id="allocations"
+ states="{'invisible': Not(Equal(Eval('type'), 'task'))}" >
+ <separator name="allocations" colspan="4"/>
+ <field name="allocations" colspan="4"/>
+ </page>
+ <page string="Requests" id="requests">
+ <field name="requests"/>
+ </page>
+ </xpath>
+ </data>
+ ]]>
+ </field>
+ </record>
+
+ <record model="ir.action.wizard" id="wizard_leveling">
+ <field name="name">Tasks Leveling</field>
+ <field name="wiz_name">project_plan.work.leveling</field>
+ <field name="model">project.work</field>
+ </record>
+ <record model="ir.action.keyword" id="leveling_keyword">
+ <field name="keyword">form_action</field>
+ <field name="model">project.work,0</field>
+ <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