Make builder do what is required.

Never aggregate lines (split_on_line).
Find proper invoice (first_causality_on_delivery).
Avoid setting not needed categories (specialise and causality).

master/bt5/slapos_accounting/PathTemplateItem/portal_deliveries/slapos_sale_invoice_transaction_trade_model_builder.xml

@@ -84,10 +84,7 @@
         <item>
             <key> <string>delivery_cell_separate_order</string> </key>
             <value>
-              <tuple>
-                <string>calculateSeparatePrice</string>
-                <string>calculateAddQuantity</string>
-              </tuple>
+              <tuple/>
             </value>
         </item>
         <item>

master/bt5/slapos_accounting/PathTemplateItem/portal_deliveries/slapos_sale_invoice_transaction_trade_model_builder/base_variant_movement_group_in_line.xml

@@ -26,7 +26,7 @@
         </item>
         <item>
             <key> <string>int_index</string> </key>
-            <value> <int>2</int> </value>
+            <value> <int>4</int> </value>
         </item>
         <item>
             <key> <string>portal_type</string> </key>

master/bt5/slapos_accounting/PathTemplateItem/portal_deliveries/slapos_sale_invoice_transaction_trade_model_builder/category_movement_group_on_delivery.xml

@@ -27,7 +27,7 @@
         </item>
         <item>
             <key> <string>int_index</string> </key>
-            <value> <int>1</int> </value>
+            <value> <int>2</int> </value>
         </item>
         <item>
             <key> <string>portal_type</string> </key>

master/bt5/slapos_accounting/PathTemplateItem/portal_deliveries/slapos_sale_invoice_transaction_trade_model_builder/category_movement_group_on_line.xml

@@ -27,7 +27,7 @@
         </item>
         <item>
             <key> <string>int_index</string> </key>
-            <value> <int>1</int> </value>
+            <value> <int>2</int> </value>
         </item>
         <item>
             <key> <string>portal_type</string> </key>
@@ -37,7 +37,6 @@
             <key> <string>tested_property</string> </key>
             <value>
               <tuple>
-                <string>specialise</string>
                 <string>resource</string>
                 <string>quantity_unit</string>
                 <string>base_contribution</string>

master/bt5/slapos_accounting/PathTemplateItem/portal_deliveries/slapos_sale_invoice_transaction_trade_model_builder/first_causality_on_delivery.xml

+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <global name="First Causality Movement Group" module="erp5.portal_type"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>categories</string> </key>
+            <value>
+              <tuple>
+                <string>collect_order_group/delivery</string>
+              </tuple>
+            </value>
+        </item>
+        <item>
+            <key> <string>description</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>first_causality_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>First Causality Movement Group</string> </value>
+        </item>
+        <item>
+            <key> <string>title</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+</ZopeData>

master/bt5/slapos_accounting/PathTemplateItem/portal_deliveries/slapos_sale_invoice_transaction_trade_model_builder/property_movement_group_on_line.xml

@@ -26,7 +26,7 @@
         </item>
         <item>
             <key> <string>int_index</string> </key>
-            <value> <int>2</int> </value>
+            <value> <int>3</int> </value>
         </item>
         <item>
             <key> <string>portal_type</string> </key>

master/bt5/slapos_accounting/PathTemplateItem/portal_deliveries/slapos_sale_invoice_transaction_trade_model_builder/delivery_causality_assignement_movement_group_on_line.xml → master/bt5/slapos_accounting/PathTemplateItem/portal_deliveries/slapos_sale_invoice_transaction_trade_model_builder/split_on_line.xml

@@ -2,7 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <global name="Delivery Causality Assignment Movement Group" module="erp5.portal_type"/>
+      <global name="Split Movement Group" module="erp5.portal_type"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -22,19 +22,21 @@
         </item>
         <item>
             <key> <string>id</string> </key>
-            <value> <string>delivery_causality_assignement_movement_group_on_line</string> </value>
+            <value> <string>split_on_line</string> </value>
         </item>
         <item>
             <key> <string>int_index</string> </key>
-            <value> <int>100</int> </value>
+            <value> <int>1</int> </value>
         </item>
         <item>
             <key> <string>portal_type</string> </key>
-            <value> <string>Delivery Causality Assignment Movement Group</string> </value>
+            <value> <string>Split Movement Group</string> </value>
         </item>
         <item>
             <key> <string>title</string> </key>
-            <value> <string>delivery_causality_assignement_movement_group_on_line</string> </value>
+            <value>
+              <none/>
+            </value>
         </item>
       </dictionary>
     </pickle>

master/bt5/slapos_accounting/bt/revision

-128
\ No newline at end of file
+129
\ No newline at end of file