From ab54057a5d04a02a67d3d1a671151fad7300f85e Mon Sep 17 00:00:00 2001
From: Kazuhiko Shiozaki <kazuhiko@nexedi.com>
Date: Wed, 3 Feb 2010 08:58:07 +0000
Subject: [PATCH] recreate from existing default_trade_model_rule
 configuration.

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@32208 20353a03-c40f-0410-a6d1-a30d3c3de9de
---
 .../portal_rules/new_trade_model_rule/11.xml  |  43 -------
 .../portal_rules/new_trade_model_rule/13.xml  |  43 -------
 .../portal_rules/new_trade_model_rule/14.xml  |  43 -------
 .../portal_rules/new_trade_model_rule/17.xml  |  43 -------
 .../portal_rules/new_trade_model_rule/19.xml  |  43 -------
 .../portal_rules/new_trade_model_rule/20.xml  |  43 -------
 .../portal_rules/new_trade_model_rule/21.xml  |  64 ----------
 .../portal_rules/new_trade_model_rule/7.xml   |  64 ----------
 .../portal_rules/new_trade_model_rule/8.xml   |  64 ----------
 .../new_trade_model_rule/aggregate_tester.xml |  83 ++++++++++++
 .../{16.xml => base_application_tester.xml}   |   2 +-
 .../{15.xml => base_contribution_tester.xml}  |   2 +-
 .../delivery_mode_tester.xml                  |  83 ++++++++++++
 .../description_tester.xml                    |  93 ++++++++++++++
 .../destination_account_tester.xml            |  83 ++++++++++++
 ... => destination_administration_tester.xml} |  18 +--
 ...{9.xml => destination_decision_tester.xml} |  18 +--
 .../destination_function_tester.xml           |  83 ++++++++++++
 ...{18.xml => destination_payment_tester.xml} |  18 +--
 .../{1.xml => destination_project_tester.xml} |  12 +-
 .../destination_section_tester.xml            |  83 ++++++++++++
 .../destination_tester.xml                    |  83 ++++++++++++
 .../new_trade_model_rule/incoterm_tester.xml  |  87 +++++++++++++
 .../price_currency_tester.xml                 |  83 ++++++++++++
 .../new_trade_model_rule/quantity_tester.xml  | 119 ++++++++++++++++++
 .../{4.xml => reference_tester.xml}           |   2 +-
 .../new_trade_model_rule/resource_tester.xml  |  83 ++++++++++++
 .../{12.xml => source_account_tester.xml}     |  16 +--
 .../source_administration_tester.xml          |  87 +++++++++++++
 .../source_decision_tester.xml                |  87 +++++++++++++
 .../source_function_tester.xml                |  83 ++++++++++++
 .../{10.xml => source_payment_tester.xml}     |  18 +--
 .../{2.xml => source_project_tester.xml}      |  12 +-
 .../source_section_tester.xml                 |  83 ++++++++++++
 .../new_trade_model_rule/source_tester.xml    |  83 ++++++++++++
 .../{6.xml => start_date_tester.xml}          |  16 +--
 .../new_trade_model_rule/stop_date_tester.xml | 112 +++++++++++++++++
 37 files changed, 1529 insertions(+), 553 deletions(-)
 delete mode 100644 bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_rule/11.xml
 delete mode 100644 bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_rule/13.xml
 delete mode 100644 bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_rule/14.xml
 delete mode 100644 bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_rule/17.xml
 delete mode 100644 bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_rule/19.xml
 delete mode 100644 bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_rule/20.xml
 delete mode 100644 bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_rule/21.xml
 delete mode 100644 bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_rule/7.xml
 delete mode 100644 bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_rule/8.xml
 create mode 100644 bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_rule/aggregate_tester.xml
 rename bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_rule/{16.xml => base_application_tester.xml} (97%)
 rename bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_rule/{15.xml => base_contribution_tester.xml} (97%)
 create mode 100644 bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_rule/delivery_mode_tester.xml
 create mode 100644 bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_rule/description_tester.xml
 create mode 100644 bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_rule/destination_account_tester.xml
 rename bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_rule/{3.xml => destination_administration_tester.xml} (83%)
 rename bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_rule/{9.xml => destination_decision_tester.xml} (83%)
 create mode 100644 bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_rule/destination_function_tester.xml
 rename bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_rule/{18.xml => destination_payment_tester.xml} (83%)
 rename bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_rule/{1.xml => destination_project_tester.xml} (88%)
 create mode 100644 bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_rule/destination_section_tester.xml
 create mode 100644 bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_rule/destination_tester.xml
 create mode 100644 bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_rule/incoterm_tester.xml
 create mode 100644 bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_rule/price_currency_tester.xml
 create mode 100644 bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_rule/quantity_tester.xml
 rename bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_rule/{4.xml => reference_tester.xml} (97%)
 create mode 100644 bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_rule/resource_tester.xml
 rename bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_rule/{12.xml => source_account_tester.xml} (82%)
 create mode 100644 bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_rule/source_administration_tester.xml
 create mode 100644 bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_rule/source_decision_tester.xml
 create mode 100644 bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_rule/source_function_tester.xml
 rename bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_rule/{10.xml => source_payment_tester.xml} (83%)
 rename bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_rule/{2.xml => source_project_tester.xml} (88%)
 create mode 100644 bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_rule/source_section_tester.xml
 create mode 100644 bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_rule/source_tester.xml
 rename bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_rule/{6.xml => start_date_tester.xml} (84%)
 create mode 100644 bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_rule/stop_date_tester.xml

