diff --git a/bt5/erp5_advanced_invoicing/ActionTemplateItem/portal_types/Purchase%20Invoice/view_discount.xml b/bt5/erp5_advanced_invoicing/ActionTemplateItem/portal_types/Purchase%20Invoice/view_discount.xml
deleted file mode 100644
index 5a96ea932638afc56cd09295b89ada32e6d81962..0000000000000000000000000000000000000000
--- a/bt5/erp5_advanced_invoicing/ActionTemplateItem/portal_types/Purchase%20Invoice/view_discount.xml
+++ /dev/null
@@ -1,77 +0,0 @@
-<?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>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> <string></string> </value>
-        </item>
-        <item>
-            <key> <string>icon</string> </key>
-            <value> <string></string> </value>
-        </item>
-        <item>
-            <key> <string>id</string> </key>
-            <value> <string>view_discount</string> </value>
-        </item>
-        <item>
-            <key> <string>permissions</string> </key>
-            <value>
-              <tuple>
-                <string>View</string>
-              </tuple>
-            </value>
-        </item>
-        <item>
-            <key> <string>priority</string> </key>
-            <value> <float>5.0</float> </value>
-        </item>
-        <item>
-            <key> <string>title</string> </key>
-            <value> <string>Discount</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}/Delivery_viewDiscount</string> </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
-</ZopeData>
diff --git a/bt5/erp5_advanced_invoicing/ActionTemplateItem/portal_types/Purchase%20Invoice/view_tax.xml b/bt5/erp5_advanced_invoicing/ActionTemplateItem/portal_types/Purchase%20Invoice/view_tax.xml
deleted file mode 100644
index b3e5af4f98da6bb1033771ec5284dcf6315b7c7c..0000000000000000000000000000000000000000
--- a/bt5/erp5_advanced_invoicing/ActionTemplateItem/portal_types/Purchase%20Invoice/view_tax.xml
+++ /dev/null
@@ -1,77 +0,0 @@
-<?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>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> <string></string> </value>
-        </item>
-        <item>
-            <key> <string>icon</string> </key>
-            <value> <string></string> </value>
-        </item>
-        <item>
-            <key> <string>id</string> </key>
-            <value> <string>view_tax</string> </value>
-        </item>
-        <item>
-            <key> <string>permissions</string> </key>
-            <value>
-              <tuple>
-                <string>View</string>
-              </tuple>
-            </value>
-        </item>
-        <item>
-            <key> <string>priority</string> </key>
-            <value> <float>4.0</float> </value>
-        </item>
-        <item>
-            <key> <string>title</string> </key>
-            <value> <string>Tax</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}/Delivery_viewTax</string> </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
-</ZopeData>
diff --git a/bt5/erp5_advanced_invoicing/ActionTemplateItem/portal_types/Sale%20Invoice/view_discount.xml b/bt5/erp5_advanced_invoicing/ActionTemplateItem/portal_types/Sale%20Invoice/view_discount.xml
deleted file mode 100644
index 5a96ea932638afc56cd09295b89ada32e6d81962..0000000000000000000000000000000000000000
--- a/bt5/erp5_advanced_invoicing/ActionTemplateItem/portal_types/Sale%20Invoice/view_discount.xml
+++ /dev/null
@@ -1,77 +0,0 @@
-<?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>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> <string></string> </value>
-        </item>
-        <item>
-            <key> <string>icon</string> </key>
-            <value> <string></string> </value>
-        </item>
-        <item>
-            <key> <string>id</string> </key>
-            <value> <string>view_discount</string> </value>
-        </item>
-        <item>
-            <key> <string>permissions</string> </key>
-            <value>
-              <tuple>
-                <string>View</string>
-              </tuple>
-            </value>
-        </item>
-        <item>
-            <key> <string>priority</string> </key>
-            <value> <float>5.0</float> </value>
-        </item>
-        <item>
-            <key> <string>title</string> </key>
-            <value> <string>Discount</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}/Delivery_viewDiscount</string> </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
-</ZopeData>
diff --git a/bt5/erp5_advanced_invoicing/ActionTemplateItem/portal_types/Sale%20Invoice/view_tax.xml b/bt5/erp5_advanced_invoicing/ActionTemplateItem/portal_types/Sale%20Invoice/view_tax.xml
deleted file mode 100644
index b3e5af4f98da6bb1033771ec5284dcf6315b7c7c..0000000000000000000000000000000000000000
--- a/bt5/erp5_advanced_invoicing/ActionTemplateItem/portal_types/Sale%20Invoice/view_tax.xml
+++ /dev/null
@@ -1,77 +0,0 @@
-<?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>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> <string></string> </value>
-        </item>
-        <item>
-            <key> <string>icon</string> </key>
-            <value> <string></string> </value>
-        </item>
-        <item>
-            <key> <string>id</string> </key>
-            <value> <string>view_tax</string> </value>
-        </item>
-        <item>
-            <key> <string>permissions</string> </key>
-            <value>
-              <tuple>
-                <string>View</string>
-              </tuple>
-            </value>
-        </item>
-        <item>
-            <key> <string>priority</string> </key>
-            <value> <float>4.0</float> </value>
-        </item>
-        <item>
-            <key> <string>title</string> </key>
-            <value> <string>Tax</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}/Delivery_viewTax</string> </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
-</ZopeData>
diff --git a/bt5/erp5_advanced_invoicing/PathTemplateItem/portal_deliveries/advanced_purchase_invoice_tax_builder.xml b/bt5/erp5_advanced_invoicing/PathTemplateItem/portal_deliveries/advanced_purchase_invoice_tax_builder.xml
deleted file mode 100644
index 4d0114f92c972c1d4197cf5b971d02ca2eabc6d9..0000000000000000000000000000000000000000
--- a/bt5/erp5_advanced_invoicing/PathTemplateItem/portal_deliveries/advanced_purchase_invoice_tax_builder.xml
+++ /dev/null
@@ -1,182 +0,0 @@
-<?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>Tax Line</string> </value>
-        </item>
-        <item>
-            <key> <string>delivery_module</string> </key>
-            <value> <string>purchase_invoice_module</string> </value>
-        </item>
-        <item>
-            <key> <string>delivery_portal_type</string> </key>
-            <value> <string>Purchase Invoice</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 Tax Lines in Purchase Invoices</string> </value>
-        </item>
-        <item>
-            <key> <string>id</string> </key>
-            <value> <string>advanced_purchase_invoice_tax_builder</string> </value>
-        </item>
-        <item>
-            <key> <string>last_id</string> </key>
-            <value> <string>1</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_selectTaxMovementList</string> </value>
-        </item>
-        <item>
-            <key> <string>title</string> </key>
-            <value> <string>Purchase Invoice Tax 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_advanced_invoicing/PathTemplateItem/portal_deliveries/advanced_purchase_invoice_tax_builder/base_variant_movement_group_in_line.xml b/bt5/erp5_advanced_invoicing/PathTemplateItem/portal_deliveries/advanced_purchase_invoice_tax_builder/base_variant_movement_group_in_line.xml
deleted file mode 100644
index 31f679d133cbcb38215143994bdfd5282fc4a2e5..0000000000000000000000000000000000000000
--- a/bt5/erp5_advanced_invoicing/PathTemplateItem/portal_deliveries/advanced_purchase_invoice_tax_builder/base_variant_movement_group_in_line.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<?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_advanced_invoicing/PathTemplateItem/portal_deliveries/advanced_purchase_invoice_tax_builder/category_movement_group_on_line.xml b/bt5/erp5_advanced_invoicing/PathTemplateItem/portal_deliveries/advanced_purchase_invoice_tax_builder/category_movement_group_on_line.xml
deleted file mode 100644
index 875b3bb459edd0a4dee325fce7d23173e05da402..0000000000000000000000000000000000000000
--- a/bt5/erp5_advanced_invoicing/PathTemplateItem/portal_deliveries/advanced_purchase_invoice_tax_builder/category_movement_group_on_line.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<?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>base_application</string>
-                <string>base_contribution</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_advanced_invoicing/PathTemplateItem/portal_deliveries/advanced_purchase_invoice_tax_builder/causality_movement_group_on_delivery.xml b/bt5/erp5_advanced_invoicing/PathTemplateItem/portal_deliveries/advanced_purchase_invoice_tax_builder/causality_movement_group_on_delivery.xml
deleted file mode 100644
index 255c19e9cb5e7d1671ed359bc30a55465822de8e..0000000000000000000000000000000000000000
--- a/bt5/erp5_advanced_invoicing/PathTemplateItem/portal_deliveries/advanced_purchase_invoice_tax_builder/causality_movement_group_on_delivery.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<?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>1</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_advanced_invoicing/PathTemplateItem/portal_deliveries/advanced_purchase_invoice_tax_builder/tax_line_delivery_movement_group_on_delivery.xml b/bt5/erp5_advanced_invoicing/PathTemplateItem/portal_deliveries/advanced_purchase_invoice_tax_builder/tax_line_delivery_movement_group_on_delivery.xml
deleted file mode 100644
index 9bf3ca2213bcadbf1436c4acbe49dd92d440637c..0000000000000000000000000000000000000000
--- a/bt5/erp5_advanced_invoicing/PathTemplateItem/portal_deliveries/advanced_purchase_invoice_tax_builder/tax_line_delivery_movement_group_on_delivery.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0"?>
-<ZopeData>
-  <record id="1" aka="AAAAAAAAAAE=">
-    <pickle>
-      <tuple>
-        <global name="TaxLineDeliveryMovementGroup" module="Products.ERP5Type.Document.TaxLineDeliveryMovementGroup"/>
-        <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>tax_line_delivery_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>Tax Line Delivery Movement Group</string> </value>
-        </item>
-        <item>
-            <key> <string>title</string> </key>
-            <value> <string>Tax Line Delivery Movement Group On Delivery</string> </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
-</ZopeData>
diff --git a/bt5/erp5_advanced_invoicing/PathTemplateItem/portal_deliveries/advanced_purchase_invoice_tax_builder/variant_movement_group_on_cell.xml b/bt5/erp5_advanced_invoicing/PathTemplateItem/portal_deliveries/advanced_purchase_invoice_tax_builder/variant_movement_group_on_cell.xml
deleted file mode 100644
index 5e3d139019f41c42317cf1508340ebe2d226c25c..0000000000000000000000000000000000000000
--- a/bt5/erp5_advanced_invoicing/PathTemplateItem/portal_deliveries/advanced_purchase_invoice_tax_builder/variant_movement_group_on_cell.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<?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_advanced_invoicing/PathTemplateItem/portal_deliveries/advanced_sale_invoice_tax_builder.xml b/bt5/erp5_advanced_invoicing/PathTemplateItem/portal_deliveries/advanced_sale_invoice_tax_builder.xml
deleted file mode 100644
index 9f4cc94fd8901f3dc52b274a5b3487e0e28ec371..0000000000000000000000000000000000000000
--- a/bt5/erp5_advanced_invoicing/PathTemplateItem/portal_deliveries/advanced_sale_invoice_tax_builder.xml
+++ /dev/null
@@ -1,182 +0,0 @@
-<?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>Tax Line</string> </value>
-        </item>
-        <item>
-            <key> <string>delivery_module</string> </key>
-            <value> <string>sale_invoice_module</string> </value>
-        </item>
-        <item>
-            <key> <string>delivery_portal_type</string> </key>
-            <value> <string>Sale Invoice</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 Tax Lines in Sale Invoices</string> </value>
-        </item>
-        <item>
-            <key> <string>id</string> </key>
-            <value> <string>advanced_sale_invoice_tax_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_selectTaxMovementList</string> </value>
-        </item>
-        <item>
-            <key> <string>title</string> </key>
-            <value> <string>Sale Invoice Tax 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_advanced_invoicing/PathTemplateItem/portal_deliveries/advanced_sale_invoice_tax_builder/base_variant_movement_group_in_line.xml b/bt5/erp5_advanced_invoicing/PathTemplateItem/portal_deliveries/advanced_sale_invoice_tax_builder/base_variant_movement_group_in_line.xml
deleted file mode 100644
index 31f679d133cbcb38215143994bdfd5282fc4a2e5..0000000000000000000000000000000000000000
--- a/bt5/erp5_advanced_invoicing/PathTemplateItem/portal_deliveries/advanced_sale_invoice_tax_builder/base_variant_movement_group_in_line.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<?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_advanced_invoicing/PathTemplateItem/portal_deliveries/advanced_sale_invoice_tax_builder/category_movement_group_on_line.xml b/bt5/erp5_advanced_invoicing/PathTemplateItem/portal_deliveries/advanced_sale_invoice_tax_builder/category_movement_group_on_line.xml
deleted file mode 100644
index 875b3bb459edd0a4dee325fce7d23173e05da402..0000000000000000000000000000000000000000
--- a/bt5/erp5_advanced_invoicing/PathTemplateItem/portal_deliveries/advanced_sale_invoice_tax_builder/category_movement_group_on_line.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<?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>base_application</string>
-                <string>base_contribution</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_advanced_invoicing/PathTemplateItem/portal_deliveries/advanced_sale_invoice_tax_builder/causality_movement_group_on_delivery.xml b/bt5/erp5_advanced_invoicing/PathTemplateItem/portal_deliveries/advanced_sale_invoice_tax_builder/causality_movement_group_on_delivery.xml
deleted file mode 100644
index 255c19e9cb5e7d1671ed359bc30a55465822de8e..0000000000000000000000000000000000000000
--- a/bt5/erp5_advanced_invoicing/PathTemplateItem/portal_deliveries/advanced_sale_invoice_tax_builder/causality_movement_group_on_delivery.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<?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>1</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_advanced_invoicing/PathTemplateItem/portal_deliveries/advanced_sale_invoice_tax_builder/tax_line_delivery_movement_group_on_delivery.xml b/bt5/erp5_advanced_invoicing/PathTemplateItem/portal_deliveries/advanced_sale_invoice_tax_builder/tax_line_delivery_movement_group_on_delivery.xml
deleted file mode 100644
index 9bf3ca2213bcadbf1436c4acbe49dd92d440637c..0000000000000000000000000000000000000000
--- a/bt5/erp5_advanced_invoicing/PathTemplateItem/portal_deliveries/advanced_sale_invoice_tax_builder/tax_line_delivery_movement_group_on_delivery.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0"?>
-<ZopeData>
-  <record id="1" aka="AAAAAAAAAAE=">
-    <pickle>
-      <tuple>
-        <global name="TaxLineDeliveryMovementGroup" module="Products.ERP5Type.Document.TaxLineDeliveryMovementGroup"/>
-        <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>tax_line_delivery_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>Tax Line Delivery Movement Group</string> </value>
-        </item>
-        <item>
-            <key> <string>title</string> </key>
-            <value> <string>Tax Line Delivery Movement Group On Delivery</string> </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
-</ZopeData>
diff --git a/bt5/erp5_advanced_invoicing/PathTemplateItem/portal_deliveries/advanced_sale_invoice_tax_builder/variant_movement_group_on_cell.xml b/bt5/erp5_advanced_invoicing/PathTemplateItem/portal_deliveries/advanced_sale_invoice_tax_builder/variant_movement_group_on_cell.xml
deleted file mode 100644
index 5e3d139019f41c42317cf1508340ebe2d226c25c..0000000000000000000000000000000000000000
--- a/bt5/erp5_advanced_invoicing/PathTemplateItem/portal_deliveries/advanced_sale_invoice_tax_builder/variant_movement_group_on_cell.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<?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_advanced_invoicing/PortalTypeAllowedContentTypeTemplateItem/allowed_content_types.xml b/bt5/erp5_advanced_invoicing/PortalTypeAllowedContentTypeTemplateItem/allowed_content_types.xml
index 9c6a360c8503283801a4326e434fb7c24efcd4b1..00e9cbe4c7e01539c79180f0298d00e2159977e7 100644
--- a/bt5/erp5_advanced_invoicing/PortalTypeAllowedContentTypeTemplateItem/allowed_content_types.xml
+++ b/bt5/erp5_advanced_invoicing/PortalTypeAllowedContentTypeTemplateItem/allowed_content_types.xml
@@ -1,22 +1,18 @@
 <allowed_content_type_list>
  <portal_type id="Purchase Invoice">
   <item>Image</item>
