odoo-addon-shopfloor 18.0.0.1.2__py3-none-any.whl → 18.0.0.3.0__py3-none-any.whl

odoo/addons/shopfloor/tests/test_checkout_select_line.py

@@ -109,7 +109,7 @@ class CheckoutSelectLineCase(CheckoutCommonCase, CheckoutSelectPackageMixin):
     def test_select_line_all_lines_done(self):
         # set all lines as done
         self.picking.move_line_ids.write(
-            {"qty_done": 10.0, "shopfloor_checkout_done": True}
+            {"qty_picked": 10.0, "shopfloor_checkout_done": True}
         )
         response = self.service.dispatch(
             "select_line",

odoo/addons/shopfloor/tests/test_checkout_select_package_base.py

@@ -42,9 +42,11 @@ class CheckoutSelectPackageMixin:
             sorted(selected_lines.ids), sorted([line.id for line in lines_quantities])
         )
         for line, quantity in lines_quantities.items():
-            self.assertEqual(line.qty_done, quantity)
+            self.assertEqual(line.qty_picked, quantity)
         for line in deselected_lines:
-            self.assertEqual(line.qty_done, 0, "Lines deselected must have no qty done")
+            self.assertEqual(
+                line.qty_picked, 0, "Lines deselected must have no qty done"
+            )
         self._assert_selected_response(
             response, selected_lines, message=message, packing_info=packing_info
         )
@@ -57,11 +59,11 @@ class CheckoutSelectPackageMixin:
         unselected_lines = picking.move_line_ids - selected_lines
         for line in selected_lines - related_lines:
             self.assertEqual(
-                line.qty_done,
+                line.qty_picked,
                 line.quantity,
                 "Scanned lines must have their qty done set to the reserved quantity",
             )
         for line in unselected_lines + related_lines:
-            self.assertEqual(line.qty_done, 0)
+            self.assertEqual(line.qty_picked, 0)
         package_lines = selected_lines + related_lines
         self._assert_selected_response(response, package_lines, message=message, **kw)

odoo/addons/shopfloor/tests/test_checkout_set_qty.py

@@ -24,15 +24,15 @@ class CheckoutSetQtyCommonCase(CheckoutCommonCase, CheckoutSelectPackageMixin):
     def setUp(self):
         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
+        # expect the lines for product a and b to have their picked qty set to
         # 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.quantity for line in self.selected_lines)
+            all(line.qty_picked == line.quantity for line in self.selected_lines)
         )
-        self.assertTrue(all(line.qty_done == 0 for line in self.deselected_lines))
+        self.assertTrue(all(not line.picked for line in self.deselected_lines))
 
 
 class CheckoutResetLineQtyCase(CheckoutSetQtyCommonCase):
@@ -83,7 +83,7 @@ class CheckoutSetLineQtyCase(CheckoutSetQtyCommonCase):
     def test_set_line_qty_ok(self):
         selected_lines = self.moves_pack1.move_line_ids
         # do as if the user removed the qties of the 2 selected lines
-        selected_lines.qty_done = 0
+        selected_lines.qty_picked = 0
         line_to_set = selected_lines[0]
         line_no_qty = selected_lines[1]
         # we want to check that when we give the package id, we get
@@ -96,8 +96,9 @@ class CheckoutSetLineQtyCase(CheckoutSetQtyCommonCase):
                 "move_line_id": line_to_set.id,
             },
         )
-        self.assertEqual(line_to_set.qty_done, line_to_set.quantity)
-        self.assertEqual(line_no_qty.qty_done, 0)
+        self.assertEqual(line_to_set.qty_picked, line_to_set.quantity)
+        self.assertEqual(line_no_qty.qty_picked, 0)
+        self.assertFalse(line_no_qty.picked)
         self._assert_selected_qties(
             response,
             selected_lines,
@@ -145,8 +146,8 @@ class CheckoutSetCustomQtyCase(CheckoutSetQtyCommonCase):
                 "qty_done": new_qty,
             },
         )
