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

odoo/addons/shopfloor/i18n/shopfloor.pot

@@ -110,6 +110,32 @@ msgid ""
 "destination'."
 msgstr ""
 
+#. module: shopfloor
+#: model_terms:ir.ui.view,arch_db:shopfloor.shopfloor_menu_form_view
+msgid ""
+"<code>get_sort_key_assigned_to_current_user</code>: Return sort key to get "
+"line assigned to current user first. (return a tuple)"
+msgstr ""
+
+#. module: shopfloor
+#: model_terms:ir.ui.view,arch_db:shopfloor.shopfloor_menu_form_view
+msgid ""
+"<code>get_sort_key_location</code>: Return sort key to sort by location. "
+"(return a tuple)"
+msgstr ""
+
+#. module: shopfloor
+#: model_terms:ir.ui.view,arch_db:shopfloor.shopfloor_menu_form_view
+msgid ""
+"<code>get_sort_key_priority</code>: Return sort key to sort by priority. "
+"(return a tuple)"
+msgstr ""
+
+#. module: shopfloor
+#: model_terms:ir.ui.view,arch_db:shopfloor.shopfloor_menu_form_view
+msgid "<code>line</code>: The move line for with the key must be computed."
+msgstr ""
+
 #. module: shopfloor
 #: model:ir.model,name:shopfloor.model_shopfloor_app
 msgid "A Shopfloor application"
@@ -127,6 +153,11 @@ msgstr ""
 msgid "Activate Zero Check"
 msgstr ""
 
+#. module: shopfloor
+#: model:ir.model.fields,field_description:shopfloor.field_shopfloor_menu__move_line_search_additional_domain
+msgid "Additional domain used when searching move lines"
+msgstr ""
+
 #. module: shopfloor
 #: model:ir.model,name:shopfloor.model_shopfloor_priority_postpone_mixin
 msgid "Adds shopfloor priority/postpone fields"
@@ -324,6 +355,35 @@ msgstr ""
 msgid "Creation of moves is not allowed for menu {}."
 msgstr ""
 
+#. module: shopfloor
+#: model:ir.model.fields.selection,name:shopfloor.selection__shopfloor_menu__move_line_search_sort_order__custom_code
+msgid "Custom code"
+msgstr ""
+
+#. module: shopfloor
+#: model_terms:ir.ui.view,arch_db:shopfloor.shopfloor_menu_form_view
+msgid "Custom code to construct the key to sort move lines"
+msgstr ""
+
+#. module: shopfloor
+#: model:ir.model.fields,field_description:shopfloor.field_shopfloor_menu__move_line_search_sort_order_custom_code
+msgid "Custom sort key code"
+msgstr ""
+
+#. module: shopfloor
+#. odoo-python
+#: code:addons/shopfloor/models/shopfloor_menu.py:0
+#, python-format
+msgid "Custom sort key code is only allowed when 'Custom code' is selected."
+msgstr ""
+
+#. module: shopfloor
+#. odoo-python
+#: code:addons/shopfloor/models/shopfloor_menu.py:0
+#, python-format
+msgid "Custom sort key code is required when 'Custom code' is selected."
+msgstr ""
+
 #. module: shopfloor
 #: model:ir.model.fields,field_description:shopfloor.field_stock_move_line__date_planned
 msgid "Date Scheduled"
@@ -460,6 +520,11 @@ msgstr ""
 msgid "Lines have different destination location."
 msgstr ""
 
+#. module: shopfloor
+#: model:ir.model.fields.selection,name:shopfloor.selection__shopfloor_menu__move_line_search_sort_order__location
+msgid "Location"
+msgstr ""
+
 #. module: shopfloor
 #. odoo-python
 #: code:addons/shopfloor/actions/message.py:0
@@ -585,6 +650,16 @@ msgstr ""
 msgid "Move Line Count"
 msgstr ""
 