diff --git a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_rule/11.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_rule/11.xml
deleted file mode 100644
index dc266a633e..0000000000
--- a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_rule/11.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0"?>
-<ZopeData>
-  <record id="1" aka="AAAAAAAAAAE=">
-    <pickle>
-      <tuple>
-        <global name="CategoryMembershipDivergenceTester" module="Products.ERP5Type.Document.CategoryMembershipDivergenceTester"/>
-        <tuple/>
-      </tuple>
-    </pickle>
-    <pickle>
-      <dictionary>
-        <item>
-            <key> <string>divergence_provider</string> </key>
-            <value> <int>1</int> </value>
-        </item>
-        <item>
-            <key> <string>id</string> </key>
-            <value> <string>11</string> </value>
-        </item>
-        <item>
-            <key> <string>matching_provider</string> </key>
-            <value> <int>0</int> </value>
-        </item>
-        <item>
-            <key> <string>portal_type</string> </key>
-            <value> <string>Category Membership Divergence Tester</string> </value>
-        </item>
-        <item>
-            <key> <string>tested_property</string> </key>
-            <value>
-              <tuple>
-                <string>source_function</string>
-              </tuple>
-            </value>
-        </item>
-        <item>
-            <key> <string>title</string> </key>
-            <value> <string>source_function divergence tester</string> </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
-</ZopeData>
diff --git a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_rule/13.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_rule/13.xml
deleted file mode 100644
index a11e21898f..0000000000
--- a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_rule/13.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0"?>
-<ZopeData>
-  <record id="1" aka="AAAAAAAAAAE=">
-    <pickle>
-      <tuple>
-        <global name="CategoryMembershipDivergenceTester" module="Products.ERP5Type.Document.CategoryMembershipDivergenceTester"/>
-        <tuple/>
-      </tuple>
-    </pickle>
-    <pickle>
-      <dictionary>
-        <item>
-            <key> <string>divergence_provider</string> </key>
-            <value> <int>1</int> </value>
-        </item>
-        <item>
-            <key> <string>id</string> </key>
-            <value> <string>13</string> </value>
-        </item>
-        <item>
-            <key> <string>matching_provider</string> </key>
-            <value> <int>0</int> </value>
-        </item>
-        <item>
-            <key> <string>portal_type</string> </key>
-            <value> <string>Category Membership Divergence Tester</string> </value>
-        </item>
-        <item>
-            <key> <string>tested_property</string> </key>
-            <value>
-              <tuple>
-                <string>source_project</string>
-              </tuple>
-            </value>
-        </item>
-        <item>
-            <key> <string>title</string> </key>
-            <value> <string>source_project divergence tester</string> </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
-</ZopeData>
diff --git a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_rule/14.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_rule/14.xml
deleted file mode 100644
index 7f99836cad..0000000000
--- a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_rule/14.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0"?>
-<ZopeData>
-  <record id="1" aka="AAAAAAAAAAE=">
-    <pickle>
-      <tuple>
-        <global name="CategoryMembershipDivergenceTester" module="Products.ERP5Type.Document.CategoryMembershipDivergenceTester"/>
-        <tuple/>
-      </tuple>
-    </pickle>
-    <pickle>
-      <dictionary>
-        <item>
-            <key> <string>divergence_provider</string> </key>
-            <value> <int>1</int> </value>
-        </item>
-        <item>
-            <key> <string>id</string> </key>
-            <value> <string>14</string> </value>
-        </item>
-        <item>
-            <key> <string>matching_provider</string> </key>
-            <value> <int>0</int> </value>
-        </item>
-        <item>
-            <key> <string>portal_type</string> </key>
-            <value> <string>Category Membership Divergence Tester</string> </value>
-        </item>
-        <item>
-            <key> <string>tested_property</string> </key>
-            <value>
-              <tuple>
-                <string>source_section</string>
-              </tuple>
-            </value>
-        </item>
-        <item>
-            <key> <string>title</string> </key>
-            <value> <string>source_section divergence tester</string> </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
-</ZopeData>
diff --git a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_rule/17.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_rule/17.xml
deleted file mode 100644
index df9ba4eb83..0000000000
--- a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_rule/17.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0"?>
-<ZopeData>
-  <record id="1" aka="AAAAAAAAAAE=">
-    <pickle>
-      <tuple>
-        <global name="CategoryMembershipDivergenceTester" module="Products.ERP5Type.Document.CategoryMembershipDivergenceTester"/>
-        <tuple/>
-      </tuple>
-    </pickle>
-    <pickle>
-      <dictionary>
-        <item>
-            <key> <string>divergence_provider</string> </key>
-            <value> <int>1</int> </value>
-        </item>
-        <item>
-            <key> <string>id</string> </key>
-            <value> <string>17</string> </value>
-        </item>
-        <item>
-            <key> <string>matching_provider</string> </key>
-            <value> <int>0</int> </value>
-        </item>
-        <item>
-            <key> <string>portal_type</string> </key>
-            <value> <string>Category Membership Divergence Tester</string> </value>
-        </item>
-        <item>
-            <key> <string>tested_property</string> </key>
-            <value>
-              <tuple>
-                <string>destination_function</string>
-              </tuple>
-            </value>
-        </item>
-        <item>
-            <key> <string>title</string> </key>
-            <value> <string>destination_function divergence tester</string> </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
-</ZopeData>
diff --git a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_rule/19.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_rule/19.xml
deleted file mode 100644
index e37cb63b7b..0000000000
--- a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_rule/19.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0"?>
-<ZopeData>
-  <record id="1" aka="AAAAAAAAAAE=">
-    <pickle>
-      <tuple>
-        <global name="CategoryMembershipDivergenceTester" module="Products.ERP5Type.Document.CategoryMembershipDivergenceTester"/>
-        <tuple/>
-      </tuple>
-    </pickle>
-    <pickle>
-      <dictionary>
-        <item>
-            <key> <string>divergence_provider</string> </key>
-            <value> <int>1</int> </value>
-        </item>
-        <item>
-            <key> <string>id</string> </key>
-            <value> <string>19</string> </value>
-        </item>
-        <item>
-            <key> <string>matching_provider</string> </key>
-            <value> <int>0</int> </value>
-        </item>
-        <item>
-            <key> <string>portal_type</string> </key>
-            <value> <string>Category Membership Divergence Tester</string> </value>
-        </item>
-        <item>
-            <key> <string>tested_property</string> </key>
-            <value>
-              <tuple>
-                <string>destination_project</string>
-              </tuple>
-            </value>
-        </item>
-        <item>
-            <key> <string>title</string> </key>
-            <value> <string>destination_project divergence tester</string> </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
-</ZopeData>
diff --git a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_rule/20.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_rule/20.xml
deleted file mode 100644
index 430565c3fb..0000000000
--- a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_rule/20.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0"?>
-<ZopeData>
-  <record id="1" aka="AAAAAAAAAAE=">
-    <pickle>
-      <tuple>
-        <global name="CategoryMembershipDivergenceTester" module="Products.ERP5Type.Document.CategoryMembershipDivergenceTester"/>
-        <tuple/>
-      </tuple>
-    </pickle>
-    <pickle>
-      <dictionary>
-        <item>
-            <key> <string>divergence_provider</string> </key>
-            <value> <int>1</int> </value>
-        </item>
-        <item>
-            <key> <string>id</string> </key>
-            <value> <string>20</string> </value>
-        </item>
-        <item>
-            <key> <string>matching_provider</string> </key>
-            <value> <int>0</int> </value>
-        </item>
-        <item>
-            <key> <string>portal_type</string> </key>
-            <value> <string>Category Membership Divergence Tester</string> </value>
-        </item>
-        <item>
-            <key> <string>tested_property</string> </key>
-            <value>
-              <tuple>
-                <string>destination_section</string>
-              </tuple>
-            </value>
-        </item>
-        <item>
-            <key> <string>title</string> </key>
-            <value> <string>destination_section divergence tester</string> </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
-</ZopeData>
diff --git a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_rule/21.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_rule/21.xml
deleted file mode 100644
index 00e5cc36b5..0000000000
--- a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_rule/21.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0"?>
-<ZopeData>
-  <record id="1" aka="AAAAAAAAAAE=">
-    <pickle>
-      <tuple>
-        <global name="FloatDivergenceTester" module="Products.ERP5Type.Document.FloatDivergenceTester"/>
-        <tuple/>
-      </tuple>
-    </pickle>
-    <pickle>
-      <dictionary>
-        <item>
-            <key> <string>_local_properties</string> </key>
-            <value>
-              <tuple>
-                <dictionary>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>quantity</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>int</string> </value>
-                  </item>
-                </dictionary>
-              </tuple>
-            </value>
-        </item>
-        <item>
-            <key> <string>divergence_provider</string> </key>
-            <value> <int>1</int> </value>
-        </item>
-        <item>
-            <key> <string>id</string> </key>
-            <value> <string>21</string> </value>
-        </item>
-        <item>
-            <key> <string>matching_provider</string> </key>
-            <value> <int>0</int> </value>
-        </item>
-        <item>
-            <key> <string>portal_type</string> </key>
-            <value> <string>Float Divergence Tester</string> </value>
-        </item>
-        <item>
-            <key> <string>quantity</string> </key>
-            <value> <int>0</int> </value>
-        </item>
-        <item>
-            <key> <string>tested_property</string> </key>
-            <value>
-              <tuple>
-                <string>price</string>
-              </tuple>
-            </value>
-        </item>
-        <item>
-            <key> <string>title</string> </key>
-            <value> <string>price divergence tester</string> </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
-</ZopeData>
diff --git a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_rule/7.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_rule/7.xml
deleted file mode 100644
index 81b1f26718..0000000000
--- a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_rule/7.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0"?>
-<ZopeData>
-  <record id="1" aka="AAAAAAAAAAE=">
-    <pickle>
-      <tuple>
-        <global name="DateTimeDivergenceTester" module="Products.ERP5Type.Document.DateTimeDivergenceTester"/>
-        <tuple/>
-      </tuple>
-    </pickle>
-    <pickle>
-      <dictionary>
-        <item>
-            <key> <string>_local_properties</string> </key>
-            <value>
-              <tuple>
-                <dictionary>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>quantity</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>int</string> </value>
-                  </item>
-                </dictionary>
-              </tuple>
-            </value>
-        </item>
-        <item>
-            <key> <string>divergence_provider</string> </key>
-            <value> <int>1</int> </value>
-        </item>
-        <item>
-            <key> <string>id</string> </key>
-            <value> <string>7</string> </value>
-        </item>
-        <item>
-            <key> <string>matching_provider</string> </key>
-            <value> <int>0</int> </value>
-        </item>
-        <item>
-            <key> <string>portal_type</string> </key>
-            <value> <string>DateTime Divergence Tester</string> </value>
-        </item>
-        <item>
-            <key> <string>quantity</string> </key>
-            <value> <int>0</int> </value>
-        </item>
-        <item>
-            <key> <string>tested_property</string> </key>
-            <value>
-              <tuple>
-                <string>start_date</string>
-              </tuple>
-            </value>
-        </item>
-        <item>
-            <key> <string>title</string> </key>
-            <value> <string>start_date divergence tester</string> </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
-</ZopeData>
diff --git a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_rule/8.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_rule/8.xml
deleted file mode 100644
index dcbbcc34be..0000000000
--- a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_rule/8.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0"?>
-<ZopeData>
-  <record id="1" aka="AAAAAAAAAAE=">
-    <pickle>
-      <tuple>
-        <global name="DateTimeDivergenceTester" module="Products.ERP5Type.Document.DateTimeDivergenceTester"/>
-        <tuple/>
-      </tuple>
-    </pickle>
-    <pickle>
-      <dictionary>
-        <item>
-            <key> <string>_local_properties</string> </key>
-            <value>
-              <tuple>
-                <dictionary>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>quantity</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>int</string> </value>
-                  </item>
-                </dictionary>
-              </tuple>
-            </value>
-        </item>
-        <item>
-            <key> <string>divergence_provider</string> </key>
-            <value> <int>1</int> </value>
-        </item>
-        <item>
-            <key> <string>id</string> </key>
-            <value> <string>8</string> </value>
-        </item>
-        <item>
-            <key> <string>matching_provider</string> </key>
-            <value> <int>0</int> </value>
-        </item>
-        <item>
-            <key> <string>portal_type</string> </key>
-            <value> <string>DateTime Divergence Tester</string> </value>
-        </item>
-        <item>
-            <key> <string>quantity</string> </key>
-            <value> <int>0</int> </value>
-        </item>
-        <item>
-            <key> <string>tested_property</string> </key>
-            <value>
-              <tuple>
-                <string>stop_date</string>
-              </tuple>
-            </value>
-        </item>
-        <item>
-            <key> <string>title</string> </key>
-            <value> <string>stop_date divergence tester</string> </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
-</ZopeData>
diff --git a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_rule/aggregate_tester.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_rule/aggregate_tester.xml
new file mode 100644
index 0000000000..71cc29897e
--- /dev/null
+++ b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_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_trade_model_rule/16.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_rule/base_application_tester.xml
similarity index 97%
rename from bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_rule/16.xml
rename to bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_rule/base_application_tester.xml
index dfcc2439e4..5f9db3567f 100644
--- a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_rule/16.xml
+++ b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_rule/base_application_tester.xml
@@ -33,7 +33,7 @@
         </item>
         <item>
             <key> <string>id</string> </key>
