From 71e5cf32531d51935beadefa813745a027634dca Mon Sep 17 00:00:00 2001
From: Vincent Pelletier <vincent@nexedi.com>
Date: Thu, 5 Aug 2010 16:24:44 +0000
Subject: [PATCH] Add solvers types (from erp5_base). Remove solvers (to be
 added to erp5_simulation_test).

git-svn-id: https://svn.erp5.org/repos/public/erp5/sandbox/amount_generator@37581 20353a03-c40f-0410-a6d1-a30d3c3de9de
---
 .../configuration.xml                         |  91 ---------
 .../Trade%20Model%20Solver/configuration.xml  |  91 ---------
 .../Trade%20Model%20Solver/view.xml           |  91 ---------
 .../Unify%20Solver/configuration.xml          |  91 ---------
 .../portal_solvers/Unify%20Solver/view.xml    |  91 ---------
 .../Solver%20Decision}/configuration.xml      |  26 ++-
 .../portal_types/Solver%20Decision/view.xml   |  85 +++++++++
 .../Solver%20Process%20Tool}/view.xml         |   6 +-
 .../portal_types/Solver%20Process/view.xml    |  85 +++++++++
 .../Solver%20Tool}/view.xml                   |   6 +-
 .../Solver%20Type/action_view.xml             |  91 +++++++++
 .../Solver%20Type/predicate_view.xml          |  91 +++++++++
 .../Solver%20Type/role_view.xml}              |   8 +-
 .../Solver%20Type/solver_view.xml}            |  11 +-
 .../Solver%20Type/translation_view.xml}       |   8 +-
 .../Solver%20Type/update_local_roles.xml      |  91 +++++++++
 .../Solver%20Type}/view.xml                   |   2 +-
 .../allowed_content_types.xml                 |  20 +-
 .../portal_solvers/Accept%20Solver.xml        |  83 ---------
 .../Production%20Reduction%20Solver.xml       |  69 -------
 .../Quantity%20Cancel%20Solver.xml            |  83 ---------
 .../Quantity%20Split%20Solver.xml             |  99 ----------
 .../portal_solvers/Trade%20Model%20Solver.xml | 173 ------------------
 .../portal_solvers/Unify%20Solver.xml         | 162 ----------------
 .../Solver%20Decision.xml}                    |  35 +---
 .../Solver%20Process%20Tool.xml}              |  38 ++--
 .../Solver%20Process.xml}                     |  36 ++--
 .../Solver%20Tool.xml}                        |  38 ++--
 .../portal_types/Solver%20Type.xml            | 102 +++++++++++
 .../workflow_chain_type.xml                   |  28 +--
 bt5/erp5_simulation/bt/comment                |   2 -
 bt5/erp5_simulation/bt/revision               |   2 +-
 .../bt/template_action_path_list              |  24 +--
 ...late_portal_type_allowed_content_type_list |  14 +-
 .../bt/template_portal_type_id_list           |  12 +-
 .../template_portal_type_workflow_chain_list  |  10 +-
 36 files changed, 689 insertions(+), 1306 deletions(-)
 delete mode 100644 bt5/erp5_simulation/ActionTemplateItem/portal_solvers/Quantity%20Split%20Solver/configuration.xml
 delete mode 100644 bt5/erp5_simulation/ActionTemplateItem/portal_solvers/Trade%20Model%20Solver/configuration.xml
 delete mode 100644 bt5/erp5_simulation/ActionTemplateItem/portal_solvers/Trade%20Model%20Solver/view.xml
 delete mode 100644 bt5/erp5_simulation/ActionTemplateItem/portal_solvers/Unify%20Solver/configuration.xml
 delete mode 100644 bt5/erp5_simulation/ActionTemplateItem/portal_solvers/Unify%20Solver/view.xml
 rename bt5/erp5_simulation/ActionTemplateItem/{portal_solvers/Adopt%20Solver => portal_types/Solver%20Decision}/configuration.xml (78%)
 create mode 100644 bt5/erp5_simulation/ActionTemplateItem/portal_types/Solver%20Decision/view.xml
 rename bt5/erp5_simulation/ActionTemplateItem/{portal_solvers/Accept%20Solver => portal_types/Solver%20Process%20Tool}/view.xml (90%)
 create mode 100644 bt5/erp5_simulation/ActionTemplateItem/portal_types/Solver%20Process/view.xml
 rename bt5/erp5_simulation/ActionTemplateItem/{portal_solvers/Quantity%20Split%20Solver => portal_types/Solver%20Tool}/view.xml (90%)
 create mode 100644 bt5/erp5_simulation/ActionTemplateItem/portal_types/Solver%20Type/action_view.xml
 create mode 100644 bt5/erp5_simulation/ActionTemplateItem/portal_types/Solver%20Type/predicate_view.xml
 rename bt5/erp5_simulation/ActionTemplateItem/{portal_solvers/Adopt%20Solver/view.xml => portal_types/Solver%20Type/role_view.xml} (90%)
 rename bt5/erp5_simulation/ActionTemplateItem/{portal_solvers/Quantity%20Cancel%20Solver/configuration.xml => portal_types/Solver%20Type/solver_view.xml} (86%)
 rename bt5/erp5_simulation/ActionTemplateItem/{portal_solvers/Accept%20Solver/configuration.xml => portal_types/Solver%20Type/translation_view.xml} (90%)
 create mode 100644 bt5/erp5_simulation/ActionTemplateItem/portal_types/Solver%20Type/update_local_roles.xml
 rename bt5/erp5_simulation/ActionTemplateItem/{portal_solvers/Quantity%20Cancel%20Solver => portal_types/Solver%20Type}/view.xml (96%)
 delete mode 100644 bt5/erp5_simulation/PortalTypeTemplateItem/portal_solvers/Accept%20Solver.xml
 delete mode 100644 bt5/erp5_simulation/PortalTypeTemplateItem/portal_solvers/Production%20Reduction%20Solver.xml
 delete mode 100644 bt5/erp5_simulation/PortalTypeTemplateItem/portal_solvers/Quantity%20Cancel%20Solver.xml
 delete mode 100644 bt5/erp5_simulation/PortalTypeTemplateItem/portal_solvers/Quantity%20Split%20Solver.xml
 delete mode 100644 bt5/erp5_simulation/PortalTypeTemplateItem/portal_solvers/Trade%20Model%20Solver.xml
 delete mode 100644 bt5/erp5_simulation/PortalTypeTemplateItem/portal_solvers/Unify%20Solver.xml
 rename bt5/erp5_simulation/PortalTypeTemplateItem/{portal_solvers/Adopt%20Solver.xml => portal_types/Solver%20Decision.xml} (69%)
 rename bt5/erp5_simulation/PortalTypeTemplateItem/{portal_solvers/LIFO%20Delivery%20Solver.xml => portal_types/Solver%20Process%20Tool.xml} (75%)
 rename bt5/erp5_simulation/PortalTypeTemplateItem/{portal_solvers/FIFO%20Delivery%20Solver.xml => portal_types/Solver%20Process.xml} (77%)
 rename bt5/erp5_simulation/PortalTypeTemplateItem/{portal_solvers/Minimise%20Price%20Delivery%20Solver.xml => portal_types/Solver%20Tool.xml} (75%)
 create mode 100644 bt5/erp5_simulation/PortalTypeTemplateItem/portal_types/Solver%20Type.xml

