diff --git a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoicing_rule/1.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoicing_rule/1.xml
deleted file mode 100644
index aa38f209e8a911461521f6fb10aa8b99a15c2553..0000000000000000000000000000000000000000
--- a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoicing_rule/1.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>1</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>aggregate</string>
-              </tuple>
-            </value>
-        </item>
-        <item>
-            <key> <string>title</string> </key>
-            <value> <string>aggregate divergence tester</string> </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
-</ZopeData>
diff --git a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoicing_rule/10.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoicing_rule/10.xml
deleted file mode 100644
index ea363c70361a7ac7329e944f1bee312bb3d7cc53..0000000000000000000000000000000000000000
--- a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoicing_rule/10.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>10</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>
-</ZopeData>
diff --git a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoicing_rule/11.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoicing_rule/11.xml
deleted file mode 100644
index c5d12ecf9b8f9ffc85930bd9bae3c253380c53d1..0000000000000000000000000000000000000000
--- a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoicing_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_invoicing_rule/12.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoicing_rule/12.xml
deleted file mode 100644
index 54a763bd761ba87e0f7c361249554008d7b3e5eb..0000000000000000000000000000000000000000
--- a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoicing_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_invoicing_rule/13.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoicing_rule/13.xml
deleted file mode 100644
index 643fa46f3d785d257a6b94995367f5ccc83c8174..0000000000000000000000000000000000000000
--- a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoicing_rule/13.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>13</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_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_invoicing_rule/14.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoicing_rule/14.xml
deleted file mode 100644
index 2c3c8d4610bbde5cba9f6481dfb08e0e0708d097..0000000000000000000000000000000000000000
--- a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoicing_rule/14.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>14</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_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_invoicing_rule/16.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoicing_rule/16.xml
deleted file mode 100644
index c8bcb34aa7b0835fa14def07f0434def3704cd8d..0000000000000000000000000000000000000000
--- a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoicing_rule/16.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0"?>
-<ZopeData>
-  <record id="1" aka="AAAAAAAAAAE=">
-    <pickle>
-      <tuple>
-        <global name="VariationDivergenceTester" module="Products.ERP5Type.Document.VariationDivergenceTester"/>
-        <tuple/>
-      </tuple>
-    </pickle>
-    <pickle>
-      <dictionary>
-        <item>
-            <key> <string>id</string> </key>
-            <value> <string>16</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>Variation Divergence Tester</string> </value>
-        </item>
-        <item>
-            <key> <string>tested_property</string> </key>
-            <value>
-              <tuple>
-                <string>variation_property_dict</string>
-              </tuple>
-            </value>
-        </item>
-        <item>
-            <key> <string>title</string> </key>
-            <value> <string>variation_property_dict divergence tester</string> </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
-</ZopeData>
diff --git a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoicing_rule/18.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoicing_rule/18.xml
deleted file mode 100644
index 80c005f38a888da350aded84a37fe9e4c36bd339..0000000000000000000000000000000000000000
--- a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoicing_rule/18.xml
+++ /dev/null
@@ -1,56 +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>id</string> </key>
-            <value> <string>18</string> </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_invoicing_rule/2.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoicing_rule/2.xml
deleted file mode 100644
index 2f3a1e6753227836364375f0394ee9ae9c817c31..0000000000000000000000000000000000000000
--- a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoicing_rule/2.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>2</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>base_application</string>
-              </tuple>
-            </value>
-        </item>
-        <item>
-            <key> <string>title</string> </key>
-            <value> <string>base_application divergence tester</string> </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
-</ZopeData>
diff --git a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoicing_rule/22.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoicing_rule/22.xml
deleted file mode 100644
index 8e1c1ee00b9e2e803378d158803404f97f34f130..0000000000000000000000000000000000000000
--- a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoicing_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_invoicing_rule/23.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoicing_rule/23.xml
deleted file mode 100644
index f9db68f66c2b4234b5b33b76240ab156fb26cb88..0000000000000000000000000000000000000000
--- a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoicing_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_invoicing_rule/24.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoicing_rule/24.xml
deleted file mode 100644
index c5a0c21a673c7c85b675431de3b567e7446f5a62..0000000000000000000000000000000000000000
--- a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoicing_rule/24.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>24</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_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_invoicing_rule/25.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoicing_rule/25.xml
deleted file mode 100644
index 0c07086edf03ea83df1b02debb3c7cb4493b95d7..0000000000000000000000000000000000000000
--- a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoicing_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_invoicing_rule/26.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoicing_rule/26.xml
deleted file mode 100644
index 6ed43f6554eef20b93d689d21b0abd43a9e4ae06..0000000000000000000000000000000000000000
--- a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoicing_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_invoicing_rule/27.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoicing_rule/27.xml
deleted file mode 100644
index f5cb7f17aa4d9f2bcaadee467539bd9010890702..0000000000000000000000000000000000000000
--- a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoicing_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_invoicing_rule/3.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoicing_rule/3.xml
deleted file mode 100644
index 913809cec3383bcc29cddd7e80d92e812124fbe1..0000000000000000000000000000000000000000
--- a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoicing_rule/3.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>3</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>base_contribution</string>
-              </tuple>
-            </value>
-        </item>
-        <item>
-            <key> <string>title</string> </key>
-            <value> <string>base_contribution divergence tester</string> </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
-</ZopeData>
diff --git a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoicing_rule/5.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoicing_rule/5.xml
deleted file mode 100644
index 6bd643bd1eee2cea96791b98c0c753fc79c248f9..0000000000000000000000000000000000000000
--- a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoicing_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_invoicing_rule/6.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoicing_rule/6.xml
deleted file mode 100644
index 5be6e509e514f1b93b26efee4fcdf7b9e629019a..0000000000000000000000000000000000000000
--- a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoicing_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_invoicing_rule/7.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoicing_rule/7.xml
deleted file mode 100644
index ceebd4b00e218ce60470c786e2078a508f5c174c..0000000000000000000000000000000000000000
--- a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoicing_rule/7.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>7</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_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_invoicing_rule/8.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoicing_rule/8.xml
deleted file mode 100644
index 6f9b6105d1dfca821ac381a03726b821db4a7fbd..0000000000000000000000000000000000000000
--- a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoicing_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_invoicing_rule/9.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoicing_rule/9.xml
deleted file mode 100644
index cfb689ed5f85e818f560124b2ddc9b804581b54c..0000000000000000000000000000000000000000
--- a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoicing_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_invoicing_rule/aggregate_tester.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoicing_rule/aggregate_tester.xml
new file mode 100644
index 0000000000000000000000000000000000000000..71cc29897ed0ced98f728e73b68dd7850c4c3aef
--- /dev/null
+++ b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoicing_rule/aggregate_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>aggregate_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>aggregate</string>
+              </tuple>
+            </value>
+        </item>
+        <item>
+            <key> <string>title</string> </key>
+            <value> <string>aggregate 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/21.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoicing_rule/base_application_tester.xml
similarity index 88%
rename from bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoicing_rule/21.xml
rename to bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoicing_rule/base_application_tester.xml
index de8fc7dc559b4cd13e54f43a707a25804d76ae4b..5f9db3567fb63c3f8b4c0b13e59d563ed04678a5 100644
--- a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoicing_rule/21.xml
+++ b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoicing_rule/base_application_tester.xml
@@ -21,12 +21,6 @@
               <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
             </value>
         </item>