-        self.assertEqual(line_to_change.qty_done, new_qty)
-        self.assertEqual(line_keep_qty.qty_done, line_keep_qty.quantity)
+        self.assertEqual(line_to_change.qty_picked, new_qty)
+        self.assertEqual(line_keep_qty.qty_picked, line_keep_qty.quantity)
         self._assert_selected_qties(
             response,
             selected_lines,
@@ -180,7 +181,7 @@ class CheckoutSetCustomQtyCase(CheckoutSetQtyCommonCase):
         selected_lines = self.moves_pack1.move_line_ids
         line1 = selected_lines[0]
         # modify so we can check that a too high quantity set the max
-        line1.qty_done = 1
+        line1.qty_picked = 1
         line2 = selected_lines[1]
         response = self.service.dispatch(
             "set_custom_qty",
@@ -240,8 +241,8 @@ class CheckoutSetCustomQtyCase(CheckoutSetQtyCommonCase):
                 "qty_done": new_qty,
             },
         )
-        self.assertEqual(line_to_change.qty_done, new_qty)
-        self.assertEqual(line_keep_qty.qty_done, line_keep_qty.quantity)
+        self.assertEqual(line_to_change.qty_picked, new_qty)
+        self.assertEqual(line_keep_qty.qty_picked, line_keep_qty.quantity)
         new_lines = [
             x for x in self.moves_pack1.move_line_ids if x not in selected_lines
         ]

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.quantity
+            ml.picked = True
             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.quantity
+            ml.picked = True
             ml.shopfloor_checkout_done = True
         response = self.service.dispatch(
             "summary", params={"picking_id": self.picking.id}

odoo/addons/shopfloor/tests/test_delivery_base.py

@@ -129,7 +129,7 @@ class DeliveryCommonCase(CommonCase):
             message=message,
         )
 
-    def assert_qty_done(self, move_lines, qties=None):
+    def assert_qty_picked(self, move_lines, qties=None):
         """Ensure that the quantities done are the expected ones.
 
         If `qties` is not defined, the expected qties are `product_uom_qty`
@@ -140,9 +140,9 @@ class DeliveryCommonCase(CommonCase):
             assert len(move_lines) == len(qties), "'qties' doesn't match 'move_lines'"
             expected_qties = []
             for qty in qties:
-                expected_qties.append({"qty_done": qty})
+                expected_qties.append({"qty_picked": qty})
         else:
-            expected_qties = [{"qty_done": line.quantity} for line in move_lines]
+            expected_qties = [{"qty_picked": 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

@@ -44,8 +44,7 @@ class DeliveryDoneCase(DeliveryCommonCase):
     def test_done_all_qty_done(self):
         # 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.quantity
+        self.picking.move_line_ids.picked = True
         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,14 +72,14 @@ 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.quantity)
+        self.assertTrue(move_line.qty_picked == move_line.quantity)
         # Reset it, no related move lines are "done"
         response = self.service.dispatch(
             "reset_qty_done_line",
             params={"move_line_id": move_line.id, "picking_id": self.picking.id},
         )
         self.assert_response_deliver(response, picking=self.picking)
-        self.assertFalse(move_line.qty_done)
+        self.assertFalse(move_line.qty_picked)
 
     def test_reset_qty_done_line_with_package(self):
         move_line = self.pack1_moves[0].mapped("move_line_ids")

odoo/addons/shopfloor/tests/test_delivery_reset_qty_done_pack.py

@@ -73,14 +73,14 @@ class DeliveryResetQtyDonePackCase(DeliveryCommonCase):
             "set_qty_done_pack",
             params={"package_id": package.id, "picking_id": self.picking.id},
         )
-        self.assertTrue(all(ml.qty_done == ml.quantity for ml in move_lines))
+        self.assertTrue(all(ml.qty_picked == ml.quantity for ml in move_lines))
         # Reset it, no related move lines are "done"
         response = self.service.dispatch(
             "reset_qty_done_pack",
             params={"package_id": package.id, "picking_id": self.picking.id},
         )
         self.assert_response_deliver(response, picking=self.picking)
-        self.assertFalse(any(ml.qty_done > 0 for ml in move_lines))
+        self.assertFalse(any(ml.picked for ml in move_lines))
 
     def test_reset_qty_done_pack_picking_status(self):
         package1 = self.pack1_moves.mapped("move_line_ids").mapped("package_id")

odoo/addons/shopfloor/tests/test_delivery_scan_deliver.py

@@ -139,7 +139,7 @@ class DeliveryScanDeliverCase(DeliveryCommonCase):
 
     def _test_scan_set_done_ok(self, move_lines, barcode, qties=None):
         response = self.service.dispatch("scan_deliver", params={"barcode": barcode})
-        self.assert_qty_done(move_lines, qties)
+        self.assert_qty_picked(move_lines, qties)
         picking = move_lines.move_id.picking_id
         if picking.state == "done":
             self.assert_response_deliver(
@@ -189,7 +189,7 @@ class DeliveryScanDeliverCase(DeliveryCommonCase):
 
     def test_scan_deliver_scan_product_not_in_package(self):
         """Check scanning product increment quantity done by one."""
-        for qty_done in range(1, 3):
+        for qty_picked in range(1, 3):
             response = self.service.dispatch(
                 "scan_deliver",
                 params={
@@ -197,7 +197,7 @@ class DeliveryScanDeliverCase(DeliveryCommonCase):
                     "picking_id": self.picking.id,
                 },
             )
-            self.assertEqual(self.raw_move.move_line_ids.qty_done, qty_done)
+            self.assertEqual(self.raw_move.move_line_ids.qty_picked, qty_picked)
 
         self.assert_response_deliver(
             response,
@@ -306,7 +306,7 @@ class DeliveryScanDeliverCase(DeliveryCommonCase):
             response,
             picking=self.picking,
         )
-        self.assertEqual(line.qty_done, 1)
+        self.assertEqual(line.qty_picked, 1)
         self.assertEqual(line.state, "assigned")
         for _ in range(int(line.quantity) - 1):
             self.service.dispatch(
@@ -316,7 +316,7 @@ class DeliveryScanDeliverCase(DeliveryCommonCase):
                     "picking_id": self.picking.id,
                 },
             )
-        self.assertEqual(line.qty_done, self.raw_lot_move.product_uom_qty)
+        self.assertEqual(line.qty_picked, self.raw_lot_move.product_uom_qty)
 
     def test_scan_deliver_scan_lot_with_prepackaged_product(self):
         """Check scanning a lot process only one piece/unit of this lot.