diff --git a/bt5/erp5_simulation/ActionTemplateItem/portal_solvers/Quantity%20Split%20Solver/configuration.xml b/bt5/erp5_simulation/ActionTemplateItem/portal_solvers/Quantity%20Split%20Solver/configuration.xml
deleted file mode 100644
index 4c964274bc..0000000000
--- a/bt5/erp5_simulation/ActionTemplateItem/portal_solvers/Quantity%20Split%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_solvers/Trade%20Model%20Solver/configuration.xml b/bt5/erp5_simulation/ActionTemplateItem/portal_solvers/Trade%20Model%20Solver/configuration.xml
deleted file mode 100644
index 4c964274bc..0000000000
--- a/bt5/erp5_simulation/ActionTemplateItem/portal_solvers/Trade%20Model%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_solvers/Trade%20Model%20Solver/view.xml b/bt5/erp5_simulation/ActionTemplateItem/portal_solvers/Trade%20Model%20Solver/view.xml
deleted file mode 100644
index f4a6ec433a..0000000000
--- a/bt5/erp5_simulation/ActionTemplateItem/portal_solvers/Trade%20Model%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_solvers/Unify%20Solver/configuration.xml b/bt5/erp5_simulation/ActionTemplateItem/portal_solvers/Unify%20Solver/configuration.xml
deleted file mode 100644
index 4c964274bc..0000000000
--- a/bt5/erp5_simulation/ActionTemplateItem/portal_solvers/Unify%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_solvers/Unify%20Solver/view.xml b/bt5/erp5_simulation/ActionTemplateItem/portal_solvers/Unify%20Solver/view.xml
deleted file mode 100644
index f4a6ec433a..0000000000
--- a/bt5/erp5_simulation/ActionTemplateItem/portal_solvers/Unify%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_solvers/Adopt%20Solver/configuration.xml b/bt5/erp5_simulation/ActionTemplateItem/portal_types/Solver%20Decision/configuration.xml
similarity index 78%
rename from bt5/erp5_simulation/ActionTemplateItem/portal_solvers/Adopt%20Solver/configuration.xml
rename to bt5/erp5_simulation/ActionTemplateItem/portal_types/Solver%20Decision/configuration.xml
index 4c964274bc..452147ceaa 100644
--- a/bt5/erp5_simulation/ActionTemplateItem/portal_solvers/Adopt%20Solver/configuration.xml
+++ b/bt5/erp5_simulation/ActionTemplateItem/portal_types/Solver%20Decision/configuration.xml
@@ -29,7 +29,9 @@
         </item>
         <item>
             <key> <string>condition</string> </key>
-            <value> <string></string> </value>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
+            </value>
         </item>
         <item>
             <key> <string>description</string> </key>
@@ -53,10 +55,6 @@
               </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>
@@ -83,7 +81,23 @@
       <dictionary>
         <item>
             <key> <string>text</string> </key>
-            <value> <string>string:${object_url}/Solver_viewConfiguration</string> </value>
+            <value> <string>string:${object_url}/SolverDecision_viewConfiguration</string> </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="3" aka="AAAAAAAAAAM=">
+    <pickle>
+      <tuple>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>text</string> </key>
+            <value> <string>python:object.getSolver() and object.getSolverValue().getConfigurationFormId()</string> </value>
         </item>
       </dictionary>
     </pickle>
diff --git a/bt5/erp5_simulation/ActionTemplateItem/portal_types/Solver%20Decision/view.xml b/bt5/erp5_simulation/ActionTemplateItem/portal_types/Solver%20Decision/view.xml
new file mode 100644
index 0000000000..307540c3e8
--- /dev/null
+++ b/bt5/erp5_simulation/ActionTemplateItem/portal_types/Solver%20Decision/view.xml
@@ -0,0 +1,85 @@
+<?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> <string></string> </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>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}/SolverDecision_view</string> </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+</ZopeData>
diff --git a/bt5/erp5_simulation/ActionTemplateItem/portal_solvers/Accept%20Solver/view.xml b/bt5/erp5_simulation/ActionTemplateItem/portal_types/Solver%20Process%20Tool/view.xml
similarity index 90%
rename from bt5/erp5_simulation/ActionTemplateItem/portal_solvers/Accept%20Solver/view.xml
rename to bt5/erp5_simulation/ActionTemplateItem/portal_types/Solver%20Process%20Tool/view.xml
index f4a6ec433a..0bb9d54b68 100644
--- a/bt5/erp5_simulation/ActionTemplateItem/portal_solvers/Accept%20Solver/view.xml
+++ b/bt5/erp5_simulation/ActionTemplateItem/portal_types/Solver%20Process%20Tool/view.xml
@@ -53,10 +53,6 @@
               </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>
@@ -83,7 +79,7 @@
       <dictionary>
         <item>
             <key> <string>text</string> </key>
-            <value> <string>string:${object_url}/TargetSolver_view</string> </value>
+            <value> <string>string:${object_url}/TypesTool_viewContentList</string> </value>
         </item>
       </dictionary>
     </pickle>
diff --git a/bt5/erp5_simulation/ActionTemplateItem/portal_types/Solver%20Process/view.xml b/bt5/erp5_simulation/ActionTemplateItem/portal_types/Solver%20Process/view.xml
new file mode 100644
index 0000000000..290e31f51c
--- /dev/null
+++ b/bt5/erp5_simulation/ActionTemplateItem/portal_types/Solver%20Process/view.xml
@@ -0,0 +1,85 @@
+<?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> <string></string> </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>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}/SolverProcess_view</string> </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+</ZopeData>
diff --git a/bt5/erp5_simulation/ActionTemplateItem/portal_solvers/Quantity%20Split%20Solver/view.xml b/bt5/erp5_simulation/ActionTemplateItem/portal_types/Solver%20Tool/view.xml
similarity index 90%
rename from bt5/erp5_simulation/ActionTemplateItem/portal_solvers/Quantity%20Split%20Solver/view.xml
rename to bt5/erp5_simulation/ActionTemplateItem/portal_types/Solver%20Tool/view.xml
index f4a6ec433a..0bb9d54b68 100644
--- a/bt5/erp5_simulation/ActionTemplateItem/portal_solvers/Quantity%20Split%20Solver/view.xml
+++ b/bt5/erp5_simulation/ActionTemplateItem/portal_types/Solver%20Tool/view.xml
@@ -53,10 +53,6 @@
               </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>
@@ -83,7 +79,7 @@
       <dictionary>
         <item>
             <key> <string>text</string> </key>
-            <value> <string>string:${object_url}/TargetSolver_view</string> </value>
+            <value> <string>string:${object_url}/TypesTool_viewContentList</string> </value>
         </item>
       </dictionary>
     </pickle>
