diff --git a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_transaction_rule.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_transaction_rule.xml
index af4d0426a868d7dcb5132d8b2c71289634ac3eee..d69e2bb68ee3c5f97f74d41577424e2242de62af 100644
--- a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_transaction_rule.xml
+++ b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_transaction_rule.xml
@@ -51,13 +51,25 @@
             <key> <string>default_reference</string> </key>
             <value> <string>default_invoice_transaction_rule</string> </value>
         </item>
+        <item>
+            <key> <string>description</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
         <item>
             <key> <string>id</string> </key>
             <value> <string>new_invoice_transaction_rule</string> </value>
         </item>
+        <item>
+            <key> <string>index</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAc=</string> </persistent>
+            </value>
+        </item>
         <item>
             <key> <string>last_id</string> </key>
-            <value> <string>21</string> </value>
+            <value> <string>23</string> </value>
         </item>
         <item>
             <key> <string>portal_type</string> </key>
@@ -150,4 +162,47 @@
       <none/>
     </pickle>
   </record>
+  <record id="7" aka="AAAAAAAAAAc=">
+    <pickle>
+      <tuple>
+        <global name="PersistentMapping" module="Persistence.mapping"/>
+        <tuple/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>data</string> </key>
+            <value>
+              <dictionary>
+                <item>
+                    <key> <string>movement</string> </key>
+                    <value>
+                      <persistent> <string encoding="base64">AAAAAAAAAAg=</string> </persistent>
+                    </value>
+                </item>
+              </dictionary>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="8" aka="AAAAAAAAAAg=">
+    <pickle>
+      <tuple>
+        <global name="PersistentMapping" module="Persistence.mapping"/>
+        <tuple/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>data</string> </key>
+            <value>
+              <dictionary/>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
 </ZopeData>