-  <item>Tax Line</item>
-  <item>Invoice Line</item>
   <item>Payment Condition</item>
+  <item>Invoice Line</item>
   <item>File</item>
-  <item>Discount Line</item>
  </portal_type>
  <portal_type id="Purchase Invoice Module">
   <item>Purchase Invoice</item>
  </portal_type>
  <portal_type id="Sale Invoice">
-  <item>Tax Line</item>
   <item>Payment Condition</item>
   <item>File</item>
   <item>Invoice Line</item>
   <item>Image</item>
-  <item>Discount Line</item>
  </portal_type>
  <portal_type id="Sale Invoice Module">
   <item>Sale Invoice</item>
diff --git a/bt5/erp5_advanced_invoicing/PortalTypeHiddenContentTypeTemplateItem/hidden_content_type_list.xml b/bt5/erp5_advanced_invoicing/PortalTypeHiddenContentTypeTemplateItem/hidden_content_type_list.xml
deleted file mode 100644
index 071febef333c35aa3741e065b2efe299e7c3c7dd..0000000000000000000000000000000000000000
--- a/bt5/erp5_advanced_invoicing/PortalTypeHiddenContentTypeTemplateItem/hidden_content_type_list.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<hidden_content_type_list>
- <portal_type id="Purchase Invoice">
-  <item>Discount Line</item>
-  <item>Tax Line</item>
- </portal_type>
- <portal_type id="Sale Invoice">
-  <item>Tax Line</item>
-  <item>Discount Line</item>
- </portal_type>
-</hidden_content_type_list>
\ No newline at end of file
diff --git a/bt5/erp5_advanced_invoicing/PortalTypeWorkflowChainTemplateItem/workflow_chain_type.xml b/bt5/erp5_advanced_invoicing/PortalTypeWorkflowChainTemplateItem/workflow_chain_type.xml
index f9c3d475f7b249cc597f4f6fdfab2b9a7cc0aa46..24265de3571199a7bfe6ef6fd6e248b9c40798bb 100644
--- a/bt5/erp5_advanced_invoicing/PortalTypeWorkflowChainTemplateItem/workflow_chain_type.xml
+++ b/bt5/erp5_advanced_invoicing/PortalTypeWorkflowChainTemplateItem/workflow_chain_type.xml
@@ -1,10 +1,10 @@
 <workflow_chain>
  <chain>
   <type>Purchase Invoice</type>
