diff --git a/bt5/erp5_calendar/WorkflowTemplateItem/portal_workflow/leave_request_workflow/worklists/1_draft_leave_request_list.xml b/bt5/erp5_calendar/WorkflowTemplateItem/portal_workflow/leave_request_workflow/worklists/1_draft_leave_request_list.xml index 0d0a54d40a50c9e8babcb73e080b89aa18909d70..0ef1b453c722f73345af25bb85ddc4e786f5b94d 100644 --- a/bt5/erp5_calendar/WorkflowTemplateItem/portal_workflow/leave_request_workflow/worklists/1_draft_leave_request_list.xml +++ b/bt5/erp5_calendar/WorkflowTemplateItem/portal_workflow/leave_request_workflow/worklists/1_draft_leave_request_list.xml @@ -21,13 +21,13 @@ </item> <item> <key> <string>actbox_name</string> </key> - <value> <string>Draft Leave Requests (%(count)s)</string> </value> + <value> <string>Leave Requests to Submit(%(count)s)</string> </value> </item> <item> <key> <string>actbox_url</string> </key> <value> <string encoding="cdata"><![CDATA[ -leave_request_module?simulation_state=draft&local_roles=Owner&reset:int=1 +leave_request_module/view?simulation_state=draft&local_roles=Owner&reset:int=1 ]]></string> </value> </item> diff --git a/bt5/erp5_calendar/WorkflowTemplateItem/portal_workflow/leave_request_workflow/worklists/2_planned_leave_request_list.xml b/bt5/erp5_calendar/WorkflowTemplateItem/portal_workflow/leave_request_workflow/worklists/2_planned_leave_request_list.xml index bc72850ec2ae9810dd2416712fac2c10aa709440..f9fc1841f7ec2623c8c33d87d8d8533fcfcac30a 100644 --- a/bt5/erp5_calendar/WorkflowTemplateItem/portal_workflow/leave_request_workflow/worklists/2_planned_leave_request_list.xml +++ b/bt5/erp5_calendar/WorkflowTemplateItem/portal_workflow/leave_request_workflow/worklists/2_planned_leave_request_list.xml @@ -21,13 +21,13 @@ </item> <item> <key> <string>actbox_name</string> </key> - <value> <string>Planned Leave Requests (%(count)s)</string> </value> + <value> <string>Leave Requests to Approve (%(count)s)</string> </value> </item> <item> <key> <string>actbox_url</string> </key> <value> <string encoding="cdata"><![CDATA[ -leave_request_module?simulation_state=planned&local_roles=Assignee&reset:int=1 +leave_request_module/view?simulation_state=planned&local_roles:list=Associate&local_roles:list=Assignor&reset:int=1 ]]></string> </value> </item> @@ -67,7 +67,8 @@ leave_request_module?simulation_state=planned&local_roles=Assignee&reset:int=1 <key> <string>roles</string> </key> <value> <tuple> - <string>Assignee</string> + <string>Associate</string> + <string>Assignor</string> </tuple> </value> </item> diff --git a/bt5/erp5_calendar/WorkflowTemplateItem/portal_workflow/leave_request_workflow/worklists/3_ordered_leave_request_list.xml b/bt5/erp5_calendar/WorkflowTemplateItem/portal_workflow/leave_request_workflow/worklists/3_ordered_leave_request_list.xml new file mode 100644 index 0000000000000000000000000000000000000000..9fc5e00ddcf0b86af2cdee4911a1a74d5c8b2752 --- /dev/null +++ b/bt5/erp5_calendar/WorkflowTemplateItem/portal_workflow/leave_request_workflow/worklists/3_ordered_leave_request_list.xml @@ -0,0 +1,112 @@ +<?xml version="1.0"?> +<ZopeData> + <record id="1" aka="AAAAAAAAAAE="> + <pickle> + <tuple> + <global name="WorklistDefinition" module="Products.DCWorkflow.Worklists"/> + <tuple/> + </tuple> + </pickle> + <pickle> + <dictionary> + <item> + <key> <string>__ac_local_roles__</string> </key> + <value> + <none/> + </value> + </item> + <item> + <key> <string>actbox_category</string> </key> + <value> <string>global</string> </value> + </item> + <item> + <key> <string>actbox_name</string> </key> + <value> <string>Leave Requests to Validate (%(count)s)</string> </value> + </item> + <item> + <key> <string>actbox_url</string> </key> + <value> <string encoding="cdata"><![CDATA[ + +leave_request_module/view?simulation_state=ordered&local_roles=Assignor&reset:int=1 + +]]></string> </value> + </item> + <item> + <key> <string>description</string> </key> + <value> <string>Ordered Leave Request</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>3_ordered_leave_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> + <tuple> + <global name="Guard" module="Products.DCWorkflow.Guard"/> + <tuple/> + </tuple> + </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> + <tuple> + <global name="PersistentMapping" module="Persistence.mapping"/> + <tuple/> + </tuple> + </pickle> + <pickle> + <dictionary> + <item> + <key> <string>data</string> </key> + <value> + <dictionary> + <item> + <key> <string>portal_type</string> </key> + <value> + <tuple> + <string>Leave Request</string> + </tuple> + </value> + </item> + <item> + <key> <string>simulation_state</string> </key> + <value> + <tuple> + <string>ordered</string> + </tuple> + </value> + </item> + </dictionary> + </value> + </item> + </dictionary> + </pickle> + </record> +</ZopeData> diff --git a/bt5/erp5_calendar/bt/revision b/bt5/erp5_calendar/bt/revision index b6e81543f7a3a86729eb8267696ac7b869355551..8db9866c8463f9bebbc4a3bdc87d5455578267c9 100644 --- a/bt5/erp5_calendar/bt/revision +++ b/bt5/erp5_calendar/bt/revision @@ -1 +1 @@ -330 \ No newline at end of file +332 \ No newline at end of file