-            <value> <string>16</string> </value>
+            <value> <string>base_application_tester</string> </value>
         </item>
         <item>
             <key> <string>matching_provider</string> </key>
diff --git a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_rule/15.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_rule/base_contribution_tester.xml
similarity index 97%
rename from bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_rule/15.xml
rename to bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_rule/base_contribution_tester.xml
index 97635f4374..3710d21db4 100644
--- a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_rule/15.xml
+++ b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_rule/base_contribution_tester.xml
@@ -33,7 +33,7 @@
         </item>
         <item>
             <key> <string>id</string> </key>
-            <value> <string>15</string> </value>
+            <value> <string>base_contribution_tester</string> </value>
         </item>
         <item>
             <key> <string>matching_provider</string> </key>
diff --git a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_rule/delivery_mode_tester.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_rule/delivery_mode_tester.xml
new file mode 100644
index 0000000000..bc96d8de5c
--- /dev/null
+++ b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_rule/delivery_mode_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>delivery_mode_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>delivery_mode</string>
+              </tuple>
+            </value>
+        </item>
+        <item>
+            <key> <string>title</string> </key>
+            <value> <string>delivery_mode 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_trade_model_rule/description_tester.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_rule/description_tester.xml
new file mode 100644
index 0000000000..1e8485574e
--- /dev/null
+++ b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_rule/description_tester.xml
@@ -0,0 +1,93 @@
+<?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>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>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_trade_model_rule/destination_account_tester.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_rule/destination_account_tester.xml
new file mode 100644
index 0000000000..c95e07e481
--- /dev/null
+++ b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_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_trade_model_rule/3.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_rule/destination_administration_tester.xml
similarity index 83%
rename from bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_rule/3.xml
rename to bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_rule/destination_administration_tester.xml
index 3594aedd8a..92ac107f2d 100644
--- a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_rule/3.xml
+++ b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_rule/destination_administration_tester.xml
@@ -21,23 +21,13 @@
               <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>
