Skip to content

erp5
erp5
Commit d48240f2 authored by Rafael Monnerat's avatar Rafael Monnerat
Browse files
Options

All Tasks are added now at Task Module. 

* Changed Allowed  Content Types
* Added new action to add related tasks. (in Project and Project Line)

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@11037 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent 90210c47
Expand all Show whitespace changes
Inline Side-by-side
Showing with 462 additions and 345 deletions
bt5/erp5_project/ActionTemplateItem/portal_types/Project%20Line/add_task_related.xml 0 → 100644
View file @ d48240f2
<?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>
bt5/erp5_project/ActionTemplateItem/portal_types/Project%20Line/constraint.xml
View file @ d48240f2
......@@ -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>
......
bt5/erp5_project/ActionTemplateItem/portal_types/Project%20Line/task.xml → bt5/erp5_project/ActionTemplateItem/portal_types/Project%20Line/task_list.xml
View file @ d48240f2
......@@ -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>
......
bt5/erp5_project/ActionTemplateItem/portal_types/Project/add_task_related.xml 0 → 100644
View file @ d48240f2
<?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>
bt5/erp5_project/ActionTemplateItem/portal_types/Project/task.xml → bt5/erp5_project/ActionTemplateItem/portal_types/Project/task_list.xml
View file @ d48240f2
......@@ -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>
......
bt5/erp5_project/PortalTypeAllowedContentTypeTemplateItem/allowed_content_types.xml
View file @ d48240f2
......@@ -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>
......
bt5/erp5_project/PortalTypeTemplateItem/portal_types/Project.xml
View file @ d48240f2
......@@ -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>
bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/ProjectLine_viewTaskList.xml
View file @ d48240f2
......@@ -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>
......
bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/ProjectLine_viewTaskList/listbox.xml
View file @ d48240f2
......@@ -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>
......
bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/ProjectLine_viewTaskList/listbox_int_index.xml
View file @ d48240f2
......@@ -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>
......
bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/ProjectLine_viewTaskList/listbox_quantity.xml
View file @ d48240f2
......@@ -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>
......
bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_viewTask.xml → bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_addTask.xml
View file @ d48240f2
......@@ -4,14 +4,24 @@
<pickle>
<tuple>
<tuple>
<string>Products.ERP5Form.Form</string>
<string>ERP5Form</string>
<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>
......@@ -31,7 +41,24 @@
<item>
<key> <string>_asgns</string> </key>
<value>
<dictionary/>
<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>
......@@ -40,125 +67,84 @@
</value>
</item>
<item>
<key> <string>_objects</string> </key>
<value>
<tuple/>
</value>
<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>action</string> </key>
<value> <string>Base_edit</string> </value>
<key> <string>_code</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>encoding</string> </key>
<value> <string>UTF-8</string> </value>
<key> <string>_filepath</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>enctype</string> </key>
<key> <string>_params</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>group_list</string> </key>
<key> <string>errors</string> </key>
<value>
<list>
<string>left</string>
<string>right</string>
<string>center</string>
<string>bottom</string>
<string>hidden</string>
</list>
<tuple/>
</value>
</item>
<item>
<key> <string>groups</string> </key>
<key> <string>func_code</string> </key>
<value>
<object>
<klass>
<global name="FuncCode" module="Shared.DC.Scripts.Signature"/>
</klass>
<tuple/>
<state>
<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>
<key> <string>co_argcount</string> </key>
<value> <int>0</int> </value>
</item>
<item>
<key> <string>hidden</string> </key>
<key> <string>co_varnames</string> </key>
<value>
<list>
<string>listbox_int_index</string>
<string>listbox_quantity</string>
<string>listbox_start_date</string>
<string>listbox_stop_date</string>
</list>
<tuple>
<string>_getattr_</string>
<string>context</string>
<string>context_obj</string>
<string>task</string>
</tuple>
</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>
</dictionary>
</state>
</object>
</value>
</item>
<item>
<key> <string>right</string> </key>
<key> <string>func_defaults</string> </key>
<value>
<list>
<string>my_start_date</string>
<string>my_stop_date</string>
<string>my_source_title_list</string>
</list>
</value>
</item>
</dictionary>
<none/>
</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>
<value> <string>Project_addTask</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>
<key> <string>warnings</string> </key>
<value>
<tuple/>
</value>
</item>
</dictionary>
</pickle>
......
bt5/erp5_project/bt/revision
View file @ d48240f2
132
\ No newline at end of file
144
\ No newline at end of file
bt5/erp5_project/bt/template_action_path_list
View file @ d48240f2
......@@ -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
......
bt5/erp5_project/bt/template_portal_type_allowed_content_type_list
View file @ d48240f2
......@@ -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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7