diff --git a/bt5/erp5_project/ActionTemplateItem/portal_types/Project%20Line/add_task_related.xml b/bt5/erp5_project/ActionTemplateItem/portal_types/Project%20Line/add_task_related.xml
new file mode 100644
index 0000000000000000000000000000000000000000..65ec17546acb3cf0c8e2269ef2079d03700d4989
--- /dev/null
+++ b/bt5/erp5_project/ActionTemplateItem/portal_types/Project%20Line/add_task_related.xml
@@ -0,0 +1,89 @@
+<?xml version="1.0"?>
+<ZopeData>
+ <record id="1" aka="AAAAAAAAAAE=">
+ <pickle>
+ <tuple>
+ <tuple>
+ <string>Products.CMFCore.ActionInformation</string>
+ <string>ActionInformation</string>
+ </tuple>
+ <none/>
+ </tuple>
+ </pickle>
+ <pickle>
+ <dictionary>
+ <item>
+ <key> <string>__ac_local_roles__</string> </key>
+ <value>
+ <none/>
+ </value>
+ </item>
+ <item>
+ <key> <string>action</string> </key>
+ <value>
+ <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+ </value>
+ </item>
+ <item>
+ <key> <string>category</string> </key>
+ <value> <string>object_action</string> </value>
+ </item>
+ <item>
+ <key> <string>condition</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>description</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>icon</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>id</string> </key>
+ <value> <string>add_task_related</string> </value>
+ </item>
+ <item>
+ <key> <string>permissions</string> </key>
+ <value>
+ <tuple>
+ <string>View</string>
+ </tuple>
+ </value>
+ </item>
+ <item>
+ <key> <string>priority</string> </key>
+ <value> <float>22.0</float> </value>
+ </item>
+ <item>
+ <key> <string>title</string> </key>
+ <value> <string>Add Task Related to This Project</string> </value>
+ </item>
+ <item>
+ <key> <string>visible</string> </key>
+ <value> <int>1</int> </value>
+ </item>
+ </dictionary>
+ </pickle>
+ </record>
+ <record id="2" aka="AAAAAAAAAAI=">
+ <pickle>
+ <tuple>
+ <tuple>
+ <string>Products.CMFCore.Expression</string>
+ <string>Expression</string>
+ </tuple>
+ <none/>
+ </tuple>
+ </pickle>
+ <pickle>
+ <dictionary>
+ <item>
+ <key> <string>text</string> </key>
+ <value> <string>string:${object_url}/Project_addTask</string> </value>
+ </item>
+ </dictionary>
+ </pickle>
+ </record>
+</ZopeData>
diff --git a/bt5/erp5_project/ActionTemplateItem/portal_types/Project%20Line/constraint.xml b/bt5/erp5_project/ActionTemplateItem/portal_types/Project%20Line/constraint.xml
index 2c1b5994e053fbd7e12bf9381189e2f71412f32d..a19da5207448724f6bce4ee0da42a26c1377ae51 100644
--- a/bt5/erp5_project/ActionTemplateItem/portal_types/Project%20Line/constraint.xml
+++ b/bt5/erp5_project/ActionTemplateItem/portal_types/Project%20Line/constraint.xml
@@ -54,7 +54,7 @@
</item>
<item>
<key> <string>priority</string> </key>
- <value> <float>2.0</float> </value>
+ <value> <float>3.0</float> </value>
</item>
<item>
<key> <string>title</string> </key>
diff --git a/bt5/erp5_project/ActionTemplateItem/portal_types/Project%20Line/task.xml b/bt5/erp5_project/ActionTemplateItem/portal_types/Project%20Line/task_list.xml
similarity index 98%
rename from bt5/erp5_project/ActionTemplateItem/portal_types/Project%20Line/task.xml
rename to bt5/erp5_project/ActionTemplateItem/portal_types/Project%20Line/task_list.xml
index 099c7267129cbc4f3082ed95de54bb67b1c1d99e..08f34d96adbc4018c91cfbe7e7574f8dcd6215b2 100644
--- a/bt5/erp5_project/ActionTemplateItem/portal_types/Project%20Line/task.xml
+++ b/bt5/erp5_project/ActionTemplateItem/portal_types/Project%20Line/task_list.xml
@@ -44,7 +44,7 @@
</item>
<item>
<key> <string>id</string> </key>
- <value> <string>task</string> </value>
+ <value> <string>task_list</string> </value>
</item>
<item>
<key> <string>permissions</string> </key>
diff --git a/bt5/erp5_project/ActionTemplateItem/portal_types/Project/add_task_related.xml b/bt5/erp5_project/ActionTemplateItem/portal_types/Project/add_task_related.xml
new file mode 100644
index 0000000000000000000000000000000000000000..2f5e1022d3baa65aac63e27ba21b5bec173e39ac
--- /dev/null
+++ b/bt5/erp5_project/ActionTemplateItem/portal_types/Project/add_task_related.xml
@@ -0,0 +1,89 @@
+<?xml version="1.0"?>
+<ZopeData>
+ <record id="1" aka="AAAAAAAAAAE=">
+ <pickle>
+ <tuple>
+ <tuple>
+ <string>Products.CMFCore.ActionInformation</string>
+ <string>ActionInformation</string>
+ </tuple>
+ <none/>
+ </tuple>
+ </pickle>
+ <pickle>
+ <dictionary>
+ <item>
+ <key> <string>__ac_local_roles__</string> </key>
+ <value>
+ <none/>
+ </value>
+ </item>
+ <item>
+ <key> <string>action</string> </key>
+ <value>
+ <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+ </value>
+ </item>
+ <item>
+ <key> <string>category</string> </key>
+ <value> <string>object_action</string> </value>
+ </item>
+ <item>
+ <key> <string>condition</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>description</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>icon</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>id</string> </key>
+ <value> <string>add_task_related</string> </value>
+ </item>
+ <item>
+ <key> <string>permissions</string> </key>
+ <value>
+ <tuple>
+ <string>View</string>
+ </tuple>
+ </value>
+ </item>
+ <item>
+ <key> <string>priority</string> </key>
+ <value> <float>23.0</float> </value>
+ </item>
+ <item>
+ <key> <string>title</string> </key>
+ <value> <string>Add Task Related to This Project</string> </value>
+ </item>
+ <item>
+ <key> <string>visible</string> </key>
+ <value> <int>1</int> </value>
+ </item>
+ </dictionary>
+ </pickle>
+ </record>
+ <record id="2" aka="AAAAAAAAAAI=">
+ <pickle>
+ <tuple>
+ <tuple>
+ <string>Products.CMFCore.Expression</string>
+ <string>Expression</string>
+ </tuple>
+ <none/>
+ </tuple>
+ </pickle>
+ <pickle>
+ <dictionary>
+ <item>
+ <key> <string>text</string> </key>
+ <value> <string>string:${object_url}/Project_addTask</string> </value>
+ </item>
+ </dictionary>
+ </pickle>
+ </record>
+</ZopeData>
diff --git a/bt5/erp5_project/ActionTemplateItem/portal_types/Project/task.xml b/bt5/erp5_project/ActionTemplateItem/portal_types/Project/task_list.xml
similarity index 98%
rename from bt5/erp5_project/ActionTemplateItem/portal_types/Project/task.xml
rename to bt5/erp5_project/ActionTemplateItem/portal_types/Project/task_list.xml
index 6959a6d77dca4f960eebf0a222be3afdbde95456..c4894c161d856955a397281fca8b0e1563cd7414 100644
--- a/bt5/erp5_project/ActionTemplateItem/portal_types/Project/task.xml
+++ b/bt5/erp5_project/ActionTemplateItem/portal_types/Project/task_list.xml
@@ -44,7 +44,7 @@
</item>
<item>
<key> <string>id</string> </key>
- <value> <string>task</string> </value>
+ <value> <string>task_list</string> </value>
</item>
<item>
<key> <string>permissions</string> </key>
diff --git a/bt5/erp5_project/PortalTypeAllowedContentTypeTemplateItem/allowed_content_types.xml b/bt5/erp5_project/PortalTypeAllowedContentTypeTemplateItem/allowed_content_types.xml
index 6dedcbadd766da182a9cbd0d389399eaf69eabeb..0addbe08089997b56577e83442dfe0e4809d223f 100644
--- a/bt5/erp5_project/PortalTypeAllowedContentTypeTemplateItem/allowed_content_types.xml
+++ b/bt5/erp5_project/PortalTypeAllowedContentTypeTemplateItem/allowed_content_types.xml
@@ -2,7 +2,6 @@
<portal_type id="Project">
<item>Project Milestone</item>
<item>Web Page</item>
- <item>Task</item>
<item>File</item>
<item>Project Line</item>
<item>Image</item>
diff --git a/bt5/erp5_project/PortalTypeTemplateItem/portal_types/Project.xml b/bt5/erp5_project/PortalTypeTemplateItem/portal_types/Project.xml
index c30cda92a5dc1a49618ee9a57be1b35611a8858c..063c4c4aba6025662e36977ec5c8094ae8244116 100644
--- a/bt5/erp5_project/PortalTypeTemplateItem/portal_types/Project.xml
+++ b/bt5/erp5_project/PortalTypeTemplateItem/portal_types/Project.xml
@@ -36,6 +36,25 @@
<none/>
</value>
</item>
+ <item>
+ <key> <string>_property_domain_dict</string> </key>
+ <value>
+ <dictionary>
+ <item>
+ <key> <string>short_title</string> </key>
+ <value>
+ <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+ </value>
+ </item>
+ <item>
+ <key> <string>title</string> </key>
+ <value>
+ <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
+ </value>
+ </item>
+ </dictionary>
+ </value>
+ </item>
<item>
<key> <string>_roles</string> </key>
<value>
@@ -115,4 +134,50 @@
</dictionary>
</pickle>
</record>
+ <record id="2" aka="AAAAAAAAAAI=">
+ <pickle>
+ <tuple>
+ <tuple>
+ <string>Products.ERP5Type.TranslationProviderBase</string>
+ <string>TranslationInformation</string>
+ </tuple>
+ <none/>
+ </tuple>
+ </pickle>
+ <pickle>
+ <dictionary>
+ <item>
+ <key> <string>domain_name</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>property_name</string> </key>
+ <value> <string>short_title</string> </value>
+ </item>
+ </dictionary>
+ </pickle>
+ </record>
+ <record id="3" aka="AAAAAAAAAAM=">
+ <pickle>
+ <tuple>
+ <tuple>
+ <string>Products.ERP5Type.TranslationProviderBase</string>
+ <string>TranslationInformation</string>
+ </tuple>
+ <none/>
+ </tuple>
+ </pickle>
+ <pickle>
+ <dictionary>
+ <item>
+ <key> <string>domain_name</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>property_name</string> </key>
+ <value> <string>title</string> </value>
+ </item>
+ </dictionary>
+ </pickle>
+ </record>
</ZopeData>
diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/ProjectLine_viewTaskList.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/ProjectLine_viewTaskList.xml
index 7ff293831d4974372062aaac699924ba73ddc26b..18a9238aa15971f8f885856a6a46b0922db3c592 100644
--- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/ProjectLine_viewTaskList.xml
+++ b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/ProjectLine_viewTaskList.xml
@@ -95,11 +95,10 @@
<key> <string>hidden</string> </key>
<value>
<list>
- <string>listbox_title</string>
+ <string>listbox_int_index</string>
<string>listbox_quantity</string>
<string>listbox_start_date</string>
<string>listbox_stop_date</string>
- <string>listbox_int_index</string>
</list>
</value>
</item>
diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/ProjectLine_viewTaskList/listbox.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/ProjectLine_viewTaskList/listbox.xml
index d1152786ebc397ee05fd6a8f0410ee50416123cf..6988bef41f98781b15a8cd0fc56059a48a1c5cc2 100644
--- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/ProjectLine_viewTaskList/listbox.xml
+++ b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/ProjectLine_viewTaskList/listbox.xml
@@ -3,8 +3,11 @@
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<tuple>
- <global name="ListBox" module="Products.ERP5Form.ListBox"/>
- <tuple/>
+ <tuple>
+ <string>Products.ERP5Form.ListBox</string>
+ <string>ListBox</string>
+ </tuple>
+ <none/>
</tuple>
</pickle>
<pickle>
@@ -217,9 +220,7 @@
</item>
<item>
<key> <string>enabled</string> </key>
- <value>
- <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
- </value>
+ <value> <string></string> </value>
</item>
<item>
<key> <string>external_validator</string> </key>
@@ -275,9 +276,7 @@
</item>
<item>
<key> <string>selection_name</string> </key>
- <value>
- <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
- </value>
+ <value> <string></string> </value>
</item>
<item>
<key> <string>sort</string> </key>
@@ -322,13 +321,17 @@
<string>id</string>
<string>ID</string>
</tuple>
+ <tuple>
+ <string>int_index</string>
+ <string>Index</string>
+ </tuple>
<tuple>
<string>title</string>
<string>Title</string>
</tuple>
<tuple>
<string>source_title</string>
- <string>Colleague</string>
+ <string>Resource</string>
</tuple>
<tuple>
<string>start_date</string>
@@ -352,7 +355,24 @@
<item>
<key> <string>all_editable_columns</string> </key>
<value>
- <list/>
+ <list>
+ <tuple>
+ <string>int_index</string>
+ <string>Index</string>
+ </tuple>
+ <tuple>
+ <string>quantity</string>
+ <string>Estimated Time</string>
+ </tuple>
+ <tuple>
+ <string>start_date</string>
+ <string>Begin</string>
+ </tuple>
+ <tuple>
+ <string>stop_date</string>
+ <string>End</string>
+ </tuple>
+ </list>
</value>
</item>
<item>
@@ -373,7 +393,7 @@
</tuple>
<tuple>
<string>title</string>
- <string>Title</string>
+ <string>Task Title</string>
</tuple>
<tuple>
<string>source_title</string>
@@ -443,8 +463,8 @@
<value>
<list>
<tuple>
- <string>title</string>
- <string>Title</string>
+ <string>int_index</string>
+ <string>Index</string>
</tuple>
<tuple>
<string>quantity</string>
@@ -458,10 +478,6 @@
<string>stop_date</string>
<string>End</string>
</tuple>
- <tuple>
- <string>int_index</string>
- <string>int_index</string>
- </tuple>
</list>
</value>
</item>
@@ -494,7 +510,7 @@
<item>
<key> <string>list_method</string> </key>
<value>
- <persistent> <string encoding="base64">AAAAAAAAAAQ=</string> </persistent>
+ <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
</value>
</item>
<item>
@@ -503,13 +519,17 @@
<list/>
</value>
</item>
+ <item>
+ <key> <string>page_template</string> </key>
+ <value> <string></string> </value>
+ </item>
<item>
<key> <string>portal_types</string> </key>
<value>
<list>
<tuple>
- <string>Project Line</string>
- <string>Project Line</string>
+ <string>Task</string>
+ <string>Task</string>
</tuple>
</list>
</value>
@@ -520,14 +540,14 @@
<list>
<tuple>
<string>parent</string>
- <string>Document Tree</string>
+ <string>Object Tree</string>
</tuple>
</list>
</value>
</item>
<item>
<key> <string>report_tree</string> </key>
- <value> <int>0</int> </value>
+ <value> <int>1</int> </value>
</item>
<item>
<key> <string>search</string> </key>
@@ -545,16 +565,12 @@
</item>
<item>
<key> <string>selection_name</string> </key>
- <value> <string>project_selection</string> </value>
+ <value> <string>project_task_selection</string> </value>
</item>
<item>
<key> <string>sort</string> </key>
<value>
<list>
- <tuple>
- <string>int_index</string>
- <string>int_index</string>
- </tuple>
<tuple>
<string>id</string>
<string>id</string>
@@ -580,7 +596,7 @@
</item>
<item>
<key> <string>title</string> </key>
- <value> <string>Project Lines</string> </value>
+ <value> <string>Listbox</string> </value>
</item>
<item>
<key> <string>url_columns</string> </key>
@@ -598,52 +614,17 @@
<pickle>
<tuple>
<tuple>
- <string>Products.Formulator.TALESField</string>
- <string>TALESMethod</string>
+ <string>Products.Formulator.MethodField</string>
+ <string>Method</string>
</tuple>
<none/>
</tuple>
</pickle>
- <pickle>
- <dictionary>
- <item>
- <key> <string>_text</string> </key>
- <value> <string>python:here.objectIds()</string> </value>
- </item>
- </dictionary>
- </pickle>
- </record>
- <record id="3" aka="AAAAAAAAAAM=">
- <pickle>
- <tuple>
- <tuple>
- <string>Products.Formulator.TALESField</string>
- <string>TALESMethod</string>
- </tuple>
- <none/>
- </tuple>
- </pickle>
- <pickle>
- <dictionary>
- <item>
- <key> <string>_text</string> </key>
- <value> <string>python:\'project_selection_%s\' % len(here.getPhysicalPath())</string> </value>
- </item>
- </dictionary>
- </pickle>
- </record>
- <record id="4" aka="AAAAAAAAAAQ=">
- <pickle>
- <tuple>
- <global name="Method" module="Products.Formulator.MethodField"/>
- <tuple/>
- </tuple>
- </pickle>
<pickle>
<dictionary>
<item>
<key> <string>method_name</string> </key>
- <value> <string>searchFolder</string> </value>
+ <value> <string>getSourceProjectRelatedValueList</string> </value>
</item>
</dictionary>
</pickle>
diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/ProjectLine_viewTaskList/listbox_int_index.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/ProjectLine_viewTaskList/listbox_int_index.xml
index 49f1082a0fe12255ba827e3efad6944927e78d08..aaf2a4ab0538f2a69c23e547381eba30b569e8dc 100644
--- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/ProjectLine_viewTaskList/listbox_int_index.xml
+++ b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/ProjectLine_viewTaskList/listbox_int_index.xml
@@ -191,7 +191,7 @@
</item>
<item>
<key> <string>css_class</string> </key>
- <value> <string></string> </value>
+ <value> <string>figure</string> </value>
</item>
<item>
<key> <string>default</string> </key>
diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/ProjectLine_viewTaskList/listbox_quantity.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/ProjectLine_viewTaskList/listbox_quantity.xml
index 2e9c5fd83842380c1e6e5ba20e8bf167e27a2d75..46f0463943e41e4d472a9bf6388131eb4684a47f 100644
--- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/ProjectLine_viewTaskList/listbox_quantity.xml
+++ b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/ProjectLine_viewTaskList/listbox_quantity.xml
@@ -171,7 +171,7 @@
</item>
<item>
<key> <string>css_class</string> </key>
- <value> <string></string> </value>
+ <value> <string>figure</string> </value>
</item>
<item>
<key> <string>default</string> </key>
@@ -187,7 +187,7 @@
</item>
<item>
<key> <string>display_width</string> </key>
- <value> <int>20</int> </value>
+ <value> <int>10</int> </value>
</item>
<item>
<key> <string>editable</string> </key>
@@ -209,6 +209,14 @@
<key> <string>hidden</string> </key>
<value> <int>0</int> </value>
</item>
+ <item>
+ <key> <string>input_style</string> </key>
+ <value> <string>-1 234.5</string> </value>
+ </item>
+ <item>
+ <key> <string>precision</string> </key>
+ <value> <string></string> </value>
+ </item>
<item>
<key> <string>required</string> </key>
<value> <int>0</int> </value>
diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/ProjectLine_viewTaskList/listbox_title.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/ProjectLine_viewTaskList/listbox_title.xml
deleted file mode 100644
index f7baed96fb2031e5628ee4dcf5bd316d970d1367..0000000000000000000000000000000000000000
--- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/ProjectLine_viewTaskList/listbox_title.xml
+++ /dev/null
@@ -1,266 +0,0 @@
-<?xml version="1.0"?>
-<ZopeData>
- <record id="1" aka="AAAAAAAAAAE=">
- <pickle>
- <tuple>
- <tuple>
- <string>Products.Formulator.StandardFields</string>
- <string>StringField</string>
- </tuple>
- <none/>
- </tuple>
- </pickle>
- <pickle>
- <dictionary>
- <item>
- <key> <string>id</string> </key>
- <value> <string>listbox_title</string> </value>
- </item>
- <item>
- <key> <string>message_values</string> </key>
- <value>
- <dictionary>
- <item>
- <key> <string>external_validator_failed</string> </key>
- <value> <string>The input failed the external validator.</string> </value>
- </item>
- <item>
- <key> <string>required_not_found</string> </key>
- <value> <string>Input is required but no input given.</string> </value>
- </item>
- <item>
- <key> <string>too_long</string> </key>
- <value> <string>Too much input was given.</string> </value>
- </item>
- </dictionary>
- </value>
- </item>
- <item>
- <key> <string>overrides</string> </key>
- <value>
- <dictionary>
- <item>
- <key> <string>alternate_name</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>css_class</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>default</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>description</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>display_maxwidth</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>display_width</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>editable</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>enabled</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>external_validator</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>extra</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>hidden</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>max_length</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>required</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>title</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>truncate</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>unicode</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>whitespace_preserve</string> </key>
- <value> <string></string> </value>
- </item>
- </dictionary>
- </value>
- </item>
- <item>
- <key> <string>tales</string> </key>
- <value>
- <dictionary>
- <item>
- <key> <string>alternate_name</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>css_class</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>default</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>description</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>display_maxwidth</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>display_width</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>editable</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>enabled</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>external_validator</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>extra</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>hidden</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>max_length</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>required</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>title</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>truncate</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>unicode</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>whitespace_preserve</string> </key>
- <value> <string></string> </value>
- </item>
- </dictionary>
- </value>
- </item>
- <item>
- <key> <string>values</string> </key>
- <value>
- <dictionary>
- <item>
- <key> <string>alternate_name</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>css_class</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>default</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>description</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>display_maxwidth</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>display_width</string> </key>
- <value> <int>20</int> </value>
- </item>
- <item>
- <key> <string>editable</string> </key>
- <value> <int>1</int> </value>
- </item>
- <item>
- <key> <string>enabled</string> </key>
- <value> <int>1</int> </value>
- </item>
- <item>
- <key> <string>external_validator</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>extra</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>hidden</string> </key>
- <value> <int>0</int> </value>
- </item>
- <item>
- <key> <string>max_length</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>required</string> </key>
- <value> <int>0</int> </value>
- </item>
- <item>
- <key> <string>title</string> </key>
- <value> <string>Title</string> </value>
- </item>
- <item>
- <key> <string>truncate</string> </key>
- <value> <int>0</int> </value>
- </item>
- <item>
- <key> <string>unicode</string> </key>
- <value> <int>0</int> </value>
- </item>
- <item>
- <key> <string>whitespace_preserve</string> </key>
- <value> <int>0</int> </value>
- </item>
- </dictionary>
- </value>
- </item>
- </dictionary>
- </pickle>
- </record>
-</ZopeData>
diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_addTask.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_addTask.xml
new file mode 100644
index 0000000000000000000000000000000000000000..5db5279fb5acaaeeb7557290d5a84a24b91f6733
--- /dev/null
+++ b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_addTask.xml
@@ -0,0 +1,152 @@
+<?xml version="1.0"?>
+<ZopeData>
+ <record id="1" aka="AAAAAAAAAAE=">
+ <pickle>
+ <tuple>
+ <tuple>
+ <string>Products.PythonScripts.PythonScript</string>
+ <string>PythonScript</string>
+ </tuple>
+ <none/>
+ </tuple>
+ </pickle>
+ <pickle>
+ <dictionary>
+ <item>
+ <key> <string>Python_magic</string> </key>
+ <value>
+ <none/>
+ </value>
+ </item>
+ <item>
+ <key> <string>Script_magic</string> </key>
+ <value> <int>3</int> </value>
+ </item>
+ <item>
+ <key> <string>__ac_local_roles__</string> </key>
+ <value>
+ <none/>
+ </value>
+ </item>
+ <item>
+ <key> <string>_bind_names</string> </key>
+ <value>
+ <object>
+ <klass>
+ <global name="NameAssignments" module="Shared.DC.Scripts.Bindings"/>
+ </klass>
+ <tuple/>
+ <state>
+ <dictionary>
+ <item>
+ <key> <string>_asgns</string> </key>
+ <value>
+ <dictionary>
+ <item>
+ <key> <string>name_container</string> </key>
+ <value> <string>container</string> </value>
+ </item>
+ <item>
+ <key> <string>name_context</string> </key>
+ <value> <string>context</string> </value>
+ </item>
+ <item>
+ <key> <string>name_m_self</string> </key>
+ <value> <string>script</string> </value>
+ </item>
+ <item>
+ <key> <string>name_subpath</string> </key>
+ <value> <string>traverse_subpath</string> </value>
+ </item>
+ </dictionary>
+ </value>
+ </item>
+ </dictionary>
+ </state>
+ </object>
+ </value>
+ </item>
+ <item>
+ <key> <string>_body</string> </key>
+ <value> <string># Add a task in task_module. \n
+context_obj = context.getObject()\n
+task = context.task_module.newContent( portal_type = \'Task\')\n
+\n
+# Set the source_project \n
+task.setSourceProjectValue(context_obj)\n
+\n
+return context.REQUEST.RESPONSE.redirect(task.absolute_url() + \'?portal_status_message=Created+Task.\')\n
+</string> </value>
+ </item>
+ <item>
+ <key> <string>_code</string> </key>
+ <value>
+ <none/>
+ </value>
+ </item>
+ <item>
+ <key> <string>_filepath</string> </key>
+ <value>
+ <none/>
+ </value>
+ </item>
+ <item>
+ <key> <string>_params</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>errors</string> </key>
+ <value>
+ <tuple/>
+ </value>
+ </item>
+ <item>
+ <key> <string>func_code</string> </key>
+ <value>
+ <object>
+ <klass>
+ <global name="FuncCode" module="Shared.DC.Scripts.Signature"/>
+ </klass>
+ <tuple/>
+ <state>
+ <dictionary>
+ <item>
+ <key> <string>co_argcount</string> </key>
+ <value> <int>0</int> </value>
+ </item>
+ <item>
+ <key> <string>co_varnames</string> </key>
+ <value>
+ <tuple>
+ <string>_getattr_</string>
+ <string>context</string>
+ <string>context_obj</string>
+ <string>task</string>
+ </tuple>
+ </value>
+ </item>
+ </dictionary>
+ </state>
+ </object>
+ </value>
+ </item>
+ <item>
+ <key> <string>func_defaults</string> </key>
+ <value>
+ <none/>
+ </value>
+ </item>
+ <item>
+ <key> <string>id</string> </key>
+ <value> <string>Project_addTask</string> </value>
+ </item>
+ <item>
+ <key> <string>warnings</string> </key>
+ <value>
+ <tuple/>
+ </value>
+ </item>
+ </dictionary>
+ </pickle>
+ </record>
+</ZopeData>
diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_viewTask.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_viewTask.xml
deleted file mode 100644
index 2df5f8f61483c4536075d0bd2ce54be1e284e03f..0000000000000000000000000000000000000000
--- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_viewTask.xml
+++ /dev/null
@@ -1,166 +0,0 @@
-<?xml version="1.0"?>
-<ZopeData>
- <record id="1" aka="AAAAAAAAAAE=">
- <pickle>
- <tuple>
- <tuple>
- <string>Products.ERP5Form.Form</string>
- <string>ERP5Form</string>
- </tuple>
- <none/>
- </tuple>
- </pickle>
- <pickle>
- <dictionary>
- <item>
- <key> <string>__ac_local_roles__</string> </key>
- <value>
- <none/>
- </value>
- </item>
- <item>
- <key> <string>_bind_names</string> </key>
- <value>
- <object>
- <klass>
- <global name="NameAssignments" module="Shared.DC.Scripts.Bindings"/>
- </klass>
- <tuple/>
- <state>
- <dictionary>
- <item>
- <key> <string>_asgns</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
- <item>
- <key> <string>_objects</string> </key>
- <value>
- <tuple/>
- </value>
- </item>
- <item>
- <key> <string>action</string> </key>
- <value> <string>Base_edit</string> </value>
- </item>
- <item>
- <key> <string>encoding</string> </key>
- <value> <string>UTF-8</string> </value>
- </item>
- <item>
- <key> <string>enctype</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>group_list</string> </key>
- <value>
- <list>
- <string>left</string>
- <string>right</string>
- <string>center</string>
- <string>bottom</string>
- <string>hidden</string>
- </list>
- </value>
- </item>
- <item>
- <key> <string>groups</string> </key>
- <value>
- <dictionary>
- <item>
- <key> <string>bottom</string> </key>
- <value>
- <list>
- <string>listbox</string>
- </list>
- </value>
- </item>
- <item>
- <key> <string>center</string> </key>
- <value>
- <list>
- <string>my_description</string>
- </list>
- </value>
- </item>
- <item>
- <key> <string>hidden</string> </key>
- <value>
- <list>
- <string>listbox_int_index</string>
- <string>listbox_quantity</string>
- <string>listbox_start_date</string>
- <string>listbox_stop_date</string>
- </list>
- </value>
- </item>
- <item>
- <key> <string>left</string> </key>
- <value>
- <list>
- <string>my_title</string>
- <string>my_reference</string>
- <string>my_destination_section_title</string>
- <string>my_destination_title</string>
- </list>
- </value>
- </item>
- <item>
- <key> <string>right</string> </key>
- <value>
- <list>
- <string>my_start_date</string>
- <string>my_stop_date</string>
- <string>my_source_title_list</string>
- </list>
- </value>
- </item>
- </dictionary>
- </value>
- </item>
- <item>
- <key> <string>id</string> </key>
- <value> <string>Project_viewTask</string> </value>
- </item>
- <item>
- <key> <string>method</string> </key>
- <value> <string>POST</string> </value>
- </item>
- <item>
- <key> <string>name</string> </key>
- <value> <string>Project_view</string> </value>
- </item>
- <item>
- <key> <string>pt</string> </key>
- <value> <string>form_view</string> </value>
- </item>
- <item>
- <key> <string>row_length</string> </key>
- <value> <int>4</int> </value>
- </item>
- <item>
- <key> <string>stored_encoding</string> </key>
- <value> <string>UTF-8</string> </value>
- </item>
- <item>
- <key> <string>title</string> </key>
- <value> <string>Project</string> </value>
- </item>
- <item>
- <key> <string>unicode_mode</string> </key>
- <value> <int>0</int> </value>
- </item>
- <item>
- <key> <string>update_action</string> </key>
- <value> <string></string> </value>
- </item>
- </dictionary>
- </pickle>
- </record>
-</ZopeData>
diff --git a/bt5/erp5_project/bt/revision b/bt5/erp5_project/bt/revision
index dd1ec209f3358043353ec9054f1d3bf3416d325e..70e1a64c23f0dc1eb79598f64221bd0c38f18b97 100644
--- a/bt5/erp5_project/bt/revision
+++ b/bt5/erp5_project/bt/revision
@@ -1 +1 @@
-132
\ No newline at end of file
+144
\ No newline at end of file
diff --git a/bt5/erp5_project/bt/template_action_path_list b/bt5/erp5_project/bt/template_action_path_list
index 9778ca1979c064f7608fbd06a30bafba18681780..61792a35dab492570a6c8c5462c7e884c61c5a92 100644
--- a/bt5/erp5_project/bt/template_action_path_list
+++ b/bt5/erp5_project/bt/template_action_path_list
@@ -2,6 +2,7 @@ Project Cell | history_view
Project Cell | metadata
Project Cell | print
Project Cell | view
+Project Line | add_task_related
Project Line | available_budget
Project Line | constraint
Project Line | consumed_budget
@@ -14,8 +15,8 @@ Project Line | initial_budget
Project Line | jump_to_related_sale_order_lines
Project Line | metadata
Project Line | print
-Project Line | task
Project Line | task_fast_input_dialog
+Project Line | task_list
Project Line | view
Project Milestone | constraint
Project Milestone | history
@@ -24,6 +25,7 @@ Project Milestone | print
Project Milestone | view
Project Module | print_pdf
Project Module | view
+Project | add_task_related
Project | content
Project | detailed_report
Project | documents
@@ -36,8 +38,8 @@ Project | planning
Project | print
Project | project_lines
Project | report
-Project | task
Project | task_fast_input_dialog
+Project | task_list
Project | view
Requirement Document | detailed_report
Requirement Document | fast_input
diff --git a/bt5/erp5_project/bt/template_portal_type_allowed_content_type_list b/bt5/erp5_project/bt/template_portal_type_allowed_content_type_list
index 457249bbd81cedaee2c473ffeedfb6d7b387a933..3fde2355ec5d45fa8a0040fee13dced97613ae15 100644
--- a/bt5/erp5_project/bt/template_portal_type_allowed_content_type_list
+++ b/bt5/erp5_project/bt/template_portal_type_allowed_content_type_list
@@ -13,7 +13,6 @@ Project | File
Project | Image
Project | Project Line
Project | Project Milestone
-Project | Task
Project | Web Page
Requirement Document | Requirement
Requirement Module | Requirement Document