diff --git a/bt5/erp5_simulation/PortalTypeWorkflowChainTemplateItem/workflow_chain_type.xml b/bt5/erp5_simulation/PortalTypeWorkflowChainTemplateItem/workflow_chain_type.xml index 971ffd8b92d9fd056bec615f9e64579b90ff12ac..f05c89edf1f18cecd51b5275dacc5be57e04f680 100644 --- a/bt5/erp5_simulation/PortalTypeWorkflowChainTemplateItem/workflow_chain_type.xml +++ b/bt5/erp5_simulation/PortalTypeWorkflowChainTemplateItem/workflow_chain_type.xml @@ -27,18 +27,6 @@ <type>Production Reduction Solver</type> <workflow>solver_workflow</workflow> </chain> - <chain> - <type>Purchase Invoice Transaction</type> - <workflow>divergence_interaction_workflow</workflow> - </chain> - <chain> - <type>Purchase Order</type> - <workflow>divergence_interaction_workflow</workflow> - </chain> - <chain> - <type>Purchase Packing List</type> - <workflow>divergence_interaction_workflow</workflow> - </chain> <chain> <type>Quantity Cancel Solver</type> <workflow>solver_workflow</workflow> @@ -47,18 +35,6 @@ <type>Quantity Split Solver</type> <workflow>solver_workflow</workflow> </chain> - <chain> - <type>Sale Invoice Transaction</type> - <workflow>divergence_interaction_workflow</workflow> - </chain> - <chain> - <type>Sale Order</type> - <workflow>divergence_interaction_workflow</workflow> - </chain> - <chain> - <type>Sale Packing List</type> - <workflow>divergence_interaction_workflow</workflow> - </chain> <chain> <type>Solver Process</type> <workflow>solver_process_workflow</workflow> diff --git a/bt5/erp5_simulation/WorkflowTemplateItem/portal_workflow/divergence_interaction_workflow.xml b/bt5/erp5_simulation/WorkflowTemplateItem/portal_workflow/divergence_interaction_workflow.xml deleted file mode 100644 index f2ac62e23271012b0eca37d2845795f7f2828a55..0000000000000000000000000000000000000000 --- a/bt5/erp5_simulation/WorkflowTemplateItem/portal_workflow/divergence_interaction_workflow.xml +++ /dev/null @@ -1,49 +0,0 @@ -<?xml version="1.0"?> -<ZopeData> - <record id="1" aka="AAAAAAAAAAE="> - <pickle> - <tuple> - <global name="InteractionWorkflowDefinition" module="Products.ERP5.InteractionWorkflow"/> - <tuple/> - </tuple> - </pickle> - <pickle> - <dictionary> - <item> - <key> <string>_objects</string> </key> - <value> - <tuple/> - </value> - </item> - <item> - <key> <string>creation_guard</string> </key> - <value> - <none/> - </value> - </item> - <item> - <key> <string>description</string> </key> - <value> <string>This workflow tries to solve divergences automatically.</string> </value> - </item> - <item> - <key> <string>groups</string> </key> - <value> - <tuple/> - </value> - </item> - <item> - <key> <string>id</string> </key> - <value> <string>divergence_interaction_workflow</string> </value> - </item> - <item> - <key> <string>manager_bypass</string> </key> - <value> <int>0</int> </value> - </item> - <item> - <key> <string>title</string> </key> - <value> <string>Divergence Interaction Workflow</string> </value> - </item> - </dictionary> - </pickle> - </record> -</ZopeData> diff --git a/bt5/erp5_simulation/WorkflowTemplateItem/portal_workflow/divergence_interaction_workflow/interactions.xml b/bt5/erp5_simulation/WorkflowTemplateItem/portal_workflow/divergence_interaction_workflow/interactions.xml deleted file mode 100644 index 6788072919f778201f1ac6bad0ff8edc16dcc3e4..0000000000000000000000000000000000000000 --- a/bt5/erp5_simulation/WorkflowTemplateItem/portal_workflow/divergence_interaction_workflow/interactions.xml +++ /dev/null @@ -1,31 +0,0 @@ -<?xml version="1.0"?> -<ZopeData> - <record id="1" aka="AAAAAAAAAAE="> - <pickle> - <tuple> - <global name="Interaction" module="Products.ERP5.Interaction"/> - <tuple/> - </tuple> - </pickle> - <pickle> - <dictionary> - <item> - <key> <string>_mapping</string> </key> - <value> - <dictionary/> - </value> - </item> - <item> - <key> <string>_objects</string> </key> - <value> - <tuple/> - </value> - </item> - <item> - <key> <string>id</string> </key> - <value> <string>interactions</string> </value> - </item> - </dictionary> - </pickle> - </record> -</ZopeData> diff --git a/bt5/erp5_simulation/WorkflowTemplateItem/portal_workflow/divergence_interaction_workflow/interactions/solve_divergence_automatically.xml b/bt5/erp5_simulation/WorkflowTemplateItem/portal_workflow/divergence_interaction_workflow/interactions/solve_divergence_automatically.xml deleted file mode 100644 index ac554ff078042f1a8cad1dc1f2d691db5a7cd0c0..0000000000000000000000000000000000000000 --- a/bt5/erp5_simulation/WorkflowTemplateItem/portal_workflow/divergence_interaction_workflow/interactions/solve_divergence_automatically.xml +++ /dev/null @@ -1,93 +0,0 @@ -<?xml version="1.0"?> -<ZopeData> - <record id="1" aka="AAAAAAAAAAE="> - <pickle> - <tuple> - <global name="InteractionDefinition" module="Products.ERP5.Interaction"/> - <tuple/> - </tuple> - </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>activate_script_name</string> </key> - <value> - <list> - <string>Workflow_solveDivergenceAutomatically</string> - </list> - </value> - </item> - <item> - <key> <string>after_script_name</string> </key> - <value> - <tuple/> - </value> - </item> - <item> - <key> <string>before_commit_script_name</string> </key> - <value> - <tuple/> - </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>solve_divergence_automatically</string> </value> - </item> - <item> - <key> <string>method_id</string> </key> - <value> - <list> - <string>diverge</string> - </list> - </value> - </item> - <item> - <key> <string>once_per_transaction</string> </key> - <value> <int>1</int> </value> - </item> - <item> - <key> <string>portal_type_filter</string> </key> - <value> - <none/> - </value> - </item> - <item> - <key> <string>script_name</string> </key> - <value> - <tuple/> - </value> - </item> - <item> - <key> <string>title</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>trigger_type</string> </key> - <value> <int>2</int> </value> - </item> - </dictionary> - </pickle> - </record> -</ZopeData> diff --git a/bt5/erp5_simulation/WorkflowTemplateItem/portal_workflow/divergence_interaction_workflow/scripts.xml b/bt5/erp5_simulation/WorkflowTemplateItem/portal_workflow/divergence_interaction_workflow/scripts.xml deleted file mode 100644 index 0622b3c34fa5ffe83ab080066492f760b230dadf..0000000000000000000000000000000000000000 --- a/bt5/erp5_simulation/WorkflowTemplateItem/portal_workflow/divergence_interaction_workflow/scripts.xml +++ /dev/null @@ -1,31 +0,0 @@ -<?xml version="1.0"?> -<ZopeData> - <record id="1" aka="AAAAAAAAAAE="> - <pickle> - <tuple> - <global name="Scripts" module="Products.DCWorkflow.Scripts"/> - <tuple/> - </tuple> - </pickle> - <pickle> - <dictionary> - <item> - <key> <string>_mapping</string> </key> - <value> - <dictionary/> - </value> - </item> - <item> - <key> <string>_objects</string> </key> - <value> - <tuple/> - </value> - </item> - <item> - <key> <string>id</string> </key> - <value> <string>scripts</string> </value> - </item> - </dictionary> - </pickle> - </record> -</ZopeData> diff --git a/bt5/erp5_simulation/WorkflowTemplateItem/portal_workflow/divergence_interaction_workflow/scripts/Workflow_solveDivergenceAutomatically.xml b/bt5/erp5_simulation/WorkflowTemplateItem/portal_workflow/divergence_interaction_workflow/scripts/Workflow_solveDivergenceAutomatically.xml deleted file mode 100644 index 0f261cd0ce093fd1743f7383e14b2967ef0ddf74..0000000000000000000000000000000000000000 --- a/bt5/erp5_simulation/WorkflowTemplateItem/portal_workflow/divergence_interaction_workflow/scripts/Workflow_solveDivergenceAutomatically.xml +++ /dev/null @@ -1,165 +0,0 @@ -<?xml version="1.0"?> -<ZopeData> - <record id="1" aka="AAAAAAAAAAE="> - <pickle> - <tuple> - <global name="PythonScript" module="Products.PythonScripts.PythonScript"/> - <tuple/> - </tuple> - </pickle> - <pickle> - <dictionary> - <item> - <key> <string>Script_magic</string> </key> - <value> <int>3</int> </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>delivery = state_change[\'object\']\n -\n -solver_tool = getattr(delivery.getPortalObject(), \'portal_solvers\', None)\n -solver_process_tool = getattr(delivery.getPortalObject(), \'portal_solver_processes\', None)\n -\n -if solver_tool is None or solver_process_tool is None:\n - return\n -\n -for tester, simulation_movement in delivery.getDivergentTesterAndSimulationMovementList():\n - for solver in solver_tool.searchTargetSolverList(tester, simulation_movement, automatic_solver_only=True):\n - if solver.isAutomaticSolver():\n - # XXX We sometimes want to store solver process document persistently.\n - solver_process = solver_process_tool.newContent(\n - portal_type=\'Solver Process\', temp_object=True)\n - # XXX We need to calculate and pass default values for some solvers\n - target_solver = solver_process.newContent(\n - portal_type=solver.getId(),\n - delivery=simulation_movement.getRelativeUrl()\n - )\n - target_solver.startSolving()\n - target_solver.solve()\n - break\n -</string> </value> - </item> - <item> - <key> <string>_code</string> </key> - <value> - <none/> - </value> - </item> - <item> - <key> <string>_params</string> </key> - <value> <string>state_change, **kw</string> </value> - </item> - <item> - <key> <string>_proxy_roles</string> </key> - <value> - <tuple> - <string>Manager</string> - </tuple> - </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>1</int> </value> - </item> - <item> - <key> <string>co_varnames</string> </key> - <value> - <tuple> - <string>state_change</string> - <string>kw</string> - <string>_getitem_</string> - <string>delivery</string> - <string>getattr</string> - <string>_getattr_</string> - <string>None</string> - <string>solver_tool</string> - <string>solver_process_tool</string> - <string>_getiter_</string> - <string>tester</string> - <string>simulation_movement</string> - <string>True</string> - <string>solver</string> - <string>solver_process</string> - <string>target_solver</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>Workflow_solveDivergenceAutomatically</string> </value> - </item> - <item> - <key> <string>warnings</string> </key> - <value> - <tuple/> - </value> - </item> - </dictionary> - </pickle> - </record> -</ZopeData> diff --git a/bt5/erp5_simulation/WorkflowTemplateItem/portal_workflow/divergence_interaction_workflow/variables.xml b/bt5/erp5_simulation/WorkflowTemplateItem/portal_workflow/divergence_interaction_workflow/variables.xml deleted file mode 100644 index 55472322781f3cf4d5b0026616f99218a03efb1b..0000000000000000000000000000000000000000 --- a/bt5/erp5_simulation/WorkflowTemplateItem/portal_workflow/divergence_interaction_workflow/variables.xml +++ /dev/null @@ -1,25 +0,0 @@ -<?xml version="1.0"?> -<ZopeData> - <record id="1" aka="AAAAAAAAAAE="> - <pickle> - <tuple> - <global name="Variables" module="Products.DCWorkflow.Variables"/> - <tuple/> - </tuple> - </pickle> - <pickle> - <dictionary> - <item> - <key> <string>_mapping</string> </key> - <value> - <dictionary/> - </value> - </item> - <item> - <key> <string>id</string> </key> - <value> <string>variables</string> </value> - </item> - </dictionary> - </pickle> - </record> -</ZopeData> diff --git a/bt5/erp5_simulation/WorkflowTemplateItem/portal_workflow/divergence_interaction_workflow/worklists.xml b/bt5/erp5_simulation/WorkflowTemplateItem/portal_workflow/divergence_interaction_workflow/worklists.xml deleted file mode 100644 index 1f8b17b01278f4c455558cd9d0b05357fdd86a7a..0000000000000000000000000000000000000000 --- a/bt5/erp5_simulation/WorkflowTemplateItem/portal_workflow/divergence_interaction_workflow/worklists.xml +++ /dev/null @@ -1,25 +0,0 @@ -<?xml version="1.0"?> -<ZopeData> - <record id="1" aka="AAAAAAAAAAE="> - <pickle> - <tuple> - <global name="Worklists" module="Products.DCWorkflow.Worklists"/> - <tuple/> - </tuple> - </pickle> - <pickle> - <dictionary> - <item> - <key> <string>_mapping</string> </key> - <value> - <dictionary/> - </value> - </item> - <item> - <key> <string>id</string> </key> - <value> <string>worklists</string> </value> - </item> - </dictionary> - </pickle> - </record> -</ZopeData> diff --git a/bt5/erp5_simulation/bt/revision b/bt5/erp5_simulation/bt/revision index 1bda760653e918fc4fca9a02b046236b0aa02843..8d9f781b525d012ac086a85ada4d36c91a210fd8 100644 --- a/bt5/erp5_simulation/bt/revision +++ b/bt5/erp5_simulation/bt/revision @@ -1 +1 @@ -117 \ No newline at end of file +118 \ No newline at end of file diff --git a/bt5/erp5_simulation/bt/template_portal_type_workflow_chain_list b/bt5/erp5_simulation/bt/template_portal_type_workflow_chain_list index b70a9e57499d99ed79df14431bdaf45f90f35440..2582a976049e03c89979de8ef24fdacea7bb9336 100644 --- a/bt5/erp5_simulation/bt/template_portal_type_workflow_chain_list +++ b/bt5/erp5_simulation/bt/template_portal_type_workflow_chain_list @@ -5,14 +5,8 @@ DateTime Divergence Tester | edit_workflow Float Divergence Tester | edit_workflow Net Converted Quantity Divergence Tester | edit_workflow Production Reduction Solver | solver_workflow -Purchase Invoice Transaction | divergence_interaction_workflow -Purchase Order | divergence_interaction_workflow -Purchase Packing List | divergence_interaction_workflow Quantity Cancel Solver | solver_workflow Quantity Split Solver | solver_workflow -Sale Invoice Transaction | divergence_interaction_workflow -Sale Order | divergence_interaction_workflow -Sale Packing List | divergence_interaction_workflow Solver Process | solver_process_workflow String Divergence Tester | edit_workflow Trade Model Solver | solver_workflow diff --git a/bt5/erp5_simulation/bt/template_workflow_id_list b/bt5/erp5_simulation/bt/template_workflow_id_list index a197806f18864bc925ee661980109ed86b4634ea..71d1ab261e2a29836bd62dde8c4674ed98269f5b 100644 --- a/bt5/erp5_simulation/bt/template_workflow_id_list +++ b/bt5/erp5_simulation/bt/template_workflow_id_list @@ -1,3 +1,2 @@ -divergence_interaction_workflow solver_process_workflow solver_workflow \ No newline at end of file