odoo-addon-shopfloor 16.0.2.12.0.1__py3-none-any.whl → 18.0.0.1.1__py3-none-any.whl

odoo/addons/shopfloor/tests/test_actions_data_base.py

@@ -31,7 +31,13 @@ class ActionsDataCaseBase(CommonCase, ActionsDataTestMixin):
         cls.packaging = (
             cls.env["product.packaging"]
             .sudo()
-            .create({"name": "Pallet", "packaging_level_id": cls.packaging_type.id})
+            .create(
+                {
+                    "name": "Pallet",
+                    "packaging_level_id": cls.packaging_type.id,
+                    "product_id": cls.product_b.id,
+                }
+            )
         )
         cls.delivery_packaging = (
             cls.env["stock.package.type"]
@@ -87,7 +93,7 @@ class ActionsDataCaseBase(CommonCase, ActionsDataTestMixin):
         cls.product_a_variant = cls.product_a.copy(
             {
                 "name": "Product A variant 1",
-                "type": "product",
+                "is_storable": True,
                 "default_code": "A-VARIANT",
                 "barcode": "A-VARIANT",
             }
@@ -176,7 +182,7 @@ class ActionsDataCaseBase(CommonCase, ActionsDataTestMixin):
         data = {
             "id": record.id,
             "name": record.name,
-            "weight": record.pack_weight or record.estimated_pack_weight_kg,
+            "weight": record.shopfloor_weight,
             "storage_type": None,
             "total_quantity": sum(record.quant_ids.mapped("quantity")),
         }

odoo/addons/shopfloor/tests/test_actions_data_detail.py

@@ -24,7 +24,7 @@ class TestActionsDataDetailCase(ActionsDataDetailCaseBase):
         move_lines = self.env["stock.move.line"].search(
             [
                 ("location_id", "child_of", location.id),
-                ("reserved_qty", ">", 0),
+                ("quantity_product_uom", ">", 0),
                 ("state", "not in", ("done", "cancel")),
             ]
         )
@@ -148,6 +148,7 @@ class TestActionsDataDetailCase(ActionsDataDetailCaseBase):
                 "carrier_id": carrier.id,
             }
         )
+        picking.move_ids[0].quantity = 5.0
         picking.move_ids.write({"date": "2020-05-13"})
         data = self.data_detail.picking_detail(picking, with_progress=True)
         self.assert_schema(self.schema_detail.picking_detail(), data)
@@ -160,7 +161,7 @@ class TestActionsDataDetailCase(ActionsDataDetailCaseBase):
             "note": Markup("<p>read me</p>"),
             "origin": "created by test",
             "ship_carrier": None,
-            "weight": 110.0,
+            "weight": 100.0,
             "partner": {"id": self.customer.id, "name": self.customer.name},
             "carrier": {"id": picking.carrier_id.id, "name": picking.carrier_id.name},
             "priority": "Urgent",
@@ -170,7 +171,7 @@ class TestActionsDataDetailCase(ActionsDataDetailCaseBase):
             },
             "move_lines": self.data_detail.move_lines(picking.move_line_ids),
             "picking_type_code": "outgoing",
-            "progress": 0.0,
+            "progress": 87.5,
         }
         self.assertEqual(data.pop("scheduled_date").split("T")[0], "2020-05-13")
         self.assertDictEqual(data, expected)
@@ -180,20 +181,21 @@ class TestActionsDataDetailCase(ActionsDataDetailCaseBase):
         result_package = self.env["stock.quant.package"].create(
             {"product_packaging_id": self.packaging.id}
         )
