odoo-addon-shopfloor 16.0.1.0.0.25__py3-none-any.whl → 16.0.2.1.0.1__py3-none-any.whl

odoo/addons/shopfloor/tests/test_actions_data.py

@@ -53,8 +53,8 @@ class ActionsDataCase(ActionsDataCaseBase):
             "name": location.name,
             "barcode": location.name,
             "operation_progress": {
-                "done": 2.0,
-                "to_do": 210.0,
+                "done": 0.0,
+                "to_do": 228.0,
             },
         }
         self.assertDictEqual(data, expected)
@@ -86,13 +86,35 @@ class ActionsDataCase(ActionsDataCaseBase):
         expected = {
             "id": package.id,
             "name": package.name,
-            "move_line_count": 1,
             "packaging": self._expected_packaging(package.product_packaging_id),
             "storage_type": self._expected_storage_type(package.package_type_id),
+            "total_quantity": 10.0,
             "weight": 20.0,
         }
         self.assertDictEqual(data, expected)
 
+    def test_data_package_with_move_line_count(self):
+        package = self.move_a.move_line_ids.package_id
+        package.product_packaging_id = self.packaging.id
+        package.package_type_id = self.storage_type_pallet
+        data = self.data.package(
+            package,
+            picking=self.picking,
+            with_packaging=True,
+            with_package_move_line_count=True,
+        )
+        self.assert_schema(self.schema.package(with_packaging=True), data)
+        expected = {
+            "id": package.id,
+            "name": package.name,
+            "move_line_count": 2,
+            "packaging": self._expected_packaging(package.product_packaging_id),
+            "storage_type": self._expected_storage_type(package.package_type_id),
+            "weight": 20.0,
+            "total_quantity": sum(package.quant_ids.mapped("quantity")),
+        }
+        self.assertDictEqual(data, expected)
+
     def test_data_package_level(self):
         package_level = self.picking.package_level_ids[0]
         data = self.data.package_level(package_level)
@@ -132,6 +154,7 @@ class ActionsDataCase(ActionsDataCaseBase):
             "partner": {"id": self.customer.id, "name": self.customer.name},
             "carrier": {"id": carrier.id, "name": carrier.name},
             "ship_carrier": None,
+            "priority": "0",
         }
         self.assertEqual(data.pop("scheduled_date").split("T")[0], "2020-08-03")
         self.assertDictEqual(data, expected)
@@ -156,6 +179,7 @@ class ActionsDataCase(ActionsDataCaseBase):
             "carrier": {"id": carrier.id, "name": carrier.name},
             "ship_carrier": None,
             "progress": 0.0,
+            "priority": "0",
         }
         self.assertEqual(data.pop("scheduled_date").split("T")[0], "2020-08-03")
         self.assertDictEqual(data, expected)
@@ -203,16 +227,18 @@ class ActionsDataCase(ActionsDataCaseBase):
             "package_src": {
                 "id": move_line.package_id.id,
                 "name": move_line.package_id.name,
-                "move_line_count": 0,
                 "weight": 20.0,
                 "storage_type": None,
+                "total_quantity": sum(
+                    move_line.package_id.quant_ids.mapped("quantity")
+                ),
             },
             "package_dest": {
                 "id": result_package.id,
                 "name": result_package.name,
-                "move_line_count": 1,
                 "weight": 6.0,
                 "storage_type": None,
+                "total_quantity": sum(result_package.quant_ids.mapped("quantity")),
             },
             "location_src": self._expected_location(move_line.location_id),
             "location_dest": self._expected_location(move_line.location_dest_id),
@@ -220,6 +246,10 @@ class ActionsDataCase(ActionsDataCaseBase):
             "progress": 30.0,
         }
         self.assertDictEqual(data, expected)
+        data = self.data.move_line(move_line, with_package_move_line_count=True)
+        expected["package_src"]["move_line_count"] = 1
+        expected["package_dest"]["move_line_count"] = 1
+        self.assertDictEqual(data, expected)
 
     def test_data_move_line_lot(self):
         move_line = self.move_b.move_line_ids
