diff --git a/bt5/erp5_simulation/ActionTemplateItem/portal_types/Net%20Converted%20Quantity%20Divergence%20Tester/configuration.xml b/bt5/erp5_simulation/ActionTemplateItem/portal_types/Net%20Converted%20Quantity%20Divergence%20Tester/configuration.xml
new file mode 100644
index 0000000000000000000000000000000000000000..51b2bb03e0abee00b2c6dff0cdc3def0a5552e82
--- /dev/null
+++ b/bt5/erp5_simulation/ActionTemplateItem/portal_types/Net%20Converted%20Quantity%20Divergence%20Tester/configuration.xml
@@ -0,0 +1,93 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <tuple>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>action</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+            </value>
+        </item>
+        <item>
+            <key> <string>categories</string> </key>
+            <value>
+              <tuple>
+                <string>action_type/object_view</string>
+                <string>portal_types/Trade Quantity Divergence Tester/1</string>
+                <string>portal_types/Float Divergence Tester/2</string>
+              </tuple>
+            </value>
+        </item>
+        <item>
+            <key> <string>category</string> </key>
+            <value> <string>object_view</string> </value>
+        </item>
+        <item>
+            <key> <string>condition</string> </key>
+            <value> <string></string> </value>
+        </item>
+        <item>
+            <key> <string>description</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>icon</string> </key>
+            <value> <string></string> </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>configuration</string> </value>
+        </item>
+        <item>
+            <key> <string>permissions</string> </key>
+            <value>
+              <tuple>
+                <string>View</string>
+              </tuple>
+            </value>
+        </item>
+        <item>
+            <key> <string>portal_type</string> </key>
+            <value> <string>Action Information</string> </value>
+        </item>
+        <item>
+            <key> <string>priority</string> </key>
+            <value> <float>2.0</float> </value>
+        </item>
+        <item>
+            <key> <string>title</string> </key>
+            <value> <string>Configuration</string> </value>
+        </item>
+        <item>
+            <key> <string>visible</string> </key>
+            <value> <int>1</int> </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="2" aka="AAAAAAAAAAI=">
+    <pickle>
+      <tuple>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>text</string> </key>
+            <value> <string>string:${object_url}/FloatDivergenceTester_viewConfiguration</string> </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+</ZopeData>
diff --git a/bt5/erp5_simulation/ActionTemplateItem/portal_types/Net%20Converted%20Quantity%20Divergence%20Tester/predicate.xml b/bt5/erp5_simulation/ActionTemplateItem/portal_types/Net%20Converted%20Quantity%20Divergence%20Tester/predicate.xml
new file mode 100644
index 0000000000000000000000000000000000000000..d7b5460d26707f8213a08802f5df4592de0512b4
--- /dev/null
+++ b/bt5/erp5_simulation/ActionTemplateItem/portal_types/Net%20Converted%20Quantity%20Divergence%20Tester/predicate.xml
@@ -0,0 +1,93 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <tuple>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>action</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+            </value>
+        </item>
+        <item>
+            <key> <string>categories</string> </key>
+            <value>
+              <tuple>
+                <string>action_type/object_view</string>
+                <string>portal_types/Trade Quantity Divergence Tester/1</string>
+                <string>portal_types/Float Divergence Tester/3</string>
+              </tuple>
+            </value>
+        </item>
+        <item>
+            <key> <string>category</string> </key>
+            <value> <string>object_view</string> </value>
+        </item>
+        <item>
+            <key> <string>condition</string> </key>
+            <value> <string></string> </value>
+        </item>
+        <item>
+            <key> <string>description</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>icon</string> </key>
+            <value> <string></string> </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>predicate</string> </value>
+        </item>
+        <item>
+            <key> <string>permissions</string> </key>
+            <value>
+              <tuple>
+                <string>View</string>
+              </tuple>
+            </value>
+        </item>
+        <item>
+            <key> <string>portal_type</string> </key>
+            <value> <string>Action Information</string> </value>
+        </item>
+        <item>
+            <key> <string>priority</string> </key>
+            <value> <float>3.0</float> </value>
+        </item>
+        <item>
+            <key> <string>title</string> </key>
+            <value> <string>Predicate</string> </value>
+        </item>
+        <item>
+            <key> <string>visible</string> </key>
+            <value> <int>1</int> </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="2" aka="AAAAAAAAAAI=">
+    <pickle>
+      <tuple>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>text</string> </key>
+            <value> <string>string:${object_url}/Predicate_view</string> </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+</ZopeData>
diff --git a/bt5/erp5_simulation/ActionTemplateItem/portal_types/Net%20Converted%20Quantity%20Divergence%20Tester/view.xml b/bt5/erp5_simulation/ActionTemplateItem/portal_types/Net%20Converted%20Quantity%20Divergence%20Tester/view.xml
new file mode 100644
index 0000000000000000000000000000000000000000..ab3322cf6d84ab5c4f6d2a3fe2e7e4d7083e8116
--- /dev/null
+++ b/bt5/erp5_simulation/ActionTemplateItem/portal_types/Net%20Converted%20Quantity%20Divergence%20Tester/view.xml
@@ -0,0 +1,93 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <tuple>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>action</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+            </value>
+        </item>
+        <item>
+            <key> <string>categories</string> </key>
+            <value>
+              <tuple>
+                <string>action_type/object_view</string>
+                <string>portal_types/Float Divergence Tester/1</string>
+                <string>portal_types/Float Divergence Tester/1</string>
+              </tuple>
+            </value>
+        </item>
+        <item>
+            <key> <string>category</string> </key>
+            <value> <string>object_view</string> </value>
+        </item>
+        <item>
+            <key> <string>condition</string> </key>
+            <value> <string></string> </value>
+        </item>
+        <item>
+            <key> <string>description</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>icon</string> </key>
+            <value> <string></string> </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>view</string> </value>
+        </item>
+        <item>
+            <key> <string>permissions</string> </key>
+            <value>
+              <tuple>
+                <string>View</string>
+              </tuple>
+            </value>
+        </item>
+        <item>
+            <key> <string>portal_type</string> </key>
+            <value> <string>Action Information</string> </value>
+        </item>
+        <item>
+            <key> <string>priority</string> </key>
+            <value> <float>1.0</float> </value>
+        </item>
+        <item>
+            <key> <string>title</string> </key>
+            <value> <string>View</string> </value>
+        </item>
+        <item>
+            <key> <string>visible</string> </key>
+            <value> <int>1</int> </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="2" aka="AAAAAAAAAAI=">
+    <pickle>
+      <tuple>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>text</string> </key>
+            <value> <string>string:${object_url}/Tester_view</string> </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+</ZopeData>
diff --git a/bt5/erp5_simulation/PortalTypeAllowedContentTypeTemplateItem/allowed_content_types.xml b/bt5/erp5_simulation/PortalTypeAllowedContentTypeTemplateItem/allowed_content_types.xml
index 227ad0d3f6b361c807ec21eb868919d34f1499fb..96dc0cf6bfd7d4e45c16d0b2940b5630ab672c13 100644
--- a/bt5/erp5_simulation/PortalTypeAllowedContentTypeTemplateItem/allowed_content_types.xml
+++ b/bt5/erp5_simulation/PortalTypeAllowedContentTypeTemplateItem/allowed_content_types.xml
@@ -4,6 +4,7 @@
   <item>DateTime Divergence Tester</item>
   <item>Variation Divergence Tester</item>
   <item>Float Divergence Tester</item>