diff --git a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_transaction_rule/1.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_transaction_rule/1.xml
deleted file mode 100644
index cdc95acfeea57bca3fc9c9fc80f60c3740969fae..0000000000000000000000000000000000000000
--- a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_transaction_rule/1.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0"?>
-<ZopeData>
-  <record id="1" aka="AAAAAAAAAAE=">
-    <pickle>
-      <tuple>
-        <global name="CategoryMembershipDivergenceTester" module="Products.ERP5Type.Document.CategoryMembershipDivergenceTester"/>
-        <tuple/>
-      </tuple>
-    </pickle>
-    <pickle>
-      <dictionary>
-        <item>
-            <key> <string>divergence_provider</string> </key>
-            <value> <int>0</int> </value>
-        </item>
-        <item>
-            <key> <string>id</string> </key>
-            <value> <string>1</string> </value>
-        </item>
-        <item>
-            <key> <string>matching_provider</string> </key>
-            <value> <int>1</int> </value>
-        </item>
-        <item>
-            <key> <string>portal_type</string> </key>
-            <value> <string>Category Membership Divergence Tester</string> </value>
-        </item>
-        <item>
-            <key> <string>tested_property</string> </key>
-            <value>
-              <tuple>
-                <string>resource</string>
-              </tuple>
-            </value>
-        </item>
-        <item>
-            <key> <string>title</string> </key>
-            <value> <string>resource divergence tester</string> </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
-</ZopeData>
diff --git a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_transaction_rule/10.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_transaction_rule/10.xml
deleted file mode 100644
index 8682c416e8f79d15623e4fa0d8d5e5750d018995..0000000000000000000000000000000000000000
--- a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_transaction_rule/10.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0"?>
-<ZopeData>
-  <record id="1" aka="AAAAAAAAAAE=">
-    <pickle>
-      <tuple>
-        <global name="CategoryMembershipDivergenceTester" module="Products.ERP5Type.Document.CategoryMembershipDivergenceTester"/>
-        <tuple/>
-      </tuple>
-    </pickle>
-    <pickle>
-      <dictionary>
-        <item>
-            <key> <string>divergence_provider</string> </key>
-            <value> <int>1</int> </value>
-        </item>
-        <item>
-            <key> <string>id</string> </key>
-            <value> <string>10</string> </value>
-        </item>
-        <item>
-            <key> <string>matching_provider</string> </key>
-            <value> <int>0</int> </value>
-        </item>
-        <item>
-            <key> <string>portal_type</string> </key>
-            <value> <string>Category Membership Divergence Tester</string> </value>
-        </item>
-        <item>
-            <key> <string>tested_property</string> </key>
-            <value>
-              <tuple>
-                <string>source_decision</string>
-              </tuple>
-            </value>
-        </item>
-        <item>
-            <key> <string>title</string> </key>
-            <value> <string>source_decision divergence tester</string> </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
-</ZopeData>
diff --git a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_transaction_rule/11.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_transaction_rule/11.xml
deleted file mode 100644
index dc266a633e66dd00a5d40529f51598bf871dad53..0000000000000000000000000000000000000000
--- a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_transaction_rule/11.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0"?>
-<ZopeData>
-  <record id="1" aka="AAAAAAAAAAE=">
-    <pickle>
-      <tuple>
-        <global name="CategoryMembershipDivergenceTester" module="Products.ERP5Type.Document.CategoryMembershipDivergenceTester"/>
-        <tuple/>
-      </tuple>
-    </pickle>
-    <pickle>
-      <dictionary>
-        <item>
-            <key> <string>divergence_provider</string> </key>
-            <value> <int>1</int> </value>
-        </item>
-        <item>
-            <key> <string>id</string> </key>
-            <value> <string>11</string> </value>
-        </item>
-        <item>
-            <key> <string>matching_provider</string> </key>
-            <value> <int>0</int> </value>
-        </item>
-        <item>
-            <key> <string>portal_type</string> </key>
-            <value> <string>Category Membership Divergence Tester</string> </value>
-        </item>
-        <item>
-            <key> <string>tested_property</string> </key>
-            <value>
-              <tuple>
-                <string>source_function</string>
-              </tuple>
-            </value>
-        </item>
-        <item>
-            <key> <string>title</string> </key>
-            <value> <string>source_function divergence tester</string> </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
-</ZopeData>
diff --git a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_transaction_rule/12.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_transaction_rule/12.xml
deleted file mode 100644
index 6756fe0dbff0ccc17220b32d2905202873a06eb7..0000000000000000000000000000000000000000
--- a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_transaction_rule/12.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0"?>
-<ZopeData>
-  <record id="1" aka="AAAAAAAAAAE=">
-    <pickle>
-      <tuple>
-        <global name="CategoryMembershipDivergenceTester" module="Products.ERP5Type.Document.CategoryMembershipDivergenceTester"/>
-        <tuple/>
-      </tuple>
-    </pickle>
-    <pickle>
-      <dictionary>
-        <item>
-            <key> <string>divergence_provider</string> </key>
-            <value> <int>1</int> </value>
-        </item>
-        <item>
-            <key> <string>id</string> </key>
-            <value> <string>12</string> </value>
-        </item>
-        <item>
-            <key> <string>matching_provider</string> </key>
-            <value> <int>0</int> </value>
-        </item>
-        <item>
-            <key> <string>portal_type</string> </key>
-            <value> <string>Category Membership Divergence Tester</string> </value>
-        </item>
-        <item>
-            <key> <string>tested_property</string> </key>
-            <value>
-              <tuple>
-                <string>source_payment</string>
-              </tuple>
-            </value>
-        </item>
-        <item>
-            <key> <string>title</string> </key>
-            <value> <string>source_payment divergence tester</string> </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
-</ZopeData>
diff --git a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_transaction_rule/13.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_transaction_rule/13.xml
deleted file mode 100644
index a11e21898f72d7b9f77e3098968ea4b9ddd1ffb3..0000000000000000000000000000000000000000
--- a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_transaction_rule/13.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0"?>
-<ZopeData>
-  <record id="1" aka="AAAAAAAAAAE=">
-    <pickle>
-      <tuple>
-        <global name="CategoryMembershipDivergenceTester" module="Products.ERP5Type.Document.CategoryMembershipDivergenceTester"/>
-        <tuple/>
-      </tuple>
-    </pickle>
-    <pickle>
-      <dictionary>
-        <item>
-            <key> <string>divergence_provider</string> </key>
-            <value> <int>1</int> </value>
-        </item>
-        <item>
-            <key> <string>id</string> </key>
-            <value> <string>13</string> </value>
-        </item>
-        <item>
-            <key> <string>matching_provider</string> </key>
-            <value> <int>0</int> </value>
-        </item>
-        <item>
-            <key> <string>portal_type</string> </key>
-            <value> <string>Category Membership Divergence Tester</string> </value>
-        </item>
-        <item>
-            <key> <string>tested_property</string> </key>
-            <value>
-              <tuple>
-                <string>source_project</string>
-              </tuple>
-            </value>
-        </item>
-        <item>
-            <key> <string>title</string> </key>
-            <value> <string>source_project divergence tester</string> </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
-</ZopeData>
diff --git a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_transaction_rule/14.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_transaction_rule/14.xml
deleted file mode 100644
index 7f99836cad833dde79f0c534461c9c2ed6af94df..0000000000000000000000000000000000000000
--- a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_transaction_rule/14.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0"?>
-<ZopeData>
-  <record id="1" aka="AAAAAAAAAAE=">
-    <pickle>
-      <tuple>
-        <global name="CategoryMembershipDivergenceTester" module="Products.ERP5Type.Document.CategoryMembershipDivergenceTester"/>
-        <tuple/>
-      </tuple>
-    </pickle>
-    <pickle>
-      <dictionary>
-        <item>
-            <key> <string>divergence_provider</string> </key>
-            <value> <int>1</int> </value>
-        </item>
-        <item>
-            <key> <string>id</string> </key>
-            <value> <string>14</string> </value>
-        </item>
-        <item>
-            <key> <string>matching_provider</string> </key>
-            <value> <int>0</int> </value>
-        </item>
-        <item>
-            <key> <string>portal_type</string> </key>
-            <value> <string>Category Membership Divergence Tester</string> </value>
-        </item>
-        <item>
-            <key> <string>tested_property</string> </key>
-            <value>
-              <tuple>
-                <string>source_section</string>
-              </tuple>
-            </value>
-        </item>
-        <item>
-            <key> <string>title</string> </key>
-            <value> <string>source_section divergence tester</string> </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
-</ZopeData>
diff --git a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_transaction_rule/15.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_transaction_rule/15.xml
deleted file mode 100644
index dc141da1fae50ac5a803454c615bec0c05633019..0000000000000000000000000000000000000000
--- a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_transaction_rule/15.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0"?>
-<ZopeData>
-  <record id="1" aka="AAAAAAAAAAE=">
-    <pickle>
-      <tuple>
-        <global name="CategoryMembershipDivergenceTester" module="Products.ERP5Type.Document.CategoryMembershipDivergenceTester"/>
-        <tuple/>
-      </tuple>
-    </pickle>
-    <pickle>
-      <dictionary>
-        <item>
-            <key> <string>divergence_provider</string> </key>
-            <value> <int>1</int> </value>
-        </item>
-        <item>
-            <key> <string>id</string> </key>
-            <value> <string>15</string> </value>
-        </item>
-        <item>
-            <key> <string>matching_provider</string> </key>
-            <value> <int>0</int> </value>
-        </item>
-        <item>
-            <key> <string>portal_type</string> </key>
-            <value> <string>Category Membership Divergence Tester</string> </value>
-        </item>
-        <item>
-            <key> <string>tested_property</string> </key>
-            <value>
-              <tuple>
-                <string>destination_administration</string>
-              </tuple>
-            </value>
-        </item>
-        <item>
-            <key> <string>title</string> </key>
-            <value> <string>destination_administration divergence tester</string> </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
-</ZopeData>
diff --git a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_transaction_rule/16.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_transaction_rule/16.xml
deleted file mode 100644
index b2a699ec3f8ea462ff4c3b9831ca91ba3423dcf9..0000000000000000000000000000000000000000
--- a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_transaction_rule/16.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0"?>
-<ZopeData>
-  <record id="1" aka="AAAAAAAAAAE=">
-    <pickle>
-      <tuple>
-        <global name="CategoryMembershipDivergenceTester" module="Products.ERP5Type.Document.CategoryMembershipDivergenceTester"/>
-        <tuple/>
-      </tuple>
-    </pickle>
-    <pickle>
-      <dictionary>
-        <item>
-            <key> <string>divergence_provider</string> </key>
-            <value> <int>1</int> </value>
-        </item>
-        <item>
-            <key> <string>id</string> </key>
-            <value> <string>16</string> </value>
-        </item>
-        <item>
-            <key> <string>matching_provider</string> </key>
-            <value> <int>0</int> </value>
-        </item>
-        <item>
-            <key> <string>portal_type</string> </key>
-            <value> <string>Category Membership Divergence Tester</string> </value>
-        </item>
-        <item>
-            <key> <string>tested_property</string> </key>
-            <value>
-              <tuple>
-                <string>destination_decision</string>
-              </tuple>
-            </value>
-        </item>
-        <item>
-            <key> <string>title</string> </key>
-            <value> <string>destination_decision divergence tester</string> </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
-</ZopeData>
diff --git a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_transaction_rule/17.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_transaction_rule/17.xml
deleted file mode 100644
index df9ba4eb837a472e65a879c067d4e3d3c1816100..0000000000000000000000000000000000000000
--- a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_transaction_rule/17.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0"?>
-<ZopeData>
-  <record id="1" aka="AAAAAAAAAAE=">
-    <pickle>
-      <tuple>
-        <global name="CategoryMembershipDivergenceTester" module="Products.ERP5Type.Document.CategoryMembershipDivergenceTester"/>
-        <tuple/>
-      </tuple>
-    </pickle>
-    <pickle>
-      <dictionary>
-        <item>
-            <key> <string>divergence_provider</string> </key>
-            <value> <int>1</int> </value>
-        </item>
-        <item>
-            <key> <string>id</string> </key>
-            <value> <string>17</string> </value>
-        </item>
-        <item>
-            <key> <string>matching_provider</string> </key>
-            <value> <int>0</int> </value>
-        </item>
-        <item>
-            <key> <string>portal_type</string> </key>
-            <value> <string>Category Membership Divergence Tester</string> </value>
-        </item>
-        <item>
-            <key> <string>tested_property</string> </key>
-            <value>
-              <tuple>
-                <string>destination_function</string>
-              </tuple>
-            </value>
-        </item>
-        <item>
-            <key> <string>title</string> </key>
-            <value> <string>destination_function divergence tester</string> </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
-</ZopeData>
diff --git a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_transaction_rule/18.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_transaction_rule/18.xml
deleted file mode 100644
index f73e7b824d2d4391a006c4ed3902ddaba296ef47..0000000000000000000000000000000000000000
--- a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_transaction_rule/18.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0"?>
-<ZopeData>
-  <record id="1" aka="AAAAAAAAAAE=">
-    <pickle>
-      <tuple>
-        <global name="CategoryMembershipDivergenceTester" module="Products.ERP5Type.Document.CategoryMembershipDivergenceTester"/>
-        <tuple/>
-      </tuple>
-    </pickle>
-    <pickle>
-      <dictionary>
-        <item>
-            <key> <string>divergence_provider</string> </key>
-            <value> <int>1</int> </value>
-        </item>
-        <item>
-            <key> <string>id</string> </key>
-            <value> <string>18</string> </value>
-        </item>
-        <item>
-            <key> <string>matching_provider</string> </key>
-            <value> <int>0</int> </value>
-        </item>
-        <item>
-            <key> <string>portal_type</string> </key>
-            <value> <string>Category Membership Divergence Tester</string> </value>
-        </item>
-        <item>
-            <key> <string>tested_property</string> </key>
-            <value>
-              <tuple>
-                <string>destination_payment</string>
-              </tuple>
-            </value>
-        </item>
-        <item>
-            <key> <string>title</string> </key>
-            <value> <string>destination_payment divergence tester</string> </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
-</ZopeData>
diff --git a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_transaction_rule/19.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_transaction_rule/19.xml
deleted file mode 100644
index e37cb63b7b6fcfb504f59662cea2433d13feeee8..0000000000000000000000000000000000000000
--- a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_transaction_rule/19.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0"?>
-<ZopeData>
-  <record id="1" aka="AAAAAAAAAAE=">
-    <pickle>
-      <tuple>
-        <global name="CategoryMembershipDivergenceTester" module="Products.ERP5Type.Document.CategoryMembershipDivergenceTester"/>
-        <tuple/>
-      </tuple>
-    </pickle>
-    <pickle>
-      <dictionary>
-        <item>
-            <key> <string>divergence_provider</string> </key>
-            <value> <int>1</int> </value>
-        </item>
-        <item>
-            <key> <string>id</string> </key>
-            <value> <string>19</string> </value>
-        </item>
-        <item>
-            <key> <string>matching_provider</string> </key>
-            <value> <int>0</int> </value>
-        </item>
-        <item>
-            <key> <string>portal_type</string> </key>
-            <value> <string>Category Membership Divergence Tester</string> </value>
-        </item>
-        <item>
-            <key> <string>tested_property</string> </key>
-            <value>
-              <tuple>
-                <string>destination_project</string>
-              </tuple>
-            </value>
-        </item>
-        <item>
-            <key> <string>title</string> </key>
-            <value> <string>destination_project divergence tester</string> </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
-</ZopeData>
diff --git a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_transaction_rule/2.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_transaction_rule/2.xml
deleted file mode 100644
index 8e3a5d6fe48c78f269cd39d5fd6c1d7aa51ea87c..0000000000000000000000000000000000000000
--- a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_transaction_rule/2.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0"?>
-<ZopeData>
-  <record id="1" aka="AAAAAAAAAAE=">
-    <pickle>
-      <tuple>
-        <global name="CategoryMembershipDivergenceTester" module="Products.ERP5Type.Document.CategoryMembershipDivergenceTester"/>
-        <tuple/>
-      </tuple>
-    </pickle>
-    <pickle>
-      <dictionary>
-        <item>
-            <key> <string>divergence_provider</string> </key>
-            <value> <int>0</int> </value>
-        </item>
-        <item>
-            <key> <string>id</string> </key>
-            <value> <string>2</string> </value>
-        </item>
-        <item>
-            <key> <string>matching_provider</string> </key>
-            <value> <int>1</int> </value>
-        </item>
-        <item>
-            <key> <string>portal_type</string> </key>
-            <value> <string>Category Membership Divergence Tester</string> </value>
-        </item>
-        <item>
-            <key> <string>tested_property</string> </key>
-            <value>
-              <tuple>
-                <string>source</string>
-              </tuple>
-            </value>
-        </item>
-        <item>
-            <key> <string>title</string> </key>
-            <value> <string>source divergence tester</string> </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
-</ZopeData>
diff --git a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_transaction_rule/20.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_transaction_rule/20.xml
deleted file mode 100644
index 430565c3fb35495b4c16b8b8c396a96c4e744c02..0000000000000000000000000000000000000000
--- a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_transaction_rule/20.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0"?>
-<ZopeData>
-  <record id="1" aka="AAAAAAAAAAE=">
-    <pickle>
-      <tuple>
-        <global name="CategoryMembershipDivergenceTester" module="Products.ERP5Type.Document.CategoryMembershipDivergenceTester"/>
-        <tuple/>
-      </tuple>
-    </pickle>
-    <pickle>
-      <dictionary>
-        <item>
-            <key> <string>divergence_provider</string> </key>
-            <value> <int>1</int> </value>
-        </item>
-        <item>
-            <key> <string>id</string> </key>
-            <value> <string>20</string> </value>
-        </item>
-        <item>
-            <key> <string>matching_provider</string> </key>
-            <value> <int>0</int> </value>
-        </item>
-        <item>
-            <key> <string>portal_type</string> </key>
-            <value> <string>Category Membership Divergence Tester</string> </value>
-        </item>
-        <item>
-            <key> <string>tested_property</string> </key>
-            <value>
-              <tuple>
-                <string>destination_section</string>
-              </tuple>
-            </value>
-        </item>
-        <item>
-            <key> <string>title</string> </key>
-            <value> <string>destination_section divergence tester</string> </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
-</ZopeData>
diff --git a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_transaction_rule/21.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_transaction_rule/21.xml
deleted file mode 100644
index 00e5cc36b54b1722f02b54b3afb8b00f4981beb3..0000000000000000000000000000000000000000
--- a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_transaction_rule/21.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0"?>
-<ZopeData>
-  <record id="1" aka="AAAAAAAAAAE=">
-    <pickle>
-      <tuple>
-        <global name="FloatDivergenceTester" module="Products.ERP5Type.Document.FloatDivergenceTester"/>
-        <tuple/>
-      </tuple>
-    </pickle>
-    <pickle>
-      <dictionary>
-        <item>
-            <key> <string>_local_properties</string> </key>
-            <value>
-              <tuple>
-                <dictionary>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>quantity</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>int</string> </value>
-                  </item>
-                </dictionary>
-              </tuple>
-            </value>
-        </item>
-        <item>
-            <key> <string>divergence_provider</string> </key>
-            <value> <int>1</int> </value>
-        </item>
-        <item>
-            <key> <string>id</string> </key>
-            <value> <string>21</string> </value>
-        </item>
-        <item>
-            <key> <string>matching_provider</string> </key>
-            <value> <int>0</int> </value>
-        </item>
-        <item>
-            <key> <string>portal_type</string> </key>
-            <value> <string>Float Divergence Tester</string> </value>
-        </item>
-        <item>
-            <key> <string>quantity</string> </key>
-            <value> <int>0</int> </value>
-        </item>
-        <item>
-            <key> <string>tested_property</string> </key>
-            <value>
-              <tuple>
-                <string>price</string>
-              </tuple>
-            </value>
-        </item>
-        <item>
-            <key> <string>title</string> </key>
-            <value> <string>price divergence tester</string> </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
-</ZopeData>
diff --git a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_transaction_rule/3.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_transaction_rule/3.xml
deleted file mode 100644
index a0d32ef23e4c8e79a72d08388f1af71de47b31ec..0000000000000000000000000000000000000000
--- a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_transaction_rule/3.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0"?>
-<ZopeData>
-  <record id="1" aka="AAAAAAAAAAE=">
-    <pickle>
-      <tuple>
-        <global name="CategoryMembershipDivergenceTester" module="Products.ERP5Type.Document.CategoryMembershipDivergenceTester"/>
-        <tuple/>
-      </tuple>
-    </pickle>
-    <pickle>
-      <dictionary>
-        <item>
-            <key> <string>divergence_provider</string> </key>
-            <value> <int>0</int> </value>
-        </item>
-        <item>
-            <key> <string>id</string> </key>
-            <value> <string>3</string> </value>
-        </item>
-        <item>
-            <key> <string>matching_provider</string> </key>
-            <value> <int>1</int> </value>
-        </item>
-        <item>
-            <key> <string>portal_type</string> </key>
-            <value> <string>Category Membership Divergence Tester</string> </value>
-        </item>
-        <item>
-            <key> <string>tested_property</string> </key>
-            <value>
-              <tuple>
-                <string>destination</string>
-              </tuple>
-            </value>
-        </item>
-        <item>
-            <key> <string>title</string> </key>
-            <value> <string>destination divergence tester</string> </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
-</ZopeData>
diff --git a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_transaction_rule/4.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_transaction_rule/4.xml
deleted file mode 100644
index 33c04d8ff4c0027546a795f16b919c1567c4d10d..0000000000000000000000000000000000000000
--- a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_transaction_rule/4.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0"?>
-<ZopeData>
-  <record id="1" aka="AAAAAAAAAAE=">
-    <pickle>
-      <tuple>
-        <global name="CategoryMembershipDivergenceTester" module="Products.ERP5Type.Document.CategoryMembershipDivergenceTester"/>
-        <tuple/>
-      </tuple>
-    </pickle>
-    <pickle>
-      <dictionary>
-        <item>
-            <key> <string>divergence_provider</string> </key>
-            <value> <int>0</int> </value>
-        </item>
-        <item>
-            <key> <string>id</string> </key>
-            <value> <string>4</string> </value>
-        </item>
-        <item>
-            <key> <string>matching_provider</string> </key>
-            <value> <int>1</int> </value>
-        </item>
-        <item>
-            <key> <string>portal_type</string> </key>
-            <value> <string>Category Membership Divergence Tester</string> </value>
-        </item>
-        <item>
-            <key> <string>tested_property</string> </key>
-            <value>
-              <tuple>
-                <string>destination_total_asset_price</string>
-              </tuple>
-            </value>
-        </item>
-        <item>
-            <key> <string>title</string> </key>
-            <value> <string>destination_total_asset_price divergence tester</string> </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
-</ZopeData>
diff --git a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_transaction_rule/5.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_transaction_rule/5.xml
deleted file mode 100644
index d64f8e5b9ca1beb678cf40346a002c7c6e763353..0000000000000000000000000000000000000000
--- a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_transaction_rule/5.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0"?>
-<ZopeData>
-  <record id="1" aka="AAAAAAAAAAE=">
-    <pickle>
-      <tuple>
-        <global name="CategoryMembershipDivergenceTester" module="Products.ERP5Type.Document.CategoryMembershipDivergenceTester"/>
-        <tuple/>
-      </tuple>
-    </pickle>
-    <pickle>
-      <dictionary>
-        <item>
-            <key> <string>divergence_provider</string> </key>
-            <value> <int>0</int> </value>
-        </item>
-        <item>
-            <key> <string>id</string> </key>
-            <value> <string>5</string> </value>
-        </item>
-        <item>
-            <key> <string>matching_provider</string> </key>
-            <value> <int>1</int> </value>
-        </item>
-        <item>
-            <key> <string>portal_type</string> </key>
-            <value> <string>Category Membership Divergence Tester</string> </value>
-        </item>
-        <item>
-            <key> <string>tested_property</string> </key>
-            <value>
-              <tuple>
-                <string>source_total_asset_price</string>
-              </tuple>
-            </value>
-        </item>
-        <item>
-            <key> <string>title</string> </key>
-            <value> <string>source_total_asset_price divergence tester</string> </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
-</ZopeData>
diff --git a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_transaction_rule/6.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_transaction_rule/6.xml
deleted file mode 100644
index 99a2be8f8f2c01830b3b43969c0d8a135140c9ad..0000000000000000000000000000000000000000
--- a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_transaction_rule/6.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0"?>
-<ZopeData>
-  <record id="1" aka="AAAAAAAAAAE=">
-    <pickle>
-      <tuple>
-        <global name="NetConvertedQuantityDivergenceTester" module="Products.ERP5Type.Document.NetConvertedQuantityDivergenceTester"/>
-        <tuple/>
-      </tuple>
-    </pickle>
-    <pickle>
-      <dictionary>
-        <item>
-            <key> <string>_local_properties</string> </key>
-            <value>
-              <tuple>
-                <dictionary>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>quantity</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>int</string> </value>
-                  </item>
-                </dictionary>
-              </tuple>
-            </value>
-        </item>
-        <item>
-            <key> <string>divergence_provider</string> </key>
-            <value> <int>0</int> </value>
-        </item>
-        <item>
-            <key> <string>id</string> </key>
-            <value> <string>6</string> </value>
-        </item>
-        <item>
-            <key> <string>matching_provider</string> </key>
-            <value> <int>0</int> </value>
-        </item>
-        <item>
-            <key> <string>portal_type</string> </key>
-            <value> <string>Net Converted Quantity Divergence Tester</string> </value>
-        </item>
-        <item>
-            <key> <string>quantity</string> </key>
-            <value> <int>0</int> </value>
-        </item>
-        <item>
-            <key> <string>tested_property</string> </key>
-            <value>
-              <tuple>
-                <string>quantity</string>
-              </tuple>
-            </value>
-        </item>
-        <item>
-            <key> <string>title</string> </key>
-            <value> <string>quantity divergence tester</string> </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
-</ZopeData>
diff --git a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_transaction_rule/8.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_transaction_rule/8.xml
deleted file mode 100644
index dcbbcc34bef69e4ebb0fc81d9f4f92c0f5d3c5f2..0000000000000000000000000000000000000000
--- a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_transaction_rule/8.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0"?>
-<ZopeData>
-  <record id="1" aka="AAAAAAAAAAE=">
-    <pickle>
-      <tuple>
-        <global name="DateTimeDivergenceTester" module="Products.ERP5Type.Document.DateTimeDivergenceTester"/>
-        <tuple/>
-      </tuple>
-    </pickle>
-    <pickle>
-      <dictionary>
-        <item>
-            <key> <string>_local_properties</string> </key>
-            <value>
-              <tuple>
-                <dictionary>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>quantity</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>int</string> </value>
-                  </item>
-                </dictionary>
-              </tuple>
-            </value>
-        </item>
-        <item>
-            <key> <string>divergence_provider</string> </key>
-            <value> <int>1</int> </value>
-        </item>
-        <item>
-            <key> <string>id</string> </key>
-            <value> <string>8</string> </value>
-        </item>
-        <item>
-            <key> <string>matching_provider</string> </key>
-            <value> <int>0</int> </value>
-        </item>
-        <item>
-            <key> <string>portal_type</string> </key>
-            <value> <string>DateTime Divergence Tester</string> </value>
-        </item>
-        <item>
-            <key> <string>quantity</string> </key>
-            <value> <int>0</int> </value>
-        </item>
-        <item>
-            <key> <string>tested_property</string> </key>
-            <value>
-              <tuple>
-                <string>stop_date</string>
-              </tuple>
-            </value>
-        </item>
-        <item>
-            <key> <string>title</string> </key>
-            <value> <string>stop_date divergence tester</string> </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
-</ZopeData>
diff --git a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_transaction_rule/9.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_transaction_rule/9.xml
deleted file mode 100644
index d782bf0ca78925ba8884c36e193df098065869c5..0000000000000000000000000000000000000000
--- a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_transaction_rule/9.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0"?>
-<ZopeData>
-  <record id="1" aka="AAAAAAAAAAE=">
-    <pickle>
-      <tuple>
-        <global name="CategoryMembershipDivergenceTester" module="Products.ERP5Type.Document.CategoryMembershipDivergenceTester"/>
-        <tuple/>
-      </tuple>
-    </pickle>
-    <pickle>
-      <dictionary>
-        <item>
-            <key> <string>divergence_provider</string> </key>
-            <value> <int>1</int> </value>
-        </item>
-        <item>
-            <key> <string>id</string> </key>
-            <value> <string>9</string> </value>
-        </item>
-        <item>
-            <key> <string>matching_provider</string> </key>
-            <value> <int>0</int> </value>
-        </item>
-        <item>
-            <key> <string>portal_type</string> </key>
-            <value> <string>Category Membership Divergence Tester</string> </value>
-        </item>
-        <item>
-            <key> <string>tested_property</string> </key>
-            <value>
-              <tuple>
-                <string>source_administration</string>
-              </tuple>
-            </value>
-        </item>
-        <item>
-            <key> <string>title</string> </key>
-            <value> <string>source_administration divergence tester</string> </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
-</ZopeData>
diff --git a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_transaction_rule/destination_administration_tester.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_transaction_rule/destination_administration_tester.xml
new file mode 100644
index 0000000000000000000000000000000000000000..ec6effb3179cbe9b5377f1a087af33d041766f02
--- /dev/null
+++ b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_transaction_rule/destination_administration_tester.xml
@@ -0,0 +1,103 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <tuple>
+        <global name="CategoryMembershipDivergenceTester" module="Products.ERP5Type.Document.CategoryMembershipDivergenceTester"/>
+        <tuple/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>_Copy_or_Move_Permission</string> </key>
+            <value>
+              <list>
+                <string>Assignor</string>
+                <string>Manager</string>
+                <string>Owner</string>
+                <string>Authenticated</string>
+                <string>Owner</string>
+              </list>
+            </value>
+        </item>
+        <item>
+            <key> <string>_identity_criterion</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+            </value>
+        </item>
+        <item>
+            <key> <string>_range_criterion</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
+            </value>
+        </item>
+        <item>
+            <key> <string>divergence_provider</string> </key>
+            <value> <int>0</int> </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>destination_administration_tester</string> </value>
+        </item>
+        <item>
+            <key> <string>matching_provider</string> </key>
+            <value> <int>0</int> </value>
+        </item>
+        <item>
+            <key> <string>portal_type</string> </key>
+            <value> <string>Category Membership Divergence Tester</string> </value>
+        </item>
+        <item>
+            <key> <string>tested_property</string> </key>
+            <value>
+              <tuple>
+                <string>destination_administration</string>
+              </tuple>
+            </value>
+        </item>
+        <item>
+            <key> <string>title</string> </key>
+            <value> <string>destination_administration divergence tester</string> </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="2" aka="AAAAAAAAAAI=">
+    <pickle>
+      <tuple>
+        <global name="PersistentMapping" module="Persistence.mapping"/>
+        <tuple/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>data</string> </key>
+            <value>
+              <dictionary/>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="3" aka="AAAAAAAAAAM=">
+    <pickle>
+      <tuple>
+        <global name="PersistentMapping" module="Persistence.mapping"/>
+        <tuple/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>data</string> </key>
+            <value>
+              <dictionary/>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+</ZopeData>
diff --git a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_transaction_rule/destination_decision_tester.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_transaction_rule/destination_decision_tester.xml
new file mode 100644
index 0000000000000000000000000000000000000000..f4edac4f1966dd822c0cc10ee17eecddcbb201d7
--- /dev/null
+++ b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_transaction_rule/destination_decision_tester.xml
@@ -0,0 +1,103 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <tuple>
+        <global name="CategoryMembershipDivergenceTester" module="Products.ERP5Type.Document.CategoryMembershipDivergenceTester"/>
+        <tuple/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>_Copy_or_Move_Permission</string> </key>
+            <value>
+              <list>
+                <string>Assignor</string>
+                <string>Manager</string>
+                <string>Owner</string>
+                <string>Authenticated</string>
+                <string>Owner</string>
+              </list>
+            </value>
+        </item>
+        <item>
+            <key> <string>_identity_criterion</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+            </value>
+        </item>
+        <item>
+            <key> <string>_range_criterion</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
+            </value>
+        </item>
+        <item>
+            <key> <string>divergence_provider</string> </key>
+            <value> <int>0</int> </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>destination_decision_tester</string> </value>
+        </item>
+        <item>
+            <key> <string>matching_provider</string> </key>
+            <value> <int>0</int> </value>
+        </item>
+        <item>
+            <key> <string>portal_type</string> </key>
+            <value> <string>Category Membership Divergence Tester</string> </value>
+        </item>
+        <item>
+            <key> <string>tested_property</string> </key>
+            <value>
+              <tuple>
+                <string>destination_decision</string>
+              </tuple>
+            </value>
+        </item>
+        <item>
+            <key> <string>title</string> </key>
+            <value> <string>destination_decision divergence tester</string> </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="2" aka="AAAAAAAAAAI=">
+    <pickle>
+      <tuple>
+        <global name="PersistentMapping" module="Persistence.mapping"/>
+        <tuple/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>data</string> </key>
+            <value>
+              <dictionary/>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="3" aka="AAAAAAAAAAM=">
+    <pickle>
+      <tuple>
+        <global name="PersistentMapping" module="Persistence.mapping"/>
+        <tuple/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>data</string> </key>
+            <value>
+              <dictionary/>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+</ZopeData>
diff --git a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_transaction_rule/destination_function_tester.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_transaction_rule/destination_function_tester.xml
new file mode 100644
index 0000000000000000000000000000000000000000..a220d6e474533cb5fc311dfde246f54638821fa5
--- /dev/null
+++ b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_transaction_rule/destination_function_tester.xml
@@ -0,0 +1,103 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <tuple>
+        <global name="CategoryMembershipDivergenceTester" module="Products.ERP5Type.Document.CategoryMembershipDivergenceTester"/>
+        <tuple/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>_Copy_or_Move_Permission</string> </key>
+            <value>
+              <list>
+                <string>Assignor</string>
+                <string>Manager</string>
+                <string>Owner</string>
+                <string>Authenticated</string>
+                <string>Owner</string>
+              </list>
+            </value>
+        </item>
+        <item>
+            <key> <string>_identity_criterion</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+            </value>
+        </item>
+        <item>
+            <key> <string>_range_criterion</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
+            </value>
+        </item>
+        <item>
+            <key> <string>divergence_provider</string> </key>
+            <value> <int>0</int> </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>destination_function_tester</string> </value>
+        </item>
+        <item>
+            <key> <string>matching_provider</string> </key>
+            <value> <int>0</int> </value>
+        </item>
+        <item>
+            <key> <string>portal_type</string> </key>
+            <value> <string>Category Membership Divergence Tester</string> </value>
+        </item>
+        <item>
+            <key> <string>tested_property</string> </key>
+            <value>
+              <tuple>
+                <string>destination_function</string>
+              </tuple>
+            </value>
+        </item>
+        <item>
+            <key> <string>title</string> </key>
+            <value> <string>destination_function divergence tester</string> </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="2" aka="AAAAAAAAAAI=">
+    <pickle>
+      <tuple>
+        <global name="PersistentMapping" module="Persistence.mapping"/>
+        <tuple/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>data</string> </key>
+            <value>
+              <dictionary/>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="3" aka="AAAAAAAAAAM=">
+    <pickle>
+      <tuple>
+        <global name="PersistentMapping" module="Persistence.mapping"/>
+        <tuple/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>data</string> </key>
+            <value>
+              <dictionary/>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+</ZopeData>
diff --git a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_transaction_rule/destination_payment_tester.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_transaction_rule/destination_payment_tester.xml
new file mode 100644
index 0000000000000000000000000000000000000000..5238a91617d970ec1e24ac101a4c02111ebc8c5d
--- /dev/null
+++ b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_transaction_rule/destination_payment_tester.xml
@@ -0,0 +1,103 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <tuple>
+        <global name="CategoryMembershipDivergenceTester" module="Products.ERP5Type.Document.CategoryMembershipDivergenceTester"/>
+        <tuple/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>_Copy_or_Move_Permission</string> </key>
+            <value>
+              <list>
+                <string>Assignor</string>
+                <string>Manager</string>
+                <string>Owner</string>
+                <string>Authenticated</string>
+                <string>Owner</string>
+              </list>
+            </value>
+        </item>
+        <item>
+            <key> <string>_identity_criterion</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+            </value>
+        </item>
+        <item>
+            <key> <string>_range_criterion</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
+            </value>
+        </item>
+        <item>
+            <key> <string>divergence_provider</string> </key>
+            <value> <int>0</int> </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>destination_payment_tester</string> </value>
+        </item>
+        <item>
+            <key> <string>matching_provider</string> </key>
+            <value> <int>0</int> </value>
+        </item>
+        <item>
+            <key> <string>portal_type</string> </key>
+            <value> <string>Category Membership Divergence Tester</string> </value>
+        </item>
+        <item>
+            <key> <string>tested_property</string> </key>
+            <value>
+              <tuple>
+                <string>destination_payment</string>
+              </tuple>
+            </value>
+        </item>
+        <item>
+            <key> <string>title</string> </key>
+            <value> <string>destination_payment divergence tester</string> </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="2" aka="AAAAAAAAAAI=">
+    <pickle>
+      <tuple>
+        <global name="PersistentMapping" module="Persistence.mapping"/>
+        <tuple/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>data</string> </key>
+            <value>
+              <dictionary/>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="3" aka="AAAAAAAAAAM=">
+    <pickle>
+      <tuple>
+        <global name="PersistentMapping" module="Persistence.mapping"/>
+        <tuple/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>data</string> </key>
+            <value>
+              <dictionary/>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+</ZopeData>
diff --git a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_transaction_rule/destination_project_tester.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_transaction_rule/destination_project_tester.xml
new file mode 100644
index 0000000000000000000000000000000000000000..5d0adf9c6662ce299a5c0e163e232b9fc5d720a4
--- /dev/null
+++ b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_transaction_rule/destination_project_tester.xml
@@ -0,0 +1,103 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <tuple>
+        <global name="CategoryMembershipDivergenceTester" module="Products.ERP5Type.Document.CategoryMembershipDivergenceTester"/>
+        <tuple/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>_Copy_or_Move_Permission</string> </key>
+            <value>
+              <list>
+                <string>Assignor</string>
+                <string>Manager</string>
+                <string>Owner</string>
+                <string>Authenticated</string>
+                <string>Owner</string>
+              </list>
+            </value>
+        </item>
+        <item>
+            <key> <string>_identity_criterion</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+            </value>
+        </item>
+        <item>
+            <key> <string>_range_criterion</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
+            </value>
+        </item>
+        <item>
+            <key> <string>divergence_provider</string> </key>
+            <value> <int>0</int> </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>destination_project_tester</string> </value>
+        </item>
+        <item>
+            <key> <string>matching_provider</string> </key>
+            <value> <int>0</int> </value>
+        </item>
+        <item>
+            <key> <string>portal_type</string> </key>
+            <value> <string>Category Membership Divergence Tester</string> </value>
+        </item>
+        <item>
+            <key> <string>tested_property</string> </key>
+            <value>
+              <tuple>
+                <string>destination_project</string>
+              </tuple>
+            </value>
+        </item>
+        <item>
+            <key> <string>title</string> </key>
+            <value> <string>destination_project divergence tester</string> </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="2" aka="AAAAAAAAAAI=">
+    <pickle>
+      <tuple>
+        <global name="PersistentMapping" module="Persistence.mapping"/>
+        <tuple/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>data</string> </key>
+            <value>
+              <dictionary/>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="3" aka="AAAAAAAAAAM=">
+    <pickle>
+      <tuple>
+        <global name="PersistentMapping" module="Persistence.mapping"/>
+        <tuple/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>data</string> </key>
+            <value>
+              <dictionary/>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+</ZopeData>
diff --git a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_transaction_rule/destination_section_tester.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_transaction_rule/destination_section_tester.xml
new file mode 100644
index 0000000000000000000000000000000000000000..7c3615d889d33f2fdbaa8429ede82d2f5bbddf70
--- /dev/null
+++ b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_transaction_rule/destination_section_tester.xml
@@ -0,0 +1,103 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <tuple>
+        <global name="CategoryMembershipDivergenceTester" module="Products.ERP5Type.Document.CategoryMembershipDivergenceTester"/>
+        <tuple/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>_Copy_or_Move_Permission</string> </key>
+            <value>
+              <list>
+                <string>Assignor</string>
+                <string>Manager</string>
+                <string>Owner</string>
+                <string>Authenticated</string>
+                <string>Owner</string>
+              </list>
+            </value>
+        </item>
+        <item>
+            <key> <string>_identity_criterion</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+            </value>
+        </item>
+        <item>
+            <key> <string>_range_criterion</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
+            </value>
+        </item>
+        <item>
+            <key> <string>divergence_provider</string> </key>
+            <value> <int>0</int> </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>destination_section_tester</string> </value>
+        </item>
+        <item>
+            <key> <string>matching_provider</string> </key>
+            <value> <int>0</int> </value>
+        </item>
+        <item>
+            <key> <string>portal_type</string> </key>
+            <value> <string>Category Membership Divergence Tester</string> </value>
+        </item>
+        <item>
+            <key> <string>tested_property</string> </key>
+            <value>
+              <tuple>
+                <string>destination_section</string>
+              </tuple>
+            </value>
+        </item>
+        <item>
+            <key> <string>title</string> </key>
+            <value> <string>destination_section divergence tester</string> </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="2" aka="AAAAAAAAAAI=">
+    <pickle>
+      <tuple>
+        <global name="PersistentMapping" module="Persistence.mapping"/>
+        <tuple/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>data</string> </key>
+            <value>
+              <dictionary/>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="3" aka="AAAAAAAAAAM=">
+    <pickle>
+      <tuple>
+        <global name="PersistentMapping" module="Persistence.mapping"/>
+        <tuple/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>data</string> </key>
+            <value>
+              <dictionary/>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+</ZopeData>
diff --git a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_transaction_rule/destination_tester.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_transaction_rule/destination_tester.xml
new file mode 100644
index 0000000000000000000000000000000000000000..9627fdb094c2f385202a0a44664e94673b38f5d3
--- /dev/null
+++ b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_transaction_rule/destination_tester.xml
@@ -0,0 +1,103 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <tuple>
+        <global name="CategoryMembershipDivergenceTester" module="Products.ERP5Type.Document.CategoryMembershipDivergenceTester"/>
+        <tuple/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>_Copy_or_Move_Permission</string> </key>
+            <value>
+              <list>
+                <string>Assignor</string>
+                <string>Manager</string>
+                <string>Owner</string>
+                <string>Authenticated</string>
+                <string>Owner</string>
+              </list>
+            </value>
+        </item>
+        <item>
+            <key> <string>_identity_criterion</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+            </value>
+        </item>
+        <item>
+            <key> <string>_range_criterion</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
+            </value>
+        </item>
+        <item>
+            <key> <string>divergence_provider</string> </key>
+            <value> <int>0</int> </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>destination_tester</string> </value>
+        </item>
+        <item>
+            <key> <string>matching_provider</string> </key>
+            <value> <int>1</int> </value>
+        </item>
+        <item>
+            <key> <string>portal_type</string> </key>
+            <value> <string>Category Membership Divergence Tester</string> </value>
+        </item>
+        <item>
+            <key> <string>tested_property</string> </key>
+            <value>
+              <tuple>
+                <string>destination</string>
+              </tuple>
+            </value>
+        </item>
+        <item>
+            <key> <string>title</string> </key>
+            <value> <string>destination divergence tester</string> </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="2" aka="AAAAAAAAAAI=">
+    <pickle>
+      <tuple>
+        <global name="PersistentMapping" module="Persistence.mapping"/>
+        <tuple/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>data</string> </key>
+            <value>
+              <dictionary/>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="3" aka="AAAAAAAAAAM=">
+    <pickle>
+      <tuple>
+        <global name="PersistentMapping" module="Persistence.mapping"/>
+        <tuple/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>data</string> </key>
+            <value>
+              <dictionary/>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+</ZopeData>
diff --git a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_transaction_rule/destination_total_asset_price_tester.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_transaction_rule/destination_total_asset_price_tester.xml
new file mode 100644
index 0000000000000000000000000000000000000000..75e55c03c3ce0a81c29143ac4ea3ecae54b248e3
--- /dev/null
+++ b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_transaction_rule/destination_total_asset_price_tester.xml
@@ -0,0 +1,164 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <tuple>
+        <global name="FloatDivergenceTester" module="Products.ERP5Type.Document.FloatDivergenceTester"/>
+        <tuple/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>_identity_criterion</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+            </value>
+        </item>
+        <item>
+            <key> <string>_local_properties</string> </key>
+            <value>
+              <tuple>
+                <dictionary>
+                  <item>
+                      <key> <string>id</string> </key>
+                      <value> <string>decimal_alignment_enabled</string> </value>
+                  </item>
+                  <item>
+                      <key> <string>type</string> </key>
+                      <value> <string>int</string> </value>
+                  </item>
+                </dictionary>
+                <dictionary>
+                  <item>
+                      <key> <string>id</string> </key>
+                      <value> <string>tolerance_base</string> </value>
+                  </item>
+                  <item>
+                      <key> <string>type</string> </key>
+                      <value> <string>string</string> </value>
+                  </item>
+                </dictionary>
+                <dictionary>
+                  <item>
+                      <key> <string>id</string> </key>
+                      <value> <string>decimal_rouding_option</string> </value>
+                  </item>
+                  <item>
+                      <key> <string>type</string> </key>
+                      <value> <string>string</string> </value>
+                  </item>
+                </dictionary>
+                <dictionary>
+                  <item>
+                      <key> <string>id</string> </key>
+                      <value> <string>quantity</string> </value>
+                  </item>
+                  <item>
+                      <key> <string>type</string> </key>
+                      <value> <string>float</string> </value>
+                  </item>
+                </dictionary>
+              </tuple>
+            </value>
+        </item>
+        <item>
+            <key> <string>_range_criterion</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
+            </value>
+        </item>
+        <item>
+            <key> <string>decimal_alignment_enabled</string> </key>
+            <value> <int>0</int> </value>
+        </item>
+        <item>
+            <key> <string>decimal_rouding_option</string> </key>
+            <value> <string>FLOOR</string> </value>
+        </item>
+        <item>
+            <key> <string>description</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>divergence_provider</string> </key>
+            <value> <int>0</int> </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>destination_total_asset_price_tester</string> </value>
+        </item>
+        <item>
+            <key> <string>matching_provider</string> </key>
+            <value> <int>1</int> </value>
+        </item>
+        <item>
+            <key> <string>portal_type</string> </key>
+            <value> <string>Float Divergence Tester</string> </value>
+        </item>
+        <item>
+            <key> <string>quantity</string> </key>
+            <value> <float>0.0</float> </value>
+        </item>
+        <item>
+            <key> <string>tested_property</string> </key>
+            <value>
+              <tuple>
+                <string>destination_total_asset_price</string>
+              </tuple>
+            </value>
+        </item>
+        <item>
+            <key> <string>title</string> </key>
+            <value> <string>destination_total_asset_price divergence tester</string> </value>
+        </item>
+        <item>
+            <key> <string>tolerance_base</string> </key>
+            <value> <string>Quantity</string> </value>
+        </item>
+        <item>
+            <key> <string>updating_provider</string> </key>
+            <value> <int>1</int> </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="2" aka="AAAAAAAAAAI=">
+    <pickle>
+      <tuple>
+        <global name="PersistentMapping" module="Persistence.mapping"/>
+        <tuple/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>data</string> </key>
+            <value>
+              <dictionary/>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="3" aka="AAAAAAAAAAM=">
+    <pickle>
+      <tuple>
+        <global name="PersistentMapping" module="Persistence.mapping"/>
+        <tuple/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>data</string> </key>
+            <value>
+              <dictionary/>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+</ZopeData>
diff --git a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_transaction_rule/price_tester.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_transaction_rule/price_tester.xml
new file mode 100644
index 0000000000000000000000000000000000000000..b877d302cd08ee4e2ac0f08b32ad735157e047ee
--- /dev/null
+++ b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_transaction_rule/price_tester.xml
@@ -0,0 +1,124 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <tuple>
+        <global name="FloatDivergenceTester" module="Products.ERP5Type.Document.FloatDivergenceTester"/>
+        <tuple/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>_Copy_or_Move_Permission</string> </key>
+            <value>
+              <list>
+                <string>Assignor</string>
+                <string>Manager</string>
+                <string>Owner</string>
+                <string>Authenticated</string>
+                <string>Owner</string>
+              </list>
+            </value>
+        </item>
+        <item>
+            <key> <string>_identity_criterion</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+            </value>
+        </item>
+        <item>
+            <key> <string>_local_properties</string> </key>
+            <value>
+              <tuple>
+                <dictionary>
+                  <item>
+                      <key> <string>id</string> </key>
+                      <value> <string>quantity</string> </value>
+                  </item>
+                  <item>
+                      <key> <string>type</string> </key>
+                      <value> <string>int</string> </value>
+                  </item>
+                </dictionary>
+              </tuple>
+            </value>
+        </item>
+        <item>
+            <key> <string>_range_criterion</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
+            </value>
+        </item>
+        <item>
+            <key> <string>divergence_provider</string> </key>
+            <value> <int>0</int> </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>price_tester</string> </value>
+        </item>
+        <item>
+            <key> <string>matching_provider</string> </key>
+            <value> <int>0</int> </value>
+        </item>
+        <item>
+            <key> <string>portal_type</string> </key>
+            <value> <string>Float Divergence Tester</string> </value>
+        </item>
+        <item>
+            <key> <string>quantity</string> </key>
+            <value> <int>0</int> </value>
+        </item>
+        <item>
+            <key> <string>tested_property</string> </key>
+            <value>
+              <tuple>
+                <string>price</string>
+              </tuple>
+            </value>
+        </item>
+        <item>
+            <key> <string>title</string> </key>
+            <value> <string>price divergence tester</string> </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="2" aka="AAAAAAAAAAI=">
+    <pickle>
+      <tuple>
+        <global name="PersistentMapping" module="Persistence.mapping"/>
+        <tuple/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>data</string> </key>
+            <value>
+              <dictionary/>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="3" aka="AAAAAAAAAAM=">
+    <pickle>
+      <tuple>
+        <global name="PersistentMapping" module="Persistence.mapping"/>
+        <tuple/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>data</string> </key>
+            <value>
+              <dictionary/>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+</ZopeData>
diff --git a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_payment_rule/19.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_transaction_rule/quantity_tester.xml
similarity index 86%
rename from bt5/erp5_simulation/PathTemplateItem/portal_rules/new_payment_rule/19.xml
rename to bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_transaction_rule/quantity_tester.xml
index 952442b891a18e8bb9b06e5d8a8bc193c53a2d94..b34e71defec25a045bdcb54cb58247c5b89c8a37 100644
--- a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_payment_rule/19.xml
+++ b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_transaction_rule/quantity_tester.xml
@@ -22,7 +22,7 @@
                 <dictionary>
                   <item>
                       <key> <string>id</string> </key>
