diff --git a/bt5/erp5_simulation/ActionTemplateItem/portal_types/Resource%20Accept%20Solver/configuration.xml b/bt5/erp5_simulation/ActionTemplateItem/portal_types/Resource%20Replacement%20Solver/configuration.xml similarity index 100% rename from bt5/erp5_simulation/ActionTemplateItem/portal_types/Resource%20Accept%20Solver/configuration.xml rename to bt5/erp5_simulation/ActionTemplateItem/portal_types/Resource%20Replacement%20Solver/configuration.xml diff --git a/bt5/erp5_simulation/ActionTemplateItem/portal_types/Resource%20Accept%20Solver/view.xml b/bt5/erp5_simulation/ActionTemplateItem/portal_types/Resource%20Replacement%20Solver/view.xml similarity index 100% rename from bt5/erp5_simulation/ActionTemplateItem/portal_types/Resource%20Accept%20Solver/view.xml rename to bt5/erp5_simulation/ActionTemplateItem/portal_types/Resource%20Replacement%20Solver/view.xml diff --git a/bt5/erp5_simulation/PortalTypeAllowedContentTypeTemplateItem/allowed_content_types.xml b/bt5/erp5_simulation/PortalTypeAllowedContentTypeTemplateItem/allowed_content_types.xml index 5b627cf35d6e504acba71ded5012f328c16a8460..8fa579f451b749eef672b14aa8f065946dec0155 100644 --- a/bt5/erp5_simulation/PortalTypeAllowedContentTypeTemplateItem/allowed_content_types.xml +++ b/bt5/erp5_simulation/PortalTypeAllowedContentTypeTemplateItem/allowed_content_types.xml @@ -13,7 +13,6 @@ <item>Production Reduction Solver</item> <item>Quantity Accept Solver</item> <item>Quantity Split Solver</item> - <item>Resource Accept Solver</item> <item>Resource Adoption Solver</item> <item>Resource Replacement Solver</item> <item>Solver Decision</item> diff --git a/bt5/erp5_simulation/PortalTypeTemplateItem/portal_types/Resource%20Accept%20Solver.xml b/bt5/erp5_simulation/PortalTypeTemplateItem/portal_types/Resource%20Accept%20Solver.xml deleted file mode 100644 index 82b469c59206a063d1dc061f9fb6cefaa089f4fe..0000000000000000000000000000000000000000 --- a/bt5/erp5_simulation/PortalTypeTemplateItem/portal_types/Resource%20Accept%20Solver.xml +++ /dev/null @@ -1,97 +0,0 @@ -<?xml version="1.0"?> -<ZopeData> - <record id="1" aka="AAAAAAAAAAE="> - <pickle> - <tuple> - <global name="SolverTypeInformation" module="Products.ERP5Type.Document.SolverTypeInformation"/> - <tuple/> - </tuple> - </pickle> - <pickle> - <dictionary> - <item> - <key> <string>acquire_local_roles</string> </key> - <value> <int>1</int> </value> - </item> - <item> - <key> <string>categories</string> </key> - <value> - <tuple/> - </value> - </item> - <item> - <key> <string>configuration_form_id</string> </key> - <value> <string>Solver_viewConfiguration</string> </value> - </item> - <item> - <key> <string>configuration_property_list</string> </key> - <value> - <tuple/> - </value> - </item> - <item> - <key> <string>delivery_solver</string> </key> - <value> - <tuple> - <string>FIFO</string> - <string>LIFO</string> - <string>MinPrice</string> - </tuple> - </value> - </item> - <item> - <key> <string>description</string> </key> - <value> <string>The Accept Solver solves the divergence by accepting the decision and updating a simulation movement.</string> </value> - </item> - <item> - <key> <string>factory</string> </key> - <value> <string>addAcceptSolver</string> </value> - </item> - <item> - <key> <string>group_list</string> </key> - <value> - <tuple> - <string>target_solver</string> - </tuple> - </value> - </item> - <item> - <key> <string>id</string> </key> - <value> <string>Resource Accept Solver</string> </value> - </item> - <item> - <key> <string>init_script</string> </key> - <value> - <none/> - </value> - </item> - <item> - <key> <string>line_exclusive</string> </key> - <value> <int>0</int> </value> - </item> - <item> - <key> <string>line_grouping</string> </key> - <value> <int>0</int> </value> - </item> - <item> - <key> <string>permission</string> </key> - <value> - <none/> - </value> - </item> - <item> - <key> <string>portal_type</string> </key> - <value> <string>Solver Type</string> </value> - </item> - <item> - <key> <string>solver_action_title</string> </key> - <value> <string>Accept new resource</string> </value> - </item> - <item> - <key> <string>tested_property</string> </key> - <value> <string>resource</string> </value> - </item> - </dictionary> - </pickle> - </record> -</ZopeData> diff --git a/bt5/erp5_simulation/PortalTypeTemplateItem/portal_types/Resource%20Replacement%20Solver.xml b/bt5/erp5_simulation/PortalTypeTemplateItem/portal_types/Resource%20Replacement%20Solver.xml index 2630a29939a9853911e7b9f4ce95d16b69dfeb9a..868e078435423433e14c0353c03de17df79792d4 100644 --- a/bt5/erp5_simulation/PortalTypeTemplateItem/portal_types/Resource%20Replacement%20Solver.xml +++ b/bt5/erp5_simulation/PortalTypeTemplateItem/portal_types/Resource%20Replacement%20Solver.xml @@ -21,7 +21,23 @@ </item> <item> <key> <string>configuration_form_id</string> </key> - <value> <string>ResourceReplacementSolver_viewConfiguration</string> </value> + <value> <string>Solver_viewConfiguration</string> </value> + </item> + <item> + <key> <string>configuration_property_list</string> </key> + <value> + <tuple/> + </value> + </item> + <item> + <key> <string>delivery_solver</string> </key> + <value> + <tuple> + <string>FIFO</string> + <string>LIFO</string> + <string>MinPrice</string> + </tuple> + </value> </item> <item> <key> <string>description</string> </key> @@ -63,6 +79,10 @@ <key> <string>solver_action_title</string> </key> <value> <string>Replace Resource</string> </value> </item> + <item> + <key> <string>tested_property</string> </key> + <value> <string>resource</string> </value> + </item> </dictionary> </pickle> </record> diff --git a/bt5/erp5_simulation/PortalTypeWorkflowChainTemplateItem/workflow_chain_type.xml b/bt5/erp5_simulation/PortalTypeWorkflowChainTemplateItem/workflow_chain_type.xml index 103a9ceada7e1fec9de6034abbcc9a7bbe4974bd..97d556baecfa8b3da7c7d9b93c628321484f5c2c 100644 --- a/bt5/erp5_simulation/PortalTypeWorkflowChainTemplateItem/workflow_chain_type.xml +++ b/bt5/erp5_simulation/PortalTypeWorkflowChainTemplateItem/workflow_chain_type.xml @@ -31,10 +31,6 @@ <type>Quantity Split Solver</type> <workflow>solver_workflow</workflow> </chain> - <chain> - <type>Resource Accept Solver</type> - <workflow>solver_workflow</workflow> - </chain> <chain> <type>Resource Adoption Solver</type> <workflow>solver_workflow</workflow> diff --git a/bt5/erp5_simulation/bt/revision b/bt5/erp5_simulation/bt/revision index dce6588ca1420a69eea5699f2ec5d666daf16a6a..7c091989d018956d085a80a955a265ebbb0d0a49 100644 --- a/bt5/erp5_simulation/bt/revision +++ b/bt5/erp5_simulation/bt/revision @@ -1 +1 @@ -36 \ No newline at end of file +37 \ 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 4eb98e6ecbd2832a5cd183210f0cf52d54c60a28..8e28392190a5168e9e6d04dd2d465b262907b353 100644 --- a/bt5/erp5_simulation/bt/template_action_path_list +++ b/bt5/erp5_simulation/bt/template_action_path_list @@ -14,8 +14,10 @@ Quantity Cancel Solver | configuration Quantity Cancel Solver | view Quantity Split Solver | configuration Quantity Split Solver | view -Resource Accept Solver | configuration -Resource Accept Solver | view +Resource Adoption Solver | configuration +Resource Adoption Solver | view +Resource Replacement Solver | configuration +Resource Replacement Solver | view Solver Decision | configuration Solver Decision | view Solver Process | target_solver 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 45c2e234d8ff2a7a86a8f4d0e569bce04a8d5ca6..e47ab4722f8a5fa12ef9982f38920b86f229d51d 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 @@ -7,7 +7,6 @@ Rule Tool | New Order Rule Solver Process | Production Reduction Solver Solver Process | Quantity Accept Solver Solver Process | Quantity Split Solver -Solver Process | Resource Accept Solver Solver Process | Resource Adoption Solver Solver Process | Resource Replacement Solver Solver Process | Solver Decision diff --git a/bt5/erp5_simulation/bt/template_portal_type_id_list b/bt5/erp5_simulation/bt/template_portal_type_id_list index 6171bbce6c185aa031ac4b07112f76ed76d574f0..dbbbbf64a5932cf65cf124df3de79de8fc889c0c 100644 --- a/bt5/erp5_simulation/bt/template_portal_type_id_list +++ b/bt5/erp5_simulation/bt/template_portal_type_id_list @@ -6,7 +6,6 @@ Production Reduction Solver Quantity Accept Solver Quantity Cancel Solver Quantity Split Solver -Resource Accept Solver Resource Adoption Solver Resource Replacement Solver Solver Decision 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 acc895b5b1d432837804bb85cf30844bc66aded3..fa107983d93fef78d158b405f8ffbdee9e70ef3b 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 @@ Production Reduction Solver | solver_workflow Quantity Accept Solver | solver_workflow Quantity Cancel Solver | solver_workflow Quantity Split Solver | solver_workflow -Resource Accept Solver | solver_workflow Resource Adoption Solver | solver_workflow Resource Replacement Solver | solver_workflow String Divergence Tester | edit_workflow