+  <item>Net Converted Quantity Divergence Tester</item>
   <item>String Divergence Tester</item>
  </portal_type>
  <portal_type id="Rule Tool">
diff --git a/bt5/erp5_simulation/PortalTypeTemplateItem/portal_types/Net%20Converted%20Quantity%20Divergence%20Tester.xml b/bt5/erp5_simulation/PortalTypeTemplateItem/portal_types/Net%20Converted%20Quantity%20Divergence%20Tester.xml
new file mode 100644
index 0000000000000000000000000000000000000000..6ee7793c867979fbe7096908bfcd4f03fae38da7
--- /dev/null
+++ b/bt5/erp5_simulation/PortalTypeTemplateItem/portal_types/Net%20Converted%20Quantity%20Divergence%20Tester.xml
@@ -0,0 +1,67 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <tuple>
+        <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
+        <tuple/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>acquire_local_roles</string> </key>
+            <value> <int>1</int> </value>
+        </item>
+        <item>
+            <key> <string>content_icon</string> </key>
+            <value> <string>document.gif</string> </value>
+        </item>
+        <item>
+            <key> <string>content_meta_type</string> </key>
+            <value> <string>ERP5 Divergence Tester</string> </value>
+        </item>
+        <item>
+            <key> <string>description</string> </key>
+            <value> <string>Net Converted Quantity Divergence Testers can be used to test net converted quantity, taking into account margins and rounding. All configuration properties of divergence testers are stored at instance level in order to simplify their historization at rule level.</string> </value>
+        </item>
+        <item>
+            <key> <string>factory</string> </key>
+            <value> <string>addNetConvertedQuantityDivergenceTester</string> </value>
+        </item>
+        <item>
+            <key> <string>filter_content_types</string> </key>
+            <value> <int>1</int> </value>
+        </item>
+        <item>
+            <key> <string>group_list</string> </key>
+            <value>
+              <tuple>
+                <string>divergence_tester</string>
+              </tuple>
+            </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>Net Converted Quantity Divergence Tester</string> </value>
+        </item>
+        <item>
+            <key> <string>init_script</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>permission</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>title</string> </key>
+            <value> <string></string> </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+</ZopeData>
diff --git a/bt5/erp5_simulation/PortalTypeWorkflowChainTemplateItem/workflow_chain_type.xml b/bt5/erp5_simulation/PortalTypeWorkflowChainTemplateItem/workflow_chain_type.xml
index 58b1c227276dda10cc8708a372d56fb67d1d92e5..69459221ecfb8a2a479265f2f26f92aba05854cc 100644
--- a/bt5/erp5_simulation/PortalTypeWorkflowChainTemplateItem/workflow_chain_type.xml
+++ b/bt5/erp5_simulation/PortalTypeWorkflowChainTemplateItem/workflow_chain_type.xml
@@ -19,6 +19,10 @@
   <type>New Order Rule</type>
   <workflow>edit_workflow, rule_validation_workflow</workflow>
  </chain>