@@ -264,16 +294,20 @@ class ActionsDataCase(ActionsDataCaseBase):
             "package_src": {
                 "id": move_line.package_id.id,
                 "name": move_line.package_id.name,
-                "move_line_count": 1,
                 "weight": 30,
                 "storage_type": None,
+                "total_quantity": sum(
+                    move_line.package_id.quant_ids.mapped("quantity")
+                ),
             },
             "package_dest": {
                 "id": move_line.result_package_id.id,
                 "name": move_line.result_package_id.name,
-                "move_line_count": 1,
                 "weight": 0,
                 "storage_type": None,
+                "total_quantity": sum(
+                    move_line.result_package_id.quant_ids.mapped("quantity")
+                ),
             },
             "location_src": self._expected_location(move_line.location_id),
             "location_dest": self._expected_location(move_line.location_dest_id),
@@ -281,6 +315,11 @@ class ActionsDataCase(ActionsDataCaseBase):
             "progress": 0.0,
         }
         self.assertDictEqual(data, expected)
+        data = self.data.move_line(move_line, with_package_move_line_count=True)
+        self.assert_schema(self.schema.move_line(), data)
+        expected["package_src"]["move_line_count"] = 2
+        expected["package_dest"]["move_line_count"] = 2
+        self.assertDictEqual(data, expected)
 
     def test_data_move_line_raw(self):
         move_line = self.move_d.move_line_ids

odoo/addons/shopfloor/tests/test_actions_data_base.py

@@ -176,6 +176,7 @@ class ActionsDataCaseBase(CommonCase, ActionsDataTestMixin):
             "name": record.name,
             "weight": record.pack_weight or record.estimated_pack_weight_kg,
             "storage_type": None,
+            "total_quantity": sum(record.quant_ids.mapped("quantity")),
         }
         data.update(kw)
         return data
@@ -242,3 +243,17 @@ class ActionsDataDetailCaseBase(ActionsDataCaseBase):
                 }
             )
         return dict(**self._expected_product(record), **detail)
+
+    def _expected_packaging_detail(self, record, **kw):
+        return dict(
+            **self._expected_packaging(record),
+            **{
+                "length": record.packaging_length,
+                "width": record.width,
+                "height": record.height,
+                "max_weight": record.package_type_id.max_weight,
+                "length_uom": record.length_uom_name,
+                "weight_uom": record.weight_uom_name,
+                "barcode": record.barcode,
+            }
+        )

odoo/addons/shopfloor/tests/test_actions_data_detail.py

@@ -33,9 +33,10 @@ class TestActionsDataDetailCase(ActionsDataDetailCaseBase):
         )
 
     def test_data_packaging(self):
-        data = self.data_detail.packaging(self.packaging)
-        self.assert_schema(self.schema_detail.packaging(), data)
-        self.assertDictEqual(data, self._expected_packaging(self.packaging))
+        self.packaging.barcode = "barcode"
+        data = self.data_detail.packaging_detail(self.packaging)
+        self.assert_schema(self.schema_detail.packaging_detail(), data)
+        self.assertDictEqual(data, self._expected_packaging_detail(self.packaging))
 
     def test_data_lot(self):
         lot = self.env["stock.lot"].create(
@@ -81,7 +82,6 @@ class TestActionsDataDetailCase(ActionsDataDetailCaseBase):
                 "name": package.location_id.display_name,
             },
             "name": package.name,
-            "move_line_count": 1,
             "packaging": self.data_detail.packaging(package.product_packaging_id),
             "weight": 20.0,
             "pickings": self.data_detail.pickings(pickings),
@@ -90,8 +90,14 @@ class TestActionsDataDetailCase(ActionsDataDetailCaseBase):
                 "id": self.storage_type_pallet.id,
                 "name": self.storage_type_pallet.name,
             },
+            "total_quantity": sum(package.quant_ids.mapped("quantity")),
         }
         self.assertDictEqual(data, expected)
+        data = self.data_detail.package_detail(
+            package, picking=self.picking, with_package_move_line_count=True
+        )
+        expected.update({"move_line_count": 2})
+        self.assertDictEqual(data, expected)
 
     def test_data_picking(self):
         picking = self.picking