+            <value> <int>0</int> </value>
         </item>
         <item>
             <key> <string>id</string> </key>
-            <value> <string>3</string> </value>
-        </item>
-        <item>
-            <key> <string>matching_provider</string> </key>
-            <value> <int>0</int> </value>
+            <value> <string>destination_administration_tester</string> </value>
         </item>
         <item>
             <key> <string>portal_type</string> </key>
@@ -47,13 +37,13 @@
             <key> <string>tested_property</string> </key>
             <value>
               <tuple>
-                <string>destination</string>
+                <string>destination_administration</string>
               </tuple>
             </value>
         </item>
         <item>
             <key> <string>title</string> </key>
-            <value> <string>destination divergence tester</string> </value>
+            <value> <string>destination_administration divergence tester</string> </value>
         </item>
       </dictionary>
     </pickle>
diff --git a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_rule/9.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_rule/destination_decision_tester.xml
similarity index 83%
rename from bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_rule/9.xml
rename to bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_rule/destination_decision_tester.xml
index 76198caf94..95ab627b42 100644
--- a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_rule/9.xml
+++ b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_rule/destination_decision_tester.xml
@@ -21,23 +21,13 @@
               <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>
+            <value> <int>0</int> </value>
         </item>
         <item>
             <key> <string>id</string> </key>
