rename new simulation rules according to the naming convention.

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@32842 20353a03-c40f-0410-a6d1-a30d3c3de9de

bt5/erp5_invoicing/SkinTemplateItem/portal_skins/erp5_invoicing/SimulationMovement_testInvoicingRule.xml

@@ -59,11 +59,11 @@ parent = movement.getParentValue()\n
 if parent.getPortalType() == \'Applied Rule\':\n
   parent_rule = parent.getSpecialiseValue()\n
   parent_rule_portal_type = parent_rule.getPortalType()\n
-  if parent_rule_portal_type not in [\'Order Rule\', \'Delivery Rule\', \'Delivering Simulation Rule\']:\n
+  if parent_rule_portal_type not in [\'Order Rule\', \'Delivery Rule\', \'Delivery Simulation Rule\']:\n
     return False\n
   # XXX can we create invoicing rule for Production Order?\n
-  if parent_rule_portal_type in [\'Delivering Simulation Rule\',] and \\\n
-      parent.getParentValue().getParentValue().getSpecialiseValue().getPortalType() not in [\'Order Simulation Rule\']:\n
+  if parent_rule_portal_type in [\'Delivery Simulation Rule\',] and \\\n
+      parent.getParentValue().getParentValue().getSpecialiseValue().getPortalType() not in [\'Order Root Simulation Rule\']:\n
     return False\n
 \n
 source_section = movement.getSourceSection()\n

bt5/erp5_invoicing/bt/revision

-334
+335
\ No newline at end of file

bt5/erp5_legacy_tax_system/SkinTemplateItem/portal_skins/erp5_legacy_tax_system/SimulationMovement_testTaxRule.xml

@@ -59,11 +59,11 @@ parent = movement.getParentValue()\n
 if parent.getPortalType() == \'Applied Rule\':\n
   parent_rule = parent.getSpecialiseValue()\n
   parent_rule_portal_type = parent_rule.getPortalType()\n
-  if parent_rule_portal_type not in [\'Order Rule\', \'Delivery Rule\', \'Delivering Simulation Rule\']:\n
+  if parent_rule_portal_type not in [\'Order Rule\', \'Delivery Rule\', \'Delivery Simulation Rule\']:\n
     return False\n
   # XXX can we create tax rule for Production Order?\n
-  if parent_rule_portal_type in [\'Delivering Simulation Rule\',] and \\\n
-      parent.getParentValue().getParentValue().getSpecialiseValue().getPortalType() not in [\'Order Simulation Rule\']:\n
+  if parent_rule_portal_type in [\'Delivery Simulation Rule\',] and \\\n
+      parent.getParentValue().getParentValue().getSpecialiseValue().getPortalType() not in [\'Order Root Simulation Rule\']:\n
     return False\n
 \n
 return True\n

bt5/erp5_legacy_tax_system/bt/revision

-10
+11
\ No newline at end of file

bt5/erp5_mrp/PortalTypeAllowedContentTypeTemplateItem/allowed_content_types.xml

@@ -11,7 +11,7 @@
   <item>Property Divergence Tester</item>
   <item>Quantity Divergence Tester</item>
  </portal_type>
- <portal_type id="Production Order Model Simulation Rule">
+ <portal_type id="Production Order Model Root Simulation Rule">
   <item>Category Divergence Tester</item>
   <item>Property Divergence Tester</item>
   <item>Quantity Divergence Tester</item>
@@ -24,7 +24,7 @@
   <item>Property Divergence Tester</item>
   <item>Quantity Divergence Tester</item>
  </portal_type>
- <portal_type id="Production Order Simulation Rule">
+ <portal_type id="Production Order Root Simulation Rule">
   <item>Category Divergence Tester</item>
   <item>Property Divergence Tester</item>
   <item>Quantity Divergence Tester</item>
@@ -48,10 +48,10 @@
   <item>Production Report</item>
  </portal_type>
  <portal_type id="Rule Tool">
+  <item>Production Order Model Root Simulation Rule</item>
   <item>Production Order Model Rule</item>
-  <item>Production Order Model Simulation Rule</item>
+  <item>Production Order Root Simulation Rule</item>
   <item>Production Order Rule</item>
-  <item>Production Order Simulation Rule</item>
   <item>Transformation Model Rule</item>
   <item>Transformation Rule</item>
   <item>Transformation Sourcing Model Rule</item>

bt5/erp5_mrp/PortalTypeTemplateItem/portal_types/Production%20Order%20Model%20Simulation%20Rule.xml → bt5/erp5_mrp/PortalTypeTemplateItem/portal_types/Production%20Order%20Model%20Root%20Simulation%20Rule.xml

@@ -38,16 +38,16 @@
         </item>
         <item>
             <key> <string>content_meta_type</string> </key>
-            <value> <string>ERP5 Production Order Model Simulation Rule</string> </value>
+            <value> <string>ERP5 Production Order Model Root Simulation Rule</string> </value>
         </item>
         <item>
             <key> <string>description</string> </key>
-            <value> <string>Prouction Order Model Simulation Rule object use a Business Process to expand a Production Order.\n
+            <value> <string>Prouction Order Model Root Simulation Rule object use a Business Process to expand a Production Order.\n
 </string> </value>
         </item>
         <item>
             <key> <string>factory</string> </key>
-            <value> <string>addProductionOrderModelSimulationRule</string> </value>
+            <value> <string>addProductionOrderModelRootSimulationRule</string> </value>
         </item>
         <item>
             <key> <string>filter_content_types</string> </key>
@@ -63,7 +63,7 @@
         </item>
         <item>
             <key> <string>id</string> </key>
-            <value> <string>Production Order Model Simulation Rule</string> </value>
+            <value> <string>Production Order Model Root Simulation Rule</string> </value>
         </item>
         <item>
             <key> <string>immediate_view</string> </key>

bt5/erp5_mrp/PortalTypeTemplateItem/portal_types/Production%20Order%20Simulation%20Rule.xml → bt5/erp5_mrp/PortalTypeTemplateItem/portal_types/Production%20Order%20Root%20Simulation%20Rule.xml

@@ -19,16 +19,16 @@
         </item>
         <item>
             <key> <string>content_meta_type</string> </key>
-            <value> <string>ERP5 Production Order Simulation Rule</string> </value>
+            <value> <string>ERP5 Production Order Root Simulation Rule</string> </value>
         </item>
         <item>
             <key> <string>description</string> </key>
-            <value> <string>Prouction Order Simulation Rule object use a Supply Chain to expand a Production Order.\n
+            <value> <string>Prouction Order Root Simulation Rule object use a Supply Chain to expand a Production Order.\n
 </string> </value>
         </item>
         <item>
             <key> <string>factory</string> </key>
-            <value> <string>addProductionOrderSimulationRule</string> </value>
+            <value> <string>addProductionOrderRootSimulationRule</string> </value>
         </item>
         <item>
             <key> <string>filter_content_types</string> </key>
@@ -44,7 +44,7 @@
         </item>
         <item>
             <key> <string>id</string> </key>
-            <value> <string>Production Order Simulation Rule</string> </value>
+            <value> <string>Production Order Root Simulation Rule</string> </value>
         </item>
         <item>
             <key> <string>immediate_view</string> </key>

bt5/erp5_mrp/PortalTypeWorkflowChainTemplateItem/workflow_chain_type.xml

@@ -16,7 +16,7 @@
   <workflow>rule_validation_workflow, edit_workflow</workflow>
  </chain>
  <chain>
-  <type>Production Order Model Simulation Rule</type>
+  <type>Production Order Model Root Simulation Rule</type>
   <workflow>rule_validation_workflow, edit_workflow</workflow>
  </chain>
  <chain>
@@ -24,7 +24,7 @@
   <workflow>edit_workflow, rule_validation_workflow</workflow>
  </chain>
  <chain>
-  <type>Production Order Simulation Rule</type>
+  <type>Production Order Root Simulation Rule</type>
   <workflow>edit_workflow, rule_validation_workflow</workflow>
  </chain>
  <chain>

bt5/erp5_mrp/SkinTemplateItem/portal_skins/erp5_mrp/SimulationMovement_testTransformationModelRule.xml

@@ -64,7 +64,7 @@ order = root_applied_rule.getCausalityValue()\n
 \n
 # Test movement\n
 if (root_rule is None or\n
-    root_rule.getPortalType() not in ("Production Order Model Rule", "Production Order Model Simulation Rule")  or\n
+    root_rule.getPortalType() not in ("Production Order Model Rule", "Production Order Model Root Simulation Rule")  or\n
     order is None or\n
     movement.getSource() is None):\n
   return False\n

bt5/erp5_mrp/SkinTemplateItem/portal_skins/erp5_mrp/SimulationMovement_testTransformationRule.xml

@@ -72,13 +72,13 @@ root_movement = movement.getRootSimulationMovement()\n
 \n
 # Test movement\n
 if (root_rule is None or\n
-    root_rule.getPortalType() not in ("Production Order Rule", "Production Order Simulation Rule") or\n
+    root_rule.getPortalType() not in ("Production Order Rule", "Production Order Root Simulation Rule") or\n
     order is None or\n
     movement.getResourceValue() is None or\n
     movement.getSourceValue() is None or\n
     movement.getResourceValue() != root_movement.getResourceValue()):\n
   return False\n
-if root_rule.getPortalType() in ("Production Order Simulation Rule",) and\\\n
+if root_rule.getPortalType() in ("Production Order Root Simulation Rule",) and\\\n
     movement.getPath() == root_movement.getPath():\n
   return False\n
 \n

bt5/erp5_mrp/SkinTemplateItem/portal_skins/erp5_mrp/SimulationMovement_testTransformationSourcingModelRule.xml

@@ -65,7 +65,7 @@ parent_rule = movement.getParentValue().getSpecialiseValue()\n
 \n
 # Test movement\n
 if (root_rule is None or\n
-    root_rule.getPortalType() not in ("Production Order Model Rule", "Production Order Model Simulation Rule") or\n
+    root_rule.getPortalType() not in ("Production Order Model Rule", "Production Order Model Root Simulation Rule") or\n
     order is None or\n
     parent_rule.getPortalType() != "Transformation Model Rule"):\n
   return False\n

bt5/erp5_mrp/SkinTemplateItem/portal_skins/erp5_mrp/SimulationMovement_testTransformationSourcingRule.xml

@@ -68,7 +68,7 @@ order = root_applied_rule.getCausalityValue()\n
 \n
 # Test movement\n
 if (root_rule is None or\n
-    root_rule.getPortalType() not in ("Production Order Rule", "Production Order Simulation Rule") or\n
+    root_rule.getPortalType() not in ("Production Order Rule", "Production Order Root Simulation Rule") or\n
     order is None or\n
     movement.getResourceValue() is None or\n
     movement.getSourceValue() is None):\n

bt5/erp5_mrp/SkinTemplateItem/portal_skins/erp5_mrp/TransformationRule_selectMovement.xml

@@ -61,7 +61,7 @@
   parent_rule = parent_applied_rule.getSpecialiseValue()\n
   return (\n
     root_rule.getPortalType() in ("Production Order Rule",\n
-                                  "Production Order Simulation Rule") and\\\n
+                                  "Production Order Root Simulation Rule") and\\\n
     parent_rule.getPortalType() == "Transformation Rule" and\\\n
     root_movement.getSimulationState() == "confirmed"\n
   )\n

bt5/erp5_mrp/SkinTemplateItem/portal_skins/erp5_mrp/TransformationSourcingRule_selectMovement.xml

@@ -63,9 +63,9 @@
     ((root_rule.getPortalType() in ("Production Order Rule",) and\\\n
       parent_rule.getPortalType() in ("Transformation Sourcing Rule",\n
                                       "Production Order Rule")) or\\\n
-     (root_rule.getPortalType() in ("Production Order Simulation Rule",) and\\\n
+     (root_rule.getPortalType() in ("Production Order Root Simulation Rule",) and\\\n
       parent_rule.getPortalType() in ("Transformation Sourcing Rule",\n
-                                      "Delivering Simulation Rule"))) and\\\n
+                                      "Delivery Simulation Rule"))) and\\\n
     root_movement.getSimulationState() == "confirmed"\n
   )\n
 \n

bt5/erp5_mrp/bt/revision

-420
+421
\ No newline at end of file

bt5/erp5_mrp/bt/template_action_path_list

@@ -3,11 +3,11 @@ Production Order Line | price_view
 Production Order Line | quantity_view
 Production Order Line | view
 Production Order Model Rule | view
-Production Order Model Simulation Rule | view
+Production Order Model Root Simulation Rule | view
 Production Order Module | production_order_module_planning
 Production Order Module | view
 Production Order Rule | view
-Production Order Simulation Rule | view
+Production Order Root Simulation Rule | view
 Production Order | jump_to_related_production_packing_list
 Production Order | jump_to_related_production_report
 Production Order | order_print

bt5/erp5_mrp/bt/template_portal_type_allowed_content_type_list

@@ -2,16 +2,16 @@ Production Order Line | Production Order Cell
 Production Order Model Rule | Category Divergence Tester
 Production Order Model Rule | Property Divergence Tester
 Production Order Model Rule | Quantity Divergence Tester
-Production Order Model Simulation Rule | Category Divergence Tester
-Production Order Model Simulation Rule | Property Divergence Tester
-Production Order Model Simulation Rule | Quantity Divergence Tester
+Production Order Model Root Simulation Rule | Category Divergence Tester
+Production Order Model Root Simulation Rule | Property Divergence Tester
+Production Order Model Root Simulation Rule | Quantity Divergence Tester
 Production Order Module | Production Order
 Production Order Rule | Category Divergence Tester
 Production Order Rule | Property Divergence Tester
 Production Order Rule | Quantity Divergence Tester
-Production Order Simulation Rule | Category Divergence Tester
-Production Order Simulation Rule | Property Divergence Tester
-Production Order Simulation Rule | Quantity Divergence Tester
+Production Order Root Simulation Rule | Category Divergence Tester
+Production Order Root Simulation Rule | Property Divergence Tester
+Production Order Root Simulation Rule | Quantity Divergence Tester
 Production Order | Payment Condition
 Production Order | Production Order Line
 Production Packing List Line | Production Packing List Cell
@@ -20,7 +20,9 @@ Production Packing List | Production Packing List Line
 Production Report Line | Production Report Cell
 Production Report Module | Production Report
 Production Report | Production Report Line
+Rule Tool | Production Order Model Root Simulation Rule
 Rule Tool | Production Order Model Rule
+Rule Tool | Production Order Root Simulation Rule
 Rule Tool | Production Order Rule
 Rule Tool | Transformation Model Rule
 Rule Tool | Transformation Rule

bt5/erp5_mrp/bt/template_portal_type_id_list

@@ -2,10 +2,10 @@ Production Order
 Production Order Cell
 Production Order Line
 Production Order Model Rule
-Production Order Model Simulation Rule
+Production Order Model Root Simulation Rule
 Production Order Module
 Production Order Rule
-Production Order Simulation Rule
+Production Order Root Simulation Rule
 Production Packing List
 Production Packing List Cell
 Production Packing List Line

bt5/erp5_mrp/bt/template_portal_type_workflow_chain_list

@@ -6,12 +6,12 @@ Production Order Line | production_matrix_workflow
 Production Order Line | transformation_interaction_workflow
 Production Order Model Rule | edit_workflow
 Production Order Model Rule | rule_validation_workflow
-Production Order Model Simulation Rule | edit_workflow
-Production Order Model Simulation Rule | rule_validation_workflow
+Production Order Model Root Simulation Rule | edit_workflow
+Production Order Model Root Simulation Rule | rule_validation_workflow
 Production Order Rule | edit_workflow
 Production Order Rule | rule_validation_workflow
-Production Order Simulation Rule | edit_workflow
-Production Order Simulation Rule | rule_validation_workflow
+Production Order Root Simulation Rule | edit_workflow
+Production Order Root Simulation Rule | rule_validation_workflow
 Production Order | edit_workflow
 Production Order | order_simulation_interaction_workflow
 Production Order | production_order_workflow

bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Task_selectMovement.xml

@@ -60,7 +60,7 @@ kw[\'query\'] = ComplexQuery(\n
   ComplexQuery(\n
     Query(parent_specialise_portal_type=[\'Order Rule\', \'Delivery Rule\'],\n
           simulation_state=\'confirmed\'),\n
-    Query(parent_specialise_portal_type=\'Delivering Simulation Rule\',\n
+    Query(parent_specialise_portal_type=\'Delivery Simulation Rule\',\n
           grand_parent_simulation_state=\'confirmed\'),\n
     operator=\'or\'),\n
   operator=\'and\')\n

bt5/erp5_project/bt/revision

-733
+734
\ No newline at end of file

bt5/erp5_trade/PortalTypeAllowedContentTypeTemplateItem/allowed_content_types.xml

@@ -13,7 +13,7 @@
  <portal_type id="Container Line">
   <item>Container Cell</item>
  </portal_type>
- <portal_type id="Delivering Simulation Rule">
+ <portal_type id="Delivery Simulation Rule">
   <item>Category Divergence Tester</item>
   <item>Property Divergence Tester</item>
   <item>Quantity Divergence Tester</item>
@@ -49,7 +49,7 @@
   <item>Property Divergence Tester</item>
   <item>Quantity Divergence Tester</item>
  </portal_type>
- <portal_type id="Order Simulation Rule">
+ <portal_type id="Order Root Simulation Rule">
   <item>Category Divergence Tester</item>
   <item>Property Divergence Tester</item>
   <item>Quantity Divergence Tester</item>
@@ -98,8 +98,9 @@
  </portal_type>
  <portal_type id="Rule Tool">
   <item>Delivery Rule</item>
+  <item>Delivery Simulation Rule</item>
   <item>Order Rule</item>
-  <item>Order Simulation Rule</item>
+  <item>Order Root Simulation Rule</item>
  </portal_type>
  <portal_type id="Sale Order">
   <item>Payment Condition</item>

bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Order%20Simulation%20Rule.xml → bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Delivery%20Simulation%20Rule.xml

@@ -19,7 +19,7 @@
         </item>
         <item>
             <key> <string>content_meta_type</string> </key>
-            <value> <string>ERP5 Order Simulation Rule</string> </value>
+            <value> <string>ERP5 Delivery Simulation Rule</string> </value>
         </item>
         <item>
             <key> <string>description</string> </key>
@@ -27,7 +27,7 @@
         </item>
         <item>
             <key> <string>factory</string> </key>
-            <value> <string>addOrderSimulationRule</string> </value>
+            <value> <string>addDeliverySimulationRule</string> </value>
         </item>
         <item>
             <key> <string>filter_content_types</string> </key>
@@ -43,7 +43,7 @@
         </item>
         <item>
             <key> <string>id</string> </key>
-            <value> <string>Order Simulation Rule</string> </value>
+            <value> <string>Delivery Simulation Rule</string> </value>
         </item>
         <item>
             <key> <string>init_script</string> </key>

bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Delivering%20Simulation%20Rule.xml → bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Order%20Root%20Simulation%20Rule.xml

@@ -19,7 +19,7 @@
         </item>
         <item>
             <key> <string>content_meta_type</string> </key>
-            <value> <string>ERP5 Delivering Simulation Rule</string> </value>
+            <value> <string>ERP5 Order Root Simulation Rule</string> </value>
         </item>
         <item>
             <key> <string>description</string> </key>
@@ -27,7 +27,7 @@
         </item>
         <item>
             <key> <string>factory</string> </key>
-            <value> <string>addDeliveringSimulationRule</string> </value>
+            <value> <string>addOrderRootSimulationRule</string> </value>
         </item>
         <item>
             <key> <string>filter_content_types</string> </key>
@@ -43,7 +43,7 @@
         </item>
         <item>
             <key> <string>id</string> </key>
-            <value> <string>Delivering Simulation Rule</string> </value>
+            <value> <string>Order Root Simulation Rule</string> </value>
         </item>
         <item>
             <key> <string>init_script</string> </key>

bt5/erp5_trade/PortalTypeWorkflowChainTemplateItem/workflow_chain_type.xml

@@ -24,7 +24,7 @@
   <workflow>container_interaction_workflow, edit_workflow, pricing_interaction_workflow, trade_matrix_workflow</workflow>
  </chain>
  <chain>
-  <type>Delivering Simulation Rule</type>
+  <type>Delivery Simulation Rule</type>
   <workflow>edit_workflow, rule_validation_workflow</workflow>
  </chain>
  <chain>
@@ -64,7 +64,7 @@
   <workflow>edit_workflow, rule_validation_workflow</workflow>
  </chain>
  <chain>
-  <type>Order Simulation Rule</type>
+  <type>Order Root Simulation Rule</type>
   <workflow>edit_workflow, rule_validation_workflow</workflow>
  </chain>
  <chain>

bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseOrder_selectMovement.xml

@@ -60,7 +60,7 @@ kw[\'query\'] = ComplexQuery(\n
   ComplexQuery(\n
     Query(parent_specialise_portal_type=[\'Order Rule\', \'Delivery Rule\'],\n
           simulation_state=\'confirmed\'),\n
-    Query(parent_specialise_portal_type=\'Delivering Simulation Rule\',\n
+    Query(parent_specialise_portal_type=\'Delivery Simulation Rule\',\n
           grand_parent_simulation_state=\'confirmed\'),\n
     operator=\'or\'),\n
   operator=\'and\')\n

bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleOrder_selectMovement.xml

@@ -60,7 +60,7 @@ kw[\'query\'] = ComplexQuery(\n
   ComplexQuery(\n
     Query(parent_specialise_portal_type=[\'Order Rule\', \'Delivery Rule\'],\n
           simulation_state=\'confirmed\'),\n
-    Query(parent_specialise_portal_type=\'Delivering Simulation Rule\',\n
+    Query(parent_specialise_portal_type=\'Delivery Simulation Rule\',\n
           grand_parent_simulation_state=\'confirmed\'),\n
     operator=\'or\'),\n
   operator=\'and\')\n

bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SimulationMovement_testDeliveringSimulationRule.xml

@@ -58,7 +58,7 @@
 parent = movement.getParentValue()\n
 if parent.getPortalType() == \'Applied Rule\':\n
   parent_rule = parent.getSpecialiseValue()\n
-  if parent_rule.getPortalType() not in [\'Order Simulation Rule\', \'Production Order Simulation Rule\']:\n
+  if parent_rule.getPortalType() not in [\'Order Root Simulation Rule\', \'Production Order Root Simulation Rule\']:\n
     return False\n
 \n
 source_section = movement.getSourceSection()\n

bt5/erp5_trade/bt/revision

-839
+840
\ No newline at end of file

bt5/erp5_trade/bt/template_action_path_list

@@ -8,7 +8,7 @@ Business State | view
 Container Line | view
 Container Line | view_quantity
 Container | view
-Delivering Simulation Rule | view
+Delivery Simulation Rule | view
 Delivery Cell | view
 Delivery Rule | view
 First Causality Movement Group | view
@@ -34,7 +34,7 @@ Inventory Module | view_stock_report
 Inventory | inventory_fast_input
 Inventory | view
 Order Rule | view
-Order Simulation Rule | view
+Order Root Simulation Rule | view
 Organisation | jump_to_purchase_order
 Organisation | jump_to_purchase_packing_list
 Organisation | jump_to_sale_order

bt5/erp5_trade/bt/template_portal_type_allowed_content_type_list

@@ -4,9 +4,9 @@ Business Process | Business State
 Container Line | Container Cell
 Container | Container
 Container | Container Line
-Delivering Simulation Rule | Category Divergence Tester
-Delivering Simulation Rule | Property Divergence Tester
-Delivering Simulation Rule | Quantity Divergence Tester
+Delivery Simulation Rule | Category Divergence Tester
+Delivery Simulation Rule | Property Divergence Tester
+Delivery Simulation Rule | Quantity Divergence Tester
 Delivery Builder | First Causality Movement Group
 Delivery Rule | Category Divergence Tester
 Delivery Rule | Property Divergence Tester
@@ -20,9 +20,9 @@ Inventory | Inventory Line
 Order Rule | Category Divergence Tester
 Order Rule | Property Divergence Tester
 Order Rule | Quantity Divergence Tester
-Order Simulation Rule | Category Divergence Tester
-Order Simulation Rule | Property Divergence Tester
-Order Simulation Rule | Quantity Divergence Tester
+Order Root Simulation Rule | Category Divergence Tester
+Order Root Simulation Rule | Property Divergence Tester
+Order Root Simulation Rule | Quantity Divergence Tester
 Preference | Sale Order
 Purchase Order Line | Purchase Order Cell
 Purchase Order Line | Purchase Order Line
@@ -42,8 +42,9 @@ Returned Sale Packing List Module | Returned Sale Packing List
 Returned Sale Packing List | Container
 Returned Sale Packing List | Returned Sale Packing List Line
 Rule Tool | Delivery Rule
+Rule Tool | Delivery Simulation Rule
 Rule Tool | Order Rule
-Rule Tool | Order Simulation Rule
+Rule Tool | Order Root Simulation Rule
 Sale Order Line | Sale Order Cell
 Sale Order Line | Sale Order Line
 Sale Order Module | Sale Order

bt5/erp5_trade/bt/template_portal_type_id_list

@@ -5,7 +5,7 @@ Business State
 Container
 Container Cell
 Container Line
-Delivering Simulation Rule
+Delivery Simulation Rule
 Delivery Cell
 Delivery Rule
 First Causality Movement Group
@@ -18,7 +18,7 @@ Inventory Cell
 Inventory Line
 Inventory Module
 Order Rule
-Order Simulation Rule
+Order Root Simulation Rule
 Payment Condition
 Purchase Order
 Purchase Order Cell

bt5/erp5_trade/bt/template_portal_type_workflow_chain_list

@@ -11,8 +11,8 @@ Container Line | pricing_interaction_workflow
 Container Line | trade_matrix_workflow
 Container | edit_workflow
 Container | pricing_interaction_workflow
-Delivering Simulation Rule | edit_workflow
-Delivering Simulation Rule | rule_validation_workflow
+Delivery Simulation Rule | edit_workflow
+Delivery Simulation Rule | rule_validation_workflow
 Delivery Cell | delivery_movement_causality_interaction_workflow
 Delivery Cell | delivery_movement_simulation_interaction_workflow
 Delivery Rule | edit_workflow
@@ -39,8 +39,8 @@ Inventory | edit_workflow
 Inventory | inventory_workflow
 Order Rule | edit_workflow
 Order Rule | rule_validation_workflow
-Order Simulation Rule | edit_workflow
-Order Simulation Rule | rule_validation_workflow
+Order Root Simulation Rule | edit_workflow
+Order Root Simulation Rule | rule_validation_workflow
 Payment Condition | edit_workflow
 Purchase Order Cell | edit_workflow
 Purchase Order Cell | order_movement_simulation_interaction_workflow

product/ERP5/Document/DeliveringSimulationRule.py → product/ERP5/Document/DeliverySimulationRule.py

@@ -29,14 +29,15 @@ from AccessControl import ClassSecurityInfo
 from Products.ERP5Type import Permissions
 from Products.ERP5.Document.Rule import Rule
 
-class DeliveringSimulationRule(Rule):
+class DeliverySimulationRule(Rule):
   """
-    Delivering Simulation Rule expand simulation created by a order or delivery rule.
+  Delivery Simulation Rule expand simulation created by a order root
+  simulation rule or delivery root simulation rule.
   """
 
   # CMF Type Definition
-  meta_type = 'ERP5 Delivering Simulation Rule'
-  portal_type = 'Delivering Simulation Rule'
+  meta_type = 'ERP5 Delivery Simulation Rule'
+  portal_type = 'Delivery Simulation Rule'
   add_permission = Permissions.AddPortalContent
 
   # Declarative security

product/ERP5/Document/OrderSimulationRule.py → product/ERP5/Document/OrderRootSimulationRule.py

@@ -32,7 +32,7 @@ from Products.ERP5Type import Permissions, PropertySheet, Constraint, interfaces
 from Products.ERP5.Document.OrderRule import OrderRule
 from zLOG import LOG, WARNING
 
-class OrderSimulationRule(OrderRule):
+class OrderRootSimulationRule(OrderRule):
   """
   Order Rule object make sure an Order in the simulation
   is consistent with the real order
@@ -40,8 +40,8 @@ class OrderSimulationRule(OrderRule):
   WARNING: what to do with movement split ?
   """
   # CMF Type Definition
-  meta_type = 'ERP5 Order Simulation Rule'
-  portal_type = 'Order Simulation Rule'
+  meta_type = 'ERP5 Order Root Simulation Rule'
+  portal_type = 'Order Root Simulation Rule'
 
   # Declarative security
   security = ClassSecurityInfo()

product/ERP5/Document/ProductionOrderModelSimulationRule.py → product/ERP5/Document/ProductionOrderModelRootSimulationRule.py

@@ -30,15 +30,15 @@ from AccessControl import ClassSecurityInfo
 from Products.ERP5Type import Permissions, interfaces
 from Products.ERP5.Document.ProductionOrderModelRule import ProductionOrderModelRule
 
-class ProductionOrderModelSimulationRule(ProductionOrderModelRule):
+class ProductionOrderModelRootSimulationRule(ProductionOrderModelRule):
   """
     Prouction Order Model Simulation Rule object use a Supply Chain to expand a 
     Production Order.
   """
 
   # CMF Type Definition
-  meta_type = 'ERP5 Production Order Model SimulationRule'
-  portal_type = 'Production Order Model SimulationRule'
+  meta_type = 'ERP5 Production Order Model Root Simulation Rule'
+  portal_type = 'Production Order Model Root Simulation Rule'
 
   # Declarative security
   security = ClassSecurityInfo()

product/ERP5/Document/ProductionOrderSimulationRule.py → product/ERP5/Document/ProductionOrderRootSimulationRule.py

@@ -30,15 +30,15 @@ from AccessControl import ClassSecurityInfo
 from Products.ERP5Type import Permissions, interfaces
 from Products.ERP5.Document.ProductionOrderRule import ProductionOrderRule
 
-class ProductionOrderSimulationRule(ProductionOrderRule):
+class ProductionOrderRootSimulationRule(ProductionOrderRule):
   """
     Prouction Order Simulation Rule object use a Supply Chain to expand a 
     Production Order.
   """
 
   # CMF Type Definition
-  meta_type = 'ERP5 Production Order Simulation Rule'
-  portal_type = 'Production Order Simulation Rule'
+  meta_type = 'ERP5 Production Order Root Simulation Rule'
+  portal_type = 'Production Order Root Simulation Rule'
 
   # Declarative security
   security = ClassSecurityInfo()