diff --git a/bt5/erp5_simulation/ActionTemplateItem/portal_types/Solver%20Type/action_view.xml b/bt5/erp5_simulation/ActionTemplateItem/portal_types/Solver%20Type/action_view.xml
new file mode 100644
index 0000000000..894be87e76
--- /dev/null
+++ b/bt5/erp5_simulation/ActionTemplateItem/portal_types/Solver%20Type/action_view.xml
@@ -0,0 +1,91 @@
+<?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>action_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>4.0</float> </value>
+        </item>
+        <item>
+            <key> <string>title</string> </key>
+            <value> <string>Actions</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}/BaseType_viewAction</string> </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+</ZopeData>
diff --git a/bt5/erp5_simulation/ActionTemplateItem/portal_types/Solver%20Type/predicate_view.xml b/bt5/erp5_simulation/ActionTemplateItem/portal_types/Solver%20Type/predicate_view.xml
new file mode 100644
index 0000000000..da90d27781
--- /dev/null
+++ b/bt5/erp5_simulation/ActionTemplateItem/portal_types/Solver%20Type/predicate_view.xml
@@ -0,0 +1,91 @@
+<?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>predicate_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>3.0</float> </value>
+        </item>
+        <item>
+            <key> <string>title</string> </key>
+            <value> <string>Predicate</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}/Predicate_view</string> </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+</ZopeData>
diff --git a/bt5/erp5_simulation/ActionTemplateItem/portal_solvers/Adopt%20Solver/view.xml b/bt5/erp5_simulation/ActionTemplateItem/portal_types/Solver%20Type/role_view.xml
similarity index 90%
rename from bt5/erp5_simulation/ActionTemplateItem/portal_solvers/Adopt%20Solver/view.xml
rename to bt5/erp5_simulation/ActionTemplateItem/portal_types/Solver%20Type/role_view.xml
index f4a6ec433a..2b78d6c59e 100644
--- a/bt5/erp5_simulation/ActionTemplateItem/portal_solvers/Adopt%20Solver/view.xml
+++ b/bt5/erp5_simulation/ActionTemplateItem/portal_types/Solver%20Type/role_view.xml
@@ -43,7 +43,7 @@
         </item>
         <item>
             <key> <string>id</string> </key>
-            <value> <string>view</string> </value>
+            <value> <string>role_view</string> </value>
         </item>
         <item>
             <key> <string>permissions</string> </key>
@@ -59,11 +59,11 @@
         </item>
         <item>
             <key> <string>priority</string> </key>
-            <value> <float>1.0</float> </value>
+            <value> <float>5.0</float> </value>
         </item>
         <item>
             <key> <string>title</string> </key>
-            <value> <string>View</string> </value>
+            <value> <string>Roles</string> </value>
         </item>
         <item>
             <key> <string>visible</string> </key>
@@ -83,7 +83,7 @@
       <dictionary>
         <item>
             <key> <string>text</string> </key>
-            <value> <string>string:${object_url}/TargetSolver_view</string> </value>
+            <value> <string>string:${object_url}/BaseType_viewRole</string> </value>
         </item>
       </dictionary>
     </pickle>
diff --git a/bt5/erp5_simulation/ActionTemplateItem/portal_solvers/Quantity%20Cancel%20Solver/configuration.xml b/bt5/erp5_simulation/ActionTemplateItem/portal_types/Solver%20Type/solver_view.xml
similarity index 86%
rename from bt5/erp5_simulation/ActionTemplateItem/portal_solvers/Quantity%20Cancel%20Solver/configuration.xml
rename to bt5/erp5_simulation/ActionTemplateItem/portal_types/Solver%20Type/solver_view.xml
index 4c964274bc..62e03be33c 100644
--- a/bt5/erp5_simulation/ActionTemplateItem/portal_solvers/Quantity%20Cancel%20Solver/configuration.xml
+++ b/bt5/erp5_simulation/ActionTemplateItem/portal_types/Solver%20Type/solver_view.xml
@@ -20,6 +20,7 @@
             <value>
               <tuple>
                 <string>action_type/object_view</string>
+                <string>portal_types/Tester Type/7</string>
               </tuple>
             </value>
         </item>
@@ -33,9 +34,7 @@
         </item>
         <item>
             <key> <string>description</string> </key>
-            <value>
-              <none/>
-            </value>
+            <value> <string>Provides access to common tester properties.</string> </value>
         </item>
         <item>
             <key> <string>icon</string> </key>
@@ -43,7 +42,7 @@
         </item>
         <item>
             <key> <string>id</string> </key>
-            <value> <string>configuration</string> </value>
+            <value> <string>solver_view</string> </value>
         </item>
         <item>
             <key> <string>permissions</string> </key>
@@ -63,7 +62,7 @@
         </item>
         <item>
             <key> <string>title</string> </key>
-            <value> <string>Configuration</string> </value>
+            <value> <string>Solver Configuration</string> </value>
         </item>
         <item>
             <key> <string>visible</string> </key>
@@ -83,7 +82,7 @@
       <dictionary>
         <item>
             <key> <string>text</string> </key>
-            <value> <string>string:${object_url}/Solver_viewConfiguration</string> </value>
+            <value> <string>string:${object_url}/SolverType_viewConfiguration</string> </value>
         </item>
       </dictionary>
     </pickle>
diff --git a/bt5/erp5_simulation/ActionTemplateItem/portal_solvers/Accept%20Solver/configuration.xml b/bt5/erp5_simulation/ActionTemplateItem/portal_types/Solver%20Type/translation_view.xml
similarity index 90%
rename from bt5/erp5_simulation/ActionTemplateItem/portal_solvers/Accept%20Solver/configuration.xml
rename to bt5/erp5_simulation/ActionTemplateItem/portal_types/Solver%20Type/translation_view.xml
index 4c964274bc..79c5df70b8 100644
--- a/bt5/erp5_simulation/ActionTemplateItem/portal_solvers/Accept%20Solver/configuration.xml
+++ b/bt5/erp5_simulation/ActionTemplateItem/portal_types/Solver%20Type/translation_view.xml
@@ -43,7 +43,7 @@
         </item>
         <item>
             <key> <string>id</string> </key>
-            <value> <string>configuration</string> </value>
+            <value> <string>translation_view</string> </value>
         </item>
         <item>
             <key> <string>permissions</string> </key>
@@ -59,11 +59,11 @@
         </item>
         <item>
             <key> <string>priority</string> </key>
-            <value> <float>2.0</float> </value>
+            <value> <float>6.0</float> </value>
         </item>
         <item>
             <key> <string>title</string> </key>
-            <value> <string>Configuration</string> </value>
+            <value> <string>Translations</string> </value>
         </item>
         <item>
             <key> <string>visible</string> </key>
@@ -83,7 +83,7 @@
       <dictionary>
         <item>
             <key> <string>text</string> </key>
-            <value> <string>string:${object_url}/Solver_viewConfiguration</string> </value>
+            <value> <string>string:${object_url}/BaseType_viewTranslation</string> </value>
         </item>
       </dictionary>
     </pickle>