-        <item>
-            <key> <string>categories</string> </key>
-            <value>
-              <tuple/>
-            </value>
-        </item>
         <item>
             <key> <string>description</string> </key>
             <value>
@@ -35,15 +29,15 @@
         </item>
         <item>
             <key> <string>divergence_provider</string> </key>
-            <value> <int>0</int> </value>
+            <value> <int>1</int> </value>
         </item>
         <item>
             <key> <string>id</string> </key>
-            <value> <string>21</string> </value>
+            <value> <string>base_application_tester</string> </value>
         </item>
         <item>
             <key> <string>matching_provider</string> </key>
-            <value> <int>1</int> </value>
+            <value> <int>0</int> </value>
         </item>
         <item>
             <key> <string>portal_type</string> </key>
@@ -53,13 +47,13 @@
             <key> <string>tested_property</string> </key>
             <value>
               <tuple>
-                <string>quantity_unit</string>
+                <string>base_application</string>
               </tuple>
             </value>
         </item>
         <item>
             <key> <string>title</string> </key>
-            <value> <string>quantity unit divergence tester</string> </value>
+            <value> <string>base_application divergence tester</string> </value>
         </item>
       </dictionary>
     </pickle>
diff --git a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoicing_rule/4.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoicing_rule/base_contribution_tester.xml
similarity index 85%
rename from bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoicing_rule/4.xml
rename to bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoicing_rule/base_contribution_tester.xml
index edba143b399e8c44cd099cd6613495dd33e3e1b3..91669dcd9e97c605d0260b19fb98be89411c21f4 100644
--- a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoicing_rule/4.xml
+++ b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoicing_rule/base_contribution_tester.xml
@@ -21,23 +21,19 @@
               <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>
               <none/>
             </value>
         </item>