+#. module: shopfloor
+#: model:ir.model.fields,field_description:shopfloor.field_shopfloor_menu__move_line_search_additional_domain_is_possible
+msgid "Move Line Search Additional Domain Is Possible"
+msgstr ""
+
+#. module: shopfloor
+#: model:ir.model.fields,field_description:shopfloor.field_shopfloor_menu__move_line_search_sort_order_is_possible
+msgid "Move Line Search Sort Order Is Possible"
+msgstr ""
+
 #. module: shopfloor
 #. odoo-python
 #: code:addons/shopfloor/actions/message.py:0
@@ -1086,6 +1161,11 @@ msgstr ""
 msgid "Prepackaged Product Is Possible"
 msgstr ""
 
+#. module: shopfloor
+#: model:ir.model.fields.selection,name:shopfloor.selection__shopfloor_menu__move_line_search_sort_order__priority
+msgid "Priority"
+msgstr ""
+
 #. module: shopfloor
 #: model:ir.model.fields,field_description:shopfloor.field_shopfloor_menu__allow_prepackaged_product
 msgid "Process as pre-packaged"
@@ -1147,6 +1227,11 @@ msgstr ""
 msgid "Product(s) processed as raw product(s)"
 msgstr ""
 
+#. module: shopfloor
+#: model:ir.model.fields,help:shopfloor.field_shopfloor_menu__move_line_search_sort_order_custom_code
+msgid "Python code to sort move lines. "
+msgstr ""
+
 #. module: shopfloor
 #: model:ir.model,name:shopfloor.model_stock_quant
 msgid "Quants"
@@ -1421,6 +1506,11 @@ msgstr ""
 msgid "Someone is already working on these transfers"
 msgstr ""
 
+#. module: shopfloor
+#: model:ir.model.fields,field_description:shopfloor.field_shopfloor_menu__move_line_search_sort_order
+msgid "Sort method used when searching move lines"
+msgstr ""
+
 #. module: shopfloor
 #: model:ir.model.fields,field_description:shopfloor.field_stock_location__source_move_line_ids
 msgid "Source Move Line"
@@ -1735,6 +1825,18 @@ msgstr ""
 msgid "This transfer does not exist or is not available anymore."
 msgstr ""
 
+#. module: shopfloor
+#: model_terms:ir.ui.view,arch_db:shopfloor.shopfloor_menu_form_view
+msgid "Three variables are available:"
+msgstr ""
+
+#. module: shopfloor
+#: model_terms:ir.ui.view,arch_db:shopfloor.shopfloor_menu_form_view
+msgid ""
+"To assign the key value: <code>key = "
+"get_sort_key_assigned_to_current_user(line) + (line.x, )</code>"
+msgstr ""
+
 #. module: shopfloor
 #: model:ir.model.fields,field_description:shopfloor.field_stock_picking__total_weight
 #: model:ir.model.fields,field_description:shopfloor.field_stock_picking_batch__total_weight

odoo/addons/shopfloor/migrations/16.0.2.2.1/post-init_search_move_line_options.py

@@ -0,0 +1,33 @@
+# Copyright 2024 ACSONE SA/NV (http://acsone.eu)
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
+
+import json
+import logging
+
+from odoo import SUPERUSER_ID, api
+
+_logger = logging.getLogger(__name__)
+
+
+def migrate(cr, version):
+    if not version:
+        return
+    env = api.Environment(cr, SUPERUSER_ID, {})
+    zone_picking = env.ref("shopfloor.scenario_zone_picking")
+    _update_scenario_options(zone_picking, sort_order=False, additional_domain=True)
+    location_content_transfer = env.ref("shopfloor.scenario_location_content_transfer")
+    _update_scenario_options(
+        location_content_transfer, sort_order=True, additional_domain=True
+    )
+
+
+def _update_scenario_options(scenario, sort_order=True, additional_domain=True):
+    options = scenario.options
+    options["allow_move_line_search_sort_order"] = sort_order
+    options["allow_move_line_search_additional_domain"] = additional_domain
+    options_edit = json.dumps(options or {}, indent=4, sort_keys=True)
+    scenario.write({"options_edit": options_edit})
+    _logger.info(
+        "Option allow_alternative_destination_package added to scenario %s",
+        scenario.name,
+    )

