diff --git a/bt5/erp5_mrp/PathTemplateItem/portal_rules/default_production_order_rule.xml b/bt5/erp5_mrp/PathTemplateItem/portal_rules/default_production_order_rule.xml
index 89f392667450705c629cdba472dff170965d18b4..c5301cb8de3b43b6355d93d18b56f5bab1273ef1 100644
--- a/bt5/erp5_mrp/PathTemplateItem/portal_rules/default_production_order_rule.xml
+++ b/bt5/erp5_mrp/PathTemplateItem/portal_rules/default_production_order_rule.xml
@@ -21,6 +21,12 @@
               <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
             </value>
         </item>
+        <item>
+            <key> <string>_identity_criterion</string> </key>
+            <value>
+              <dictionary/>
+            </value>
+        </item>
         <item>
             <key> <string>_mt_index</string> </key>
             <value>
@@ -33,6 +39,12 @@
               <none/>
             </value>
         </item>
+        <item>
+            <key> <string>_range_criterion</string> </key>
+            <value>
+              <dictionary/>
+            </value>
+        </item>
         <item>
             <key> <string>_tree</string> </key>
             <value>
@@ -54,9 +66,7 @@
         <item>
             <key> <string>test_method_id</string> </key>
             <value>
-              <tuple>
-                <string>ProductionOrderRule_testContextPortalType</string>
-              </tuple>
+              <tuple/>
             </value>
         </item>
         <item>
diff --git a/bt5/erp5_mrp/PathTemplateItem/portal_rules/default_transformation_rule.xml b/bt5/erp5_mrp/PathTemplateItem/portal_rules/default_transformation_rule.xml
index 0cab24d9e65002fd24a4eb481bc5bcc457022f70..25fc3d8e231821c8d9ebc837e810cab5808234cc 100644
--- a/bt5/erp5_mrp/PathTemplateItem/portal_rules/default_transformation_rule.xml
+++ b/bt5/erp5_mrp/PathTemplateItem/portal_rules/default_transformation_rule.xml
@@ -21,6 +21,12 @@
               <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
             </value>
         </item>
+        <item>
+            <key> <string>_identity_criterion</string> </key>
+            <value>
+              <dictionary/>
+            </value>
+        </item>
         <item>
             <key> <string>_mt_index</string> </key>
             <value>
@@ -33,6 +39,12 @@
               <none/>
             </value>
         </item>
+        <item>
+            <key> <string>_range_criterion</string> </key>
+            <value>
+              <dictionary/>
+            </value>
+        </item>
         <item>
             <key> <string>_tree</string> </key>
             <value>
@@ -55,7 +67,7 @@
             <key> <string>test_method_id</string> </key>
             <value>
               <tuple>
-                <string>TransformationRule_test</string>
+                <string>SimulationMovement_testTransformationRule</string>
               </tuple>
             </value>
         </item>
diff --git a/bt5/erp5_mrp/PathTemplateItem/portal_rules/default_transformation_sourcing_rule.xml b/bt5/erp5_mrp/PathTemplateItem/portal_rules/default_transformation_sourcing_rule.xml
index 3a12c839525b5ec9aef7fb8ee8f44e9e221b1d02..bf9aefcab1d51ac43b82e73b458d3c8f62a37e12 100644
--- a/bt5/erp5_mrp/PathTemplateItem/portal_rules/default_transformation_sourcing_rule.xml
+++ b/bt5/erp5_mrp/PathTemplateItem/portal_rules/default_transformation_sourcing_rule.xml
@@ -21,6 +21,12 @@
               <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
             </value>
         </item>
+        <item>
+            <key> <string>_identity_criterion</string> </key>
+            <value>
+              <dictionary/>
+            </value>
+        </item>
         <item>
             <key> <string>_mt_index</string> </key>
             <value>
@@ -33,6 +39,12 @@
               <none/>
             </value>
         </item>
+        <item>
+            <key> <string>_range_criterion</string> </key>
+            <value>
+              <dictionary/>
+            </value>
+        </item>
         <item>
             <key> <string>_tree</string> </key>
             <value>
@@ -55,7 +67,7 @@
             <key> <string>test_method_id</string> </key>
             <value>
               <tuple>
-                <string>TransformationSourcingRule_test</string>
+                <string>SimulationMovement_testTransformationSourcingRule</string>
               </tuple>
             </value>
         </item>