-            <value> <string>9</string> </value>
-        </item>
-        <item>
-            <key> <string>matching_provider</string> </key>
-            <value> <int>0</int> </value>
+            <value> <string>destination_decision_tester</string> </value>
         </item>
         <item>
             <key> <string>portal_type</string> </key>
@@ -47,13 +37,13 @@
             <key> <string>tested_property</string> </key>
             <value>
               <tuple>
-                <string>aggregate</string>
+                <string>destination_decision</string>
               </tuple>
             </value>
         </item>
         <item>
             <key> <string>title</string> </key>
-            <value> <string>aggregate divergence tester</string> </value>
+            <value> <string>destination_decision divergence tester</string> </value>
         </item>
       </dictionary>
     </pickle>
diff --git a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_rule/destination_function_tester.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_rule/destination_function_tester.xml
new file mode 100644
index 0000000000..7549f4265f
--- /dev/null
+++ b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_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_trade_model_rule/18.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_rule/destination_payment_tester.xml
similarity index 83%
rename from bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_rule/18.xml
rename to bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_rule/destination_payment_tester.xml
index cc6483d525..294cf5b5ee 100644
--- a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_rule/18.xml
+++ b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_rule/destination_payment_tester.xml
@@ -21,23 +21,13 @@
               <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>
+            <value> <int>0</int> </value>
         </item>
         <item>
             <key> <string>id</string> </key>
-            <value> <string>18</string> </value>
-        </item>
-        <item>
-            <key> <string>matching_provider</string> </key>
-            <value> <int>0</int> </value>
+            <value> <string>destination_payment_tester</string> </value>
         </item>
         <item>
             <key> <string>portal_type</string> </key>