-                      <value> <string>quantity</string> </value>
+                      <value> <string>use_delivery_ratio</string> </value>
                   </item>
                   <item>
                       <key> <string>type</string> </key>
@@ -32,7 +32,7 @@
                 <dictionary>
                   <item>
                       <key> <string>id</string> </key>
-                      <value> <string>use_delivery_ratio</string> </value>
+                      <value> <string>quantity</string> </value>
                   </item>
                   <item>
                       <key> <string>type</string> </key>
@@ -49,24 +49,12 @@
             </value>
         </item>
         <item>
-            <key> <string>categories</string> </key>
-            <value>
-              <tuple>
-                <string>solver/portal_types/Quantity Accept Solver</string>
-                <string>solver/portal_types/Quantity Adoption Solver</string>
-                <string>solver/portal_types/Quantity Split Solver</string>
-              </tuple>
-            </value>
-        </item>
-        <item>
-            <key> <string>description</string> </key>
-            <value>
-              <none/>
-            </value>
+            <key> <string>divergence_provider</string> </key>
+            <value> <int>0</int> </value>
         </item>
         <item>
             <key> <string>id</string> </key>
-            <value> <string>19</string> </value>
+            <value> <string>quantity_tester</string> </value>
         </item>
         <item>
             <key> <string>portal_type</string> </key>