diff --git a/bt5/erp5_simulation/ActionTemplateItem/portal_types/Solver%20Type/update_local_roles.xml b/bt5/erp5_simulation/ActionTemplateItem/portal_types/Solver%20Type/update_local_roles.xml
new file mode 100644
index 0000000000..6c03a6dc4c
--- /dev/null
+++ b/bt5/erp5_simulation/ActionTemplateItem/portal_types/Solver%20Type/update_local_roles.xml
@@ -0,0 +1,91 @@
+<?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_action</string>
+              </tuple>
+            </value>
+        </item>
+        <item>
+            <key> <string>category</string> </key>
+            <value> <string>object_action</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>update_local_roles</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>Update Local Roles</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}/updateRoleMapping</string> </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+</ZopeData>
diff --git a/bt5/erp5_simulation/ActionTemplateItem/portal_solvers/Quantity%20Cancel%20Solver/view.xml b/bt5/erp5_simulation/ActionTemplateItem/portal_types/Solver%20Type/view.xml
similarity index 96%
rename from bt5/erp5_simulation/ActionTemplateItem/portal_solvers/Quantity%20Cancel%20Solver/view.xml
rename to bt5/erp5_simulation/ActionTemplateItem/portal_types/Solver%20Type/view.xml
index f4a6ec433a..1cd5eabc00 100644
--- a/bt5/erp5_simulation/ActionTemplateItem/portal_solvers/Quantity%20Cancel%20Solver/view.xml
+++ b/bt5/erp5_simulation/ActionTemplateItem/portal_types/Solver%20Type/view.xml
@@ -83,7 +83,7 @@
       <dictionary>
         <item>
             <key> <string>text</string> </key>
-            <value> <string>string:${object_url}/TargetSolver_view</string> </value>
+            <value> <string>string:${object_url}/SolverType_view</string> </value>
         </item>
       </dictionary>
     </pickle>
diff --git a/bt5/erp5_simulation/PortalTypeAllowedContentTypeTemplateItem/allowed_content_types.xml b/bt5/erp5_simulation/PortalTypeAllowedContentTypeTemplateItem/allowed_content_types.xml
index 71b6e69b12..81cd7d1979 100644
--- a/bt5/erp5_simulation/PortalTypeAllowedContentTypeTemplateItem/allowed_content_types.xml
+++ b/bt5/erp5_simulation/PortalTypeAllowedContentTypeTemplateItem/allowed_content_types.xml
@@ -56,15 +56,17 @@
   <item>Variation Divergence Tester</item>
  </portal_type>
  <portal_type id="Solver Process">
