From 645147181d0b3de772c56ada3d6af27d3099865a Mon Sep 17 00:00:00 2001 From: Nicolas Dumazet <nicolas.dumazet@nexedi.com> Date: Wed, 28 Jul 2010 02:35:57 +0000 Subject: [PATCH] delete movement_base_contribution_interaction_workflow and replace it with movement_resource_interaction_workflow (can be found in erp5_base) git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@37307 20353a03-c40f-0410-a6d1-a30d3c3de9de --- ...base_contribution_interaction_workflow.xml | 49 ------- .../interactions.xml | 31 ---- .../interactions/setResource.xml | 93 ------------ .../scripts.xml | 31 ---- ...ement_copyBaseContributionFromResource.xml | 138 ------------------ .../variables.xml | 25 ---- .../worklists.xml | 25 ---- bt5/erp5_trade/bt/revision | 2 +- .../template_portal_type_workflow_chain_list | 16 +- bt5/erp5_trade/bt/template_workflow_id_list | 1 - 10 files changed, 9 insertions(+), 402 deletions(-) delete mode 100644 bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/movement_base_contribution_interaction_workflow.xml delete mode 100644 bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/movement_base_contribution_interaction_workflow/interactions.xml delete mode 100644 bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/movement_base_contribution_interaction_workflow/interactions/setResource.xml delete mode 100644 bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/movement_base_contribution_interaction_workflow/scripts.xml delete mode 100644 bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/movement_base_contribution_interaction_workflow/scripts/Movement_copyBaseContributionFromResource.xml delete mode 100644 bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/movement_base_contribution_interaction_workflow/variables.xml delete mode 100644 bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/movement_base_contribution_interaction_workflow/worklists.xml diff --git a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/movement_base_contribution_interaction_workflow.xml b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/movement_base_contribution_interaction_workflow.xml deleted file mode 100644 index 7be337c5cf..0000000000 --- a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/movement_base_contribution_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></string> </value> - </item> - <item> - <key> <string>groups</string> </key> - <value> - <tuple/> - </value> - </item> - <item> - <key> <string>id</string> </key> - <value> <string>movement_base_contribution_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>Base Contribution Interaction Workflow</string> </value> - </item> - </dictionary> - </pickle> - </record> -</ZopeData> diff --git a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/movement_base_contribution_interaction_workflow/interactions.xml b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/movement_base_contribution_interaction_workflow/interactions.xml deleted file mode 100644 index 6788072919..0000000000 --- a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/movement_base_contribution_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_trade/WorkflowTemplateItem/portal_workflow/movement_base_contribution_interaction_workflow/interactions/setResource.xml b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/movement_base_contribution_interaction_workflow/interactions/setResource.xml deleted file mode 100644 index 73908b1589..0000000000 --- a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/movement_base_contribution_interaction_workflow/interactions/setResource.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> - <tuple/> - </value> - </item> - <item> - <key> <string>after_script_name</string> </key> - <value> - <list> - <string>Movement_copyBaseContributionFromResource</string> - </list> - </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>setResource</string> </value> - </item> - <item> - <key> <string>method_id</string> </key> - <value> - <list> - <string>_setResource.*</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_trade/WorkflowTemplateItem/portal_workflow/movement_base_contribution_interaction_workflow/scripts.xml b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/movement_base_contribution_interaction_workflow/scripts.xml deleted file mode 100644 index 0622b3c34f..0000000000 --- a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/movement_base_contribution_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_trade/WorkflowTemplateItem/portal_workflow/movement_base_contribution_interaction_workflow/scripts/Movement_copyBaseContributionFromResource.xml b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/movement_base_contribution_interaction_workflow/scripts/Movement_copyBaseContributionFromResource.xml deleted file mode 100644 index 0283156f74..0000000000 --- a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/movement_base_contribution_interaction_workflow/scripts/Movement_copyBaseContributionFromResource.xml +++ /dev/null @@ -1,138 +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>movement = state_change[\'object\']\n -\n -resource = movement.getResourceValue()\n -if resource is not None:\n - movement.setBaseContributionList(resource.getBaseContributionList())\n -</string> </value> - </item> - <item> - <key> <string>_code</string> </key> - <value> - <none/> - </value> - </item> - <item> - <key> <string>_params</string> </key> - <value> <string>state_change</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>_getitem_</string> - <string>movement</string> - <string>_getattr_</string> - <string>resource</string> - <string>None</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>Movement_copyBaseContributionFromResource</string> </value> - </item> - <item> - <key> <string>warnings</string> </key> - <value> - <tuple/> - </value> - </item> - </dictionary> - </pickle> - </record> -</ZopeData> diff --git a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/movement_base_contribution_interaction_workflow/variables.xml b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/movement_base_contribution_interaction_workflow/variables.xml deleted file mode 100644 index 5547232278..0000000000 --- a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/movement_base_contribution_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_trade/WorkflowTemplateItem/portal_workflow/movement_base_contribution_interaction_workflow/worklists.xml b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/movement_base_contribution_interaction_workflow/worklists.xml deleted file mode 100644 index 1f8b17b012..0000000000 --- a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/movement_base_contribution_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_trade/bt/revision b/bt5/erp5_trade/bt/revision index 20d91f52a5..03b7719c61 100644 --- a/bt5/erp5_trade/bt/revision +++ b/bt5/erp5_trade/bt/revision @@ -1 +1 @@ -963 \ No newline at end of file +964 diff --git a/bt5/erp5_trade/bt/template_portal_type_workflow_chain_list b/bt5/erp5_trade/bt/template_portal_type_workflow_chain_list index 23eb81eec8..f769f76da9 100644 --- a/bt5/erp5_trade/bt/template_portal_type_workflow_chain_list +++ b/bt5/erp5_trade/bt/template_portal_type_workflow_chain_list @@ -26,7 +26,7 @@ Internal Order Cell | pricing_interaction_workflow Internal Order Line | delivery_movement_causality_interaction_workflow Internal Order Line | delivery_movement_simulation_interaction_workflow Internal Order Line | edit_workflow -Internal Order Line | movement_base_contribution_interaction_workflow +Internal Order Line | movement_resource_interaction_workflow Internal Order Line | pricing_interaction_workflow Internal Order Line | trade_matrix_workflow Internal Order | delivery_causality_interaction_workflow @@ -40,7 +40,7 @@ Internal Packing List Cell | pricing_interaction_workflow Internal Packing List Line | delivery_movement_causality_interaction_workflow Internal Packing List Line | delivery_movement_simulation_interaction_workflow Internal Packing List Line | edit_workflow -Internal Packing List Line | movement_base_contribution_interaction_workflow +Internal Packing List Line | movement_resource_interaction_workflow Internal Packing List Line | pricing_interaction_workflow Internal Packing List Line | trade_matrix_workflow Internal Packing List | delivery_causality_interaction_workflow @@ -66,7 +66,7 @@ Purchase Order Cell | pricing_interaction_workflow Purchase Order Line | delivery_movement_causality_interaction_workflow Purchase Order Line | delivery_movement_simulation_interaction_workflow Purchase Order Line | edit_workflow -Purchase Order Line | movement_base_contribution_interaction_workflow +Purchase Order Line | movement_resource_interaction_workflow Purchase Order Line | pricing_interaction_workflow Purchase Order Line | trade_matrix_workflow Purchase Order | delivery_causality_interaction_workflow @@ -80,7 +80,7 @@ Purchase Packing List Cell | pricing_interaction_workflow Purchase Packing List Line | delivery_movement_causality_interaction_workflow Purchase Packing List Line | delivery_movement_simulation_interaction_workflow Purchase Packing List Line | edit_workflow -Purchase Packing List Line | movement_base_contribution_interaction_workflow +Purchase Packing List Line | movement_resource_interaction_workflow Purchase Packing List Line | pricing_interaction_workflow Purchase Packing List Line | trade_matrix_workflow Purchase Packing List | delivery_causality_interaction_workflow @@ -96,7 +96,7 @@ Returned Purchase Packing List Cell | pricing_interaction_workflow Returned Purchase Packing List Line | delivery_movement_causality_interaction_workflow Returned Purchase Packing List Line | delivery_movement_simulation_interaction_workflow Returned Purchase Packing List Line | edit_workflow -Returned Purchase Packing List Line | movement_base_contribution_interaction_workflow +Returned Purchase Packing List Line | movement_resource_interaction_workflow Returned Purchase Packing List Line | pricing_interaction_workflow Returned Purchase Packing List Line | trade_matrix_workflow Returned Purchase Packing List | delivery_causality_interaction_workflow @@ -110,7 +110,7 @@ Returned Sale Packing List Cell | pricing_interaction_workflow Returned Sale Packing List Line | delivery_movement_causality_interaction_workflow Returned Sale Packing List Line | delivery_movement_simulation_interaction_workflow Returned Sale Packing List Line | edit_workflow -Returned Sale Packing List Line | movement_base_contribution_interaction_workflow +Returned Sale Packing List Line | movement_resource_interaction_workflow Returned Sale Packing List Line | pricing_interaction_workflow Returned Sale Packing List Line | trade_matrix_workflow Returned Sale Packing List | delivery_causality_interaction_workflow @@ -125,7 +125,7 @@ Sale Order Cell | pricing_interaction_workflow Sale Order Line | delivery_movement_causality_interaction_workflow Sale Order Line | delivery_movement_simulation_interaction_workflow Sale Order Line | edit_workflow -Sale Order Line | movement_base_contribution_interaction_workflow +Sale Order Line | movement_resource_interaction_workflow Sale Order Line | pricing_interaction_workflow Sale Order Line | trade_matrix_workflow Sale Order | delivery_causality_interaction_workflow @@ -141,7 +141,7 @@ Sale Packing List Line | container_interaction_workflow Sale Packing List Line | delivery_movement_causality_interaction_workflow Sale Packing List Line | delivery_movement_simulation_interaction_workflow Sale Packing List Line | edit_workflow -Sale Packing List Line | movement_base_contribution_interaction_workflow +Sale Packing List Line | movement_resource_interaction_workflow Sale Packing List Line | pricing_interaction_workflow Sale Packing List Line | trade_matrix_workflow Sale Packing List | delivery_causality_interaction_workflow diff --git a/bt5/erp5_trade/bt/template_workflow_id_list b/bt5/erp5_trade/bt/template_workflow_id_list index 4cb66e3ab6..17d4e7f164 100644 --- a/bt5/erp5_trade/bt/template_workflow_id_list +++ b/bt5/erp5_trade/bt/template_workflow_id_list @@ -1,7 +1,6 @@ container_interaction_workflow internal_packing_list_workflow inventory_workflow -movement_base_contribution_interaction_workflow order_workflow packing_list_container_workflow packing_list_workflow -- 2.30.9