Skip to content

erp5
erp5
Commit 95274f07 authored by Jean-Paul Smets's avatar Jean-Paul Smets
Browse files
Options

Use source_trade to specify who will work on a project (it should probably be... 

Use source_trade to specify who will work on a project (it should probably be removed afterall since projects are only reporting structures). Use of reference instead of ID everywhere in requirements. SImplify columns in milestone lists. Added requirement to order matrix generation for requirement coverage. Make requirement report show description only if it exists.

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@15771 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent 20546651
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 1347 additions and 2057 deletions
bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/ProjectLine_view.xml
View file @ 95274f07
...@@ -121,7 +121,7 @@ ...@@ -121,7 +121,7 @@
<list> <list>
<string>my_start_date</string> <string>my_start_date</string>
<string>my_stop_date</string> <string>my_stop_date</string>
<string>my_source_title_list</string> <string>my_source_trade_title_list</string>
</list> </list>
</value> </value>
</item> </item>
......
bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/ProjectLine_view/my_source_title_list.xml → bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/ProjectLine_view/my_source_trade_title_list.xml
View file @ 95274f07
...@@ -3,15 +3,18 @@ ...@@ -3,15 +3,18 @@
<record id="1" aka="AAAAAAAAAAE="> <record id="1" aka="AAAAAAAAAAE=">
<pickle> <pickle>
<tuple> <tuple>
<global name="MultiRelationStringField" module="Products.ERP5Form.MultiRelationField"/> <tuple>
<tuple/> <string>Products.ERP5Form.MultiRelationField</string>
<string>MultiRelationStringField</string>
</tuple>
<none/>
</tuple> </tuple>
</pickle> </pickle>
<pickle> <pickle>
<dictionary> <dictionary>
<item> <item>
<key> <string>id</string> </key> <key> <string>id</string> </key>
<value> <string>my_source_title_list</string> </value> <value> <string>my_source_trade_title_list</string> </value>
</item> </item>
<item> <item>
<key> <string>message_values</string> </key> <key> <string>message_values</string> </key>
......
bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_viewMilestone.xml
View file @ 95274f07
...@@ -95,7 +95,6 @@ ...@@ -95,7 +95,6 @@
<list> <list>
<string>listbox_int_index</string> <string>listbox_int_index</string>
<string>listbox_quantity</string> <string>listbox_quantity</string>
<string>listbox_start_date</string>
<string>listbox_stop_date</string> <string>listbox_stop_date</string>
</list> </list>
</value> </value>
......
bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_viewMilestone/listbox.xml
View file @ 95274f07
...@@ -329,26 +329,10 @@ ...@@ -329,26 +329,10 @@
<string>title</string> <string>title</string>
<string>Title</string> <string>Title</string>
</tuple> </tuple>
<tuple>
<string>source_title</string>
<string>Resource</string>
</tuple>
<tuple>
<string>start_date</string>
<string>Begin</string>
</tuple>
<tuple> <tuple>
<string>stop_date</string> <string>stop_date</string>
<string>End</string> <string>End</string>
</tuple> </tuple>
<tuple>
<string>quantity</string>
<string>Estimated Time</string>
</tuple>
<tuple>
<string>destination_title</string>
<string>Location</string>
</tuple>
</list> </list>
</value> </value>
</item> </item>
...@@ -395,30 +379,10 @@ ...@@ -395,30 +379,10 @@
<string>title</string> <string>title</string>
<string>Title</string> <string>Title</string>
</tuple> </tuple>
<tuple>
<string>source_title</string>
<string>Resource</string>
</tuple>
<tuple>
<string>start_date</string>
<string>Begin</string>
</tuple>
<tuple> <tuple>
<string>stop_date</string> <string>stop_date</string>
<string>End</string> <string>End</string>
</tuple> </tuple>
<tuple>
<string>quantity</string>
<string>Estimated Time</string>
</tuple>
<tuple>
<string>quantity_unit</string>
<string>Unit</string>
</tuple>
<tuple>
<string>destination_title</string>
<string>Location</string>
</tuple>
</list> </list>
</value> </value>
</item> </item>
...@@ -470,10 +434,6 @@ ...@@ -470,10 +434,6 @@
<string>quantity</string> <string>quantity</string>
<string>Estimated Time</string> <string>Estimated Time</string>
</tuple> </tuple>
<tuple>
<string>start_date</string>
<string>Begin</string>
</tuple>
<tuple> <tuple>
<string>stop_date</string> <string>stop_date</string>
<string>End</string> <string>End</string>
...@@ -531,6 +491,10 @@ ...@@ -531,6 +491,10 @@
<string>Project Milestone</string> <string>Project Milestone</string>
<string>Project Milestone</string> <string>Project Milestone</string>
</tuple> </tuple>
<tuple>
<string>Sale Order Milestone</string>
<string>Sale Order Milestone</string>
</tuple>
</list> </list>
</value> </value>
</item> </item>
......
bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/RequirementDocument_getOrderCoverageList.xml 0 → 100644
View file @ 95274f07
<?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>result = []\n
\n
for r in context.contentValues(portal_type= "Requirement", sort_on = ((\'int_index\',\'ascending\', \'int\'),)):\n
if not r.getRequirementRelatedValueList():\n
if not r.contentValues(portal_type= "Requirement", sort_on = ((\'int_index\',\'ascending\', \'int\'),)):\n
result.append({\'requirement_reference\': r.Requirement_getDefaultReference(),\n
\'requirement_title\': r.getTitle(),\n
\'project_reference\': \'Not covered\',\n
\'project_title\': \'\',\n
\'stop_date\': None})\n
else:\n
for p in r.getRequirementRelatedValueList():\n
result.append({\'requirement_reference\': r.Requirement_getDefaultReference(),\n
\'requirement_title\': r.getTitle(),\n
\'project_reference\': p.Project_getDefaultReference(),\n
\'project_title\': p.getTitle(),\n
\'stop_date\': p.getStopDate()})\n
result.extend(r.RequirementDocument_getProjectCoverageList())\n
\n
return result\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>_owner</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>result</string>
<string>_getiter_</string>
<string>_getattr_</string>
<string>context</string>
<string>r</string>
<string>None</string>
<string>p</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>RequirementDocument_getOrderCoverageList</string> </value>
</item>
<item>
<key> <string>warnings</string> </key>
<value>
<tuple/>
</value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/RequirementDocument_view.xml
View file @ 95274f07
...@@ -95,6 +95,7 @@ ...@@ -95,6 +95,7 @@
<list> <list>
<string>listbox_sub_requirement_count</string> <string>listbox_sub_requirement_count</string>
<string>listbox_int_index</string> <string>listbox_int_index</string>
<string>listbox_reference</string>
</list> </list>
</value> </value>
</item> </item>
......
bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/RequirementDocument_view/listbox.xml
View file @ 95274f07
...@@ -3,8 +3,11 @@ ...@@ -3,8 +3,11 @@
<record id="1" aka="AAAAAAAAAAE="> <record id="1" aka="AAAAAAAAAAE=">
<pickle> <pickle>
<tuple> <tuple>
<global name="ListBox" module="Products.ERP5Form.ListBox"/> <tuple>
<tuple/> <string>Products.ERP5Form.ListBox</string>
<string>ListBox</string>
</tuple>
<none/>
</tuple> </tuple>
</pickle> </pickle>
<pickle> <pickle>
...@@ -330,14 +333,14 @@ ...@@ -330,14 +333,14 @@
<key> <string>columns</string> </key> <key> <string>columns</string> </key>
<value> <value>
<list> <list>
<tuple>
<string>id</string>
<string>ID</string>
</tuple>
<tuple> <tuple>
<string>int_index</string> <string>int_index</string>
<string>Index</string> <string>Index</string>
</tuple> </tuple>
<tuple>
<string>reference</string>
<string>Reference</string>
</tuple>
<tuple> <tuple>
<string>title</string> <string>title</string>
<string>Requirement Title</string> <string>Requirement Title</string>
...@@ -401,6 +404,10 @@ ...@@ -401,6 +404,10 @@
<string>int_index</string> <string>int_index</string>
<string>Index</string> <string>Index</string>
</tuple> </tuple>
<tuple>
<string>reference</string>
<string>Reference</string>
</tuple>
<tuple> <tuple>
<string>sub_requirement_count</string> <string>sub_requirement_count</string>
<string>Sub-Requirement Count</string> <string>Sub-Requirement Count</string>
...@@ -466,6 +473,10 @@ ...@@ -466,6 +473,10 @@
<key> <string>not_viewable</string> </key> <key> <string>not_viewable</string> </key>
<value> <int>0</int> </value> <value> <int>0</int> </value>
</item> </item>
<item>
<key> <string>page_template</string> </key>
<value> <string></string> </value>
</item>
<item> <item>
<key> <string>portal_types</string> </key> <key> <string>portal_types</string> </key>
<value> <value>
...@@ -540,6 +551,10 @@ ...@@ -540,6 +551,10 @@
<string>int_index</string> <string>int_index</string>
<string>Index</string> <string>Index</string>
</tuple> </tuple>
<tuple>
<string>reference</string>
<string>Refence</string>
</tuple>
<tuple> <tuple>
<string>title</string> <string>title</string>
<string>Requirement Title</string> <string>Requirement Title</string>
...@@ -596,8 +611,11 @@ ...@@ -596,8 +611,11 @@
<record id="2" aka="AAAAAAAAAAI="> <record id="2" aka="AAAAAAAAAAI=">
<pickle> <pickle>
<tuple> <tuple>
<global name="Method" module="Products.Formulator.MethodField"/> <tuple>
<tuple/> <string>Products.Formulator.MethodField</string>
<string>Method</string>
</tuple>
<none/>
</tuple> </tuple>
</pickle> </pickle>
<pickle> <pickle>
......
bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/RequirementDocument_viewDetailedReportAsOdt.xml
View file @ 95274f07
...@@ -119,7 +119,8 @@ AAA=</string> </value> ...@@ -119,7 +119,8 @@ AAA=</string> </value>
<text:h text:outline-level=\'1\' text:style-name=\'Heading_20_1\' tal:content="python:\'%s %s\' % (current_requirement.getReference(requirement_base), current_requirement.getTitle())"\n <text:h text:outline-level=\'1\' text:style-name=\'Heading_20_1\' tal:content="python:\'%s %s\' % (current_requirement.getReference(requirement_base), current_requirement.getTitle())"\n
tal:attributes="text:outline-level python:\'%s\' % depth;\n tal:attributes="text:outline-level python:\'%s\' % depth;\n
\t\t\t\ttext:style-name python:\'Heading_20_%s\' % depth"><tal:trans i18n:domain="erp5_ui" i18n:translate="Project Line" /></text:h>\n \t\t\t\ttext:style-name python:\'Heading_20_%s\' % depth"><tal:trans i18n:domain="erp5_ui" i18n:translate="Project Line" /></text:h>\n
<text:p text:style-name=\'Text_20_body\' tal:content="current_requirement/getDescription">Description of project line.</text:p>\n <text:p text:style-name=\'Text_20_body\' tal:content="current_requirement/getDescription"\n
tal:condition="current_requirement/getDescription">Description of project line.</text:p>\n
<tal:block tal:define="requirement_list python:current_requirement.contentValues(portal_type = \'Requirement\', sort_on = ((\'int_index\',\'ascending\', \'int\'),))">\n <tal:block tal:define="requirement_list python:current_requirement.contentValues(portal_type = \'Requirement\', sort_on = ((\'int_index\',\'ascending\', \'int\'),))">\n
<!-- make sure there are some lines to display in the table -->\n <!-- make sure there are some lines to display in the table -->\n
<tal:block tal:define="global has_content python:0"/>\n <tal:block tal:define="global has_content python:0"/>\n
......
bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/RequirementDocument_viewOrderMappingReportDialog.xml 0 → 100644
View file @ 95274f07
<?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>_owner</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>action</string> </key>
<value> <string>RequirementDocument_viewProjectMappingReportAsOdt</string> </value>
</item>
<item>
<key> <string>encoding</string> </key>
<value> <string>UTF-8</string> </value>
</item>
<item>
<key> <string>enctype</string> </key>
<value> <string>multipart/form-data</string> </value>
</item>
<item>
<key> <string>group_list</string> </key>
<value>
<list>
<string>Default</string>
</list>
</value>
</item>
<item>
<key> <string>groups</string> </key>
<value>
<dictionary>
<item>
<key> <string>Default</string> </key>
<value>
<list/>
</value>
</item>
</dictionary>
</value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>RequirementDocument_viewOrderMappingReportDialog</string> </value>
</item>
<item>
<key> <string>method</string> </key>
<value> <string>POST</string> </value>
</item>
<item>
<key> <string>name</string> </key>
<value> <string>RequirementDocument_viewProjectMappingReportDialog</string> </value>
</item>
<item>
<key> <string>pt</string> </key>
<value> <string>form_dialog</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 Mapping</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>
bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Requirement_view.xml
View file @ 95274f07
...@@ -96,6 +96,7 @@ ...@@ -96,6 +96,7 @@
<list> <list>
<string>listbox_sub_requirement_count</string> <string>listbox_sub_requirement_count</string>
<string>listbox_int_index</string> <string>listbox_int_index</string>
<string>listbox_reference</string>
</list> </list>
</value> </value>
</item> </item>
......
bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Requirement_view/listbox.xml
View file @ 95274f07
...@@ -3,8 +3,11 @@ ...@@ -3,8 +3,11 @@
<record id="1" aka="AAAAAAAAAAE="> <record id="1" aka="AAAAAAAAAAE=">
<pickle> <pickle>
<tuple> <tuple>
<global name="ListBox" module="Products.ERP5Form.ListBox"/> <tuple>
<tuple/> <string>Products.ERP5Form.ListBox</string>
<string>ListBox</string>
</tuple>
<none/>
</tuple> </tuple>
</pickle> </pickle>
<pickle> <pickle>
...@@ -336,14 +339,14 @@ ...@@ -336,14 +339,14 @@
<key> <string>columns</string> </key> <key> <string>columns</string> </key>
<value> <value>
<list> <list>
<tuple>
<string>id</string>
<string>ID</string>
</tuple>
<tuple> <tuple>
<string>int_index</string> <string>int_index</string>
<string>Index</string> <string>Index</string>
</tuple> </tuple>
<tuple>
<string>reference</string>
<string>Reference</string>
</tuple>
<tuple> <tuple>
<string>title</string> <string>title</string>
<string>Requirement Title</string> <string>Requirement Title</string>
...@@ -407,6 +410,10 @@ ...@@ -407,6 +410,10 @@
<string>int_index</string> <string>int_index</string>
<string>Index</string> <string>Index</string>
</tuple> </tuple>
<tuple>
<string>reference</string>
<string>Reference</string>
</tuple>
<tuple> <tuple>
<string>sub_requirement_count</string> <string>sub_requirement_count</string>
<string>Sub-Requirement Count</string> <string>Sub-Requirement Count</string>
...@@ -472,6 +479,10 @@ ...@@ -472,6 +479,10 @@
<key> <string>not_viewable</string> </key> <key> <string>not_viewable</string> </key>
<value> <int>0</int> </value> <value> <int>0</int> </value>
</item> </item>
<item>
<key> <string>page_template</string> </key>
<value> <string></string> </value>
</item>
<item> <item>
<key> <string>portal_types</string> </key> <key> <string>portal_types</string> </key>
<value> <value>
...@@ -520,8 +531,8 @@ ...@@ -520,8 +531,8 @@
<value> <value>
<list> <list>
<tuple> <tuple>
<string>id</string> <string>int_index</string>
<string>ID</string> <string>Index</string>
</tuple> </tuple>
<tuple> <tuple>
<string>title</string> <string>title</string>
...@@ -534,14 +545,14 @@ ...@@ -534,14 +545,14 @@
<key> <string>sort_columns</string> </key> <key> <string>sort_columns</string> </key>
<value> <value>
<list> <list>
<tuple>
<string>id</string>
<string>ID</string>
</tuple>
<tuple> <tuple>
<string>int_index</string> <string>int_index</string>
<string>Index</string> <string>Index</string>
</tuple> </tuple>
<tuple>
<string>reference</string>
<string>Reference</string>
</tuple>
<tuple> <tuple>
<string>title</string> <string>title</string>
<string>Requirement Title</string> <string>Requirement Title</string>
...@@ -614,8 +625,11 @@ ...@@ -614,8 +625,11 @@
<record id="3" aka="AAAAAAAAAAM="> <record id="3" aka="AAAAAAAAAAM=">
<pickle> <pickle>
<tuple> <tuple>
<global name="Method" module="Products.Formulator.MethodField"/> <tuple>
<tuple/> <string>Products.Formulator.MethodField</string>
<string>Method</string>
</tuple>
<none/>
</tuple> </tuple>
</pickle> </pickle>
<pickle> <pickle>
......
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