@@ -81,6 +69,7 @@
             <value>
               <tuple>
                 <string>quantity</string>
+                <string>quantity_unit</string>
               </tuple>
             </value>
         </item>
diff --git a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_transaction_rule/resource_tester.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_transaction_rule/resource_tester.xml
new file mode 100644
index 0000000000000000000000000000000000000000..f4fa8e2d8b0d466682972fd1585bccf1e5b37260
--- /dev/null
+++ b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_transaction_rule/resource_tester.xml
@@ -0,0 +1,103 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <tuple>
+        <global name="CategoryMembershipDivergenceTester" module="Products.ERP5Type.Document.CategoryMembershipDivergenceTester"/>
+        <tuple/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>_Copy_or_Move_Permission</string> </key>
+            <value>
+              <list>
+                <string>Assignor</string>
+                <string>Manager</string>
+                <string>Owner</string>
+                <string>Authenticated</string>
+                <string>Owner</string>
+              </list>
+            </value>
+        </item>
+        <item>
+            <key> <string>_identity_criterion</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+            </value>
+        </item>
+        <item>
+            <key> <string>_range_criterion</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
+            </value>
+        </item>
+        <item>
+            <key> <string>divergence_provider</string> </key>
+            <value> <int>0</int> </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>resource_tester</string> </value>
+        </item>
+        <item>
+            <key> <string>matching_provider</string> </key>
+            <value> <int>1</int> </value>
+        </item>
+        <item>
+            <key> <string>portal_type</string> </key>
+            <value> <string>Category Membership Divergence Tester</string> </value>
+        </item>
+        <item>
+            <key> <string>tested_property</string> </key>
+            <value>
+              <tuple>
+                <string>resource</string>
+              </tuple>
+            </value>
+        </item>
+        <item>
+            <key> <string>title</string> </key>
+            <value> <string>resource divergence tester</string> </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="2" aka="AAAAAAAAAAI=">
+    <pickle>
+      <tuple>
+        <global name="PersistentMapping" module="Persistence.mapping"/>
+        <tuple/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>data</string> </key>
+            <value>
+              <dictionary/>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="3" aka="AAAAAAAAAAM=">
+    <pickle>
+      <tuple>
+        <global name="PersistentMapping" module="Persistence.mapping"/>
+        <tuple/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>data</string> </key>
+            <value>
+              <dictionary/>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+</ZopeData>
diff --git a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_transaction_rule/source_administration_tester.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_transaction_rule/source_administration_tester.xml
new file mode 100644
index 0000000000000000000000000000000000000000..20a5eb3bf3fab3e08826234ba6c987f904836348
--- /dev/null
+++ b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_transaction_rule/source_administration_tester.xml
@@ -0,0 +1,103 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <tuple>
+        <global name="CategoryMembershipDivergenceTester" module="Products.ERP5Type.Document.CategoryMembershipDivergenceTester"/>
+        <tuple/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>_Copy_or_Move_Permission</string> </key>
+            <value>
+              <list>
+                <string>Assignor</string>
+                <string>Manager</string>
+                <string>Owner</string>
+                <string>Authenticated</string>
+                <string>Owner</string>
+              </list>
+            </value>
+        </item>
+        <item>
+            <key> <string>_identity_criterion</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+            </value>
+        </item>
+        <item>
+            <key> <string>_range_criterion</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
+            </value>
+        </item>
+        <item>
+            <key> <string>divergence_provider</string> </key>
+            <value> <int>0</int> </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>source_administration_tester</string> </value>
+        </item>
+        <item>
+            <key> <string>matching_provider</string> </key>
+            <value> <int>0</int> </value>
+        </item>
+        <item>
+            <key> <string>portal_type</string> </key>
+            <value> <string>Category Membership Divergence Tester</string> </value>
+        </item>
+        <item>
+            <key> <string>tested_property</string> </key>
+            <value>
+              <tuple>
+                <string>source_administration</string>
+              </tuple>
+            </value>
+        </item>
+        <item>
+            <key> <string>title</string> </key>
+            <value> <string>source_administration divergence tester</string> </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="2" aka="AAAAAAAAAAI=">
+    <pickle>
+      <tuple>
+        <global name="PersistentMapping" module="Persistence.mapping"/>
+        <tuple/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>data</string> </key>
+            <value>
+              <dictionary/>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="3" aka="AAAAAAAAAAM=">
+    <pickle>
+      <tuple>
+        <global name="PersistentMapping" module="Persistence.mapping"/>
+        <tuple/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>data</string> </key>
+            <value>
+              <dictionary/>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+</ZopeData>
diff --git a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_transaction_rule/source_decision_tester.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_transaction_rule/source_decision_tester.xml
new file mode 100644
index 0000000000000000000000000000000000000000..c4ea13bac96e4b6bc4c5defdfa78f5882e1cb493
--- /dev/null
+++ b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_transaction_rule/source_decision_tester.xml
@@ -0,0 +1,103 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <tuple>
+        <global name="CategoryMembershipDivergenceTester" module="Products.ERP5Type.Document.CategoryMembershipDivergenceTester"/>
+        <tuple/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>_Copy_or_Move_Permission</string> </key>
+            <value>
+              <list>
+                <string>Assignor</string>
+                <string>Manager</string>
+                <string>Owner</string>
+                <string>Authenticated</string>
+                <string>Owner</string>
+              </list>
+            </value>
+        </item>
+        <item>
+            <key> <string>_identity_criterion</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+            </value>
+        </item>
+        <item>
+            <key> <string>_range_criterion</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
+            </value>
+        </item>
+        <item>
+            <key> <string>divergence_provider</string> </key>
+            <value> <int>0</int> </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>source_decision_tester</string> </value>
+        </item>
+        <item>
+            <key> <string>matching_provider</string> </key>
+            <value> <int>0</int> </value>
+        </item>
+        <item>
+            <key> <string>portal_type</string> </key>
+            <value> <string>Category Membership Divergence Tester</string> </value>
+        </item>
+        <item>
+            <key> <string>tested_property</string> </key>
+            <value>
+              <tuple>
+                <string>source_decision</string>
+              </tuple>
+            </value>
+        </item>
+        <item>
+            <key> <string>title</string> </key>
+            <value> <string>source_decision divergence tester</string> </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="2" aka="AAAAAAAAAAI=">
+    <pickle>
+      <tuple>
+        <global name="PersistentMapping" module="Persistence.mapping"/>
+        <tuple/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>data</string> </key>
+            <value>
+              <dictionary/>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="3" aka="AAAAAAAAAAM=">
+    <pickle>
+      <tuple>
+        <global name="PersistentMapping" module="Persistence.mapping"/>
+        <tuple/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>data</string> </key>
+            <value>
+              <dictionary/>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+</ZopeData>
diff --git a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_transaction_rule/source_function_tester.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_transaction_rule/source_function_tester.xml
new file mode 100644
index 0000000000000000000000000000000000000000..adc176aad32f2f03b1fcdba60a7b78f68340d5f0
--- /dev/null
+++ b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_transaction_rule/source_function_tester.xml
@@ -0,0 +1,103 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <tuple>
+        <global name="CategoryMembershipDivergenceTester" module="Products.ERP5Type.Document.CategoryMembershipDivergenceTester"/>
+        <tuple/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>_Copy_or_Move_Permission</string> </key>
+            <value>
+              <list>
+                <string>Assignor</string>
+                <string>Manager</string>
+                <string>Owner</string>
+                <string>Authenticated</string>
+                <string>Owner</string>
+              </list>
+            </value>
+        </item>
+        <item>
+            <key> <string>_identity_criterion</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+            </value>
+        </item>
+        <item>
+            <key> <string>_range_criterion</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
+            </value>
+        </item>
+        <item>
+            <key> <string>divergence_provider</string> </key>
+            <value> <int>0</int> </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>source_function_tester</string> </value>
+        </item>
+        <item>
+            <key> <string>matching_provider</string> </key>
+            <value> <int>0</int> </value>
+        </item>
+        <item>
+            <key> <string>portal_type</string> </key>
+            <value> <string>Category Membership Divergence Tester</string> </value>
+        </item>
+        <item>
+            <key> <string>tested_property</string> </key>
+            <value>
+              <tuple>
+                <string>source_function</string>
+              </tuple>
+            </value>
+        </item>
+        <item>
+            <key> <string>title</string> </key>
+            <value> <string>source_function divergence tester</string> </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="2" aka="AAAAAAAAAAI=">
+    <pickle>
+      <tuple>
+        <global name="PersistentMapping" module="Persistence.mapping"/>
+        <tuple/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>data</string> </key>
+            <value>
+              <dictionary/>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="3" aka="AAAAAAAAAAM=">
+    <pickle>
+      <tuple>
+        <global name="PersistentMapping" module="Persistence.mapping"/>
+        <tuple/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>data</string> </key>
+            <value>
+              <dictionary/>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+</ZopeData>
diff --git a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_transaction_rule/source_payment_tester.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_transaction_rule/source_payment_tester.xml
new file mode 100644
index 0000000000000000000000000000000000000000..0491ea1860b2295b8b60549a7bb2c92c6840a1c0
--- /dev/null
+++ b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_transaction_rule/source_payment_tester.xml
@@ -0,0 +1,103 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <tuple>
+        <global name="CategoryMembershipDivergenceTester" module="Products.ERP5Type.Document.CategoryMembershipDivergenceTester"/>
+        <tuple/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>_Copy_or_Move_Permission</string> </key>
+            <value>
+              <list>
+                <string>Assignor</string>
+                <string>Manager</string>
+                <string>Owner</string>
+                <string>Authenticated</string>
+                <string>Owner</string>
+              </list>
+            </value>
+        </item>
+        <item>
+            <key> <string>_identity_criterion</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+            </value>
+        </item>
+        <item>
+            <key> <string>_range_criterion</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
+            </value>
+        </item>
+        <item>
+            <key> <string>divergence_provider</string> </key>
+            <value> <int>0</int> </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>source_payment_tester</string> </value>
+        </item>
+        <item>
+            <key> <string>matching_provider</string> </key>
+            <value> <int>0</int> </value>
+        </item>
+        <item>
+            <key> <string>portal_type</string> </key>
+            <value> <string>Category Membership Divergence Tester</string> </value>
+        </item>
+        <item>
+            <key> <string>tested_property</string> </key>
+            <value>
+              <tuple>
+                <string>source_payment</string>
+              </tuple>
+            </value>
+        </item>
+        <item>
+            <key> <string>title</string> </key>
+            <value> <string>source_payment divergence tester</string> </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="2" aka="AAAAAAAAAAI=">
+    <pickle>
+      <tuple>
+        <global name="PersistentMapping" module="Persistence.mapping"/>
+        <tuple/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>data</string> </key>
+            <value>
+              <dictionary/>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="3" aka="AAAAAAAAAAM=">
+    <pickle>
+      <tuple>
+        <global name="PersistentMapping" module="Persistence.mapping"/>
+        <tuple/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>data</string> </key>
+            <value>
+              <dictionary/>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+</ZopeData>
diff --git a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_transaction_rule/source_project_tester.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_transaction_rule/source_project_tester.xml
new file mode 100644
index 0000000000000000000000000000000000000000..7f5683c094cff5799cae040b875bc4dbbff32f6a
--- /dev/null
+++ b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_transaction_rule/source_project_tester.xml
@@ -0,0 +1,103 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <tuple>
+        <global name="CategoryMembershipDivergenceTester" module="Products.ERP5Type.Document.CategoryMembershipDivergenceTester"/>
+        <tuple/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>_Copy_or_Move_Permission</string> </key>
+            <value>
+              <list>
+                <string>Assignor</string>
+                <string>Manager</string>
+                <string>Owner</string>
+                <string>Authenticated</string>
+                <string>Owner</string>
+              </list>
+            </value>
+        </item>
+        <item>
+            <key> <string>_identity_criterion</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+            </value>
+        </item>
+        <item>
+            <key> <string>_range_criterion</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
+            </value>
+        </item>
+        <item>
+            <key> <string>divergence_provider</string> </key>
+            <value> <int>0</int> </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>source_project_tester</string> </value>
+        </item>
+        <item>
+            <key> <string>matching_provider</string> </key>
+            <value> <int>0</int> </value>
+        </item>
+        <item>
+            <key> <string>portal_type</string> </key>
+            <value> <string>Category Membership Divergence Tester</string> </value>
+        </item>
+        <item>
+            <key> <string>tested_property</string> </key>
+            <value>
+              <tuple>
+                <string>source_project</string>
+              </tuple>
+            </value>
+        </item>
+        <item>
+            <key> <string>title</string> </key>
+            <value> <string>source_project divergence tester</string> </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="2" aka="AAAAAAAAAAI=">
+    <pickle>
+      <tuple>
+        <global name="PersistentMapping" module="Persistence.mapping"/>
+        <tuple/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>data</string> </key>
+            <value>
+              <dictionary/>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="3" aka="AAAAAAAAAAM=">
+    <pickle>
+      <tuple>
+        <global name="PersistentMapping" module="Persistence.mapping"/>
+        <tuple/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>data</string> </key>
+            <value>
+              <dictionary/>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+</ZopeData>
diff --git a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_transaction_rule/source_section_tester.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_transaction_rule/source_section_tester.xml
new file mode 100644
index 0000000000000000000000000000000000000000..e589aa45588dbbf6f38c99c8d9ccc16dd19666f0
--- /dev/null
+++ b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_transaction_rule/source_section_tester.xml
@@ -0,0 +1,103 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <tuple>
+        <global name="CategoryMembershipDivergenceTester" module="Products.ERP5Type.Document.CategoryMembershipDivergenceTester"/>
+        <tuple/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>_Copy_or_Move_Permission</string> </key>
+            <value>
+              <list>
+                <string>Assignor</string>
+                <string>Manager</string>
+                <string>Owner</string>
+                <string>Authenticated</string>
+                <string>Owner</string>
+              </list>
+            </value>
+        </item>
+        <item>
+            <key> <string>_identity_criterion</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+            </value>
+        </item>
+        <item>
+            <key> <string>_range_criterion</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
+            </value>
+        </item>
+        <item>
+            <key> <string>divergence_provider</string> </key>
+            <value> <int>0</int> </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>source_section_tester</string> </value>
+        </item>
+        <item>
+            <key> <string>matching_provider</string> </key>
+            <value> <int>0</int> </value>
+        </item>
+        <item>
+            <key> <string>portal_type</string> </key>
+            <value> <string>Category Membership Divergence Tester</string> </value>
+        </item>
+        <item>
+            <key> <string>tested_property</string> </key>
+            <value>
+              <tuple>
+                <string>source_section</string>
+              </tuple>
+            </value>
+        </item>
+        <item>
+            <key> <string>title</string> </key>
+            <value> <string>source_section divergence tester</string> </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="2" aka="AAAAAAAAAAI=">
+    <pickle>
+      <tuple>
+        <global name="PersistentMapping" module="Persistence.mapping"/>
+        <tuple/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>data</string> </key>
+            <value>
+              <dictionary/>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="3" aka="AAAAAAAAAAM=">
+    <pickle>
+      <tuple>
+        <global name="PersistentMapping" module="Persistence.mapping"/>
+        <tuple/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>data</string> </key>
+            <value>
+              <dictionary/>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+</ZopeData>
diff --git a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_payment_rule/21.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_transaction_rule/source_tester.xml
similarity index 83%
rename from bt5/erp5_simulation/PathTemplateItem/portal_rules/new_payment_rule/21.xml
rename to bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_transaction_rule/source_tester.xml
index de8fc7dc559b4cd13e54f43a707a25804d76ae4b..e945dc99f6e65c526dcc8461675e9b61f81c2df3 100644
--- a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_payment_rule/21.xml
+++ b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_transaction_rule/source_tester.xml
@@ -10,27 +10,27 @@
     <pickle>
       <dictionary>
         <item>
