odoo-addon-shopfloor 18.0.0.5.0.1__py3-none-any.whl → 18.0.0.6.0__py3-none-any.whl

odoo/addons/shopfloor/README.rst

@@ -11,7 +11,7 @@ Shopfloor
    !! This file is generated by oca-gen-addon-readme !!
    !! changes will be overwritten.                   !!
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-   !! source digest: sha256:82699fc8ed59ec349f18149761cdefd28a4d13c4b41274373aa4e1ff02cc593b
+   !! source digest: sha256:63709bb5049a329746f85dcd55988b47e5e77d8a3be50ced7fc3768892762c22
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
 .. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png

odoo/addons/shopfloor/__manifest__.py

@@ -6,7 +6,7 @@
 {
     "name": "Shopfloor",
     "summary": "manage warehouse operations with barcode scanners",
-    "version": "18.0.0.5.0",
+    "version": "18.0.0.6.0",
     "development_status": "Beta",
     "category": "Inventory",
     "website": "https://github.com/OCA/stock-logistics-shopfloor",

odoo/addons/shopfloor/i18n/shopfloor.pot

@@ -287,6 +287,15 @@ msgstr ""
 msgid "Bulk Line Count"
 msgstr ""
 
+#. module: shopfloor
+#: model:ir.model.fields,help:shopfloor.field_shopfloor_menu__move_line_processing_sort_order
+msgid ""
+"By priority & location:\n"
+"> each line is sorted by priority and then by location to perform a smart path in the warehouse.\n"
+"By location grouped by product:\n"
+"> in case of multiple move lines for the same product, break the sorting to finalize a started product by processing all other move lines for that product in order to group a product on a picking device. When stacking products on a pallet, this prevents to spread a same product at different level on the stack."
+msgstr ""
+
 #. module: shopfloor
 #. odoo-python
 #: code:addons/shopfloor/actions/message.py:0
@@ -354,6 +363,7 @@ msgid "Creation of moves is not allowed for menu {}."
 msgstr ""
 
 #. module: shopfloor
+#: model:ir.model.fields.selection,name:shopfloor.selection__shopfloor_menu__move_line_processing_sort_order__custom_code
 #: model:ir.model.fields.selection,name:shopfloor.selection__shopfloor_menu__move_line_search_sort_order__custom_code
 msgid "Custom code"
 msgstr ""
@@ -363,11 +373,6 @@ msgstr ""
 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
@@ -430,6 +435,14 @@ msgstr ""
 msgid "Do not pre-fill quantity to pick"
 msgstr ""
 
+#. module: shopfloor
+#. odoo-python
+#: code:addons/shopfloor/services/cluster_picking.py:0
+msgid ""
+"Error when evaluating the move lines sorting code:\n"
+" %s"
+msgstr ""
+
 #. module: shopfloor
 #: model:ir.model.fields,help:shopfloor.field_stock_picking_type__shopfloor_zero_check
 msgid ""
@@ -529,6 +542,7 @@ msgid "Lines have different destination location."
 msgstr ""
 
 #. module: shopfloor
+#: model:ir.model.fields.selection,name:shopfloor.selection__shopfloor_menu__move_line_processing_sort_order__location
 #: model:ir.model.fields.selection,name:shopfloor.selection__shopfloor_menu__move_line_search_sort_order__location
 msgid "Location"
 msgstr ""
@@ -545,6 +559,11 @@ msgstr ""
 msgid "Location Content Transfer"
 msgstr ""
 
+#. module: shopfloor
+#: model:ir.model.fields.selection,name:shopfloor.selection__shopfloor_menu__move_line_processing_sort_order__location_grouped_product
+msgid "Location Grouping products"
+msgstr ""
+
 #. module: shopfloor
 #: model:shopfloor.scenario,name:shopfloor.scenario_location_content_transfer
 msgid "Location content transfer"
@@ -645,11 +664,26 @@ msgstr ""
 msgid "Move Line Count"
 msgstr ""
 
+#. module: shopfloor
+#: model:ir.model.fields,field_description:shopfloor.field_shopfloor_menu__move_line_processing_sort_order_custom_code
+msgid "Move Line Processing Sort Order Custom Code"
+msgstr ""
+
+#. module: shopfloor
+#: model:ir.model.fields,field_description:shopfloor.field_shopfloor_menu__move_line_processing_sort_order_is_possible
+msgid "Move Line Processing Sort Order Is Possible"
+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_custom_code
+msgid "Move Line Search Sort Order Custom Code"
+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"
@@ -1157,7 +1191,12 @@ 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. "
+msgid "Python code to sort move lines on search. "
+msgstr ""
+
+#. module: shopfloor
+#: model:ir.model.fields,help:shopfloor.field_shopfloor_menu__move_line_processing_sort_order_custom_code
+msgid "Python code to sort processing move lines."
 msgstr ""
 
 #. module: shopfloor
@@ -1437,6 +1476,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_processing_sort_order
+msgid "Sort method used when processing move lines"
+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"

odoo/addons/shopfloor/models/shopfloor_menu.py

@@ -55,6 +55,30 @@ If enabled, they will also be allowed
 to scan a destination package.
 """
 
+MOVE_LINE_PROCESSING_SORT_ORDER_HELP = (
+    "By priority & location:\n"
+    "> each line is sorted by priority and then by location to perform a smart path in"
+    " the warehouse.\n"
+    "By location grouped by product:\n"
+    "> in case of multiple move lines for the same product, break the sorting to"
+    " finalize a started product by processing all other move lines for that product"
+    " in order to group a product on a picking device. When stacking products on a"
+    " pallet, this prevents to spread a same product at different level on the stack."
+)
+
+CUSTOM_CODE_DEFAULT = (
+    "# Available variables:\n"
+    "#  - env: Odoo Environment on which the action is triggered\n"
+    "#  - time, datetime, dateutil, timezone: useful Python libraries\n"
+    "#  - records: lines to sort\n"
+    "#  - default_filter_func: default filtering function\n"
+    "#\n"
+    "# To provide the order for stock.move.line records to be processed, define eg.:\n"
+    "# move_lines = records.filtered(default_filter_func).sorted()\n"
+    "\n"
+    "\n"
+)
+
 
 class ShopfloorMenu(models.Model):
     _inherit = "shopfloor.menu"
@@ -247,7 +271,7 @@ class ShopfloorMenu(models.Model):
         default="priority",
     )
     move_line_search_sort_order_custom_code = fields.Text(
-        string="Custom sort key code", help="Python code to sort move lines. "
+        help="Python code to sort move lines on search. "
     )
     require_destination_package = fields.Boolean(
         string="Destination package required",
@@ -260,6 +284,25 @@ class ShopfloorMenu(models.Model):
     require_destination_package_is_possible = fields.Boolean(
         compute="_compute_require_destination_package_is_possible"
     )
+    move_line_processing_sort_order_is_possible = fields.Boolean(
+        compute="_compute_move_line_processing_sort_order_is_possible"
+    )
+    move_line_processing_sort_order = fields.Selection(
+        selection=[
+            ("location", "Location"),
+            ("location_grouped_product", "Location Grouping products"),
+            ("custom_code", "Custom code"),
+        ],
+        string="Sort method used when processing move lines",
+        default="location",
+        required=True,
+        help=MOVE_LINE_PROCESSING_SORT_ORDER_HELP,
+    )
+
+    move_line_processing_sort_order_custom_code = fields.Text(
+        default=CUSTOM_CODE_DEFAULT,
+        help="Python code to sort processing move lines.",
+    )
 
     @api.onchange("unload_package_at_destination")
     def _onchange_unload_package_at_destination(self):
@@ -585,3 +628,20 @@ class ShopfloorMenu(models.Model):
         ):
             vals["move_line_search_sort_order_custom_code"] = ""
         return super().write(vals)
+
+    @api.depends("scenario_id")
+    def _compute_move_line_processing_sort_order_is_possible(self):
+        for menu in self:
+            menu.move_line_processing_sort_order_is_possible = (
+                menu.scenario_id.has_option("allow_move_line_processing_sort_order")
+            )
+
+    @api.constrains("move_line_processing_sort_order_custom_code")
+    def _check_python_code(self):
+        for menu in self.sudo().filtered("move_line_processing_sort_order_custom_code"):
+            msg = test_python_expr(
+                expr=menu.move_line_processing_sort_order_custom_code.strip(),
+                mode="exec",
+            )
+            if msg:
+                raise exceptions.ValidationError(msg)

odoo/addons/shopfloor/services/cluster_picking.py

@@ -2,9 +2,23 @@
 # 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 pytz import timezone
+
+from odoo import _, exceptions, fields
 from odoo.osv import expression
 from odoo.tools import str2bool
+from odoo.tools.safe_eval import (
+    datetime as safe_datetime,
+)
+from odoo.tools.safe_eval import (
+    dateutil as safe_dateutil,
+)
+from odoo.tools.safe_eval import (
+    safe_eval,
+)
+from odoo.tools.safe_eval import (
+    time as safe_time,
+)
 
 from odoo.addons.base_rest.components.service import to_int
 from odoo.addons.component.core import Component
@@ -362,17 +376,81 @@ class ClusterPicking(Component):
         # after ALL the other lines in the batch are processed.
         return lines.sorted(key=self._sort_key_lines)
 
+    @staticmethod
+    def _lines_filtering(line):
+        return (
+            line.state in ("assigned", "partially_available")
+            # On 'StockPicking.action_assign()', result_package_id is set to
+            # the same package as 'package_id'. Here, we need to exclude lines
+            # that were already put into a bin, i.e. the destination package
+            # is different.
+            and (
+                not line.result_package_id or line.result_package_id == line.package_id
+            )
+        )
+
+    def _group_by_product(self, lines):
+        grouped_line_ids = []
+        product_ids_checked = set()
+        for line in lines:
+            if line.product_id.id not in product_ids_checked:
+                same_product_line_ids = lines.filtered(
+                    lambda x, line=line: x.product_id == line.product_id
+                ).ids
+                grouped_line_ids.extend(same_product_line_ids)
+                product_ids_checked.add(line.product_id.id)
+        lines = self.env["stock.move.line"].browse(grouped_line_ids)
+        return lines
+
     def _lines_to_pick(self, picking_batch):
-        return self._lines_for_picking_batch(
-            picking_batch,
-            filter_func=lambda x: (
-                x.state in ("assigned", "partially_available")
-                # On 'StockPicking.action_assign()', result_package_id is set to
-                # the same package as 'package_id'. Here, we need to exclude lines
-                # that were already put into a bin, i.e. the destination package
-                # is different.
-                and (not x.result_package_id or x.result_package_id == x.package_id)
-            ),
+        order = self.work.menu.move_line_processing_sort_order
+        if order == "location":
+            lines = self._lines_for_picking_batch(
+                picking_batch, filter_func=self._lines_filtering
+            )
+        elif order == "location_grouped_product":
+            # we need to call _lines_for_picking_batch
+            # without passing a filter_func so that the ordering is computed
+            # taking into account all lines in the batch,
+            # including those that have already been processed.
+            lines = self._lines_for_picking_batch(
+                picking_batch,
+                filter_func=lambda x: x,
+            )
+            lines = self._group_by_product(lines).filtered(self._lines_filtering)
+        elif order == "custom_code":
+            lines = self._eval_custom_code(picking_batch)
+        return lines
+
+    def _eval_context(self, move_lines):
+        return {
+            "uid": self.env.uid,
+            "user": self.env.user,
+            "time": safe_time,
+            "datetime": safe_datetime,
+            "dateutil": safe_dateutil,
+            "timezone": timezone,
+            # orm
+            "env": self.env,
+            # record
+            "records": move_lines,
+            # filter
+            "default_filter_func": self._lines_filtering,
+        }
+
+    def _eval_custom_code(self, picking_batch):
+        expr = self.work.menu.move_line_processing_sort_order_custom_code
+        move_lines = picking_batch.mapped("picking_ids.move_line_ids")
+        eval_context = self._eval_context(move_lines)
+        try:
+            safe_eval(expr, eval_context, mode="exec", nocopy=True)
+        except Exception as err:
+            msg = self.env._(
+                "Error when evaluating the move lines sorting code:\n %s", err
+            )
+            raise exceptions.UserError(msg) from err
+        return eval_context.get(
+            "move_lines", move_lines.filtered(self._lines_filtering)
         )
 
     def _last_picked_line(self, picking):

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

@@ -372,7 +372,7 @@ ul.auto-toc {
 !! This file is generated by oca-gen-addon-readme !!
 !! changes will be overwritten.                   !!
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-!! source digest: sha256:82699fc8ed59ec349f18149761cdefd28a4d13c4b41274373aa4e1ff02cc593b
+!! source digest: sha256:63709bb5049a329746f85dcd55988b47e5e77d8a3be50ced7fc3768892762c22
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
 <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/license-AGPL--3-blue.png" /></a> <a class="reference external image-reference" href="https://github.com/OCA/stock-logistics-shopfloor/tree/18.0/shopfloor"><img alt="OCA/stock-logistics-shopfloor" src="https://img.shields.io/badge/github-OCA%2Fstock--logistics--shopfloor-lightgray.png?logo=github" /></a> <a class="reference external image-reference" href="https://translation.odoo-community.org/projects/stock-logistics-shopfloor-18-0/stock-logistics-shopfloor-18-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/stock-logistics-shopfloor&amp;target_branch=18.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

odoo/addons/shopfloor/tests/test_cluster_picking_sort_order.py

@@ -0,0 +1,104 @@
+# Copyright 2023 Camptocamp SA (https://www.camptocamp.com)
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+from odoo import fields
+from odoo.tests import tagged
+
+from .test_cluster_picking_base import ClusterPickingCommonCase
+
+
+@tagged("post_install", "-at_install")
+class ClusterPickingSortOrder(ClusterPickingCommonCase):
+    @classmethod
+    def setUpClassBaseData(cls, *args, **kwargs):
+        super().setUpClassBaseData(*args, **kwargs)
+        cls.batch = cls._create_picking_batch(
+            [
+                [cls.BatchProduct(product=cls.product_a, quantity=1)],
+                [cls.BatchProduct(product=cls.product_b, quantity=1)],
+                [cls.BatchProduct(product=cls.product_d, quantity=1)],
+                [cls.BatchProduct(product=cls.product_c, quantity=1)],
+                [cls.BatchProduct(product=cls.product_b, quantity=1)],
+            ]
+        )
+        cls._simulate_batch_selected(cls.batch, in_package=True)
+        cls.menu.sudo().move_line_processing_sort_order = "location_grouped_product"
+        return
+
+    def test_custom_lines_order(self):
+        """The sorting of the lines in the batch groups lines with the same product"""
+        batch = self.batch
+
+        expected_lines_order = self._assign_different_locations(batch)
+
+        for expected_line in expected_lines_order:
+            # We are going to call this empoint once per line
+            # to simulate the fact that the lines have to be treated
+            # one at a time.
+            response = self.service.dispatch(
+                "confirm_start",
+                params={"picking_batch_id": batch.id},
+            )
+            returned_line = batch.move_line_ids.filtered(
+                lambda line,
+                response_line_id=response["data"]["start_line"]["id"]: line.id
+                == response_line_id
+            )
+            self.assertEqual(returned_line.id, expected_line.id)
+            returned_line.state = "confirmed"
+
+    def _assign_different_locations(self, batch):
+        # We assign one unique location to each line of the batch
+        # and we make sure each location has the sequence required for the test.
+        locations = self.env["stock.location"].search(
+            [("usage", "!=", "view")], limit=5
+        )
+        # The line with product A will have the lowest sequence.
+        line_product_a = batch.move_line_ids.filtered(
+            lambda line: line.product_id == self.product_a
+        )
+        line_product_a.location_id = locations[0]
+        line_product_a.location_id.shopfloor_picking_sequence = 1
+        line_product_a.state = "assigned"
+
+        # One of the lines with product B will have the second lowest sequence.
+        line_product_b_1 = fields.first(
+            batch.move_line_ids.filtered(lambda line: line.product_id == self.product_b)
+        )
+        line_product_b_1.location_id = locations[1]
+        line_product_b_1.location_id.shopfloor_picking_sequence = 2
+        line_product_b_1.state = "assigned"
+
+        # The line with product D will have the third lowest sequence.
+        line_product_d = batch.move_line_ids.filtered(
+            lambda line: line.product_id == self.product_d
+        )
+        line_product_d.location_id = locations[2]
+        line_product_d.location_id.shopfloor_picking_sequence = 3
+        line_product_d.state = "assigned"
+
+        # The line with product C will have the second highest sequence.
+        line_product_c = batch.move_line_ids.filtered(
+            lambda line: line.product_id == self.product_c
+        )
+        line_product_c.location_id = locations[3]
+        line_product_c.location_id.shopfloor_picking_sequence = 4
+        line_product_c.state = "assigned"
+
+        # The other line with product B will have the highest sequence.
+        line_product_b_2 = batch.move_line_ids.filtered(
+            lambda line: line.product_id == self.product_b
+            and line.location_id != locations[1]
+        )
+        line_product_b_2.location_id = locations[4]
+        line_product_b_2.location_id.shopfloor_picking_sequence = 5
+        line_product_b_2.state = "assigned"
+
+        # Return the lines in the order we expect once we sort by product.
+        return (
+            line_product_a,
+            line_product_b_1,
+            line_product_b_2,
+            line_product_d,
+            line_product_c,
+        )

odoo/addons/shopfloor/views/shopfloor_menu.xml

@@ -171,6 +171,22 @@
                         />
                     </div>
                 </group>
+                <group
+                    name="move_line_processing_sort_order"
+                    invisible="not move_line_processing_sort_order_is_possible"
+                >
+                    <field name="move_line_processing_sort_order" />
+                </group>
+            </group>
+            <group name="options" position="after">
+                <group name="move_line_processing_sort_order_custom_code">
+                    <field
+                        name="move_line_processing_sort_order_custom_code"
+                        invisible="move_line_processing_sort_order != 'custom_code'"
+                        widget="ace"
+                        options="{'mode': 'python'}"
+                    />
+                </group>
             </group>
         </field>
     </record>

{odoo_addon_shopfloor-18.0.0.5.0.1.dist-info → odoo_addon_shopfloor-18.0.0.6.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: odoo-addon-shopfloor
-Version: 18.0.0.5.0.1
+Version: 18.0.0.6.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:82699fc8ed59ec349f18149761cdefd28a4d13c4b41274373aa4e1ff02cc593b
+   !! source digest: sha256:63709bb5049a329746f85dcd55988b47e5e77d8a3be50ced7fc3768892762c22
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
 .. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png

{odoo_addon_shopfloor-18.0.0.5.0.1.dist-info → odoo_addon_shopfloor-18.0.0.6.0.dist-info}/RECORD

@@ -1,6 +1,6 @@
-odoo/addons/shopfloor/README.rst,sha256=bWxl7EQ4nkZ2hXJJWTOwcvr7BSSbMzTj7VsfucYWi6I,6138
+odoo/addons/shopfloor/README.rst,sha256=vpeT4OYvvgw1SyxTVqx99AdJ1QPD8587hPRlns0xyaQ,6138
 odoo/addons/shopfloor/__init__.py,sha256=ke3RmZ7XkX-lz4S8NHAxNIEJ5_Nvj5bjBAqD-W-q73c,91
-odoo/addons/shopfloor/__manifest__.py,sha256=ZOAsrUj9vnrx8654PRYNGoku-2pBFJ9QB__MvaAzrkA,2572
+odoo/addons/shopfloor/__manifest__.py,sha256=K1AyooaB8j3Kv9MPFYj1lohw5Fln9E7Z-O_6qnoGQRY,2572
 odoo/addons/shopfloor/exceptions.py,sha256=81KpIGVkuYRhA0cIuml4pg4G3izqkAAhLqoXZbUd4X8,197
 odoo/addons/shopfloor/utils.py,sha256=Be7J8Tu7ivOW4lpe8IjKxwqfTwfmK-ZkeFEavoYIIF4,375
 odoo/addons/shopfloor/actions/__init__.py,sha256=_yTf-NtaJmSylBJIoJJvKNYEI-wlqpyRw-S5eJRRzEM,400
@@ -48,11 +48,11 @@ odoo/addons/shopfloor/i18n/de.po,sha256=WM-9Snw36HBNemQ-IBufDQeoTpsEhszvi9xPeARj
 odoo/addons/shopfloor/i18n/es_AR.po,sha256=UNMrL-flfq08iZfrKhNL4LxsuZHz822Y-snRjuuPZNU,82475
 odoo/addons/shopfloor/i18n/it.po,sha256=1bok_TEH6bpcx3ykkdSTiJkra2Y5ASU1l3VrzfBVp-8,84434
 odoo/addons/shopfloor/i18n/pt_BR.po,sha256=GK4yxA42sF-RHzqmVUocNCfUPVifOpGS7BuPt6BbnTY,59867
-odoo/addons/shopfloor/i18n/shopfloor.pot,sha256=f1K0aqY3G5QyWqkhqjMhPGjxb4SF82PE2AwiZBwqzWk,56857
+odoo/addons/shopfloor/i18n/shopfloor.pot,sha256=IRbZaf5Cz0RoY9loimK_QBT9Xw52UU6x-vFf_wTfj4w,58901
 odoo/addons/shopfloor/models/__init__.py,sha256=hQY6dfl-ATXYffWa6cRlVQbyZ2BYc3voUNiNSC32miA,368
 odoo/addons/shopfloor/models/priority_postpone_mixin.py,sha256=AEu_K9mul_SmjyLK8NLCycRn3BLzirUqNOaf0RVYEpE,1503
 odoo/addons/shopfloor/models/shopfloor_app.py,sha256=ZfVahQYm0jzyeH7EtlOOhxYUif9OwcHIsyZAbQxEeXA,292
-odoo/addons/shopfloor/models/shopfloor_menu.py,sha256=aiA8y9bfy0JDgaRr1wwbRXmkleTefui7wksBS2qOYUM,23207
+odoo/addons/shopfloor/models/shopfloor_menu.py,sha256=SjDzL7C7RdMrIc9oWndeg7uzHsE8EQsvLyhJSuFFDH0,25669
 odoo/addons/shopfloor/models/stock_location.py,sha256=InkhTmnqYZaXCXIarku-NS1T6BO8EmLxg2zBE0CHeZ8,3092
 odoo/addons/shopfloor/models/stock_move.py,sha256=FcfRILSZygUvFgTd-AjjW_SoKgUiQtzC-4u_BzK65vw,5671
 odoo/addons/shopfloor/models/stock_move_line.py,sha256=YuYcJlTDpKsDnfs19UJynnsQI2gCvu64XlQArxFvKOM,11463
@@ -71,7 +71,7 @@ odoo/addons/shopfloor/readme/USAGE.md,sha256=YHN8xXpASu7XGNvmpV453zK86e5UyWeHPm-
 odoo/addons/shopfloor/security/groups.xml,sha256=hdLqRUZM_4RQnleinRYhxDxqW4VOI5li4oTsB7m96LQ,578
 odoo/addons/shopfloor/services/__init__.py,sha256=4lhF0VNx8QosVEZj9QJYgv6oWD0kl9FX80rL5WMrXf4,303
 odoo/addons/shopfloor/services/checkout.py,sha256=E40wOnnuKhpc98Q27ePz0nAvd9xB3-o6GSz8C7Hj6oc,82616
-odoo/addons/shopfloor/services/cluster_picking.py,sha256=mHnJnqTeeJkiD7pCKOb45E2Zd4mSEAYK2KcO2qgW8WA,69142
+odoo/addons/shopfloor/services/cluster_picking.py,sha256=U40bzXXmxGOnKL7yhQzpZfAVyDL2sBbNHIbIcUfdBvg,71927
 odoo/addons/shopfloor/services/delivery.py,sha256=Gxbwp0x9XPLx9AJ3GFDSH69xHrQCD_R8m2i78kuuS6s,34352
 odoo/addons/shopfloor/services/location_content_transfer.py,sha256=ovx3w4xnACTlc-24JmUcGtcKgaTb1FXpZ31m2FhTGM4,50431
 odoo/addons/shopfloor/services/menu.py,sha256=m1eNOReTda_xD-p-m8k2Pn5cJQOLWTiaBGW46zxsYsk,2354
@@ -82,7 +82,7 @@ odoo/addons/shopfloor/services/zone_picking.py,sha256=BI25T234hcjlgGDIMjsO6PfDUK
 odoo/addons/shopfloor/services/forms/__init__.py,sha256=nxwJdKX47hb56ERf4Qb3UE5dkdsHCbkaXMAXs4XMAd8,27
 odoo/addons/shopfloor/services/forms/picking_form.py,sha256=pX1hbALlCqTVG3m1HYY5xtgbTcSHVnpaGaqm3akBS-U,2718
 odoo/addons/shopfloor/static/description/icon.png,sha256=6xBPJauaFOF0KDHfHgQopSc28kKvxMaeoQFQWZtfZDo,9455
-odoo/addons/shopfloor/static/description/index.html,sha256=HoTSlz9robP64j8fSLEEAOSJ0mq8WwUwi2j7tACozmg,18540
+odoo/addons/shopfloor/static/description/index.html,sha256=VcVJce6blHWG92LiUbysuNWZtN35msLaLqA_BSAetO8,18540
 odoo/addons/shopfloor/tests/__init__.py,sha256=1L6fBScnX0sYhGhRfdrJAgc0BVT2bzO_43WJ8aiIhIU,3986
 odoo/addons/shopfloor/tests/common.py,sha256=lFdSQRXBjwCr7StVJltEwLtA_a4V77JcBcKkGAnAL5M,11676
 odoo/addons/shopfloor/tests/models.py,sha256=PWNPC6DgFMbrarojSxUqwycnBdePX-4Q5Z0rn1WwQqY,940
@@ -126,6 +126,7 @@ odoo/addons/shopfloor/tests/test_cluster_picking_scan_line_location_or_pack_firs
 odoo/addons/shopfloor/tests/test_cluster_picking_scan_line_no_prefill_qty.py,sha256=T-8V-Xug-T0cPe0XK09AlvL0S319QJk_-IPGP6v9es4,2897
 odoo/addons/shopfloor/tests/test_cluster_picking_select.py,sha256=BvuQznmCtOAipvgEhiUiTyeKR6nDkC5u9hCUZIF7MEc,15240
 odoo/addons/shopfloor/tests/test_cluster_picking_skip.py,sha256=CGTvP200X4XPX1sKIapTTJTw9Rs6aYh97c4k11IKBI8,3584
+odoo/addons/shopfloor/tests/test_cluster_picking_sort_order.py,sha256=akgZdMuGKJHmB8kWCNPKyQ0JbYGtHAsgFINpInTWKOU,4396
 odoo/addons/shopfloor/tests/test_cluster_picking_stock_issue.py,sha256=lcPC-w5PlkoknO7BVEl_aJitrtcn1_7YHCXIx7dnxJw,15830
 odoo/addons/shopfloor/tests/test_cluster_picking_unload.py,sha256=3GqAj4jyCLaXEscCoNgS-wTSpbgO_1OoBp5a2vNZyxw,38989
 odoo/addons/shopfloor/tests/test_delivery_base.py,sha256=XlreffzVgz4aVlG2Vo5Q02ZB5cMV9kI5F1UUMGC9xQA,5005
@@ -179,11 +180,11 @@ odoo/addons/shopfloor/tests/test_zone_picking_unload_buffer_lines.py,sha256=dVb4
 odoo/addons/shopfloor/tests/test_zone_picking_unload_set_destination.py,sha256=3TtVsNGEgAGNNn5m2kS8yN7fxw1q-nZQcRAuMYetP2U,13625
 odoo/addons/shopfloor/tests/test_zone_picking_unload_single.py,sha256=QmUbxYansd1zpHBpRePkM25DSOuWZb9qYLOLjESS3kU,4387
 odoo/addons/shopfloor/tests/test_zone_picking_zero_check.py,sha256=HB0hrvRsH7Ucv1pQm-D8dMWq6tQuTbrI8CPFqZh0Zb0,1376
-odoo/addons/shopfloor/views/shopfloor_menu.xml,sha256=LK_XdKawKqXPTaE1tq4r5dXR62CmDQHl8SwrZnLeyJM,9319
+odoo/addons/shopfloor/views/shopfloor_menu.xml,sha256=ffKWocGBGvE-hpaLMytpAm2FiQGfh3WzctnYyt3cP3A,10066
 odoo/addons/shopfloor/views/stock_location.xml,sha256=d7iqbOQZbb5YPSdAXlQ6spcj8dUvQ37DpEGuaLX5B1M,829
 odoo/addons/shopfloor/views/stock_move_line.xml,sha256=AmIO95-G0AD5i5C3x_BQL_NARXvyCfe4mg9iM97wD1U,1996
 odoo/addons/shopfloor/views/stock_picking_type.xml,sha256=M3U8xijiL6ZJUx2IiYelIYECsCRtOCU1J6lwlWzx3Jo,778
-odoo_addon_shopfloor-18.0.0.5.0.1.dist-info/METADATA,sha256=G_m8au5awfBb1-yJoKbGAi9RRbAtVYoqsTuqoloZ9B0,7582
-odoo_addon_shopfloor-18.0.0.5.0.1.dist-info/WHEEL,sha256=ZhOvUsYhy81Dx67gN3TV0RchQWBIIzutDZaJODDg2Vo,81
-odoo_addon_shopfloor-18.0.0.5.0.1.dist-info/top_level.txt,sha256=QE6RBQ0QX5f4eFuUcGgU5Kbq1A_qJcDs-e_vpr6pmfU,4
-odoo_addon_shopfloor-18.0.0.5.0.1.dist-info/RECORD,,
+odoo_addon_shopfloor-18.0.0.6.0.dist-info/METADATA,sha256=297jSoYH8igaw-s7plmwt_NlCrAFiKEasshXBZGB3WA,7580
+odoo_addon_shopfloor-18.0.0.6.0.dist-info/WHEEL,sha256=ZhOvUsYhy81Dx67gN3TV0RchQWBIIzutDZaJODDg2Vo,81
+odoo_addon_shopfloor-18.0.0.6.0.dist-info/top_level.txt,sha256=QE6RBQ0QX5f4eFuUcGgU5Kbq1A_qJcDs-e_vpr6pmfU,4
+odoo_addon_shopfloor-18.0.0.6.0.dist-info/RECORD,,