-  <workflow>delivery_simulation_interaction_workflow, edit_workflow, invoice_workflow, delivery_tax_interaction_workflow, delivery_causality_workflow, delivery_causality_interaction_workflow</workflow>
+  <workflow>delivery_simulation_interaction_workflow, edit_workflow, invoice_workflow, delivery_causality_workflow, delivery_causality_interaction_workflow</workflow>
  </chain>
  <chain>
   <type>Sale Invoice</type>
-  <workflow>invoice_workflow, delivery_simulation_interaction_workflow, delivery_tax_interaction_workflow, edit_workflow, delivery_causality_interaction_workflow, delivery_causality_workflow</workflow>
+  <workflow>invoice_workflow, delivery_simulation_interaction_workflow, edit_workflow, delivery_causality_interaction_workflow, delivery_causality_workflow</workflow>
  </chain>
 </workflow_chain>
\ No newline at end of file
diff --git a/bt5/erp5_advanced_invoicing/SkinTemplateItem/portal_skins/erp5_advanced_invoicing/PurchaseInvoice_getBuilderList.xml b/bt5/erp5_advanced_invoicing/SkinTemplateItem/portal_skins/erp5_advanced_invoicing/PurchaseInvoice_getBuilderList.xml
index 977fd4e1ddf0f3466c385393775549dfe743e280..e60db80ac2093562058eeab437d21b39e7c39d28 100644
--- a/bt5/erp5_advanced_invoicing/SkinTemplateItem/portal_skins/erp5_advanced_invoicing/PurchaseInvoice_getBuilderList.xml
+++ b/bt5/erp5_advanced_invoicing/SkinTemplateItem/portal_skins/erp5_advanced_invoicing/PurchaseInvoice_getBuilderList.xml
@@ -54,8 +54,7 @@
         <item>
             <key> <string>_body</string> </key>
             <value> <string>portal_deliveries = context.getPortalObject().portal_deliveries\n