+ <chain>
+  <type>Net Converted Quantity Divergence Tester</type>
+  <workflow>edit_workflow</workflow>
+ </chain>
  <chain>
   <type>Production Reduction Solver</type>
   <workflow>solver_workflow</workflow>
diff --git a/bt5/erp5_simulation/bt/revision b/bt5/erp5_simulation/bt/revision
index 86ee83a4a26867a79e0a5a8948153cff8f4cf9a4..aaa6442fe902e96a5233b136b973b96a4011fc18 100644
--- a/bt5/erp5_simulation/bt/revision
+++ b/bt5/erp5_simulation/bt/revision
@@ -1 +1 @@
-40
\ No newline at end of file
+41
\ No newline at end of file
diff --git a/bt5/erp5_simulation/bt/template_action_path_list b/bt5/erp5_simulation/bt/template_action_path_list
index faa665b5b4c6dcd13711b05939dbc5283c2dc8b6..e97e60d1920cda0cf8cafed3777d523917a64309 100644
--- a/bt5/erp5_simulation/bt/template_action_path_list
+++ b/bt5/erp5_simulation/bt/template_action_path_list
@@ -10,6 +10,9 @@ Float Divergence Tester | configuration
 Float Divergence Tester | predicate
 Float Divergence Tester | view
 New Order Rule | view
+Net Converted Quantity Divergence Tester | configuration
+Net Converted Quantity Divergence Tester | predicate
+Net Converted Quantity Divergence Tester | view
 Quantity Accept Solver | configuration
 Quantity Accept Solver | view
 Quantity Cancel Solver | configuration
diff --git a/bt5/erp5_simulation/bt/template_portal_type_allowed_content_type_list b/bt5/erp5_simulation/bt/template_portal_type_allowed_content_type_list
index 6a3ab31615c7d6be33573e42e9a0d9b1245eb72a..81b915b7117b250e6e8f6e868db015a1be960ff0 100644
--- a/bt5/erp5_simulation/bt/template_portal_type_allowed_content_type_list
+++ b/bt5/erp5_simulation/bt/template_portal_type_allowed_content_type_list
@@ -1,6 +1,7 @@
 New Order Rule | Category Membership Divergence Tester
 New Order Rule | DateTime Divergence Tester
 New Order Rule | Float Divergence Tester
+New Order Rule | Net Converted Quantity Divergence Tester
 New Order Rule | String Divergence Tester
 New Order Rule | Variation Divergence Tester
 Rule Tool | New Order Rule
diff --git a/bt5/erp5_simulation/bt/template_portal_type_id_list b/bt5/erp5_simulation/bt/template_portal_type_id_list
index 37291a604fa8805cd4ad15cfc2f486ca7b4307b7..c373c0e94d4143f6f735f83685a4f79f4208ccd5 100644
--- a/bt5/erp5_simulation/bt/template_portal_type_id_list
+++ b/bt5/erp5_simulation/bt/template_portal_type_id_list
@@ -3,6 +3,7 @@ DateTime Divergence Tester
 Destination Replacement Solver
 Float Divergence Tester
 New Order Rule
+Net Converted Quantity Divergence Tester
 Production Reduction Solver
 Quantity Accept Solver
 Quantity Adoption Solver
diff --git a/bt5/erp5_simulation/bt/template_portal_type_workflow_chain_list b/bt5/erp5_simulation/bt/template_portal_type_workflow_chain_list
index 26e07b43374f76d500d4094c3116d909475cb746..f985bf46cc3c40e6d069aea22ab9ebf3eff51a73 100644
--- a/bt5/erp5_simulation/bt/template_portal_type_workflow_chain_list
+++ b/bt5/erp5_simulation/bt/template_portal_type_workflow_chain_list
@@ -4,6 +4,7 @@ Destination Replacement Solver | solver_workflow
 Float Divergence Tester | edit_workflow
 New Order Rule | edit_workflow
 New Order Rule | rule_validation_workflow
+Net Converted Quantity Divergence Tester | edit_workflow
 Production Reduction Solver | solver_workflow
 Quantity Accept Solver | solver_workflow
 Quantity Adoption Solver | solver_workflow