@@ -186,16 +192,20 @@ class TestActionsDataDetailCase(ActionsDataDetailCaseBase):
             "package_src": {
                 "id": move_line.package_id.id,
                 "name": move_line.package_id.name,
-                "move_line_count": 0,
                 "weight": 20.0,
                 "storage_type": None,
+                "total_quantity": sum(
+                    move_line.package_id.quant_ids.mapped("quantity")
+                ),
             },
             "package_dest": {
                 "id": result_package.id,
                 "name": result_package.name,
-                "move_line_count": 1,
                 "weight": 6.0,
                 "storage_type": None,
+                "total_quantity": sum(
+                    move_line.result_package_id.quant_ids.mapped("quantity")
+                ),
             },
             "location_src": self._expected_location(move_line.location_id),
             "location_dest": self._expected_location(move_line.location_dest_id),
@@ -203,6 +213,10 @@ class TestActionsDataDetailCase(ActionsDataDetailCaseBase):
             "progress": 30.0,
         }
         self.assertDictEqual(data, expected)
+        data = self.data_detail.move_line(move_line, with_package_move_line_count=True)
+        expected["package_src"]["move_line_count"] = 1
+        expected["package_dest"]["move_line_count"] = 1
+        self.assertDictEqual(data, expected)
 
     def test_data_move_line_lot(self):
         move_line = self.move_b.move_line_ids
@@ -248,16 +262,20 @@ class TestActionsDataDetailCase(ActionsDataDetailCaseBase):
             "package_src": {
                 "id": move_line.package_id.id,
                 "name": move_line.package_id.name,
-                "move_line_count": 1,
                 "weight": 30.0,
                 "storage_type": None,
+                "total_quantity": sum(
+                    move_line.package_id.quant_ids.mapped("quantity")
+                ),
             },
             "package_dest": {
                 "id": move_line.result_package_id.id,
                 "name": move_line.result_package_id.name,
-                "move_line_count": 1,
                 "weight": 0.0,
                 "storage_type": None,
+                "total_quantity": sum(
+                    move_line.result_package_id.quant_ids.mapped("quantity")
+                ),
             },
             "location_src": self._expected_location(move_line.location_id),
             "location_dest": self._expected_location(move_line.location_dest_id),
@@ -265,6 +283,10 @@ class TestActionsDataDetailCase(ActionsDataDetailCaseBase):
             "progress": 0.0,
         }
         self.assertDictEqual(data, expected)
+        data = self.data_detail.move_line(move_line, with_package_move_line_count=True)
+        expected["package_src"]["move_line_count"] = 2
+        expected["package_dest"]["move_line_count"] = 2
+        self.assertDictEqual(data, expected)
 
     def test_data_move_line_raw(self):
         move_line = self.move_d.move_line_ids

odoo/addons/shopfloor/tests/test_actions_packaging.py

@@ -0,0 +1,43 @@
+# Copyright 2023 Camptocamp SA (http://www.camptocamp.com)
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
+
+# pylint: disable=missing-return
+
+
+from .common import CommonCase
+
+
+class TestActionsPackaging(CommonCase):
+    """Tests covering methods to work on product packaging."""
+
+    @classmethod
+    def setUpClass(cls):
+        super().setUpClass()
+        with cls.work_on_actions(cls) as work:
+            cls.packaging = work.component(usage="packaging")
+        cls.picking = cls._create_picking(
+            lines=[(cls.product_a, 10), (cls.product_b, 10)], confirm=True
+        )
+        cls.move0 = cls.picking.move_ids[0]
+        cls.move1 = cls.picking.move_ids[1]
+        cls._fill_stock_for_moves(
+            cls.picking.move_ids, in_package=True, same_package=True
+        )
+        cls.picking.action_assign()
+        cls.package1 = cls.move0.move_line_ids.package_id
+
+    @classmethod
+    def setUpClassVars(cls):
+        super().setUpClassVars()
+        cls.wh = cls.env.ref("stock.warehouse0")
+        cls.picking_type = cls.wh.out_type_id
+
+    def test_package_is_complete_mix_pack(self):
+        self.assertTrue(self.packaging.is_complete_mix_pack(self.package1))
+
+    def test_package_partially_reserved(self):
+        # Package has 2 products from pick 1 reserved
+        pick2 = self._create_picking(lines=[(self.product_c, 10)], confirm=True)
+        # But adding 1 more product from pick 2 that is not yet reserved
+        self._fill_stock_for_moves(pick2.move_ids, in_package=self.package1)
+        self.assertFalse(self.packaging.is_complete_mix_pack(self.package1))