-        move_line.write({"qty_done": 3.0, "result_package_id": result_package.id})
+        move_line.result_package_id = result_package
+        move_line._pick_qty(3.0)
         data = self.data_detail.move_line(move_line)
         self.assert_schema(self.schema_detail.move_line(), data)
         product = self.product_a.with_context(location=move_line.location_id.id)
         expected = {
             "id": move_line.id,
             "qty_done": 3.0,
-            "quantity": move_line.reserved_uom_qty,
+            "quantity": move_line.quantity,
             "product": self._expected_product_detail(product),
             "lot": None,
             "package_src": {
                 "id": move_line.package_id.id,
                 "name": move_line.package_id.name,
-                "weight": 20.0,
+                "weight": move_line.package_id.shopfloor_weight,
                 "storage_type": None,
                 "total_quantity": sum(
                     move_line.package_id.quant_ids.mapped("quantity")
@@ -202,7 +204,7 @@ class TestActionsDataDetailCase(ActionsDataDetailCaseBase):
             "package_dest": {
                 "id": result_package.id,
                 "name": result_package.name,
-                "weight": 6.0,
+                "weight": result_package.shopfloor_weight,
                 "storage_type": None,
                 "total_quantity": sum(
                     move_line.result_package_id.quant_ids.mapped("quantity")
@@ -211,7 +213,6 @@ class TestActionsDataDetailCase(ActionsDataDetailCaseBase):
             "location_src": self._expected_location(move_line.location_id),
             "location_dest": self._expected_location(move_line.location_dest_id),
             "priority": "1",
-            "progress": 30.0,
         }
         self.assertDictEqual(data, expected)
         data = self.data_detail.move_line(move_line, with_package_move_line_count=True)
@@ -226,8 +227,8 @@ class TestActionsDataDetailCase(ActionsDataDetailCaseBase):
         product = self.product_b.with_context(location=move_line.location_id.id)
         expected = {
             "id": move_line.id,
-            "qty_done": 0.0,
-            "quantity": move_line.reserved_uom_qty,
+            "qty_done": 0,
+            "quantity": move_line.quantity,
             "product": self._expected_product_detail(product),
             "lot": {
                 "id": move_line.lot_id.id,
@@ -240,7 +241,6 @@ class TestActionsDataDetailCase(ActionsDataDetailCaseBase):
             "location_src": self._expected_location(move_line.location_id),
             "location_dest": self._expected_location(move_line.location_dest_id),
             "priority": "1",
-            "progress": 0.0,
         }
         self.assertDictEqual(data, expected)
 
@@ -251,8 +251,8 @@ class TestActionsDataDetailCase(ActionsDataDetailCaseBase):
         product = self.product_c.with_context(location=move_line.location_id.id)
         expected = {
             "id": move_line.id,
-            "qty_done": 0.0,
-            "quantity": move_line.reserved_uom_qty,
+            "qty_done": 0,
+            "quantity": move_line.quantity,
             "product": self._expected_product_detail(product),
             "lot": {
                 "id": move_line.lot_id.id,
@@ -263,7 +263,7 @@ class TestActionsDataDetailCase(ActionsDataDetailCaseBase):
             "package_src": {
                 "id": move_line.package_id.id,
                 "name": move_line.package_id.name,
-                "weight": 30.0,
+                "weight": move_line.package_id.shopfloor_weight,
                 "storage_type": None,
                 "total_quantity": sum(
                     move_line.package_id.quant_ids.mapped("quantity")
@@ -272,7 +272,7 @@ class TestActionsDataDetailCase(ActionsDataDetailCaseBase):
             "package_dest": {
                 "id": move_line.result_package_id.id,
                 "name": move_line.result_package_id.name,
-                "weight": 0.0,
+                "weight": move_line.result_package_id.shopfloor_weight,
                 "storage_type": None,
                 "total_quantity": sum(
                     move_line.result_package_id.quant_ids.mapped("quantity")
@@ -281,7 +281,6 @@ class TestActionsDataDetailCase(ActionsDataDetailCaseBase):
             "location_src": self._expected_location(move_line.location_id),
             "location_dest": self._expected_location(move_line.location_dest_id),
             "priority": "1",
-            "progress": 0.0,
         }
         self.assertDictEqual(data, expected)
         data = self.data_detail.move_line(move_line, with_package_move_line_count=True)
@@ -296,8 +295,8 @@ class TestActionsDataDetailCase(ActionsDataDetailCaseBase):
         product = self.product_d.with_context(location=move_line.location_id.id)
         expected = {
             "id": move_line.id,
-            "qty_done": 0.0,
-            "quantity": move_line.reserved_uom_qty,
+            "qty_done": 0,
+            "quantity": move_line.quantity,
             "product": self._expected_product_detail(product),
             "lot": None,
             "package_src": None,
@@ -305,7 +304,6 @@ class TestActionsDataDetailCase(ActionsDataDetailCaseBase):
             "location_src": self._expected_location(move_line.location_id),
             "location_dest": self._expected_location(move_line.location_dest_id),
             "priority": "1",
-            "progress": 0.0,
         }
         self.assertDictEqual(data, expected)
 

odoo/addons/shopfloor/tests/test_actions_search.py

@@ -94,7 +94,8 @@ class TestSearchCase(TestSearchBaseCase):
         self.assertEqual(handler(lots[0].name, products=self.product_b), lots[1])
         self.assertEqual(handler(lots[1].name, products=self.product_b), lots[1])
 
-    def test_search_generic_packaging(self):
+    def __TODO__test_search_generic_packaging(self):
+        # FIXME: generic packaging is not defined anymore w/ a packaging w/o product
         rec = (
             self.env["product.packaging"]
             .sudo()

odoo/addons/shopfloor/tests/test_actions_stock.py

@@ -1,6 +1,5 @@
 # Copyright 2023 Camptocamp SA (http://www.camptocamp.com)
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
-# from odoo.tests.common import Form
 
 from .common import CommonCase
 
@@ -35,6 +34,8 @@ class TestActionsStock(CommonCase):
         # all lines (two) are picked
         self.stock.mark_move_line_as_picked(lines_picked)
         self.assertTrue(self.picking.user_id)
+        self.assertEqual(lines_picked.mapped("picked"), [True, True])
+        self.assertEqual(lines_picked.mapped("qty_picked"), [10.0, 10.0])
         # unpick one line
         line_unpicked = lines_picked[0]
         self.stock.unmark_move_line_as_picked(line_unpicked)
@@ -46,3 +47,5 @@ class TestActionsStock(CommonCase):
         self.assertTrue(self.picking.move_line_ids.shopfloor_user_id)
         self.assertFalse(picking_not_assigned.move_line_ids.shopfloor_user_id)
         self.assertFalse(picking_not_assigned.user_id)
+        self.assertEqual(lines_picked.mapped("picked"), [False, True])
+        self.assertEqual(lines_picked.mapped("qty_picked"), [0.0, 10.0])

odoo/addons/shopfloor/tests/test_checkout_auto_post.py

@@ -59,9 +59,9 @@ class CheckoutAutoPostCase(CheckoutCommonCase):
         line_b_in_original_picking = picking.move_line_ids.filtered(
             lambda x: x.product_id == selected_move_line_b.product_id
         )
-        self.assertEqual(line_a_in_original_picking.reserved_uom_qty, 3)
-        self.assertEqual(line_b_in_original_picking.reserved_uom_qty, 11)
-        self.assertEqual(selected_move_line_c.reserved_uom_qty, 30)
+        self.assertEqual(line_a_in_original_picking.quantity, 3)
+        self.assertEqual(line_b_in_original_picking.quantity, 11)
+        self.assertEqual(selected_move_line_c.quantity, 30)
 
         self.assertEqual(line_a_in_original_picking.qty_done, 0)
         self.assertEqual(line_b_in_original_picking.qty_done, 0)

odoo/addons/shopfloor/tests/test_checkout_base.py

@@ -91,6 +91,6 @@ class CheckoutCommonCase(CommonCase):
                 "message_type": "warning",
                 "body": "The quantity scanned for one or more lines cannot be "
                 "higher than the maximum allowed. "
-                f"({line.product_id.name} : {str(line.qty_done)} > {str(line.reserved_uom_qty)})",  # noqa
+                f"({line.product_id.name} : {str(line.qty_done)} > {str(line.quantity)})",  # noqa
             },
         )

odoo/addons/shopfloor/tests/test_checkout_list_delivery_packaging.py

@@ -106,7 +106,7 @@ class CheckoutListDeliveryPackagingCase(CheckoutCommonCase, CheckoutSelectPackag
         self.picking.action_assign()
         selected_lines = self.picking.move_line_ids
         # for line in selected_lines:
-        #     line.qty_done = line.reserved_uom_qty
+        #     line.qty_done = line.quantity
         response = self.service.dispatch(
             "list_delivery_packaging",
             params={

odoo/addons/shopfloor/tests/test_checkout_list_package.py

@@ -137,8 +137,8 @@ class CheckoutScanSetDestPackageCase(CheckoutCommonCase, SelectDestPackageMixin)
         # them
         cls.move_line1.result_package_id = cls.delivery_package
         # We'll put only product A and B in the destination package
-        cls.move_line1.qty_done = cls.move_line1.reserved_uom_qty
-        cls.move_line2.qty_done = cls.move_line2.reserved_uom_qty
+        cls.move_line1.qty_done = cls.move_line1.quantity
+        cls.move_line2.qty_done = cls.move_line2.quantity
         cls.move_line3.qty_done = 0
 
         cls.picking = picking
@@ -266,7 +266,7 @@ class CheckoutScanSetDestPackageCase(CheckoutCommonCase, SelectDestPackageMixin)
         )
         # Left quantity to do from line 3
         new_move_line = self.picking.move_line_ids.filtered(
-            lambda line: line.qty_done == 0 and line.reserved_uom_qty == 7
+            lambda line: line.qty_done == 0 and line.quantity == 7
         )
         self.assertTrue(new_move_line)
         self.assertFalse(new_move_line.shopfloor_checkout_done)
@@ -318,7 +318,7 @@ class CheckoutScanSetDestPackageCase(CheckoutCommonCase, SelectDestPackageMixin)
         # the maximum allowed, a message should be displayed
         # and the user shouldn't be allowed to select a package.
         line = fields.first(self.picking.move_line_ids)
-        line.qty_done = line.reserved_uom_qty + 1
+        line.qty_done = line.quantity + 1
         response = self.service.dispatch(
             "list_dest_package",
             params={

odoo/addons/shopfloor/tests/test_checkout_new_package.py

@@ -28,8 +28,8 @@ class CheckoutNewPackageCase(CheckoutCommonCase, CheckoutSelectPackageMixin):
 
         move_line1, move_line2, move_line3 = selected_lines
         # we'll put only the first 2 lines (product A and B) in the new package
-        move_line1.qty_done = move_line1.reserved_uom_qty
-        move_line2.qty_done = move_line2.reserved_uom_qty
+        move_line1.qty_done = move_line1.quantity
+        move_line2.qty_done = move_line2.quantity
         move_line3.qty_done = 0
 
         response = self.service.dispatch(
@@ -77,7 +77,7 @@ class CheckoutNewPackageCase(CheckoutCommonCase, CheckoutSelectPackageMixin):
         # and the user shouldn't be allowed to select a package.
         selected_lines = moves.move_line_ids
         line = fields.first(selected_lines)
-        line.qty_done = line.reserved_uom_qty + 1
+        line.qty_done = line.quantity + 1
         response = self.service.dispatch(
             "list_dest_package",
             params={

odoo/addons/shopfloor/tests/test_checkout_no_package.py

@@ -33,8 +33,8 @@ class CheckoutNoPackageCase(CheckoutCommonCase, CheckoutSelectPackageMixin):
         selected_lines = move_line1 + move_line2
 
         # we'll put only the first 2 lines (product A and B) w/ no package
-        move_line1.qty_done = move_line1.reserved_uom_qty
-        move_line2.qty_done = move_line2.reserved_uom_qty
+        move_line1.qty_done = move_line1.quantity
+        move_line2.qty_done = move_line2.quantity
         move_line3.qty_done = 0
         response = self.service.dispatch(
             "no_package",
@@ -84,7 +84,7 @@ class CheckoutNoPackageCase(CheckoutCommonCase, CheckoutSelectPackageMixin):
         # the maximum allowed, a message should be displayed
         # and the user shouldn't be allowed to select a package.
         line = fields.first(self.picking.move_line_ids)
-        line.qty_done = line.reserved_uom_qty + 1
+        line.qty_done = line.quantity + 1
         response = self.service.dispatch(
             "list_dest_package",
             params={

odoo/addons/shopfloor/tests/test_checkout_scan_dest_location.py

@@ -49,7 +49,7 @@ class CheckoutSelectChildLocationCase(CheckoutCommonCase):
 
         self.assertRecordValues(self.picking, [{"state": "done"}])
         self.assertTrue(self.picking.backorder_ids)
-        self.assertEqual(self.picking.backorder_ids.move_line_ids.reserved_uom_qty, 8)
+        self.assertEqual(self.picking.backorder_ids.move_line_ids.quantity, 8)
 
         self.assert_response(
             response,

odoo/addons/shopfloor/tests/test_checkout_scan_package_action.py

@@ -40,18 +40,18 @@ class CheckoutScanPackageActionCase(CheckoutCommonCase, CheckoutSelectPackageMix
 
     def test_scan_package_action_select_product(self):
         self._test_select_product(
-            lambda x: x.product_id.barcode, lambda x: x.reserved_uom_qty, lambda __: 0
+            lambda x: x.product_id.barcode, lambda x: x.quantity, lambda __: 0
         )
 
     def test_scan_package_action_deselect_product(self):
         self._test_select_product(
-            lambda x: x.product_id.barcode, lambda __: 0, lambda x: x.reserved_uom_qty
+            lambda x: x.product_id.barcode, lambda __: 0, lambda x: x.quantity
         )
 
     def test_scan_package_action_select_product_packaging(self):
         self._test_select_product(
             lambda x: x.product_id.packaging_ids.barcode,
-            lambda x: x.reserved_uom_qty,
+            lambda x: x.quantity,
             lambda __: 0,
         )
 
@@ -59,21 +59,21 @@ class CheckoutScanPackageActionCase(CheckoutCommonCase, CheckoutSelectPackageMix
         self._test_select_product(
             lambda x: x.product_id.packaging_ids.barcode,
             lambda __: 0,
-            lambda x: x.reserved_uom_qty,
+            lambda x: x.quantity,
         )
 
     def test_scan_package_action_select_product_lot(self):
         self._test_select_product(
             lambda x: x.lot_id.name,
             lambda __: 0,
-            lambda x: x.reserved_uom_qty,
+            lambda x: x.quantity,
             in_lot=True,
         )
 
     def test_scan_package_action_deselect_product_lot(self):
         self._test_select_product(
             lambda x: x.lot_id.name,
-            lambda x: x.reserved_uom_qty,
+            lambda x: x.quantity,
             lambda __: 0,
             in_lot=True,
         )
@@ -135,8 +135,8 @@ class CheckoutScanPackageActionCase(CheckoutCommonCase, CheckoutSelectPackageMix
 
         move_line1, move_line2, move_line3 = selected_lines
         # We'll put only product A and B in the package
-        move_line1.qty_done = move_line1.reserved_uom_qty
-        move_line2.qty_done = move_line2.reserved_uom_qty
+        move_line1.qty_done = move_line1.quantity
+        move_line2.qty_done = move_line2.quantity
         move_line3.qty_done = 0
 
         response = self.service.dispatch(
@@ -296,8 +296,8 @@ class CheckoutScanPackageActionCase(CheckoutCommonCase, CheckoutSelectPackageMix
 
         move_line1, move_line2, move_line3 = selected_lines
         # we'll put only the first 2 lines (product A and B) in the new package
-        move_line1.qty_done = move_line1.reserved_uom_qty
-        move_line2.qty_done = move_line2.reserved_uom_qty
+        move_line1.qty_done = move_line1.quantity
+        move_line2.qty_done = move_line2.quantity
         move_line3.qty_done = 0
 
         packaging = (
@@ -368,7 +368,7 @@ class CheckoutScanPackageActionCase(CheckoutCommonCase, CheckoutSelectPackageMix
         self._fill_stock_for_moves(pack1_moves, in_package=True)
         picking.action_assign()
         selected_lines = pack1_moves.move_line_ids
-        selected_lines.qty_done = selected_lines.reserved_uom_qty
+        selected_lines.qty_done = selected_lines.quantity
 
         packaging = (
             self.env["stock.package.type"]

odoo/addons/shopfloor/tests/test_checkout_select_package_base.py

@@ -58,7 +58,7 @@ class CheckoutSelectPackageMixin:
         for line in selected_lines - related_lines:
             self.assertEqual(
                 line.qty_done,
-                line.reserved_uom_qty,
+                line.quantity,
                 "Scanned lines must have their qty done set to the reserved quantity",
             )
         for line in unselected_lines + related_lines:

odoo/addons/shopfloor/tests/test_checkout_set_qty.py

@@ -25,12 +25,12 @@ class CheckoutSetQtyCommonCase(CheckoutCommonCase, CheckoutSelectPackageMixin):
         super().setUp()
         # we assume we have called /select_line on pack one, so by default, we
         # expect the lines for product a and b to have their qty_done set to
-        # their reserved_uom_qty at the start of the tests
+        # their reserved quantity at the start of the tests
         self.selected_lines = self.moves_pack1.move_line_ids
         self.deselected_lines = self.moves_pack2.move_line_ids
         self.service._select_lines(self.selected_lines)
         self.assertTrue(
-            all(line.qty_done == line.reserved_uom_qty for line in self.selected_lines)
+            all(line.qty_done == line.quantity for line in self.selected_lines)
         )
         self.assertTrue(all(line.qty_done == 0 for line in self.deselected_lines))
 
@@ -53,7 +53,7 @@ class CheckoutResetLineQtyCase(CheckoutSetQtyCommonCase):
         self._assert_selected_qties(
             response,
             selected_lines,
-            {line_to_reset: 0, line_with_qty: line_with_qty.reserved_uom_qty},
+            {line_to_reset: 0, line_with_qty: line_with_qty.quantity},
         )
 
     def test_reset_line_qty_not_found(self):
@@ -71,7 +71,7 @@ class CheckoutResetLineQtyCase(CheckoutSetQtyCommonCase):
         self._assert_selected_qties(
             response,
             selected_lines,
-            {line: line.reserved_uom_qty for line in selected_lines},
+            {line: line.quantity for line in selected_lines},
             message={
                 "body": "The record you were working on does not exist anymore.",
                 "message_type": "error",
@@ -96,12 +96,12 @@ class CheckoutSetLineQtyCase(CheckoutSetQtyCommonCase):
                 "move_line_id": line_to_set.id,
             },
         )
-        self.assertEqual(line_to_set.qty_done, line_to_set.reserved_uom_qty)
+        self.assertEqual(line_to_set.qty_done, line_to_set.quantity)
         self.assertEqual(line_no_qty.qty_done, 0)
         self._assert_selected_qties(
             response,
             selected_lines,
-            {line_to_set: line_to_set.reserved_uom_qty, line_no_qty: 0},
+            {line_to_set: line_to_set.quantity, line_no_qty: 0},
         )
 
     def test_set_line_qty_not_found(self):
@@ -119,7 +119,7 @@ class CheckoutSetLineQtyCase(CheckoutSetQtyCommonCase):
         self._assert_selected_qties(
             response,
             selected_lines,
-            {line: line.reserved_uom_qty for line in selected_lines},
+            {line: line.quantity for line in selected_lines},
             message={
                 "body": "The record you were working on does not exist anymore.",
                 "message_type": "error",
@@ -133,7 +133,7 @@ class CheckoutSetCustomQtyCase(CheckoutSetQtyCommonCase):
         line_to_change = selected_lines[0]
         line_keep_qty = selected_lines[1]
         # Process full qty
-        new_qty = line_to_change.reserved_uom_qty
+        new_qty = line_to_change.quantity
         # we want to check that when we give the package id, we get
         # all its move lines
         response = self.service.dispatch(
@@ -146,11 +146,11 @@ class CheckoutSetCustomQtyCase(CheckoutSetQtyCommonCase):
             },
         )
         self.assertEqual(line_to_change.qty_done, new_qty)
-        self.assertEqual(line_keep_qty.qty_done, line_keep_qty.reserved_uom_qty)
+        self.assertEqual(line_keep_qty.qty_done, line_keep_qty.quantity)
         self._assert_selected_qties(
             response,
             selected_lines,
-            {line_to_change: new_qty, line_keep_qty: line_keep_qty.reserved_uom_qty},
+            {line_to_change: new_qty, line_keep_qty: line_keep_qty.quantity},
         )
 
     def test_set_custom_qty_not_found(self):
@@ -169,7 +169,7 @@ class CheckoutSetCustomQtyCase(CheckoutSetQtyCommonCase):
         self._assert_selected_qties(
             response,
             selected_lines,
-            {line: line.reserved_uom_qty for line in selected_lines},
+            {line: line.quantity for line in selected_lines},
             message={
                 "body": "The record you were working on does not exist anymore.",
                 "message_type": "error",
@@ -188,13 +188,13 @@ class CheckoutSetCustomQtyCase(CheckoutSetQtyCommonCase):
                 "picking_id": self.picking.id,
                 "selected_line_ids": selected_lines.ids,
                 "move_line_id": line1.id,
-                "qty_done": line1.reserved_uom_qty + 1,
+                "qty_done": line1.quantity + 1,
             },
         )
         self._assert_selected_qties(
             response,
             selected_lines,
-            {line1: line1.reserved_uom_qty + 1, line2: line2.reserved_uom_qty},
+            {line1: line1.quantity + 1, line2: line2.quantity},
             message={
                 "body": "Please note that the scanned quantity "
                 "is higher than the maximum allowed.",
@@ -218,7 +218,7 @@ class CheckoutSetCustomQtyCase(CheckoutSetQtyCommonCase):
         self._assert_selected_qties(
             response,
             selected_lines,
-            {line1: line1.reserved_uom_qty, line2: line2.reserved_uom_qty},
+            {line1: line1.quantity, line2: line2.quantity},
             message={
                 "body": "Negative quantity not allowed.",
                 "message_type": "error",
@@ -230,7 +230,7 @@ class CheckoutSetCustomQtyCase(CheckoutSetQtyCommonCase):
         line_to_change = selected_lines[0]
         line_keep_qty = selected_lines[1]
         # split 1 qty
-        new_qty = line_to_change.reserved_uom_qty - 1
+        new_qty = line_to_change.quantity - 1
         response = self.service.dispatch(
             "set_custom_qty",
             params={
@@ -241,7 +241,7 @@ class CheckoutSetCustomQtyCase(CheckoutSetQtyCommonCase):
             },
         )
         self.assertEqual(line_to_change.qty_done, new_qty)
-        self.assertEqual(line_keep_qty.qty_done, line_keep_qty.reserved_uom_qty)
+        self.assertEqual(line_keep_qty.qty_done, line_keep_qty.quantity)
         new_lines = [
             x for x in self.moves_pack1.move_line_ids if x not in selected_lines
         ]
@@ -252,6 +252,6 @@ class CheckoutSetCustomQtyCase(CheckoutSetQtyCommonCase):
             self.moves_pack1.move_line_ids,
             {
                 line_to_change: new_qty,
-                line_keep_qty: line_keep_qty.reserved_uom_qty,
+                line_keep_qty: line_keep_qty.quantity,
             },
         )

odoo/addons/shopfloor/tests/test_checkout_summary.py

@@ -35,7 +35,7 @@ class CheckoutSummaryCase(CheckoutCommonCase):
         self.picking.action_assign()
         # satisfy only few lines
         for ml in self.picking.move_line_ids[:2]:
-            ml.qty_done = ml.reserved_uom_qty
+            ml.qty_done = ml.quantity
             ml.shopfloor_checkout_done = True
         response = self.service.dispatch(
             "summary", params={"picking_id": self.picking.id}
@@ -54,7 +54,7 @@ class CheckoutSummaryCase(CheckoutCommonCase):
         self.picking.action_assign()
         # satisfy only all lines
         for ml in self.picking.move_line_ids:
-            ml.qty_done = ml.reserved_uom_qty
+            ml.qty_done = ml.quantity
             ml.shopfloor_checkout_done = True
         response = self.service.dispatch(
             "summary", params={"picking_id": self.picking.id}

odoo/addons/shopfloor/tests/test_cluster_picking_base.py

@@ -53,7 +53,7 @@ class ClusterPickingCommonCase(CommonCase, PickingBatchMixin):
         for line in move_lines:
             line.write(
                 {
-                    "qty_done": line.reserved_uom_qty,
+                    "qty_done": line.quantity,
                     "result_package_id": dest_package.id,
                 }
             )

odoo/addons/shopfloor/tests/test_cluster_picking_batch.py

@@ -21,12 +21,12 @@ class ClusterPickingBatchCase(CommonCase, PickingBatchMixin):
         cls.product_a = (
             cls.env["product.product"]
             .sudo()
-            .create({"name": "Product A", "type": "product"})
+            .create({"name": "Product A", "is_storable": True})
         )
         cls.product_b = (
             cls.env["product.product"]
             .sudo()
-            .create({"name": "Product B", "type": "product"})
+            .create({"name": "Product B", "is_storable": True})
         )
         cls.batch1 = cls._create_picking_batch(
             [[cls.BatchProduct(product=cls.product_a, quantity=1)]]

odoo/addons/shopfloor/tests/test_cluster_picking_change_pack_lot.py

@@ -74,7 +74,7 @@ class ClusterPickingChangePackLotCase(ClusterPickingCommonCase):
                 {
                     "package_id": new_package.id,
                     "result_package_id": new_package.id,
-                    "reserved_qty": 10.0,
+                    "quantity_product_uom": 10.0,
                 }
             ],
         )

odoo/addons/shopfloor/tests/test_cluster_picking_is_zero.py

@@ -35,7 +35,7 @@ class ClusterPickingIsZeroCase(ClusterPickingCommonCase):
         cls.next_line = cls.picking.move_line_ids[1]
         cls.bin1 = cls.env["stock.quant.package"].create({})
         cls._update_qty_in_location(
-            cls.line.location_id, cls.line.product_id, cls.line.reserved_uom_qty
+            cls.line.location_id, cls.line.product_id, cls.line.quantity
         )
         # we already scan and put the first line in bin1, at this point the
         # system see the location is empty and reach "zero_check"