odoo/addons/shopfloor/models/shopfloor_menu.py

@@ -1,6 +1,8 @@
 # Copyright 2020 Camptocamp SA (http://www.camptocamp.com)
+# Copyright 2024 ACSONE SA/NV (http://www.acsone.eu)
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
 from odoo import _, api, exceptions, fields, models
+from odoo.tools.safe_eval import test_python_expr
 
 PICK_PACK_SAME_TIME_HELP = """
 If you tick this box, while picking goods from a location
@@ -227,6 +229,28 @@ class ShopfloorMenu(models.Model):
         compute="_compute_allow_alternative_destination_package_is_possible"
     )
 
+    move_line_search_additional_domain_is_possible = fields.Boolean(
+        compute="_compute_move_line_search_additional_domain_is_possible"
+    )
+    move_line_search_additional_domain = fields.Char(
+        string="Additional domain used when searching move lines"
+    )
+    move_line_search_sort_order_is_possible = fields.Boolean(
+        compute="_compute_move_line_search_sort_order_is_possible"
+    )
+    move_line_search_sort_order = fields.Selection(
+        selection=[
+            ("priority", "Priority"),
+            ("location", "Location"),
+            ("custom_code", "Custom code"),
+        ],
+        string="Sort method used when searching move lines",
+        default="priority",
+    )
+    move_line_search_sort_order_custom_code = fields.Text(
+        string="Custom sort key code", help="Python code to sort move lines. "
+    )
+
     @api.onchange("unload_package_at_destination")
     def _onchange_unload_package_at_destination(self):
         # Uncheck pick_pack_same_time when unload_package_at_destination is set to True
@@ -458,3 +482,64 @@ class ShopfloorMenu(models.Model):
             menu.allow_alternative_destination_package_is_possible = (
                 menu.scenario_id.has_option("allow_alternative_destination_package")
             )
+
+    @api.depends("scenario_id")
+    def _compute_move_line_search_additional_domain_is_possible(self):
+        for menu in self:
+            menu.move_line_search_additional_domain_is_possible = (
+                menu.scenario_id.has_option("allow_move_line_search_additional_domain")
+            )
+
+    @api.depends("scenario_id")
+    def _compute_move_line_search_sort_order_is_possible(self):
+        for menu in self:
+            menu.move_line_search_sort_order_is_possible = menu.scenario_id.has_option(
+                "allow_move_line_search_sort_order"
+            )
+
+    @api.constrains(
+        "move_line_search_sort_order", "move_line_search_sort_order_custom_code"
+    )
+    def _check_move_line_search_sort_order_custom_code(self):
+        for menu in self:
+            if (
+                menu.move_line_search_sort_order == "custom_code"
+                and not menu.move_line_search_sort_order_custom_code
+            ):
+                raise exceptions.ValidationError(
+                    _(
+                        "Custom sort key code is required when 'Custom code' is selected."
+                    )
+                )
+            if (
+                menu.move_line_search_sort_order != "custom_code"
+                and menu.move_line_search_sort_order_custom_code
+            ):
+                raise exceptions.ValidationError(
+                    _(
+                        "Custom sort key code is only allowed when 'Custom code' is selected."
+                    )
+                )
+            code = (
+                menu.move_line_search_sort_order_custom_code
+                and menu.move_line_search_sort_order_custom_code.strip()
+            )
+            if code:
+                msg = test_python_expr(code, mode="exec")
+                if msg:
+                    raise exceptions.ValidationError(msg)
+
+    @api.model_create_multi
+    def create(self, vals_list):
+        for vals in vals_list:
+            if vals.get("move_line_search_sort_order", "") != "custom_code":
+                vals["move_line_search_sort_order_custom_code"] = ""
+        return super().create(vals_list)
+
+    def write(self, vals):
+        if (
+            "move_line_search_sort_order" in vals
+            and vals["move_line_search_sort_order"] != "custom_code"
+        ):
+            vals["move_line_search_sort_order_custom_code"] = ""
+        return super().write(vals)

odoo/addons/shopfloor/services/location_content_transfer.py

@@ -2,7 +2,8 @@
 # Copyright 2020-2022 Jacques-Etienne Baudoux (BCIM) <je@bcim.be>
 # Copyright 2023 Michael Tietz (MT Software) <mtietz@mt-software.de>
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
-from odoo import _, fields
+from odoo import _
+from odoo.fields import first
 
 from odoo.addons.base_rest.components.service import to_int
 from odoo.addons.component.core import Component
@@ -208,24 +209,6 @@ class LocationContentTransfer(Component):
         response = self._recover_started_picking()
         return response or self._response_for_start()
 
-    def _find_location_move_lines_domain(self, location):
-        return [
-            ("location_id", "=", location.id),
-            ("qty_done", "=", 0),
-            ("state", "in", ("assigned", "partially_available")),
-            ("picking_id.user_id", "in", (False, self.env.uid)),
-            ("picking_id.state", "=", "assigned"),
-        ]
-
-    def _find_location_move_lines_from_scan_location(self, *args, **kwargs):
-        return self._find_location_move_lines(*args, **kwargs)
-
-    def _find_location_move_lines(self, location):
-        """Find lines that potentially are to move in the location"""
-        return self.env["stock.move.line"].search(
-            self._find_location_move_lines_domain(location)
-        )
-
     def _create_moves_from_location(self, location):
         # get all quants from the scanned location
         quants = self.env["stock.quant"].search(
@@ -251,24 +234,12 @@ class LocationContentTransfer(Component):
         return self.env["stock.move"].create(move_vals_list)
 
     def _find_location_to_work_from(self):
-        location = self.env["stock.location"]
-        pickings = self.env["stock.picking"].search(
-            [
-                ("picking_type_id", "in", self.picking_types.ids),
-                ("state", "=", "assigned"),
-                ("user_id", "in", (False, self.env.user.id)),
-            ],
-            order="user_id, priority desc, scheduled_date asc, id desc",
-        )
+        move_lines = self.search_move_line.search_move_lines(match_user=True)
+        return first(move_lines).location_id
 
-        for next_picking in pickings:
-            move_lines = next_picking.move_line_ids.filtered(
-                lambda line: line.qty_done < line.reserved_uom_qty
-            )
-            location = fields.first(move_lines).location_id
-            if location:
-                break
-        return location
+    def _select_move_lines_first_location(self, move_lines):
+        location = first(move_lines).location_id
+        return move_lines.filtered(lambda line: line.location_id == location)
 
     def find_work(self):
         """Find the next location to work from, for a user.
