diff --git a/bt5/erp5_simplified_invoicing/PathTemplateItem/portal_deliveries/purchase_invoice_transaction_trade_model_builder.xml b/bt5/erp5_simplified_invoicing/PathTemplateItem/portal_deliveries/purchase_invoice_transaction_trade_model_builder.xml
new file mode 100644
index 0000000000000000000000000000000000000000..aef622f6971efc6e296267a077877160d601f96e
--- /dev/null
+++ b/bt5/erp5_simplified_invoicing/PathTemplateItem/portal_deliveries/purchase_invoice_transaction_trade_model_builder.xml
@@ -0,0 +1,182 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <tuple>
+        <global name="DeliveryBuilder" module="Products.ERP5Type.Document.DeliveryBuilder"/>
+        <tuple/>
+      </tuple>
+    </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>collect_order</string> </key>
+            <value>
+              <tuple>
+                <string>OrderMovementGroup</string>
+                <string>PathMovementGroup</string>
+                <string>DateMovementGroup</string>
+                <string>ResourceMovementGroup</string>
+                <string>VariantMovementGroup</string>
+              </tuple>
+            </value>
+        </item>
+        <item>
+            <key> <string>collect_order_list</string> </key>
+            <value>
+              <list>
+                <string>test</string>
+                <string>test2</string>
+              </list>
+            </value>
+        </item>
+        <item>
+            <key> <string>collect_order_list_id</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>comment</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>delivery_after_generation_method_id</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>delivery_after_generation_script_id</string> </key>
+            <value> <string>Invoice_reindexRelatedSimulation</string> </value>
+        </item>
+        <item>
+            <key> <string>delivery_cell_collect_order</string> </key>
+            <value>
+              <tuple>
+                <string>VariantMovementGroup</string>
+              </tuple>
+            </value>
+        </item>
+        <item>
+            <key> <string>delivery_cell_portal_type</string> </key>
+            <value> <string>Invoice Cell</string> </value>
+        </item>
+        <item>
+            <key> <string>delivery_cell_separate_order</string> </key>
+            <value>
+              <tuple>
+                <string>calculateSeparatePrice</string>
+              </tuple>
+            </value>
+        </item>
+        <item>
+            <key> <string>delivery_collect_order</string> </key>
+            <value>
+              <tuple>
+                <string>CausalityMovementGroup</string>
+              </tuple>
+            </value>
+        </item>
+        <item>
+            <key> <string>delivery_line_collect_order</string> </key>
+            <value>
+              <tuple>
+                <string>ResourceMovementGroup</string>
+                <string>BaseVariantMovementGroup</string>
+                <string>BaseApplicationMovementGroup</string>
+              </tuple>
+            </value>
+        </item>
+        <item>
+            <key> <string>delivery_line_portal_type</string> </key>
+            <value> <string>Invoice Line</string> </value>
+        </item>
+        <item>
+            <key> <string>delivery_module</string> </key>
+            <value> <string>accounting_module</string> </value>
+        </item>
+        <item>
+            <key> <string>delivery_portal_type</string> </key>
+            <value> <string>Purchase Invoice Transaction</string> </value>
+        </item>
+        <item>
+            <key> <string>delivery_select_method_id</string> </key>
+            <value> <string>InvoiceTransaction_selectDelivery</string> </value>
+        </item>
+        <item>
+            <key> <string>description</string> </key>
+            <value> <string>Add Invoice Lines from Trade Model Lines</string> </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>purchase_invoice_transaction_trade_model_builder</string> </value>
+        </item>
+        <item>
+            <key> <string>last_id</string> </key>
+            <value> <string>2</string> </value>
+        </item>
+        <item>
+            <key> <string>portal_type</string> </key>
+            <value> <string>Delivery Builder</string> </value>
+        </item>
+        <item>
+            <key> <string>resource_portal_type</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>simulation_select_method_id</string> </key>
+            <value> <string>PurchaseInvoice_selectTradeModelMovementList</string> </value>
+        </item>
+        <item>
+            <key> <string>title</string> </key>
+            <value> <string>Purchase Invoice Transaction Trade Model Line 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_simplified_invoicing/PathTemplateItem/portal_deliveries/purchase_invoice_transaction_trade_model_builder/base_variant_movement_group_in_line.xml b/bt5/erp5_simplified_invoicing/PathTemplateItem/portal_deliveries/purchase_invoice_transaction_trade_model_builder/base_variant_movement_group_in_line.xml
new file mode 100644
index 0000000000000000000000000000000000000000..31f679d133cbcb38215143994bdfd5282fc4a2e5
--- /dev/null
+++ b/bt5/erp5_simplified_invoicing/PathTemplateItem/portal_deliveries/purchase_invoice_transaction_trade_model_builder/base_variant_movement_group_in_line.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <tuple>
+        <global name="BaseVariantMovementGroup" module="Products.ERP5Type.Document.BaseVariantMovementGroup"/>
+        <tuple/>
+      </tuple>
+    </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_simplified_invoicing/PathTemplateItem/portal_deliveries/purchase_invoice_transaction_trade_model_builder/category_movement_group_on_delivery.xml b/bt5/erp5_simplified_invoicing/PathTemplateItem/portal_deliveries/purchase_invoice_transaction_trade_model_builder/category_movement_group_on_delivery.xml
new file mode 100644
index 0000000000000000000000000000000000000000..811b3fda712cc1045e83efca357171fa2242b03d
--- /dev/null
+++ b/bt5/erp5_simplified_invoicing/PathTemplateItem/portal_deliveries/purchase_invoice_transaction_trade_model_builder/category_movement_group_on_delivery.xml
@@ -0,0 +1,66 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <tuple>
+        <global name="CategoryMovementGroup" module="Products.ERP5Type.Document.CategoryMovementGroup"/>
+        <tuple/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>categories</string> </key>
+            <value>
+              <tuple>
+                <string>divergence_scope/category</string>
+                <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>2</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>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_simplified_invoicing/PathTemplateItem/portal_deliveries/purchase_invoice_transaction_trade_model_builder/category_movement_group_on_line.xml b/bt5/erp5_simplified_invoicing/PathTemplateItem/portal_deliveries/purchase_invoice_transaction_trade_model_builder/category_movement_group_on_line.xml
new file mode 100644
index 0000000000000000000000000000000000000000..b117eee73426d2caa01e145d23de45eeedc7afeb
--- /dev/null
+++ b/bt5/erp5_simplified_invoicing/PathTemplateItem/portal_deliveries/purchase_invoice_transaction_trade_model_builder/category_movement_group_on_line.xml
@@ -0,0 +1,62 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <tuple>
+        <global name="CategoryMovementGroup" module="Products.ERP5Type.Document.CategoryMovementGroup"/>
+        <tuple/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>categories</string> </key>
+            <value>
+              <tuple>
+                <string>divergence_scope/category</string>
+                <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>base_application</string>
+                <string>source_function</string>
+                <string>destination_function</string>
+                <string>source_account</string>
+                <string>destination_account</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_simplified_invoicing/PathTemplateItem/portal_deliveries/purchase_invoice_transaction_trade_model_builder/causality_movement_group_on_delivery.xml b/bt5/erp5_simplified_invoicing/PathTemplateItem/portal_deliveries/purchase_invoice_transaction_trade_model_builder/causality_movement_group_on_delivery.xml
new file mode 100644
index 0000000000000000000000000000000000000000..2e46b8dab532e6583ea24fe76cb72d0846e9002f
--- /dev/null
+++ b/bt5/erp5_simplified_invoicing/PathTemplateItem/portal_deliveries/purchase_invoice_transaction_trade_model_builder/causality_movement_group_on_delivery.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <tuple>
+        <global name="CausalityMovementGroup" module="Products.ERP5Type.Document.CausalityMovementGroup"/>
+        <tuple/>
+      </tuple>
+    </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>causality_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>Causality Movement Group</string> </value>
+        </item>
+        <item>
+            <key> <string>title</string> </key>
+            <value> <string>causality_movement_group_on_delivery</string> </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+</ZopeData>
diff --git a/bt5/erp5_simplified_invoicing/PathTemplateItem/portal_deliveries/purchase_invoice_transaction_trade_model_builder/delivery_causality_assignement_movement_group_on_delivery.xml b/bt5/erp5_simplified_invoicing/PathTemplateItem/portal_deliveries/purchase_invoice_transaction_trade_model_builder/delivery_causality_assignement_movement_group_on_delivery.xml
new file mode 100644
index 0000000000000000000000000000000000000000..f81ff420071db188b6ef17937fee871588803f0f
--- /dev/null
+++ b/bt5/erp5_simplified_invoicing/PathTemplateItem/portal_deliveries/purchase_invoice_transaction_trade_model_builder/delivery_causality_assignement_movement_group_on_delivery.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <tuple>
+        <global name="DeliveryCausalityAssignmentMovementGroup" module="Products.ERP5Type.Document.DeliveryCausalityAssignmentMovementGroup"/>
+        <tuple/>
+      </tuple>
+    </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>delivery_causality_assignement_movement_group_on_delivery</string> </value>
+        </item>
+        <item>
+            <key> <string>int_index</string> </key>
+            <value> <int>100</int> </value>
+        </item>
+        <item>
+            <key> <string>portal_type</string> </key>
+            <value> <string>Delivery Causality Assignment Movement Group</string> </value>
+        </item>
+        <item>
+            <key> <string>title</string> </key>
+            <value> <string>Delivery Causality Assignement Movement Group On Delivery</string> </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+</ZopeData>
diff --git a/bt5/erp5_simplified_invoicing/PathTemplateItem/portal_deliveries/purchase_invoice_transaction_trade_model_builder/property_movement_group_on_delivery.xml b/bt5/erp5_simplified_invoicing/PathTemplateItem/portal_deliveries/purchase_invoice_transaction_trade_model_builder/property_movement_group_on_delivery.xml
new file mode 100644
index 0000000000000000000000000000000000000000..0b3b5388980e41ec6ee0974b30243e96b18263e3
--- /dev/null
+++ b/bt5/erp5_simplified_invoicing/PathTemplateItem/portal_deliveries/purchase_invoice_transaction_trade_model_builder/property_movement_group_on_delivery.xml
@@ -0,0 +1,55 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <tuple>
+        <global name="PropertyMovementGroup" module="Products.ERP5Type.Document.PropertyMovementGroup"/>
+        <tuple/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>categories</string> </key>
+            <value>
+              <tuple>
+                <string>divergence_scope/property</string>
+                <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>1</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_simplified_invoicing/PathTemplateItem/portal_deliveries/purchase_invoice_transaction_trade_model_builder/property_movement_group_on_line.xml b/bt5/erp5_simplified_invoicing/PathTemplateItem/portal_deliveries/purchase_invoice_transaction_trade_model_builder/property_movement_group_on_line.xml
new file mode 100644
index 0000000000000000000000000000000000000000..60c8e585b235d5cddb76ea7bf33082cdb8470ca0
--- /dev/null
+++ b/bt5/erp5_simplified_invoicing/PathTemplateItem/portal_deliveries/purchase_invoice_transaction_trade_model_builder/property_movement_group_on_line.xml
@@ -0,0 +1,56 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <tuple>
+        <global name="PropertyMovementGroup" module="Products.ERP5Type.Document.PropertyMovementGroup"/>
+        <tuple/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>categories</string> </key>
+            <value>
+              <tuple>
+                <string>divergence_scope/property</string>
+                <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>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>description</string>
+              </tuple>
+            </value>
+        </item>
+        <item>
+            <key> <string>title</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+</ZopeData>
diff --git a/bt5/erp5_simplified_invoicing/PathTemplateItem/portal_deliveries/purchase_invoice_transaction_trade_model_builder/variant_movement_group_on_cell.xml b/bt5/erp5_simplified_invoicing/PathTemplateItem/portal_deliveries/purchase_invoice_transaction_trade_model_builder/variant_movement_group_on_cell.xml
new file mode 100644
index 0000000000000000000000000000000000000000..5e3d139019f41c42317cf1508340ebe2d226c25c
--- /dev/null
+++ b/bt5/erp5_simplified_invoicing/PathTemplateItem/portal_deliveries/purchase_invoice_transaction_trade_model_builder/variant_movement_group_on_cell.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <tuple>
+        <global name="VariantMovementGroup" module="Products.ERP5Type.Document.VariantMovementGroup"/>
+        <tuple/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>categories</string> </key>
+            <value>
+              <tuple>
+                <string>collect_order_group/cell</string>
+                <string>divergence_scope/category</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_simplified_invoicing/PathTemplateItem/portal_deliveries/sale_invoice_transaction_trade_model_builder.xml b/bt5/erp5_simplified_invoicing/PathTemplateItem/portal_deliveries/sale_invoice_transaction_trade_model_builder.xml
new file mode 100644
index 0000000000000000000000000000000000000000..63dbdb100e20ae0e31b4961d9eea365d20a28dfd
--- /dev/null
+++ b/bt5/erp5_simplified_invoicing/PathTemplateItem/portal_deliveries/sale_invoice_transaction_trade_model_builder.xml
@@ -0,0 +1,182 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <tuple>
+        <global name="DeliveryBuilder" module="Products.ERP5Type.Document.DeliveryBuilder"/>
+        <tuple/>
+      </tuple>
+    </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>collect_order</string> </key>
+            <value>
+              <tuple>
+                <string>OrderMovementGroup</string>
+                <string>PathMovementGroup</string>
+                <string>DateMovementGroup</string>
+                <string>ResourceMovementGroup</string>
+                <string>VariantMovementGroup</string>
+              </tuple>
+            </value>
+        </item>
+        <item>
+            <key> <string>collect_order_list</string> </key>
+            <value>
+              <list>
+                <string>test</string>
+                <string>test2</string>
+              </list>
+            </value>
+        </item>
+        <item>
+            <key> <string>collect_order_list_id</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>comment</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>delivery_after_generation_method_id</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>delivery_after_generation_script_id</string> </key>
+            <value> <string>Invoice_reindexRelatedSimulation</string> </value>
+        </item>
+        <item>
+            <key> <string>delivery_cell_collect_order</string> </key>
+            <value>
+              <tuple>
+                <string>VariantMovementGroup</string>
+              </tuple>
+            </value>
+        </item>
+        <item>
+            <key> <string>delivery_cell_portal_type</string> </key>
+            <value> <string>Invoice Cell</string> </value>
+        </item>
+        <item>
+            <key> <string>delivery_cell_separate_order</string> </key>
+            <value>
+              <tuple>
+                <string>calculateSeparatePrice</string>
+              </tuple>
+            </value>
+        </item>
+        <item>
+            <key> <string>delivery_collect_order</string> </key>
+            <value>
+              <tuple>
+                <string>CausalityMovementGroup</string>
+              </tuple>
+            </value>
+        </item>
+        <item>
+            <key> <string>delivery_line_collect_order</string> </key>
+            <value>
+              <tuple>
+                <string>ResourceMovementGroup</string>
+                <string>BaseVariantMovementGroup</string>
+                <string>BaseApplicationMovementGroup</string>
+              </tuple>
+            </value>
+        </item>
+        <item>
+            <key> <string>delivery_line_portal_type</string> </key>
+            <value> <string>Invoice Line</string> </value>
+        </item>
+        <item>
+            <key> <string>delivery_module</string> </key>
+            <value> <string>accounting_module</string> </value>
+        </item>
+        <item>
+            <key> <string>delivery_portal_type</string> </key>
+            <value> <string>Sale Invoice Transaction</string> </value>
+        </item>
+        <item>
+            <key> <string>delivery_select_method_id</string> </key>
+            <value> <string>InvoiceTransaction_selectDelivery</string> </value>
+        </item>
+        <item>
+            <key> <string>description</string> </key>
+            <value> <string>Add Invoice Lines from Trade Model Lines</string> </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>sale_invoice_transaction_trade_model_builder</string> </value>
+        </item>
+        <item>
+            <key> <string>last_id</string> </key>
+            <value> <string>2</string> </value>
+        </item>
+        <item>
+            <key> <string>portal_type</string> </key>
+            <value> <string>Delivery Builder</string> </value>
+        </item>
+        <item>
+            <key> <string>resource_portal_type</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>simulation_select_method_id</string> </key>
+            <value> <string>SaleInvoice_selectTradeModelMovementList</string> </value>
+        </item>
+        <item>
+            <key> <string>title</string> </key>
+            <value> <string>Sale Invoice Transaction Trade Model Line 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_simplified_invoicing/PathTemplateItem/portal_deliveries/sale_invoice_transaction_trade_model_builder/base_variant_movement_group_in_line.xml b/bt5/erp5_simplified_invoicing/PathTemplateItem/portal_deliveries/sale_invoice_transaction_trade_model_builder/base_variant_movement_group_in_line.xml
new file mode 100644
index 0000000000000000000000000000000000000000..31f679d133cbcb38215143994bdfd5282fc4a2e5
--- /dev/null
+++ b/bt5/erp5_simplified_invoicing/PathTemplateItem/portal_deliveries/sale_invoice_transaction_trade_model_builder/base_variant_movement_group_in_line.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <tuple>
+        <global name="BaseVariantMovementGroup" module="Products.ERP5Type.Document.BaseVariantMovementGroup"/>
+        <tuple/>
+      </tuple>
+    </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_simplified_invoicing/PathTemplateItem/portal_deliveries/sale_invoice_transaction_trade_model_builder/category_movement_group_on_delivery.xml b/bt5/erp5_simplified_invoicing/PathTemplateItem/portal_deliveries/sale_invoice_transaction_trade_model_builder/category_movement_group_on_delivery.xml
new file mode 100644
index 0000000000000000000000000000000000000000..811b3fda712cc1045e83efca357171fa2242b03d
--- /dev/null
+++ b/bt5/erp5_simplified_invoicing/PathTemplateItem/portal_deliveries/sale_invoice_transaction_trade_model_builder/category_movement_group_on_delivery.xml
@@ -0,0 +1,66 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <tuple>
+        <global name="CategoryMovementGroup" module="Products.ERP5Type.Document.CategoryMovementGroup"/>
+        <tuple/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>categories</string> </key>
+            <value>
+              <tuple>
+                <string>divergence_scope/category</string>
+                <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>2</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>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_simplified_invoicing/PathTemplateItem/portal_deliveries/sale_invoice_transaction_trade_model_builder/category_movement_group_on_line.xml b/bt5/erp5_simplified_invoicing/PathTemplateItem/portal_deliveries/sale_invoice_transaction_trade_model_builder/category_movement_group_on_line.xml
new file mode 100644
index 0000000000000000000000000000000000000000..b117eee73426d2caa01e145d23de45eeedc7afeb
--- /dev/null
+++ b/bt5/erp5_simplified_invoicing/PathTemplateItem/portal_deliveries/sale_invoice_transaction_trade_model_builder/category_movement_group_on_line.xml
@@ -0,0 +1,62 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <tuple>
+        <global name="CategoryMovementGroup" module="Products.ERP5Type.Document.CategoryMovementGroup"/>
+        <tuple/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>categories</string> </key>
+            <value>
+              <tuple>
+                <string>divergence_scope/category</string>
+                <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>base_application</string>
+                <string>source_function</string>
+                <string>destination_function</string>
+                <string>source_account</string>
+                <string>destination_account</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_simplified_invoicing/PathTemplateItem/portal_deliveries/sale_invoice_transaction_trade_model_builder/causality_movement_group_on_delivery.xml b/bt5/erp5_simplified_invoicing/PathTemplateItem/portal_deliveries/sale_invoice_transaction_trade_model_builder/causality_movement_group_on_delivery.xml
new file mode 100644
index 0000000000000000000000000000000000000000..2e46b8dab532e6583ea24fe76cb72d0846e9002f
--- /dev/null
+++ b/bt5/erp5_simplified_invoicing/PathTemplateItem/portal_deliveries/sale_invoice_transaction_trade_model_builder/causality_movement_group_on_delivery.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <tuple>
+        <global name="CausalityMovementGroup" module="Products.ERP5Type.Document.CausalityMovementGroup"/>
+        <tuple/>
+      </tuple>
+    </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>causality_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>Causality Movement Group</string> </value>
+        </item>
+        <item>
+            <key> <string>title</string> </key>
+            <value> <string>causality_movement_group_on_delivery</string> </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+</ZopeData>
diff --git a/bt5/erp5_simplified_invoicing/PathTemplateItem/portal_deliveries/sale_invoice_transaction_trade_model_builder/delivery_causality_assignement_movement_group_on_delivery.xml b/bt5/erp5_simplified_invoicing/PathTemplateItem/portal_deliveries/sale_invoice_transaction_trade_model_builder/delivery_causality_assignement_movement_group_on_delivery.xml
new file mode 100644
index 0000000000000000000000000000000000000000..f81ff420071db188b6ef17937fee871588803f0f
--- /dev/null
+++ b/bt5/erp5_simplified_invoicing/PathTemplateItem/portal_deliveries/sale_invoice_transaction_trade_model_builder/delivery_causality_assignement_movement_group_on_delivery.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <tuple>
+        <global name="DeliveryCausalityAssignmentMovementGroup" module="Products.ERP5Type.Document.DeliveryCausalityAssignmentMovementGroup"/>
+        <tuple/>
+      </tuple>
+    </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>delivery_causality_assignement_movement_group_on_delivery</string> </value>
+        </item>
+        <item>
+            <key> <string>int_index</string> </key>
+            <value> <int>100</int> </value>
+        </item>
+        <item>
+            <key> <string>portal_type</string> </key>
+            <value> <string>Delivery Causality Assignment Movement Group</string> </value>
+        </item>
+        <item>
+            <key> <string>title</string> </key>
+            <value> <string>Delivery Causality Assignement Movement Group On Delivery</string> </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+</ZopeData>
diff --git a/bt5/erp5_simplified_invoicing/PathTemplateItem/portal_deliveries/sale_invoice_transaction_trade_model_builder/property_movement_group_on_delivery.xml b/bt5/erp5_simplified_invoicing/PathTemplateItem/portal_deliveries/sale_invoice_transaction_trade_model_builder/property_movement_group_on_delivery.xml
new file mode 100644
index 0000000000000000000000000000000000000000..0b3b5388980e41ec6ee0974b30243e96b18263e3
--- /dev/null
+++ b/bt5/erp5_simplified_invoicing/PathTemplateItem/portal_deliveries/sale_invoice_transaction_trade_model_builder/property_movement_group_on_delivery.xml
@@ -0,0 +1,55 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <tuple>
+        <global name="PropertyMovementGroup" module="Products.ERP5Type.Document.PropertyMovementGroup"/>
+        <tuple/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>categories</string> </key>
+            <value>
+              <tuple>
+                <string>divergence_scope/property</string>
+                <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>1</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_simplified_invoicing/PathTemplateItem/portal_deliveries/sale_invoice_transaction_trade_model_builder/property_movement_group_on_line.xml b/bt5/erp5_simplified_invoicing/PathTemplateItem/portal_deliveries/sale_invoice_transaction_trade_model_builder/property_movement_group_on_line.xml
new file mode 100644
index 0000000000000000000000000000000000000000..60c8e585b235d5cddb76ea7bf33082cdb8470ca0
--- /dev/null
+++ b/bt5/erp5_simplified_invoicing/PathTemplateItem/portal_deliveries/sale_invoice_transaction_trade_model_builder/property_movement_group_on_line.xml
@@ -0,0 +1,56 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <tuple>
+        <global name="PropertyMovementGroup" module="Products.ERP5Type.Document.PropertyMovementGroup"/>
+        <tuple/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>categories</string> </key>
+            <value>
+              <tuple>
+                <string>divergence_scope/property</string>
+                <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>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>description</string>
+              </tuple>
+            </value>
+        </item>
+        <item>
+            <key> <string>title</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+</ZopeData>
diff --git a/bt5/erp5_simplified_invoicing/PathTemplateItem/portal_deliveries/sale_invoice_transaction_trade_model_builder/variant_movement_group_on_cell.xml b/bt5/erp5_simplified_invoicing/PathTemplateItem/portal_deliveries/sale_invoice_transaction_trade_model_builder/variant_movement_group_on_cell.xml
new file mode 100644
index 0000000000000000000000000000000000000000..5e3d139019f41c42317cf1508340ebe2d226c25c
--- /dev/null
+++ b/bt5/erp5_simplified_invoicing/PathTemplateItem/portal_deliveries/sale_invoice_transaction_trade_model_builder/variant_movement_group_on_cell.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <tuple>
+        <global name="VariantMovementGroup" module="Products.ERP5Type.Document.VariantMovementGroup"/>
+        <tuple/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>categories</string> </key>
+            <value>
+              <tuple>
+                <string>collect_order_group/cell</string>
+                <string>divergence_scope/category</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_simplified_invoicing/bt/revision b/bt5/erp5_simplified_invoicing/bt/revision
index 1758dddccea2b3b02d21228a0d06a45a35c0d861..dc7b54ad014355b948b93c4c6c5891da053d5fdd 100644
--- a/bt5/erp5_simplified_invoicing/bt/revision
+++ b/bt5/erp5_simplified_invoicing/bt/revision
@@ -1 +1 @@
-32
\ No newline at end of file
+33
\ No newline at end of file
diff --git a/bt5/erp5_simplified_invoicing/bt/template_path_list b/bt5/erp5_simplified_invoicing/bt/template_path_list
index fbd419f692cf909ca71620e836871bf916611138..f6bd394e8c2b072a90b1a4b77d1c2c9854acf24e 100644
--- a/bt5/erp5_simplified_invoicing/bt/template_path_list
+++ b/bt5/erp5_simplified_invoicing/bt/template_path_list
@@ -4,9 +4,13 @@ portal_deliveries/purchase_invoice_tax_builder
 portal_deliveries/purchase_invoice_tax_builder/**
 portal_deliveries/purchase_invoice_transaction_builder
 portal_deliveries/purchase_invoice_transaction_builder/**
+portal_deliveries/purchase_invoice_transaction_trade_model_builder
+portal_deliveries/purchase_invoice_transaction_trade_model_builder/**
 portal_deliveries/sale_invoice_builder
 portal_deliveries/sale_invoice_builder/**
 portal_deliveries/sale_invoice_tax_builder
 portal_deliveries/sale_invoice_tax_builder/**
 portal_deliveries/sale_invoice_transaction_builder
-portal_deliveries/sale_invoice_transaction_builder/**
\ No newline at end of file
+portal_deliveries/sale_invoice_transaction_builder/**
+portal_deliveries/sale_invoice_transaction_trade_model_builder
+portal_deliveries/sale_invoice_transaction_trade_model_builder/**
\ No newline at end of file