diff --git a/bt5/erp5_mrp/SkinTemplateItem/portal_skins/erp5_mrp/ProductionOrderRule_testContextPortalType.xml b/bt5/erp5_mrp/SkinTemplateItem/portal_skins/erp5_mrp/ProductionOrderRule_testContextPortalType.xml
deleted file mode 100644
index a17cfd70fd3eb594b5cc7c054496d1844ea2d15c..0000000000000000000000000000000000000000
--- a/bt5/erp5_mrp/SkinTemplateItem/portal_skins/erp5_mrp/ProductionOrderRule_testContextPortalType.xml
+++ /dev/null
@@ -1,147 +0,0 @@
-<?xml version="1.0"?>
-<ZopeData>
-  <record id="1" aka="AAAAAAAAAAE=">
-    <pickle>
-      <tuple>
-        <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
-        <tuple/>
-      </tuple>
-    </pickle>
-    <pickle>
-      <dictionary>
-        <item>
-            <key> <string>Python_magic</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
-        <item>
-            <key> <string>Script_magic</string> </key>
-            <value> <int>3</int> </value>
-        </item>
-        <item>
-            <key> <string>__ac_local_roles__</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
-        <item>
-            <key> <string>_bind_names</string> </key>
-            <value>
-              <object>
-                <klass>
-                  <global name="NameAssignments" module="Shared.DC.Scripts.Bindings"/>
-                </klass>
-                <tuple/>
-                <state>
-                  <dictionary>
-                    <item>
-                        <key> <string>_asgns</string> </key>
-                        <value>
-                          <dictionary>
-                            <item>
-                                <key> <string>name_container</string> </key>
-                                <value> <string>container</string> </value>
-                            </item>
-                            <item>
-                                <key> <string>name_context</string> </key>
-                                <value> <string>context</string> </value>
-                            </item>
-                            <item>
-                                <key> <string>name_m_self</string> </key>
-                                <value> <string>script</string> </value>
-                            </item>
-                            <item>
-                                <key> <string>name_subpath</string> </key>
-                                <value> <string>traverse_subpath</string> </value>
-                            </item>
-                          </dictionary>
-                        </value>
-                    </item>
-                  </dictionary>
-                </state>
-              </object>
-            </value>
-        </item>
-        <item>
-            <key> <string>_body</string> </key>
-            <value> <string>return context.getPortalType() in [\'Production Order\']\n
-</string> </value>
-        </item>
-        <item>
-            <key> <string>_code</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
-        <item>
-            <key> <string>_filepath</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
-        <item>
-            <key> <string>_params</string> </key>
-            <value> <string>rule</string> </value>
-        </item>
-        <item>
-            <key> <string>errors</string> </key>
-            <value>
-              <tuple/>
-            </value>
-        </item>
-        <item>
-            <key> <string>func_code</string> </key>
-            <value>
-              <object>
-                <klass>
-                  <global name="FuncCode" module="Shared.DC.Scripts.Signature"/>
-                </klass>
-                <tuple/>
-                <state>
-                  <dictionary>
-                    <item>
-                        <key> <string>co_argcount</string> </key>
-                        <value> <int>1</int> </value>
-                    </item>
-                    <item>
-                        <key> <string>co_varnames</string> </key>
-                        <value>
-                          <tuple>
-                            <string>rule</string>
-                            <string>_getattr_</string>
-                            <string>context</string>
-                          </tuple>
-                        </value>
-                    </item>
-                  </dictionary>
-                </state>
-              </object>
-            </value>
-        </item>
-        <item>
-            <key> <string>func_defaults</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
-        <item>
-            <key> <string>id</string> </key>
-            <value> <string>ProductionOrderRule_testContextPortalType</string> </value>
-        </item>
-        <item>
-            <key> <string>warnings</string> </key>
-            <value>
-              <tuple/>
-            </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
-</ZopeData>
diff --git a/bt5/erp5_mrp/SkinTemplateItem/portal_skins/erp5_mrp/TransformationRule_test.xml b/bt5/erp5_mrp/SkinTemplateItem/portal_skins/erp5_mrp/SimulationMovement_testTransformationRule.xml
similarity index 98%
rename from bt5/erp5_mrp/SkinTemplateItem/portal_skins/erp5_mrp/TransformationRule_test.xml
rename to bt5/erp5_mrp/SkinTemplateItem/portal_skins/erp5_mrp/SimulationMovement_testTransformationRule.xml
index 1f15cf15c742e891365feaee2e8673d7e96654a5..0f67a04a24fbec1f90d02bb76911a19c723c73aa 100644
--- a/bt5/erp5_mrp/SkinTemplateItem/portal_skins/erp5_mrp/TransformationRule_test.xml
+++ b/bt5/erp5_mrp/SkinTemplateItem/portal_skins/erp5_mrp/SimulationMovement_testTransformationRule.xml
@@ -185,7 +185,7 @@ return True\n
         </item>
         <item>
             <key> <string>id</string> </key>
-            <value> <string>TransformationRule_test</string> </value>
+            <value> <string>SimulationMovement_testTransformationRule</string> </value>
         </item>
         <item>
             <key> <string>warnings</string> </key>
diff --git a/bt5/erp5_mrp/SkinTemplateItem/portal_skins/erp5_mrp/TransformationSourcingRule_test.xml b/bt5/erp5_mrp/SkinTemplateItem/portal_skins/erp5_mrp/SimulationMovement_testTransformationSourcingRule.xml
similarity index 98%
rename from bt5/erp5_mrp/SkinTemplateItem/portal_skins/erp5_mrp/TransformationSourcingRule_test.xml
rename to bt5/erp5_mrp/SkinTemplateItem/portal_skins/erp5_mrp/SimulationMovement_testTransformationSourcingRule.xml
index 34398b1df64dad35eb809f1921c1ed949fbe9588..fb765838c6084e3d72cbd8c0cbd6b21ebb78898b 100644
--- a/bt5/erp5_mrp/SkinTemplateItem/portal_skins/erp5_mrp/TransformationSourcingRule_test.xml
+++ b/bt5/erp5_mrp/SkinTemplateItem/portal_skins/erp5_mrp/SimulationMovement_testTransformationSourcingRule.xml
@@ -168,7 +168,7 @@ return True\n
         </item>
         <item>
             <key> <string>id</string> </key>
-            <value> <string>TransformationSourcingRule_test</string> </value>
+            <value> <string>SimulationMovement_testTransformationSourcingRule</string> </value>
         </item>
         <item>
             <key> <string>warnings</string> </key>
diff --git a/bt5/erp5_mrp/bt/revision b/bt5/erp5_mrp/bt/revision
index 7003e7fe1fa0b91d6e034f2f7ac38f2f5989f85c..613955421088a491231b1c6c7766f0f95a5c5824 100644
--- a/bt5/erp5_mrp/bt/revision
+++ b/bt5/erp5_mrp/bt/revision
@@ -1 +1 @@
-51
\ No newline at end of file
+52
\ No newline at end of file