From 113c50aa53cb90f89f31d8b802fe696e411903a5 Mon Sep 17 00:00:00 2001 From: Rafael Monnerat <rafael@nexedi.com> Date: Wed, 13 Sep 2006 13:49:31 +0000 Subject: [PATCH] Remove production_order_interaction_workflow. Do not use interaction workflow Order Movement, as expanding the simulation is now done on the document level. git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@9875 20353a03-c40f-0410-a6d1-a30d3c3de9de --- .../workflow_chain_type.xml | 10 +- .../interactions.xml | 40 ----- .../interactions/edit.xml | 94 ----------- .../scripts.xml | 40 ----- .../scripts/Order_updateAppliedRule.xml | 150 ------------------ .../variables.xml | 34 ---- .../worklists.xml | 34 ---- bt5/erp5_mrp/bt/provision_list | 0 bt5/erp5_mrp/bt/revision | 1 + .../template_portal_type_workflow_chain_list | 1 - bt5/erp5_mrp/bt/template_workflow_id_list | 1 - 11 files changed, 6 insertions(+), 399 deletions(-) delete mode 100644 bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_order_interaction_workflow/interactions.xml delete mode 100644 bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_order_interaction_workflow/interactions/edit.xml delete mode 100644 bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_order_interaction_workflow/scripts.xml delete mode 100644 bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_order_interaction_workflow/scripts/Order_updateAppliedRule.xml delete mode 100644 bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_order_interaction_workflow/variables.xml delete mode 100644 bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_order_interaction_workflow/worklists.xml create mode 100644 bt5/erp5_mrp/bt/provision_list diff --git a/bt5/erp5_mrp/PortalTypeWorkflowChainTemplateItem/workflow_chain_type.xml b/bt5/erp5_mrp/PortalTypeWorkflowChainTemplateItem/workflow_chain_type.xml index ac9048684b..34be8c799e 100644 --- a/bt5/erp5_mrp/PortalTypeWorkflowChainTemplateItem/workflow_chain_type.xml +++ b/bt5/erp5_mrp/PortalTypeWorkflowChainTemplateItem/workflow_chain_type.xml @@ -1,7 +1,7 @@ <workflow_chain> <chain> <type>Production Order</type> - <workflow>edit_workflow, production_order_workflow, production_order_interaction_workflow</workflow> + <workflow>edit_workflow, production_order_workflow</workflow> </chain> <chain> <type>Production Order Line</type> @@ -9,19 +9,19 @@ </chain> <chain> <type>Production Packing List</type> - <workflow>production_packing_list_workflow, production_packing_list_causality_workflow, edit_workflow, production_packing_list_interaction_workflow</workflow> + <workflow>production_packing_list_workflow, production_packing_list_interaction_workflow, production_packing_list_causality_workflow, edit_workflow</workflow> </chain> <chain> <type>Production Packing List Line</type> - <workflow>edit_workflow, production_packing_list_interaction_workflow, production_matrix_workflow</workflow> + <workflow>production_matrix_workflow, edit_workflow, production_packing_list_interaction_workflow</workflow> </chain> <chain> <type>Production Report</type> - <workflow>production_packing_list_causality_workflow, production_packing_list_interaction_workflow, edit_workflow, production_packing_list_workflow</workflow> + <workflow>production_packing_list_workflow, production_packing_list_interaction_workflow, production_packing_list_causality_workflow, edit_workflow</workflow> </chain> <chain> <type>Production Report Line</type> - <workflow>edit_workflow, production_matrix_workflow, production_packing_list_interaction_workflow</workflow> + <workflow>edit_workflow, production_packing_list_interaction_workflow, production_matrix_workflow</workflow> </chain> <chain> <type>Supply Chain</type> diff --git a/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_order_interaction_workflow/interactions.xml b/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_order_interaction_workflow/interactions.xml deleted file mode 100644 index 7d8c51003b..0000000000 --- a/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_order_interaction_workflow/interactions.xml +++ /dev/null @@ -1,40 +0,0 @@ -<?xml version="1.0"?> -<ZopeData> - <record id="1" aka="AAAAAAAAAAE="> - <pickle> - <tuple> - <tuple> - <string>Products.ERP5.Interaction</string> - <string>Interaction</string> - </tuple> - <none/> - </tuple> - </pickle> - <pickle> - <dictionary> - <item> - <key> <string>__ac_local_roles__</string> </key> - <value> - <none/> - </value> - </item> - <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_mrp/WorkflowTemplateItem/portal_workflow/production_order_interaction_workflow/interactions/edit.xml b/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_order_interaction_workflow/interactions/edit.xml deleted file mode 100644 index d7b5ef4f44..0000000000 --- a/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_order_interaction_workflow/interactions/edit.xml +++ /dev/null @@ -1,94 +0,0 @@ -<?xml version="1.0"?> -<ZopeData> - <record id="1" aka="AAAAAAAAAAE="> - <pickle> - <tuple> - <tuple> - <string>Products.ERP5.Interaction</string> - <string>InteractionDefinition</string> - </tuple> - <none/> - </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>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> - <tuple/> - </value> - </item> - <item> - <key> <string>after_script_name</string> </key> - <value> - <list> - <string>Order_updateAppliedRule</string> - </list> - </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>edit</string> </value> - </item> - <item> - <key> <string>method_id</string> </key> - <value> - <list> - <string>_edit</string> - </list> - </value> - </item> - <item> - <key> <string>portal_type_filter</string> </key> - <value> - <list> - <string>Production Order</string> - </list> - </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_mrp/WorkflowTemplateItem/portal_workflow/production_order_interaction_workflow/scripts.xml b/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_order_interaction_workflow/scripts.xml deleted file mode 100644 index 01ba35bf25..0000000000 --- a/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_order_interaction_workflow/scripts.xml +++ /dev/null @@ -1,40 +0,0 @@ -<?xml version="1.0"?> -<ZopeData> - <record id="1" aka="AAAAAAAAAAE="> - <pickle> - <tuple> - <tuple> - <string>Products.DCWorkflow.Scripts</string> - <string>Scripts</string> - </tuple> - <none/> - </tuple> - </pickle> - <pickle> - <dictionary> - <item> - <key> <string>__ac_local_roles__</string> </key> - <value> - <none/> - </value> - </item> - <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_mrp/WorkflowTemplateItem/portal_workflow/production_order_interaction_workflow/scripts/Order_updateAppliedRule.xml b/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_order_interaction_workflow/scripts/Order_updateAppliedRule.xml deleted file mode 100644 index ab9771f438..0000000000 --- a/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_order_interaction_workflow/scripts/Order_updateAppliedRule.xml +++ /dev/null @@ -1,150 +0,0 @@ -<?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>order = state_change.object\n -\n -if order.getSimulationState() in order.getPortalPlannedOrderStateList():\n - # Be carreful, tags must corresponds to ones in production_order_workflow\n - previous_tag = order.getPath() + \'_firstUpdateAppliedRule\'\n - expand_tag = order.getPath() + \'_expand\'\n - order.activate(tag=expand_tag,after_tag=previous_tag).updateAppliedRule(tag=expand_tag,rule_id = \'default_production_order_rule\',priority=3)\n -</string> </value> - </item> - <item> - <key> <string>_code</string> </key> - <value> - <none/> - </value> - </item> - <item> - <key> <string>_filepath</string> </key> - <value> <string>Script (Python):/erp5/portal_workflow/order_interaction_workflow/scripts/Order_updateAppliedRule</string> </value> - </item> - <item> - <key> <string>_params</string> </key> - <value> <string>state_change</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>1</int> </value> - </item> - <item> - <key> <string>co_varnames</string> </key> - <value> - <tuple> - <string>state_change</string> - <string>_getattr_</string> - <string>order</string> - <string>previous_tag</string> - <string>expand_tag</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>Order_updateAppliedRule</string> </value> - </item> - <item> - <key> <string>warnings</string> </key> - <value> - <tuple/> - </value> - </item> - </dictionary> - </pickle> - </record> -</ZopeData> diff --git a/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_order_interaction_workflow/variables.xml b/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_order_interaction_workflow/variables.xml deleted file mode 100644 index db67387d4e..0000000000 --- a/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_order_interaction_workflow/variables.xml +++ /dev/null @@ -1,34 +0,0 @@ -<?xml version="1.0"?> -<ZopeData> - <record id="1" aka="AAAAAAAAAAE="> - <pickle> - <tuple> - <tuple> - <string>Products.DCWorkflow.Variables</string> - <string>Variables</string> - </tuple> - <none/> - </tuple> - </pickle> - <pickle> - <dictionary> - <item> - <key> <string>__ac_local_roles__</string> </key> - <value> - <none/> - </value> - </item> - <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_mrp/WorkflowTemplateItem/portal_workflow/production_order_interaction_workflow/worklists.xml b/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_order_interaction_workflow/worklists.xml deleted file mode 100644 index f4c2789633..0000000000 --- a/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_order_interaction_workflow/worklists.xml +++ /dev/null @@ -1,34 +0,0 @@ -<?xml version="1.0"?> -<ZopeData> - <record id="1" aka="AAAAAAAAAAE="> - <pickle> - <tuple> - <tuple> - <string>Products.DCWorkflow.Worklists</string> - <string>Worklists</string> - </tuple> - <none/> - </tuple> - </pickle> - <pickle> - <dictionary> - <item> - <key> <string>__ac_local_roles__</string> </key> - <value> - <none/> - </value> - </item> - <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_mrp/bt/provision_list b/bt5/erp5_mrp/bt/provision_list new file mode 100644 index 0000000000..e69de29bb2 diff --git a/bt5/erp5_mrp/bt/revision b/bt5/erp5_mrp/bt/revision index e69de29bb2..9a037142aa 100644 --- a/bt5/erp5_mrp/bt/revision +++ b/bt5/erp5_mrp/bt/revision @@ -0,0 +1 @@ +10 \ No newline at end of file diff --git a/bt5/erp5_mrp/bt/template_portal_type_workflow_chain_list b/bt5/erp5_mrp/bt/template_portal_type_workflow_chain_list index fcc7181b98..7c1bdb3559 100644 --- a/bt5/erp5_mrp/bt/template_portal_type_workflow_chain_list +++ b/bt5/erp5_mrp/bt/template_portal_type_workflow_chain_list @@ -1,7 +1,6 @@ Production Order Line | edit_workflow Production Order Line | production_matrix_workflow Production Order | edit_workflow -Production Order | production_order_interaction_workflow Production Order | production_order_workflow Production Packing List Line | edit_workflow Production Packing List Line | production_matrix_workflow diff --git a/bt5/erp5_mrp/bt/template_workflow_id_list b/bt5/erp5_mrp/bt/template_workflow_id_list index ddeef4481b..348350bc13 100644 --- a/bt5/erp5_mrp/bt/template_workflow_id_list +++ b/bt5/erp5_mrp/bt/template_workflow_id_list @@ -1,5 +1,4 @@ production_matrix_workflow -production_order_interaction_workflow production_order_workflow production_packing_list_causality_workflow production_packing_list_interaction_workflow -- 2.30.9