slapos_accounting: builders: do not merge movement with different prices

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

@@ -84,6 +84,7 @@
             <value>
               <tuple>
                 <string>calculateSeparatePrice</string>
+                <string>calculateAddQuantity</string>
               </tuple>
             </value>
         </item>

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

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

master/bt5/slapos_accounting/PathTemplateItem/portal_deliveries/slapos_sale_invoice_builder/category_movement_group_on_line.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>

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

@@ -27,7 +27,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>
@@ -39,6 +39,7 @@
               <tuple>
                 <string>start_date</string>
                 <string>stop_date</string>
+                <string>price</string>
               </tuple>
             </value>
         </item>

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

@@ -83,8 +83,8 @@
             <key> <string>delivery_cell_separate_order</string> </key>
             <value>
               <tuple>
+                <string>calculateSeparatePrice</string>
                 <string>calculateAddQuantity</string>
-                <string>calculateAveragePrice</string>
               </tuple>
             </value>
         </item>

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

@@ -85,8 +85,8 @@
             <key> <string>delivery_cell_separate_order</string> </key>
             <value>
               <tuple>
+                <string>calculateSeparatePrice</string>
                 <string>calculateAddQuantity</string>
-                <string>calculateAveragePrice</string>
               </tuple>
             </value>
         </item>

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

@@ -11,6 +11,7 @@
             <value>
               <tuple>
                 <string>collect_order_group/line</string>
+                <string>divergence_scope/property</string>
               </tuple>
             </value>
         </item>

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

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

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

+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <global name="Property Movement Group" module="erp5.portal_type"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>categories</string> </key>
+            <value>
+              <tuple>
+                <string>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>tested_property</string> </key>
+            <value>
+              <tuple>
+                <string>price</string>
+              </tuple>
+            </value>
+        </item>
+        <item>
+            <key> <string>title</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>update_always</string> </key>
+            <value> <int>0</int> </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+</ZopeData>