@@ -47,13 +37,13 @@
             <key> <string>tested_property</string> </key>
             <value>
               <tuple>
-                <string>destination_account</string>
+                <string>destination_payment</string>
               </tuple>
             </value>
         </item>
         <item>
             <key> <string>title</string> </key>
-            <value> <string>destination_account divergence tester</string> </value>
+            <value> <string>destination_payment divergence tester</string> </value>
         </item>
       </dictionary>
     </pickle>
diff --git a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_rule/1.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_rule/destination_project_tester.xml
similarity index 88%
rename from bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_rule/1.xml
rename to bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_rule/destination_project_tester.xml
index 2d05bf123f..7c5c1d67d6 100644
--- a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_rule/1.xml
+++ b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_rule/destination_project_tester.xml
@@ -21,19 +21,13 @@
               <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>1</string> </value>
+            <value> <string>destination_project_tester</string> </value>
         </item>
         <item>
             <key> <string>matching_provider</string> </key>
@@ -47,13 +41,13 @@
             <key> <string>tested_property</string> </key>
             <value>
               <tuple>
-                <string>resource</string>
+                <string>destination_project</string>
               </tuple>
             </value>
         </item>
         <item>
             <key> <string>title</string> </key>
-            <value> <string>resource divergence tester</string> </value>
+            <value> <string>destination_project divergence tester</string> </value>
         </item>
       </dictionary>
     </pickle>
diff --git a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_rule/destination_section_tester.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_rule/destination_section_tester.xml
new file mode 100644
index 0000000000..db74f573d7
--- /dev/null
+++ b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_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_trade_model_rule/destination_tester.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_rule/destination_tester.xml
new file mode 100644
index 0000000000..8ceac2bb77
--- /dev/null
+++ b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_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_trade_model_rule/incoterm_tester.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_rule/incoterm_tester.xml
new file mode 100644
index 0000000000..a286dad565
--- /dev/null
+++ b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_rule/incoterm_tester.xml
@@ -0,0 +1,87 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <tuple>
+        <global name="CategoryMembershipDivergenceTester" module="Products.ERP5Type.Document.CategoryMembershipDivergenceTester"/>
+        <tuple/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>_identity_criterion</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+            </value>
+        </item>
+        <item>
+            <key> <string>_range_criterion</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
+            </value>
+        </item>
+        <item>
+            <key> <string>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_trade_model_rule/price_currency_tester.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_rule/price_currency_tester.xml
new file mode 100644
index 0000000000..35d65aa3b1
--- /dev/null
+++ b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_rule/price_currency_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>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_trade_model_rule/quantity_tester.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_rule/quantity_tester.xml
new file mode 100644
index 0000000000..91bc42df6a
--- /dev/null
+++ b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_rule/quantity_tester.xml
@@ -0,0 +1,119 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <tuple>
+        <global name="NetConvertedQuantityDivergenceTester" module="Products.ERP5Type.Document.NetConvertedQuantityDivergenceTester"/>
+        <tuple/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>_identity_criterion</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+            </value>
+        </item>
+        <item>
+            <key> <string>_local_properties</string> </key>
+            <value>
+              <tuple>
+                <dictionary>
+                  <item>
+                      <key> <string>id</string> </key>
+                      <value> <string>use_delivery_ratio</string> </value>
+                  </item>
+                  <item>
+                      <key> <string>type</string> </key>
+                      <value> <string>int</string> </value>
+                  </item>
+                </dictionary>
+                <dictionary>
+                  <item>
+                      <key> <string>id</string> </key>
+                      <value> <string>quantity</string> </value>
+                  </item>
+                  <item>
+                      <key> <string>type</string> </key>
+                      <value> <string>int</string> </value>
+                  </item>
+                </dictionary>
+              </tuple>
+            </value>
+        </item>
+        <item>
+            <key> <string>_range_criterion</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
+            </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>quantity_tester</string> </value>
+        </item>
+        <item>
+            <key> <string>portal_type</string> </key>
+            <value> <string>Net Converted Quantity Divergence Tester</string> </value>
+        </item>
+        <item>
+            <key> <string>quantity</string> </key>
+            <value> <int>0</int> </value>
+        </item>
+        <item>
+            <key> <string>tested_property</string> </key>
+            <value>
+              <tuple>
+                <string>quantity</string>
+                <string>quantity_unit</string>
+              </tuple>
+            </value>
+        </item>
+        <item>
+            <key> <string>title</string> </key>
+            <value> <string>quantity divergence tester</string> </value>
+        </item>
+        <item>
+            <key> <string>use_delivery_ratio</string> </key>
+            <value> <int>1</int> </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="2" aka="AAAAAAAAAAI=">
+    <pickle>
+      <tuple>
+        <global name="PersistentMapping" module="Persistence.mapping"/>
+        <tuple/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>data</string> </key>
+            <value>
+              <dictionary/>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="3" aka="AAAAAAAAAAM=">
+    <pickle>
+      <tuple>
+        <global name="PersistentMapping" module="Persistence.mapping"/>
+        <tuple/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>data</string> </key>
+            <value>
+              <dictionary/>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+</ZopeData>
diff --git a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_rule/4.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_rule/reference_tester.xml
similarity index 97%
rename from bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_rule/4.xml
rename to bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_rule/reference_tester.xml
index 3551769d6b..df6cbcb636 100644
--- a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_rule/4.xml
+++ b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_rule/reference_tester.xml
@@ -33,7 +33,7 @@
         </item>
         <item>
             <key> <string>id</string> </key>