-            <key> <string>_identity_criterion</string> </key>
-            <value>
-              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
-            </value>
-        </item>
-        <item>
-            <key> <string>_range_criterion</string> </key>
+            <key> <string>_Copy_or_Move_Permission</string> </key>
             <value>
-              <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
+              <list>
+                <string>Assignor</string>
+                <string>Manager</string>
+                <string>Owner</string>
+                <string>Authenticated</string>
+                <string>Owner</string>
+              </list>
             </value>
         </item>
         <item>
-            <key> <string>categories</string> </key>
+            <key> <string>_identity_criterion</string> </key>
             <value>
-              <tuple/>
+              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
             </value>
         </item>
         <item>
-            <key> <string>description</string> </key>
+            <key> <string>_range_criterion</string> </key>
             <value>
-              <none/>
+              <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
             </value>
         </item>
         <item>
@@ -39,7 +39,7 @@
         </item>
         <item>
             <key> <string>id</string> </key>
-            <value> <string>21</string> </value>
+            <value> <string>source_tester</string> </value>
         </item>
         <item>
             <key> <string>matching_provider</string> </key>
@@ -53,13 +53,13 @@
             <key> <string>tested_property</string> </key>
             <value>
               <tuple>
-                <string>quantity_unit</string>
+                <string>source</string>
               </tuple>
             </value>
         </item>
         <item>
             <key> <string>title</string> </key>
-            <value> <string>quantity unit divergence tester</string> </value>
+            <value> <string>source divergence tester</string> </value>
         </item>
       </dictionary>
     </pickle>
diff --git a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_transaction_rule/source_total_asset_price_tester.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_transaction_rule/source_total_asset_price_tester.xml
new file mode 100644
index 0000000000000000000000000000000000000000..49d9e39edf4836ecfda1249f2ec861ea683a3126
--- /dev/null
+++ b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_transaction_rule/source_total_asset_price_tester.xml
@@ -0,0 +1,164 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <tuple>
+        <global name="FloatDivergenceTester" module="Products.ERP5Type.Document.FloatDivergenceTester"/>
+        <tuple/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>_identity_criterion</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+            </value>
+        </item>
+        <item>
+            <key> <string>_local_properties</string> </key>
+            <value>
+              <tuple>
+                <dictionary>
+                  <item>
+                      <key> <string>id</string> </key>
+                      <value> <string>decimal_alignment_enabled</string> </value>
+                  </item>
+                  <item>
+                      <key> <string>type</string> </key>
+                      <value> <string>int</string> </value>
+                  </item>
+                </dictionary>
+                <dictionary>
+                  <item>
+                      <key> <string>id</string> </key>
+                      <value> <string>tolerance_base</string> </value>
+                  </item>
+                  <item>
+                      <key> <string>type</string> </key>
+                      <value> <string>string</string> </value>
+                  </item>
+                </dictionary>
+                <dictionary>
+                  <item>
+                      <key> <string>id</string> </key>
+                      <value> <string>decimal_rouding_option</string> </value>
+                  </item>
+                  <item>
+                      <key> <string>type</string> </key>
+                      <value> <string>string</string> </value>
+                  </item>
+                </dictionary>
+                <dictionary>
+                  <item>
+                      <key> <string>id</string> </key>
+                      <value> <string>quantity</string> </value>
+                  </item>
+                  <item>
+                      <key> <string>type</string> </key>
+                      <value> <string>float</string> </value>
+                  </item>
+                </dictionary>
+              </tuple>
+            </value>
+        </item>
+        <item>
+            <key> <string>_range_criterion</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
+            </value>
+        </item>
+        <item>
+            <key> <string>decimal_alignment_enabled</string> </key>
+            <value> <int>0</int> </value>
+        </item>
+        <item>
+            <key> <string>decimal_rouding_option</string> </key>
+            <value> <string>FLOOR</string> </value>
+        </item>
+        <item>
+            <key> <string>description</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>divergence_provider</string> </key>
+            <value> <int>0</int> </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>source_total_asset_price_tester</string> </value>
+        </item>
+        <item>
+            <key> <string>matching_provider</string> </key>
+            <value> <int>1</int> </value>
+        </item>
+        <item>
+            <key> <string>portal_type</string> </key>
+            <value> <string>Float Divergence Tester</string> </value>
+        </item>
+        <item>
+            <key> <string>quantity</string> </key>
+            <value> <float>0.0</float> </value>
+        </item>
+        <item>
+            <key> <string>tested_property</string> </key>
+            <value>
+              <tuple>
+                <string>source_total_asset_price</string>
+              </tuple>
+            </value>
+        </item>
+        <item>
+            <key> <string>title</string> </key>
+            <value> <string>source_total_asset_price divergence tester</string> </value>
+        </item>
+        <item>
+            <key> <string>tolerance_base</string> </key>
+            <value> <string>Quantity</string> </value>
+        </item>
+        <item>
+            <key> <string>updating_provider</string> </key>
+            <value> <int>1</int> </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="2" aka="AAAAAAAAAAI=">
+    <pickle>
+      <tuple>
+        <global name="PersistentMapping" module="Persistence.mapping"/>
+        <tuple/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>data</string> </key>
+            <value>
+              <dictionary/>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="3" aka="AAAAAAAAAAM=">
+    <pickle>
+      <tuple>
+        <global name="PersistentMapping" module="Persistence.mapping"/>
+        <tuple/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>data</string> </key>
+            <value>
+              <dictionary/>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+</ZopeData>
diff --git a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_payment_rule/17.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_transaction_rule/start_date_tester.xml
similarity index 82%
rename from bt5/erp5_simulation/PathTemplateItem/portal_rules/new_payment_rule/17.xml
rename to bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_transaction_rule/start_date_tester.xml
index eef1e34267c96ea85a10238d94937f43f5ce3047..cdb5c01668c623aca788b0d1006df682540dddb6 100644
--- a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_payment_rule/17.xml
+++ b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_transaction_rule/start_date_tester.xml
@@ -9,6 +9,18 @@
     </pickle>
     <pickle>
       <dictionary>
