diff --git a/bt5/erp5_simulation/ActionTemplateItem/portal_types/Destination%20Replacement%20Solver/configuration.xml b/bt5/erp5_simulation/ActionTemplateItem/portal_types/Accept%20Solver/configuration.xml
similarity index 100%
rename from bt5/erp5_simulation/ActionTemplateItem/portal_types/Destination%20Replacement%20Solver/configuration.xml
rename to bt5/erp5_simulation/ActionTemplateItem/portal_types/Accept%20Solver/configuration.xml
diff --git a/bt5/erp5_simulation/ActionTemplateItem/portal_types/Destination%20Replacement%20Solver/view.xml b/bt5/erp5_simulation/ActionTemplateItem/portal_types/Accept%20Solver/view.xml
similarity index 100%
rename from bt5/erp5_simulation/ActionTemplateItem/portal_types/Destination%20Replacement%20Solver/view.xml
rename to bt5/erp5_simulation/ActionTemplateItem/portal_types/Accept%20Solver/view.xml
diff --git a/bt5/erp5_simulation/ActionTemplateItem/portal_types/Quantity%20Accept%20Solver/configuration.xml b/bt5/erp5_simulation/ActionTemplateItem/portal_types/Adoption%20Solver/configuration.xml
similarity index 100%
rename from bt5/erp5_simulation/ActionTemplateItem/portal_types/Quantity%20Accept%20Solver/configuration.xml
rename to bt5/erp5_simulation/ActionTemplateItem/portal_types/Adoption%20Solver/configuration.xml
diff --git a/bt5/erp5_simulation/ActionTemplateItem/portal_types/Quantity%20Accept%20Solver/view.xml b/bt5/erp5_simulation/ActionTemplateItem/portal_types/Adoption%20Solver/view.xml
similarity index 100%
rename from bt5/erp5_simulation/ActionTemplateItem/portal_types/Quantity%20Accept%20Solver/view.xml
rename to bt5/erp5_simulation/ActionTemplateItem/portal_types/Adoption%20Solver/view.xml
diff --git a/bt5/erp5_simulation/ActionTemplateItem/portal_types/Resource%20Replacement%20Solver/configuration.xml b/bt5/erp5_simulation/ActionTemplateItem/portal_types/Resource%20Replacement%20Solver/configuration.xml
deleted file mode 100644
index 4c964274bc47a91404890d8aa391201dadb38698..0000000000000000000000000000000000000000
--- a/bt5/erp5_simulation/ActionTemplateItem/portal_types/Resource%20Replacement%20Solver/configuration.xml
+++ /dev/null
@@ -1,91 +0,0 @@
-<?xml version="1.0"?>
-<ZopeData>
- <record id="1" aka="AAAAAAAAAAE=">
- <pickle>
- <tuple>
- <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
- <tuple/>
- </tuple>
- </pickle>
- <pickle>
- <dictionary>
- <item>
- <key> <string>action</string> </key>
- <value>
- <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
- </value>
- </item>
- <item>
- <key> <string>categories</string> </key>
- <value>
- <tuple>
- <string>action_type/object_view</string>
- </tuple>
- </value>
- </item>
- <item>
- <key> <string>category</string> </key>
- <value> <string>object_view</string> </value>
- </item>
- <item>
- <key> <string>condition</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>description</string> </key>
- <value>
- <none/>
- </value>
- </item>
- <item>
- <key> <string>icon</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>id</string> </key>
- <value> <string>configuration</string> </value>
- </item>
- <item>
- <key> <string>permissions</string> </key>
- <value>
- <tuple>
- <string>View</string>
- </tuple>
- </value>
- </item>
- <item>
- <key> <string>portal_type</string> </key>
- <value> <string>Action Information</string> </value>
- </item>
- <item>
- <key> <string>priority</string> </key>
- <value> <float>2.0</float> </value>
- </item>
- <item>
- <key> <string>title</string> </key>
- <value> <string>Configuration</string> </value>
- </item>
- <item>
- <key> <string>visible</string> </key>
- <value> <int>1</int> </value>
- </item>
- </dictionary>
- </pickle>
- </record>
- <record id="2" aka="AAAAAAAAAAI=">
- <pickle>
- <tuple>
- <global name="Expression" module="Products.CMFCore.Expression"/>
- <tuple/>
- </tuple>
- </pickle>
- <pickle>
- <dictionary>
- <item>
- <key> <string>text</string> </key>
- <value> <string>string:${object_url}/Solver_viewConfiguration</string> </value>
- </item>
- </dictionary>
- </pickle>
- </record>
-</ZopeData>
diff --git a/bt5/erp5_simulation/ActionTemplateItem/portal_types/Resource%20Replacement%20Solver/view.xml b/bt5/erp5_simulation/ActionTemplateItem/portal_types/Resource%20Replacement%20Solver/view.xml
deleted file mode 100644
index f4a6ec433a2d26ee6181ac5a4761afd049238835..0000000000000000000000000000000000000000
--- a/bt5/erp5_simulation/ActionTemplateItem/portal_types/Resource%20Replacement%20Solver/view.xml
+++ /dev/null
@@ -1,91 +0,0 @@
-<?xml version="1.0"?>
-<ZopeData>
- <record id="1" aka="AAAAAAAAAAE=">
- <pickle>
- <tuple>
- <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
- <tuple/>
- </tuple>
- </pickle>
- <pickle>
- <dictionary>
- <item>
- <key> <string>action</string> </key>
- <value>
- <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
- </value>
- </item>
- <item>
- <key> <string>categories</string> </key>
- <value>
- <tuple>
- <string>action_type/object_view</string>
- </tuple>
- </value>
- </item>
- <item>
- <key> <string>category</string> </key>
- <value> <string>object_view</string> </value>
- </item>
- <item>
- <key> <string>condition</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>description</string> </key>
- <value>
- <none/>
- </value>
- </item>
- <item>
- <key> <string>icon</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>id</string> </key>
- <value> <string>view</string> </value>
- </item>
- <item>
- <key> <string>permissions</string> </key>
- <value>
- <tuple>
- <string>View</string>
- </tuple>
- </value>
- </item>
- <item>
- <key> <string>portal_type</string> </key>
- <value> <string>Action Information</string> </value>
- </item>
- <item>
- <key> <string>priority</string> </key>
- <value> <float>1.0</float> </value>
- </item>
- <item>
- <key> <string>title</string> </key>
- <value> <string>View</string> </value>
- </item>
- <item>
- <key> <string>visible</string> </key>
- <value> <int>1</int> </value>
- </item>
- </dictionary>
- </pickle>
- </record>
- <record id="2" aka="AAAAAAAAAAI=">
- <pickle>
- <tuple>
- <global name="Expression" module="Products.CMFCore.Expression"/>
- <tuple/>
- </tuple>
- </pickle>
- <pickle>
- <dictionary>
- <item>
- <key> <string>text</string> </key>
- <value> <string>string:${object_url}/TargetSolver_view</string> </value>
- </item>
- </dictionary>
- </pickle>
- </record>
-</ZopeData>
diff --git a/bt5/erp5_simulation/ActionTemplateItem/portal_types/Start%20Date%20Replacement%20Solver/configuration.xml b/bt5/erp5_simulation/ActionTemplateItem/portal_types/Start%20Date%20Replacement%20Solver/configuration.xml
deleted file mode 100644
index 4c964274bc47a91404890d8aa391201dadb38698..0000000000000000000000000000000000000000
--- a/bt5/erp5_simulation/ActionTemplateItem/portal_types/Start%20Date%20Replacement%20Solver/configuration.xml
+++ /dev/null
@@ -1,91 +0,0 @@
-<?xml version="1.0"?>
-<ZopeData>
- <record id="1" aka="AAAAAAAAAAE=">
- <pickle>
- <tuple>
- <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
- <tuple/>
- </tuple>
- </pickle>
- <pickle>
- <dictionary>
- <item>
- <key> <string>action</string> </key>
- <value>
- <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
- </value>
- </item>
- <item>
- <key> <string>categories</string> </key>
- <value>
- <tuple>
- <string>action_type/object_view</string>
- </tuple>
- </value>
- </item>
- <item>
- <key> <string>category</string> </key>
- <value> <string>object_view</string> </value>
- </item>
- <item>
- <key> <string>condition</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>description</string> </key>
- <value>
- <none/>
- </value>
- </item>
- <item>
- <key> <string>icon</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>id</string> </key>
- <value> <string>configuration</string> </value>
- </item>
- <item>
- <key> <string>permissions</string> </key>
- <value>
- <tuple>
- <string>View</string>
- </tuple>
- </value>
- </item>
- <item>
- <key> <string>portal_type</string> </key>
- <value> <string>Action Information</string> </value>
- </item>
- <item>
- <key> <string>priority</string> </key>
- <value> <float>2.0</float> </value>
- </item>
- <item>
- <key> <string>title</string> </key>
- <value> <string>Configuration</string> </value>
- </item>
- <item>
- <key> <string>visible</string> </key>
- <value> <int>1</int> </value>
- </item>
- </dictionary>
- </pickle>
- </record>
- <record id="2" aka="AAAAAAAAAAI=">
- <pickle>
- <tuple>
- <global name="Expression" module="Products.CMFCore.Expression"/>
- <tuple/>
- </tuple>
- </pickle>
- <pickle>
- <dictionary>
- <item>
- <key> <string>text</string> </key>
- <value> <string>string:${object_url}/Solver_viewConfiguration</string> </value>
- </item>
- </dictionary>
- </pickle>
- </record>
-</ZopeData>
diff --git a/bt5/erp5_simulation/ActionTemplateItem/portal_types/Start%20Date%20Replacement%20Solver/view.xml b/bt5/erp5_simulation/ActionTemplateItem/portal_types/Start%20Date%20Replacement%20Solver/view.xml
deleted file mode 100644
index f4a6ec433a2d26ee6181ac5a4761afd049238835..0000000000000000000000000000000000000000
--- a/bt5/erp5_simulation/ActionTemplateItem/portal_types/Start%20Date%20Replacement%20Solver/view.xml
+++ /dev/null
@@ -1,91 +0,0 @@
-<?xml version="1.0"?>
-<ZopeData>
- <record id="1" aka="AAAAAAAAAAE=">
- <pickle>
- <tuple>
- <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
- <tuple/>
- </tuple>
- </pickle>
- <pickle>
- <dictionary>
- <item>
- <key> <string>action</string> </key>
- <value>
- <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
- </value>
- </item>
- <item>
- <key> <string>categories</string> </key>
- <value>
- <tuple>
- <string>action_type/object_view</string>
- </tuple>
- </value>
- </item>
- <item>
- <key> <string>category</string> </key>
- <value> <string>object_view</string> </value>
- </item>
- <item>
- <key> <string>condition</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>description</string> </key>
- <value>
- <none/>
- </value>
- </item>
- <item>
- <key> <string>icon</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>id</string> </key>
- <value> <string>view</string> </value>
- </item>
- <item>
- <key> <string>permissions</string> </key>
- <value>
- <tuple>
- <string>View</string>
- </tuple>
- </value>
- </item>
- <item>
- <key> <string>portal_type</string> </key>
- <value> <string>Action Information</string> </value>
- </item>
- <item>
- <key> <string>priority</string> </key>
- <value> <float>1.0</float> </value>
- </item>
- <item>
- <key> <string>title</string> </key>
- <value> <string>View</string> </value>
- </item>
- <item>
- <key> <string>visible</string> </key>
- <value> <int>1</int> </value>
- </item>
- </dictionary>
- </pickle>
- </record>
- <record id="2" aka="AAAAAAAAAAI=">
- <pickle>
- <tuple>
- <global name="Expression" module="Products.CMFCore.Expression"/>
- <tuple/>
- </tuple>
- </pickle>
- <pickle>
- <dictionary>
- <item>
- <key> <string>text</string> </key>
- <value> <string>string:${object_url}/TargetSolver_view</string> </value>
- </item>
- </dictionary>
- </pickle>
- </record>
-</ZopeData>
diff --git a/bt5/erp5_simulation/ActionTemplateItem/portal_types/Quantity%20Adoption%20Solver/configuration.xml b/bt5/erp5_simulation/ActionTemplateItem/portal_types/Unify%20Solver/configuration.xml
similarity index 100%
rename from bt5/erp5_simulation/ActionTemplateItem/portal_types/Quantity%20Adoption%20Solver/configuration.xml
rename to bt5/erp5_simulation/ActionTemplateItem/portal_types/Unify%20Solver/configuration.xml
diff --git a/bt5/erp5_simulation/ActionTemplateItem/portal_types/Quantity%20Adoption%20Solver/view.xml b/bt5/erp5_simulation/ActionTemplateItem/portal_types/Unify%20Solver/view.xml
similarity index 100%
rename from bt5/erp5_simulation/ActionTemplateItem/portal_types/Quantity%20Adoption%20Solver/view.xml
rename to bt5/erp5_simulation/ActionTemplateItem/portal_types/Unify%20Solver/view.xml
diff --git a/bt5/erp5_simulation/PortalTypeAllowedContentTypeTemplateItem/allowed_content_types.xml b/bt5/erp5_simulation/PortalTypeAllowedContentTypeTemplateItem/allowed_content_types.xml
index 82324a1015907356fc8299e74e84e42774f17199..ee9a77afedf04f29ae10781fbac14348d2b10734 100644
--- a/bt5/erp5_simulation/PortalTypeAllowedContentTypeTemplateItem/allowed_content_types.xml
+++ b/bt5/erp5_simulation/PortalTypeAllowedContentTypeTemplateItem/allowed_content_types.xml
@@ -48,15 +48,12 @@
<item>Variation Divergence Tester</item>
</portal_type>
<portal_type id="Solver Process">
- <item>Destination Replacement Solver</item>
+ <item>Accept Solver</item>
+ <item>Adoption Solver</item>
<item>Production Reduction Solver</item>
- <item>Quantity Accept Solver</item>
- <item>Quantity Adoption Solver</item>
<item>Quantity Split Solver</item>
- <item>Resource Adoption Solver</item>
- <item>Resource Replacement Solver</item>
<item>Solver Decision</item>
- <item>Start Date Replacement Solver</item>
+ <item>Unify Solver</item>
</portal_type>
<portal_type id="Solver Tool">
<item>Solver Process</item>
diff --git a/bt5/erp5_simulation/PortalTypeTemplateItem/portal_types/Quantity%20Accept%20Solver.xml b/bt5/erp5_simulation/PortalTypeTemplateItem/portal_types/Accept%20Solver.xml
similarity index 66%
rename from bt5/erp5_simulation/PortalTypeTemplateItem/portal_types/Quantity%20Accept%20Solver.xml
rename to bt5/erp5_simulation/PortalTypeTemplateItem/portal_types/Accept%20Solver.xml
index 9c446f731445c060bf686cae3d5d01640ba648ed..9f1713d88cd0b57ec50e618cf609391ea205308f 100644
--- a/bt5/erp5_simulation/PortalTypeTemplateItem/portal_types/Quantity%20Accept%20Solver.xml
+++ b/bt5/erp5_simulation/PortalTypeTemplateItem/portal_types/Accept%20Solver.xml
@@ -23,22 +23,6 @@
<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>
@@ -57,7 +41,7 @@
</item>
<item>
<key> <string>id</string> </key>
- <value> <string>Quantity Accept Solver</string> </value>
+ <value> <string>Accept Solver</string> </value>
</item>
<item>
<key> <string>init_script</string> </key>
@@ -65,14 +49,6 @@
<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>
@@ -85,11 +61,7 @@
</item>
<item>
<key> <string>solver_action_title</string> </key>
- <value> <string>Accept new quantity</string> </value>
- </item>
- <item>
- <key> <string>tested_property</string> </key>
- <value> <string>quantity</string> </value>
+ <value> <string>Accept new value</string> </value>
</item>
</dictionary>
</pickle>
diff --git a/bt5/erp5_simulation/PortalTypeTemplateItem/portal_types/Quantity%20Adoption%20Solver.xml b/bt5/erp5_simulation/PortalTypeTemplateItem/portal_types/Adoption%20Solver.xml
similarity index 74%
rename from bt5/erp5_simulation/PortalTypeTemplateItem/portal_types/Quantity%20Adoption%20Solver.xml
rename to bt5/erp5_simulation/PortalTypeTemplateItem/portal_types/Adoption%20Solver.xml
index 6e8179e36d343e1dc898a9d9207c8071626158ef..387026d6f31d9398813bdfee08a398c191c4d768 100644
--- a/bt5/erp5_simulation/PortalTypeTemplateItem/portal_types/Quantity%20Adoption%20Solver.xml
+++ b/bt5/erp5_simulation/PortalTypeTemplateItem/portal_types/Adoption%20Solver.xml
@@ -21,11 +21,11 @@
</item>
<item>
<key> <string>configuration_form_id</string> </key>
- <value> <string>QuantityReplacementSolver_viewConfiguration</string> </value>
+ <value> <string>Solver_viewConfiguration</string> </value>
</item>
<item>
<key> <string>description</string> </key>
- <value> <string>The quantity adoption solver resets the quantity value of the delivery movement to the total of the quantity values of related simulations. It eventually updates the delivery_ratio in the simulations.</string> </value>
+ <value> <string>The adoption solver resets the value of the delivery movement to the total of the values of related simulations. It eventually updates the delivery_ratio in the simulations.</string> </value>
</item>
<item>
<key> <string>factory</string> </key>
@@ -41,7 +41,7 @@
</item>
<item>
<key> <string>id</string> </key>
- <value> <string>Quantity Adoption Solver</string> </value>
+ <value> <string>Adoption Solver</string> </value>
</item>
<item>
<key> <string>init_script</string> </key>
@@ -61,11 +61,7 @@
</item>
<item>
<key> <string>solver_action_title</string> </key>
- <value> <string>Replace Quantity</string> </value>
- </item>
- <item>
- <key> <string>tested_property</string> </key>
- <value> <string>quantity</string> </value>
+ <value> <string>Replace value</string> </value>
</item>
</dictionary>
</pickle>
diff --git a/bt5/erp5_simulation/PortalTypeTemplateItem/portal_types/Destination%20Replacement%20Solver.xml b/bt5/erp5_simulation/PortalTypeTemplateItem/portal_types/Destination%20Replacement%20Solver.xml
deleted file mode 100644
index 5c1da7db2b09b983d8b329115db22b228336feb2..0000000000000000000000000000000000000000
--- a/bt5/erp5_simulation/PortalTypeTemplateItem/portal_types/Destination%20Replacement%20Solver.xml
+++ /dev/null
@@ -1,93 +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/>
- </value>
- </item>
- <item>
- <key> <string>description</string> </key>
- <value> <string>The Destination Replacement Solver forces the source of delivery related simulation movements to the destination value of the delivery movement, yet preserving its original value as a recordable property.</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>Destination Replacement 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>Replace Destination</string> </value>
- </item>
- <item>
- <key> <string>tested_property</string> </key>
- <value> <string>destination</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
deleted file mode 100644
index 8aa432594beb46b107b40021830caa1537625a29..0000000000000000000000000000000000000000
--- a/bt5/erp5_simulation/PortalTypeTemplateItem/portal_types/Resource%20Replacement%20Solver.xml
+++ /dev/null
@@ -1,93 +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/>
- </value>
- </item>
- <item>
- <key> <string>description</string> </key>
- <value> <string>The Resource Replacement Solver forces the source of delivery related simulation movements to the resource value of the delivery movement, yet preserving its original value as a recordable property.</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 Replacement 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>Replace 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/Start%20Date%20Replacement%20Solver.xml b/bt5/erp5_simulation/PortalTypeTemplateItem/portal_types/Unify%20Solver.xml
similarity index 62%
rename from bt5/erp5_simulation/PortalTypeTemplateItem/portal_types/Start%20Date%20Replacement%20Solver.xml
rename to bt5/erp5_simulation/PortalTypeTemplateItem/portal_types/Unify%20Solver.xml
index 8d0427b7f6d361b78f99af09e61e1cc834273fc6..994e41d575669b1c2d4b92041374a97fd2b52f61 100644
--- a/bt5/erp5_simulation/PortalTypeTemplateItem/portal_types/Start%20Date%20Replacement%20Solver.xml
+++ b/bt5/erp5_simulation/PortalTypeTemplateItem/portal_types/Unify%20Solver.xml
@@ -23,21 +23,9 @@
<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/>
- </value>
- </item>
<item>
<key> <string>description</string> </key>
- <value> <string>The Start Date Replacement Solver forces the source of delivery related simulation movements to the start_date value of the delivery movement, yet preserving its original value as a recordable property.</string> </value>
+ <value> <string>The Unify Solver solves the divergence by unifying the value with a selected one and updating a simulation movement.</string> </value>
</item>
<item>
<key> <string>factory</string> </key>
@@ -53,7 +41,7 @@
</item>
<item>
<key> <string>id</string> </key>
- <value> <string>Start Date Replacement Solver</string> </value>
+ <value> <string>Unify Solver</string> </value>
</item>
<item>
<key> <string>init_script</string> </key>
@@ -61,14 +49,6 @@
<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>
@@ -81,11 +61,7 @@
</item>
<item>
<key> <string>solver_action_title</string> </key>
- <value> <string>Replace Start Date</string> </value>
- </item>
- <item>
- <key> <string>tested_property</string> </key>
- <value> <string>start_date</string> </value>
+ <value> <string>Unify value</string> </value>
</item>
</dictionary>
</pickle>
diff --git a/bt5/erp5_simulation/PortalTypeWorkflowChainTemplateItem/workflow_chain_type.xml b/bt5/erp5_simulation/PortalTypeWorkflowChainTemplateItem/workflow_chain_type.xml
index c3510f40ecabc1cd56dd027c3dad2f3a866e71f2..b9b171cbf2d7babf36018b78c39b3b330b17f452 100644
--- a/bt5/erp5_simulation/PortalTypeWorkflowChainTemplateItem/workflow_chain_type.xml
+++ b/bt5/erp5_simulation/PortalTypeWorkflowChainTemplateItem/workflow_chain_type.xml
@@ -1,4 +1,12 @@
<workflow_chain>
+ <chain>
+ <type>Accept Solver</type>
+ <workflow>solver_workflow</workflow>
+ </chain>
+ <chain>
+ <type>Adoption Solver</type>
+ <workflow>solver_workflow</workflow>
+ </chain>
<chain>
<type>Category Membership Divergence Tester</type>
<workflow>edit_workflow</workflow>
@@ -7,10 +15,6 @@
<type>DateTime Divergence Tester</type>
<workflow>edit_workflow</workflow>
</chain>
- <chain>
- <type>Destination Replacement Solver</type>
- <workflow>solver_workflow</workflow>
- </chain>
<chain>
<type>Float Divergence Tester</type>
<workflow>edit_workflow</workflow>
@@ -23,14 +27,6 @@
<type>Production Reduction Solver</type>
<workflow>solver_workflow</workflow>
</chain>
- <chain>
- <type>Quantity Accept Solver</type>
- <workflow>solver_workflow</workflow>
- </chain>
- <chain>
- <type>Quantity Adoption Solver</type>
- <workflow>solver_workflow</workflow>
- </chain>
<chain>
<type>Quantity Cancel Solver</type>
<workflow>solver_workflow</workflow>
@@ -40,21 +36,13 @@
<workflow>solver_workflow</workflow>
</chain>
<chain>
- <type>Resource Adoption Solver</type>
- <workflow>solver_workflow</workflow>
- </chain>
- <chain>
- <type>Resource Replacement Solver</type>
- <workflow>solver_workflow</workflow>
+ <type>String Divergence Tester</type>
+ <workflow>edit_workflow</workflow>
</chain>
<chain>
- <type>Start Date Replacement Solver</type>
+ <type>Unify Solver</type>
<workflow>solver_workflow</workflow>
</chain>
- <chain>
- <type>String Divergence Tester</type>
- <workflow>edit_workflow</workflow>
- </chain>
<chain>
<type>Variation Divergence Tester</type>
<workflow>edit_workflow</workflow>
diff --git a/bt5/erp5_simulation/bt/template_action_path_list b/bt5/erp5_simulation/bt/template_action_path_list
index 0a12e5d5d45e7bb3d48e8b4e3a930bd37df8d534..c8db0e17c72f552caad34de572f4687970fb1a05 100644
--- a/bt5/erp5_simulation/bt/template_action_path_list
+++ b/bt5/erp5_simulation/bt/template_action_path_list
@@ -1,29 +1,23 @@
+Accept Solver | configuration
+Accept Solver | view
+Adoption Solver | configuration
+Adoption Solver | view
Category Membership Divergence Tester | configuration
Category Membership Divergence Tester | predicate
Category Membership Divergence Tester | view
DateTime Divergence Tester | configuration
DateTime Divergence Tester | predicate
DateTime Divergence Tester | view
-Destination Replacement Solver | configuration
-Destination Replacement Solver | view
Float Divergence Tester | configuration
Float Divergence Tester | predicate
Float Divergence Tester | view
Net Converted Quantity Divergence Tester | configuration
Net Converted Quantity Divergence Tester | predicate
Net Converted Quantity Divergence Tester | view
-Quantity Accept Solver | configuration
-Quantity Accept Solver | view
-Quantity Adoption Solver | configuration
-Quantity Adoption Solver | view
Quantity Cancel Solver | configuration
Quantity Cancel Solver | view
Quantity Split Solver | configuration
Quantity Split 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
@@ -35,11 +29,11 @@ Solver Type | solver_view
Solver Type | translation_view
Solver Type | update_local_roles
Solver Type | view
-Start Date Replacement Solver | configuration
-Start Date Replacement Solver | view
String Divergence Tester | configuration
String Divergence Tester | predicate
String Divergence Tester | view
+Unify Solver | configuration
+Unify Solver | view
Variation Divergence Tester | configuration
Variation Divergence Tester | predicate
Variation Divergence Tester | view
\ 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 2ef4d3c473c89dde0c973e3602c6adb5099a86ec..c41d476e02b7ad1c44169383ebde2d9b62fbb7d5 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
@@ -34,15 +34,12 @@ Payment Rule | Float Divergence Tester
Payment Rule | Net Converted Quantity Divergence Tester
Payment Rule | String Divergence Tester
Payment Rule | Variation Divergence Tester
-Solver Process | Destination Replacement Solver
+Solver Process | Accept Solver
+Solver Process | Adoption Solver
Solver Process | Production Reduction Solver
-Solver Process | Quantity Accept Solver
-Solver Process | Quantity Adoption Solver
Solver Process | Quantity Split Solver
-Solver Process | Resource Adoption Solver
-Solver Process | Resource Replacement Solver
Solver Process | Solver Decision
-Solver Process | Start Date Replacement Solver
+Solver Process | Unify Solver
Solver Tool | Solver Process
Solver Type | Action Information
Solver Type | Role Information
diff --git a/bt5/erp5_simulation/bt/template_portal_type_id_list b/bt5/erp5_simulation/bt/template_portal_type_id_list
index 6eefe9effbabe4fe6153072f187832dff8724afb..d477fb1081149e80773c6f473389c733bf143678 100644
--- a/bt5/erp5_simulation/bt/template_portal_type_id_list
+++ b/bt5/erp5_simulation/bt/template_portal_type_id_list
@@ -1,19 +1,16 @@
+Accept Solver
+Adoption Solver
Category Membership Divergence Tester
DateTime Divergence Tester
-Destination Replacement Solver
Float Divergence Tester
Net Converted Quantity Divergence Tester
Production Reduction Solver
-Quantity Accept Solver
-Quantity Adoption Solver
Quantity Cancel Solver
Quantity Split Solver
-Resource Adoption Solver
-Resource Replacement Solver
Solver Decision
Solver Process
Solver Tool
Solver Type
-Start Date Replacement Solver
String Divergence Tester
+Unify Solver
Variation Divergence Tester
\ 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 74e8c6fcc9c0340979f1eb67478b075b67909a3e..5260d9bf6b95f65ff572fa5f0e412d78e865ac5b 100644
--- a/bt5/erp5_simulation/bt/template_portal_type_workflow_chain_list
+++ b/bt5/erp5_simulation/bt/template_portal_type_workflow_chain_list
@@ -1,15 +1,12 @@
+Accept Solver | solver_workflow
+Adoption Solver | solver_workflow
Category Membership Divergence Tester | edit_workflow
DateTime Divergence Tester | edit_workflow
-Destination Replacement Solver | solver_workflow
Float Divergence Tester | edit_workflow
Net Converted Quantity Divergence Tester | edit_workflow
Production Reduction Solver | solver_workflow
-Quantity Accept Solver | solver_workflow
-Quantity Adoption Solver | solver_workflow
Quantity Cancel Solver | solver_workflow
Quantity Split Solver | solver_workflow
-Resource Adoption Solver | solver_workflow
-Resource Replacement Solver | solver_workflow
-Start Date Replacement Solver | solver_workflow
String Divergence Tester | edit_workflow
+Unify Solver | solver_workflow
Variation Divergence Tester | edit_workflow
\ No newline at end of file