-return [portal_deliveries.advanced_purchase_invoice_builder,\n
-        portal_deliveries.advanced_purchase_invoice_tax_builder]\n
+return [portal_deliveries.advanced_purchase_invoice_builder, ]\n
 </string> </value>
         </item>
         <item>
diff --git a/bt5/erp5_advanced_invoicing/SkinTemplateItem/portal_skins/erp5_advanced_invoicing/SaleInvoice_getBuilderList.xml b/bt5/erp5_advanced_invoicing/SkinTemplateItem/portal_skins/erp5_advanced_invoicing/SaleInvoice_getBuilderList.xml
index 24c1d263a3a3f58e10df6cfbb952ce9e55c272ff..a517dfb9fba82858da0a2e721496206e3cc2a925 100644
--- a/bt5/erp5_advanced_invoicing/SkinTemplateItem/portal_skins/erp5_advanced_invoicing/SaleInvoice_getBuilderList.xml
+++ b/bt5/erp5_advanced_invoicing/SkinTemplateItem/portal_skins/erp5_advanced_invoicing/SaleInvoice_getBuilderList.xml
@@ -54,8 +54,7 @@
         <item>
             <key> <string>_body</string> </key>
             <value> <string>portal_deliveries = context.getPortalObject().portal_deliveries\n
