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_cluster_picking_scan_destination.py

@@ -45,7 +45,7 @@ class ClusterPickingScanDestinationPackCase(ClusterPickingCommonCase):
         """
         line = self.batch.picking_ids.move_line_ids[0]
         next_line = self.batch.picking_ids.move_line_ids[1]
-        qty_done = line.reserved_uom_qty
+        qty_done = line.quantity
         response = self.service.dispatch(
             "scan_destination_pack",
             params={
@@ -79,7 +79,7 @@ class ClusterPickingScanDestinationPackCase(ClusterPickingCommonCase):
         )
         # this is the only remaining line to pick
         line = self.two_lines_picking.move_line_ids[1]
-        qty_done = line.reserved_uom_qty
+        qty_done = line.quantity
         response = self.service.dispatch(
             "scan_destination_pack",
             params={
@@ -113,7 +113,7 @@ class ClusterPickingScanDestinationPackCase(ClusterPickingCommonCase):
                 "move_line_id": line2.id,
                 # this bin is used for the same picking, should be allowed
                 "barcode": self.bin1.name,
-                "quantity": line2.reserved_uom_qty,
+                "quantity": line2.quantity,
             },
         )
         self.assert_response(
@@ -137,7 +137,7 @@ class ClusterPickingScanDestinationPackCase(ClusterPickingCommonCase):
                 "move_line_id": line.id,
                 # this bin is used for the other picking
                 "barcode": self.bin1.name,
-                "quantity": line.reserved_uom_qty,
+                "quantity": line.quantity,
             },
         )
         self.assertRecordValues(line, [{"qty_done": 0, "result_package_id": False}])
@@ -168,7 +168,7 @@ class ClusterPickingScanDestinationPackCase(ClusterPickingCommonCase):
                 "move_line_id": line.id,
                 # this bin is used for the other picking
                 "barcode": self.bin1.name,
-                "quantity": line.reserved_uom_qty,
+                "quantity": line.quantity,
             },
         )
         # Since `multiple_move_single_pack` is enabled, assigning `bin` should be ok
@@ -179,13 +179,13 @@ class ClusterPickingScanDestinationPackCase(ClusterPickingCommonCase):
                 {
                     "qty_done": 10,
                     "result_package_id": self.bin1.id,
-                    "reserved_uom_qty": 10,
+                    "quantity": 10,
                 }
             ],
         )
         self.assertRecordValues(
             new_line,
-            [{"qty_done": 0, "result_package_id": False, "reserved_uom_qty": 10}],
+            [{"qty_done": 0, "result_package_id": False, "quantity": 10}],
         )
 
     def test_scan_destination_pack_bin_not_found(self):
@@ -198,7 +198,7 @@ class ClusterPickingScanDestinationPackCase(ClusterPickingCommonCase):
                 "move_line_id": line.id,
                 # this bin is used for the other picking
                 "barcode": "⌿",
-                "quantity": line.reserved_uom_qty,
+                "quantity": line.quantity,
             },
         )
         line_data = self._line_data(line)
@@ -222,7 +222,7 @@ class ClusterPickingScanDestinationPackCase(ClusterPickingCommonCase):
                 "picking_batch_id": self.batch.id,
                 "move_line_id": line.id,
                 "barcode": self.bin1.name,
-                "quantity": line.reserved_uom_qty + 1,
+                "quantity": line.quantity + 1,
             },
         )
         self.assert_response(
@@ -231,7 +231,7 @@ class ClusterPickingScanDestinationPackCase(ClusterPickingCommonCase):
             data=self._line_data(line, qty_done=11.0),
             message={
                 "message_type": "error",
-                "body": f"You must not pick more than {line.reserved_uom_qty} units.",
+                "body": f"You must not pick more than {line.quantity} units.",
             },
         )
 
@@ -256,7 +256,7 @@ class ClusterPickingScanDestinationPackCase(ClusterPickingCommonCase):
                 "picking_batch_id": self.batch.id,
                 "move_line_id": line.id,
                 "barcode": self.bin1.name,
-                "quantity": line.reserved_uom_qty - 3,
+                "quantity": line.quantity - 3,
             },
         )
         new_line = self.one_line_picking.move_line_ids - line
@@ -273,11 +273,11 @@ class ClusterPickingScanDestinationPackCase(ClusterPickingCommonCase):
 
         self.assertRecordValues(
             line,
-            [{"qty_done": 7, "result_package_id": self.bin1.id, "reserved_uom_qty": 7}],
+            [{"qty_done": 7, "result_package_id": self.bin1.id, "quantity": 7}],
         )
         self.assertRecordValues(
             new_line,
-            [{"qty_done": 0, "result_package_id": False, "reserved_uom_qty": 3}],
+            [{"qty_done": 0, "result_package_id": False, "quantity": 3}],
         )
         # the reserved quantity on the quant must stay the same
         self.assertRecordValues(quant, [{"quantity": 40.0, "reserved_quantity": 20.0}])
@@ -300,7 +300,7 @@ class ClusterPickingScanDestinationPackCase(ClusterPickingCommonCase):
         location, product, qty = (
             self.zero_check_location,
             line.product_id,
-            line.reserved_uom_qty,
+            line.quantity,
         )
         self.one_line_picking.do_unreserve()
 
@@ -320,7 +320,7 @@ class ClusterPickingScanDestinationPackCase(ClusterPickingCommonCase):
                 "picking_batch_id": self.batch.id,
                 "move_line_id": line.id,
                 "barcode": self.bin1.name,
-                "quantity": line.reserved_uom_qty,
+                "quantity": line.quantity,
             },
         )
 
@@ -342,16 +342,14 @@ class ClusterPickingScanDestinationPackCase(ClusterPickingCommonCase):
         # Update the quantity in the location to be equal to the line's
         # so when scan_destination_pack sets the qty_done, the planned
         # qty should be zero and trigger a zero check
-        self._update_qty_in_location(
-            line.location_id, line.product_id, line.reserved_uom_qty
-        )
+        self._update_qty_in_location(line.location_id, line.product_id, line.quantity)
         response = self.service.dispatch(
             "scan_destination_pack",
             params={
                 "picking_batch_id": self.batch.id,
                 "move_line_id": line.id,
                 "barcode": self.bin1.name,
-                "quantity": line.reserved_uom_qty,
+                "quantity": line.quantity,
             },
         )
 

odoo/addons/shopfloor/tests/test_cluster_picking_scan_line_no_prefill_qty.py

@@ -16,7 +16,7 @@ class ClusterPickingScanLineNoPrefillQtyCase(ClusterPickingLineCommonCase):
         cls.menu.sudo().no_prefill_qty = True
         cls.picking = cls.batch.picking_ids
         cls.line = cls.picking.move_line_ids
-        cls.line.reserved_uom_qty = 3
+        cls.line.quantity = 3
 
     def _assert_qty_done(self, line, scanned, expected_qty_done):
         batch = line.picking_id.batch_id

odoo/addons/shopfloor/tests/test_cluster_picking_stock_issue.py

@@ -126,7 +126,7 @@ class ClusterPickingStockIssue(ClusterPickingCommonCase):
             + sum(
                 self.batch_other.picking_ids.move_line_ids.filtered(
                     lambda x: x.location_id == self.shelf2
-                ).mapped("reserved_uom_qty")
+                ).mapped("quantity")
             )
         )
         # we should have a quant with 20 quantity and 20 reserved
@@ -336,9 +336,9 @@ class ClusterPickingStockIssue(ClusterPickingCommonCase):
         new_line, __ = pick_line1._split_qty_to_be_done(1)
         self._set_dest_package_and_done(pick_line1, self.dest_package)
 
-        self.assertEqual(pick_line1.reserved_qty, 1.0)
-        self.assertEqual(new_line.reserved_qty, 1.0)
-        self.assertEqual(pick_line2.reserved_qty, 8.0)
+        self.assertEqual(pick_line1.quantity_product_uom, 1.0)
+        self.assertEqual(new_line.quantity_product_uom, 1.0)
+        self.assertEqual(pick_line2.quantity_product_uom, 8.0)
         # on the third move, the operator can't pick anymore in shelf1
         # because there is nothing inside, they declare a stock issue
         self._stock_issue(new_line, next_line_func=lambda: pick_line2)
@@ -358,7 +358,7 @@ class ClusterPickingStockIssue(ClusterPickingCommonCase):
         self.assertFalse(new_line.exists())
         # the second line to pick has been raised to 9 instead of 8
         # initially, to compensate the stock out
-        self.assertEqual(pick_line2.reserved_qty, 9.0)
+        self.assertEqual(pick_line2.quantity_product_uom, 9.0)
 
         # quant with stock out has been updated
         self.assertEqual(package1.quant_ids.quantity, 1.0)

odoo/addons/shopfloor/tests/test_delivery_base.py

@@ -25,7 +25,7 @@ class DeliveryCommonCase(CommonCase):
             .create(
                 {
                     "name": "Product E",
-                    "type": "product",
+                    "is_storable": True,
                     "default_code": "E",
                     "barcode": "E",
                     "weight": 3,
@@ -49,7 +49,7 @@ class DeliveryCommonCase(CommonCase):
             .create(
                 {
                     "name": "Product F",
-                    "type": "product",
+                    "is_storable": True,
                     "default_code": "F",
                     "barcode": "F",
                     "weight": 3,
@@ -73,7 +73,7 @@ class DeliveryCommonCase(CommonCase):
             .create(
                 {
                     "name": "Product G",
-                    "type": "product",
+                    "is_storable": True,
                     "default_code": "G",
                     "barcode": "G",
                     "weight": 1,
@@ -142,9 +142,7 @@ class DeliveryCommonCase(CommonCase):
             for qty in qties:
                 expected_qties.append({"qty_done": qty})
         else:
-            expected_qties = [
-                {"qty_done": line.reserved_uom_qty} for line in move_lines
-            ]
+            expected_qties = [{"qty_done": line.quantity} for line in move_lines]
         self.assertRecordValues(move_lines, expected_qties)
         package_level = move_lines.package_level_id
         if package_level:

odoo/addons/shopfloor/tests/test_delivery_done.py

@@ -45,7 +45,7 @@ class DeliveryDoneCase(DeliveryCommonCase):
         # Do not use the /set_qty_done_line endpoint to set done qties to not
         # update the picking to 'done' state automatically
         for move_line in self.picking.move_line_ids:
-            move_line.qty_done = move_line.reserved_uom_qty
+            move_line.qty_done = move_line.quantity
         response = self.service.dispatch("done", params={"picking_id": self.picking.id})
         self.assert_response_deliver(
             response,

odoo/addons/shopfloor/tests/test_delivery_reset_qty_done_line.py

@@ -72,7 +72,7 @@ class DeliveryResetQtyDoneLineCase(DeliveryCommonCase):
             "set_qty_done_line",
             params={"move_line_id": move_line.id, "picking_id": self.picking.id},
         )
-        self.assertTrue(move_line.qty_done == move_line.reserved_uom_qty)
+        self.assertTrue(move_line.qty_done == move_line.quantity)
         # Reset it, no related move lines are "done"
         response = self.service.dispatch(
             "reset_qty_done_line",

odoo/addons/shopfloor/tests/test_delivery_reset_qty_done_pack.py

@@ -73,7 +73,7 @@ class DeliveryResetQtyDonePackCase(DeliveryCommonCase):
             "set_qty_done_pack",
             params={"package_id": package.id, "picking_id": self.picking.id},
         )
-        self.assertTrue(all(ml.qty_done == ml.reserved_uom_qty for ml in move_lines))
+        self.assertTrue(all(ml.qty_done == ml.quantity for ml in move_lines))
         # Reset it, no related move lines are "done"
         response = self.service.dispatch(
             "reset_qty_done_pack",

odoo/addons/shopfloor/tests/test_delivery_scan_deliver.py

@@ -171,7 +171,7 @@ class DeliveryScanDeliverCase(DeliveryCommonCase):
             response, message=self.service.msg_store.transfer_complete(self.picking)
         )
         for line in move_lines:
-            self.assertEqual(line.move_id.product_uom_qty, line.move_id.quantity_done)
+            self.assertEqual(line.move_id.product_uom_qty, line.move_id.quantity_picked)
             self.assertEqual(line.move_id.state, "done")
         self.assertEqual(self.picking.state, "done")
         self.assertTrue(self.picking.backorder_ids)
@@ -285,7 +285,7 @@ class DeliveryScanDeliverCase(DeliveryCommonCase):
         self.assert_response_deliver(
             response, message=self.service.msg_store.transfer_complete(self.picking)
         )
-        self.assertEqual(raw_move2.quantity_done, 1)
+        self.assertEqual(raw_move2.quantity_picked, 1)
         self.assertEqual(raw_move2.state, "done")
 
     def test_scan_deliver_scan_product_not_found(self):
@@ -308,7 +308,7 @@ class DeliveryScanDeliverCase(DeliveryCommonCase):
         )
         self.assertEqual(line.qty_done, 1)
         self.assertEqual(line.state, "assigned")
-        for _ in range(int(line.reserved_uom_qty) - 1):
+        for _ in range(int(line.quantity) - 1):
             self.service.dispatch(
                 "scan_deliver",
                 params={
@@ -405,7 +405,7 @@ class DeliveryScanDeliverCase(DeliveryCommonCase):
             "scan_deliver", params={"barcode": self.packaging.barcode}
         )
         self.assert_response_deliver(response, picking=self.picking)
-        self.assertEqual(line.move_id.product_qty, line.move_id.quantity_done)
+        self.assertEqual(line.move_id.product_qty, line.move_id.quantity_picked)
         self.assertEqual(line.move_id.state, "assigned")
 
     def test_scan_deliver_scan_product_packaging_partial_qty_with_prepackaged_product(
@@ -566,7 +566,7 @@ class DeliveryScanDeliverCase(DeliveryCommonCase):
         )
         # Re-force qty to 1, as setting the lot resets qty to 0
         cleanup_picking.move_line_ids.lot_id = cleanup_lot
-        cleanup_picking.move_line_ids.reserved_uom_qty = 1.0
+        cleanup_picking.move_line_ids.quantity = 1.0
         params = {"barcode": "CLEANUP_LOT"}
         response = self.service.dispatch("scan_deliver", params=params)
         type_name = cleanup_picking.picking_type_id.name
@@ -688,7 +688,7 @@ class DeliveryScanDeliverSpecialCase(DeliveryCommonCase):
         picking = self._create_picking(lines=[(self.product_a, 10)])
         self._fill_stock_for_moves(picking.move_ids, in_package=True)
         picking.action_assign()
-        picking.move_line_ids.qty_done = picking.move_line_ids.reserved_uom_qty
+        picking.move_line_ids.qty_done = picking.move_line_ids.quantity
         picking._action_done()
         response = self.service.dispatch(
             "scan_deliver", params={"barcode": picking.name}

odoo/addons/shopfloor/tests/test_location_content_transfer_base.py

@@ -26,7 +26,7 @@ class LocationContentTransferCommonCase(CommonCase):
             .create(
                 {
                     "name": "Product E",
-                    "type": "product",
+                    "is_storable": True,
                     "default_code": "E",
                     "barcode": "E",
                     "weight": 3,
@@ -94,7 +94,7 @@ class LocationContentTransferCommonCase(CommonCase):
         """
         pickings.user_id = cls.env.uid
         for line in pickings.mapped("move_line_ids"):