-            <value> <string>4</string> </value>
+            <value> <string>reference_tester</string> </value>
         </item>
         <item>
             <key> <string>matching_provider</string> </key>
diff --git a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_rule/resource_tester.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_rule/resource_tester.xml
new file mode 100644
index 0000000000..fb2433449e
--- /dev/null
+++ b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_rule/resource_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>resource_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>resource</string>
+              </tuple>
+            </value>
+        </item>
+        <item>
+            <key> <string>title</string> </key>
+            <value> <string>resource divergence tester</string> </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="2" aka="AAAAAAAAAAI=">
+    <pickle>
+      <tuple>
+        <global name="PersistentMapping" module="Persistence.mapping"/>
+        <tuple/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>data</string> </key>
+            <value>
+              <dictionary/>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="3" aka="AAAAAAAAAAM=">
+    <pickle>
+      <tuple>
+        <global name="PersistentMapping" module="Persistence.mapping"/>
+        <tuple/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>data</string> </key>
+            <value>
+              <dictionary/>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+</ZopeData>
diff --git a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_rule/12.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_rule/source_account_tester.xml
similarity index 82%
rename from bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_rule/12.xml
rename to bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_rule/source_account_tester.xml
index c73c595f30..8891440869 100644
--- a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_rule/12.xml
+++ b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_rule/source_account_tester.xml
@@ -21,23 +21,9 @@
               <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>12</string> </value>
-        </item>
-        <item>
-            <key> <string>matching_provider</string> </key>
-            <value> <int>0</int> </value>
+            <value> <string>source_account_tester</string> </value>
         </item>
         <item>
             <key> <string>portal_type</string> </key>
diff --git a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_rule/source_administration_tester.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_rule/source_administration_tester.xml
new file mode 100644
index 0000000000..15c034d819
--- /dev/null
+++ b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_rule/source_administration_tester.xml
@@ -0,0 +1,87 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <tuple>
+        <global name="CategoryMembershipDivergenceTester" module="Products.ERP5Type.Document.CategoryMembershipDivergenceTester"/>
+        <tuple/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>_identity_criterion</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+            </value>
+        </item>
+        <item>
+            <key> <string>_range_criterion</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
+            </value>
+        </item>
+        <item>
+            <key> <string>divergence_provider</string> </key>
+            <value> <int>0</int> </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>source_administration_tester</string> </value>
+        </item>
+        <item>
+            <key> <string>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_trade_model_rule/source_decision_tester.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_rule/source_decision_tester.xml
new file mode 100644
index 0000000000..9fcb72c6cd
--- /dev/null
+++ b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_rule/source_decision_tester.xml
@@ -0,0 +1,87 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <tuple>
+        <global name="CategoryMembershipDivergenceTester" module="Products.ERP5Type.Document.CategoryMembershipDivergenceTester"/>
+        <tuple/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>_identity_criterion</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+            </value>
+        </item>
+        <item>
+            <key> <string>_range_criterion</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
+            </value>
+        </item>
+        <item>
+            <key> <string>divergence_provider</string> </key>
+            <value> <int>0</int> </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>source_decision_tester</string> </value>
+        </item>
+        <item>
+            <key> <string>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_trade_model_rule/source_function_tester.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_rule/source_function_tester.xml
new file mode 100644
index 0000000000..08ca7aa283
--- /dev/null
+++ b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_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_trade_model_rule/10.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_rule/source_payment_tester.xml
similarity index 83%
rename from bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_rule/10.xml
rename to bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_rule/source_payment_tester.xml
index 69d24cc417..2b262fd2bd 100644
--- a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_rule/10.xml
+++ b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_rule/source_payment_tester.xml
@@ -21,23 +21,13 @@
               <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>
+            <value> <int>0</int> </value>
         </item>
         <item>
             <key> <string>id</string> </key>
-            <value> <string>10</string> </value>
-        </item>
-        <item>
-            <key> <string>matching_provider</string> </key>
-            <value> <int>0</int> </value>
+            <value> <string>source_payment_tester</string> </value>
         </item>
         <item>
             <key> <string>portal_type</string> </key>
@@ -47,13 +37,13 @@
             <key> <string>tested_property</string> </key>
             <value>
               <tuple>