-return [portal_deliveries.advanced_sale_invoice_builder,\n
-        portal_deliveries.advanced_sale_invoice_tax_builder]\n
+return [portal_deliveries.advanced_sale_invoice_builder,]\n
 </string> </value>
         </item>
         <item>
diff --git a/bt5/erp5_advanced_invoicing/bt/revision b/bt5/erp5_advanced_invoicing/bt/revision
index 4b6f9c39e5c757bf387d465c53026b336dd8b96c..d1cbcfa54043559204a5b30b0d1b808dfe9cb552 100644
--- a/bt5/erp5_advanced_invoicing/bt/revision
+++ b/bt5/erp5_advanced_invoicing/bt/revision
@@ -1 +1 @@
-64
\ No newline at end of file
+66
\ No newline at end of file
diff --git a/bt5/erp5_advanced_invoicing/bt/template_action_path_list b/bt5/erp5_advanced_invoicing/bt/template_action_path_list
index 11775fcde349ceb8a321b0ceb7fd92a9713b3fd1..28392f1740a452eb416a23ab649d66c5184cf855 100644
--- a/bt5/erp5_advanced_invoicing/bt/template_action_path_list
+++ b/bt5/erp5_advanced_invoicing/bt/template_action_path_list
@@ -11,9 +11,7 @@ Purchase Invoice | jump_related_purchase_invoice_transaction
 Purchase Invoice | jump_to_related_purchase_packing_list
 Purchase Invoice | payment_condition
 Purchase Invoice | profile_view