+        <item>
+            <key> <string>_Copy_or_Move_Permission</string> </key>
+            <value>
+              <list>
+                <string>Assignor</string>
+                <string>Manager</string>
+                <string>Owner</string>
+                <string>Authenticated</string>
+                <string>Owner</string>
+              </list>
+            </value>
+        </item>
         <item>
             <key> <string>_identity_criterion</string> </key>
             <value>
@@ -39,22 +51,16 @@
             </value>
         </item>
         <item>
-            <key> <string>categories</string> </key>
-            <value>
-              <tuple>
-                <string>solver/portal_types/Start Date Replacement Solver</string>
-              </tuple>
-            </value>
+            <key> <string>divergence_provider</string> </key>
+            <value> <int>0</int> </value>
         </item>
         <item>
-            <key> <string>description</string> </key>
-            <value>
-              <none/>
-            </value>
+            <key> <string>id</string> </key>
+            <value> <string>start_date_tester</string> </value>
         </item>
         <item>
-            <key> <string>id</string> </key>
-            <value> <string>17</string> </value>
+            <key> <string>matching_provider</string> </key>
+            <value> <int>0</int> </value>
         </item>
         <item>
             <key> <string>portal_type</string> </key>
diff --git a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_transaction_rule/stop_date_tester.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_transaction_rule/stop_date_tester.xml
new file mode 100644
index 0000000000000000000000000000000000000000..fcf0dd2c6fe2f432cfb3a64fbb2fd98336124e1c
--- /dev/null
+++ b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_transaction_rule/stop_date_tester.xml
@@ -0,0 +1,124 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <tuple>
+        <global name="DateTimeDivergenceTester" module="Products.ERP5Type.Document.DateTimeDivergenceTester"/>
+        <tuple/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>_Copy_or_Move_Permission</string> </key>
+            <value>
+              <list>
+                <string>Assignor</string>
+                <string>Manager</string>
+                <string>Owner</string>
+                <string>Authenticated</string>
+                <string>Owner</string>
+              </list>
+            </value>
+        </item>
+        <item>
+            <key> <string>_identity_criterion</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+            </value>
+        </item>
+        <item>
+            <key> <string>_local_properties</string> </key>
+            <value>
+              <tuple>
+                <dictionary>
+                  <item>
+                      <key> <string>id</string> </key>
+                      <value> <string>quantity</string> </value>
+                  </item>
+                  <item>
+                      <key> <string>type</string> </key>
+                      <value> <string>int</string> </value>
+                  </item>
+                </dictionary>
+              </tuple>
+            </value>
+        </item>
+        <item>
+            <key> <string>_range_criterion</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
+            </value>
+        </item>
+        <item>
+            <key> <string>divergence_provider</string> </key>
+            <value> <int>0</int> </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>stop_date_tester</string> </value>
+        </item>
+        <item>
+            <key> <string>matching_provider</string> </key>
+            <value> <int>0</int> </value>
+        </item>
+        <item>
+            <key> <string>portal_type</string> </key>
+            <value> <string>DateTime Divergence Tester</string> </value>
+        </item>
+        <item>
+            <key> <string>quantity</string> </key>
+            <value> <int>0</int> </value>
+        </item>
+        <item>
+            <key> <string>tested_property</string> </key>
+            <value>
+              <tuple>
+                <string>stop_date</string>
+              </tuple>
+            </value>
+        </item>
+        <item>
+            <key> <string>title</string> </key>
+            <value> <string>stop_date divergence tester</string> </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="2" aka="AAAAAAAAAAI=">
+    <pickle>
+      <tuple>
+        <global name="PersistentMapping" module="Persistence.mapping"/>
+        <tuple/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>data</string> </key>
+            <value>
+              <dictionary/>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="3" aka="AAAAAAAAAAM=">
+    <pickle>
+      <tuple>
+        <global name="PersistentMapping" module="Persistence.mapping"/>
+        <tuple/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>data</string> </key>
+            <value>
+              <dictionary/>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+</ZopeData>
diff --git a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoicing_rule.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoicing_rule.xml
index 9a99ed3f8b3daa8313ebfb9198203524c131ece5..e0143855a96009d58179212fb04015e89f30d6d9 100644
--- a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoicing_rule.xml
+++ b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoicing_rule.xml
@@ -16,17 +16,29 @@
             </value>
         </item>
         <item>
-            <key> <string>_mt_index</string> </key>
+            <key> <string>_identity_criterion</string> </key>
             <value>
               <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
             </value>
         </item>
         <item>
-            <key> <string>_tree</string> </key>
+            <key> <string>_mt_index</string> </key>
             <value>
               <persistent> <string encoding="base64">AAAAAAAAAAQ=</string> </persistent>
             </value>
         </item>
+        <item>
+            <key> <string>_range_criterion</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAU=</string> </persistent>
+            </value>
+        </item>
+        <item>
+            <key> <string>_tree</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAY=</string> </persistent>
+            </value>
+        </item>
         <item>
             <key> <string>categories</string> </key>
             <value>
@@ -39,6 +51,12 @@
             <key> <string>default_reference</string> </key>
             <value> <string>default_invoicing_rule</string> </value>
         </item>
+        <item>
+            <key> <string>description</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
         <item>
             <key> <string>id</string> </key>
             <value> <string>new_invoicing_rule</string> </value>
@@ -77,6 +95,24 @@
     <pickle> <int>0</int> </pickle>
   </record>
   <record id="3" aka="AAAAAAAAAAM=">
+    <pickle>
+      <tuple>
+        <global name="PersistentMapping" module="Persistence.mapping"/>
+        <tuple/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>data</string> </key>
+            <value>
+              <dictionary/>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="4" aka="AAAAAAAAAAQ=">
     <pickle>
       <global name="OOBTree" module="BTrees._OOBTree"/>
     </pickle>
@@ -84,7 +120,35 @@
       <none/>
     </pickle>
   </record>
-  <record id="4" aka="AAAAAAAAAAQ=">
+  <record id="5" aka="AAAAAAAAAAU=">
+    <pickle>
+      <tuple>
+        <global name="PersistentMapping" module="Persistence.mapping"/>
+        <tuple/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>data</string> </key>
+            <value>
+              <dictionary>
+                <item>
+                    <key> <string>start_date</string> </key>
+                    <value>
+                      <tuple>
+                        <none/>
+                        <none/>
+                      </tuple>
+                    </value>
+                </item>
+              </dictionary>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="6" aka="AAAAAAAAAAY=">
     <pickle>
       <global name="OOBTree" module="BTrees._OOBTree"/>
     </pickle>
diff --git a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_payment_rule.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_payment_rule.xml
index badeb54e73e4610807ad31551348b011ac9b7158..458dabe853fa20a89853f2a758a049dc5fc95521 100644
--- a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_payment_rule.xml
+++ b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_payment_rule.xml
@@ -16,17 +16,29 @@
             </value>
         </item>
         <item>
-            <key> <string>_mt_index</string> </key>
+            <key> <string>_identity_criterion</string> </key>
             <value>
               <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
             </value>
         </item>
         <item>
-            <key> <string>_tree</string> </key>
+            <key> <string>_mt_index</string> </key>
             <value>
               <persistent> <string encoding="base64">AAAAAAAAAAQ=</string> </persistent>
             </value>
         </item>
+        <item>
+            <key> <string>_range_criterion</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAU=</string> </persistent>
+            </value>
+        </item>
+        <item>
+            <key> <string>_tree</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAY=</string> </persistent>
+            </value>
+        </item>
         <item>
             <key> <string>categories</string> </key>
             <value>
@@ -39,6 +51,12 @@
             <key> <string>default_reference</string> </key>
             <value> <string>default_payment_rule</string> </value>
         </item>
+        <item>
+            <key> <string>description</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
         <item>
             <key> <string>id</string> </key>
             <value> <string>new_payment_rule</string> </value>
@@ -77,6 +95,24 @@
     <pickle> <int>0</int> </pickle>
   </record>
   <record id="3" aka="AAAAAAAAAAM=">
+    <pickle>
+      <tuple>
+        <global name="PersistentMapping" module="Persistence.mapping"/>
+        <tuple/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>data</string> </key>
+            <value>
+              <dictionary/>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="4" aka="AAAAAAAAAAQ=">
     <pickle>
       <global name="OOBTree" module="BTrees._OOBTree"/>
     </pickle>
@@ -84,7 +120,35 @@
       <none/>
     </pickle>
   </record>
-  <record id="4" aka="AAAAAAAAAAQ=">
+  <record id="5" aka="AAAAAAAAAAU=">
+    <pickle>
+      <tuple>
+        <global name="PersistentMapping" module="Persistence.mapping"/>
+        <tuple/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>data</string> </key>
+            <value>
+              <dictionary>
+                <item>
+                    <key> <string>start_date</string> </key>
+                    <value>
+                      <tuple>
+                        <none/>
+                        <none/>
+                      </tuple>
+                    </value>
+                </item>
+              </dictionary>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="6" aka="AAAAAAAAAAY=">
     <pickle>
       <global name="OOBTree" module="BTrees._OOBTree"/>
     </pickle>
