From cd51e8727380227484408d810e77ff22384e72a5 Mon Sep 17 00:00:00 2001
From: Kazuhiko Shiozaki <kazuhiko@nexedi.com>
Date: Tue, 15 Dec 2009 10:45:22 +0000
Subject: [PATCH] remove bogus Accept Solver and Adopt Solver portal types, but
 add Quantity Accept Solver and Resource Accept Solver.

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@31302 20353a03-c40f-0410-a6d1-a30d3c3de9de
---
 .../configuration.xml                                |  0
 .../view.xml                                         |  0
 .../configuration.xml                                |  0
 .../view.xml                                         |  0
 .../allowed_content_types.xml                        |  4 ++--
 ...t%20Solver.xml => Quantity%20Accept%20Solver.xml} | 10 ++++++----
 ...t%20Solver.xml => Resource%20Accept%20Solver.xml} | 12 +++++++-----
 bt5/erp5_simulation/bt/revision                      |  2 +-
 bt5/erp5_simulation/bt/template_action_path_list     |  6 ++----
 .../template_portal_type_allowed_content_type_list   |  4 ++--
 bt5/erp5_simulation/bt/template_portal_type_id_list  |  3 +--
 11 files changed, 21 insertions(+), 20 deletions(-)
 rename bt5/erp5_simulation/ActionTemplateItem/portal_types/{Accept%20Solver => Quantity%20Accept%20Solver}/configuration.xml (100%)
 rename bt5/erp5_simulation/ActionTemplateItem/portal_types/{Accept%20Solver => Quantity%20Accept%20Solver}/view.xml (100%)
 rename bt5/erp5_simulation/ActionTemplateItem/portal_types/{Adopt%20Solver => Resource%20Accept%20Solver}/configuration.xml (100%)
 rename bt5/erp5_simulation/ActionTemplateItem/portal_types/{Adopt%20Solver => Resource%20Accept%20Solver}/view.xml (100%)
 rename bt5/erp5_simulation/PortalTypeTemplateItem/portal_types/{Accept%20Solver.xml => Quantity%20Accept%20Solver.xml} (90%)
 rename bt5/erp5_simulation/PortalTypeTemplateItem/portal_types/{Adopt%20Solver.xml => Resource%20Accept%20Solver.xml} (88%)

diff --git a/bt5/erp5_simulation/ActionTemplateItem/portal_types/Accept%20Solver/configuration.xml b/bt5/erp5_simulation/ActionTemplateItem/portal_types/Quantity%20Accept%20Solver/configuration.xml
similarity index 100%
rename from bt5/erp5_simulation/ActionTemplateItem/portal_types/Accept%20Solver/configuration.xml
rename to bt5/erp5_simulation/ActionTemplateItem/portal_types/Quantity%20Accept%20Solver/configuration.xml
diff --git a/bt5/erp5_simulation/ActionTemplateItem/portal_types/Accept%20Solver/view.xml b/bt5/erp5_simulation/ActionTemplateItem/portal_types/Quantity%20Accept%20Solver/view.xml
similarity index 100%
rename from bt5/erp5_simulation/ActionTemplateItem/portal_types/Accept%20Solver/view.xml
rename to bt5/erp5_simulation/ActionTemplateItem/portal_types/Quantity%20Accept%20Solver/view.xml
diff --git a/bt5/erp5_simulation/ActionTemplateItem/portal_types/Adopt%20Solver/configuration.xml b/bt5/erp5_simulation/ActionTemplateItem/portal_types/Resource%20Accept%20Solver/configuration.xml
similarity index 100%
rename from bt5/erp5_simulation/ActionTemplateItem/portal_types/Adopt%20Solver/configuration.xml
rename to bt5/erp5_simulation/ActionTemplateItem/portal_types/Resource%20Accept%20Solver/configuration.xml
diff --git a/bt5/erp5_simulation/ActionTemplateItem/portal_types/Adopt%20Solver/view.xml b/bt5/erp5_simulation/ActionTemplateItem/portal_types/Resource%20Accept%20Solver/view.xml
similarity index 100%
rename from bt5/erp5_simulation/ActionTemplateItem/portal_types/Adopt%20Solver/view.xml
rename to bt5/erp5_simulation/ActionTemplateItem/portal_types/Resource%20Accept%20Solver/view.xml
diff --git a/bt5/erp5_simulation/PortalTypeAllowedContentTypeTemplateItem/allowed_content_types.xml b/bt5/erp5_simulation/PortalTypeAllowedContentTypeTemplateItem/allowed_content_types.xml
index 237385d662..afdb134ae7 100644
--- a/bt5/erp5_simulation/PortalTypeAllowedContentTypeTemplateItem/allowed_content_types.xml
+++ b/bt5/erp5_simulation/PortalTypeAllowedContentTypeTemplateItem/allowed_content_types.xml
@@ -9,10 +9,10 @@
   <item>New Order Rule</item>
  </portal_type>
  <portal_type id="Solver Process">
-  <item>Accept Solver</item>
-  <item>Adopt Solver</item>
   <item>Production Reduction Solver</item>
+  <item>Quantity Accept Solver</item>
   <item>Quantity Split Solver</item>
+  <item>Resource Accept Solver</item>
   <item>Resource Adoption Solver</item>
   <item>Resource Replacement Solver</item>
   <item>Solver Decision</item>
