Simplify the builder.

Make it sure that lines are always separated (split_on_line).
Took movements only from same invoice (first_causality_on_delivery).

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

@@ -49,10 +49,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_payment_transaction_builder/category_movement_group_on_delivery.xml

@@ -27,7 +27,7 @@
         </item>
         <item>
             <key> <string>int_index</string> </key>
-            <value> <int>3</int> </value>
+            <value> <int>4</int> </value>
         </item>
         <item>
             <key> <string>portal_type</string> </key>
@@ -41,6 +41,7 @@
                 <string>destination_section</string>
                 <string>payment_mode</string>
                 <string>resource</string>
+                <string>specialise</string>
               </tuple>
             </value>
         </item>

master/bt5/slapos_accounting/PathTemplateItem/portal_deliveries/slapos_payment_transaction_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>
@@ -43,7 +43,6 @@
                 <string>destination_project</string>
                 <string>source_payment</string>
                 <string>destination_payment</string>
-                <string>specialise</string>
               </tuple>
             </value>
         </item>

master/bt5/slapos_accounting/PathTemplateItem/portal_deliveries/slapos_payment_transaction_builder/category_movement_group_on_cell.xml → master/bt5/slapos_accounting/PathTemplateItem/portal_deliveries/slapos_payment_transaction_builder/first_causality_on_delivery.xml

@@ -2,7 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <global name="Category Movement Group" module="erp5.portal_type"/>
+      <global name="First Causality Movement Group" module="erp5.portal_type"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -10,8 +10,7 @@
             <key> <string>categories</string> </key>
             <value>
               <tuple>
-                <string>divergence_scope/category</string>
-                <string>collect_order_group/cell</string>
+                <string>collect_order_group/delivery</string>
               </tuple>
             </value>
         </item>
@@ -23,7 +22,7 @@
         </item>
         <item>
             <key> <string>id</string> </key>
-            <value> <string>category_movement_group_on_cell</string> </value>
+            <value> <string>first_causality_on_delivery</string> </value>
         </item>
         <item>
             <key> <string>int_index</string> </key>
@@ -31,21 +30,14 @@
         </item>
         <item>
             <key> <string>portal_type</string> </key>
-            <value> <string>Category Movement Group</string> </value>
+            <value> <string>First Causality Movement Group</string> </value>
         </item>
         <item>
-            <key> <string>tested_property</string> </key>
+            <key> <string>title</string> </key>
             <value>
-              <tuple>
-                <string>source</string>
-                <string>destination</string>
-              </tuple>
+              <none/>
             </value>
         </item>
-        <item>
-            <key> <string>title</string> </key>
-            <value> <string>category_movement_group_on_cell</string> </value>
-        </item>
       </dictionary>
     </pickle>
   </record>

master/bt5/slapos_accounting/PathTemplateItem/portal_deliveries/slapos_payment_transaction_builder/mirror_movement_group_on_delivery.xml

@@ -26,7 +26,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_payment_transaction_builder/property_movement_group_on_delivery.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_payment_transaction_builder/split_on_line.xml

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

master/bt5/slapos_accounting/bt/revision

-137
\ No newline at end of file
+138
\ No newline at end of file