diff --git a/bt5/erp5_simulation/ActionTemplateItem/portal_types/Solver%20Tool/view.xml b/bt5/erp5_base/ActionTemplateItem/portal_types/Solver%20Tool/view.xml similarity index 100% rename from bt5/erp5_simulation/ActionTemplateItem/portal_types/Solver%20Tool/view.xml rename to bt5/erp5_base/ActionTemplateItem/portal_types/Solver%20Tool/view.xml diff --git a/bt5/erp5_simulation/ActionTemplateItem/portal_types/Solver%20Type/action_view.xml b/bt5/erp5_base/ActionTemplateItem/portal_types/Solver%20Type/action_view.xml similarity index 100% rename from bt5/erp5_simulation/ActionTemplateItem/portal_types/Solver%20Type/action_view.xml rename to bt5/erp5_base/ActionTemplateItem/portal_types/Solver%20Type/action_view.xml diff --git a/bt5/erp5_simulation/ActionTemplateItem/portal_types/Solver%20Type/role_view.xml b/bt5/erp5_base/ActionTemplateItem/portal_types/Solver%20Type/role_view.xml similarity index 100% rename from bt5/erp5_simulation/ActionTemplateItem/portal_types/Solver%20Type/role_view.xml rename to bt5/erp5_base/ActionTemplateItem/portal_types/Solver%20Type/role_view.xml diff --git a/bt5/erp5_simulation/ActionTemplateItem/portal_types/Solver%20Type/solver_view.xml b/bt5/erp5_base/ActionTemplateItem/portal_types/Solver%20Type/solver_view.xml similarity index 100% rename from bt5/erp5_simulation/ActionTemplateItem/portal_types/Solver%20Type/solver_view.xml rename to bt5/erp5_base/ActionTemplateItem/portal_types/Solver%20Type/solver_view.xml diff --git a/bt5/erp5_simulation/ActionTemplateItem/portal_types/Solver%20Type/translation_view.xml b/bt5/erp5_base/ActionTemplateItem/portal_types/Solver%20Type/translation_view.xml similarity index 100% rename from bt5/erp5_simulation/ActionTemplateItem/portal_types/Solver%20Type/translation_view.xml rename to bt5/erp5_base/ActionTemplateItem/portal_types/Solver%20Type/translation_view.xml diff --git a/bt5/erp5_simulation/ActionTemplateItem/portal_types/Solver%20Type/update_local_roles.xml b/bt5/erp5_base/ActionTemplateItem/portal_types/Solver%20Type/update_local_roles.xml similarity index 100% rename from bt5/erp5_simulation/ActionTemplateItem/portal_types/Solver%20Type/update_local_roles.xml rename to bt5/erp5_base/ActionTemplateItem/portal_types/Solver%20Type/update_local_roles.xml diff --git a/bt5/erp5_simulation/ActionTemplateItem/portal_types/Solver%20Type/view.xml b/bt5/erp5_base/ActionTemplateItem/portal_types/Solver%20Type/view.xml similarity index 100% rename from bt5/erp5_simulation/ActionTemplateItem/portal_types/Solver%20Type/view.xml rename to bt5/erp5_base/ActionTemplateItem/portal_types/Solver%20Type/view.xml diff --git a/bt5/erp5_simulation/CategoryTemplateItem/portal_categories/conflicting_solver.xml b/bt5/erp5_base/CategoryTemplateItem/portal_categories/conflicting_solver.xml similarity index 100% rename from bt5/erp5_simulation/CategoryTemplateItem/portal_categories/conflicting_solver.xml rename to bt5/erp5_base/CategoryTemplateItem/portal_categories/conflicting_solver.xml diff --git a/bt5/erp5_simulation/CategoryTemplateItem/portal_categories/solver.xml b/bt5/erp5_base/CategoryTemplateItem/portal_categories/solver.xml similarity index 100% rename from bt5/erp5_simulation/CategoryTemplateItem/portal_categories/solver.xml rename to bt5/erp5_base/CategoryTemplateItem/portal_categories/solver.xml diff --git a/bt5/erp5_base/PortalTypeAllowedContentTypeTemplateItem/allowed_content_types.xml b/bt5/erp5_base/PortalTypeAllowedContentTypeTemplateItem/allowed_content_types.xml index 7e01a1209790e337a423058f7ef9a09eff9ddd96..83c95f566fb0d8f409cfc0e34ae993eb5fdd62b0 100644 --- a/bt5/erp5_base/PortalTypeAllowedContentTypeTemplateItem/allowed_content_types.xml +++ b/bt5/erp5_base/PortalTypeAllowedContentTypeTemplateItem/allowed_content_types.xml @@ -117,4 +117,14 @@ <portal_type id="Rounding Tool"> <item>Rounding Model</item> </portal_type> + <portal_type id="Solver Process Tool"> + <item>Solver Process</item> + </portal_type> + <portal_type id="Solver Tool"> + <item>Solver Type</item> + </portal_type> + <portal_type id="Solver Type"> + <item>Action Information</item> + <item>Role Information</item> + </portal_type> </allowed_content_type_list> \ No newline at end of file diff --git a/bt5/erp5_simulation/PortalTypeTemplateItem/portal_types/Solver%20Process%20Tool.xml b/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Solver%20Process%20Tool.xml similarity index 100% rename from bt5/erp5_simulation/PortalTypeTemplateItem/portal_types/Solver%20Process%20Tool.xml rename to bt5/erp5_base/PortalTypeTemplateItem/portal_types/Solver%20Process%20Tool.xml diff --git a/bt5/erp5_simulation/PortalTypeTemplateItem/portal_types/Solver%20Process.xml b/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Solver%20Process.xml similarity index 100% rename from bt5/erp5_simulation/PortalTypeTemplateItem/portal_types/Solver%20Process.xml rename to bt5/erp5_base/PortalTypeTemplateItem/portal_types/Solver%20Process.xml diff --git a/bt5/erp5_simulation/PortalTypeTemplateItem/portal_types/Solver%20Tool.xml b/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Solver%20Tool.xml similarity index 100% rename from bt5/erp5_simulation/PortalTypeTemplateItem/portal_types/Solver%20Tool.xml rename to bt5/erp5_base/PortalTypeTemplateItem/portal_types/Solver%20Tool.xml diff --git a/bt5/erp5_simulation/PortalTypeTemplateItem/portal_types/Solver%20Type.xml b/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Solver%20Type.xml similarity index 100% rename from bt5/erp5_simulation/PortalTypeTemplateItem/portal_types/Solver%20Type.xml rename to bt5/erp5_base/PortalTypeTemplateItem/portal_types/Solver%20Type.xml diff --git a/bt5/erp5_base/PortalTypeWorkflowChainTemplateItem/workflow_chain_type.xml b/bt5/erp5_base/PortalTypeWorkflowChainTemplateItem/workflow_chain_type.xml index 8b73f105f7fd8c97d814138648aab6abff77f5c3..f6539c8652c30dd4c360201d0bb755fa4a88fbc0 100644 --- a/bt5/erp5_base/PortalTypeWorkflowChainTemplateItem/workflow_chain_type.xml +++ b/bt5/erp5_base/PortalTypeWorkflowChainTemplateItem/workflow_chain_type.xml @@ -95,6 +95,10 @@ <type>Simulation Movement</type> <workflow>simulation_movement_causality_interaction_workflow</workflow> </chain> + <chain> + <type>Solver Process</type> + <workflow>solver_process_workflow</workflow> + </chain> <chain> <type>Telephone</type> <workflow>edit_workflow</workflow> diff --git a/bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/SolverType_view.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/SolverType_view.xml similarity index 100% rename from bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/SolverType_view.xml rename to bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/SolverType_view.xml diff --git a/bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/SolverType_view/my_configuration_form_id.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/SolverType_view/my_configuration_form_id.xml similarity index 100% rename from bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/SolverType_view/my_configuration_form_id.xml rename to bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/SolverType_view/my_configuration_form_id.xml diff --git a/bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/SolverType_view/my_configuration_groupable.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/SolverType_view/my_configuration_groupable.xml similarity index 100% rename from bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/SolverType_view/my_configuration_groupable.xml rename to bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/SolverType_view/my_configuration_groupable.xml diff --git a/bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/SolverType_view/my_configuration_property_list.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/SolverType_view/my_configuration_property_list.xml similarity index 100% rename from bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/SolverType_view/my_configuration_property_list.xml rename to bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/SolverType_view/my_configuration_property_list.xml diff --git a/bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/SolverType_view/my_conflicting_solver_list.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/SolverType_view/my_conflicting_solver_list.xml similarity index 100% rename from bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/SolverType_view/my_conflicting_solver_list.xml rename to bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/SolverType_view/my_conflicting_solver_list.xml diff --git a/bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/SolverType_view/my_delivery_solver_list.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/SolverType_view/my_delivery_solver_list.xml similarity index 100% rename from bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/SolverType_view/my_delivery_solver_list.xml rename to bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/SolverType_view/my_delivery_solver_list.xml diff --git a/bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/SolverType_view/my_line_exclusive.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/SolverType_view/my_line_exclusive.xml similarity index 100% rename from bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/SolverType_view/my_line_exclusive.xml rename to bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/SolverType_view/my_line_exclusive.xml diff --git a/bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/SolverType_view/my_line_groupable.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/SolverType_view/my_line_groupable.xml similarity index 100% rename from bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/SolverType_view/my_line_groupable.xml rename to bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/SolverType_view/my_line_groupable.xml diff --git a/bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/SolverType_view/my_process_exclusive.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/SolverType_view/my_process_exclusive.xml similarity index 100% rename from bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/SolverType_view/my_process_exclusive.xml rename to bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/SolverType_view/my_process_exclusive.xml diff --git a/bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/SolverType_view/my_solver_action_title.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/SolverType_view/my_solver_action_title.xml similarity index 100% rename from bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/SolverType_view/my_solver_action_title.xml rename to bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/SolverType_view/my_solver_action_title.xml diff --git a/bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/SolverType_view/my_tested_property_list.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/SolverType_view/my_tested_property_list.xml similarity index 100% rename from bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/SolverType_view/my_tested_property_list.xml rename to bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/SolverType_view/my_tested_property_list.xml diff --git a/bt5/erp5_simulation/ToolTemplateItem/portal_solver_processes.xml b/bt5/erp5_base/ToolTemplateItem/portal_solver_processes.xml similarity index 100% rename from bt5/erp5_simulation/ToolTemplateItem/portal_solver_processes.xml rename to bt5/erp5_base/ToolTemplateItem/portal_solver_processes.xml diff --git a/bt5/erp5_simulation/ToolTemplateItem/portal_solvers.xml b/bt5/erp5_base/ToolTemplateItem/portal_solvers.xml similarity index 100% rename from bt5/erp5_simulation/ToolTemplateItem/portal_solvers.xml rename to bt5/erp5_base/ToolTemplateItem/portal_solvers.xml diff --git a/bt5/erp5_simulation/WorkflowTemplateItem/portal_workflow/solver_process_workflow.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/solver_process_workflow.xml similarity index 100% rename from bt5/erp5_simulation/WorkflowTemplateItem/portal_workflow/solver_process_workflow.xml rename to bt5/erp5_base/WorkflowTemplateItem/portal_workflow/solver_process_workflow.xml diff --git a/bt5/erp5_simulation/WorkflowTemplateItem/portal_workflow/solver_process_workflow/scripts.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/solver_process_workflow/scripts.xml similarity index 100% rename from bt5/erp5_simulation/WorkflowTemplateItem/portal_workflow/solver_process_workflow/scripts.xml rename to bt5/erp5_base/WorkflowTemplateItem/portal_workflow/solver_process_workflow/scripts.xml diff --git a/bt5/erp5_simulation/WorkflowTemplateItem/portal_workflow/solver_process_workflow/states.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/solver_process_workflow/states.xml similarity index 100% rename from bt5/erp5_simulation/WorkflowTemplateItem/portal_workflow/solver_process_workflow/states.xml rename to bt5/erp5_base/WorkflowTemplateItem/portal_workflow/solver_process_workflow/states.xml diff --git a/bt5/erp5_simulation/WorkflowTemplateItem/portal_workflow/solver_process_workflow/states/draft.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/solver_process_workflow/states/draft.xml similarity index 100% rename from bt5/erp5_simulation/WorkflowTemplateItem/portal_workflow/solver_process_workflow/states/draft.xml rename to bt5/erp5_base/WorkflowTemplateItem/portal_workflow/solver_process_workflow/states/draft.xml diff --git a/bt5/erp5_simulation/WorkflowTemplateItem/portal_workflow/solver_process_workflow/states/failed.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/solver_process_workflow/states/failed.xml similarity index 100% rename from bt5/erp5_simulation/WorkflowTemplateItem/portal_workflow/solver_process_workflow/states/failed.xml rename to bt5/erp5_base/WorkflowTemplateItem/portal_workflow/solver_process_workflow/states/failed.xml diff --git a/bt5/erp5_simulation/WorkflowTemplateItem/portal_workflow/solver_process_workflow/states/solved.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/solver_process_workflow/states/solved.xml similarity index 100% rename from bt5/erp5_simulation/WorkflowTemplateItem/portal_workflow/solver_process_workflow/states/solved.xml rename to bt5/erp5_base/WorkflowTemplateItem/portal_workflow/solver_process_workflow/states/solved.xml diff --git a/bt5/erp5_simulation/WorkflowTemplateItem/portal_workflow/solver_process_workflow/states/solving.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/solver_process_workflow/states/solving.xml similarity index 100% rename from bt5/erp5_simulation/WorkflowTemplateItem/portal_workflow/solver_process_workflow/states/solving.xml rename to bt5/erp5_base/WorkflowTemplateItem/portal_workflow/solver_process_workflow/states/solving.xml diff --git a/bt5/erp5_simulation/WorkflowTemplateItem/portal_workflow/solver_process_workflow/transitions.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/solver_process_workflow/transitions.xml similarity index 100% rename from bt5/erp5_simulation/WorkflowTemplateItem/portal_workflow/solver_process_workflow/transitions.xml rename to bt5/erp5_base/WorkflowTemplateItem/portal_workflow/solver_process_workflow/transitions.xml diff --git a/bt5/erp5_simulation/WorkflowTemplateItem/portal_workflow/solver_process_workflow/transitions/fail.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/solver_process_workflow/transitions/fail.xml similarity index 100% rename from bt5/erp5_simulation/WorkflowTemplateItem/portal_workflow/solver_process_workflow/transitions/fail.xml rename to bt5/erp5_base/WorkflowTemplateItem/portal_workflow/solver_process_workflow/transitions/fail.xml diff --git a/bt5/erp5_simulation/WorkflowTemplateItem/portal_workflow/solver_process_workflow/transitions/start_solving.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/solver_process_workflow/transitions/start_solving.xml similarity index 100% rename from bt5/erp5_simulation/WorkflowTemplateItem/portal_workflow/solver_process_workflow/transitions/start_solving.xml rename to bt5/erp5_base/WorkflowTemplateItem/portal_workflow/solver_process_workflow/transitions/start_solving.xml diff --git a/bt5/erp5_simulation/WorkflowTemplateItem/portal_workflow/solver_process_workflow/transitions/succeed.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/solver_process_workflow/transitions/succeed.xml similarity index 100% rename from bt5/erp5_simulation/WorkflowTemplateItem/portal_workflow/solver_process_workflow/transitions/succeed.xml rename to bt5/erp5_base/WorkflowTemplateItem/portal_workflow/solver_process_workflow/transitions/succeed.xml diff --git a/bt5/erp5_simulation/WorkflowTemplateItem/portal_workflow/solver_process_workflow/variables.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/solver_process_workflow/variables.xml similarity index 100% rename from bt5/erp5_simulation/WorkflowTemplateItem/portal_workflow/solver_process_workflow/variables.xml rename to bt5/erp5_base/WorkflowTemplateItem/portal_workflow/solver_process_workflow/variables.xml diff --git a/bt5/erp5_simulation/WorkflowTemplateItem/portal_workflow/solver_process_workflow/variables/action.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/solver_process_workflow/variables/action.xml similarity index 100% rename from bt5/erp5_simulation/WorkflowTemplateItem/portal_workflow/solver_process_workflow/variables/action.xml rename to bt5/erp5_base/WorkflowTemplateItem/portal_workflow/solver_process_workflow/variables/action.xml diff --git a/bt5/erp5_simulation/WorkflowTemplateItem/portal_workflow/solver_process_workflow/variables/actor.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/solver_process_workflow/variables/actor.xml similarity index 100% rename from bt5/erp5_simulation/WorkflowTemplateItem/portal_workflow/solver_process_workflow/variables/actor.xml rename to bt5/erp5_base/WorkflowTemplateItem/portal_workflow/solver_process_workflow/variables/actor.xml diff --git a/bt5/erp5_simulation/WorkflowTemplateItem/portal_workflow/solver_process_workflow/variables/comment.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/solver_process_workflow/variables/comment.xml similarity index 100% rename from bt5/erp5_simulation/WorkflowTemplateItem/portal_workflow/solver_process_workflow/variables/comment.xml rename to bt5/erp5_base/WorkflowTemplateItem/portal_workflow/solver_process_workflow/variables/comment.xml diff --git a/bt5/erp5_simulation/WorkflowTemplateItem/portal_workflow/solver_process_workflow/variables/error_message.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/solver_process_workflow/variables/error_message.xml similarity index 100% rename from bt5/erp5_simulation/WorkflowTemplateItem/portal_workflow/solver_process_workflow/variables/error_message.xml rename to bt5/erp5_base/WorkflowTemplateItem/portal_workflow/solver_process_workflow/variables/error_message.xml diff --git a/bt5/erp5_simulation/WorkflowTemplateItem/portal_workflow/solver_process_workflow/variables/history.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/solver_process_workflow/variables/history.xml similarity index 100% rename from bt5/erp5_simulation/WorkflowTemplateItem/portal_workflow/solver_process_workflow/variables/history.xml rename to bt5/erp5_base/WorkflowTemplateItem/portal_workflow/solver_process_workflow/variables/history.xml diff --git a/bt5/erp5_simulation/WorkflowTemplateItem/portal_workflow/solver_process_workflow/variables/portal_type.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/solver_process_workflow/variables/portal_type.xml similarity index 100% rename from bt5/erp5_simulation/WorkflowTemplateItem/portal_workflow/solver_process_workflow/variables/portal_type.xml rename to bt5/erp5_base/WorkflowTemplateItem/portal_workflow/solver_process_workflow/variables/portal_type.xml diff --git a/bt5/erp5_simulation/WorkflowTemplateItem/portal_workflow/solver_process_workflow/variables/time.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/solver_process_workflow/variables/time.xml similarity index 100% rename from bt5/erp5_simulation/WorkflowTemplateItem/portal_workflow/solver_process_workflow/variables/time.xml rename to bt5/erp5_base/WorkflowTemplateItem/portal_workflow/solver_process_workflow/variables/time.xml diff --git a/bt5/erp5_simulation/WorkflowTemplateItem/portal_workflow/solver_process_workflow/worklists.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/solver_process_workflow/worklists.xml similarity index 100% rename from bt5/erp5_simulation/WorkflowTemplateItem/portal_workflow/solver_process_workflow/worklists.xml rename to bt5/erp5_base/WorkflowTemplateItem/portal_workflow/solver_process_workflow/worklists.xml diff --git a/bt5/erp5_simulation/WorkflowTemplateItem/portal_workflow/solver_workflow.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/solver_workflow.xml similarity index 100% rename from bt5/erp5_simulation/WorkflowTemplateItem/portal_workflow/solver_workflow.xml rename to bt5/erp5_base/WorkflowTemplateItem/portal_workflow/solver_workflow.xml diff --git a/bt5/erp5_simulation/WorkflowTemplateItem/portal_workflow/solver_workflow/scripts.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/solver_workflow/scripts.xml similarity index 100% rename from bt5/erp5_simulation/WorkflowTemplateItem/portal_workflow/solver_workflow/scripts.xml rename to bt5/erp5_base/WorkflowTemplateItem/portal_workflow/solver_workflow/scripts.xml diff --git a/bt5/erp5_simulation/WorkflowTemplateItem/portal_workflow/solver_workflow/scripts/SolverProcess_startSolving.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/solver_workflow/scripts/SolverProcess_startSolving.xml similarity index 100% rename from bt5/erp5_simulation/WorkflowTemplateItem/portal_workflow/solver_workflow/scripts/SolverProcess_startSolving.xml rename to bt5/erp5_base/WorkflowTemplateItem/portal_workflow/solver_workflow/scripts/SolverProcess_startSolving.xml diff --git a/bt5/erp5_simulation/WorkflowTemplateItem/portal_workflow/solver_workflow/scripts/SolverProcess_succeed.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/solver_workflow/scripts/SolverProcess_succeed.xml similarity index 100% rename from bt5/erp5_simulation/WorkflowTemplateItem/portal_workflow/solver_workflow/scripts/SolverProcess_succeed.xml rename to bt5/erp5_base/WorkflowTemplateItem/portal_workflow/solver_workflow/scripts/SolverProcess_succeed.xml diff --git a/bt5/erp5_simulation/WorkflowTemplateItem/portal_workflow/solver_workflow/states.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/solver_workflow/states.xml similarity index 100% rename from bt5/erp5_simulation/WorkflowTemplateItem/portal_workflow/solver_workflow/states.xml rename to bt5/erp5_base/WorkflowTemplateItem/portal_workflow/solver_workflow/states.xml diff --git a/bt5/erp5_simulation/WorkflowTemplateItem/portal_workflow/solver_workflow/states/draft.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/solver_workflow/states/draft.xml similarity index 100% rename from bt5/erp5_simulation/WorkflowTemplateItem/portal_workflow/solver_workflow/states/draft.xml rename to bt5/erp5_base/WorkflowTemplateItem/portal_workflow/solver_workflow/states/draft.xml diff --git a/bt5/erp5_simulation/WorkflowTemplateItem/portal_workflow/solver_workflow/states/failed.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/solver_workflow/states/failed.xml similarity index 100% rename from bt5/erp5_simulation/WorkflowTemplateItem/portal_workflow/solver_workflow/states/failed.xml rename to bt5/erp5_base/WorkflowTemplateItem/portal_workflow/solver_workflow/states/failed.xml diff --git a/bt5/erp5_simulation/WorkflowTemplateItem/portal_workflow/solver_workflow/states/solved.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/solver_workflow/states/solved.xml similarity index 100% rename from bt5/erp5_simulation/WorkflowTemplateItem/portal_workflow/solver_workflow/states/solved.xml rename to bt5/erp5_base/WorkflowTemplateItem/portal_workflow/solver_workflow/states/solved.xml diff --git a/bt5/erp5_simulation/WorkflowTemplateItem/portal_workflow/solver_workflow/states/solving.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/solver_workflow/states/solving.xml similarity index 100% rename from bt5/erp5_simulation/WorkflowTemplateItem/portal_workflow/solver_workflow/states/solving.xml rename to bt5/erp5_base/WorkflowTemplateItem/portal_workflow/solver_workflow/states/solving.xml diff --git a/bt5/erp5_simulation/WorkflowTemplateItem/portal_workflow/solver_workflow/transitions.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/solver_workflow/transitions.xml similarity index 100% rename from bt5/erp5_simulation/WorkflowTemplateItem/portal_workflow/solver_workflow/transitions.xml rename to bt5/erp5_base/WorkflowTemplateItem/portal_workflow/solver_workflow/transitions.xml diff --git a/bt5/erp5_simulation/WorkflowTemplateItem/portal_workflow/solver_workflow/transitions/fail.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/solver_workflow/transitions/fail.xml similarity index 100% rename from bt5/erp5_simulation/WorkflowTemplateItem/portal_workflow/solver_workflow/transitions/fail.xml rename to bt5/erp5_base/WorkflowTemplateItem/portal_workflow/solver_workflow/transitions/fail.xml diff --git a/bt5/erp5_simulation/WorkflowTemplateItem/portal_workflow/solver_workflow/transitions/start_solving.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/solver_workflow/transitions/start_solving.xml similarity index 100% rename from bt5/erp5_simulation/WorkflowTemplateItem/portal_workflow/solver_workflow/transitions/start_solving.xml rename to bt5/erp5_base/WorkflowTemplateItem/portal_workflow/solver_workflow/transitions/start_solving.xml diff --git a/bt5/erp5_simulation/WorkflowTemplateItem/portal_workflow/solver_workflow/transitions/succeed.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/solver_workflow/transitions/succeed.xml similarity index 100% rename from bt5/erp5_simulation/WorkflowTemplateItem/portal_workflow/solver_workflow/transitions/succeed.xml rename to bt5/erp5_base/WorkflowTemplateItem/portal_workflow/solver_workflow/transitions/succeed.xml diff --git a/bt5/erp5_simulation/WorkflowTemplateItem/portal_workflow/solver_workflow/variables.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/solver_workflow/variables.xml similarity index 100% rename from bt5/erp5_simulation/WorkflowTemplateItem/portal_workflow/solver_workflow/variables.xml rename to bt5/erp5_base/WorkflowTemplateItem/portal_workflow/solver_workflow/variables.xml diff --git a/bt5/erp5_simulation/WorkflowTemplateItem/portal_workflow/solver_workflow/variables/action.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/solver_workflow/variables/action.xml similarity index 100% rename from bt5/erp5_simulation/WorkflowTemplateItem/portal_workflow/solver_workflow/variables/action.xml rename to bt5/erp5_base/WorkflowTemplateItem/portal_workflow/solver_workflow/variables/action.xml diff --git a/bt5/erp5_simulation/WorkflowTemplateItem/portal_workflow/solver_workflow/variables/actor.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/solver_workflow/variables/actor.xml similarity index 100% rename from bt5/erp5_simulation/WorkflowTemplateItem/portal_workflow/solver_workflow/variables/actor.xml rename to bt5/erp5_base/WorkflowTemplateItem/portal_workflow/solver_workflow/variables/actor.xml diff --git a/bt5/erp5_simulation/WorkflowTemplateItem/portal_workflow/solver_workflow/variables/comment.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/solver_workflow/variables/comment.xml similarity index 100% rename from bt5/erp5_simulation/WorkflowTemplateItem/portal_workflow/solver_workflow/variables/comment.xml rename to bt5/erp5_base/WorkflowTemplateItem/portal_workflow/solver_workflow/variables/comment.xml diff --git a/bt5/erp5_simulation/WorkflowTemplateItem/portal_workflow/solver_workflow/variables/error_message.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/solver_workflow/variables/error_message.xml similarity index 100% rename from bt5/erp5_simulation/WorkflowTemplateItem/portal_workflow/solver_workflow/variables/error_message.xml rename to bt5/erp5_base/WorkflowTemplateItem/portal_workflow/solver_workflow/variables/error_message.xml diff --git a/bt5/erp5_simulation/WorkflowTemplateItem/portal_workflow/solver_workflow/variables/history.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/solver_workflow/variables/history.xml similarity index 100% rename from bt5/erp5_simulation/WorkflowTemplateItem/portal_workflow/solver_workflow/variables/history.xml rename to bt5/erp5_base/WorkflowTemplateItem/portal_workflow/solver_workflow/variables/history.xml diff --git a/bt5/erp5_simulation/WorkflowTemplateItem/portal_workflow/solver_workflow/variables/portal_type.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/solver_workflow/variables/portal_type.xml similarity index 100% rename from bt5/erp5_simulation/WorkflowTemplateItem/portal_workflow/solver_workflow/variables/portal_type.xml rename to bt5/erp5_base/WorkflowTemplateItem/portal_workflow/solver_workflow/variables/portal_type.xml diff --git a/bt5/erp5_simulation/WorkflowTemplateItem/portal_workflow/solver_workflow/variables/time.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/solver_workflow/variables/time.xml similarity index 100% rename from bt5/erp5_simulation/WorkflowTemplateItem/portal_workflow/solver_workflow/variables/time.xml rename to bt5/erp5_base/WorkflowTemplateItem/portal_workflow/solver_workflow/variables/time.xml diff --git a/bt5/erp5_simulation/WorkflowTemplateItem/portal_workflow/solver_workflow/worklists.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/solver_workflow/worklists.xml similarity index 100% rename from bt5/erp5_simulation/WorkflowTemplateItem/portal_workflow/solver_workflow/worklists.xml rename to bt5/erp5_base/WorkflowTemplateItem/portal_workflow/solver_workflow/worklists.xml diff --git a/bt5/erp5_base/bt/change_log b/bt5/erp5_base/bt/change_log index 654baad6016e2fb61e80e872ffb601c536f50674..0dbdc182fed1e6d38f821291c343aa8b8929b13b 100644 --- a/bt5/erp5_base/bt/change_log +++ b/bt5/erp5_base/bt/change_log @@ -1,3 +1,6 @@ +2010-06-29 kazuhiko +* Move portal_solvers and portal_solver_processes from the experimental erp5_simulation business template to the erp5_base business template. + 2010-06-28 kazuhiko * Add automatic divergence solving function in delivery_causality_workflow. diff --git a/bt5/erp5_base/bt/revision b/bt5/erp5_base/bt/revision index 5c1d4541ae1282041c7a670a25b9a2901703f63e..44075dbca6e76778826f486ef3af5b053c6d929e 100644 --- a/bt5/erp5_base/bt/revision +++ b/bt5/erp5_base/bt/revision @@ -1 +1 @@ -777 \ No newline at end of file +778 \ No newline at end of file diff --git a/bt5/erp5_base/bt/template_action_path_list b/bt5/erp5_base/bt/template_action_path_list index 4eea905ead947d5aea9c35c773907e30c9990960..b9057eaf4dcf1a4cfbd4b124f13b0e6711e3ca3f 100644 --- a/bt5/erp5_base/bt/template_action_path_list +++ b/bt5/erp5_base/bt/template_action_path_list @@ -81,6 +81,13 @@ Root Applied Rule Causality Movement Group | view Rounding Model | predicate_view Rounding Model | view Rounding Tool | view +Solver Tool | view +Solver Type | action_view +Solver Type | role_view +Solver Type | solver_view +Solver Type | translation_view +Solver Type | update_local_roles +Solver Type | view Split Movement Group | view Tax Line Delivery Movement Group | view Telephone | change_function diff --git a/bt5/erp5_base/bt/template_base_category_list b/bt5/erp5_base/bt/template_base_category_list index 98bc31dd6d132bd726118b9e51eb6d27f4a0d5cf..8942d35cb240b908d6666d2cde31b6fc9c17f611 100644 --- a/bt5/erp5_base/bt/template_base_category_list +++ b/bt5/erp5_base/bt/template_base_category_list @@ -2,6 +2,7 @@ agent agent_privilege bank_account_type collect_order_group +conflicting_solver contributor currency_exchange_type delivery_builder @@ -34,6 +35,7 @@ salary_level site skill social_form +solver source_carrier source_referral source_region diff --git a/bt5/erp5_base/bt/template_portal_type_allowed_content_type_list b/bt5/erp5_base/bt/template_portal_type_allowed_content_type_list index 4e5e71769accc7630eba1cf9be8a69e10851ea1b..b221f5e823e0f98b915d02b000b8877ead8e08b4 100644 --- a/bt5/erp5_base/bt/template_portal_type_allowed_content_type_list +++ b/bt5/erp5_base/bt/template_portal_type_allowed_content_type_list @@ -81,4 +81,8 @@ Person | Image Person | Link Person | Telephone Query Module | Query -Rounding Tool | Rounding Model \ No newline at end of file +Rounding Tool | Rounding Model +Solver Process Tool | Solver Process +Solver Tool | Solver Type +Solver Type | Action Information +Solver Type | Role Information \ No newline at end of file diff --git a/bt5/erp5_base/bt/template_portal_type_id_list b/bt5/erp5_base/bt/template_portal_type_id_list index 3763a0f06d70635198a3a95e2002e137cc1eb529..eb60bf1ac70ecdf7d76f506bc843b99cf40f72fd 100644 --- a/bt5/erp5_base/bt/template_portal_type_id_list +++ b/bt5/erp5_base/bt/template_portal_type_id_list @@ -52,6 +52,10 @@ Role Definition Root Applied Rule Causality Movement Group Rounding Model Rounding Tool +Solver Process +Solver Process Tool +Solver Tool +Solver Type Split Movement Group Tax Line Delivery Movement Group Telephone diff --git a/bt5/erp5_base/bt/template_portal_type_workflow_chain_list b/bt5/erp5_base/bt/template_portal_type_workflow_chain_list index cc1592ba5b8f85f6a9a8b9729408c14b7ffb3550..d4a4b3939ecb9ff448f7b5a8033178b5c69a2fa0 100644 --- a/bt5/erp5_base/bt/template_portal_type_workflow_chain_list +++ b/bt5/erp5_base/bt/template_portal_type_workflow_chain_list @@ -42,4 +42,5 @@ Role Definition | edit_workflow Role Definition | local_permission_interaction_workflow Rounding Model | validation_workflow Simulation Movement | simulation_movement_causality_interaction_workflow +Solver Process | solver_process_workflow Telephone | edit_workflow \ No newline at end of file diff --git a/bt5/erp5_base/bt/template_tool_id_list b/bt5/erp5_base/bt/template_tool_id_list index 7d80b27030ffdbcc6653a38f01585112c233cb0f..0225668d77c0c19305bdea4d613899b482d1ed89 100644 --- a/bt5/erp5_base/bt/template_tool_id_list +++ b/bt5/erp5_base/bt/template_tool_id_list @@ -1,3 +1,5 @@ portal_introspections portal_roundings +portal_solver_processes +portal_solvers portal_web_services \ No newline at end of file diff --git a/bt5/erp5_base/bt/template_workflow_id_list b/bt5/erp5_base/bt/template_workflow_id_list index 256e0fa7c4d37936ff31da318ddfd914abc1ac65..a5b763084b2e2366767c62d69f4f0c676498cfc7 100644 --- a/bt5/erp5_base/bt/template_workflow_id_list +++ b/bt5/erp5_base/bt/template_workflow_id_list @@ -17,4 +17,6 @@ processing_status_workflow query_workflow reindex_object_interaction_workflow simulation_movement_causality_interaction_workflow +solver_process_workflow +solver_workflow user_account_workflow \ No newline at end of file diff --git a/bt5/erp5_simulation/PortalTypeAllowedContentTypeTemplateItem/allowed_content_types.xml b/bt5/erp5_simulation/PortalTypeAllowedContentTypeTemplateItem/allowed_content_types.xml index 55207d6f74c6ca0fb10fa21eaa2f9aae5dd1a366..97d3d6b7a0d1fa2b1df399bd890e02c8ec6cc95e 100644 --- a/bt5/erp5_simulation/PortalTypeAllowedContentTypeTemplateItem/allowed_content_types.xml +++ b/bt5/erp5_simulation/PortalTypeAllowedContentTypeTemplateItem/allowed_content_types.xml @@ -64,16 +64,6 @@ <item>Trade Model Solver</item> <item>Unify Solver</item> </portal_type> - <portal_type id="Solver Process Tool"> - <item>Solver Process</item> - </portal_type> - <portal_type id="Solver Tool"> - <item>Solver Type</item> - </portal_type> - <portal_type id="Solver Type"> - <item>Action Information</item> - <item>Role Information</item> - </portal_type> <portal_type id="Trade Model Simulation Rule"> <item>Category Membership Divergence Tester</item> <item>DateTime Divergence Tester</item> @@ -82,4 +72,4 @@ <item>String Divergence Tester</item> <item>Variation Divergence Tester</item> </portal_type> -</allowed_content_type_list> \ No newline at end of file +</allowed_content_type_list> diff --git a/bt5/erp5_simulation/PortalTypeWorkflowChainTemplateItem/workflow_chain_type.xml b/bt5/erp5_simulation/PortalTypeWorkflowChainTemplateItem/workflow_chain_type.xml index f05c89edf1f18cecd51b5275dacc5be57e04f680..18a144354202b4fc0caf599cf5cc7a5b01330f1e 100644 --- a/bt5/erp5_simulation/PortalTypeWorkflowChainTemplateItem/workflow_chain_type.xml +++ b/bt5/erp5_simulation/PortalTypeWorkflowChainTemplateItem/workflow_chain_type.xml @@ -35,10 +35,6 @@ <type>Quantity Split Solver</type> <workflow>solver_workflow</workflow> </chain> - <chain> - <type>Solver Process</type> - <workflow>solver_process_workflow</workflow> - </chain> <chain> <type>String Divergence Tester</type> <workflow>edit_workflow</workflow> @@ -55,4 +51,4 @@ <type>Variation Divergence Tester</type> <workflow>edit_workflow</workflow> </chain> -</workflow_chain> \ No newline at end of file +</workflow_chain> diff --git a/bt5/erp5_simulation/bt/revision b/bt5/erp5_simulation/bt/revision index 8d9f781b525d012ac086a85ada4d36c91a210fd8..176fdebf1bd8be248521f57896a16a3540e3f661 100644 --- a/bt5/erp5_simulation/bt/revision +++ b/bt5/erp5_simulation/bt/revision @@ -1 +1 @@ -118 \ No newline at end of file +119 \ No newline at end of file diff --git a/bt5/erp5_simulation/bt/template_action_path_list b/bt5/erp5_simulation/bt/template_action_path_list index d7596061d75e3aa4e89ea674e9e21404305d6743..4e90e0c1ce26e5e72f0948d8fda28c7e8c1f22f2 100644 --- a/bt5/erp5_simulation/bt/template_action_path_list +++ b/bt5/erp5_simulation/bt/template_action_path_list @@ -23,13 +23,6 @@ Solver Decision | view Solver Process Tool | view Solver Process | target_solver Solver Process | view -Solver Tool | view -Solver Type | action_view -Solver Type | role_view -Solver Type | solver_view -Solver Type | translation_view -Solver Type | update_local_roles -Solver Type | view String Divergence Tester | configuration String Divergence Tester | predicate String Divergence Tester | view diff --git a/bt5/erp5_simulation/bt/template_base_category_list b/bt5/erp5_simulation/bt/template_base_category_list index 27cf7dbff2a53c0d267a03f06811329ab24e1b6c..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644 --- a/bt5/erp5_simulation/bt/template_base_category_list +++ b/bt5/erp5_simulation/bt/template_base_category_list @@ -1,2 +0,0 @@ -conflicting_solver -solver \ No newline at end of file diff --git a/bt5/erp5_simulation/bt/template_portal_type_allowed_content_type_list b/bt5/erp5_simulation/bt/template_portal_type_allowed_content_type_list index ab734078938f22fbd87bf40d8be902612e68103e..51b1a9ccf4f36a5663240dd62b9103afb31764b3 100644 --- a/bt5/erp5_simulation/bt/template_portal_type_allowed_content_type_list +++ b/bt5/erp5_simulation/bt/template_portal_type_allowed_content_type_list @@ -40,7 +40,6 @@ Payment Simulation Rule | Float Divergence Tester Payment Simulation Rule | Net Converted Quantity Divergence Tester Payment Simulation Rule | String Divergence Tester Payment Simulation Rule | Variation Divergence Tester -Solver Process Tool | Solver Process Solver Process | Accept Solver Solver Process | Adopt Solver Solver Process | Production Reduction Solver @@ -48,9 +47,6 @@ Solver Process | Quantity Split Solver Solver Process | Solver Decision Solver Process | Trade Model Solver Solver Process | Unify Solver -Solver Tool | Solver Type -Solver Type | Action Information -Solver Type | Role Information Trade Model Simulation Rule | Category Membership Divergence Tester Trade Model Simulation Rule | DateTime Divergence Tester Trade Model Simulation Rule | Float Divergence Tester diff --git a/bt5/erp5_simulation/bt/template_portal_type_id_list b/bt5/erp5_simulation/bt/template_portal_type_id_list index 1282c0dbc7052018d2ff29a5d3290c41a635c90c..851832d2e1332a4dad9ff6cabe4fd2f7d5f3cea8 100644 --- a/bt5/erp5_simulation/bt/template_portal_type_id_list +++ b/bt5/erp5_simulation/bt/template_portal_type_id_list @@ -8,10 +8,6 @@ Production Reduction Solver Quantity Cancel Solver Quantity Split Solver Solver Decision -Solver Process -Solver Process Tool -Solver Tool -Solver Type String Divergence Tester Trade Model Solver Unify Solver 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 2582a976049e03c89979de8ef24fdacea7bb9336..599a343a0a9673dfe00d4ae2b162463122afa7dd 100644 --- a/bt5/erp5_simulation/bt/template_portal_type_workflow_chain_list +++ b/bt5/erp5_simulation/bt/template_portal_type_workflow_chain_list @@ -7,7 +7,6 @@ Net Converted Quantity Divergence Tester | edit_workflow Production Reduction Solver | solver_workflow Quantity Cancel Solver | solver_workflow Quantity Split Solver | solver_workflow -Solver Process | solver_process_workflow String Divergence Tester | edit_workflow Trade Model Solver | solver_workflow Unify Solver | solver_workflow diff --git a/bt5/erp5_simulation/bt/template_tool_id_list b/bt5/erp5_simulation/bt/template_tool_id_list index 115292f89fa8d0eda3112497e89e3be39a2dba64..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644 --- a/bt5/erp5_simulation/bt/template_tool_id_list +++ b/bt5/erp5_simulation/bt/template_tool_id_list @@ -1,2 +0,0 @@ -portal_solver_processes -portal_solvers \ No newline at end of file diff --git a/bt5/erp5_simulation/bt/template_workflow_id_list b/bt5/erp5_simulation/bt/template_workflow_id_list index 71d1ab261e2a29836bd62dde8c4674ed98269f5b..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644 --- a/bt5/erp5_simulation/bt/template_workflow_id_list +++ b/bt5/erp5_simulation/bt/template_workflow_id_list @@ -1,2 +0,0 @@ -solver_process_workflow -solver_workflow \ No newline at end of file