odoo/addons/shopfloor/tests/test_checkout_base.py

@@ -35,8 +35,15 @@ class CheckoutCommonCase(CommonCase):
             "checkout", menu=self.menu, profile=self.profile
         )
 
-    def _stock_picking_data(self, picking, **kw):
-        return self.service._data_for_stock_picking(picking, **kw)
+    def _stock_picking_data(
+        self, picking, done=False, with_lines=True, with_location=False, **kw
+    ):
+        return self.service._data_for_stock_picking(
+            picking, done, with_lines, with_location, **kw
+        )
+
+    def _stock_locations_data(self, locations, **kw):
+        return self.service._data_for_locations(locations, **kw)
 
     # we test the methods that structure data in test_actions_data.py
     def _picking_summary_data(self, picking):
@@ -45,8 +52,10 @@ class CheckoutCommonCase(CommonCase):
     def _move_line_data(self, move_line):
         return self.data.move_line(move_line)
 
-    def _package_data(self, package, picking):
-        return self.data.package(package, picking=picking, with_packaging=True)
+    def _package_data(self, package, picking, **kwargs):
+        return self.data.package(
+            package, picking=picking, with_packaging=True, **kwargs
+        )
 
     def _packaging_data(self, packaging):
         return self.data.delivery_packaging(packaging)
@@ -56,7 +65,7 @@ class CheckoutCommonCase(CommonCase):
             "picking": self._stock_picking_data(picking),
             "group_lines_by_location": True,
             "show_oneline_package_content": False,
-            "need_confirm_pack_all": False,
+            "need_confirm_pack_all": "",
         }
         data.update(kw)
         return data
@@ -72,6 +81,7 @@ class CheckoutCommonCase(CommonCase):
                 "picking": self._picking_summary_data(picking),
                 "packing_info": "",
                 "no_package_enabled": True,
+                "package_allowed": True,
             },
             message={
                 "message_type": "warning",

odoo/addons/shopfloor/tests/test_checkout_done.py

@@ -22,6 +22,7 @@ class CheckoutDoneCase(CheckoutCommonCase):
                 "message_type": "success",
                 "body": "Transfer {} done".format(picking.name),
             },
+            data={"restrict_scan_first": False},
         )
 
 
@@ -39,6 +40,13 @@ class CheckoutDonePartialCase(CheckoutCommonCase):
         cls.line1.write({"qty_done": 10, "shopfloor_checkout_done": True})
         cls.line2.write({"qty_done": 2, "shopfloor_checkout_done": True})
 
+        cls.dest_location = picking.location_dest_id
+        cls.child_location = (
+            cls.env["stock.location"]
+            .sudo()
+            .create({"name": "Child Location", "location_id": cls.dest_location.id})
+        )
+
     def test_done_partial(self):
         # line is done
         response = self.service.dispatch("done", params={"picking_id": self.picking.id})
@@ -57,17 +65,43 @@ class CheckoutDonePartialCase(CheckoutCommonCase):
         response = self.service.dispatch(
             "done", params={"picking_id": self.picking.id, "confirmation": True}
         )
