diff --git a/bt5/erp5_open_trade/PathTemplateItem/portal_deliveries/sale_order_builder.xml b/bt5/erp5_open_trade/PathTemplateItem/portal_deliveries/sale_order_builder.xml
deleted file mode 100644
index bc5710ce99c5797415723897863bc3ebfa90a43c..0000000000000000000000000000000000000000
--- a/bt5/erp5_open_trade/PathTemplateItem/portal_deliveries/sale_order_builder.xml
+++ /dev/null
@@ -1,108 +0,0 @@
-<?xml version="1.0"?>
-<ZopeData>
-  <record id="1" aka="AAAAAAAAAAE=">
-    <pickle>
-      <global name="Delivery Builder" module="erp5.portal_type"/>
-    </pickle>
-    <pickle>
-      <dictionary>
-        <item>
-            <key> <string>_count</string> </key>
-            <value>
-              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
-            </value>
-        </item>
-        <item>
-            <key> <string>_mt_index</string> </key>
-            <value>
-              <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
-            </value>
-        </item>
-        <item>
-            <key> <string>_tree</string> </key>
-            <value>
-              <persistent> <string encoding="base64">AAAAAAAAAAQ=</string> </persistent>
-            </value>
-        </item>
-        <item>
-            <key> <string>comment</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
-        <item>
-            <key> <string>delivery_after_generation_script_id</string> </key>
-            <value> <string>SaleOrder_copyOpenSaleOrderProperties</string> </value>
-        </item>
-        <item>
-            <key> <string>delivery_cell_portal_type</string> </key>
-            <value> <string>Sale Order Cell</string> </value>
-        </item>
-        <item>
-            <key> <string>delivery_cell_separate_order</string> </key>
-            <value>
-              <tuple/>
-            </value>
-        </item>
-        <item>
-            <key> <string>delivery_line_portal_type</string> </key>
-            <value> <string>Sale Order Line</string> </value>
-        </item>
-        <item>
-            <key> <string>delivery_module</string> </key>
-            <value> <string>sale_order_module</string> </value>
-        </item>
-        <item>
-            <key> <string>delivery_portal_type</string> </key>
-            <value> <string>Sale Order</string> </value>
-        </item>
-        <item>
-            <key> <string>description</string> </key>
-            <value> <string>Build Sale Order from Open Sale Order related simulation movements.</string> </value>
-        </item>
-        <item>
-            <key> <string>id</string> </key>
-            <value> <string>sale_order_builder</string> </value>
-        </item>
-        <item>
-            <key> <string>last_id</string> </key>
-            <value> <string>9</string> </value>
-        </item>
-        <item>
-            <key> <string>portal_type</string> </key>
-            <value> <string>Delivery Builder</string> </value>
-        </item>
-        <item>
-            <key> <string>simulation_select_method_id</string> </key>
-            <value> <string>DeliveryBuilder_getOpenSaleOrderRelatedSimulationMovementList</string> </value>
-        </item>
-        <item>
-            <key> <string>title</string> </key>
-            <value> <string>Sale Order Builder</string> </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
-  <record id="2" aka="AAAAAAAAAAI=">
-    <pickle>
-      <global name="Length" module="BTrees.Length"/>
-    </pickle>
-    <pickle> <int>0</int> </pickle>
-  </record>
-  <record id="3" aka="AAAAAAAAAAM=">
-    <pickle>
-      <global name="OOBTree" module="BTrees.OOBTree"/>
-    </pickle>
-    <pickle>
-      <none/>
-    </pickle>
-  </record>
-  <record id="4" aka="AAAAAAAAAAQ=">
-    <pickle>
-      <global name="OOBTree" module="BTrees.OOBTree"/>
-    </pickle>
-    <pickle>
-      <none/>
-    </pickle>
-  </record>
-</ZopeData>
diff --git a/bt5/erp5_open_trade/PathTemplateItem/portal_deliveries/sale_order_builder/base_variant_movement_group_in_line.xml b/bt5/erp5_open_trade/PathTemplateItem/portal_deliveries/sale_order_builder/base_variant_movement_group_in_line.xml
deleted file mode 100644
index 5d8672824aa593a2d14edf6d1c5cf7d03089c533..0000000000000000000000000000000000000000
--- a/bt5/erp5_open_trade/PathTemplateItem/portal_deliveries/sale_order_builder/base_variant_movement_group_in_line.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0"?>
-<ZopeData>
-  <record id="1" aka="AAAAAAAAAAE=">
-    <pickle>
-      <global name="Base Variant Movement Group" module="erp5.portal_type"/>
-    </pickle>
-    <pickle>
-      <dictionary>
-        <item>
-            <key> <string>categories</string> </key>
-            <value>
-              <tuple>
-                <string>collect_order_group/line</string>
-              </tuple>
-            </value>
-        </item>
-        <item>
-            <key> <string>description</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
-        <item>
-            <key> <string>id</string> </key>
-            <value> <string>base_variant_movement_group_in_line</string> </value>
-        </item>
-        <item>
-            <key> <string>int_index</string> </key>
-            <value> <int>2</int> </value>
-        </item>
-        <item>
-            <key> <string>portal_type</string> </key>
-            <value> <string>Base Variant Movement Group</string> </value>
-        </item>
-        <item>
-            <key> <string>title</string> </key>
-            <value> <string>base_variant_movement_group_in_line</string> </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
-</ZopeData>
diff --git a/bt5/erp5_open_trade/PathTemplateItem/portal_deliveries/sale_order_builder/category_movement_group_on_delivery.xml b/bt5/erp5_open_trade/PathTemplateItem/portal_deliveries/sale_order_builder/category_movement_group_on_delivery.xml
deleted file mode 100644
index aa365c70f91e8d614a5af9b7fcd1a3440e6baecb..0000000000000000000000000000000000000000
--- a/bt5/erp5_open_trade/PathTemplateItem/portal_deliveries/sale_order_builder/category_movement_group_on_delivery.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0"?>
-<ZopeData>
-  <record id="1" aka="AAAAAAAAAAE=">
-    <pickle>
-      <global name="Category Movement Group" module="erp5.portal_type"/>
-    </pickle>
-    <pickle>
-      <dictionary>
-        <item>
-            <key> <string>categories</string> </key>
-            <value>
-              <tuple>
-                <string>collect_order_group/delivery</string>
-              </tuple>
-            </value>
-        </item>
-        <item>
-            <key> <string>description</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
-        <item>
-            <key> <string>id</string> </key>
-            <value> <string>category_movement_group_on_delivery</string> </value>
-        </item>
-        <item>
-            <key> <string>int_index</string> </key>
-            <value> <int>3</int> </value>
-        </item>
-        <item>
-            <key> <string>portal_type</string> </key>
-            <value> <string>Category Movement Group</string> </value>
-        </item>
-        <item>
-            <key> <string>tested_property</string> </key>
-            <value>
-              <tuple>
-                <string>delivery_mode</string>
-                <string>incoterm</string>
-                <string>source</string>
-                <string>destination</string>
-                <string>source_section</string>
-                <string>destination_section</string>
-                <string>source_decision</string>
-                <string>destination_decision</string>
-                <string>source_administration</string>
-                <string>destination_administration</string>
-                <string>source_project</string>
-                <string>destination_project</string>
-                <string>source_payment</string>
-                <string>destination_payment</string>
-                <string>price_currency</string>
-              </tuple>
-            </value>
-        </item>
-        <item>
-            <key> <string>title</string> </key>
-            <value> <string>category_movement_group_on_delivery</string> </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
-</ZopeData>
diff --git a/bt5/erp5_open_trade/PathTemplateItem/portal_deliveries/sale_order_builder/category_movement_group_on_line.xml b/bt5/erp5_open_trade/PathTemplateItem/portal_deliveries/sale_order_builder/category_movement_group_on_line.xml
deleted file mode 100644
index 8c8945e40e4ff7f7b629630196704ed4bc9a1f4c..0000000000000000000000000000000000000000
--- a/bt5/erp5_open_trade/PathTemplateItem/portal_deliveries/sale_order_builder/category_movement_group_on_line.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0"?>
-<ZopeData>
-  <record id="1" aka="AAAAAAAAAAE=">
-    <pickle>
-      <global name="Category Movement Group" module="erp5.portal_type"/>
-    </pickle>
-    <pickle>
-      <dictionary>
-        <item>
-            <key> <string>categories</string> </key>
-            <value>
-              <tuple>
-                <string>collect_order_group/line</string>
-              </tuple>
-            </value>
-        </item>
-        <item>
-            <key> <string>description</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
-        <item>
-            <key> <string>id</string> </key>
-            <value> <string>category_movement_group_on_line</string> </value>
-        </item>
-        <item>
-            <key> <string>int_index</string> </key>
-            <value> <int>1</int> </value>
-        </item>
-        <item>
-            <key> <string>portal_type</string> </key>
-            <value> <string>Category Movement Group</string> </value>
-        </item>
-        <item>
-            <key> <string>tested_property</string> </key>
-            <value>
-              <tuple>
-                <string>resource</string>
-                <string>aggregate</string>
-                <string>quantity_unit</string>
-                <string>base_contribution</string>
-                <string>source_trade</string>
-              </tuple>
-            </value>
-        </item>
-        <item>
-            <key> <string>title</string> </key>
-            <value> <string>category_movement_group_on_line</string> </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
-</ZopeData>
diff --git a/bt5/erp5_open_trade/PathTemplateItem/portal_deliveries/sale_order_builder/causality_assignment_movement_group_on_cell.xml b/bt5/erp5_open_trade/PathTemplateItem/portal_deliveries/sale_order_builder/causality_assignment_movement_group_on_cell.xml
deleted file mode 100644
index 2f2c71f553f58887ad00ac582939a1812de1dc18..0000000000000000000000000000000000000000
--- a/bt5/erp5_open_trade/PathTemplateItem/portal_deliveries/sale_order_builder/causality_assignment_movement_group_on_cell.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0"?>
-<ZopeData>
-  <record id="1" aka="AAAAAAAAAAE=">
-    <pickle>
-      <global name="Causality Assignment Movement Group" module="erp5.portal_type"/>
-    </pickle>
-    <pickle>
-      <dictionary>
-        <item>
-            <key> <string>categories</string> </key>
-            <value>
-              <tuple>
-                <string>collect_order_group/cell</string>
-              </tuple>
-            </value>
-        </item>
-        <item>
-            <key> <string>description</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
-        <item>
-            <key> <string>id</string> </key>
-            <value> <string>causality_assignment_movement_group_on_cell</string> </value>
-        </item>
-        <item>
-            <key> <string>int_index</string> </key>
-            <value> <int>2</int> </value>
-        </item>
-        <item>
-            <key> <string>portal_type</string> </key>
-            <value> <string>Causality Assignment Movement Group</string> </value>
-        </item>
-        <item>
-            <key> <string>title</string> </key>
-            <value> <string>causality_assignment_movement_group_on_cell</string> </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
-</ZopeData>
diff --git a/bt5/erp5_open_trade/PathTemplateItem/portal_deliveries/sale_order_builder/causality_assignment_movement_group_on_line.xml b/bt5/erp5_open_trade/PathTemplateItem/portal_deliveries/sale_order_builder/causality_assignment_movement_group_on_line.xml
deleted file mode 100644
index 41ee05ae609e692410cba7e0cbbda008908e11e4..0000000000000000000000000000000000000000
--- a/bt5/erp5_open_trade/PathTemplateItem/portal_deliveries/sale_order_builder/causality_assignment_movement_group_on_line.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0"?>
-<ZopeData>
-  <record id="1" aka="AAAAAAAAAAE=">
-    <pickle>
-      <global name="Causality Assignment Movement Group" module="erp5.portal_type"/>
-    </pickle>
-    <pickle>
-      <dictionary>
-        <item>
-            <key> <string>categories</string> </key>
-            <value>
-              <tuple>
-                <string>collect_order_group/line</string>
-              </tuple>
-            </value>
-        </item>
-        <item>
-            <key> <string>description</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
-        <item>
-            <key> <string>id</string> </key>
-            <value> <string>causality_assignment_movement_group_on_line</string> </value>
-        </item>
-        <item>
-            <key> <string>int_index</string> </key>
-            <value> <int>3</int> </value>
-        </item>
-        <item>
-            <key> <string>portal_type</string> </key>
-            <value> <string>Causality Assignment Movement Group</string> </value>
-        </item>
-        <item>
-            <key> <string>title</string> </key>
-            <value> <string>causality_assignment_movement_group_on_line</string> </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
-</ZopeData>
diff --git a/bt5/erp5_open_trade/PathTemplateItem/portal_deliveries/sale_order_builder/order_movement_group_on_delivery.xml b/bt5/erp5_open_trade/PathTemplateItem/portal_deliveries/sale_order_builder/order_movement_group_on_delivery.xml
deleted file mode 100644
index 4b4699de2a43cd2dfc3d046bd425713439bc086e..0000000000000000000000000000000000000000
--- a/bt5/erp5_open_trade/PathTemplateItem/portal_deliveries/sale_order_builder/order_movement_group_on_delivery.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0"?>
-<ZopeData>
-  <record id="1" aka="AAAAAAAAAAE=">
-    <pickle>
-      <global name="Order Movement Group" module="erp5.portal_type"/>
-    </pickle>
-    <pickle>
-      <dictionary>
-        <item>
-            <key> <string>categories</string> </key>
-            <value>
-              <tuple>
-                <string>collect_order_group/delivery</string>
-              </tuple>
-            </value>
-        </item>
-        <item>
-            <key> <string>description</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
-        <item>
-            <key> <string>id</string> </key>
-            <value> <string>order_movement_group_on_delivery</string> </value>
-        </item>
-        <item>
-            <key> <string>int_index</string> </key>
-            <value> <int>1</int> </value>
-        </item>
-        <item>
-            <key> <string>portal_type</string> </key>
-            <value> <string>Order Movement Group</string> </value>
-        </item>
-        <item>
-            <key> <string>title</string> </key>
-            <value> <string>order_movement_group_on_delivery</string> </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
-</ZopeData>
diff --git a/bt5/erp5_open_trade/PathTemplateItem/portal_deliveries/sale_order_builder/property_movement_group_on_delivery.xml b/bt5/erp5_open_trade/PathTemplateItem/portal_deliveries/sale_order_builder/property_movement_group_on_delivery.xml
deleted file mode 100644
index b27d8532c02edf67d540cf82c3c7b93307b0c82c..0000000000000000000000000000000000000000
--- a/bt5/erp5_open_trade/PathTemplateItem/portal_deliveries/sale_order_builder/property_movement_group_on_delivery.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0"?>
-<ZopeData>
-  <record id="1" aka="AAAAAAAAAAE=">
-    <pickle>
-      <global name="Property Movement Group" module="erp5.portal_type"/>
-    </pickle>
-    <pickle>
-      <dictionary>
-        <item>
-            <key> <string>categories</string> </key>
-            <value>
-              <tuple>
-                <string>collect_order_group/delivery</string>
-              </tuple>
-            </value>
-        </item>
-        <item>
-            <key> <string>description</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
-        <item>
-            <key> <string>id</string> </key>
-            <value> <string>property_movement_group_on_delivery</string> </value>
-        </item>
-        <item>
-            <key> <string>int_index</string> </key>
-            <value> <int>2</int> </value>
-        </item>
-        <item>
-            <key> <string>portal_type</string> </key>
-            <value> <string>Property Movement Group</string> </value>
-        </item>
-        <item>
-            <key> <string>tested_property</string> </key>
-            <value>
-              <tuple>
-                <string>start_date</string>
-                <string>stop_date</string>
-              </tuple>
-            </value>
-        </item>
-        <item>
-            <key> <string>title</string> </key>
-            <value> <string>property_movement_group_on_delivery</string> </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
-</ZopeData>
diff --git a/bt5/erp5_open_trade/PathTemplateItem/portal_deliveries/sale_order_builder/property_movement_group_on_line.xml b/bt5/erp5_open_trade/PathTemplateItem/portal_deliveries/sale_order_builder/property_movement_group_on_line.xml
deleted file mode 100644
index 1839c8e1125a4b4d070c8be735dac30931e26ace..0000000000000000000000000000000000000000
--- a/bt5/erp5_open_trade/PathTemplateItem/portal_deliveries/sale_order_builder/property_movement_group_on_line.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0"?>
-<ZopeData>
-  <record id="1" aka="AAAAAAAAAAE=">
-    <pickle>
-      <global name="Property Movement Group" module="erp5.portal_type"/>
-    </pickle>
-    <pickle>
-      <dictionary>
-        <item>
-            <key> <string>categories</string> </key>
-            <value>
-              <tuple>
-                <string>collect_order_group/line</string>
-              </tuple>
-            </value>
-        </item>
-        <item>
-            <key> <string>description</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
-        <item>
-            <key> <string>id</string> </key>
-            <value> <string>property_movement_group_on_line</string> </value>
-        </item>
-        <item>
-            <key> <string>int_index</string> </key>
-            <value> <int>4</int> </value>
-        </item>
-        <item>
-            <key> <string>portal_type</string> </key>
-            <value> <string>Property Movement Group</string> </value>
-        </item>
-        <item>
-            <key> <string>tested_property</string> </key>
-            <value>
-              <tuple>
-                <string>description</string>
-                <string>price</string>
-                <string>title</string>
-                <string>reference</string>
-                <string>int_index</string>
-                <string>quantity</string>
-              </tuple>
-            </value>
-        </item>
-        <item>
-            <key> <string>title</string> </key>
-            <value> <string>property_movement_group_on_line</string> </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
-</ZopeData>
diff --git a/bt5/erp5_open_trade/PathTemplateItem/portal_deliveries/sale_order_builder/variant_movement_group_on_cell.xml b/bt5/erp5_open_trade/PathTemplateItem/portal_deliveries/sale_order_builder/variant_movement_group_on_cell.xml
deleted file mode 100644
index 0fb0ec219671ccbdb053e2f7be34cb526308b1ed..0000000000000000000000000000000000000000
--- a/bt5/erp5_open_trade/PathTemplateItem/portal_deliveries/sale_order_builder/variant_movement_group_on_cell.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0"?>
-<ZopeData>
-  <record id="1" aka="AAAAAAAAAAE=">
-    <pickle>
-      <global name="Variant Movement Group" module="erp5.portal_type"/>
-    </pickle>
-    <pickle>
-      <dictionary>
-        <item>
-            <key> <string>categories</string> </key>
-            <value>
-              <tuple>
-                <string>collect_order_group/cell</string>
-              </tuple>
-            </value>
-        </item>
-        <item>
-            <key> <string>description</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
-        <item>
-            <key> <string>id</string> </key>
-            <value> <string>variant_movement_group_on_cell</string> </value>
-        </item>
-        <item>
-            <key> <string>int_index</string> </key>
-            <value> <int>1</int> </value>
-        </item>
-        <item>
-            <key> <string>portal_type</string> </key>
-            <value> <string>Variant Movement Group</string> </value>
-        </item>
-        <item>
-            <key> <string>title</string> </key>
-            <value> <string>variant_movement_group_on_cell</string> </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
-</ZopeData>
diff --git a/bt5/erp5_open_trade/bt/revision b/bt5/erp5_open_trade/bt/revision
index 9cd72aa941214d4cb8522dda34eb12cf878e3e8b..3ca9062a11783e80eeffeb9613eb9e38b528bfab 100644
--- a/bt5/erp5_open_trade/bt/revision
+++ b/bt5/erp5_open_trade/bt/revision
@@ -1 +1 @@
-72
\ No newline at end of file
+84
\ No newline at end of file
diff --git a/bt5/erp5_open_trade/bt/template_path_list b/bt5/erp5_open_trade/bt/template_path_list
deleted file mode 100644
index 543321c0518ff1d9fe84fa144549b91361e57e9d..0000000000000000000000000000000000000000
--- a/bt5/erp5_open_trade/bt/template_path_list
+++ /dev/null
@@ -1,2 +0,0 @@
-portal_deliveries/sale_order_builder
-portal_deliveries/sale_order_builder/**
\ No newline at end of file