-  <item>Accept Solver</item>
-  <item>Adopt Solver</item>
-  <item>FIFO Delivery Solver</item>
-  <item>LIFO Delivery Solver</item>
-  <item>Minimise Price Delivery Solver</item>
-  <item>Production Reduction Solver</item>
-  <item>Quantity Split Solver</item>
-  <item>Trade Model Solver</item>
-  <item>Unify Solver</item>
+  <item>Solver Decision</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>
diff --git a/bt5/erp5_simulation/PortalTypeTemplateItem/portal_solvers/Accept%20Solver.xml b/bt5/erp5_simulation/PortalTypeTemplateItem/portal_solvers/Accept%20Solver.xml
deleted file mode 100644
index 43f494d20a..0000000000
--- a/bt5/erp5_simulation/PortalTypeTemplateItem/portal_solvers/Accept%20Solver.xml
+++ /dev/null
@@ -1,83 +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_viewConfigurationFormBox</string> </value>
-        </item>
-        <item>
-            <key> <string>configuration_property_list</string> </key>
-            <value>
-              <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>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_groupable</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 value</string> </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
-</ZopeData>
diff --git a/bt5/erp5_simulation/PortalTypeTemplateItem/portal_solvers/Production%20Reduction%20Solver.xml b/bt5/erp5_simulation/PortalTypeTemplateItem/portal_solvers/Production%20Reduction%20Solver.xml
deleted file mode 100644
index 50145d8846..0000000000
--- a/bt5/erp5_simulation/PortalTypeTemplateItem/portal_solvers/Production%20Reduction%20Solver.xml
+++ /dev/null
@@ -1,69 +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>QuantitySplit_viewConfigurationFormBox</string> </value>
-        </item>
-        <item>
-            <key> <string>description</string> </key>
-            <value> <string>The Production Reduction Solver reduces the production in order to comply with the reduced amount of sourced goods at the workshop.</string> </value>
-        </item>
-        <item>
-            <key> <string>factory</string> </key>
-            <value> <string>addProductionReductionSolver</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>Production Reduction Solver</string> </value>
-        </item>
-        <item>
-            <key> <string>init_script</string> </key>
-            <value>
-              <none/>
-            </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>Split and Differ</string> </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
-</ZopeData>
diff --git a/bt5/erp5_simulation/PortalTypeTemplateItem/portal_solvers/Quantity%20Cancel%20Solver.xml b/bt5/erp5_simulation/PortalTypeTemplateItem/portal_solvers/Quantity%20Cancel%20Solver.xml
deleted file mode 100644
index 49dc774ef5..0000000000
--- a/bt5/erp5_simulation/PortalTypeTemplateItem/portal_solvers/Quantity%20Cancel%20Solver.xml
+++ /dev/null
@@ -1,83 +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_viewConfigurationFormBox</string> </value>
-        </item>
-        <item>
-            <key> <string>configuration_property_list</string> </key>
-            <value>
-              <tuple/>
-            </value>
-        </item>
-        <item>
-            <key> <string>description</string> </key>
-            <value> <string>The Quantity Cancel Solver is used to cancel the delivery of part of a shipment and prevent any further expand on the parent to generate changes. (as long the expanded quantity does not change)</string> </value>
-        </item>
-        <item>
-            <key> <string>factory</string> </key>
-            <value> <string>addQuantityCancelSolver</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>Quantity Cancel 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_groupable</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>Cancel Quantity</string> </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
-</ZopeData>
diff --git a/bt5/erp5_simulation/PortalTypeTemplateItem/portal_solvers/Quantity%20Split%20Solver.xml b/bt5/erp5_simulation/PortalTypeTemplateItem/portal_solvers/Quantity%20Split%20Solver.xml
deleted file mode 100644
index ef5cae487f..0000000000
--- a/bt5/erp5_simulation/PortalTypeTemplateItem/portal_solvers/Quantity%20Split%20Solver.xml
+++ /dev/null
@@ -1,99 +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>automatic_solver</string> </key>
-            <value> <int>0</int> </value>
-        </item>
-        <item>
-            <key> <string>categories</string> </key>
-            <value>
-              <tuple>
-                <string>delivery_solver/portal_solvers/FIFO Delivery Solver</string>
-                <string>delivery_solver/portal_solvers/LIFO Delivery Solver</string>
-                <string>delivery_solver/portal_solvers/Minimise Price Delivery Solver</string>
-              </tuple>
-            </value>
-        </item>
-        <item>
-            <key> <string>configuration_form_id</string> </key>
-            <value> <string>QuantitySplitSolver_viewConfigurationFormBox</string> </value>
-        </item>
-        <item>
-            <key> <string>configuration_groupable</string> </key>
-            <value> <int>0</int> </value>
-        </item>
-        <item>
-            <key> <string>configuration_property_list</string> </key>
-            <value>
-              <tuple/>
-            </value>
-        </item>
-        <item>
-            <key> <string>description</string> </key>
-            <value> <string>The Quantity Split Solver splits a simulation movement into multiple simulation movements in order to defer the delivery of remaining quantities.</string> </value>
-        </item>
-        <item>
-            <key> <string>factory</string> </key>
-            <value> <string>addQuantitySplitSolver</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>Quantity Split 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_groupable</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>process_exclusive</string> </key>
-            <value> <int>0</int> </value>
-        </item>
-        <item>
-            <key> <string>solver_action_title</string> </key>
-            <value> <string>Split and Differ</string> </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
-</ZopeData>
diff --git a/bt5/erp5_simulation/PortalTypeTemplateItem/portal_solvers/Trade%20Model%20Solver.xml b/bt5/erp5_simulation/PortalTypeTemplateItem/portal_solvers/Trade%20Model%20Solver.xml
deleted file mode 100644
index 16b573d11a..0000000000
--- a/bt5/erp5_simulation/PortalTypeTemplateItem/portal_solvers/Trade%20Model%20Solver.xml
+++ /dev/null
@@ -1,173 +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>_property_domain_dict</string> </key>
-            <value>
-              <dictionary>
-                <item>
-                    <key> <string>short_title</string> </key>
-                    <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
-                    </value>
-                </item>
-                <item>
-                    <key> <string>title</string> </key>
-                    <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
-                    </value>
-                </item>
-              </dictionary>
-            </value>
-        </item>
-        <item>
-            <key> <string>acquire_local_roles</string> </key>
-            <value> <int>1</int> </value>
-        </item>
-        <item>
-            <key> <string>categories</string> </key>
-            <value>
-              <tuple>
-                <string>conflicting_solver/portal_solvers/Accept Solver</string>
-              </tuple>
-            </value>
-        </item>
-        <item>
-            <key> <string>configuration_form_id</string> </key>
-            <value> <string>Solver_viewConfigurationFormBox</string> </value>
-        </item>
-        <item>
-            <key> <string>configuration_groupable</string> </key>
-            <value> <int>0</int> </value>
-        </item>
-        <item>
-            <key> <string>configuration_property_list</string> </key>
-            <value>
-              <tuple/>
-            </value>
-        </item>
-        <item>
-            <key> <string>content_icon</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
-        <item>
-            <key> <string>contributor_list</string> </key>
-            <value>
-              <tuple/>
-            </value>
-        </item>
-        <item>
-            <key> <string>description</string> </key>
-            <value> <string>The Trade Model Solver solves a quantity divergence on an delivery line by accepting the decision and updating a simulation movement, and also updates trade model related movements.\n
-It must be used as a solver for quantity divergence on input lines.</string> </value>
-        </item>
-        <item>
-            <key> <string>factory</string> </key>
-            <value> <string>addTradeModelSolver</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>Trade Model 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_groupable</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>process_exclusive</string> </key>
-            <value> <int>0</int> </value>
-        </item>
-        <item>
-            <key> <string>solver_action_title</string> </key>
-            <value> <string>Accept values from Invoice Line and recalculate Trade Model related Invoice Lines</string> </value>
-        </item>
-        <item>
-            <key> <string>tested_property</string> </key>
-            <value>
-              <tuple>
-                <string>quantity</string>
-              </tuple>
-            </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
-  <record id="2" aka="AAAAAAAAAAI=">
-    <pickle>
-      <tuple>
-        <global name="TranslationInformation" module="Products.ERP5Type.TranslationProviderBase"/>
-        <tuple/>
-      </tuple>
-    </pickle>
-    <pickle>
-      <dictionary>
-        <item>
-            <key> <string>domain_name</string> </key>
-            <value> <string>erp5_content</string> </value>
-        </item>
-        <item>
-            <key> <string>property_name</string> </key>
-            <value> <string>short_title</string> </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
-  <record id="3" aka="AAAAAAAAAAM=">
-    <pickle>
-      <tuple>
-        <global name="TranslationInformation" module="Products.ERP5Type.TranslationProviderBase"/>
-        <tuple/>
-      </tuple>
-    </pickle>
-    <pickle>
-      <dictionary>
-        <item>
-            <key> <string>domain_name</string> </key>
-            <value> <string>erp5_content</string> </value>
-        </item>
-        <item>
-            <key> <string>property_name</string> </key>
-            <value> <string>title</string> </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
-</ZopeData>
diff --git a/bt5/erp5_simulation/PortalTypeTemplateItem/portal_solvers/Unify%20Solver.xml b/bt5/erp5_simulation/PortalTypeTemplateItem/portal_solvers/Unify%20Solver.xml
deleted file mode 100644
index 7f98faf377..0000000000
--- a/bt5/erp5_simulation/PortalTypeTemplateItem/portal_solvers/Unify%20Solver.xml
+++ /dev/null
@@ -1,162 +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>_property_domain_dict</string> </key>
-            <value>
-              <dictionary>
-                <item>
-                    <key> <string>short_title</string> </key>
-                    <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
-                    </value>
-                </item>
-                <item>
-                    <key> <string>title</string> </key>
-                    <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
-                    </value>
-                </item>
-              </dictionary>
-            </value>
-        </item>
-        <item>
-            <key> <string>acquire_local_roles</string> </key>
-            <value> <int>1</int> </value>
-        </item>
-        <item>
-            <key> <string>automatic_solver</string> </key>
-            <value> <int>0</int> </value>
-        </item>
-        <item>
-            <key> <string>categories</string> </key>
-            <value>
-              <tuple/>
-            </value>
-        </item>
-        <item>
-            <key> <string>configuration_form_id</string> </key>
-            <value> <string>UnifySolver_viewConfigurationFormBox</string> </value>
-        </item>
-        <item>
-            <key> <string>configuration_groupable</string> </key>
-            <value> <int>0</int> </value>
-        </item>
-        <item>
-            <key> <string>configuration_property_list</string> </key>
-            <value>
-              <tuple/>
-            </value>
-        </item>
-        <item>
-            <key> <string>configuration_property_list_dict_method_id</string> </key>
-            <value> <string>UnifySolver_getConfigurationPropertyListDict</string> </value>
-        </item>
-        <item>
-            <key> <string>default_configuration_property_dict_method_id</string> </key>
-            <value> <string>UnifySolver_getDefaultConfigurationPropertyDict</string> </value>
-        </item>
-        <item>
-            <key> <string>description</string> </key>
-            <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>
-            <value> <string>addUnifySolver</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>Unify 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_groupable</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>process_exclusive</string> </key>
-            <value> <int>0</int> </value>
-        </item>
-        <item>
-            <key> <string>solver_action_title</string> </key>
-            <value> <string>Unify value</string> </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
-  <record id="2" aka="AAAAAAAAAAI=">
-    <pickle>
-      <tuple>
-        <global name="TranslationInformation" module="Products.ERP5Type.TranslationProviderBase"/>
-        <tuple/>
-      </tuple>
-    </pickle>
-    <pickle>
-      <dictionary>
-        <item>
-            <key> <string>domain_name</string> </key>
-            <value> <string>erp5_content</string> </value>
-        </item>
-        <item>
-            <key> <string>property_name</string> </key>
-            <value> <string>short_title</string> </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
-  <record id="3" aka="AAAAAAAAAAM=">
-    <pickle>
-      <tuple>
-        <global name="TranslationInformation" module="Products.ERP5Type.TranslationProviderBase"/>
-        <tuple/>
-      </tuple>
-    </pickle>
-    <pickle>
-      <dictionary>
-        <item>
-            <key> <string>domain_name</string> </key>
-            <value> <string>erp5_content</string> </value>
-        </item>
-        <item>
-            <key> <string>property_name</string> </key>
-            <value> <string>title</string> </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
-</ZopeData>
diff --git a/bt5/erp5_simulation/PortalTypeTemplateItem/portal_solvers/Adopt%20Solver.xml b/bt5/erp5_simulation/PortalTypeTemplateItem/portal_types/Solver%20Decision.xml
similarity index 69%
rename from bt5/erp5_simulation/PortalTypeTemplateItem/portal_solvers/Adopt%20Solver.xml
rename to bt5/erp5_simulation/PortalTypeTemplateItem/portal_types/Solver%20Decision.xml
index 607f042ee1..ad8f4a5267 100644
--- a/bt5/erp5_simulation/PortalTypeTemplateItem/portal_solvers/Adopt%20Solver.xml
+++ b/bt5/erp5_simulation/PortalTypeTemplateItem/portal_types/Solver%20Decision.xml
@@ -3,7 +3,7 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <global name="SolverTypeInformation" module="Products.ERP5Type.Document.SolverTypeInformation"/>
+        <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
         <tuple/>
       </tuple>
     </pickle>