+        <item>
+            <key> <string>divergence_provider</string> </key>
+            <value> <int>1</int> </value>
+        </item>
         <item>
             <key> <string>id</string> </key>
-            <value> <string>4</string> </value>
+            <value> <string>base_contribution_tester</string> </value>
         </item>
         <item>
             <key> <string>portal_type</string> </key>
@@ -47,13 +43,13 @@
             <key> <string>tested_property</string> </key>
             <value>
               <tuple>
-                <string>destination</string>
+                <string>base_contribution</string>
               </tuple>
             </value>
         </item>
         <item>
             <key> <string>title</string> </key>
-            <value> <string>destination divergence tester</string> </value>
+            <value> <string>base_contribution divergence tester</string> </value>
         </item>
       </dictionary>
     </pickle>
diff --git a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoicing_rule/description_tester.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoicing_rule/description_tester.xml
new file mode 100644
index 0000000000000000000000000000000000000000..709484c50659385c331ed3604b421d7be5bdb024
--- /dev/null
+++ b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoicing_rule/description_tester.xml
@@ -0,0 +1,83 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <tuple>
+        <global name="StringDivergenceTester" module="Products.ERP5Type.Document.StringDivergenceTester"/>
+        <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>description_tester</string> </value>
+        </item>
+        <item>
+            <key> <string>portal_type</string> </key>
+            <value> <string>String Divergence Tester</string> </value>
+        </item>
+        <item>
+            <key> <string>tested_property</string> </key>
+            <value>
+              <tuple>
+                <string>description</string>
+              </tuple>
+            </value>
+        </item>
+        <item>
+            <key> <string>title</string> </key>
+            <value> <string>description 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/destination_account_tester.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoicing_rule/destination_account_tester.xml
new file mode 100644
index 0000000000000000000000000000000000000000..c95e07e481e1f6a88aa96b17726fdcefab56a6a7
--- /dev/null
+++ b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoicing_rule/destination_account_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_account_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_account</string>
+              </tuple>
+            </value>
+        </item>
+        <item>
+            <key> <string>title</string> </key>
+            <value> <string>destination_account 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/destination_administration_tester.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoicing_rule/destination_administration_tester.xml
new file mode 100644
index 0000000000000000000000000000000000000000..7f862c2c72442400ad09366d0f1e06072343f2ad
--- /dev/null
+++ b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoicing_rule/destination_administration_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_administration_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_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_invoicing_rule/destination_decision_tester.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoicing_rule/destination_decision_tester.xml
new file mode 100644
index 0000000000000000000000000000000000000000..3deb7089dae4d3a862b866b36b6f6a46de64fa7f
--- /dev/null
+++ b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoicing_rule/destination_decision_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_decision_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_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_invoicing_rule/destination_function_tester.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoicing_rule/destination_function_tester.xml
new file mode 100644
index 0000000000000000000000000000000000000000..7549f4265fc22e1c23549f0c4a588c888b5733fd
--- /dev/null
+++ b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoicing_rule/destination_function_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_function_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_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_invoicing_rule/destination_payment_tester.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoicing_rule/destination_payment_tester.xml
new file mode 100644
index 0000000000000000000000000000000000000000..7a7dddc10d30273bcd55563e742eb5ba91579427
--- /dev/null
+++ b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoicing_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_invoicing_rule/destination_project_tester.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoicing_rule/destination_project_tester.xml
new file mode 100644
index 0000000000000000000000000000000000000000..5352601f43367758afd2a827e7ab7b192f6f6f50
--- /dev/null
+++ b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoicing_rule/destination_project_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_project_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_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_invoicing_rule/destination_section_tester.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoicing_rule/destination_section_tester.xml
new file mode 100644
index 0000000000000000000000000000000000000000..db74f573d7ec4a2a1d630b9f2a109b3ac4e9cd82
--- /dev/null
+++ b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoicing_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_invoicing_rule/destination_tester.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoicing_rule/destination_tester.xml
new file mode 100644
index 0000000000000000000000000000000000000000..8ceac2bb776267f4a47a34a0596cbd41dd96bd67
--- /dev/null
+++ b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoicing_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_invoicing_rule/incoterm_tester.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoicing_rule/incoterm_tester.xml
new file mode 100644
index 0000000000000000000000000000000000000000..b2decced0e925c6fa624df9975d5e3a3e12ee2ea
--- /dev/null
+++ b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoicing_rule/incoterm_tester.xml
@@ -0,0 +1,93 @@
+<?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>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>incoterm_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>incoterm</string>
+              </tuple>
+            </value>
+        </item>
+        <item>
+            <key> <string>title</string> </key>
+            <value> <string>incoterm 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/price_currency_tester.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoicing_rule/price_currency_tester.xml
new file mode 100644
index 0000000000000000000000000000000000000000..ee3915c8b9e805d3ee2944cae7e7ae2fd3eb90af
--- /dev/null
+++ b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoicing_rule/price_currency_tester.xml
@@ -0,0 +1,93 @@
+<?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>description</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>divergence_provider</string> </key>
+            <value> <int>1</int> </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>price_currency_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>price_currency</string>
+              </tuple>
+            </value>
+        </item>
+        <item>
+            <key> <string>title</string> </key>
+            <value> <string>price_currency 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/20.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoicing_rule/price_tester.xml
similarity index 81%
rename from bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoicing_rule/20.xml
rename to bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoicing_rule/price_tester.xml
index a671a57f2fe98b68eabbd97baf876a8edc715afb..804761bdb40f8e81c35da03243ca46c37e732b50 100644
--- a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoicing_rule/20.xml
+++ b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoicing_rule/price_tester.xml
@@ -29,16 +29,6 @@
                       <value> <string>int</string> </value>
                   </item>
                 </dictionary>
