Skip to content

erp5
erp5
Commit 8abc75c0 authored by Jérome Perrin's avatar Jérome Perrin
Browse files
Options

make open order use a validation workflow, and have reference editable,... 

make open order use a validation workflow, and have reference editable, because validating an open order now archives the previous open order with same reference

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@44233 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent 1d9ac7bc
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 161 additions and 1039 deletions
bt5/erp5_open_trade/SkinTemplateItem/portal_skins/erp5_open_trade/OpenSaleOrder_view.xml
View file @ 8abc75c0
...@@ -130,7 +130,7 @@ ...@@ -130,7 +130,7 @@
<string>my_effective_date</string> <string>my_effective_date</string>
<string>my_expiration_date</string> <string>my_expiration_date</string>
<string>my_comment</string> <string>my_comment</string>
<string>my_translated_simulation_state_title</string> <string>my_translated_validation_state_title</string>
</list> </list>
</value> </value>
</item> </item>
......
bt5/erp5_open_trade/SkinTemplateItem/portal_skins/erp5_open_trade/OpenSaleOrder_view/my_reference.xml
View file @ 8abc75c0
...@@ -211,7 +211,7 @@ ...@@ -211,7 +211,7 @@
</item> </item>
<item> <item>
<key> <string>editable</string> </key> <key> <string>editable</string> </key>
<value> <int>0</int> </value> <value> <int>1</int> </value>
</item> </item>
<item> <item>
<key> <string>enabled</string> </key> <key> <string>enabled</string> </key>
......
bt5/erp5_open_trade/SkinTemplateItem/portal_skins/erp5_open_trade/OpenSaleOrder_view/my_translated_simulation_state_title.xml → bt5/erp5_open_trade/SkinTemplateItem/portal_skins/erp5_open_trade/OpenSaleOrder_view/my_translated_validation_state_title.xml
View file @ 8abc75c0
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
<dictionary> <dictionary>
<item> <item>
<key> <string>id</string> </key> <key> <string>id</string> </key>
<value> <string>my_translated_simulation_state_title</string> </value> <value> <string>my_translated_validation_state_title</string> </value>
</item> </item>
<item> <item>
<key> <string>message_values</string> </key> <key> <string>message_values</string> </key>
......
bt5/erp5_open_trade/WorkflowTemplateItem/portal_workflow/open_order_workflow.xml
View file @ 8abc75c0
...@@ -38,7 +38,7 @@ ...@@ -38,7 +38,7 @@
</item> </item>
<item> <item>
<key> <string>manager_bypass</string> </key> <key> <string>manager_bypass</string> </key>
<value> <int>0</int> </value> <value> <int>1</int> </value>
</item> </item>
<item> <item>
<key> <string>permissions</string> </key> <key> <string>permissions</string> </key>
...@@ -54,7 +54,7 @@ ...@@ -54,7 +54,7 @@
</item> </item>
<item> <item>
<key> <string>state_var</string> </key> <key> <string>state_var</string> </key>
<value> <string>simulation_state</string> </value> <value> <string>validation_state</string> </value>
</item> </item>
<item> <item>
<key> <string>title</string> </key> <key> <string>title</string> </key>
......
bt5/erp5_open_trade/WorkflowTemplateItem/portal_workflow/open_order_workflow/scripts/OpenOrder_buildSaleOrder.xml → bt5/erp5_open_trade/WorkflowTemplateItem/portal_workflow/open_order_workflow/scripts/OpenOrder_archivePrevious.xml
View file @ 8abc75c0
...@@ -50,37 +50,29 @@ ...@@ -50,37 +50,29 @@
</item> </item>
<item> <item>
<key> <string>_body</string> </key> <key> <string>_body</string> </key>
<value> <string>order = state_change[\'object\']\n <value> <string>open_order = sci[\'object\']\n
transition_kw = state_change[\'kwargs\']\n
\n \n
# XXX for now, all this is disabled\n if not open_order.getReference():\n
return \n return\n
\n \n
this_uid = open_order.getUid()\n
\n \n
path = order.getPath()\n # archive previously active open order with same reference\n
tag = \'%s_updateAppliedRule\' % path\n for open_order in sci.getPortal().portal_catalog.searchFolder(\n
expand_tag = \'%s_expand\' % path\n portal_type=open_order.getPortalType(),\n
activate_kw = {\'tag\':expand_tag, \'priority\':3}\n reference=open_order.getReference(),\n
kw = {}\n validation_state=\'validated\'):\n
if transition_kw.get(\'calculation_base_date\') is not None:\n if this_uid != open_order.uid:\n
kw[\'calculation_base_date\'] = transition_kw[\'calculation_base_date\']\n open_order.getObject().archive()\n
order.activate(tag=tag, after_tag=expand_tag).updateAppliedRule(\n
rule_reference=\'default_open_order_rule\', activate_kw=activate_kw, **kw)\n
\n
\n
order_portal_type = order.getPortalType()\n
if order_portal_type == \'Open Sale Order\':\n
delivery_builder = order.portal_deliveries.sale_order_builder\n
delivery_builder.activate(activity=\'SQLQueue\', after_tag=(expand_tag, tag)).build(explanation_uid=order.getUid())\n
</string> </value> </string> </value>
</item> </item>
<item> <item>
<key> <string>_params</string> </key> <key> <string>_params</string> </key>
<value> <string>state_change</string> </value> <value> <string>sci</string> </value>
</item> </item>
<item> <item>
<key> <string>id</string> </key> <key> <string>id</string> </key>
<value> <string>OpenOrder_buildSaleOrder</string> </value> <value> <string>OpenOrder_archivePrevious</string> </value>
</item> </item>
</dictionary> </dictionary>
</pickle> </pickle>
......
bt5/erp5_open_trade/WorkflowTemplateItem/portal_workflow/open_order_workflow/scripts/OpenOrder_validateData.xml
View file @ 8abc75c0
...@@ -50,7 +50,7 @@ ...@@ -50,7 +50,7 @@
</item> </item>
<item> <item>
<key> <string>_body</string> </key> <key> <string>_body</string> </key>
<value> <string># This script check that necessary data exists on Order\n <value> <string># This script check that necessary data exists on this open order\n
order = state_change[\'object\']\n order = state_change[\'object\']\n
order.Base_checkConsistency()\n order.Base_checkConsistency()\n
</string> </value> </string> </value>
......
bt5/erp5_open_trade/WorkflowTemplateItem/portal_workflow/open_order_workflow/states/stopped.xml → bt5/erp5_open_trade/WorkflowTemplateItem/portal_workflow/open_order_workflow/states/archived.xml
View file @ 8abc75c0
...@@ -8,11 +8,11 @@ ...@@ -8,11 +8,11 @@
<dictionary> <dictionary>
<item> <item>
<key> <string>description</string> </key> <key> <string>description</string> </key>
<value> <string>Order is inactivated and stop to order.</string> </value> <value> <string>This version of the open order is archived</string> </value>
</item> </item>
<item> <item>
<key> <string>id</string> </key> <key> <string>id</string> </key>
<value> <string>stopped</string> </value> <value> <string>archived</string> </value>
</item> </item>
<item> <item>
<key> <string>permission_roles</string> </key> <key> <string>permission_roles</string> </key>
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
</item> </item>
<item> <item>
<key> <string>title</string> </key> <key> <string>title</string> </key>
<value> <string>Stopped</string> </value> <value> <string>Archived</string> </value>
</item> </item>
<item> <item>
<key> <string>transitions</string> </key> <key> <string>transitions</string> </key>
...@@ -73,6 +73,7 @@ ...@@ -73,6 +73,7 @@
<key> <string>Delete objects</string> </key> <key> <string>Delete objects</string> </key>
<value> <value>
<tuple> <tuple>
<string>Assignor</string>
<string>Manager</string> <string>Manager</string>
</tuple> </tuple>
</value> </value>
...@@ -81,6 +82,7 @@ ...@@ -81,6 +82,7 @@
<key> <string>Modify portal content</string> </key> <key> <string>Modify portal content</string> </key>
<value> <value>
<tuple> <tuple>
<string>Assignor</string>
<string>Manager</string> <string>Manager</string>
</tuple> </tuple>
</value> </value>
......
bt5/erp5_open_trade/WorkflowTemplateItem/portal_workflow/open_order_workflow/states/auto_planned.xml deleted 100644 → 0
View file @ 1d9ac7bc
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<global name="StateDefinition" module="Products.DCWorkflow.States"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>description</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>auto_planned</string> </value>
</item>
<item>
<key> <string>permission_roles</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
</value>
</item>
<item>
<key> <string>title</string> </key>
<value> <string>Auto Planned</string> </value>
</item>
<item>
<key> <string>transitions</string> </key>
<value>
<tuple>
<string>order</string>
<string>order_action</string>
<string>plan</string>
<string>plan_action</string>
</tuple>
</value>
</item>
<item>
<key> <string>type_list</string> </key>
<value>
<tuple>
<string>draft_order</string>
</tuple>
</value>
</item>
</dictionary>
</pickle>
</record>
<record id="2" aka="AAAAAAAAAAI=">
<pickle>
<global name="PersistentMapping" module="Persistence.mapping"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>data</string> </key>
<value>
<dictionary>
<item>
<key> <string>Access contents information</string> </key>
<value>
<tuple>
<string>Assignee</string>
<string>Assignor</string>
<string>Associate</string>
<string>Auditor</string>
<string>Manager</string>
</tuple>
</value>
</item>
<item>
<key> <string>Add portal content</string> </key>
<value>
<tuple>
<string>Assignee</string>
<string>Assignor</string>
<string>Associate</string>
<string>Manager</string>
</tuple>
</value>
</item>
<item>
<key> <string>Delete objects</string> </key>
<value>
<tuple>
<string>Assignee</string>
<string>Assignor</string>
<string>Associate</string>
<string>Manager</string>
</tuple>
</value>
</item>
<item>
<key> <string>Modify portal content</string> </key>
<value>
<tuple>
<string>Assignee</string>
<string>Assignor</string>
<string>Associate</string>
<string>Manager</string>
</tuple>
</value>
</item>
<item>
<key> <string>View</string> </key>
<value>
<tuple>
<string>Assignee</string>
<string>Assignor</string>
<string>Associate</string>
<string>Auditor</string>
<string>Manager</string>
</tuple>
</value>
</item>
</dictionary>
</value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
bt5/erp5_open_trade/WorkflowTemplateItem/portal_workflow/open_order_workflow/states/suspended.xml → bt5/erp5_open_trade/WorkflowTemplateItem/portal_workflow/open_order_workflow/states/invalidated.xml
View file @ 8abc75c0
...@@ -8,11 +8,11 @@ ...@@ -8,11 +8,11 @@
<dictionary> <dictionary>
<item> <item>
<key> <string>description</string> </key> <key> <string>description</string> </key>
<value> <string>Order is now paused and stop next order.</string> </value> <value> <string>Open Order is invalidated and no longer apply</string> </value>
</item> </item>
<item> <item>
<key> <string>id</string> </key> <key> <string>id</string> </key>
<value> <string>suspended</string> </value> <value> <string>invalidated</string> </value>
</item> </item>
<item> <item>
<key> <string>permission_roles</string> </key> <key> <string>permission_roles</string> </key>
...@@ -22,14 +22,14 @@ ...@@ -22,14 +22,14 @@
</item> </item>
<item> <item>
<key> <string>title</string> </key> <key> <string>title</string> </key>
<value> <string>Suspended</string> </value> <value> <string>Invalidated</string> </value>
</item> </item>
<item> <item>
<key> <string>transitions</string> </key> <key> <string>transitions</string> </key>
<value> <value>
<tuple> <tuple>
<string>start</string> <string>validate</string>
<string>start_action</string> <string>validate_action</string>
</tuple> </tuple>
</value> </value>
</item> </item>
...@@ -76,7 +76,6 @@ ...@@ -76,7 +76,6 @@
<key> <string>Delete objects</string> </key> <key> <string>Delete objects</string> </key>
<value> <value>
<tuple> <tuple>
<string>Assignor</string>
<string>Manager</string> <string>Manager</string>
</tuple> </tuple>
</value> </value>
...@@ -85,7 +84,6 @@ ...@@ -85,7 +84,6 @@
<key> <string>Modify portal content</string> </key> <key> <string>Modify portal content</string> </key>
<value> <value>
<tuple> <tuple>
<string>Assignor</string>
<string>Manager</string> <string>Manager</string>
</tuple> </tuple>
</value> </value>
......
bt5/erp5_open_trade/WorkflowTemplateItem/portal_workflow/open_order_workflow/states/ordered.xml
View file @ 8abc75c0
...@@ -30,8 +30,8 @@ ...@@ -30,8 +30,8 @@
<tuple> <tuple>
<string>cancel</string> <string>cancel</string>
<string>cancel_action</string> <string>cancel_action</string>
<string>start</string> <string>validate</string>
<string>start_action</string> <string>validate_action</string>
</tuple> </tuple>
</value> </value>
</item> </item>
...@@ -39,8 +39,8 @@ ...@@ -39,8 +39,8 @@
<key> <string>type_list</string> </key> <key> <string>type_list</string> </key>
<value> <value>
<tuple> <tuple>
<string>future_inventory</string>
<string>planned_order</string> <string>planned_order</string>
<string>future_inventory</string>
</tuple> </tuple>
</value> </value>
</item> </item>
......
bt5/erp5_open_trade/WorkflowTemplateItem/portal_workflow/open_order_workflow/states/planned.xml
View file @ 8abc75c0
...@@ -32,6 +32,8 @@ ...@@ -32,6 +32,8 @@
<string>cancel_action</string> <string>cancel_action</string>
<string>order</string> <string>order</string>
<string>order_action</string> <string>order_action</string>
<string>validate</string>
<string>validate_action</string>
</tuple> </tuple>
</value> </value>
</item> </item>
...@@ -39,8 +41,8 @@ ...@@ -39,8 +41,8 @@
<key> <string>type_list</string> </key> <key> <string>type_list</string> </key>
<value> <value>
<tuple> <tuple>
<string>future_inventory</string>
<string>planned_order</string> <string>planned_order</string>
<string>future_inventory</string>
</tuple> </tuple>
</value> </value>
</item> </item>
......
bt5/erp5_open_trade/WorkflowTemplateItem/portal_workflow/open_order_workflow/states/started.xml → bt5/erp5_open_trade/WorkflowTemplateItem/portal_workflow/open_order_workflow/states/validated.xml
View file @ 8abc75c0
...@@ -8,11 +8,11 @@ ...@@ -8,11 +8,11 @@
<dictionary> <dictionary>
<item> <item>
<key> <string>description</string> </key> <key> <string>description</string> </key>
<value> <string>Order is now activated and starts to order repeatedly.</string> </value> <value> <string>Open Order is now validated and starts to order repeatedly.</string> </value>
</item> </item>
<item> <item>
<key> <string>id</string> </key> <key> <string>id</string> </key>
<value> <string>started</string> </value> <value> <string>validated</string> </value>
</item> </item>
<item> <item>
<key> <string>permission_roles</string> </key> <key> <string>permission_roles</string> </key>
...@@ -22,17 +22,15 @@ ...@@ -22,17 +22,15 @@
</item> </item>
<item> <item>
<key> <string>title</string> </key> <key> <string>title</string> </key>
<value> <string>Started</string> </value> <value> <string>Validated</string> </value>
</item> </item>
<item> <item>
<key> <string>transitions</string> </key> <key> <string>transitions</string> </key>
<value> <value>
<tuple> <tuple>
<string>auto_order_periodically</string> <string>archive</string>
<string>stop</string> <string>invalidate</string>
<string>stop_action</string> <string>invalidate_action</string>
<string>suspend</string>
<string>suspend_action</string>
</tuple> </tuple>
</value> </value>
</item> </item>
......
bt5/erp5_open_trade/WorkflowTemplateItem/portal_workflow/open_order_workflow/transitions/accept_offer_action.xml
View file @ 8abc75c0
...@@ -67,7 +67,6 @@ ...@@ -67,7 +67,6 @@
<tuple> <tuple>
<string>Assignee</string> <string>Assignee</string>
<string>Assignor</string> <string>Assignor</string>
<string>Manager</string>
</tuple> </tuple>
</value> </value>
</item> </item>
......
bt5/erp5_open_trade/WorkflowTemplateItem/portal_workflow/open_order_workflow/transitions/stop.xml → bt5/erp5_open_trade/WorkflowTemplateItem/portal_workflow/open_order_workflow/transitions/archive.xml
View file @ 8abc75c0
...@@ -34,11 +34,11 @@ ...@@ -34,11 +34,11 @@
</item> </item>
<item> <item>
<key> <string>id</string> </key> <key> <string>id</string> </key>
<value> <string>stop</string> </value> <value> <string>archive</string> </value>
</item> </item>
<item> <item>
<key> <string>new_state_id</string> </key> <key> <string>new_state_id</string> </key>
<value> <string>stopped</string> </value> <value> <string>archived</string> </value>
</item> </item>
<item> <item>
<key> <string>script_name</string> </key> <key> <string>script_name</string> </key>
...@@ -46,7 +46,7 @@ ...@@ -46,7 +46,7 @@
</item> </item>
<item> <item>
<key> <string>title</string> </key> <key> <string>title</string> </key>
<value> <string>Stop Open Order</string> </value> <value> <string>Archive</string> </value>
</item> </item>
<item> <item>
<key> <string>trigger_type</string> </key> <key> <string>trigger_type</string> </key>
......
bt5/erp5_open_trade/WorkflowTemplateItem/portal_workflow/open_order_workflow/transitions/auto_order_periodically.xml deleted 100644 → 0
View file @ 1d9ac7bc
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<global name="TransitionDefinition" module="Products.DCWorkflow.Transitions"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>actbox_category</string> </key>
<value> <string>workflow</string> </value>
</item>
<item>
<key> <string>actbox_name</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>actbox_url</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>after_script_name</string> </key>
<value> <string>OpenOrder_buildSaleOrder</string> </value>
</item>
<item>
<key> <string>description</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>guard</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>auto_order_periodically</string> </value>
</item>
<item>
<key> <string>new_state_id</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>script_name</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>title</string> </key>
<value> <string>Auto Order Periodically</string> </value>
</item>
<item>
<key> <string>trigger_type</string> </key>
<value> <int>2</int> </value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
bt5/erp5_open_trade/WorkflowTemplateItem/portal_workflow/open_order_workflow/transitions/auto_plan.xml deleted 100644 → 0
View file @ 1d9ac7bc
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<global name="TransitionDefinition" module="Products.DCWorkflow.Transitions"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>actbox_category</string> </key>
<value> <string>workflow</string> </value>
</item>
<item>
<key> <string>actbox_name</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>actbox_url</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>after_script_name</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>description</string> </key>
<value> <string>plan an order (automatically done by the system)</string> </value>
</item>
<item>
<key> <string>guard</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>auto_plan</string> </value>
</item>
<item>
<key> <string>new_state_id</string> </key>
<value> <string>auto_planned</string> </value>
</item>
<item>
<key> <string>script_name</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>title</string> </key>
<value> <string>Auto Plan</string> </value>
</item>
<item>
<key> <string>trigger_type</string> </key>
<value> <int>1</int> </value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
bt5/erp5_open_trade/WorkflowTemplateItem/portal_workflow/open_order_workflow/transitions/cancel.xml
View file @ 8abc75c0
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
</item> </item>
<item> <item>
<key> <string>description</string> </key> <key> <string>description</string> </key>
<value> <string>Cancel the order</string> </value> <value> <string>Cancel the open order</string> </value>
</item> </item>
<item> <item>
<key> <string>guard</string> </key> <key> <string>guard</string> </key>
...@@ -46,7 +46,7 @@ ...@@ -46,7 +46,7 @@
</item> </item>
<item> <item>
<key> <string>title</string> </key> <key> <string>title</string> </key>
<value> <string>Cancel Order</string> </value> <value> <string>Cancel Open Order</string> </value>
</item> </item>
<item> <item>
<key> <string>trigger_type</string> </key> <key> <string>trigger_type</string> </key>
......
bt5/erp5_open_trade/WorkflowTemplateItem/portal_workflow/open_order_workflow/transitions/cancel_action.xml
View file @ 8abc75c0
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
</item> </item>
<item> <item>
<key> <string>actbox_name</string> </key> <key> <string>actbox_name</string> </key>
<value> <string>Cancel Order</string> </value> <value> <string>Cancel Open Order</string> </value>
</item> </item>
<item> <item>
<key> <string>actbox_url</string> </key> <key> <string>actbox_url</string> </key>
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
</item> </item>
<item> <item>
<key> <string>description</string> </key> <key> <string>description</string> </key>
<value> <string>Cancel the order</string> </value> <value> <string>Cancel the open order</string> </value>
</item> </item>
<item> <item>
<key> <string>guard</string> </key> <key> <string>guard</string> </key>
...@@ -46,7 +46,7 @@ ...@@ -46,7 +46,7 @@
</item> </item>
<item> <item>
<key> <string>title</string> </key> <key> <string>title</string> </key>
<value> <string>Cancel Order Action</string> </value> <value> <string>Cancel Open Order Action</string> </value>
</item> </item>
<item> <item>
<key> <string>trigger_type</string> </key> <key> <string>trigger_type</string> </key>
...@@ -67,7 +67,6 @@ ...@@ -67,7 +67,6 @@
<tuple> <tuple>
<string>Assignee</string> <string>Assignee</string>
<string>Assignor</string> <string>Assignor</string>
<string>Manager</string>
</tuple> </tuple>
</value> </value>
</item> </item>
......
bt5/erp5_open_trade/WorkflowTemplateItem/portal_workflow/open_order_workflow/transitions/suspend.xml → bt5/erp5_open_trade/WorkflowTemplateItem/portal_workflow/open_order_workflow/transitions/invalidate.xml
View file @ 8abc75c0
...@@ -34,11 +34,11 @@ ...@@ -34,11 +34,11 @@
</item> </item>
<item> <item>
<key> <string>id</string> </key> <key> <string>id</string> </key>
<value> <string>suspend</string> </value> <value> <string>invalidate</string> </value>
</item> </item>
<item> <item>
<key> <string>new_state_id</string> </key> <key> <string>new_state_id</string> </key>
<value> <string>suspended</string> </value> <value> <string>invalidated</string> </value>
</item> </item>
<item> <item>
<key> <string>script_name</string> </key> <key> <string>script_name</string> </key>
...@@ -46,7 +46,7 @@ ...@@ -46,7 +46,7 @@
</item> </item>
<item> <item>
<key> <string>title</string> </key> <key> <string>title</string> </key>
<value> <string>Suspend Open Order</string> </value> <value> <string>Invalidate Open Order</string> </value>
</item> </item>
<item> <item>
<key> <string>trigger_type</string> </key> <key> <string>trigger_type</string> </key>
......
bt5/erp5_open_trade/WorkflowTemplateItem/portal_workflow/open_order_workflow/transitions/start_action.xml → bt5/erp5_open_trade/WorkflowTemplateItem/portal_workflow/open_order_workflow/transitions/invalidate_action.xml
View file @ 8abc75c0
...@@ -12,15 +12,15 @@ ...@@ -12,15 +12,15 @@
</item> </item>
<item> <item>
<key> <string>actbox_name</string> </key> <key> <string>actbox_name</string> </key>
<value> <string>Start Open Order</string> </value> <value> <string>Invalidate Open Order</string> </value>
</item> </item>
<item> <item>
<key> <string>actbox_url</string> </key> <key> <string>actbox_url</string> </key>
<value> <string>%(content_url)s/Base_viewWorkflowActionDialog?workflow_action=start_action</string> </value> <value> <string>%(content_url)s/Base_viewWorkflowActionDialog?workflow_action=invalidate_action</string> </value>
</item> </item>
<item> <item>
<key> <string>after_script_name</string> </key> <key> <string>after_script_name</string> </key>
<value> <string>start</string> </value> <value> <string>invalidate</string> </value>
</item> </item>
<item> <item>
<key> <string>description</string> </key> <key> <string>description</string> </key>
...@@ -34,7 +34,7 @@ ...@@ -34,7 +34,7 @@
</item> </item>
<item> <item>
<key> <string>id</string> </key> <key> <string>id</string> </key>
<value> <string>start_action</string> </value> <value> <string>invalidate_action</string> </value>
</item> </item>
<item> <item>
<key> <string>new_state_id</string> </key> <key> <string>new_state_id</string> </key>
...@@ -46,7 +46,7 @@ ...@@ -46,7 +46,7 @@
</item> </item>
<item> <item>
<key> <string>title</string> </key> <key> <string>title</string> </key>
<value> <string>Start Open Order Action</string> </value> <value> <string>Invalidate Open Order</string> </value>
</item> </item>
<item> <item>
<key> <string>trigger_type</string> </key> <key> <string>trigger_type</string> </key>
...@@ -65,8 +65,8 @@ ...@@ -65,8 +65,8 @@
<key> <string>roles</string> </key> <key> <string>roles</string> </key>
<value> <value>
<tuple> <tuple>
<string>Assignee</string>
<string>Assignor</string> <string>Assignor</string>
<string>Manager</string>
</tuple> </tuple>
</value> </value>
</item> </item>
......
bt5/erp5_open_trade/WorkflowTemplateItem/portal_workflow/open_order_workflow/transitions/offer_action.xml
View file @ 8abc75c0
...@@ -67,7 +67,6 @@ ...@@ -67,7 +67,6 @@
<tuple> <tuple>
<string>Assignee</string> <string>Assignee</string>
<string>Assignor</string> <string>Assignor</string>
<string>Manager</string>
</tuple> </tuple>
</value> </value>
</item> </item>
......
bt5/erp5_open_trade/WorkflowTemplateItem/portal_workflow/open_order_workflow/transitions/order_action.xml
View file @ 8abc75c0
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
</item> </item>
<item> <item>
<key> <string>description</string> </key> <key> <string>description</string> </key>
<value> <string>marks the document as it has been ordered to the customer or it has been ordered by the supplier</string> </value> <value> <string>Marks the document as it has been ordered to the customer or it has been ordered by the supplier</string> </value>
</item> </item>
<item> <item>
<key> <string>guard</string> </key> <key> <string>guard</string> </key>
...@@ -67,7 +67,6 @@ ...@@ -67,7 +67,6 @@
<tuple> <tuple>
<string>Assignee</string> <string>Assignee</string>
<string>Assignor</string> <string>Assignor</string>
<string>Manager</string>
</tuple> </tuple>
</value> </value>
</item> </item>
......
bt5/erp5_open_trade/WorkflowTemplateItem/portal_workflow/open_order_workflow/transitions/plan.xml
View file @ 8abc75c0
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
</item> </item>
<item> <item>
<key> <string>description</string> </key> <key> <string>description</string> </key>
<value> <string>plan an order</string> </value> <value> <string>plan an open order</string> </value>
</item> </item>
<item> <item>
<key> <string>guard</string> </key> <key> <string>guard</string> </key>
...@@ -46,7 +46,7 @@ ...@@ -46,7 +46,7 @@
</item> </item>
<item> <item>
<key> <string>title</string> </key> <key> <string>title</string> </key>
<value> <string>Plan Order</string> </value> <value> <string>Plan Open Order</string> </value>
</item> </item>
<item> <item>
<key> <string>trigger_type</string> </key> <key> <string>trigger_type</string> </key>
......
bt5/erp5_open_trade/WorkflowTemplateItem/portal_workflow/open_order_workflow/transitions/plan_action.xml
View file @ 8abc75c0
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
</item> </item>
<item> <item>
<key> <string>actbox_name</string> </key> <key> <string>actbox_name</string> </key>
<value> <string>Plan Order</string> </value> <value> <string>Plan Open Order</string> </value>
</item> </item>
<item> <item>
<key> <string>actbox_url</string> </key> <key> <string>actbox_url</string> </key>
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
</item> </item>
<item> <item>
<key> <string>description</string> </key> <key> <string>description</string> </key>
<value> <string>plan an order</string> </value> <value> <string>Plan an open order</string> </value>
</item> </item>
<item> <item>
<key> <string>guard</string> </key> <key> <string>guard</string> </key>
...@@ -46,7 +46,7 @@ ...@@ -46,7 +46,7 @@
</item> </item>
<item> <item>
<key> <string>title</string> </key> <key> <string>title</string> </key>
<value> <string>Plan Order Action</string> </value> <value> <string>Plan Open Order Action</string> </value>
</item> </item>
<item> <item>
<key> <string>trigger_type</string> </key> <key> <string>trigger_type</string> </key>
...@@ -67,7 +67,6 @@ ...@@ -67,7 +67,6 @@
<tuple> <tuple>
<string>Assignee</string> <string>Assignee</string>
<string>Assignor</string> <string>Assignor</string>
<string>Manager</string>
</tuple> </tuple>
</value> </value>
</item> </item>
......
bt5/erp5_open_trade/WorkflowTemplateItem/portal_workflow/open_order_workflow/transitions/suspend_action.xml deleted 100644 → 0
View file @ 1d9ac7bc
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<global name="TransitionDefinition" module="Products.DCWorkflow.Transitions"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>actbox_category</string> </key>
<value> <string>workflow</string> </value>
</item>
<item>
<key> <string>actbox_name</string> </key>
<value> <string>Suspend Open Order</string> </value>
</item>
<item>
<key> <string>actbox_url</string> </key>
<value> <string>%(content_url)s/Base_viewWorkflowActionDialog?workflow_action=suspend_action</string> </value>
</item>
<item>
<key> <string>after_script_name</string> </key>
<value> <string>suspend</string> </value>
</item>
<item>
<key> <string>description</string> </key>
<value> <string>Client suspend order</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>suspend_action</string> </value>
</item>
<item>
<key> <string>new_state_id</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>script_name</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>title</string> </key>
<value> <string>Suspend Open Order Action</string> </value>
</item>
<item>
<key> <string>trigger_type</string> </key>
<value> <int>1</int> </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>Manager</string>
</tuple>
</value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
bt5/erp5_open_trade/WorkflowTemplateItem/portal_workflow/open_order_workflow/transitions/start.xml → bt5/erp5_open_trade/WorkflowTemplateItem/portal_workflow/open_order_workflow/transitions/validate.xml
View file @ 8abc75c0
...@@ -20,11 +20,11 @@ ...@@ -20,11 +20,11 @@
</item> </item>
<item> <item>
<key> <string>after_script_name</string> </key> <key> <string>after_script_name</string> </key>
<value> <string>OpenOrder_buildSaleOrder</string> </value> <value> <string>OpenOrder_archivePrevious</string> </value>
</item> </item>
<item> <item>
<key> <string>description</string> </key> <key> <string>description</string> </key>
<value> <string></string> </value> <value> <string>Validates the open order, and archive previous versions</string> </value>
</item> </item>
<item> <item>
<key> <string>guard</string> </key> <key> <string>guard</string> </key>
...@@ -34,11 +34,11 @@ ...@@ -34,11 +34,11 @@
</item> </item>
<item> <item>
<key> <string>id</string> </key> <key> <string>id</string> </key>
<value> <string>start</string> </value> <value> <string>validate</string> </value>
</item> </item>
<item> <item>
<key> <string>new_state_id</string> </key> <key> <string>new_state_id</string> </key>
<value> <string>started</string> </value> <value> <string>validated</string> </value>
</item> </item>
<item> <item>
<key> <string>script_name</string> </key> <key> <string>script_name</string> </key>
...@@ -46,7 +46,7 @@ ...@@ -46,7 +46,7 @@
</item> </item>
<item> <item>
<key> <string>title</string> </key> <key> <string>title</string> </key>
<value> <string>Start Open Order</string> </value> <value> <string>Validate Open Order</string> </value>
</item> </item>
<item> <item>
<key> <string>trigger_type</string> </key> <key> <string>trigger_type</string> </key>
......
bt5/erp5_open_trade/WorkflowTemplateItem/portal_workflow/open_order_workflow/transitions/stop_action.xml → bt5/erp5_open_trade/WorkflowTemplateItem/portal_workflow/open_order_workflow/transitions/validate_action.xml
View file @ 8abc75c0
...@@ -12,19 +12,19 @@ ...@@ -12,19 +12,19 @@
</item> </item>
<item> <item>
<key> <string>actbox_name</string> </key> <key> <string>actbox_name</string> </key>
<value> <string>Stop Open Order</string> </value> <value> <string>Validate Open Order</string> </value>
</item> </item>
<item> <item>
<key> <string>actbox_url</string> </key> <key> <string>actbox_url</string> </key>
<value> <string>%(content_url)s/Base_viewWorkflowActionDialog?workflow_action=stop_action</string> </value> <value> <string>%(content_url)s/Base_viewWorkflowActionDialog?workflow_action=validate_action</string> </value>
</item> </item>
<item> <item>
<key> <string>after_script_name</string> </key> <key> <string>after_script_name</string> </key>
<value> <string>stop</string> </value> <value> <string>validate</string> </value>
</item> </item>
<item> <item>
<key> <string>description</string> </key> <key> <string>description</string> </key>
<value> <string></string> </value> <value> <string>Validate the open order to make it effective</string> </value>
</item> </item>
<item> <item>
<key> <string>guard</string> </key> <key> <string>guard</string> </key>
...@@ -34,7 +34,7 @@ ...@@ -34,7 +34,7 @@
</item> </item>
<item> <item>
<key> <string>id</string> </key> <key> <string>id</string> </key>
<value> <string>stop_action</string> </value> <value> <string>validate_action</string> </value>
</item> </item>
<item> <item>
<key> <string>new_state_id</string> </key> <key> <string>new_state_id</string> </key>
...@@ -42,11 +42,11 @@ ...@@ -42,11 +42,11 @@
</item> </item>
<item> <item>
<key> <string>script_name</string> </key> <key> <string>script_name</string> </key>
<value> <string></string> </value> <value> <string>OpenOrder_validateData</string> </value>
</item> </item>
<item> <item>
<key> <string>title</string> </key> <key> <string>title</string> </key>
<value> <string>Stop Open Order Action</string> </value> <value> <string>Validate Open Order Action</string> </value>
</item> </item>
<item> <item>
<key> <string>trigger_type</string> </key> <key> <string>trigger_type</string> </key>
...@@ -65,8 +65,8 @@ ...@@ -65,8 +65,8 @@
<key> <string>roles</string> </key> <key> <string>roles</string> </key>
<value> <value>
<tuple> <tuple>
<string>Assignee</string>
<string>Assignor</string> <string>Assignor</string>
<string>Manager</string>
</tuple> </tuple>
</value> </value>
</item> </item>
......
bt5/erp5_open_trade/WorkflowTemplateItem/portal_workflow/open_order_workflow/worklists/1_draft_open_sale_order_list.xml
View file @ 8abc75c0
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
<key> <string>actbox_url</string> </key> <key> <string>actbox_url</string> </key>
<value> <string encoding="cdata"><![CDATA[ <value> <string encoding="cdata"><![CDATA[
sale_order_module/view?simulation_state=draft&portal_type=Open+Sale+Order&local_roles:list=Assignee&local_roles:list=Owner&reset=1 open_sale_order_module/view?simulation_state=draft&portal_type=Open+Sale+Order&local_roles:list=Assignee&local_roles:list=Owner&reset=1
]]></string> </value> ]]></string> </value>
</item> </item>
...@@ -82,7 +82,7 @@ sale_order_module/view?simulation_state=draft&portal_type=Open+Sale+Order&local_ ...@@ -82,7 +82,7 @@ sale_order_module/view?simulation_state=draft&portal_type=Open+Sale+Order&local_
</value> </value>
</item> </item>
<item> <item>
<key> <string>simulation_state</string> </key> <key> <string>validation_state</string> </key>
<value> <value>
<tuple> <tuple>
<string>draft</string> <string>draft</string>
......
bt5/erp5_open_trade/WorkflowTemplateItem/portal_workflow/open_order_workflow/worklists/2_auto_planned_open_sale_order_list.xml deleted 100644 → 0
View file @ 1d9ac7bc
<?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_name</string> </key>
<value> <string>Open Sale Order Proposals to Approve (%(count)s)</string> </value>
</item>
<item>
<key> <string>actbox_url</string> </key>
<value> <string encoding="cdata"><![CDATA[
sale_order_module/view?simulation_state=draft&portal_type=Open+Sale+Order&local_roles:list=Assignee&reset=1
]]></string> </value>
</item>
<item>
<key> <string>description</string> </key>
<value> <string>Open Sale Order Proposals to Approve</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>2_auto_planned_open_sale_order_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>
</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>Open Sale Order</string>
</tuple>
</value>
</item>
<item>
<key> <string>simulation_state</string> </key>
<value>
<tuple>
<string>auto_planned</string>
</tuple>
</value>
</item>
</dictionary>
</value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
bt5/erp5_open_trade/WorkflowTemplateItem/portal_workflow/open_order_workflow/worklists/3_planned_open_sale_order_list.xml
View file @ 8abc75c0
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
<key> <string>actbox_url</string> </key> <key> <string>actbox_url</string> </key>
<value> <string encoding="cdata"><![CDATA[ <value> <string encoding="cdata"><![CDATA[
sale_order_module/view?simulation_state=planned&portal_type=Open+Sale+Order&local_roles:list=Assignee&reset=1 open_sale_order_module/view?validation_state=planned&portal_type=Open+Sale+Order&local_roles:list=Assignee&reset=1
]]></string> </value> ]]></string> </value>
</item> </item>
...@@ -81,7 +81,7 @@ sale_order_module/view?simulation_state=planned&portal_type=Open+Sale+Order&loca ...@@ -81,7 +81,7 @@ sale_order_module/view?simulation_state=planned&portal_type=Open+Sale+Order&loca
</value> </value>
</item> </item>
<item> <item>
<key> <string>simulation_state</string> </key> <key> <string>validation_state</string> </key>
<value> <value>
<tuple> <tuple>
<string>planned</string> <string>planned</string>
......
bt5/erp5_open_trade/WorkflowTemplateItem/portal_workflow/open_order_workflow/worklists/4_ordered_open_sale_order_list.xml
View file @ 8abc75c0
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
<key> <string>actbox_url</string> </key> <key> <string>actbox_url</string> </key>
<value> <string encoding="cdata"><![CDATA[ <value> <string encoding="cdata"><![CDATA[
sale_order_module/view?simulation_state=ordered&portal_type=Open+Sale+Order&local_roles:list=Assignee&local_roles:list=Assignor&reset=1 open_sale_order_module/view?validation_state=ordered&portal_type=Open+Sale+Order&local_roles:list=Assignee&local_roles:list=Assignor&reset=1
]]></string> </value> ]]></string> </value>
</item> </item>
...@@ -81,7 +81,7 @@ sale_order_module/view?simulation_state=ordered&portal_type=Open+Sale+Order&loca ...@@ -81,7 +81,7 @@ sale_order_module/view?simulation_state=ordered&portal_type=Open+Sale+Order&loca
</value> </value>
</item> </item>
<item> <item>
<key> <string>simulation_state</string> </key> <key> <string>validation_state</string> </key>
<value> <value>
<tuple> <tuple>
<string>ordered</string> <string>ordered</string>
......
bt5/erp5_open_trade/WorkflowTemplateItem/portal_workflow/open_order_workflow/worklists/5_offered_open_sale_order_list.xml
View file @ 8abc75c0
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
<key> <string>actbox_url</string> </key> <key> <string>actbox_url</string> </key>
<value> <string encoding="cdata"><![CDATA[ <value> <string encoding="cdata"><![CDATA[
sale_order_module/view?simulation_state=offered&portal_type=Open+Sale+Order&local_roles:list=Assignee&local_roles:list=Assignor&reset=1 open_sale_order_module/view?validation_state=offered&portal_type=Open+Sale+Order&local_roles:list=Assignee&local_roles:list=Assignor&reset=1
]]></string> </value> ]]></string> </value>
</item> </item>
...@@ -82,7 +82,7 @@ sale_order_module/view?simulation_state=offered&portal_type=Open+Sale+Order&loca ...@@ -82,7 +82,7 @@ sale_order_module/view?simulation_state=offered&portal_type=Open+Sale+Order&loca
</value> </value>
</item> </item>
<item> <item>
<key> <string>simulation_state</string> </key> <key> <string>validation_state</string> </key>
<value> <value>
<tuple> <tuple>
<string>offered</string> <string>offered</string>
......
bt5/erp5_open_trade/bt/revision
View file @ 8abc75c0
94 95
\ No newline at end of file \ 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