odoo-addon-shopfloor 16.0.2.2.0__py3-none-any.whl → 16.0.2.2.1.4__py3-none-any.whl

odoo/addons/shopfloor/services/menu.py

@@ -19,10 +19,13 @@ class ShopfloorMenu(Component):
         # TODO: maybe to be improved w/ raw SQL as this run for each menu item
         # and it's called every time the menu is opened/gets refreshed
         move_line_search = self._actions_for(
-            "search_move_line", picking_types=record.picking_type_ids
+            "search_move_line",
+            picking_types=record.picking_type_ids,
+            additional_domain=record.move_line_search_additional_domain,
+            sort_order=record.move_line_search_sort_order,
+            sort_order_custom_code=record.move_line_search_sort_order_custom_code,
         )
-        locations = record.picking_type_ids.mapped("default_location_src_id")
-        lines_per_menu = move_line_search.search_move_lines_by_location(locations)
+        lines_per_menu = move_line_search.search_move_lines()
         return move_line_search.counters_for_lines(lines_per_menu)
 
     def _one_record_parser(self, record):

odoo/addons/shopfloor/services/service.py

@@ -15,7 +15,15 @@ class BaseShopfloorService(AbstractComponent):
     @property
     def search_move_line(self):
         # TODO: propagating `picking_types` should probably be default
-        return self._actions_for("search_move_line", propagate_kwargs=["picking_types"])
+        return self._actions_for(
+            "search_move_line",
+            propagate_kwargs=[
+                "picking_types",
+                "additional_domain",
+                "sort_order",
+                "sort_order_custom_code",
+            ],
+        )
 
 
 class BaseShopfloorProcess(AbstractComponent):
@@ -38,13 +46,31 @@ class BaseShopfloorProcess(AbstractComponent):
             )
         return self.work.picking_types
 
+    @property
+    def additional_domain(self):
+        return self.work.menu.move_line_search_additional_domain
+
+    @property
+    def sort_order(self):
+        return self.work.menu.move_line_search_sort_order
+
+    @property
+    def sort_order_custom_code(self):
+        return self.work.menu.move_line_search_sort_order_custom_code
+
     @property
     def search_move_line(self):
         # TODO: picking types should be set somehow straight in the work context
         # by `_validate_headers_update_work_context` in this way
         # we can remove this override and the need to call `_get_process_picking_types`
         # every time.