-                <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>
               </tuple>
             </value>
         </item>
@@ -48,21 +38,19 @@
               <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
             </value>
         </item>
-        <item>
-            <key> <string>categories</string> </key>
-            <value>
-              <tuple />
-            </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>20</string> </value>
+            <value> <string>price_tester</string> </value>
         </item>
         <item>
             <key> <string>portal_type</string> </key>
@@ -84,10 +72,6 @@
             <key> <string>title</string> </key>
             <value> <string>price divergence tester</string> </value>
         </item>
-        <item>
-            <key> <string>use_delivery_ratio</string> </key>
-            <value> <int>1</int> </value>
-        </item>
       </dictionary>
     </pickle>
   </record>
diff --git a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoicing_rule/19.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoicing_rule/quantity_tester.xml
similarity index 85%
rename from bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoicing_rule/19.xml
rename to bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoicing_rule/quantity_tester.xml
index 952442b891a18e8bb9b06e5d8a8bc193c53a2d94..91bc42df6a8aceee3500f2fd9523515aed803096 100644
--- a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoicing_rule/19.xml
+++ b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoicing_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>
@@ -48,25 +48,9 @@
               <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
             </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>
-        </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 +65,7 @@
             <value>
               <tuple>
                 <string>quantity</string>
+                <string>quantity_unit</string>
               </tuple>
             </value>
         </item>
diff --git a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoicing_rule/15.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoicing_rule/resource_tester.xml
similarity index 81%
rename from bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoicing_rule/15.xml
rename to bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoicing_rule/resource_tester.xml
index b7b347a86a374f4da1a895deccf3bb1fe0f2a85e..ab14bc8e9d834ebdf37817e56728a62b57363f3b 100644
--- a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoicing_rule/15.xml
+++ b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoicing_rule/resource_tester.xml
@@ -21,24 +21,9 @@
               <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
             </value>
         </item>
-        <item>
-            <key> <string>categories</string> </key>
-            <value>
-              <tuple>
-                <string>solver/portal_types/Resource Adoption Solver</string>
-                <string>solver/portal_types/Resource Replacement Solver</string>
-              </tuple>
-            </value>
-        </item>
-        <item>
-            <key> <string>description</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>id</string> </key>
-            <value> <string>15</string> </value>
+            <value> <string>resource_tester</string> </value>
         </item>
         <item>
             <key> <string>matching_provider</string> </key>
