Skip to content

erp5
erp5
Commit 7c6076b8 authored by Cédric Le Ninivin's avatar Cédric Le Ninivin Committed by Xiaowu Zhang
Browse files
Options

erp5_travel_expense: Remove unecessary view, add worklist, move script to appropriate portal skin

parent 7dd2be4a
Show whitespace changes
Inline Side-by-side
Showing with 23 additions and 599 deletions
bt5/erp5_travel_expense/ActionTemplateItem/portal_types/Expense%20Record%20Module/jio_view.xml deleted 100644 → 0
View file @ 7dd2be4a
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>action</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
</value>
</item>
<item>
<key> <string>categories</string> </key>
<value>
<tuple>
<string>action_type/object_jio_view</string>
</tuple>
</value>
</item>
<item>
<key> <string>category</string> </key>
<value> <string>object_jio_view</string> </value>
</item>
<item>
<key> <string>condition</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>description</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>icon</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>jio_view</string> </value>
</item>
<item>
<key> <string>permissions</string> </key>
<value>
<tuple>
<string>View</string>
</tuple>
</value>
</item>
<item>
<key> <string>portal_type</string> </key>
<value> <string>Action Information</string> </value>
</item>
<item>
<key> <string>priority</string> </key>
<value> <float>100.0</float> </value>
</item>
<item>
<key> <string>title</string> </key>
<value> <string>View</string> </value>
</item>
<item>
<key> <string>visible</string> </key>
<value> <int>1</int> </value>
</item>
</dictionary>
</pickle>
</record>
<record id="2" aka="AAAAAAAAAAI=">
<pickle>
<global name="Expression" module="Products.CMFCore.Expression"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>text</string> </key>
<value> <string>string:${object_url}/Base_viewAsJio</string> </value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
bt5/erp5_travel_expense/ActionTemplateItem/portal_types/Travel%20Request%20Record/view_as_jio.xml deleted 100644 → 0
View file @ 7dd2be4a
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>action</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
</value>
</item>
<item>
<key> <string>categories</string> </key>
<value>
<tuple>
<string>action_type/object_view</string>
</tuple>
</value>
</item>
<item>
<key> <string>category</string> </key>
<value> <string>object_view</string> </value>
</item>
<item>
<key> <string>condition</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>description</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>icon</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>view_as_jio</string> </value>
</item>
<item>
<key> <string>permissions</string> </key>
<value>
<tuple>
<string>View</string>
</tuple>
</value>
</item>
<item>
<key> <string>portal_type</string> </key>
<value> <string>Action Information</string> </value>
</item>
<item>
<key> <string>priority</string> </key>
<value> <float>2.0</float> </value>
</item>
<item>
<key> <string>title</string> </key>
<value> <string>jIO View</string> </value>
</item>
<item>
<key> <string>visible</string> </key>
<value> <int>1</int> </value>
</item>
</dictionary>
</pickle>
</record>
<record id="2" aka="AAAAAAAAAAI=">
<pickle>
<global name="Expression" module="Products.CMFCore.Expression"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>text</string> </key>
<value> <string>string:${object_url}/TravelRequestRecord_viewAsJio</string> </value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
bt5/erp5_travel_expense/SkinTemplateItem/portal_skins/erp5_hr_request/TravelRequest_createRepresentativeRecord.py → bt5/erp5_travel_expense/SkinTemplateItem/portal_skins/erp5_hr_record/TravelRequest_createRepresentativeRecord.py
View file @ 7c6076b8
......@@ -24,6 +24,8 @@ new_record.edit(
site=context.getAnimationCenter(),
destination_node_title=context.getTravelDestination(),
# XX Hackish
resource=context.getResource(),
resource_title=context.getResourceTitle(),
comment=context.getDescription(),
)
......
bt5/erp5_travel_expense/WorkflowTemplateItem/portal_workflow/ticket_acceptance_simulation_workflow/worklists/0C_open_travel_request_list.xml
View file @ 7c6076b8
......@@ -16,7 +16,7 @@
</item>
<item>
<key> <string>actbox_name</string> </key>
<value> <string>Travel Requests to Close (%(count)s)</string> </value>
<value> <string>Travel Requests to Accept (%(count)s)</string> </value>
</item>
<item>
<key> <string>actbox_url</string> </key>
......
bt5/erp5_travel_expense/WorkflowTemplateItem/portal_workflow/ticket_acceptance_simulation_workflow/worklists/2A_draft_support_request_list.xml → bt5/erp5_travel_expense/WorkflowTemplateItem/portal_workflow/ticket_acceptance_simulation_workflow/worklists/1A_draft_expense_validation_request_list.xml
View file @ 7c6076b8
......@@ -16,19 +16,19 @@
</item>
<item>
<key> <string>actbox_name</string> </key>
<value> <string>Support Requests to Submit (%(count)s)</string> </value>
<value> <string>Expense Validation Requests to Submit (%(count)s)</string> </value>
</item>
<item>
<key> <string>actbox_url</string> </key>
<value> <string encoding="cdata"><![CDATA[
support_request_module?simulation_state=draft&portal_type:list=%(portal_type)s&local_roles:list=%(local_roles)s&reset:int=1
expense_validation_request_module?simulation_state=draft&portal_type:list=%(portal_type)s&local_roles:list=%(local_roles)s&reset:int=1
]]></string> </value>
</item>
<item>
<key> <string>description</string> </key>
<value> <string>Draft Support Requests</string> </value>
<value> <string>Draft Expense Validation Requests</string> </value>
</item>
<item>
<key> <string>guard</string> </key>
......@@ -38,7 +38,7 @@ support_request_module?simulation_state=draft&portal_type:list=%(portal_type)s&l
</item>
<item>
<key> <string>id</string> </key>
<value> <string>2A_draft_support_request_list</string> </value>
<value> <string>1A_draft_expense_validation_request_list</string> </value>
</item>
<item>
<key> <string>var_matches</string> </key>
......@@ -80,7 +80,7 @@ support_request_module?simulation_state=draft&portal_type:list=%(portal_type)s&l
<key> <string>portal_type</string> </key>
<value>
<tuple>
<string>Support Request</string>
<string>Expense Validation Request</string>
</tuple>
</value>
</item>
......
bt5/erp5_travel_expense/WorkflowTemplateItem/portal_workflow/ticket_acceptance_simulation_workflow/worklists/1A_draft_meeting_list.xml deleted 100644 → 0
View file @ 7dd2be4a
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<global name="WorklistDefinition" module="Products.DCWorkflow.Worklists"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>actbox_category</string> </key>
<value> <string>global</string> </value>
</item>
<item>
<key> <string>actbox_icon</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>actbox_name</string> </key>
<value> <string>Meetings to Submit (%(count)s)</string> </value>
</item>
<item>
<key> <string>actbox_url</string> </key>
<value> <string encoding="cdata"><![CDATA[
meeting_module?simulation_state=draft&portal_type:list=%(portal_type)s&local_roles:list=%(local_roles)s&reset:int=1
]]></string> </value>
</item>
<item>
<key> <string>description</string> </key>
<value> <string>Draft Meetings</string> </value>
</item>
<item>
<key> <string>guard</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
</value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>1A_draft_meeting_list</string> </value>
</item>
<item>
<key> <string>var_matches</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
</value>
</item>
</dictionary>
</pickle>
</record>
<record id="2" aka="AAAAAAAAAAI=">
<pickle>
<global name="Guard" module="Products.DCWorkflow.Guard"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>roles</string> </key>
<value>
<tuple>
<string>Owner</string>
</tuple>
</value>
</item>
</dictionary>
</pickle>
</record>
<record id="3" aka="AAAAAAAAAAM=">
<pickle>
<global name="PersistentMapping" module="Persistence.mapping"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>data</string> </key>
<value>
<dictionary>
<item>
<key> <string>portal_type</string> </key>
<value>
<tuple>
<string>Meeting</string>
</tuple>
</value>
</item>
<item>
<key> <string>simulation_state</string> </key>
<value>
<tuple>
<string>draft</string>
</tuple>
</value>
</item>
</dictionary>
</value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
bt5/erp5_travel_expense/WorkflowTemplateItem/portal_workflow/ticket_acceptance_simulation_workflow/worklists/2B_submitted_support_request_list.xml → bt5/erp5_travel_expense/WorkflowTemplateItem/portal_workflow/ticket_acceptance_simulation_workflow/worklists/1B_submitted_expense_validation_request_list.xml
View file @ 7c6076b8
......@@ -16,19 +16,19 @@
</item>
<item>
<key> <string>actbox_name</string> </key>
<value> <string>Support Requests to Open (%(count)s)</string> </value>
<value> <string>Expense Validation Requests to Open (%(count)s)</string> </value>
</item>
<item>
<key> <string>actbox_url</string> </key>
<value> <string encoding="cdata"><![CDATA[
support_request_module?simulation_state=submitted&portal_type:list=%(portal_type)s&local_roles:list=%(local_roles)s&reset:int=1
expense_validation_request_module?simulation_state=submitted&portal_type:list=%(portal_type)s&local_roles:list=%(local_roles)s&reset:int=1
]]></string> </value>
</item>
<item>
<key> <string>description</string> </key>
<value> <string>Submitted Support Requests</string> </value>
<value> <string>Submitted Expense Validation Requests</string> </value>
</item>
<item>
<key> <string>guard</string> </key>
......@@ -38,7 +38,7 @@ support_request_module?simulation_state=submitted&portal_type:list=%(portal_type
</item>
<item>
<key> <string>id</string> </key>
<value> <string>2B_submitted_support_request_list</string> </value>
<value> <string>1B_submitted_expense_validation_request_list</string> </value>
</item>
<item>
<key> <string>var_matches</string> </key>
......@@ -80,7 +80,7 @@ support_request_module?simulation_state=submitted&portal_type:list=%(portal_type
<key> <string>portal_type</string> </key>
<value>
<tuple>
<string>Support Request</string>
<string>Expense Validation Request</string>
</tuple>
</value>
</item>
......
bt5/erp5_travel_expense/WorkflowTemplateItem/portal_workflow/ticket_acceptance_simulation_workflow/worklists/1B_submitted_meeting_list.xml deleted 100644 → 0
View file @ 7dd2be4a
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<global name="WorklistDefinition" module="Products.DCWorkflow.Worklists"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>actbox_category</string> </key>
<value> <string>global</string> </value>
</item>
<item>
<key> <string>actbox_icon</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>actbox_name</string> </key>
<value> <string>Meetings to Open (%(count)s)</string> </value>
</item>
<item>
<key> <string>actbox_url</string> </key>
<value> <string encoding="cdata"><![CDATA[
meeting_module?simulation_state=submitted&portal_type:list=%(portal_type)s&local_roles:list=%(local_roles)s&reset:int=1
]]></string> </value>
</item>
<item>
<key> <string>description</string> </key>
<value> <string>Submitted Meetings</string> </value>
</item>
<item>
<key> <string>guard</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
</value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>1B_submitted_meeting_list</string> </value>
</item>
<item>
<key> <string>var_matches</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
</value>
</item>
</dictionary>
</pickle>
</record>
<record id="2" aka="AAAAAAAAAAI=">
<pickle>
<global name="Guard" module="Products.DCWorkflow.Guard"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>roles</string> </key>
<value>
<tuple>
<string>Assignor</string>
</tuple>
</value>
</item>
</dictionary>
</pickle>
</record>
<record id="3" aka="AAAAAAAAAAM=">
<pickle>
<global name="PersistentMapping" module="Persistence.mapping"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>data</string> </key>
<value>
<dictionary>
<item>
<key> <string>portal_type</string> </key>
<value>
<tuple>
<string>Meeting</string>
</tuple>
</value>
</item>
<item>
<key> <string>simulation_state</string> </key>
<value>
<tuple>
<string>submitted</string>
</tuple>
</value>
</item>
</dictionary>
</value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
bt5/erp5_travel_expense/WorkflowTemplateItem/portal_workflow/ticket_acceptance_simulation_workflow/worklists/1C_open_meeting_list.xml → bt5/erp5_travel_expense/WorkflowTemplateItem/portal_workflow/ticket_acceptance_simulation_workflow/worklists/1C_open_expense_validation_request_list.xml
View file @ 7c6076b8
......@@ -16,19 +16,19 @@
</item>
<item>
<key> <string>actbox_name</string> </key>
<value> <string>Meetings to Close (%(count)s)</string> </value>
<value> <string>Expense Validation Requests to Accept (%(count)s)</string> </value>
</item>
<item>
<key> <string>actbox_url</string> </key>
<value> <string encoding="cdata"><![CDATA[
meeting_module?simulation_state=validated&portal_type:list=%(portal_type)s&local_roles:list=%(local_roles)s&reset:int=1
expense_validation_request_module?simulation_state=validated&portal_type:list=%(portal_type)s&local_roles:list=%(local_roles)s&reset:int=1
]]></string> </value>
</item>
<item>
<key> <string>description</string> </key>
<value> <string>Open Meetings</string> </value>
<value> <string>Open Expense Validation Requests</string> </value>
</item>
<item>
<key> <string>guard</string> </key>
......@@ -38,7 +38,7 @@ meeting_module?simulation_state=validated&portal_type:list=%(portal_type)s&local
</item>
<item>
<key> <string>id</string> </key>
<value> <string>1C_open_meeting_list</string> </value>
<value> <string>1C_open_expense_validation_request_list</string> </value>
</item>
<item>
<key> <string>var_matches</string> </key>
......@@ -81,7 +81,7 @@ meeting_module?simulation_state=validated&portal_type:list=%(portal_type)s&local
<key> <string>portal_type</string> </key>
<value>
<tuple>
<string>Meeting</string>
<string>Expense Validation Request</string>
</tuple>
</value>
</item>
......
bt5/erp5_travel_expense/WorkflowTemplateItem/portal_workflow/ticket_acceptance_simulation_workflow/worklists/1D_suspended_meeting_list.xml → bt5/erp5_travel_expense/WorkflowTemplateItem/portal_workflow/ticket_acceptance_simulation_workflow/worklists/1D_suspended_expense_validation_request_list.xml
View file @ 7c6076b8
......@@ -16,19 +16,19 @@
</item>
<item>
<key> <string>actbox_name</string> </key>
<value> <string>Suspended Meetings (%(count)s)</string> </value>
<value> <string>Suspended Expense Validation Requests (%(count)s)</string> </value>
</item>
<item>
<key> <string>actbox_url</string> </key>
<value> <string encoding="cdata"><![CDATA[
meeting_module?simulation_state=suspended&portal_type:list=%(portal_type)s&local_roles:list=%(local_roles)s&reset:int=1
expense_validation_request_module?simulation_state=suspended&portal_type:list=%(portal_type)s&local_roles:list=%(local_roles)s&reset:int=1
]]></string> </value>
</item>
<item>
<key> <string>description</string> </key>
<value> <string>Suspended Meetings</string> </value>
<value> <string>Suspended Expense Validation Requests</string> </value>
</item>
<item>
<key> <string>guard</string> </key>
......@@ -38,7 +38,7 @@ meeting_module?simulation_state=suspended&portal_type:list=%(portal_type)s&local
</item>
<item>
<key> <string>id</string> </key>
<value> <string>1D_suspended_meeting_list</string> </value>
<value> <string>1D_suspended_expense_validation_request_list</string> </value>
</item>
<item>
<key> <string>var_matches</string> </key>
......@@ -81,7 +81,7 @@ meeting_module?simulation_state=suspended&portal_type:list=%(portal_type)s&local
<key> <string>portal_type</string> </key>
<value>
<tuple>
<string>Meeting</string>
<string>Expense Validation Request</string>
</tuple>
</value>
</item>
......
bt5/erp5_travel_expense/WorkflowTemplateItem/portal_workflow/ticket_acceptance_simulation_workflow/worklists/2C_open_support_request_list.xml deleted 100644 → 0
View file @ 7dd2be4a
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<global name="WorklistDefinition" module="Products.DCWorkflow.Worklists"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>actbox_category</string> </key>
<value> <string>global</string> </value>
</item>
<item>
<key> <string>actbox_icon</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>actbox_name</string> </key>
<value> <string>Support Requests to Close (%(count)s)</string> </value>
</item>
<item>
<key> <string>actbox_url</string> </key>
<value> <string encoding="cdata"><![CDATA[
support_request_module?simulation_state=validated&portal_type:list=%(portal_type)s&local_roles:list=%(local_roles)s&reset:int=1
]]></string> </value>
</item>
<item>
<key> <string>description</string> </key>
<value> <string>Open Support Requests</string> </value>
</item>
<item>
<key> <string>guard</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
</value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>2C_open_support_request_list</string> </value>
</item>
<item>
<key> <string>var_matches</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
</value>
</item>
</dictionary>
</pickle>
</record>
<record id="2" aka="AAAAAAAAAAI=">
<pickle>
<global name="Guard" module="Products.DCWorkflow.Guard"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>roles</string> </key>
<value>
<tuple>
<string>Assignee</string>
<string>Assignor</string>
</tuple>
</value>
</item>
</dictionary>
</pickle>
</record>
<record id="3" aka="AAAAAAAAAAM=">
<pickle>
<global name="PersistentMapping" module="Persistence.mapping"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>data</string> </key>
<value>
<dictionary>
<item>
<key> <string>portal_type</string> </key>
<value>
<tuple>
<string>Support Request</string>
</tuple>
</value>
</item>
<item>
<key> <string>simulation_state</string> </key>
<value>
<tuple>
<string>validated</string>
</tuple>
</value>
</item>
</dictionary>
</value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
bt5/erp5_travel_expense/WorkflowTemplateItem/portal_workflow/ticket_acceptance_simulation_workflow/worklists/2D_suspended_support_request_list.xml deleted 100644 → 0
View file @ 7dd2be4a
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<global name="WorklistDefinition" module="Products.DCWorkflow.Worklists"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>actbox_category</string> </key>
<value> <string>global</string> </value>
</item>
<item>
<key> <string>actbox_icon</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>actbox_name</string> </key>
<value> <string>Suspended Support Requests (%(count)s)</string> </value>
</item>
<item>
<key> <string>actbox_url</string> </key>
<value> <string encoding="cdata"><![CDATA[
support_request_module?simulation_state=suspended&portal_type:list=%(portal_type)s&local_roles:list=%(local_roles)s&reset:int=1
]]></string> </value>
</item>
<item>
<key> <string>description</string> </key>
<value> <string>Suspended Support Requests</string> </value>
</item>
<item>
<key> <string>guard</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
</value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>2D_suspended_support_request_list</string> </value>
</item>
<item>
<key> <string>var_matches</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
</value>
</item>
</dictionary>
</pickle>
</record>
<record id="2" aka="AAAAAAAAAAI=">
<pickle>
<global name="Guard" module="Products.DCWorkflow.Guard"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>roles</string> </key>
<value>
<tuple>
<string>Assignor</string>
<string>Assignee</string>
</tuple>
</value>
</item>
</dictionary>
</pickle>
</record>
<record id="3" aka="AAAAAAAAAAM=">
<pickle>
<global name="PersistentMapping" module="Persistence.mapping"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>data</string> </key>
<value>
<dictionary>
<item>
<key> <string>portal_type</string> </key>
<value>
<tuple>
<string>Support Request</string>
</tuple>
</value>
</item>
<item>
<key> <string>simulation_state</string> </key>
<value>
<tuple>
<string>suspended</string>
</tuple>
</value>
</item>
</dictionary>
</value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
bt5/erp5_travel_expense/bt/template_action_path_list
View file @ 7c6076b8
Category | jio_view
Currency | jio_view
Expense Record Module | jio_view
Expense Record Module | view
Expense Record | jio_view
Expense Record | view
......@@ -12,5 +11,4 @@ Record Module | view
Travel Request Module | view
Travel Request Record | jio_view
Travel Request Record | view
Travel Request Record | view_as_jio
Travel Request | view
\ No newline at end of file
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