@@ -330,7 +330,7 @@ class DeliveryScanDeliverCase(DeliveryCommonCase):
         self.assert_response_deliver(
             response, message=self.service.msg_store.transfer_complete(self.picking)
         )
-        self.assertEqual(line.qty_done, 1)
+        self.assertEqual(line.qty_picked, 1)
         self.assertEqual(line.move_id.state, "done")
         self.assertEqual(self.picking.state, "done")
         self.assertTrue(self.picking.backorder_ids)
@@ -364,7 +364,7 @@ class DeliveryScanDeliverCase(DeliveryCommonCase):
             "scan_deliver", params={"barcode": self.packaging.barcode}
         )
         self.assert_response_deliver(response, picking=self.picking)
-        self.assertEqual(line.qty_done, self.packaging.qty)
+        self.assertEqual(line.qty_picked, self.packaging.qty)
 
     def test_scan_deliver_scan_product_packaging_with_prepackaged_product(self):
         """Check scanning a product packaging use the packaging quantity.
@@ -383,7 +383,7 @@ class DeliveryScanDeliverCase(DeliveryCommonCase):
         self.assert_response_deliver(
             response, message=self.service.msg_store.transfer_complete(self.picking)
         )
-        self.assertEqual(line.qty_done, self.packaging.qty)
+        self.assertEqual(line.qty_picked, self.packaging.qty)
 
     def test_scan_deliver_scan_product_packaging_partial_qty(self):
         # Scan a product packaging with a smaller qty than the move line
@@ -398,7 +398,7 @@ class DeliveryScanDeliverCase(DeliveryCommonCase):
             "scan_deliver", params={"barcode": self.packaging.barcode}
         )
         self.assert_response_deliver(response, picking=self.picking)
-        self.assertEqual(line.qty_done, self.packaging.qty)
+        self.assertEqual(line.qty_picked, self.packaging.qty)
         self.assertTrue(line.move_id.product_qty > self.packaging.qty)
         # Process the remaining qties, still by scanning the packaging
         response = self.service.dispatch(
@@ -428,7 +428,7 @@ class DeliveryScanDeliverCase(DeliveryCommonCase):
             response,
             message=self.service.msg_store.transfer_complete(self.picking),
         )
-        self.assertEqual(line.qty_done, self.packaging.qty)
+        self.assertEqual(line.qty_picked, self.packaging.qty)
         self.assertEqual(line.move_id.product_qty, self.packaging.qty)
         self.assertEqual(line.move_id.state, "done")
         self.assertTrue(self.picking.backorder_ids)
@@ -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.quantity
+        picking.move_line_ids.picked = True
         picking._action_done()
         response = self.service.dispatch(
             "scan_deliver", params={"barcode": picking.name}

odoo/addons/shopfloor/tests/test_delivery_set_qty_done_line.py

@@ -31,7 +31,7 @@ class DeliverySetQtyDoneLineCase(DeliveryCommonCase):
             "set_qty_done_line",
             params={"move_line_id": move_line.id, "picking_id": self.picking.id},
         )
-        self.assert_qty_done(move_line)
+        self.assert_qty_picked(move_line)
         self.assert_response_deliver(response, picking=self.picking)
 
     def test_set_qty_done_line_picking_not_found(self):

odoo/addons/shopfloor/tests/test_delivery_set_qty_done_pack.py

@@ -44,7 +44,7 @@ class DeliverySetQtyDonePackCase(DeliveryCommonCase):
             "set_qty_done_pack",
             params={"package_id": package.id, "picking_id": self.picking.id},
         )
-        self.assert_qty_done(move_lines, qties=qties)
+        self.assert_qty_picked(move_lines, qties=qties)
         self.assert_response_deliver(response, picking=self.picking)
 
     def test_set_qty_done_pack_picking_not_found(self):

odoo/addons/shopfloor/tests/test_zone_picking_select_line.py

@@ -160,7 +160,7 @@ class ZonePickingSelectLineCase(ZonePickingCommonCase):
             qty_done=10.0,
         )
         # first line done
-        move_line.qty_done = move_line.quantity
+        move_line._pick_qty(move_line.quantity)
         # get the next one
         response = self.service.dispatch(
             "scan_source",
@@ -223,7 +223,10 @@ class ZonePickingSelectLineCase(ZonePickingCommonCase):
             qty_done=10.0,
         )
 
-    def test_scan_source_barcode_package_not_found(self):
+    # FIXME: this case shouldn't be possible anymore
+    # because a check on stock.quant.package.write in odoo core
+    # prevents to update a location on a package w/o move lines.
+    def FIXME_test_scan_source_barcode_package_not_found(self):
         """Scan source: scanned package has no related move line,
         next step 'select_line' expected.
         """

odoo/addons/shopfloor/tests/test_zone_picking_set_line_destination.py

@@ -165,7 +165,7 @@ class ZonePickingSetLineDestinationCase(ZonePickingCommonCase):
         # Check picking data
         moves_after = self.picking1.move_ids
         self.assertEqual(moves_before, moves_after)
-        self.assertEqual(move_line.qty_done, 10)
+        self.assertEqual(move_line.qty_picked, 10)
         # Check response
         move_lines = self.service._find_location_move_lines()
         move_lines = move_lines.sorted(lambda x: x.move_id.priority, reverse=True)
@@ -273,11 +273,12 @@ class ZonePickingSetLineDestinationCase(ZonePickingCommonCase):
         self.assertEqual(len(move_after), 1)
         self.assertEqual(move_line.move_id.product_uom_qty, 6)
         self.assertEqual(move_line.move_id.state, "done")
-        self.assertEqual(move_line.move_id.move_line_ids.quantity, 0)
+        self.assertEqual(move_line.quantity, 6)
+        self.assertEqual(move_line.qty_picked, 6)
         self.assertEqual(move_after.product_uom_qty, 4)
         self.assertEqual(move_after.state, "assigned")
         self.assertEqual(move_after.move_line_ids.quantity, 4)
-        self.assertEqual(move_line.qty_done, 6)
+        self.assertEqual(move_after.move_line_ids.qty_picked, 0)
         self.assertNotEqual(move_line.move_id, other_move_line.move_id)
         # Check response
         move_lines = self.service._find_location_move_lines()
@@ -407,7 +408,7 @@ class ZonePickingSetLineDestinationCase(ZonePickingCommonCase):
                 {
                     "result_package_id": self.free_package.id,
                     "quantity": 10,
-                    "qty_done": 10,
+                    "qty_picked": 10,
                     "shopfloor_user_id": self.env.user.id,
                 },
             ],
@@ -465,7 +466,7 @@ class ZonePickingSetLineDestinationCase(ZonePickingCommonCase):
                 {
                     "result_package_id": self.free_package.id,
                     "quantity": 6,
-                    "qty_done": 6,
+                    "qty_picked": 6,
                     "shopfloor_user_id": self.env.user.id,
                 },
             ],
@@ -476,7 +477,7 @@ class ZonePickingSetLineDestinationCase(ZonePickingCommonCase):
                 {
                     "result_package_id": new_move_line.package_id.id,  # Unchanged
                     "quantity": 4,
-                    "qty_done": 0,
+                    "qty_picked": 0,
                     "shopfloor_user_id": False,
                 },
             ],

odoo/addons/shopfloor/tests/test_zone_picking_set_line_destination_pick_pack.py

@@ -68,7 +68,7 @@ class ZonePickingSetLineDestinationPickPackCase(ZonePickingCommonCase):
         move_line = self.picking1.move_line_ids
         move_line.location_dest_id = self.shelf1
         quantity_reserved = move_line.quantity
-        previous_qty_done = move_line.qty_done
+        previous_qty_done = move_line.qty_picked
         # Confirm the destination with the right destination
         response = self.service.dispatch(
             "set_destination",
@@ -78,7 +78,7 @@ class ZonePickingSetLineDestinationPickPackCase(ZonePickingCommonCase):
                 "quantity": quantity_reserved,
             },
         )
-        self.assertEqual(move_line.qty_done, previous_qty_done)
+        self.assertEqual(move_line.qty_picked, previous_qty_done)
         self.assert_response_set_line_destination(
             response,
             zone_location,
@@ -198,6 +198,7 @@ class ZonePickingSetLineDestinationPickPackCase(ZonePickingCommonCase):
                 {
                     "name": "TEST DEFAULT",
                     "package_type_id": self.carrier.test_default_packaging_id.id,
+                    "product_id": self.free_product.id,
                 }
             )
         )
@@ -220,7 +221,7 @@ class ZonePickingSetLineDestinationPickPackCase(ZonePickingCommonCase):
                 {
                     "result_package_id": self.free_package.id,
                     "quantity": 10,
-                    "qty_done": 10,
+                    "qty_picked": 10,
                     "shopfloor_user_id": self.env.user.id,
                 },
             ],

odoo/addons/shopfloor/tests/test_zone_picking_unload_all.py

@@ -208,10 +208,10 @@ class ZonePickingUnloadAllCase(ZonePickingCommonCase):
         #   picking validated
         self.assertEqual(move_line_g.state, "done")
         self.assertEqual(move_line_g.picking_id.state, "done")
-        self.assertEqual(move_line_g.qty_done, 6)
+        self.assertEqual(move_line_g.qty_picked, 6)
         self.assertEqual(move_line_h.state, "done")
         self.assertEqual(move_line_h.picking_id.state, "done")
-        self.assertEqual(move_line_h.qty_done, 3)
+        self.assertEqual(move_line_h.qty_picked, 3)
         #   current picking (backorder)
         backorder = (move_line_g | move_line_h).picking_id.backorder_id
         self.assertEqual(backorder, self.picking6)

odoo/addons/shopfloor/tests/test_zone_picking_unload_single.py

@@ -44,7 +44,7 @@ class ZonePickingUnloadSingleCase(ZonePickingCommonCase):
         # wrong package ID, and there is no more move line to unload from the buffer
         # => get back on 'select_line' screen
         move_line.write(
-            {"qty_done": 0, "shopfloor_user_id": False, "result_package_id": False}
+            {"qty_picked": 0, "shopfloor_user_id": False, "result_package_id": False}
         )
         response = self.service.dispatch(
             "unload_scan_pack",

{odoo_addon_shopfloor-18.0.0.1.2.dist-info → odoo_addon_shopfloor-18.0.0.3.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: odoo-addon-shopfloor
-Version: 18.0.0.1.2
+Version: 18.0.0.3.0
 Requires-Python: >=3.10
 Requires-Dist: odoo-addon-base_rest==18.0.*
 Requires-Dist: odoo-addon-jsonifier==18.0.*
@@ -42,7 +42,7 @@ Shopfloor
    !! This file is generated by oca-gen-addon-readme !!
    !! changes will be overwritten.                   !!
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-   !! source digest: sha256:01ad1a242b0c8a3b6ab8593cd6dedb31c5b6dd941b58e9af751833dad9cc69f3
+   !! source digest: sha256:039c0e1f10bbf63b4fd82fea958772168aea3e98a4fb38955960a74f946bd07d
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
 .. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png