-            line.qty_done = line.reserved_uom_qty
+            line.qty_done = line.quantity
 
     def assert_response_start(self, response, message=None, popup=None):
         self.assert_response(

odoo/addons/shopfloor/tests/test_location_content_transfer_mix.py

@@ -122,7 +122,7 @@ class LocationContentTransferMixCase(LocationContentTransferCommonCase):
         # Set the destination on the move line
         if not dest_location:
             dest_location = move_line.location_dest_id
-        qty = move_line.reserved_uom_qty
+        qty = move_line.quantity
         response = self.zp_service.set_destination(
             move_line.id,
             dest_location.barcode,
@@ -153,7 +153,7 @@ class LocationContentTransferMixCase(LocationContentTransferCommonCase):
         # Set the destination
         if set_destination:
             assert response["next_state"] in ("scan_destination_all", "start_single")
-            qty = move_line.reserved_uom_qty
+            qty = move_line.quantity
             if response["next_state"] == "scan_destination_all":
                 response = service.set_destination_all(
                     pack_location.id, out_location.barcode
@@ -305,12 +305,12 @@ class LocationContentTransferMixCase(LocationContentTransferCommonCase):
         pack_first_pallet = pack_move_a.move_line_ids.filtered(
             lambda x: not x.shopfloor_user_id and x.location_id == dest_location1
         )
-        self.assertEqual(pack_first_pallet.reserved_uom_qty, 6)
+        self.assertEqual(pack_first_pallet.quantity, 6)
         self.assertEqual(pack_first_pallet.qty_done, 0)
         pack_second_pallet = pack_move_a.move_line_ids.filtered(
             lambda x: not x.shopfloor_user_id and x.location_id == dest_location2
         )
-        self.assertEqual(pack_second_pallet.reserved_uom_qty, 4)
+        self.assertEqual(pack_second_pallet.quantity, 4)
         self.assertEqual(pack_second_pallet.qty_done, 0)
         # Operator-2 with the "location content transfer" scenario scan
         # the location where the first pallet is.
@@ -345,7 +345,7 @@ class LocationContentTransferMixCase(LocationContentTransferCommonCase):
             message=self.service.msg_store.recovered_previous_session(),
         )
         # Operator-2 finishes its operation regarding the first pallet
-        qty = pack_first_pallet.reserved_uom_qty
+        qty = pack_first_pallet.quantity
         response = self.service.set_destination_all(
             pack_first_pallet.location_id.id, pack_first_pallet.location_dest_id.barcode
         )
@@ -446,7 +446,7 @@ class LocationContentTransferMixCase(LocationContentTransferCommonCase):
         pack_first_pallet = pack_move_a1.move_line_ids.filtered(
             lambda x: not x.shopfloor_user_id and x.location_id == dest_location1
         )
-        self.assertEqual(pack_first_pallet.reserved_uom_qty, 6)
+        self.assertEqual(pack_first_pallet.quantity, 6)
         self.assertEqual(pack_first_pallet.qty_done, 0)
         # Operator-2 with the "location content transfer" scenario scan
         # the location where the first pallet is.
@@ -472,7 +472,7 @@ class LocationContentTransferMixCase(LocationContentTransferCommonCase):
         pack_second_pallet = pack_move_a2.move_line_ids.filtered(
             lambda x: not x.shopfloor_user_id and x.location_id == dest_location2
         )
-        self.assertEqual(pack_second_pallet.reserved_uom_qty, 4)
+        self.assertEqual(pack_second_pallet.quantity, 4)
         self.assertEqual(pack_second_pallet.qty_done, 0)
         # The last action has updated the pack operation (new move line) in the
         # transfer previously processed by Operator-2.
@@ -481,7 +481,7 @@ class LocationContentTransferMixCase(LocationContentTransferCommonCase):
         # Operator-2 finishes its operation regarding the first pallet without
         # any trouble as the processed move line has been put in its own
         # move+transfer
-        qty = pack_first_pallet.reserved_uom_qty
+        qty = pack_first_pallet.quantity
         response = self.service.set_destination_all(
             pack_first_pallet.location_id.id, pack_first_pallet.location_dest_id.barcode
         )