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/README.rst

@@ -7,7 +7,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

odoo/addons/shopfloor/__manifest__.py

@@ -6,7 +6,7 @@
 {
     "name": "Shopfloor",
     "summary": "manage warehouse operations with barcode scanners",
-    "version": "16.0.2.2.0",
+    "version": "16.0.2.2.1",
     "development_status": "Beta",
     "category": "Inventory",
     "website": "https://github.com/OCA/wms",

odoo/addons/shopfloor/actions/move_line_search.py

@@ -1,5 +1,8 @@
 # Copyright 2020 Camptocamp SA (http://www.camptocamp.com)
+# Copyright 2024 ACSONE SA/NV
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
+from odoo.tools import safe_eval
+
 from odoo.addons.component.core import Component
 
 
@@ -20,9 +23,42 @@ class MoveLineSearch(Component):
             self.work, "picking_types", self.env["stock.picking.type"].browse()
         )
 
-    def _search_move_lines_by_location_domain(
+    @property
+    def additional_domain(self):
+        return getattr(self.work, "additional_domain", [])
+
+    @property
+    def sort_order(self):
+        return getattr(self.work, "sort_order", "priority")
+
+    @property
+    def sort_order_custom_code(self):
+        return getattr(self.work, "sort_order_custom_code", None)
+
+    def _get_additional_domain_eval_context(self):
+        """Prepare the context used when evaluating the additional domain
+        :returns: dict -- evaluation context given to safe_eval
+        """
+        return {
+            "datetime": safe_eval.datetime,
+            "dateutil": safe_eval.dateutil,
+            "time": safe_eval.time,
+            "uid": self.env.uid,
+            "user": self.env.user,
+        }
+
+    def _sort_key_custom_code_eval_context(self, line):
+        return {
+            "line": line,
+            "key": None,
+            "get_sort_key_priority": self._sort_key_move_lines_priority,
+            "get_sort_key_location": self._sort_key_move_lines_location,
+            "get_sort_key_assigned_to_current_user": self._sort_key_assigned_to_current_user,
+        }
+
+    def _search_move_lines_domain(
         self,
-        locations,
+        locations=None,
         picking_type=None,
         package=None,
         product=None,
@@ -32,16 +68,26 @@ class MoveLineSearch(Component):
         # When True, adds the package in the domain even if the package is False
         enforce_empty_package=False,
     ):
+        """Return a domain to search move lines.
+
+        Be careful on the use of the picking_type parameter. This paramater can take
+        a recordset or None as value. The interpretation of the value is as follows:
+        * If picking_type is None, the domain will be filtered on all picking types
+            defined in the work. (most probably those defined on the menu)
+        * If picking_type is a recordset, the domain will be filtered on the given
+            picking types if the recordset is not empty. If the recordset is empty,
+            the domain will not be filtered on any picking type.
+        """
         domain = [
-            ("location_id", "child_of", locations.ids),
             ("qty_done", "=", 0),
             ("state", "in", ("assigned", "partially_available")),
         ]
-        if picking_type:
-            # auto_join in place for this field
-            domain += [("picking_id.picking_type_id", "=", picking_type.id)]
-        elif self.picking_types:
-            domain += [("picking_id.picking_type_id", "in", self.picking_types.ids)]
+        picking_types = picking_type if picking_type is not None else self.picking_types
+        if picking_types:
+            domain += [("picking_id.picking_type_id", "in", picking_types.ids)]
+        locations = locations or picking_types.default_location_src_id
+        if locations:
+            domain += [("location_id", "child_of", locations.ids)]
         if package or package is not None and enforce_empty_package:
             domain += [("package_id", "=", package.id if package else False)]
         if product:
@@ -49,23 +95,26 @@ class MoveLineSearch(Component):
         if lot:
             domain += [("lot_id", "=", lot.id)]
         if match_user:
+            # we only want to see the lines assigned to the current user
             domain += [
-                "|",
-                ("shopfloor_user_id", "=", False),
-                ("shopfloor_user_id", "=", self.env.uid),
+                ("shopfloor_user_id", "in", (False, self.env.uid)),
+                ("picking_id.user_id", "in", (False, self.env.uid)),
             ]
         if picking_ready:
             domain += [("picking_id.state", "=", "assigned")]
+        if self.additional_domain:
+            eval_context = self._get_additional_domain_eval_context()
+            domain += safe_eval.safe_eval(self.additional_domain, eval_context)
         return domain
 
-    def search_move_lines_by_location(
+    def search_move_lines(
         self,
-        locations,
+        locations=None,
         picking_type=None,
         package=None,
         product=None,
         lot=None,
-        order="priority",
+        order=None,
         match_user=False,
         sort_keys_func=None,
         picking_ready=True,
@@ -73,7 +122,7 @@ class MoveLineSearch(Component):
     ):
         """Find lines that potentially need work in given locations."""
         move_lines = self.env["stock.move.line"].search(
-            self._search_move_lines_by_location_domain(
+            self._search_move_lines_domain(
                 locations,
                 picking_type,
                 package,
@@ -84,36 +133,79 @@ class MoveLineSearch(Component):
                 enforce_empty_package=enforce_empty_package,
             )
         )
+        order = order or self.sort_order
         sort_keys_func = sort_keys_func or self._sort_key_move_lines(order)
         move_lines = move_lines.sorted(sort_keys_func)
         return move_lines
 
-    @staticmethod
-    def _sort_key_move_lines(order):
+    def _sort_key_move_lines(self, order=None):
         """Return a sorting function to order lines."""
+        if order is None:
+            return lambda line: tuple()
 
         if order == "priority":
-            # make prority negative to keep sorting ascending
-            return lambda line: (
-                -int(line.move_id.priority or "0"),
-                line.move_id.date,
-                line.move_id.id,
-            )
-        elif order == "location":
-            return lambda line: (
-                line.location_id.shopfloor_picking_sequence or "",
-                line.location_id.name,
-                line.move_id.date,
-                line.move_id.id,
-            )
-        return lambda line: line
+            return self._sort_key_move_lines_priority
+
+        if order == "location":
+            return self._sort_key_move_lines_location
+
+        if order == "custom_code":
+            return self._sort_key_custom_code
+
+        if order == "assigned_to_current_user":
+            return self._sort_key_assigned_to_current_user
+
+        raise ValueError(f"Unknown order '{order}'")
+
+    def _sort_key_move_lines_priority(self, line):
+        # make prority negative to keep sorting ascending
+        return self._sort_key_assigned_to_current_user(line) + (
+            -int(line.move_id.priority or "0"),
+            line.move_id.date,
+            line.move_id.id,
+        )
+
+    def _sort_key_move_lines_location(self, line):
+        return self._sort_key_assigned_to_current_user(line) + (
+            line.location_id.shopfloor_picking_sequence or "",
+            line.location_id.name,
+            line.move_id.date,
+            line.move_id.id,
+        )
+
+    def _sort_key_assigned_to_current_user(self, line):
+        user_id = line.shopfloor_user_id.id or line.picking_id.user_id.id or None
+        # Determine sort priority
+        # Priority 0: Assigned to the current user
+        # Priority 1: Not assigned to any user
+        # Priority 2: Assigned to a different user
+        if user_id == self.env.uid:
+            priority = 0
+        elif user_id is None:
+            priority = 1
+        else:
+            priority = 2
+        return (priority,)
+
+    def _sort_key_custom_code(self, line):
+        context = self._sort_key_custom_code_eval_context(line)
+        safe_eval.safe_eval(
+            self.sort_order_custom_code, context, mode="exec", nocopy=True
+        )
+        return context["key"]
 
     def counters_for_lines(self, lines):
         # Not using mapped/filtered to support simple lists and generators
-        priority_lines = [x for x in lines if int(x.picking_id.priority or "0") > 0]
+        priority_lines = set()
+        priority_pickings = set()
+        for line in lines:
+            if int(line.move_id.priority or "0") > 0:
+                priority_lines.add(line)
+            if int(line.picking_id.priority or "0") > 0:
+                priority_pickings.add(line.picking_id)
         return {
             "lines_count": len(lines),
             "picking_count": len({x.picking_id.id for x in lines}),
             "priority_lines_count": len(priority_lines),
-            "priority_picking_count": len({x.picking_id.id for x in priority_lines}),
+            "priority_picking_count": len(priority_pickings),
         }

odoo/addons/shopfloor/data/shopfloor_scenario_data.xml

@@ -21,7 +21,9 @@
     "multiple_move_single_pack": true,
     "no_prefill_qty": true,
     "scan_location_or_pack_first": true,
-    "allow_alternative_destination_package": true
+    "allow_alternative_destination_package": true,
+    "allow_move_line_search_sort_order": false,
+    "allow_move_line_search_additional_domain": true
 }
         </field>
     </record>
@@ -68,7 +70,10 @@
     "allow_unreserve_other_moves": true,
     "allow_ignore_no_putaway_available": true,
     "allow_get_work": true,
-    "no_prefill_qty": true
+    "no_prefill_qty": true,
+    "allow_move_line_search_sort_order": true,
+    "allow_move_line_search_additional_domain": true
+
 }
         </field>
     </record>

odoo/addons/shopfloor/i18n/ca.po

@@ -116,6 +116,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"
@@ -133,6 +159,11 @@ msgstr "Es requereix un paquet destí."
 msgid "Activate Zero Check"
 msgstr "Activar verificació zero"
 
+#. 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"
@@ -330,6 +361,35 @@ msgstr ""
 msgid "Creation of moves is not allowed for menu {}."
 msgstr "La creació de moviments no està permesa pel menú {}."
 
+#. 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"
@@ -468,6 +528,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
@@ -593,6 +658,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
@@ -1093,6 +1168,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"
@@ -1154,6 +1234,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"
@@ -1427,6 +1512,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"
@@ -1506,8 +1596,8 @@ msgstr ""
 #: code:addons/shopfloor/models/stock_picking.py:0
 #, python-format
 msgid ""
-"The backorder <a href=\"#\" data-oe-model=\"stock.picking\" data-oe-id="
-"\"%(new_picking_id)d\">%(new_picking_name)s</a> has been created."
+"The backorder <a href=\"#\" data-oe-model=\"stock.picking\" data-oe-"
+"id=\"%(new_picking_id)d\">%(new_picking_name)s</a> has been created."
 msgstr ""
 
 #. module: shopfloor
@@ -1740,6 +1830,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
@@ -2025,8 +2127,8 @@ msgstr ""
 #~ msgstr "ID"
 
 #~ msgid ""
-#~ "Created from backorder <a href=# data-oe-model=stock.picking data-oe-id="
-#~ "%d>%s</a>."
+#~ "Created from backorder <a href=# data-oe-model=stock.picking data-oe-"
+#~ "id=%d>%s</a>."
 #~ msgstr ""
 #~ "Creat des de comanda pendent <a href=# data-oe-model=stock.picking data-"
 #~ "oe-id=%d>%s</a>."

odoo/addons/shopfloor/i18n/de.po

@@ -114,6 +114,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"
@@ -131,6 +157,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"
@@ -328,6 +359,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"
@@ -464,6 +524,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
@@ -589,6 +654,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
@@ -1089,6 +1164,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"
@@ -1150,6 +1230,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"
@@ -1423,6 +1508,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"
@@ -1502,8 +1592,8 @@ msgstr ""
 #: code:addons/shopfloor/models/stock_picking.py:0
 #, python-format
 msgid ""
-"The backorder <a href=\"#\" data-oe-model=\"stock.picking\" data-oe-id="
-"\"%(new_picking_id)d\">%(new_picking_name)s</a> has been created."
+"The backorder <a href=\"#\" data-oe-model=\"stock.picking\" data-oe-"
+"id=\"%(new_picking_id)d\">%(new_picking_name)s</a> has been created."
 msgstr ""
 
 #. module: shopfloor
@@ -1736,6 +1826,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