-        # as they are all the lines that relate to the picking, they didn't have
-        # been extracted in a separate transfer. An usual backorder has been
-        # created for the unprocessed qty.
+
         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.assert_response(
             response,
             next_state="select_document",
             message=self.service.msg_store.transfer_done_success(self.picking),
+            data={"restrict_scan_first": False},
+        )
+
+    def test_done_ask_destination_location(self):
+        """Check asking for destination location for view type location."""
+        view_location = (
+            self.env["stock.location"]
+            .sudo()
+            .create(
+                {
+                    "name": "Test Location Usage View",
+                    "location_id": self.picking.move_ids.location_dest_id.id,
+                    "usage": "view",
+                }
+            )
+        )
+        self.picking.move_ids.location_dest_id = view_location
+        response = self.service.dispatch(
+            "done", params={"picking_id": self.picking.id, "confirmation": True}
+        )
+
+        self.assertRecordValues(self.picking, [{"state": "assigned"}])
+        self.assert_response(
+            response,
+            next_state="select_child_location",
+            data={
+                "picking": self._stock_picking_data(
+                    self.picking, done=True, with_lines=False, with_location=True
+                ),
+            },
         )
 
 
@@ -130,4 +164,5 @@ class CheckoutDoneRawUnpackedCase(CheckoutCommonCase):
             response,
             next_state="select_document",
             message=self.service.msg_store.transfer_done_success(picking_done),
+            data={"restrict_scan_first": False},
         )

odoo/addons/shopfloor/tests/test_checkout_list_delivery_packaging.py

@@ -126,6 +126,7 @@ class CheckoutListDeliveryPackagingCase(CheckoutCommonCase, CheckoutSelectPackag
                 "no_package_enabled": not self.service.options.get(
                     "checkout__disable_no_package"
                 ),
+                "package_allowed": True,
             },
             message=self.service.msg_store.no_delivery_packaging_available(),
         )

odoo/addons/shopfloor/tests/test_checkout_list_package.py

@@ -28,7 +28,9 @@ class SelectDestPackageMixin:
                 "picking": picking_data,
                 "packages": [
                     self._package_data(
-                        package.with_context(picking_id=picking.id), picking
+                        package.with_context(picking_id=picking.id),
+                        picking,
+                        with_package_move_line_count=True,
                     )
                     for package in packages
                 ],

odoo/addons/shopfloor/tests/test_checkout_scan.py

@@ -31,6 +31,20 @@ class CheckoutScanCase(CheckoutCommonCase):
             in_package=False,
         )
 
+    def test_scan_document_with_option_product_not_ok(self):
+        self.menu.sudo().scan_location_or_pack_first = True
+        picking = self._create_picking()
+        self._fill_stock_for_moves(picking.move_ids)
+        picking.action_assign()
+        barcode = picking.move_line_ids.product_id[0].barcode
+        response = self.service.dispatch("scan_document", params={"barcode": barcode})
+        self.assert_response(
+            response,
+            next_state="select_document",
+            message={"message_type": "error", "body": "Barcode not found"},
+            data={"restrict_scan_first": True},
+        )
+
     def test_scan_document_packaging_ok(self):
         self._test_scan_ok(
             lambda picking: picking.move_line_ids.product_id[0].packaging_ids.barcode,
@@ -43,6 +57,7 @@ class CheckoutScanCase(CheckoutCommonCase):
             response,
             next_state="select_document",
             message={"message_type": "error", "body": "Barcode not found"},
+            data={"restrict_scan_first": False},
         )
 
     def _test_scan_document_error_not_available(self, barcode_func):
@@ -65,6 +80,7 @@ class CheckoutScanCase(CheckoutCommonCase):
                 "message_type": "error",
                 "body": "Transfer {} is not available.".format(picking.name),
             },
+            data={"restrict_scan_first": False},
         )
 
     def test_scan_document_error_not_available_picking(self):
@@ -92,6 +108,7 @@ class CheckoutScanCase(CheckoutCommonCase):
             response,
             next_state="select_document",
             message={"message_type": "error", "body": "Location not allowed here."},
+            data={"restrict_scan_first": False},
         )
 
     def _test_scan_document_error_different_picking_type(self, barcode_func):
@@ -107,6 +124,7 @@ class CheckoutScanCase(CheckoutCommonCase):
                 "message_type": "error",
                 "body": "You cannot move this using this menu.",
             },
+            data={"restrict_scan_first": False},
         )
 
     def test_scan_document_error_different_picking_type_picking(self):