@@ -33,34 +33,25 @@
             <value> <int>1</int> </value>
         </item>
         <item>
-            <key> <string>categories</string> </key>
-            <value>
-              <tuple/>
-            </value>
+            <key> <string>content_icon</string> </key>
+            <value> <string>document_icon.gif</string> </value>
         </item>
         <item>
-            <key> <string>configuration_form_id</string> </key>
-            <value> <string>Solver_viewConfigurationFormBox</string> </value>
+            <key> <string>content_meta_type</string> </key>
+            <value> <string>ERP5 Solver Decision</string> </value>
         </item>
         <item>
             <key> <string>description</string> </key>
-            <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>
+            <value> <string>A Solver Decision defines which delivery movements are solved using which solvers. Solver Dcision will support all property sheets which are supported also by a Target Solver, so that it can hold decision information.\r\n
+</string> </value>
         </item>
         <item>
             <key> <string>factory</string> </key>
-            <value> <string>addAdoptSolver</string> </value>
-        </item>
-        <item>
-            <key> <string>group_list</string> </key>
-            <value>
-              <tuple>
-                <string>target_solver</string>
-              </tuple>
-            </value>
+            <value> <string>addSolverDecision</string> </value>
         </item>
         <item>
             <key> <string>id</string> </key>
-            <value> <string>Adopt Solver</string> </value>
+            <value> <string>Solver Decision</string> </value>
         </item>
         <item>
             <key> <string>init_script</string> </key>
@@ -74,14 +65,6 @@
               <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 value</string> </value>
-        </item>
       </dictionary>
     </pickle>
   </record>
diff --git a/bt5/erp5_simulation/PortalTypeTemplateItem/portal_solvers/LIFO%20Delivery%20Solver.xml b/bt5/erp5_simulation/PortalTypeTemplateItem/portal_types/Solver%20Process%20Tool.xml
similarity index 75%
rename from bt5/erp5_simulation/PortalTypeTemplateItem/portal_solvers/LIFO%20Delivery%20Solver.xml
rename to bt5/erp5_simulation/PortalTypeTemplateItem/portal_types/Solver%20Process%20Tool.xml
index 245672af40..7f20399c8a 100644
--- a/bt5/erp5_simulation/PortalTypeTemplateItem/portal_solvers/LIFO%20Delivery%20Solver.xml
+++ b/bt5/erp5_simulation/PortalTypeTemplateItem/portal_types/Solver%20Process%20Tool.xml
@@ -3,7 +3,7 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <global name="SolverTypeInformation" module="Products.ERP5Type.Document.SolverTypeInformation"/>
+        <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
         <tuple/>
       </tuple>
     </pickle>
@@ -30,33 +30,39 @@
         </item>
         <item>
             <key> <string>acquire_local_roles</string> </key>
-            <value> <int>1</int> </value>
+            <value> <int>0</int> </value>
         </item>
         <item>
-            <key> <string>categories</string> </key>
-            <value>
-              <tuple/>
-            </value>
+            <key> <string>content_icon</string> </key>
+            <value> <string>folder_icon.gif</string> </value>
+        </item>
+        <item>
+            <key> <string>content_meta_type</string> </key>
+            <value> <string>ERP5 Solver Tool</string> </value>
         </item>
         <item>
             <key> <string>description</string> </key>
-            <value> <string>The LIFO solver reduces delivered quantity by reducing the quantity of simulation movements from the last order.</string> </value>
+            <value> <string>Solver Process Tool contains Solver Processes</string> </value>
         </item>
         <item>
             <key> <string>factory</string> </key>
-            <value> <string>addLIFODeliverySolver</string> </value>
+            <value> <string>addFolder</string> </value>
+        </item>
+        <item>
+            <key> <string>filter_content_types</string> </key>
+            <value> <int>1</int> </value>
         </item>
         <item>
             <key> <string>group_list</string> </key>
             <value>
               <tuple>
-                <string>delivery_solver</string>
+                <string>module</string>
               </tuple>
             </value>
         </item>
         <item>
             <key> <string>id</string> </key>
-            <value> <string>LIFO Delivery Solver</string> </value>
+            <value> <string>Solver Process Tool</string> </value>
         </item>
         <item>
             <key> <string>init_script</string> </key>
@@ -71,12 +77,8 @@
             </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>Last In, First Out</string> </value>
+            <key> <string>title</string> </key>
+            <value> <string></string> </value>
         </item>
       </dictionary>
     </pickle>
@@ -92,7 +94,7 @@
       <dictionary>
         <item>
             <key> <string>domain_name</string> </key>
-            <value> <string>erp5_content</string> </value>
+            <value> <string>erp5_ui</string> </value>
         </item>
         <item>
             <key> <string>property_name</string> </key>
@@ -112,7 +114,7 @@
       <dictionary>
         <item>
             <key> <string>domain_name</string> </key>
-            <value> <string>erp5_content</string> </value>
+            <value> <string>erp5_ui</string> </value>
         </item>
         <item>
             <key> <string>property_name</string> </key>