diff --git a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoicing_rule/source_account_tester.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoicing_rule/source_account_tester.xml
new file mode 100644
index 0000000000000000000000000000000000000000..88914408693deebd6e21f4fdcbea1d4a65ae017e
--- /dev/null
+++ b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoicing_rule/source_account_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_account_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_account</string>
+              </tuple>
+            </value>
+        </item>
+        <item>
+            <key> <string>title</string> </key>
+            <value> <string>source_account 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/source_administration_tester.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoicing_rule/source_administration_tester.xml
new file mode 100644
index 0000000000000000000000000000000000000000..116c9ee5d769e3acc513a511a5f4a83e715821e6
--- /dev/null
+++ b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoicing_rule/source_administration_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_administration_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_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_invoicing_rule/source_decision_tester.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoicing_rule/source_decision_tester.xml
new file mode 100644
index 0000000000000000000000000000000000000000..d9d2410416ddc1c8a037d038d0536bf92d563bcf
--- /dev/null
+++ b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoicing_rule/source_decision_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_decision_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_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_invoicing_rule/source_function_tester.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoicing_rule/source_function_tester.xml
new file mode 100644
index 0000000000000000000000000000000000000000..08ca7aa2834e3d2f4f9961a4e00806b11cdb25ed
--- /dev/null
+++ b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoicing_rule/source_function_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_function_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_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_invoicing_rule/source_payment_tester.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoicing_rule/source_payment_tester.xml
new file mode 100644
index 0000000000000000000000000000000000000000..437988be1e091df68589f06c9d5905533ddddff8
--- /dev/null
+++ b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoicing_rule/source_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>source_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>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_invoicing_rule/source_project_tester.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoicing_rule/source_project_tester.xml
new file mode 100644
index 0000000000000000000000000000000000000000..324a15f7e98d353d943900b84a061e17e1a814ce
--- /dev/null
+++ b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoicing_rule/source_project_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_project_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_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_invoicing_rule/source_section_tester.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoicing_rule/source_section_tester.xml
new file mode 100644
index 0000000000000000000000000000000000000000..a9eb20c9fe54af8f994427ce59cb245bb638514c
--- /dev/null
+++ b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoicing_rule/source_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>source_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>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_invoicing_rule/source_tester.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoicing_rule/source_tester.xml
new file mode 100644
index 0000000000000000000000000000000000000000..ca8b9fe1440dab321ed3f5f6d28128488c40a5cb
--- /dev/null
+++ b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoicing_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_invoicing_rule/17.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoicing_rule/start_date_tester.xml
similarity index 86%
rename from bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoicing_rule/17.xml
rename to bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoicing_rule/start_date_tester.xml
index eef1e34267c96ea85a10238d94937f43f5ce3047..157d847c7b32ec3b80ba7dd39d01eb4ca3c72612 100644
--- a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoicing_rule/17.xml
+++ b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoicing_rule/start_date_tester.xml
@@ -38,23 +38,9 @@
               <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
             </value>
         </item>
-        <item>
-            <key> <string>categories</string> </key>
-            <value>
-              <tuple>
-                <string>solver/portal_types/Start Date Replacement Solver</string>
-              </tuple>
-            </value>
-        </item>
-        <item>
-            <key> <string>description</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>id</string> </key>
-            <value> <string>17</string> </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_invoicing_rule/stop_date_tester.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoicing_rule/stop_date_tester.xml
new file mode 100644
index 0000000000000000000000000000000000000000..9749397cb0edac7ad6c556e1a53c4f67f4a9e771
--- /dev/null
+++ b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoicing_rule/stop_date_tester.xml
@@ -0,0 +1,104 @@
+<?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>_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>id</string> </key>
+            <value> <string>stop_date_tester</string> </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/variation_tester.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoicing_rule/variation_tester.xml
new file mode 100644
index 0000000000000000000000000000000000000000..5912dd068cffba82e81ceca1788c7759cba012d5
--- /dev/null
+++ b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoicing_rule/variation_tester.xml
@@ -0,0 +1,119 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <tuple>
+        <global name="VariationDivergenceTester" module="Products.ERP5Type.Document.VariationDivergenceTester"/>
+        <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>variation_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>Variation 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>variation_category_list</string>
+                <string>variation_property_dict</string>
+              </tuple>
+            </value>
+        </item>
+        <item>
+            <key> <string>title</string> </key>
+            <value> <string>variation 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>