-Purchase Invoice | view_discount
 Purchase Invoice | view_invoice
-Purchase Invoice | view_tax
 Purchase Packing List | jump_related_purchase_invoice_advanced
 Sale Invoice Module | view
 Sale Invoice Transaction | jump_related_order_advanced
@@ -25,7 +23,5 @@ Sale Invoice | jump_related_order
 Sale Invoice | jump_related_sale_invoice_transaction
 Sale Invoice | jump_to_related_sale_packing_list
 Sale Invoice | payment_condition
-Sale Invoice | view_discount
 Sale Invoice | view_invoice
-Sale Invoice | view_tax
 Sale Packing List | jump_related_sale_invoice_advanced
\ No newline at end of file
diff --git a/bt5/erp5_advanced_invoicing/bt/template_path_list b/bt5/erp5_advanced_invoicing/bt/template_path_list
index b40eb1fd2bbd5c52ca22583bed8dc1fd1c19286c..82b2e2f81e0db5a3a7bb639758f8b33cd2d0e198 100644
--- a/bt5/erp5_advanced_invoicing/bt/template_path_list
+++ b/bt5/erp5_advanced_invoicing/bt/template_path_list
@@ -1,12 +1,8 @@
 portal_deliveries/advanced_purchase_invoice_builder
 portal_deliveries/advanced_purchase_invoice_builder/**
-portal_deliveries/advanced_purchase_invoice_tax_builder
-portal_deliveries/advanced_purchase_invoice_tax_builder/**
 portal_deliveries/advanced_purchase_invoice_transaction_builder
 portal_deliveries/advanced_purchase_invoice_transaction_builder/**
 portal_deliveries/advanced_sale_invoice_builder
 portal_deliveries/advanced_sale_invoice_builder/**
-portal_deliveries/advanced_sale_invoice_tax_builder
-portal_deliveries/advanced_sale_invoice_tax_builder/**
 portal_deliveries/advanced_sale_invoice_transaction_builder
 portal_deliveries/advanced_sale_invoice_transaction_builder/**
\ No newline at end of file
diff --git a/bt5/erp5_advanced_invoicing/bt/template_portal_type_allowed_content_type_list b/bt5/erp5_advanced_invoicing/bt/template_portal_type_allowed_content_type_list
index 29d1f7e8a9ec63a9604d77314961b19ca06f1ad2..118d65a90d872f407a2f21ce8a069feb0069e8dd 100644
--- a/bt5/erp5_advanced_invoicing/bt/template_portal_type_allowed_content_type_list
+++ b/bt5/erp5_advanced_invoicing/bt/template_portal_type_allowed_content_type_list
@@ -1,14 +1,10 @@
 Purchase Invoice Module | Purchase Invoice
-Purchase Invoice | Discount Line
 Purchase Invoice | File
 Purchase Invoice | Image
 Purchase Invoice | Invoice Line
 Purchase Invoice | Payment Condition
-Purchase Invoice | Tax Line
 Sale Invoice Module | Sale Invoice
-Sale Invoice | Discount Line
 Sale Invoice | File
 Sale Invoice | Image
 Sale Invoice | Invoice Line
-Sale Invoice | Payment Condition
-Sale Invoice | Tax Line
\ No newline at end of file
+Sale Invoice | Payment Condition
\ No newline at end of file
diff --git a/bt5/erp5_advanced_invoicing/bt/template_portal_type_hidden_content_type_list b/bt5/erp5_advanced_invoicing/bt/template_portal_type_hidden_content_type_list
index 886655b2e85867b968d5226227505e1bf80d7e10..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644
--- a/bt5/erp5_advanced_invoicing/bt/template_portal_type_hidden_content_type_list
+++ b/bt5/erp5_advanced_invoicing/bt/template_portal_type_hidden_content_type_list
@@ -1,4 +0,0 @@
-Purchase Invoice | Discount Line
-Purchase Invoice | Tax Line
-Sale Invoice | Discount Line
-Sale Invoice | Tax Line
\ No newline at end of file
diff --git a/bt5/erp5_advanced_invoicing/bt/template_portal_type_workflow_chain_list b/bt5/erp5_advanced_invoicing/bt/template_portal_type_workflow_chain_list
index 30061fb3c325ca203b63c499d15a8b288b6152e6..e7d1b3d22d91a45caaebe06dda00704b5416d5ec 100644
--- a/bt5/erp5_advanced_invoicing/bt/template_portal_type_workflow_chain_list
+++ b/bt5/erp5_advanced_invoicing/bt/template_portal_type_workflow_chain_list
@@ -1,12 +1,10 @@
 Purchase Invoice | delivery_causality_interaction_workflow
 Purchase Invoice | delivery_causality_workflow
 Purchase Invoice | delivery_simulation_interaction_workflow
-Purchase Invoice | delivery_tax_interaction_workflow
 Purchase Invoice | edit_workflow
 Purchase Invoice | invoice_workflow
 Sale Invoice | delivery_causality_interaction_workflow
 Sale Invoice | delivery_causality_workflow
 Sale Invoice | delivery_simulation_interaction_workflow
-Sale Invoice | delivery_tax_interaction_workflow
 Sale Invoice | edit_workflow
 Sale Invoice | invoice_workflow
\ No newline at end of file