diff --git a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_payment_rule/10.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_payment_rule/10.xml
deleted file mode 100644
index bfe7c5da5b9be67e8ceedb8c8512fd0fae8a7074..0000000000000000000000000000000000000000
--- a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_payment_rule/10.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0"?>
-<ZopeData>
-  <record id="1" aka="AAAAAAAAAAE=">
-    <pickle>
-      <tuple>
-        <global name="CategoryMembershipDivergenceTester" module="Products.ERP5Type.Document.CategoryMembershipDivergenceTester"/>
-        <tuple/>
-      </tuple>
-    </pickle>
-    <pickle>
-      <dictionary>
-        <item>
-            <key> <string>id</string> </key>
-            <value> <string>10</string> </value>
-        </item>
-        <item>
-            <key> <string>matching_provider</string> </key>
-            <value> <int>1</int> </value>
-        </item>
-        <item>
-            <key> <string>portal_type</string> </key>
-            <value> <string>Category Membership Divergence Tester</string> </value>
-        </item>
-        <item>
-            <key> <string>tested_property</string> </key>
-            <value>
-              <tuple>
-                <string>source</string>
-              </tuple>
-            </value>
-        </item>
-        <item>
-            <key> <string>title</string> </key>
-            <value> <string>source divergence tester</string> </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
-</ZopeData>
diff --git a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_payment_rule/11.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_payment_rule/11.xml
deleted file mode 100644
index c5d12ecf9b8f9ffc85930bd9bae3c253380c53d1..0000000000000000000000000000000000000000
--- a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_payment_rule/11.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0"?>
-<ZopeData>
-  <record id="1" aka="AAAAAAAAAAE=">
-    <pickle>
-      <tuple>
-        <global name="CategoryMembershipDivergenceTester" module="Products.ERP5Type.Document.CategoryMembershipDivergenceTester"/>
-        <tuple/>
-      </tuple>
-    </pickle>
-    <pickle>
-      <dictionary>
-        <item>
-            <key> <string>id</string> </key>
-            <value> <string>11</string> </value>
-        </item>
-        <item>
-            <key> <string>portal_type</string> </key>
-            <value> <string>Category Membership Divergence Tester</string> </value>
-        </item>
-        <item>
-            <key> <string>tested_property</string> </key>
-            <value>
-              <tuple>
-                <string>source_account</string>
-              </tuple>
-            </value>
-        </item>
-        <item>
-            <key> <string>title</string> </key>
-            <value> <string>source_account divergence tester</string> </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
-</ZopeData>
diff --git a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_payment_rule/12.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_payment_rule/12.xml
deleted file mode 100644
index 54a763bd761ba87e0f7c361249554008d7b3e5eb..0000000000000000000000000000000000000000
--- a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_payment_rule/12.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0"?>
-<ZopeData>
-  <record id="1" aka="AAAAAAAAAAE=">
-    <pickle>
-      <tuple>
-        <global name="CategoryMembershipDivergenceTester" module="Products.ERP5Type.Document.CategoryMembershipDivergenceTester"/>
-        <tuple/>
-      </tuple>
-    </pickle>
-    <pickle>
-      <dictionary>
-        <item>
-            <key> <string>id</string> </key>
-            <value> <string>12</string> </value>
-        </item>
-        <item>
-            <key> <string>portal_type</string> </key>
-            <value> <string>Category Membership Divergence Tester</string> </value>
-        </item>
-        <item>
-            <key> <string>tested_property</string> </key>
-            <value>
-              <tuple>
-                <string>source_function</string>
-              </tuple>
-            </value>
-        </item>
-        <item>
-            <key> <string>title</string> </key>
-            <value> <string>source_function divergence tester</string> </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
-</ZopeData>
diff --git a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_payment_rule/22.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_payment_rule/22.xml
deleted file mode 100644
index 8e1c1ee00b9e2e803378d158803404f97f34f130..0000000000000000000000000000000000000000
--- a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_payment_rule/22.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0"?>
-<ZopeData>
-  <record id="1" aka="AAAAAAAAAAE=">
-    <pickle>
-      <tuple>
-        <global name="CategoryMembershipDivergenceTester" module="Products.ERP5Type.Document.CategoryMembershipDivergenceTester"/>
-        <tuple/>
-      </tuple>
-    </pickle>
-    <pickle>
-      <dictionary>
-        <item>
-            <key> <string>id</string> </key>
-            <value> <string>22</string> </value>
-        </item>
-        <item>
-            <key> <string>portal_type</string> </key>
-            <value> <string>Category Membership Divergence Tester</string> </value>
-        </item>
-        <item>
-            <key> <string>tested_property</string> </key>
-            <value>
-              <tuple>
-                <string>source_administration</string>
-              </tuple>
-            </value>
-        </item>
-        <item>
-            <key> <string>title</string> </key>
-            <value> <string>source_administration divergence tester</string> </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
-</ZopeData>
diff --git a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_payment_rule/23.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_payment_rule/23.xml
deleted file mode 100644
index f9db68f66c2b4234b5b33b76240ab156fb26cb88..0000000000000000000000000000000000000000
--- a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_payment_rule/23.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0"?>
-<ZopeData>
-  <record id="1" aka="AAAAAAAAAAE=">
-    <pickle>
-      <tuple>
-        <global name="CategoryMembershipDivergenceTester" module="Products.ERP5Type.Document.CategoryMembershipDivergenceTester"/>
-        <tuple/>
-      </tuple>
-    </pickle>
-    <pickle>
-      <dictionary>
-        <item>
-            <key> <string>id</string> </key>
-            <value> <string>23</string> </value>
-        </item>
-        <item>
-            <key> <string>portal_type</string> </key>
-            <value> <string>Category Membership Divergence Tester</string> </value>
-        </item>
-        <item>
-            <key> <string>tested_property</string> </key>
-            <value>
-              <tuple>
-                <string>source_decision</string>
-              </tuple>
-            </value>
-        </item>
-        <item>
-            <key> <string>title</string> </key>
-            <value> <string>source_decision divergence tester</string> </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
-</ZopeData>
diff --git a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_payment_rule/25.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_payment_rule/25.xml
deleted file mode 100644
index 0c07086edf03ea83df1b02debb3c7cb4493b95d7..0000000000000000000000000000000000000000
--- a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_payment_rule/25.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0"?>
-<ZopeData>
-  <record id="1" aka="AAAAAAAAAAE=">
-    <pickle>
-      <tuple>
-        <global name="CategoryMembershipDivergenceTester" module="Products.ERP5Type.Document.CategoryMembershipDivergenceTester"/>
-        <tuple/>
-      </tuple>
-    </pickle>
-    <pickle>
-      <dictionary>
-        <item>
-            <key> <string>id</string> </key>
-            <value> <string>25</string> </value>
-        </item>
-        <item>
-            <key> <string>portal_type</string> </key>
-            <value> <string>Category Membership Divergence Tester</string> </value>
-        </item>
-        <item>
-            <key> <string>tested_property</string> </key>
-            <value>
-              <tuple>
-                <string>destination_administration</string>
-              </tuple>
-            </value>
-        </item>
-        <item>
-            <key> <string>title</string> </key>
-            <value> <string>destination_administration divergence tester</string> </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
-</ZopeData>
diff --git a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_payment_rule/26.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_payment_rule/26.xml
deleted file mode 100644
index 6ed43f6554eef20b93d689d21b0abd43a9e4ae06..0000000000000000000000000000000000000000
--- a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_payment_rule/26.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0"?>
-<ZopeData>
-  <record id="1" aka="AAAAAAAAAAE=">
-    <pickle>
-      <tuple>
-        <global name="CategoryMembershipDivergenceTester" module="Products.ERP5Type.Document.CategoryMembershipDivergenceTester"/>
-        <tuple/>
-      </tuple>
-    </pickle>
-    <pickle>
-      <dictionary>
-        <item>
-            <key> <string>id</string> </key>
-            <value> <string>26</string> </value>
-        </item>
-        <item>
-            <key> <string>portal_type</string> </key>
-            <value> <string>Category Membership Divergence Tester</string> </value>
-        </item>
-        <item>
-            <key> <string>tested_property</string> </key>
-            <value>
-              <tuple>
-                <string>destination_decision</string>
-              </tuple>
-            </value>
-        </item>
-        <item>
-            <key> <string>title</string> </key>
-            <value> <string>destination_decision divergence tester</string> </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
-</ZopeData>
diff --git a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_payment_rule/27.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_payment_rule/27.xml
deleted file mode 100644
index f5cb7f17aa4d9f2bcaadee467539bd9010890702..0000000000000000000000000000000000000000
--- a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_payment_rule/27.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0"?>
-<ZopeData>
-  <record id="1" aka="AAAAAAAAAAE=">
-    <pickle>
-      <tuple>
-        <global name="CategoryMembershipDivergenceTester" module="Products.ERP5Type.Document.CategoryMembershipDivergenceTester"/>
-        <tuple/>
-      </tuple>
-    </pickle>
-    <pickle>
-      <dictionary>
-        <item>
-            <key> <string>id</string> </key>
-            <value> <string>27</string> </value>
-        </item>
-        <item>
-            <key> <string>portal_type</string> </key>
-            <value> <string>Category Membership Divergence Tester</string> </value>
-        </item>
-        <item>
-            <key> <string>tested_property</string> </key>
-            <value>
-              <tuple>
-                <string>destination_payment</string>
-              </tuple>
-            </value>
-        </item>
-        <item>
-            <key> <string>title</string> </key>
-            <value> <string>destination_payment divergence tester</string> </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
-</ZopeData>
diff --git a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_payment_rule/5.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_payment_rule/5.xml
deleted file mode 100644
index 6bd643bd1eee2cea96791b98c0c753fc79c248f9..0000000000000000000000000000000000000000
--- a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_payment_rule/5.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0"?>
-<ZopeData>
-  <record id="1" aka="AAAAAAAAAAE=">
-    <pickle>
-      <tuple>
-        <global name="CategoryMembershipDivergenceTester" module="Products.ERP5Type.Document.CategoryMembershipDivergenceTester"/>
-        <tuple/>
-      </tuple>
-    </pickle>
-    <pickle>
-      <dictionary>
-        <item>
-            <key> <string>id</string> </key>
-            <value> <string>5</string> </value>
-        </item>
-        <item>
-            <key> <string>portal_type</string> </key>
-            <value> <string>Category Membership Divergence Tester</string> </value>
-        </item>
-        <item>
-            <key> <string>tested_property</string> </key>
-            <value>
-              <tuple>
-                <string>destination_account</string>
-              </tuple>
-            </value>
-        </item>
-        <item>
-            <key> <string>title</string> </key>
-            <value> <string>destination_account divergence tester</string> </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
-</ZopeData>
diff --git a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_payment_rule/6.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_payment_rule/6.xml
deleted file mode 100644
index 5be6e509e514f1b93b26efee4fcdf7b9e629019a..0000000000000000000000000000000000000000
--- a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_payment_rule/6.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0"?>
-<ZopeData>
-  <record id="1" aka="AAAAAAAAAAE=">
-    <pickle>
-      <tuple>
-        <global name="CategoryMembershipDivergenceTester" module="Products.ERP5Type.Document.CategoryMembershipDivergenceTester"/>
-        <tuple/>
-      </tuple>
-    </pickle>
-    <pickle>
-      <dictionary>
-        <item>
-            <key> <string>id</string> </key>
-            <value> <string>6</string> </value>
-        </item>
-        <item>
-            <key> <string>portal_type</string> </key>
-            <value> <string>Category Membership Divergence Tester</string> </value>
-        </item>
-        <item>
-            <key> <string>tested_property</string> </key>
-            <value>
-              <tuple>
-                <string>destination_function</string>
-              </tuple>
-            </value>
-        </item>
-        <item>
-            <key> <string>title</string> </key>
-            <value> <string>destination_function divergence tester</string> </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
-</ZopeData>
diff --git a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_payment_rule/8.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_payment_rule/8.xml
deleted file mode 100644
index 6f9b6105d1dfca821ac381a03726b821db4a7fbd..0000000000000000000000000000000000000000
--- a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_payment_rule/8.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0"?>
-<ZopeData>
-  <record id="1" aka="AAAAAAAAAAE=">
-    <pickle>
-      <tuple>
-        <global name="CategoryMembershipDivergenceTester" module="Products.ERP5Type.Document.CategoryMembershipDivergenceTester"/>
-        <tuple/>
-      </tuple>
-    </pickle>
-    <pickle>
-      <dictionary>
-        <item>
-            <key> <string>id</string> </key>
-            <value> <string>8</string> </value>
-        </item>
-        <item>
-            <key> <string>portal_type</string> </key>
-            <value> <string>Category Membership Divergence Tester</string> </value>
-        </item>
-        <item>
-            <key> <string>tested_property</string> </key>
-            <value>
-              <tuple>
-                <string>destination_section</string>
-              </tuple>
-            </value>
-        </item>
-        <item>
-            <key> <string>title</string> </key>
-            <value> <string>destination_section divergence tester</string> </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
-</ZopeData>
diff --git a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_payment_rule/9.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_payment_rule/9.xml
deleted file mode 100644
index cfb689ed5f85e818f560124b2ddc9b804581b54c..0000000000000000000000000000000000000000
--- a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_payment_rule/9.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0"?>
-<ZopeData>
-  <record id="1" aka="AAAAAAAAAAE=">
-    <pickle>
-      <tuple>
-        <global name="CategoryMembershipDivergenceTester" module="Products.ERP5Type.Document.CategoryMembershipDivergenceTester"/>
-        <tuple/>
-      </tuple>
-    </pickle>
-    <pickle>
-      <dictionary>
-        <item>
-            <key> <string>id</string> </key>
-            <value> <string>9</string> </value>
-        </item>
-        <item>
-            <key> <string>portal_type</string> </key>
-            <value> <string>Category Membership Divergence Tester</string> </value>
-        </item>
-        <item>
-            <key> <string>tested_property</string> </key>
-            <value>
-              <tuple>
-                <string>price_currency</string>
-              </tuple>
-            </value>
-        </item>
-        <item>
-            <key> <string>title</string> </key>
-            <value> <string>price_currency divergence tester</string> </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
-</ZopeData>
diff --git a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_payment_rule/destination_payment_tester.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_payment_rule/destination_payment_tester.xml
new file mode 100644
index 0000000000000000000000000000000000000000..7a7dddc10d30273bcd55563e742eb5ba91579427
--- /dev/null
+++ b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_payment_rule/destination_payment_tester.xml
@@ -0,0 +1,83 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <tuple>
+        <global name="CategoryMembershipDivergenceTester" module="Products.ERP5Type.Document.CategoryMembershipDivergenceTester"/>
+        <tuple/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>_identity_criterion</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+            </value>
+        </item>
+        <item>
+            <key> <string>_range_criterion</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
+            </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>destination_payment_tester</string> </value>
+        </item>
+        <item>
+            <key> <string>portal_type</string> </key>
+            <value> <string>Category Membership Divergence Tester</string> </value>
+        </item>
+        <item>
+            <key> <string>tested_property</string> </key>
+            <value>
+              <tuple>
+                <string>destination_payment</string>
+              </tuple>
+            </value>
+        </item>
+        <item>
+            <key> <string>title</string> </key>
+            <value> <string>destination_payment divergence tester</string> </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="2" aka="AAAAAAAAAAI=">
+    <pickle>
+      <tuple>
+        <global name="PersistentMapping" module="Persistence.mapping"/>
+        <tuple/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>data</string> </key>
+            <value>
+              <dictionary/>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="3" aka="AAAAAAAAAAM=">
+    <pickle>
+      <tuple>
+        <global name="PersistentMapping" module="Persistence.mapping"/>
+        <tuple/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>data</string> </key>
+            <value>
+              <dictionary/>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+</ZopeData>
diff --git a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_payment_rule/7.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_payment_rule/destination_project_tester.xml
similarity index 93%
rename from bt5/erp5_simulation/PathTemplateItem/portal_rules/new_payment_rule/7.xml
rename to bt5/erp5_simulation/PathTemplateItem/portal_rules/new_payment_rule/destination_project_tester.xml
index ceebd4b00e218ce60470c786e2078a508f5c174c..8807e052736d671edc0feac81e8958788e367891 100644
--- a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_payment_rule/7.xml
+++ b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_payment_rule/destination_project_tester.xml
@@ -11,7 +11,7 @@
       <dictionary>
         <item>
             <key> <string>id</string> </key>
-            <value> <string>7</string> </value>
+            <value> <string>destination_project_tester</string> </value>
         </item>
         <item>
             <key> <string>portal_type</string> </key>
diff --git a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_payment_rule/destination_section_tester.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_payment_rule/destination_section_tester.xml
new file mode 100644
index 0000000000000000000000000000000000000000..db74f573d7ec4a2a1d630b9f2a109b3ac4e9cd82
--- /dev/null
+++ b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_payment_rule/destination_section_tester.xml
@@ -0,0 +1,83 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <tuple>
+        <global name="CategoryMembershipDivergenceTester" module="Products.ERP5Type.Document.CategoryMembershipDivergenceTester"/>
+        <tuple/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>_identity_criterion</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+            </value>
+        </item>
+        <item>
+            <key> <string>_range_criterion</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
+            </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>destination_section_tester</string> </value>
+        </item>
+        <item>
+            <key> <string>portal_type</string> </key>
+            <value> <string>Category Membership Divergence Tester</string> </value>
+        </item>
+        <item>
+            <key> <string>tested_property</string> </key>
+            <value>
+              <tuple>
+                <string>destination_section</string>
+              </tuple>
+            </value>
+        </item>
+        <item>
+            <key> <string>title</string> </key>
+            <value> <string>destination_section divergence tester</string> </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="2" aka="AAAAAAAAAAI=">
+    <pickle>
+      <tuple>
+        <global name="PersistentMapping" module="Persistence.mapping"/>
+        <tuple/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>data</string> </key>
+            <value>
+              <dictionary/>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="3" aka="AAAAAAAAAAM=">
+    <pickle>
+      <tuple>
+        <global name="PersistentMapping" module="Persistence.mapping"/>
+        <tuple/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>data</string> </key>
+            <value>
+              <dictionary/>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+</ZopeData>
diff --git a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_payment_rule/destination_tester.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_payment_rule/destination_tester.xml
new file mode 100644
index 0000000000000000000000000000000000000000..8ceac2bb776267f4a47a34a0596cbd41dd96bd67
--- /dev/null
+++ b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_payment_rule/destination_tester.xml
@@ -0,0 +1,83 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <tuple>
+        <global name="CategoryMembershipDivergenceTester" module="Products.ERP5Type.Document.CategoryMembershipDivergenceTester"/>
+        <tuple/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>_identity_criterion</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+            </value>
+        </item>
+        <item>
+            <key> <string>_range_criterion</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
+            </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>destination_tester</string> </value>
+        </item>
+        <item>
+            <key> <string>portal_type</string> </key>
+            <value> <string>Category Membership Divergence Tester</string> </value>
+        </item>
+        <item>
+            <key> <string>tested_property</string> </key>
+            <value>
+              <tuple>
+                <string>destination</string>
+              </tuple>
+            </value>
+        </item>
+        <item>
+            <key> <string>title</string> </key>
+            <value> <string>destination divergence tester</string> </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="2" aka="AAAAAAAAAAI=">
+    <pickle>
+      <tuple>
+        <global name="PersistentMapping" module="Persistence.mapping"/>
+        <tuple/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>data</string> </key>
+            <value>
+              <dictionary/>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="3" aka="AAAAAAAAAAM=">
+    <pickle>
+      <tuple>
+        <global name="PersistentMapping" module="Persistence.mapping"/>
+        <tuple/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>data</string> </key>
+            <value>
+              <dictionary/>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+</ZopeData>
diff --git a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_payment_rule/4.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_payment_rule/payment_mode_tester.xml
similarity index 84%
rename from bt5/erp5_simulation/PathTemplateItem/portal_rules/new_payment_rule/4.xml
rename to bt5/erp5_simulation/PathTemplateItem/portal_rules/new_payment_rule/payment_mode_tester.xml
index edba143b399e8c44cd099cd6613495dd33e3e1b3..5be24c2dc2e7e574c7fd2727d0d931b65ab73c88 100644
--- a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_payment_rule/4.xml
+++ b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_payment_rule/payment_mode_tester.xml
@@ -21,14 +21,6 @@
               <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
             </value>
         </item>