@@ -285,14 +256,15 @@ class LocationContentTransfer(Component):
         response = self._recover_started_picking()
         if response:
             return response
+
         self._actions_for("lock").advisory(self._advisory_lock_find_work)
-        location = self._find_location_to_work_from()
-        if not location:
+        move_lines = self.search_move_line.search_move_lines(match_user=True)
+        if not move_lines:
             return self._response_for_start(message=self.msg_store.no_work_found())
-        move_lines = self._find_location_move_lines(location)
+        move_lines = self._select_move_lines_first_location(move_lines)
         stock = self._actions_for("stock")
         stock.mark_move_line_as_picked(move_lines, quantity=0)
-        return self._response_for_scan_location(location=location)
+        return self._response_for_scan_location(location=move_lines.location_id)
 
     def _find_move_lines_to_cancel_work(self, location):
         unreserve = self._actions_for("stock.unreserve")
@@ -356,7 +328,14 @@ class LocationContentTransfer(Component):
                 message=self.msg_store.cannot_move_something_in_picking_type()
             )
 
-        move_lines = self._find_location_move_lines_from_scan_location(location)
+        move_lines = self.search_move_line.search_move_lines(
+            locations=location,
+            match_user=True,
+            picking_type=self.env[
+                "stock.picking.type"
+            ],  # disable filtering on picking types
+        )
+        move_lines = self._select_move_lines_first_location(move_lines)
 
         savepoint = self._actions_for("savepoint").new()
         unreserve = self._actions_for("stock.unreserve")

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)