Merge PR OCA#179 into 16.0

Signed-off-by pedrobaeza
aurestic · Sep 5, 2024 · 6a9fd4d · 6a9fd4d
2 parents 66b5edb + 4a94255
commit 6a9fd4d
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 18 deletions.
diff --git a/sale_product_pack/models/product_pack_line.py b/sale_product_pack/models/product_pack_line.py
@@ -16,7 +16,6 @@ def get_sale_order_line_vals(self, line, order):
         quantity = self.quantity * line.product_uom_qty
         line_vals = {
             "order_id": order.id,
-            "sequence": line.sequence,
             "product_id": self.product_id.id or False,
             "pack_parent_line_id": line.id,
             "pack_depth": line.pack_depth + 1,

diff --git a/sale_product_pack/models/sale_order_line.py b/sale_product_pack/models/sale_order_line.py
@@ -52,8 +52,11 @@ def expand_pack_line(self, write=False):
         # only want to update prices
         vals_list = []
         if self.product_id.pack_ok and self.pack_type == "detailed":
+            new_sequence = self.sequence + 1
             for subline in self.product_id.get_pack_lines():
                 vals = subline.get_sale_order_line_vals(self, self.order_id)
+                vals["sequence"] = new_sequence
+                new_sequence += 1
                 if write:
                     existing_subline = first(
                         self.pack_child_line_ids.filtered(

diff --git a/sale_product_pack/tests/test_sale_product_pack.py b/sale_product_pack/tests/test_sale_product_pack.py
@@ -71,13 +71,8 @@ def test_create_components_price_order_line(self):
         )
         # After create, there will be four lines
         self.assertEqual(len(self.sale_order.order_line), 4)
-        pack_line = self.sale_order.order_line.filtered(
-            lambda pline: pline.product_id == product_cp
-        )
-        # Check if sequence is the same as pack product one
-        sequence = pack_line.sequence
         self.assertEqual(
-            [sequence, sequence, sequence, sequence],
+            [10, 11, 12, 13],
             self.sale_order.order_line.mapped("sequence"),
         )
         # The products of those four lines are the main product pack and its
@@ -250,26 +245,21 @@ def test_create_several_lines(self):
                 "name": product_cp.name,
                 "product_id": product_cp.id,
                 "product_uom_qty": 1,
+                "sequence": 10,
             },
             {
                 "order_id": self.sale_order.id,
                 "name": product_tp.name,
                 "product_id": product_tp.id,
                 "product_uom_qty": 1,
+                "sequence": 20,
             },
         ]
         self.env["sale.order.line"].create(vals)
         # After create, there will be eight lines (4 + 4)
         self.assertEqual(len(self.sale_order.order_line), 8)
         # Check if lines are well ordered
-        self.assertEqual(self.sale_order.order_line[0].product_id, product_cp)
-        sequence_cp = self.sale_order.order_line[0].sequence
-        self.assertEqual(sequence_cp, self.sale_order.order_line[1].sequence)
-        self.assertEqual(sequence_cp, self.sale_order.order_line[2].sequence)
-        self.assertEqual(sequence_cp, self.sale_order.order_line[3].sequence)
-
-        self.assertEqual(self.sale_order.order_line[4].product_id, product_tp)
-        sequence_tp = self.sale_order.order_line[4].sequence
-        self.assertEqual(sequence_tp, self.sale_order.order_line[5].sequence)
-        self.assertEqual(sequence_tp, self.sale_order.order_line[6].sequence)
-        self.assertEqual(sequence_tp, self.sale_order.order_line[7].sequence)
+        self.assertEqual(
+            [10, 11, 12, 13, 20, 21, 22, 23],
+            self.sale_order.order_line.mapped("sequence"),
+        )