-        return self._actions_for("search_move_line", picking_types=self.picking_types)
+        return self._actions_for(
+            "search_move_line",
+            picking_types=self.picking_types,
+            additional_domain=self.additional_domain,
+            sort_order=self.sort_order,
+            sort_order_custom_code=self.sort_order_custom_code,
+        )
 
     def _check_picking_status(self, pickings, states=("assigned",)):
         """Check if given pickings can be processed.

odoo/addons/shopfloor/services/zone_picking.py

@@ -315,7 +315,7 @@ class ZonePicking(Component):
         return self.search_move_line.counters_for_lines(zone_lines)
 
     def _picking_type_zone_lines(self, zone_location, picking_type):
-        return self.search_move_line.search_move_lines_by_location(
+        return self.search_move_line.search_move_lines(
             zone_location, picking_type=picking_type
         )
 
@@ -429,7 +429,7 @@ class ZonePicking(Component):
         enforce_empty_package=False,
     ):
         """Find lines that potentially need work in given locations."""
-        return self.search_move_line.search_move_lines_by_location(
+        return self.search_move_line.search_move_lines(
             locations or self.zone_location,
             picking_type=picking_type or self.picking_type,
             order=self.lines_order,

odoo/addons/shopfloor/static/description/index.html

@@ -367,7 +367,7 @@ ul.auto-toc {
 !! This file is generated by oca-gen-addon-readme !!
 !! changes will be overwritten.                   !!
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-!! source digest: sha256:8c610188b1ca56f5f11da8e51e3fd390897186bc38eed9c6246f4cc394dccda1
+!! source digest: sha256:bb5933746c40b25c45fcadac4704a1a752a86c48bb857969ca935196736d24c6
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
 <p><a class="reference external image-reference" href="https://odoo-community.org/page/development-status"><img alt="Beta" src="https://img.shields.io/badge/maturity-Beta-yellow.png" /></a> <a class="reference external image-reference" href="http://www.gnu.org/licenses/agpl-3.0-standalone.html"><img alt="License: AGPL-3" src="https://img.shields.io/badge/licence-AGPL--3-blue.png" /></a> <a class="reference external image-reference" href="https://github.com/OCA/wms/tree/16.0/shopfloor"><img alt="OCA/wms" src="https://img.shields.io/badge/github-OCA%2Fwms-lightgray.png?logo=github" /></a> <a class="reference external image-reference" href="https://translation.odoo-community.org/projects/wms-16-0/wms-16-0-shopfloor"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external image-reference" href="https://runboat.odoo-community.org/builds?repo=OCA/wms&amp;target_branch=16.0"><img alt="Try me on Runboat" src="https://img.shields.io/badge/runboat-Try%20me-875A7B.png" /></a></p>
 <p>Shopfloor is a barcode scanner application for internal warehouse operations.</p>

odoo/addons/shopfloor/tests/__init__.py

@@ -1,8 +1,10 @@
 from . import test_menu_counters
+from . import test_menu_contrains
 from . import test_openapi
 from . import test_actions_change_package_lot
 from . import test_actions_data
 from . import test_actions_data_detail
+from . import test_actions_search_move_line
 from . import test_actions_search
 from . import test_actions_stock
 from . import test_single_pack_transfer

odoo/addons/shopfloor/tests/test_actions_search_move_line.py

@@ -0,0 +1,128 @@
+# Copyright 2024 ACSONE SA/NV (http://www.acsone.eu)
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
+# pylint: disable=missing-return
+from contextlib import contextmanager
+
+from odoo.addons.base_rest.controllers.main import _PseudoCollection
+from odoo.addons.component.core import WorkContext
+
+from .common import CommonCase
+
+
+class TestActionsSearchMoveLine(CommonCase):
+    @classmethod
+    def setUpClass(cls):
+        super().setUpClass()
+        cls.picking_user1 = cls._create_picking(
+            lines=[(cls.product_a, 10)], confirm=True
+        )
+        cls.picking_user2 = cls._create_picking(
+            lines=[(cls.product_a, 10)], confirm=True
+        )
+        cls.picking_no_user = cls._create_picking(
+            lines=[(cls.product_a, 10)], confirm=True
+        )
+
+        cls.pickings = cls.picking_no_user | cls.picking_user1 | cls.picking_user2
+        cls._fill_stock_for_moves(cls.pickings.move_ids)
+        cls.pickings.action_assign()
+        cls.move_lines = cls.pickings.move_line_ids
+        cls.user1 = cls.env.user.copy({"name": "User 1", "login": "user1"})
+        cls.user2 = cls.env.user.copy({"name": "User 2", "login": "user2"})
+        cls.picking_no_user.user_id = False
+        cls.picking_user1.user_id = cls.user1.id
+        cls.picking_user2.move_line_ids.write({"shopfloor_user_id": cls.user2.id})
+        cls.picking_user2.user_id = cls.user2.id
+
+    @contextmanager
+    def work_on_actions(self, user=None, **params):
+        params = params or {}
+        env = self.env(user=user) if user else self.env
+        collection = _PseudoCollection("shopfloor.action", env)
+        yield WorkContext(
+            model_name="rest.service.registration", collection=collection, **params
+        )
+
+    @contextmanager
+    def search_move_line(self, user=None):
+        with self.work_on_actions(user) as work:
+            move_line_search = work.component(usage="search_move_line")
+            yield move_line_search
+
+    @classmethod
+    def setUpClassVars(cls):
+        super().setUpClassVars()
+        cls.wh = cls.env.ref("stock.warehouse0")
+        cls.picking_type = cls.wh.out_type_id
+
+    def test_search_move_line_sorter(self):
+        with self.search_move_line() as move_line_search:
+            move_lines = self.move_lines.sorted(
+                move_line_search._sort_key_move_lines(order="assigned_to_current_user")
+            )
+        # we must get operations in the following order:
+        #  * no shopfloor user and not user assigned to picking
+        #  * no shopfloor user and user assigned to picking
+        #  * shopfloor user or user assigned to picking
+
+        self.assertFalse(move_lines[0].shopfloor_user_id)
+        self.assertFalse(move_lines[0].picking_id.user_id)
+        self.assertFalse(move_lines[1].shopfloor_user_id)
+        self.assertTrue(move_lines[1].picking_id.user_id)
+        self.assertTrue(move_lines[2].shopfloor_user_id)
+
+        with self.search_move_line(user=self.user1) as move_line_search:
+            move_lines = self.move_lines.sorted(
+                move_line_search._sort_key_move_lines(order="assigned_to_current_user")
+            )
+        # user1 is only assigned at picking level
+        # we must get operations in the following order:
+        # * no shopfloor user but user assigned to picking
+        # * no shopfloor user and not user assigned to picking
+        # * shopfloor user or user assigned to picking
+        self.assertFalse(move_lines[0].shopfloor_user_id)
+        self.assertEqual(move_lines[0].picking_id.user_id, self.user1)
+        self.assertFalse(move_lines[1].shopfloor_user_id)
+        self.assertTrue(move_lines[2].shopfloor_user_id)
+
+        with self.search_move_line(user=self.user2) as move_line_search:
+            move_lines = self.move_lines.sorted(
+                move_line_search._sort_key_move_lines(order="assigned_to_current_user")
+            )
+        # user2 is only assigned at move level
+        # we must get operations in the following order:
+        # * shopfloor user or user assigned to picking
+        # * no shopfloor user and no user assigned to picking
+        # * no shopfloor user and user assigned to picking
+        self.assertEqual(move_lines[0].shopfloor_user_id, self.user2)
+        self.assertFalse(move_lines[1].shopfloor_user_id)
+        self.assertFalse(move_lines[1].picking_id.user_id)
+        self.assertTrue(move_lines[2].picking_id.user_id)
+
+    def test_search_move_line_match_user(self):
+        with self.search_move_line() as move_line_search:
+            move_lines = move_line_search.search_move_lines(
+                locations=self.picking_type.default_location_src_id,
+                match_user=True,
+            )
+        # we must only get picking not assigned to a user
+        self.assertFalse(move_lines.picking_id.user_id)
+        self.assertFalse(move_lines.shopfloor_user_id)
+
+        with self.search_move_line(user=self.user1) as move_line_search:
+            move_lines = move_line_search.search_move_lines(
+                locations=self.picking_type.default_location_src_id,
+                match_user=True,
+            )
+        # we must only get picking assigned to user1 or not assigned to any user
+        self.assertEqual(move_lines.picking_id.user_id, self.user1)
+        self.assertFalse(move_lines.shopfloor_user_id)
+
+        with self.search_move_line(user=self.user2) as move_line_search:
+            move_lines = move_line_search.search_move_lines(
+                locations=self.picking_type.default_location_src_id,
+                match_user=True,
+            )
+        # we must only get picking assigned to user2
+        self.assertEqual(move_lines.picking_id.user_id, self.user2)
+        self.assertEqual(move_lines.shopfloor_user_id, self.user2)

odoo/addons/shopfloor/tests/test_location_content_transfer_get_work.py

@@ -105,6 +105,47 @@ class TestLocationContentTransferGetWork(LocationContentTransferCommonCase):
         )
         self.assertEqual(response["next_state"], "scan_destination_all")
 
+    def test_find_work_additional_domain(self):
+        next_location = self.service._find_location_to_work_from()
+        self.assertTrue(next_location)
+        self.menu.sudo().move_line_search_additional_domain = [
+            ("picking_id.id", "not in", self.pickings.ids)
+        ]
+        next_location = self.service._find_location_to_work_from()
+        self.assertFalse(next_location)
+        response = self.service.dispatch("find_work", params={})
+        self.assert_response(
+            response,
+            next_state="get_work",
+            data={},
+            message=self.service.msg_store.no_work_found(),
+        )
+
+    def test_find_work_custom_sort_key(self):
+        # fmt: off
+        self.menu.sudo().write(
+            {
+                "move_line_search_sort_order": "custom_code",
+                "move_line_search_sort_order_custom_code":
+                    f"key = (-1 if line.location_id.id == {self.content_loc.id} else 10, )",
+            }
+        )
+        # fmt: on
+
+        next_location = self.service._find_location_to_work_from()
+        self.assertEqual(next_location, self.content_loc)
+        self.menu.sudo().move_line_search_sort_order_custom_code = (
+            f"key = (-1 if line.location_id.id == {self.content_loc2.id} else 10, )"
+        )
+        next_location = self.service._find_location_to_work_from()
+        self.assertEqual(next_location, self.content_loc2)
+        self.menu.sudo().move_line_search_sort_order_custom_code = f"""
+key = (-1 if line.location_id.id == {self.content_loc2.id} else 10, ) + \
+    get_sort_key_assigned_to_current_user(line)
+        """
+        next_location = self.service._find_location_to_work_from()
+        self.assertEqual(next_location, self.content_loc2)
+
     def test_cancel_work(self):
         next_location = self.service._find_location_to_work_from()
         stock = self.service._actions_for("stock")

odoo/addons/shopfloor/tests/test_location_content_transfer_mix.py

@@ -370,8 +370,8 @@ class LocationContentTransferMixCase(LocationContentTransferCommonCase):
             lambda l: not l.shopfloor_user_id and l.location_id == dest_location2
         )
         picking_before = pack_second_pallet.picking_id
-        move_lines = self.service._find_location_move_lines(
-            pack_second_pallet.location_id
+        move_lines = self.service.search_move_line.search_move_lines(
+            locations=pack_second_pallet.location_id
         )
         response = self._location_content_transfer_process_line(pack_second_pallet)
         response_packages = response["data"]["scan_destination_all"]["package_levels"]

odoo/addons/shopfloor/tests/test_menu_contrains.py

@@ -0,0 +1,40 @@
+# Copyright 2024 ACSONE SA/NV
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
+from odoo import exceptions
+
+from .test_menu_base import MenuCountersCommonCase
+
+
+class TestMenuContrains(MenuCountersCommonCase):
+    def test_move_line_search_sort_order_custom_code_invalid(self):
+
+        with self.assertRaises(exceptions.ValidationError):
+            # wrong indentation in python code
+            self.menu1.sudo().write(
+                {
+                    "move_line_search_sort_order_custom_code": """
+  key = 1
+  toto(1)
+""",
+                    "move_line_search_sort_order": "custom_code",
+                }
+            )
+
+        self.menu1.sudo().write(
+            {
+                "move_line_search_sort_order_custom_code": "key = 1",
+                "move_line_search_sort_order": "custom_code",
+            }
+        )
+
+    def test_move_line_search_sort_order_mismatch(self):
+        with self.assertRaises(exceptions.ValidationError):
+            self.menu1.sudo().move_line_search_sort_order = "custom_code"
+
+        self.menu1.sudo().write(
+            {
+                "move_line_search_sort_order_custom_code": "key = 1",
+                "move_line_search_sort_order": "priority",
+            }
+        )
+        self.assertFalse(self.menu1.move_line_search_sort_order_custom_code)

odoo/addons/shopfloor/tests/test_menu_counters.py

@@ -24,6 +24,9 @@ class TestMenuCountersCommonCase(MenuCountersCommonCase):
             .sudo()
             .search([("profile_id", "=", self.wms_profile.id)])
         )
+        # ensures expected counters are in the expected menu items
+        self.assertIn(self.menu1, expected_menu_items)
+        self.assertIn(self.menu2, expected_menu_items)
         service = self.get_service("menu", profile=self.wms_profile)
         response = service.dispatch("search")
         self._assert_menu_response(
@@ -33,6 +36,51 @@ class TestMenuCountersCommonCase(MenuCountersCommonCase):
         )
 
     def test_menu_search_profile2(self):
+        expected_menu_items = (
+            self.env["shopfloor.menu"]
+            .sudo()
+            .search([("profile_id", "=", self.wms_profile2.id)])
+        )
+        expected_counters = {
+            expected_menu_item[0].id: {
+                "lines_count": 0,
+                "picking_count": 0,
+                "priority_lines_count": 0,
+                "priority_picking_count": 0,
+            }
+            for expected_menu_item in expected_menu_items
+        }
+        service = self.get_service("menu", profile=self.wms_profile2)
+        response = service.dispatch("search")
+        self._assert_menu_response(
+            response,
+            expected_menu_items.sorted("sequence"),
+            expected_counters=expected_counters,
+        )
+
+    def test_menu_counter_priority(self):
+        """Test that priority counters are correctly computed.
+
+        Priority on lines must be based on the move priority.
+        Priority on pickings must be based on the picking priority.
+        """
+        self.pickings.write({"priority": "0"})
+        self.pickings.move_ids.write({"priority": "0"})
+        pickings_menu_2 = self.pickings.filtered(
+            lambda p: p.picking_type_id == self.menu2_picking_type
+        )
+        # Set priority on pickings only for first picking of menu 2
+        pickings_menu_2[0].write({"priority": "1"})
+        pickings_menu_2[0].move_ids.write({"priority": "0"})
+
+        # set priority on move lines only for second picking of menu 2
+        pickings_menu_2[1].write({"priority": "0"})
+        pickings_menu_2[1].move_ids[0].write({"priority": "1"})
+
+        # set priority on both move lines and pickings for third picking of menu 2
+        pickings_menu_2[2].write({"priority": "1"})
+        pickings_menu_2[2].move_ids.write({"priority": "1"})
+
         expected_counters = {
             self.menu1.id: {
                 "lines_count": 2,
@@ -40,6 +88,41 @@ class TestMenuCountersCommonCase(MenuCountersCommonCase):
                 "priority_lines_count": 0,
                 "priority_picking_count": 0,
             },
+            self.menu2.id: {
+                "lines_count": 6,
+                "picking_count": 3,
+                "priority_lines_count": 1 + len(pickings_menu_2[2].move_ids),
+                "priority_picking_count": 2,
+            },
+        }
+        expected_menu_items = (
+            self.env["shopfloor.menu"]
+            .sudo()
+            .search([("profile_id", "=", self.wms_profile.id)])
+        )
+        # ensures expected counters are in the expected menu items
+        self.assertIn(self.menu1, expected_menu_items)
+        self.assertIn(self.menu2, expected_menu_items)
+        service = self.get_service("menu", profile=self.wms_profile)
+        response = service.dispatch("search")
+        self._assert_menu_response(
+            response,
+            expected_menu_items.sorted("sequence"),
+            expected_counters=expected_counters,
+        )
+
+    def test_menu_search_additional_domain(self):
+        self.menu1.sudo().move_line_search_additional_domain = [
+            ("picking_id.priority", "=", "1")
+        ]
+
+        expected_counters = {
+            self.menu1.id: {
+                "lines_count": 0,
+                "picking_count": 0,
+                "priority_lines_count": 0,
+                "priority_picking_count": 0,
+            },
             self.menu2.id: {
                 "lines_count": 6,
                 "picking_count": 3,
@@ -50,9 +133,36 @@ class TestMenuCountersCommonCase(MenuCountersCommonCase):
         expected_menu_items = (
             self.env["shopfloor.menu"]
             .sudo()
-            .search([("profile_id", "=", self.wms_profile2.id)])
+            .search([("profile_id", "=", self.wms_profile.id)])
         )
-        service = self.get_service("menu", profile=self.wms_profile2)
+        # ensures expected counters are in the expected menu items
+        self.assertIn(self.menu1, expected_menu_items)
+        self.assertIn(self.menu2, expected_menu_items)
+        service = self.get_service("menu", profile=self.wms_profile)
+        response = service.dispatch("search")
+        self._assert_menu_response(
+            response,
+            expected_menu_items.sorted("sequence"),
+            expected_counters=expected_counters,
+        )
+
+        self.menu1.sudo().move_line_search_additional_domain = [
+            ("picking_id.priority", "=", "0")
+        ]
+        expected_counters = {
+            self.menu1.id: {
+                "lines_count": 2,
+                "picking_count": 2,
+                "priority_lines_count": 0,
+                "priority_picking_count": 0,
+            },
+            self.menu2.id: {
+                "lines_count": 6,
+                "picking_count": 3,
+                "priority_lines_count": 0,
+                "priority_picking_count": 0,
+            },
+        }
         response = service.dispatch("search")
         self._assert_menu_response(
             response,

odoo/addons/shopfloor/views/shopfloor_menu.xml

@@ -169,6 +169,60 @@
                     />
                     <field name="allow_alternative_destination_package" />
                 </group>
+                <group
+                    name="search_move_line"
+                    attrs="{'invisible': [('move_line_search_sort_order_is_possible', '=', False), ('move_line_search_additional_domain_is_possible', '=', False)]}"
+                >
+                <field
+                        name="move_line_search_additional_domain_is_possible"
+                        invisible="1"
+                    />
+                  <field
+                        name="move_line_search_additional_domain"
+                        widget="domain"
+                        options="{'model': 'stock.move.line'}"
+                        attrs="{'invisible': [('move_line_search_additional_domain_is_possible', '=', False)]}"
+                    />
+                  <field name="move_line_search_sort_order_is_possible" invisible="1" />
+                  <field
+                        name="move_line_search_sort_order"
+                        attrs="{'invisible': [('move_line_search_sort_order_is_possible', '=', False)]}"
+                    />
+                  <div
+                        class="o_cell o_wrap_label"
+                        style="margin-top: 4px;"
+                        colspan="2"
+                        attrs="{'invisible': ['|', ('move_line_search_sort_order_is_possible', '=', False), ('move_line_search_sort_order', '!=', 'custom_code')]}"
+                    >
+                    <label
+                            class="text-900"
+                            for="move_line_search_sort_order_custom_code"
+                        >Custom code to construct the key to sort move lines</label>
+                    <p>Three variables are available:</p>
+                    <ul>
+                        <li><code
+                                >line</code>: The move line for with the key must be computed.
+                        </li>
+                        <li><code
+                                >get_sort_key_priority</code>: Return sort key to sort by priority. (return a tuple)
+                        </li>
+                        <li><code
+                                >get_sort_key_location</code>: Return sort key to sort by location. (return a tuple)
+                        </li>
+                        <li><code
+                                >get_sort_key_assigned_to_current_user</code>: Return sort key to get line assigned to current user first. (return a tuple)
+                        </li>
+                        <li>To assign the key value: <code
+                                >key = get_sort_key_assigned_to_current_user(line) + (line.x, )</code></li>
+                    </ul>
+                    <field
+                            name="move_line_search_sort_order_custom_code"
+                            attrs="{'invisible': ['|', ('move_line_search_sort_order_is_possible', '=', False), ('move_line_search_sort_order', '!=', 'custom_code')]}"
+                            nolabel="1"
+                        />
+                  </div>
+
+            </group>
             </group>
         </field>
     </record>

{odoo_addon_shopfloor-16.0.2.2.0.dist-info → odoo_addon_shopfloor-16.0.2.2.1.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: odoo-addon-shopfloor
-Version: 16.0.2.2.0
+Version: 16.0.2.2.1.4
 Summary: manage warehouse operations with barcode scanners
 Home-page: https://github.com/OCA/wms
 Author: Camptocamp, BCIM, Akretion, Odoo Community Association (OCA)
@@ -36,7 +36,7 @@ Shopfloor
    !! This file is generated by oca-gen-addon-readme !!
    !! changes will be overwritten.                   !!
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-   !! source digest: sha256:8c610188b1ca56f5f11da8e51e3fd390897186bc38eed9c6246f4cc394dccda1
+   !! source digest: sha256:bb5933746c40b25c45fcadac4704a1a752a86c48bb857969ca935196736d24c6
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
 .. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png