-        <item>
-            <key> <string>categories</string> </key>
-            <value>
-              <tuple>
-                <string>solver/portal_types/Destination Replacement Solver</string>
-              </tuple>
-            </value>
-        </item>
         <item>
             <key> <string>description</string> </key>
             <value>
@@ -37,7 +29,7 @@
         </item>
         <item>
             <key> <string>id</string> </key>
-            <value> <string>4</string> </value>
+            <value> <string>payment_mode_tester</string> </value>
         </item>
         <item>
             <key> <string>portal_type</string> </key>
@@ -47,13 +39,13 @@
             <key> <string>tested_property</string> </key>
             <value>
               <tuple>
-                <string>destination</string>
+                <string>payment_mode</string>
               </tuple>
             </value>
         </item>
         <item>
             <key> <string>title</string> </key>
-            <value> <string>destination divergence tester</string> </value>
+            <value> <string>payment_mode divergence tester</string> </value>
         </item>
       </dictionary>
     </pickle>
diff --git a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_payment_rule/price_tester.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_payment_rule/price_tester.xml
new file mode 100644
index 0000000000000000000000000000000000000000..804761bdb40f8e81c35da03243ca46c37e732b50
--- /dev/null
+++ b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_payment_rule/price_tester.xml
@@ -0,0 +1,114 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <tuple>
+        <global name="FloatDivergenceTester" module="Products.ERP5Type.Document.FloatDivergenceTester"/>
+        <tuple/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>_identity_criterion</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+            </value>
+        </item>
+        <item>
+            <key> <string>_local_properties</string> </key>
+            <value>
+              <tuple>
+                <dictionary>
+                  <item>
+                      <key> <string>id</string> </key>
+                      <value> <string>quantity</string> </value>
+                  </item>
+                  <item>
+                      <key> <string>type</string> </key>
+                      <value> <string>int</string> </value>
+                  </item>
+                </dictionary>
+              </tuple>
+            </value>
+        </item>
+        <item>
+            <key> <string>_range_criterion</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
+            </value>
+        </item>
+        <item>
+            <key> <string>description</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>divergence_provider</string> </key>
+            <value> <int>0</int> </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>price_tester</string> </value>
+        </item>
+        <item>
+            <key> <string>portal_type</string> </key>
+            <value> <string>Float Divergence Tester</string> </value>
+        </item>
+        <item>
+            <key> <string>quantity</string> </key>
+            <value> <int>0</int> </value>
+        </item>
+        <item>
+            <key> <string>tested_property</string> </key>
+            <value>
+              <tuple>
+                <string>price</string>
+              </tuple>
+            </value>
+        </item>
+        <item>
+            <key> <string>title</string> </key>
+            <value> <string>price divergence tester</string> </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="2" aka="AAAAAAAAAAI=">
+    <pickle>
+      <tuple>
+        <global name="PersistentMapping" module="Persistence.mapping"/>
+        <tuple/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>data</string> </key>
+            <value>
+              <dictionary/>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="3" aka="AAAAAAAAAAM=">
+    <pickle>
+      <tuple>
+        <global name="PersistentMapping" module="Persistence.mapping"/>
+        <tuple/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>data</string> </key>
+            <value>
+              <dictionary/>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+</ZopeData>
diff --git a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_payment_rule/quantity_tester.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_payment_rule/quantity_tester.xml
new file mode 100644
index 0000000000000000000000000000000000000000..91bc42df6a8aceee3500f2fd9523515aed803096
--- /dev/null
+++ b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_payment_rule/quantity_tester.xml
@@ -0,0 +1,119 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <tuple>
+        <global name="NetConvertedQuantityDivergenceTester" module="Products.ERP5Type.Document.NetConvertedQuantityDivergenceTester"/>
+        <tuple/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>_identity_criterion</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+            </value>
+        </item>
+        <item>
+            <key> <string>_local_properties</string> </key>
+            <value>
+              <tuple>
+                <dictionary>
+                  <item>
+                      <key> <string>id</string> </key>
+                      <value> <string>use_delivery_ratio</string> </value>
+                  </item>
+                  <item>
+                      <key> <string>type</string> </key>
+                      <value> <string>int</string> </value>
+                  </item>
+                </dictionary>
+                <dictionary>
+                  <item>
+                      <key> <string>id</string> </key>
+                      <value> <string>quantity</string> </value>
+                  </item>
+                  <item>
+                      <key> <string>type</string> </key>
+                      <value> <string>int</string> </value>
+                  </item>
+                </dictionary>
+              </tuple>
+            </value>
+        </item>
+        <item>
+            <key> <string>_range_criterion</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
+            </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>quantity_tester</string> </value>
+        </item>
+        <item>
+            <key> <string>portal_type</string> </key>
+            <value> <string>Net Converted Quantity Divergence Tester</string> </value>
+        </item>
+        <item>
+            <key> <string>quantity</string> </key>
+            <value> <int>0</int> </value>
+        </item>
+        <item>
+            <key> <string>tested_property</string> </key>
+            <value>
+              <tuple>
+                <string>quantity</string>
+                <string>quantity_unit</string>
+              </tuple>
+            </value>
+        </item>
+        <item>
+            <key> <string>title</string> </key>
+            <value> <string>quantity divergence tester</string> </value>
+        </item>
+        <item>
+            <key> <string>use_delivery_ratio</string> </key>
+            <value> <int>1</int> </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="2" aka="AAAAAAAAAAI=">
+    <pickle>
+      <tuple>
+        <global name="PersistentMapping" module="Persistence.mapping"/>
+        <tuple/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>data</string> </key>
+            <value>
+              <dictionary/>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="3" aka="AAAAAAAAAAM=">
+    <pickle>
+      <tuple>
+        <global name="PersistentMapping" module="Persistence.mapping"/>
+        <tuple/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>data</string> </key>
+            <value>
+              <dictionary/>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+</ZopeData>
diff --git a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_payment_rule/resource_tester.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_payment_rule/resource_tester.xml
new file mode 100644
index 0000000000000000000000000000000000000000..ab14bc8e9d834ebdf37817e56728a62b57363f3b
--- /dev/null
+++ b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_payment_rule/resource_tester.xml
@@ -0,0 +1,87 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <tuple>
+        <global name="CategoryMembershipDivergenceTester" module="Products.ERP5Type.Document.CategoryMembershipDivergenceTester"/>
+        <tuple/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>_identity_criterion</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+            </value>
+        </item>
+        <item>
+            <key> <string>_range_criterion</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
+            </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>resource_tester</string> </value>
+        </item>
+        <item>
+            <key> <string>matching_provider</string> </key>
+            <value> <int>1</int> </value>
+        </item>
+        <item>
+            <key> <string>portal_type</string> </key>
+            <value> <string>Category Membership Divergence Tester</string> </value>
+        </item>
+        <item>
+            <key> <string>tested_property</string> </key>
+            <value>
+              <tuple>
+                <string>resource</string>
+              </tuple>
+            </value>
+        </item>
+        <item>
+            <key> <string>title</string> </key>
+            <value> <string>resource divergence tester</string> </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="2" aka="AAAAAAAAAAI=">
+    <pickle>
+      <tuple>
+        <global name="PersistentMapping" module="Persistence.mapping"/>
+        <tuple/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>data</string> </key>
+            <value>
+              <dictionary/>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="3" aka="AAAAAAAAAAM=">
+    <pickle>
+      <tuple>
+        <global name="PersistentMapping" module="Persistence.mapping"/>
+        <tuple/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>data</string> </key>
+            <value>
+              <dictionary/>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+</ZopeData>
diff --git a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_payment_rule/24.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_payment_rule/source_payment_tester.xml
similarity index 93%
rename from bt5/erp5_simulation/PathTemplateItem/portal_rules/new_payment_rule/24.xml
rename to bt5/erp5_simulation/PathTemplateItem/portal_rules/new_payment_rule/source_payment_tester.xml
index c5a0c21a673c7c85b675431de3b567e7446f5a62..2d7776e0155e17cfec78503194b0ee4388cb24f4 100644
--- a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_payment_rule/24.xml
+++ b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_payment_rule/source_payment_tester.xml
@@ -11,7 +11,7 @@
       <dictionary>
         <item>
             <key> <string>id</string> </key>
-            <value> <string>24</string> </value>
+            <value> <string>source_payment_tester</string> </value>
         </item>
         <item>
             <key> <string>portal_type</string> </key>
diff --git a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_payment_rule/13.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_payment_rule/source_project_tester.xml
similarity index 93%
rename from bt5/erp5_simulation/PathTemplateItem/portal_rules/new_payment_rule/13.xml
rename to bt5/erp5_simulation/PathTemplateItem/portal_rules/new_payment_rule/source_project_tester.xml
index 643fa46f3d785d257a6b94995367f5ccc83c8174..af97684f5c179078d1de07244146967ef9a46823 100644
--- a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_payment_rule/13.xml
+++ b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_payment_rule/source_project_tester.xml
@@ -11,7 +11,7 @@
       <dictionary>
         <item>
             <key> <string>id</string> </key>
-            <value> <string>13</string> </value>
+            <value> <string>source_project_tester</string> </value>
         </item>
         <item>
             <key> <string>portal_type</string> </key>
diff --git a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_payment_rule/14.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_payment_rule/source_section_tester.xml
similarity index 93%
rename from bt5/erp5_simulation/PathTemplateItem/portal_rules/new_payment_rule/14.xml
rename to bt5/erp5_simulation/PathTemplateItem/portal_rules/new_payment_rule/source_section_tester.xml
index 2c3c8d4610bbde5cba9f6481dfb08e0e0708d097..4db51be8a0ec57ace81f2fccfdad114306609409 100644
--- a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_payment_rule/14.xml
+++ b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_payment_rule/source_section_tester.xml
@@ -11,7 +11,7 @@
       <dictionary>
         <item>
             <key> <string>id</string> </key>
-            <value> <string>14</string> </value>
+            <value> <string>source_section_tester</string> </value>
         </item>
         <item>
             <key> <string>portal_type</string> </key>
diff --git a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_payment_rule/source_tester.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_payment_rule/source_tester.xml
new file mode 100644
index 0000000000000000000000000000000000000000..ca8b9fe1440dab321ed3f5f6d28128488c40a5cb
--- /dev/null
+++ b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_payment_rule/source_tester.xml
@@ -0,0 +1,83 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <tuple>
+        <global name="CategoryMembershipDivergenceTester" module="Products.ERP5Type.Document.CategoryMembershipDivergenceTester"/>
+        <tuple/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>_identity_criterion</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+            </value>
+        </item>
+        <item>
+            <key> <string>_range_criterion</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
+            </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>source_tester</string> </value>
+        </item>
+        <item>
+            <key> <string>portal_type</string> </key>
+            <value> <string>Category Membership Divergence Tester</string> </value>
+        </item>
+        <item>
+            <key> <string>tested_property</string> </key>
+            <value>
+              <tuple>
+                <string>source</string>
+              </tuple>
+            </value>
+        </item>
+        <item>
+            <key> <string>title</string> </key>
+            <value> <string>source divergence tester</string> </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="2" aka="AAAAAAAAAAI=">
+    <pickle>
+      <tuple>
+        <global name="PersistentMapping" module="Persistence.mapping"/>
+        <tuple/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>data</string> </key>
+            <value>
+              <dictionary/>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="3" aka="AAAAAAAAAAM=">
+    <pickle>
+      <tuple>
+        <global name="PersistentMapping" module="Persistence.mapping"/>
+        <tuple/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>data</string> </key>
+            <value>
+              <dictionary/>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+</ZopeData>
diff --git a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_transaction_rule/7.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_payment_rule/start_date_tester.xml
similarity index 83%
rename from bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_transaction_rule/7.xml
rename to bt5/erp5_simulation/PathTemplateItem/portal_rules/new_payment_rule/start_date_tester.xml
index 81b1f267184901cd338445630042a091e0a1cfbf..46a49cad749f7e2c2ef8f7f215b08f932e245f7a 100644
--- a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_transaction_rule/7.xml
+++ b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_payment_rule/start_date_tester.xml
@@ -26,17 +26,9 @@
               </tuple>
             </value>
         </item>
-        <item>
-            <key> <string>divergence_provider</string> </key>
-            <value> <int>1</int> </value>
-        </item>
         <item>
             <key> <string>id</string> </key>
-            <value> <string>7</string> </value>
-        </item>
-        <item>
-            <key> <string>matching_provider</string> </key>
-            <value> <int>0</int> </value>
+            <value> <string>start_date_tester</string> </value>
         </item>
         <item>
             <key> <string>portal_type</string> </key>
diff --git a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_payment_rule/18.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_payment_rule/stop_date_tester.xml
similarity index 96%
rename from bt5/erp5_simulation/PathTemplateItem/portal_rules/new_payment_rule/18.xml
rename to bt5/erp5_simulation/PathTemplateItem/portal_rules/new_payment_rule/stop_date_tester.xml
index 80c005f38a888da350aded84a37fe9e4c36bd339..4a1167b3d56cd5c83abb7f22c4d357a70eca6906 100644
--- a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_payment_rule/18.xml
+++ b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_payment_rule/stop_date_tester.xml
@@ -28,7 +28,7 @@
         </item>
         <item>
             <key> <string>id</string> </key>
-            <value> <string>18</string> </value>
+            <value> <string>stop_date_tester</string> </value>
         </item>
         <item>
             <key> <string>portal_type</string> </key>