diff --git a/bt5/erp5_simulation/PortalTypeTemplateItem/portal_types/Accept%20Solver.xml b/bt5/erp5_simulation/PortalTypeTemplateItem/portal_types/Quantity%20Accept%20Solver.xml
similarity index 90%
rename from bt5/erp5_simulation/PortalTypeTemplateItem/portal_types/Accept%20Solver.xml
rename to bt5/erp5_simulation/PortalTypeTemplateItem/portal_types/Quantity%20Accept%20Solver.xml
index ad8d07f9d8..9c446f7314 100644
--- a/bt5/erp5_simulation/PortalTypeTemplateItem/portal_types/Accept%20Solver.xml
+++ b/bt5/erp5_simulation/PortalTypeTemplateItem/portal_types/Quantity%20Accept%20Solver.xml
@@ -57,7 +57,7 @@
         </item>
         <item>
             <key> <string>id</string> </key>
-            <value> <string>Accept Solver</string> </value>
+            <value> <string>Quantity Accept Solver</string> </value>
         </item>
         <item>
             <key> <string>init_script</string> </key>
@@ -85,9 +85,11 @@
         </item>
         <item>
             <key> <string>solver_action_title</string> </key>
-            <value>
-              <none/>
-            </value>
+            <value> <string>Accept new quantity</string> </value>
+        </item>
+        <item>
+            <key> <string>tested_property</string> </key>
+            <value> <string>quantity</string> </value>
         </item>
       </dictionary>
     </pickle>
diff --git a/bt5/erp5_simulation/PortalTypeTemplateItem/portal_types/Adopt%20Solver.xml b/bt5/erp5_simulation/PortalTypeTemplateItem/portal_types/Resource%20Accept%20Solver.xml
similarity index 88%
rename from bt5/erp5_simulation/PortalTypeTemplateItem/portal_types/Adopt%20Solver.xml
rename to bt5/erp5_simulation/PortalTypeTemplateItem/portal_types/Resource%20Accept%20Solver.xml
index b6acce0073..82b469c592 100644
--- a/bt5/erp5_simulation/PortalTypeTemplateItem/portal_types/Adopt%20Solver.xml
+++ b/bt5/erp5_simulation/PortalTypeTemplateItem/portal_types/Resource%20Accept%20Solver.xml
@@ -45,7 +45,7 @@
         </item>
         <item>
             <key> <string>factory</string> </key>
-            <value> <string>addAdoptSolver</string> </value>
+            <value> <string>addAcceptSolver</string> </value>
         </item>
         <item>
             <key> <string>group_list</string> </key>
@@ -57,7 +57,7 @@
         </item>
         <item>
             <key> <string>id</string> </key>
-            <value> <string>Adopt Solver</string> </value>
+            <value> <string>Resource Accept Solver</string> </value>
         </item>
         <item>
             <key> <string>init_script</string> </key>
@@ -85,9 +85,11 @@
         </item>
         <item>
             <key> <string>solver_action_title</string> </key>
-            <value>
-              <none/>
-            </value>
+            <value> <string>Accept new resource</string> </value>
+        </item>
+        <item>
+            <key> <string>tested_property</string> </key>
+            <value> <string>resource</string> </value>
         </item>
       </dictionary>
     </pickle>
diff --git a/bt5/erp5_simulation/bt/revision b/bt5/erp5_simulation/bt/revision
index 410b14d2ce..978b4e8e51 100644
--- a/bt5/erp5_simulation/bt/revision
+++ b/bt5/erp5_simulation/bt/revision
@@ -1 +1 @@
-25
\ No newline at end of file
+26
\ 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 c56456120f..c6c0d6f256 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
@@ -12,6 +8,8 @@ Float Divergence Tester | configuration
 Float Divergence Tester | predicate
 Float Divergence Tester | view
 New Order Rule | view
+Quantity Accept Solver | configuration
+Quantity Accept Solver | view
 Quantity Cancel Solver | configuration
 Quantity Cancel Solver | view
 Quantity Split Solver | configuration
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 a6efdfa694..02af97ff1c 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
@@ -3,10 +3,10 @@ New Order Rule | DateTime Divergence Tester
 New Order Rule | Float Divergence Tester
 New Order Rule | String Divergence Tester
 Rule Tool | New Order Rule
-Solver Process | Accept Solver
-Solver Process | Adopt Solver
 Solver Process | Production Reduction Solver
+Solver Process | Quantity Accept Solver
 Solver Process | Quantity Split Solver
+Solver Process | Resource Accept Solver
 Solver Process | Resource Adoption Solver
 Solver Process | Resource Replacement Solver
 Solver Process | Solver Decision
diff --git a/bt5/erp5_simulation/bt/template_portal_type_id_list b/bt5/erp5_simulation/bt/template_portal_type_id_list
index 588f382b25..b369dea0d4 100644
--- a/bt5/erp5_simulation/bt/template_portal_type_id_list
+++ b/bt5/erp5_simulation/bt/template_portal_type_id_list
@@ -1,10 +1,9 @@
-Accept Solver
-Adopt Solver
 Category Membership Divergence Tester
 DateTime Divergence Tester
 Float Divergence Tester
 New Order Rule
 Production Reduction Solver
+Quantity Accept Solver
 Quantity Cancel Solver
 Quantity Split Solver
 Resource Adoption Solver
-- 
2.30.9