diff --git a/bt5/erp5_simulation/PortalTypeTemplateItem/portal_solvers/FIFO%20Delivery%20Solver.xml b/bt5/erp5_simulation/PortalTypeTemplateItem/portal_types/Solver%20Process.xml
similarity index 77%
rename from bt5/erp5_simulation/PortalTypeTemplateItem/portal_solvers/FIFO%20Delivery%20Solver.xml
rename to bt5/erp5_simulation/PortalTypeTemplateItem/portal_types/Solver%20Process.xml
index 671ea4cfc5..13b21a2ebc 100644
--- a/bt5/erp5_simulation/PortalTypeTemplateItem/portal_solvers/FIFO%20Delivery%20Solver.xml
+++ b/bt5/erp5_simulation/PortalTypeTemplateItem/portal_types/Solver%20Process.xml
@@ -3,7 +3,7 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <global name="SolverTypeInformation" module="Products.ERP5Type.Document.SolverTypeInformation"/>
+        <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
         <tuple/>
       </tuple>
     </pickle>
@@ -30,33 +30,37 @@
         </item>
         <item>
             <key> <string>acquire_local_roles</string> </key>
-            <value> <int>1</int> </value>
+            <value> <int>0</int> </value>
         </item>
         <item>
-            <key> <string>categories</string> </key>
-            <value>
-              <tuple/>
-            </value>
+            <key> <string>content_icon</string> </key>
+            <value> <string>document_icon.gif</string> </value>
+        </item>
+        <item>
+            <key> <string>content_meta_type</string> </key>
+            <value> <string>ERP5 Solver Process</string> </value>
         </item>
         <item>
             <key> <string>description</string> </key>
-            <value> <string>The FIFO solver reduces delivered quantity by reducing the quantity of simulation movements from the last order.</string> </value>
+            <value> <string>A Solver Process is a document which stored a collection of solver decisions and provides a persistency area to solvers which are in charge of implementing the decision.</string> </value>
         </item>
         <item>
             <key> <string>factory</string> </key>
-            <value> <string>addFIFODeliverySolver</string> </value>
+            <value> <string>addSolverProcess</string> </value>
+        </item>
+        <item>
+            <key> <string>filter_content_types</string> </key>
+            <value> <int>1</int> </value>
         </item>
         <item>
             <key> <string>group_list</string> </key>
             <value>
-              <tuple>
-                <string>delivery_solver</string>
-              </tuple>
+              <tuple/>
             </value>
         </item>
         <item>
             <key> <string>id</string> </key>
-            <value> <string>FIFO Delivery Solver</string> </value>
+            <value> <string>Solver Process</string> </value>
         </item>
         <item>
             <key> <string>init_script</string> </key>
@@ -71,12 +75,8 @@
             </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>First In, First Out</string> </value>
+            <key> <string>title</string> </key>
+            <value> <string></string> </value>
         </item>
       </dictionary>
     </pickle>
diff --git a/bt5/erp5_simulation/PortalTypeTemplateItem/portal_solvers/Minimise%20Price%20Delivery%20Solver.xml b/bt5/erp5_simulation/PortalTypeTemplateItem/portal_types/Solver%20Tool.xml
similarity index 75%
rename from bt5/erp5_simulation/PortalTypeTemplateItem/portal_solvers/Minimise%20Price%20Delivery%20Solver.xml
rename to bt5/erp5_simulation/PortalTypeTemplateItem/portal_types/Solver%20Tool.xml
index 5bb4f254b5..dbb89fe999 100644
--- a/bt5/erp5_simulation/PortalTypeTemplateItem/portal_solvers/Minimise%20Price%20Delivery%20Solver.xml
+++ b/bt5/erp5_simulation/PortalTypeTemplateItem/portal_types/Solver%20Tool.xml
@@ -3,7 +3,7 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <global name="SolverTypeInformation" module="Products.ERP5Type.Document.SolverTypeInformation"/>
+        <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
         <tuple/>
       </tuple>
     </pickle>
@@ -30,33 +30,39 @@
         </item>
         <item>
             <key> <string>acquire_local_roles</string> </key>
-            <value> <int>1</int> </value>
+            <value> <int>0</int> </value>
         </item>
         <item>
-            <key> <string>categories</string> </key>
-            <value>
-              <tuple/>
-            </value>
+            <key> <string>content_icon</string> </key>
+            <value> <string>folder_icon.gif</string> </value>
+        </item>
+        <item>
+            <key> <string>content_meta_type</string> </key>
+            <value> <string>ERP5 Solver Tool</string> </value>
         </item>
         <item>
             <key> <string>description</string> </key>
-            <value> <string>The Minimise Price solver reduces delivered quantity by reducing the quantity of simulation movements from the last order.</string> </value>
+            <value> <string>Solver Tool contains Solver Types</string> </value>
         </item>
         <item>
             <key> <string>factory</string> </key>
-            <value> <string>addMinimisePriceDeliverySolver</string> </value>
+            <value> <string>addFolder</string> </value>
+        </item>
+        <item>
+            <key> <string>filter_content_types</string> </key>
+            <value> <int>1</int> </value>
         </item>
         <item>
             <key> <string>group_list</string> </key>
             <value>
               <tuple>
-                <string>delivery_solver</string>
+                <string>module</string>
               </tuple>
             </value>
         </item>
         <item>
             <key> <string>id</string> </key>
-            <value> <string>Minimise Price Delivery Solver</string> </value>
+            <value> <string>Solver Tool</string> </value>
         </item>
         <item>
             <key> <string>init_script</string> </key>
@@ -71,12 +77,8 @@
             </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>Minimise Price</string> </value>
+            <key> <string>title</string> </key>
+            <value> <string></string> </value>
         </item>
       </dictionary>
     </pickle>
@@ -92,7 +94,7 @@
       <dictionary>
         <item>
             <key> <string>domain_name</string> </key>
-            <value> <string>erp5_content</string> </value>
+            <value> <string>erp5_ui</string> </value>
         </item>
         <item>
             <key> <string>property_name</string> </key>
@@ -112,7 +114,7 @@
       <dictionary>
         <item>
             <key> <string>domain_name</string> </key>
-            <value> <string>erp5_content</string> </value>
+            <value> <string>erp5_ui</string> </value>
         </item>
         <item>
             <key> <string>property_name</string> </key>