-                <string>price_currency</string>
+                <string>source_payment</string>
               </tuple>
             </value>
         </item>
         <item>
             <key> <string>title</string> </key>
-            <value> <string>price_currency divergence tester</string> </value>
+            <value> <string>source_payment divergence tester</string> </value>
         </item>
       </dictionary>
     </pickle>
diff --git a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_rule/2.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_rule/source_project_tester.xml
similarity index 88%
rename from bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_rule/2.xml
rename to bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_rule/source_project_tester.xml
index b1358bb2f8..b76872dbaa 100644
--- a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_rule/2.xml
+++ b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_rule/source_project_tester.xml
@@ -21,19 +21,13 @@
               <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>2</string> </value>
+            <value> <string>source_project_tester</string> </value>
         </item>
         <item>
             <key> <string>matching_provider</string> </key>
@@ -47,13 +41,13 @@
             <key> <string>tested_property</string> </key>
             <value>
               <tuple>
-                <string>source</string>
+                <string>source_project</string>
               </tuple>
             </value>
         </item>
         <item>
             <key> <string>title</string> </key>
-            <value> <string>source divergence tester</string> </value>
+            <value> <string>source_project divergence tester</string> </value>
         </item>
       </dictionary>
     </pickle>
diff --git a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_rule/source_section_tester.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_rule/source_section_tester.xml
new file mode 100644
index 0000000000..a9eb20c9fe
--- /dev/null
+++ b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_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_trade_model_rule/source_tester.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_rule/source_tester.xml
new file mode 100644
index 0000000000..ca8b9fe144
--- /dev/null
+++ b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_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_trade_model_rule/6.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_rule/start_date_tester.xml
similarity index 84%
rename from bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_rule/6.xml
rename to bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_rule/start_date_tester.xml
index 58c057f2ee..7d635e4ce5 100644
--- a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_rule/6.xml
+++ b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_rule/start_date_tester.xml
@@ -3,7 +3,7 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <global name="NetConvertedQuantityDivergenceTester" module="Products.ERP5Type.Document.NetConvertedQuantityDivergenceTester"/>
+        <global name="DateTimeDivergenceTester" module="Products.ERP5Type.Document.DateTimeDivergenceTester"/>
         <tuple/>
       </tuple>
     </pickle>
@@ -38,19 +38,13 @@
               <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>6</string> </value>
+            <value> <string>start_date_tester</string> </value>
         </item>
         <item>
             <key> <string>matching_provider</string> </key>
@@ -58,7 +52,7 @@
         </item>
         <item>
             <key> <string>portal_type</string> </key>
-            <value> <string>Net Converted Quantity Divergence Tester</string> </value>
+            <value> <string>DateTime Divergence Tester</string> </value>
         </item>
         <item>
             <key> <string>quantity</string> </key>
@@ -68,13 +62,13 @@
             <key> <string>tested_property</string> </key>
             <value>
               <tuple>
-                <string>quantity</string>
+                <string>start_date</string>
               </tuple>
             </value>
         </item>
         <item>
             <key> <string>title</string> </key>
-            <value> <string>quantity divergence tester</string> </value>
+            <value> <string>start_date divergence tester</string> </value>
         </item>
       </dictionary>
     </pickle>
diff --git a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_rule/stop_date_tester.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_rule/stop_date_tester.xml
new file mode 100644
index 0000000000..f31151e04e
--- /dev/null
+++ b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_rule/stop_date_tester.xml
@@ -0,0 +1,112 @@
+<?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>divergence_provider</string> </key>
+            <value> <int>1</int> </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>stop_date_tester</string> </value>
+        </item>
+        <item>
+            <key> <string>matching_provider</string> </key>
+            <value> <int>0</int> </value>
+        </item>
+        <item>
+            <key> <string>portal_type</string> </key>
+            <value> <string>DateTime Divergence Tester</string> </value>
+        </item>
+        <item>
+            <key> <string>quantity</string> </key>
+            <value> <int>0</int> </value>
+        </item>
+        <item>
+            <key> <string>tested_property</string> </key>
+            <value>
+              <tuple>
+                <string>stop_date</string>
+              </tuple>
+            </value>
+        </item>
+        <item>
+            <key> <string>title</string> </key>
+            <value> <string>stop_date divergence tester</string> </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="2" aka="AAAAAAAAAAI=">
+    <pickle>
+      <tuple>
+        <global name="PersistentMapping" module="Persistence.mapping"/>
+        <tuple/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>data</string> </key>
+            <value>
+              <dictionary/>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="3" aka="AAAAAAAAAAM=">
+    <pickle>
+      <tuple>
+        <global name="PersistentMapping" module="Persistence.mapping"/>
+        <tuple/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>data</string> </key>
+            <value>
+              <dictionary/>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+</ZopeData>
-- 
2.30.9