@@ -139,6 +157,7 @@ class CheckoutScanCase(CheckoutCommonCase):
                 "body": "Several transfers found, please scan a package"
                 " or select a transfer manually.",
             },
+            data={"restrict_scan_first": False},
         )
 
     def test_scan_document_recover(self):

odoo/addons/shopfloor/tests/test_checkout_scan_dest_location.py

@@ -0,0 +1,99 @@
+# Copyright 2023 Camptocamp SA (http://www.camptocamp.com)
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
+
+# pylint: disable=missing-return
+
+from .test_checkout_base import CheckoutCommonCase
+
+
+class CheckoutSelectChildLocationCase(CheckoutCommonCase):
+    @classmethod
+    def setUpClassBaseData(cls):
+        super().setUpClassBaseData()
+        cls.picking = picking = cls._create_picking(
+            lines=[(cls.product_a, 10), (cls.product_b, 10)]
+        )
+        cls._fill_stock_for_moves(picking.move_ids)
+        picking.action_assign()
+        cls.line1 = picking.move_line_ids[0]
+        cls.line2 = picking.move_line_ids[1]
+        cls.line1.write({"qty_done": 10, "shopfloor_checkout_done": True})
+        cls.line2.write({"qty_done": 2, "shopfloor_checkout_done": True})
+
+        cls.dest_location = picking.location_dest_id
+        cls.child_location = (
+            cls.env["stock.location"]
+            .sudo()
+            .create({"name": "Child Location", "location_id": cls.dest_location.id})
+        )
+        cls.child_location_view = (
+            cls.env["stock.location"]
+            .sudo()
+            .create(
+                {
+                    "name": "Child Location View",
+                    "location_id": cls.dest_location.id,
+                    "usage": "view",
+                }
+            )
+        )
+
+    def test_scan_dest_location_ok(self):
+        response = self.service.dispatch(
+            "scan_dest_location",
+            params={
+                "picking_id": self.picking.id,
+                "barcode": self.child_location.name,
+            },
+        )
+
+        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.assert_response(
+            response,
+            next_state="select_document",
+            data={"restrict_scan_first": False},
+            message=self.service.msg_store.transfer_done_success(self.picking),
+        )
+
+    def test_scan_dest_location_not_found(self):
+        response = self.service.dispatch(
+            "scan_dest_location",
+            params={
+                "picking_id": self.picking.id,
+                "barcode": "not-a-location",
+            },
+        )
+
+        self.assert_response(
+            response,
+            next_state="select_child_location",
+            data={
+                "picking": self._stock_picking_data(
+                    self.picking, done=True, with_lines=False, with_location=True
+                ),
+            },
+            message=self.service.msg_store.location_not_found(),
+        )
+
+    def test_scan_dest_location_not_allowed(self):
+        response = self.service.dispatch(
+            "scan_dest_location",
+            params={
+                "picking_id": self.picking.id,
+                "barcode": self.child_location_view.name,
+            },
+        )
+
+        self.assert_response(
+            response,
+            next_state="select_child_location",
+            data={
+                "picking": self._stock_picking_data(
+                    self.picking, done=True, with_lines=False, with_location=True
+                ),
+            },
+            message=self.service.msg_store.dest_location_not_allowed(),
+        )

odoo/addons/shopfloor/tests/test_checkout_scan_line.py

@@ -119,7 +119,8 @@ class CheckoutScanLineCase(CheckoutScanLineCaseBase):
         picking.action_assign()
         first_line = picking.move_line_ids[0]
         lot = first_line.lot_id
-        self._test_scan_line_ok(lot.name, first_line)
+        related_lines = picking.move_line_ids - first_line
+        self._test_scan_line_ok(lot.name, first_line, related_lines)
 
     def test_scan_line_product_in_one_package_all_package_lines_ok(self):
         picking = self._create_picking(
@@ -365,7 +366,7 @@ class CheckoutScanLineCase(CheckoutScanLineCaseBase):
             params={
                 "picking_id": picking.id,
                 "barcode": self.delivery_packaging.barcode,
-                "confirm_pack_all": True,
+                "confirm_pack_all": self.delivery_packaging.barcode,
             },
         )
         # move to summary as all lines are done