diff --git a/bt5/erp5_simulation/PortalTypeTemplateItem/portal_types/Solver%20Type.xml b/bt5/erp5_simulation/PortalTypeTemplateItem/portal_types/Solver%20Type.xml
new file mode 100644
index 0000000000..fb21a54c8c
--- /dev/null
+++ b/bt5/erp5_simulation/PortalTypeTemplateItem/portal_types/Solver%20Type.xml
@@ -0,0 +1,102 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <tuple>
+        <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
+        <tuple/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>_property_domain_dict</string> </key>
+            <value>
+              <dictionary>
+                <item>
+                    <key> <string>short_title</string> </key>
+                    <value>
+                      <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+                    </value>
+                </item>
+                <item>
+                    <key> <string>title</string> </key>
+                    <value>
+                      <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
+                    </value>
+                </item>
+              </dictionary>
+            </value>
+        </item>
+        <item>
+            <key> <string>description</string> </key>
+            <value> <string>An abstract Portal Type which is useful to generate Solvers (ex. Target Solvers) and to keep all common properties in a central place. Solver properties include various user interface information, configuration forms, and possibly properties which help to find out incompatible divergence resolution decisions.</string> </value>
+        </item>
+        <item>
+            <key> <string>factory</string> </key>
+            <value> <string>addSolverTypeInformation</string> </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>Solver Type</string> </value>
+        </item>
+        <item>
+            <key> <string>init_script</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>permission</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>portal_type</string> </key>
+            <value> <string>Base Type</string> </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="2" aka="AAAAAAAAAAI=">
+    <pickle>
+      <tuple>
+        <global name="TranslationInformation" module="Products.ERP5Type.TranslationProviderBase"/>
+        <tuple/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>domain_name</string> </key>
+            <value> <string>erp5_content</string> </value>
+        </item>
+        <item>
+            <key> <string>property_name</string> </key>
+            <value> <string>short_title</string> </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="3" aka="AAAAAAAAAAM=">
+    <pickle>
+      <tuple>
+        <global name="TranslationInformation" module="Products.ERP5Type.TranslationProviderBase"/>
+        <tuple/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>domain_name</string> </key>
+            <value> <string>erp5_content</string> </value>
+        </item>
+        <item>
+            <key> <string>property_name</string> </key>
+            <value> <string>title</string> </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+</ZopeData>
diff --git a/bt5/erp5_simulation/PortalTypeWorkflowChainTemplateItem/workflow_chain_type.xml b/bt5/erp5_simulation/PortalTypeWorkflowChainTemplateItem/workflow_chain_type.xml
index c28cd29d77..6748c265a0 100644
--- a/bt5/erp5_simulation/PortalTypeWorkflowChainTemplateItem/workflow_chain_type.xml
+++ b/bt5/erp5_simulation/PortalTypeWorkflowChainTemplateItem/workflow_chain_type.xml
@@ -1,12 +1,4 @@
 <workflow_chain>
- <chain>
-  <type>Accept Solver</type>
-  <workflow>solver_workflow</workflow>
- </chain>
- <chain>
-  <type>Adopt Solver</type>
-  <workflow>solver_workflow</workflow>
- </chain>
  <chain>
   <type>Category Membership Divergence Tester</type>
   <workflow>edit_workflow</workflow>
@@ -24,29 +16,17 @@
   <workflow>edit_workflow</workflow>
  </chain>
  <chain>
-  <type>Production Reduction Solver</type>
-  <workflow>solver_workflow</workflow>
- </chain>
- <chain>
-  <type>Quantity Cancel Solver</type>
-  <workflow>solver_workflow</workflow>
+  <type>Solver Process</type>
+  <workflow>solver_process_workflow</workflow>
  </chain>
  <chain>
-  <type>Quantity Split Solver</type>
-  <workflow>solver_workflow</workflow>
+  <type>Solver Type</type>
+  <workflow>edit_workflow, validation_workflow</workflow>
  </chain>
  <chain>
   <type>String Divergence Tester</type>
   <workflow>edit_workflow</workflow>
  </chain>
- <chain>
-  <type>Trade Model Solver</type>
-  <workflow>solver_workflow</workflow>
- </chain>
- <chain>
-  <type>Unify Solver</type>
-  <workflow>solver_workflow</workflow>
- </chain>
  <chain>
   <type>Variation Divergence Tester</type>
   <workflow>edit_workflow</workflow>
diff --git a/bt5/erp5_simulation/bt/comment b/bt5/erp5_simulation/bt/comment
index af45c89476..e69de29bb2 100644
--- a/bt5/erp5_simulation/bt/comment
+++ b/bt5/erp5_simulation/bt/comment
@@ -1,2 +0,0 @@
-This initial release is for now a placeholder to demonstrate the future structure of divergence testers and simulation in ERP5. Some sample objects are provided in the path to help understanding. They will be later removed.
-TODO: make all solver names uniform
\ No newline at end of file
diff --git a/bt5/erp5_simulation/bt/revision b/bt5/erp5_simulation/bt/revision
index 83248fb9df..b5db9c417a 100644
--- a/bt5/erp5_simulation/bt/revision
+++ b/bt5/erp5_simulation/bt/revision
@@ -1 +1 @@
-142
\ No newline at end of file
+139
\ 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 66b8179fb2..9339859355 100644
--- a/bt5/erp5_simulation/bt/template_action_path_list
+++ b/bt5/erp5_simulation/bt/template_action_path_list
@@ -1,7 +1,3 @@
-Accept Solver | configuration
-Accept Solver | view
-Adopt Solver | configuration
-Adopt Solver | view
 Category Membership Divergence Tester | configuration
 Category Membership Divergence Tester | predicate
 Category Membership Divergence Tester | view
@@ -14,17 +10,21 @@ Float Divergence Tester | view
 Net Converted Quantity Divergence Tester | configuration
 Net Converted Quantity Divergence Tester | predicate
 Net Converted Quantity Divergence Tester | view
-Quantity Cancel Solver | configuration
-Quantity Cancel Solver | view
-Quantity Split Solver | configuration
-Quantity Split Solver | view
+Solver Decision | configuration
+Solver Decision | view
+Solver Process Tool | view
+Solver Process | view
+Solver Tool | view
+Solver Type | action_view
+Solver Type | predicate_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
-Trade Model Solver | configuration
-Trade Model Solver | 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 20289cf3a3..c9357fd833 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,15 +40,11 @@ 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 | Accept Solver
-Solver Process | Adopt Solver
-Solver Process | FIFO Delivery Solver
-Solver Process | LIFO Delivery Solver
-Solver Process | Minimise Price Delivery Solver
-Solver Process | Production Reduction Solver
-Solver Process | Quantity Split Solver
-Solver Process | Trade Model Solver
-Solver Process | Unify Solver
+Solver Process Tool | Solver Process
+Solver Process | Solver Decision
+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 927ce63cc4..61ccc83dd5 100644
--- a/bt5/erp5_simulation/bt/template_portal_type_id_list
+++ b/bt5/erp5_simulation/bt/template_portal_type_id_list
@@ -1,13 +1,11 @@
-Accept Solver
-Adopt Solver
 Category Membership Divergence Tester
 DateTime Divergence Tester
 Float Divergence Tester
 Net Converted Quantity Divergence Tester
-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
 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 599a343a0a..fb8e52234f 100644
--- a/bt5/erp5_simulation/bt/template_portal_type_workflow_chain_list
+++ b/bt5/erp5_simulation/bt/template_portal_type_workflow_chain_list
@@ -1,13 +1,9 @@
-Accept Solver | solver_workflow
-Adopt Solver | solver_workflow
 Category Membership Divergence Tester | edit_workflow
 DateTime Divergence Tester | edit_workflow
 Float Divergence Tester | edit_workflow
 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
+Solver Type | edit_workflow
+Solver Type | validation_workflow
 String Divergence Tester | edit_workflow
-Trade Model Solver | solver_workflow
-Unify Solver | solver_workflow
 Variation Divergence Tester | edit_workflow
\ No newline at end of file
-- 
2.30.9