From 20cc674407dce2ab19dd0b0f649d231d0fdab1d1 Mon Sep 17 00:00:00 2001
From: Nicolas Delbovier <nicolas.delbovier@acsone.eu>
Date: Wed, 28 Jan 2026 16:44:14 +0100
Subject: [PATCH 01/34] [REF] shopfloor_reception_mobile: relocate
 date-picker-input for better readibility

Reorganized the template structure to ensure the date-picker is positioned adjacent to its related components inside the "set_lot" template.
---
 .../static/src/scenario/reception.js                     | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/shopfloor_reception_mobile/static/src/scenario/reception.js b/shopfloor_reception_mobile/static/src/scenario/reception.js
index 135091ccb0..9c392b7ed3 100644
--- a/shopfloor_reception_mobile/static/src/scenario/reception.js
+++ b/shopfloor_reception_mobile/static/src/scenario/reception.js
@@ -21,11 +21,6 @@ const Reception = {
                 v-on:found="on_scan"
                 :input_placeholder="search_input_placeholder"
             />
-            <date-picker-input
-                v-if="state_is('set_lot')"
-                :handler_to_update_date="get_expiration_date_from_lot"
-                v-on:date_picker_selected="state.on_date_picker_selected"
-            />
             <template v-if="state_is('select_move')">
                 <item-detail-card
                     :record="state.data.picking"
@@ -100,6 +95,10 @@ const Reception = {
                 </div>
             </template>
             <template v-if="state_is('set_lot')">
+                <date-picker-input
+                    :handler_to_update_date="get_expiration_date_from_lot"
+                    v-on:date_picker_selected="state.on_date_picker_selected"
+                />
                 <item-detail-card
                     :record="line_being_handled"
                     :options="picking_detail_options_for_set_lot()"

From 36d804af79ed5b207ae22ebf95737bc843724d7d Mon Sep 17 00:00:00 2001
From: Nicolas Delbovier <nicolas.delbovier@acsone.eu>
Date: Tue, 3 Feb 2026 13:41:18 +0100
Subject: [PATCH 02/34] [REF] shopfloor_reception: better lot handling.

- Merge `set_lot_confirm_action` and `set_lot` endpoints so as to call only one endpoint
- Ensures lot is not created in DB until proven valid
- Add expired expiration date check
---
 shopfloor_reception/services/reception.py | 105 ++++++++--------------
 1 file changed, 36 insertions(+), 69 deletions(-)

diff --git a/shopfloor_reception/services/reception.py b/shopfloor_reception/services/reception.py
index ba9e5ec8f0..86c0e8ea8c 100644
--- a/shopfloor_reception/services/reception.py
+++ b/shopfloor_reception/services/reception.py
@@ -878,7 +878,9 @@ def _set_lot_from_parse(self, picking, line):
                     expiration_date = result.value
 
             if found:
-                return self.set_lot(picking.id, line.id, lot_name, expiration_date)
+                return self.set_lot_confirm_action(
+                    picking.id, line.id, lot_name, expiration_date
+                )
 
     def _align_display_product_uom_qty(self, line, response):
         # This method aligns product uom qties on move lines.
@@ -1136,8 +1138,8 @@ def _handle_backorder(self, picking, cancel_backorder=False):
             # Remove user_id on backorder, if any
             backorders_after.user_id = False
 
-    def set_lot(
-        self, picking_id, selected_line_id, lot_name=None, expiration_date=None
+    def set_lot_confirm_action(
+        self, picking_id, selected_line_id, lot_name, expiration_date=None
     ):
         """Set lot and its expiration date
 
@@ -1159,61 +1161,44 @@ def set_lot(
         if message:
             return self._response_for_set_lot(picking, selected_line, message=message)
         if not selected_line.exists():
-            message = self.msg_store.record_not_found()
-            return self._response_for_set_lot(picking, selected_line, message=message)
+            return self._response_for_set_lot(
+                picking, selected_line, message=self.msg_store.record_not_found()
+            )
+
         search = self._actions_for("search")
-        if lot_name:
-            product = selected_line.product_id
-            lot = search.lot_from_scan(lot_name, products=product)
-            if not lot:
-                lot = self.env["stock.lot"].create(
-                    self._create_lot_values(product, lot_name)
-                )
-            selected_line.lot_id = lot.id
-            selected_line._onchange_lot_id()
+        product = selected_line.product_id
+        lot = search.lot_from_scan(lot_name, products=product)
+
+        if selected_line.product_id.use_expiration_date and (
+            not expiration_date and not lot.expiration_date
+        ):
+            return self._response_for_set_lot(
+                picking,
+                selected_line,
+                message=self.msg_store.expiration_date_missing(),
+            )
+
+        if not lot:
+            lot = self.env["stock.lot"].new(self._create_lot_values(product, lot_name))
         if expiration_date:
-            selected_line.write({"expiration_date": expiration_date})
-            selected_line.lot_id.write({"expiration_date": expiration_date})
-        return self._response_for_set_lot(picking, selected_line)
+            lot.expiration_date = expiration_date
+
+        # Convert in-memory record into real record
+        if not lot._origin:
+            lot_vals = lot._convert_to_write(lot._cache)
+            lot = self.env["stock.lot"].create(lot_vals)
+        selected_line.lot_id = lot.id
+        selected_line._onchange_lot_id()
+
+        return self._before_state__set_quantity(picking, selected_line)
 
     def _create_lot_values(self, product, lot_name):
         return {
             "name": lot_name,
             "product_id": product.id,
             "company_id": self.env.company.id,
-            "use_expiration_date": product.use_expiration_date,
         }
 
-    def set_lot_confirm_action(self, picking_id, selected_line_id):
-        picking = self.env["stock.picking"].browse(picking_id)
-        message = self._check_picking_processible(picking)
-        selected_line = self.env["stock.move.line"].browse(selected_line_id)
-        if message:
-            return self._response_for_set_lot(picking, selected_line, message=message)
-        checks = [
-            self._check_expiry_date,
-            self._check_lot,
-        ]
-        for check in checks:
-            message = check(selected_line)
-            if message:
-                return self._response_for_set_lot(
-                    picking, selected_line, message=message
-                )
-        return self._before_state__set_quantity(picking, selected_line)
-
-    def _check_lot(self, line):
-        need_lot = line.product_id.tracking == "lot"
-        if need_lot and not line.lot_id:
-            return self.msg_store.scan_lot_on_product_tracked_by_lot()
-
-    def _check_expiry_date(self, line):
-        use_expiration_date = (
-            line.product_id.use_expiration_date or line.lot_id.use_expiration_date
-        )
-        if use_expiration_date and not line.expiration_date:
-            return self.msg_store.expiration_date_missing()
-
     def _set_quantity__get_handlers_by_type(self):
         return {
             "product": self._set_quantity__by_product,
@@ -1613,7 +1598,7 @@ def manual_select_move(self):
             "move_id": {"required": True, "type": "integer"},
         }
 
-    def set_lot(self):
+    def set_lot_confirm_action(self):
         return {
             "picking_id": {"coerce": to_int, "required": True, "type": "integer"},
             "selected_line_id": {
@@ -1621,7 +1606,7 @@ def set_lot(self):
                 "type": "integer",
                 "required": True,
             },
-            "lot_name": {"type": "string"},
+            "lot_name": {"type": "string", "required": True},
             "expiration_date": {"type": "string"},
         }
 
@@ -1711,16 +1696,6 @@ def done_action(self):
             "confirmation": {"type": "boolean"},
         }
 
-    def set_lot_confirm_action(self):
-        return {
-            "picking_id": {"coerce": to_int, "required": True, "type": "integer"},
-            "selected_line_id": {
-                "coerce": to_int,
-                "type": "integer",
-                "required": True,
-            },
-        }
-
 
 class ShopfloorReceptionValidatorResponse(Component):
     _inherit = "base.shopfloor.validator.response"
@@ -1791,9 +1766,6 @@ def _select_dest_package_next_states(self):
     def _done_next_states(self):
         return {"select_document", "select_move", "confirm_done"}
 
-    def _set_lot_confirm_action_next_states(self):
-        return {"set_lot", "set_quantity"}
-
     def _process_with_existing_pack_next_states(self):
         return {"set_quantity", "select_dest_package"}
 
@@ -1938,13 +1910,8 @@ def scan_line(self):
     def manual_select_move(self):
         return self._response_schema(next_states=self._scan_line_next_states())
 
-    def set_lot(self):
-        return self._response_schema(next_states=self._set_lot_next_states())
-
     def set_lot_confirm_action(self):
-        return self._response_schema(
-            next_states=self._set_lot_confirm_action_next_states()
-        )
+        return self._response_schema(next_states=self._set_lot_next_states())
 
     def set_quantity(self):
         return self._response_schema(next_states=self._set_quantity_next_states())

From 9387a8f8fce06d7f032f880f4e8dafb058332228 Mon Sep 17 00:00:00 2001
From: Nicolas Delbovier <nicolas.delbovier@acsone.eu>
Date: Tue, 3 Feb 2026 15:34:27 +0100
Subject: [PATCH 03/34] [REF] shopfloor_reception: adapt test suite to
 "set_lot" refactoring

---
 shopfloor_reception/tests/__init__.py         |   1 -
 shopfloor_reception/tests/test_set_lot.py     | 158 ------------------
 .../tests/test_set_lot_confirm.py             | 142 +++++++++++++---
 3 files changed, 120 insertions(+), 181 deletions(-)
 delete mode 100644 shopfloor_reception/tests/test_set_lot.py

diff --git a/shopfloor_reception/tests/__init__.py b/shopfloor_reception/tests/__init__.py
index 7e192132e7..cc71f6d0ba 100644
--- a/shopfloor_reception/tests/__init__.py
+++ b/shopfloor_reception/tests/__init__.py
@@ -3,7 +3,6 @@
 from . import test_manual_selection
 from . import test_select_move
 from . import test_reception_done
-from . import test_set_lot
 from . import test_set_lot_confirm
 from . import test_set_quantity
 from . import test_set_quantity_action
diff --git a/shopfloor_reception/tests/test_set_lot.py b/shopfloor_reception/tests/test_set_lot.py
deleted file mode 100644
index c605aa20eb..0000000000
--- a/shopfloor_reception/tests/test_set_lot.py
+++ /dev/null
@@ -1,158 +0,0 @@
-# Copyright 2022 Camptocamp SA
-# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl)
-# pylint: disable=missing-return
-from .common import CommonCase
-
-
-class TestSetLot(CommonCase):
-    @classmethod
-    def setUpClassBaseData(cls):
-        super().setUpClassBaseData()
-        cls.product_a.tracking = "lot"
-
-    def test_set_existing_lot(self):
-        picking = self._create_picking()
-        lot = self._create_lot()
-        selected_move_line = picking.move_line_ids.filtered(
-            lambda l: l.product_id == self.product_a
-        )
-        selected_move_line.shopfloor_user_id = self.env.uid
-        response = self.service.dispatch(
-            "set_lot",
-            params={
-                "picking_id": picking.id,
-                "selected_line_id": selected_move_line.id,
-                "lot_name": lot.name,
-            },
-        )
-        self.assertEqual(selected_move_line.lot_id, lot)
-        self.assertFalse(selected_move_line.expiration_date)
-        data = self.data.picking(picking)
-        self.assert_response(
-            response,
-            next_state="set_lot",
-            data={
-                "picking": data,
-                "selected_move_line": self.data.move_lines(selected_move_line),
-            },
-        )
-
-    def test_set_new_lot_on_line_with_lot(self):
-        picking = self._create_picking()
-        lot_before = self._create_lot()
-        selected_move_line = picking.move_line_ids.filtered(
-            lambda l: l.product_id == self.product_a
-        )
-        selected_move_line.shopfloor_user_id = self.env.uid
-        selected_move_line.lot_id = lot_before
-        lot_after = self._create_lot()
-        response = self.service.dispatch(
-            "set_lot",
-            params={
-                "picking_id": picking.id,
-                "selected_line_id": selected_move_line.id,
-                "lot_name": lot_after.name,
-            },
-        )
-        self.assertEqual(selected_move_line.lot_id, lot_after)
-        self.assertFalse(selected_move_line.expiration_date)
-        data = self.data.picking(picking)
-        self.assert_response(
-            response,
-            next_state="set_lot",
-            data={
-                "picking": data,
-                "selected_move_line": self.data.move_lines(selected_move_line),
-            },
-        )
-
-    def test_set_existing_lot_with_expiration_date(self):
-        self.product_a.use_expiration_date = True
-        picking = self._create_picking()
-        expiration_date = "2022-08-23 12:00:00"
-        lot = self._create_lot(expiration_date=expiration_date)
-        selected_move_line = picking.move_line_ids.filtered(
-            lambda l: l.product_id == self.product_a
-        )
-        selected_move_line.shopfloor_user_id = self.env.uid
-        response = self.service.dispatch(
-            "set_lot",
-            params={
-                "picking_id": picking.id,
-                "selected_line_id": selected_move_line.id,
-                "lot_name": lot.name,
-            },
-        )
-        self.assertEqual(str(selected_move_line.expiration_date), expiration_date)
-        data = self.data.picking(picking)
-        self.assert_response(
-            response,
-            next_state="set_lot",
-            data={
-                "picking": data,
-                "selected_move_line": self.data.move_lines(selected_move_line),
-            },
-        )
-
-    def test_set_new_lot(self):
-        picking = self._create_picking()
-        selected_move_line = picking.move_line_ids.filtered(
-            lambda l: l.product_id == self.product_a
-        )
-        selected_move_line.shopfloor_user_id = self.env.uid
-        response = self.service.dispatch(
-            "set_lot",
-            params={
-                "picking_id": picking.id,
-                "selected_line_id": selected_move_line.id,
-                "lot_name": "FooBar",
-            },
-        )
-        self.assertEqual(selected_move_line.lot_id.name, "FooBar")
-        data = self.data.picking(picking)
-        self.assert_response(
-            response,
-            next_state="set_lot",
-            data={
-                "picking": data,
-                "selected_move_line": self.data.move_lines(selected_move_line),
-            },
-        )
-
-    def test_set_expiry_date(self):
-        # First, set the lot
-        picking = self._create_picking()
-        lot = self._create_lot()
-        selected_move_line = picking.move_line_ids.filtered(
-            lambda l: l.product_id == self.product_a
-        )
-        selected_move_line.shopfloor_user_id = self.env.uid
-        self.service.dispatch(
-            "set_lot",
-            params={
-                "picking_id": picking.id,
-                "selected_line_id": selected_move_line.id,
-                "lot_name": lot.name,
-            },
-        )
-        # Then, set the expiration date
-        expiration_date = "2022-08-24 12:00:00"
-        response = self.service.dispatch(
-            "set_lot",
-            params={
-                "picking_id": picking.id,
-                "selected_line_id": selected_move_line.id,
-                "expiration_date": expiration_date,
-            },
-        )
-        self.assertEqual(str(lot.expiration_date), expiration_date)
-        self.assertEqual(str(selected_move_line.expiration_date), expiration_date)
-        data = self.data.picking(picking)
-        self.assert_response(
-            response,
-            next_state="set_lot",
-            data={
-                "picking": data,
-                "selected_move_line": self.data.move_lines(selected_move_line),
-            },
-        )
diff --git a/shopfloor_reception/tests/test_set_lot_confirm.py b/shopfloor_reception/tests/test_set_lot_confirm.py
index 238f4546f6..47066b75e9 100644
--- a/shopfloor_reception/tests/test_set_lot_confirm.py
+++ b/shopfloor_reception/tests/test_set_lot_confirm.py
@@ -1,6 +1,8 @@
 # Copyright 2022 Camptocamp SA
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl)
 # pylint: disable=missing-return
+from freezegun import freeze_time
+
 from .common import CommonCase
 
 
@@ -8,82 +10,178 @@ class TestSetLotConfirm(CommonCase):
     @classmethod
     def setUpClassBaseData(cls):
         super().setUpClassBaseData()
+        cls.product_a.tracking = "lot"
 
-    def test_ensure_lot(self):
+    def test_set_existing_lot(self):
         picking = self._create_picking()
-        self.product_a.tracking = "lot"
+        lot = self._create_lot()
         selected_move_line = picking.move_line_ids.filtered(
-            lambda li: li.product_id == self.product_a
+            lambda l: l.product_id == self.product_a
         )
+        selected_move_line.shopfloor_user_id = self.env.uid
         response = self.service.dispatch(
             "set_lot_confirm_action",
             params={
                 "picking_id": picking.id,
                 "selected_line_id": selected_move_line.id,
+                "lot_name": lot.name,
             },
         )
-        message = self.msg_store.scan_lot_on_product_tracked_by_lot()
+        self.assertEqual(selected_move_line.lot_id, lot)
+        self.assertFalse(selected_move_line.expiration_date)
         self.assert_response(
             response,
-            next_state="set_lot",
+            next_state="set_quantity",
             data={
                 "picking": self.data.picking(picking),
                 "selected_move_line": self.data.move_lines(selected_move_line),
+                "confirmation_required": None,
             },
-            message=message,
         )
 
-    def test_ensure_expiry_date(self):
+    def test_set_new_lot(self):
         picking = self._create_picking()
-        self.product_a.use_expiration_date = True
         selected_move_line = picking.move_line_ids.filtered(
             lambda l: l.product_id == self.product_a
         )
         selected_move_line.shopfloor_user_id = self.env.uid
-        # product has been set as requiring a expiration date.
-        # Trying to move to the next screen should return an error
         response = self.service.dispatch(
             "set_lot_confirm_action",
             params={
                 "picking_id": picking.id,
                 "selected_line_id": selected_move_line.id,
+                "lot_name": "FooBar",
             },
         )
-        data = self.data.picking(picking)
+        self.assertEqual(selected_move_line.lot_id.name, "FooBar")
         self.assert_response(
             response,
-            next_state="set_lot",
+            next_state="set_quantity",
+            data={
+                "picking": self.data.picking(picking),
+                "selected_move_line": self.data.move_lines(selected_move_line),
+                "confirmation_required": None,
+            },
+        )
+
+    def test_set_new_lot_on_line_with_lot(self):
+        picking = self._create_picking()
+        lot_before = self._create_lot()
+        selected_move_line = picking.move_line_ids.filtered(
+            lambda l: l.product_id == self.product_a
+        )
+        selected_move_line.shopfloor_user_id = self.env.uid
+        selected_move_line.lot_id = lot_before
+        lot_after = self._create_lot()
+        response = self.service.dispatch(
+            "set_lot_confirm_action",
+            params={
+                "picking_id": picking.id,
+                "selected_line_id": selected_move_line.id,
+                "lot_name": lot_after.name,
+            },
+        )
+        self.assertEqual(selected_move_line.lot_id, lot_after)
+        self.assertFalse(selected_move_line.expiration_date)
+        self.assert_response(
+            response,
+            next_state="set_quantity",
             data={
-                "picking": data,
+                "picking": self.data.picking(picking),
                 "selected_move_line": self.data.move_lines(selected_move_line),
+                "confirmation_required": None,
             },
-            message={"message_type": "error", "body": "Missing expiration date."},
         )
-        # Now, set the expiry date
-        expiration_date = "2022-08-24 12:00:00"
-        self.service.dispatch(
-            "set_lot",
+
+    @freeze_time("2020-01-01 11:00:00")
+    def test_set_existing_lot_with_expiration_date(self):
+        self.product_a.use_expiration_date = True
+        picking = self._create_picking()
+        expiration_date = "2022-08-23 12:00:00"
+        lot = self._create_lot(expiration_date=expiration_date)
+        selected_move_line = picking.move_line_ids.filtered(
+            lambda l: l.product_id == self.product_a
+        )
+        selected_move_line.shopfloor_user_id = self.env.uid
+        response = self.service.dispatch(
+            "set_lot_confirm_action",
             params={
                 "picking_id": picking.id,
                 "selected_line_id": selected_move_line.id,
-                "expiration_date": expiration_date,
+                "lot_name": lot.name,
             },
         )
-        # And try to confirm again
+        self.assertEqual(str(selected_move_line.expiration_date), expiration_date)
+        self.assert_response(
+            response,
+            next_state="set_quantity",
+            data={
+                "picking": self.data.picking(picking),
+                "selected_move_line": self.data.move_lines(selected_move_line),
+                "confirmation_required": None,
+            },
+        )
+
+    @freeze_time("2020-01-01 11:00:00")
+    def test_set_new_lot_and_expiration_date(self):
+        picking = self._create_picking()
+        selected_move_line = picking.move_line_ids.filtered(
+            lambda l: l.product_id == self.product_a
+        )
+        selected_move_line.shopfloor_user_id = self.env.uid
         response = self.service.dispatch(
             "set_lot_confirm_action",
             params={
                 "picking_id": picking.id,
                 "selected_line_id": selected_move_line.id,
+                "lot_name": "FooBar",
+                "expiration_date": "2022-08-24 12:00:00",
             },
         )
-        data = self.data.picking(picking)
+        self.assertEqual(selected_move_line.lot_id.name, "FooBar")
+        self.assertEqual(
+            str(selected_move_line.lot_id.expiration_date), "2022-08-24 12:00:00"
+        )
         self.assert_response(
             response,
             next_state="set_quantity",
             data={
-                "picking": data,
+                "picking": self.data.picking(picking),
                 "selected_move_line": self.data.move_lines(selected_move_line),
                 "confirmation_required": None,
             },
         )
+
+    @freeze_time("2020-01-01 11:00:00")
+    def test_ensure_expiry_date(self):
+        picking = self._create_picking()
+        self.product_a.use_expiration_date = True
+        selected_move_line = picking.move_line_ids.filtered(
+            lambda l: l.product_id == self.product_a
+        )
+        selected_move_line.shopfloor_user_id = self.env.uid
+        # product has been set as requiring a expiration date.
+        # Trying to move to the next screen should return an error
+        lot_name = "Test Lot"
+        response = self.service.dispatch(
+            "set_lot_confirm_action",
+            params={
+                "picking_id": picking.id,
+                "selected_line_id": selected_move_line.id,
+                "lot_name": lot_name,
+            },
+        )
+        self.assert_response(
+            response,
+            next_state="set_lot",
+            data={
+                "picking": self.data.picking(picking),
+                "selected_move_line": self.data.move_lines(selected_move_line),
+            },
+            message=self.msg_store.expiration_date_missing(),
+        )
+        self.assertEqual(
+            len(self.env["stock.lot"].search([("name", "=", lot_name)])),
+            0,
+            "No new lot should have been created in case of error.",
+        )

From 41a9dd1475bfcc15c75ad33c43c7cff3382b717a Mon Sep 17 00:00:00 2001
From: Nicolas Delbovier <nicolas.delbovier@acsone.eu>
Date: Fri, 6 Feb 2026 09:22:09 +0100
Subject: [PATCH 04/34] [IMP] shopfloor_reception: pass
 product.use_expiration_date value to the frontend

---
 shopfloor_reception/__init__.py         |  2 +-
 shopfloor_reception/actions/__init__.py |  2 ++
 shopfloor_reception/actions/data.py     | 17 +++++++++++++++++
 shopfloor_reception/actions/schema.py   | 20 ++++++++++++++++++++
 4 files changed, 40 insertions(+), 1 deletion(-)
 create mode 100644 shopfloor_reception/actions/__init__.py
 create mode 100644 shopfloor_reception/actions/data.py
 create mode 100644 shopfloor_reception/actions/schema.py

diff --git a/shopfloor_reception/__init__.py b/shopfloor_reception/__init__.py
index b447b57f1b..1a8abd9f42 100644
--- a/shopfloor_reception/__init__.py
+++ b/shopfloor_reception/__init__.py
@@ -1,2 +1,2 @@
-from . import services, models
+from . import services, models, actions
 from .hooks import post_init_hook, uninstall_hook
diff --git a/shopfloor_reception/actions/__init__.py b/shopfloor_reception/actions/__init__.py
new file mode 100644
index 0000000000..0049231d56
--- /dev/null
+++ b/shopfloor_reception/actions/__init__.py
@@ -0,0 +1,2 @@
+from . import data
+from . import schema
diff --git a/shopfloor_reception/actions/data.py b/shopfloor_reception/actions/data.py
new file mode 100644
index 0000000000..8db66c0be1
--- /dev/null
+++ b/shopfloor_reception/actions/data.py
@@ -0,0 +1,17 @@
+# Copyright 2026 ACSONE SA/NV
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
+
+from odoo.addons.component.core import Component
+
+
+class DataAction(Component):
+    _inherit = "shopfloor.data.action"
+
+    @property
+    def _product_parser(self):
+        """
+        The jsonifier engine passes (record, field_name) when calling
+        parser functions. We use *args to capture them.
+        """
+        res = super(DataAction, self)._product_parser
+        return res + ["use_expiration_date"]
diff --git a/shopfloor_reception/actions/schema.py b/shopfloor_reception/actions/schema.py
new file mode 100644
index 0000000000..4cd2d991aa
--- /dev/null
+++ b/shopfloor_reception/actions/schema.py
@@ -0,0 +1,20 @@
+# Copyright 2026 ACSONE SA/NV
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
+from odoo.addons.component.core import Component
+
+
+class ShopfloorSchemaAction(Component):
+    _inherit = "shopfloor.schema.action"
+
+    def product(self):
+        res = super().product()
+        res.update(
+            {
+                "use_expiration_date": {
+                    "type": "boolean",
+                    "nullable": True,
+                    "required": False,
+                },
+            }
+        )
+        return res

From 3e68d44aebcc5a7321706294a3f482403d183c51 Mon Sep 17 00:00:00 2001
From: Nicolas Delbovier <nicolas.delbovier@acsone.eu>
Date: Tue, 3 Feb 2026 16:18:38 +0100
Subject: [PATCH 05/34] [REF] shopfloor_reception_mobile: buffer lot inputs in
 UI

Update the 'set_lot' state logic to store user input locally on the
active move line before calling the backend.

Crucially, this ensures the 'set_lot' function is now called with both
'expiration_date' and 'lot_name' at the same time upon confirmation.
This prevents premature backend calls with partial data and allows
for better validation of the lot on the server.
---
 .../static/src/scenario/reception.js          | 22 ++++++------
 .../static/src/scenario/reception_states.js   | 36 ++++++++-----------
 2 files changed, 25 insertions(+), 33 deletions(-)

diff --git a/shopfloor_reception_mobile/static/src/scenario/reception.js b/shopfloor_reception_mobile/static/src/scenario/reception.js
index 9c392b7ed3..55c57dee53 100644
--- a/shopfloor_reception_mobile/static/src/scenario/reception.js
+++ b/shopfloor_reception_mobile/static/src/scenario/reception.js
@@ -96,19 +96,20 @@ const Reception = {
             </template>
             <template v-if="state_is('set_lot')">
                 <date-picker-input
+                    v-if="line_being_handled.product.use_expiration_date"
                     :handler_to_update_date="get_expiration_date_from_lot"
-                    v-on:date_picker_selected="state.on_date_picker_selected"
+                    @date_picker_selected="state.on_date_picker_selected"
                 />
                 <item-detail-card
                     :record="line_being_handled"
                     :options="picking_detail_options_for_set_lot()"
-                    :card_color="lot_has_expiry_date() ? utils.colors.color_for('screen_step_done') : utils.colors.color_for('screen_step_todo')"
+                    :card_color="is_set_lot_possible() ? utils.colors.color_for('screen_step_done') : utils.colors.color_for('screen_step_todo')"
                     :key="make_state_component_key(['reception-product-item-detail-set-lot', state.data.picking.id])"
                 />
                 <div class="button-list button-vertical-list full">
                     <v-row align="center">
                         <v-col class="text-center" cols="12">
-                            <btn-action @click="state.on_confirm_action">Continue</btn-action>
+                            <btn-action @click="state.on_confirm_lot" :disabled="!is_set_lot_possible()">Continue</btn-action>
                         </v-col>
                     </v-row>
                     <v-row align="center">
@@ -469,14 +470,13 @@ const Reception = {
         reset_picking_filter: function () {
             this.filtered_pickings = [];
         },
-        lot_has_expiry_date: function () {
-            // If there's a expiry date, it means there's a lot too.
-            const expiry_date = _.result(
-                this.line_being_handled,
-                "lot.expiration_date",
-                ""
-            );
-            return !_.isEmpty(expiry_date);
+        is_set_lot_possible: function () {
+            if (!this.line_being_handled.lot) return false;
+
+            let lot_name = this.line_being_handled.lot.name;
+            if (!lot_name) return false;
+
+            return true;
         },
         get_expiration_date_from_lot: function (lot) {
             if (!lot.expiration_date) {
diff --git a/shopfloor_reception_mobile/static/src/scenario/reception_states.js b/shopfloor_reception_mobile/static/src/scenario/reception_states.js
index 9ff37f360a..945e14ed77 100644
--- a/shopfloor_reception_mobile/static/src/scenario/reception_states.js
+++ b/shopfloor_reception_mobile/static/src/scenario/reception_states.js
@@ -130,35 +130,27 @@ export const reception_states = function () {
                 scan_input_placeholder_expiry: "Scan expiration date",
             },
             on_scan: (barcode) => {
-                // Scan a lot
-                this.wait_call(
-                    this.odoo.call("set_lot", {
-                        picking_id: this.state.data.picking.id,
-                        selected_line_id: this.line_being_handled.id,
-                        lot_name: barcode.text,
-                    })
-                ).then(() => {
-                    // We need to wait for the call to the backend to be over
-                    // to update the date-picker-input component
-                    // with the expiration_date of the selected lot.
-                    event_hub.$emit("datepicker:newdate", this.line_being_handled.lot);
-                });
+                // We merge the new name with whatever is already in .lot
+                // If .lot is null/undefined, we start with an empty object
+                this.line_being_handled.lot = {
+                    ...(this.line_being_handled.lot || {}),
+                    name: barcode.text,
+                };
             },
             on_date_picker_selected: (expiration_date) => {
-                // Select expiration_date
-                this.wait_call(
-                    this.odoo.call("set_lot", {
-                        picking_id: this.state.data.picking.id,
-                        selected_line_id: this.line_being_handled.id,
-                        expiration_date: expiration_date,
-                    })
-                );
+                // We merge the new date with whatever is already in .lot
+                this.line_being_handled.lot = {
+                    ...(this.line_being_handled.lot || {}),
+                    expiration_date: expiration_date,
+                };
             },
-            on_confirm_action: () => {
+            on_confirm_lot: () => {
                 this.wait_call(
                     this.odoo.call("set_lot_confirm_action", {
                         picking_id: this.state.data.picking.id,
                         selected_line_id: this.line_being_handled.id,
+                        lot_name: this.line_being_handled.lot.name,
+                        expiration_date: this.line_being_handled.lot.expiration_date,
                     })
                 );
             },

From b24f16f30e7e934ef0f59ea55e1e20511dd00982 Mon Sep 17 00:00:00 2001
From: Nicolas Delbovier <nicolas.delbovier@acsone.eu>
Date: Wed, 11 Feb 2026 10:07:52 +0100
Subject: [PATCH 06/34] [FIX] shopfloor: decouple unit tests from product
 serialization

Updated unit tests to be resistant to changes in product data serialization.
Previously, tests used a hard-coded dict, which caused failures when
other modules modified the product's serialized fields.
---
 shopfloor/tests/test_actions_data_base.py | 18 +-----------------
 1 file changed, 1 insertion(+), 17 deletions(-)

diff --git a/shopfloor/tests/test_actions_data_base.py b/shopfloor/tests/test_actions_data_base.py
index 49c8e0d384..57d2328dd7 100644
--- a/shopfloor/tests/test_actions_data_base.py
+++ b/shopfloor/tests/test_actions_data_base.py
@@ -120,23 +120,7 @@ def _expected_location(self, record, **kw):
         return data
 
     def _expected_product(self, record, **kw):
-        data = {
-            "id": record.id,
-            "name": record.name,
-            "display_name": record.display_name,
-            "default_code": record.default_code,
-            "barcode": record.barcode,
-            "packaging": [
-                self._expected_packaging(x) for x in record.packaging_ids if x.qty
-            ],
-            "uom": {
-                "factor": record.uom_id.factor,
-                "id": record.uom_id.id,
-                "name": record.uom_id.name,
-                "rounding": record.uom_id.rounding,
-            },
-            "supplier_code": self._expected_supplier_code(record),
-        }
+        data = self.data._jsonify(record, self.data._product_parser)
         data.update(kw)
         return data
 

From f15172d7692373837b565c247fa883fbd3648dcb Mon Sep 17 00:00:00 2001
From: Nicolas Delbovier <nicolas.delbovier@acsone.eu>
Date: Wed, 11 Feb 2026 10:10:20 +0100
Subject: [PATCH 07/34] [IMP] shopfloor_reception: add scan_lot_name endpoint.

Add an endpoint to call on lot name scan. This enables to detect already existing lots.
This endpoint could also be used to add logic to extract extra infos from barcode such as expiration date.
---
 shopfloor_reception/actions/data.py       | 17 +++++++++
 shopfloor_reception/actions/schema.py     | 12 +++++++
 shopfloor_reception/services/reception.py | 42 +++++++++++++++++++++--
 3 files changed, 69 insertions(+), 2 deletions(-)

diff --git a/shopfloor_reception/actions/data.py b/shopfloor_reception/actions/data.py
index 8db66c0be1..26ff59ab41 100644
--- a/shopfloor_reception/actions/data.py
+++ b/shopfloor_reception/actions/data.py
@@ -2,6 +2,7 @@
 # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
 
 from odoo.addons.component.core import Component
+from odoo.addons.shopfloor_base.utils import ensure_model
 
 
 class DataAction(Component):
@@ -15,3 +16,19 @@ def _product_parser(self):
         """
         res = super(DataAction, self)._product_parser
         return res + ["use_expiration_date"]
+
+    @ensure_model("stock.move.line")
+    def move_line(self, record, with_picking=False, **kw):
+        data = super().move_line(record, with_picking, **kw)
+
+        lot_data = {}
+        if lot := kw.get("lot"):
+            lot_data = self._jsonify(lot, self._lot_parser)
+        elif lot_name := kw.get("lot_name"):
+            lot_data["name"] = lot_name
+
+        if lot_data:
+            data["lot"] = data.get("lot") or {}
+            data["lot"].update(lot_data)
+
+        return data
diff --git a/shopfloor_reception/actions/schema.py b/shopfloor_reception/actions/schema.py
index 4cd2d991aa..6453b43d53 100644
--- a/shopfloor_reception/actions/schema.py
+++ b/shopfloor_reception/actions/schema.py
@@ -18,3 +18,15 @@ def product(self):
             }
         )
         return res
+
+    def lot(self):
+        res = super().lot()
+
+        # We need to be able to send lot name and expiration date info
+        # for "virtual lot" not yet created -> not yet an id
+        res.update(
+            {
+                "id": {"required": False, "type": "integer"},
+            }
+        )
+        return res
diff --git a/shopfloor_reception/services/reception.py b/shopfloor_reception/services/reception.py
index 86c0e8ea8c..dc243e8727 100644
--- a/shopfloor_reception/services/reception.py
+++ b/shopfloor_reception/services/reception.py
@@ -837,12 +837,12 @@ def _response_for_manual_selection(self):
         data = {"pickings": self._data_for_stock_pickings(pickings, with_lines=False)}
         return self._response(next_state="manual_selection", data=data)
 
-    def _response_for_set_lot(self, picking, line, message=None):
+    def _response_for_set_lot(self, picking, line, message=None, **kw):
         self._set_lot_from_parse(picking, line)
         return self._response(
             next_state="set_lot",
             data={
-                "selected_move_line": self._data_for_move_lines(line),
+                "selected_move_line": self._data_for_move_lines(line, **kw),
                 "picking": self.data.picking(picking),
             },
             message=message,
@@ -1138,6 +1138,27 @@ def _handle_backorder(self, picking, cancel_backorder=False):
             # Remove user_id on backorder, if any
             backorders_after.user_id = False
 
+    def scan_lot_name(self, picking_id, selected_line_id, lot_name):
+        picking = self.env["stock.picking"].browse(picking_id)
+        selected_line = self.env["stock.move.line"].browse(selected_line_id)
+        message = self._check_picking_processible(picking)
+        if message:
+            return self._response_for_set_lot(picking, selected_line, message=message)
+        if not selected_line.exists():
+            return self._response_for_set_lot(
+                picking, selected_line, message=self.msg_store.record_not_found()
+            )
+
+        existing_lot = self.env["stock.lot"].search(
+            [("name", "=", lot_name), ("product_id", "=", selected_line.product_id.id)]
+        )
+
+        res = self._response_for_set_lot(
+            picking, selected_line, lot=existing_lot, lot_name=lot_name
+        )
+
+        return res
+
     def set_lot_confirm_action(
         self, picking_id, selected_line_id, lot_name, expiration_date=None
     ):
@@ -1610,6 +1631,17 @@ def set_lot_confirm_action(self):
             "expiration_date": {"type": "string"},
         }
 
+    def scan_lot_name(self):
+        return {
+            "picking_id": {"coerce": to_int, "required": True, "type": "integer"},
+            "selected_line_id": {
+                "coerce": to_int,
+                "type": "integer",
+                "required": True,
+            },
+            "lot_name": {"type": "string", "required": True},
+        }
+
     def set_quantity(self):
         return {
             "picking_id": {"coerce": to_int, "required": True, "type": "integer"},
@@ -1751,6 +1783,9 @@ def _scan_line_next_states(self):
     def _set_lot_next_states(self):
         return {"select_move", "set_lot", "set_quantity"}
 
+    def _scan_lot_name_next_states(self):
+        return {"set_lot"}
+
     def _set_quantity_next_states(self):
         return {"set_quantity", "select_move", "set_destination"}
 
@@ -1913,6 +1948,9 @@ def manual_select_move(self):
     def set_lot_confirm_action(self):
         return self._response_schema(next_states=self._set_lot_next_states())
 
+    def scan_lot_name(self):
+        return self._response_schema(next_states=self._scan_lot_name_next_states())
+
     def set_quantity(self):
         return self._response_schema(next_states=self._set_quantity_next_states())
 

From 15310cd92b6b6086dd0dc4f6dcb1aac76a4b49a7 Mon Sep 17 00:00:00 2001
From: Nicolas Delbovier <nicolas.delbovier@acsone.eu>
Date: Mon, 9 Feb 2026 14:41:30 +0100
Subject: [PATCH 08/34] [IMP] shopfloor_reception_mobile: call "scan_lot_name"
 endpoint on lot name scan

---
 .../static/src/scenario/reception_states.js        | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/shopfloor_reception_mobile/static/src/scenario/reception_states.js b/shopfloor_reception_mobile/static/src/scenario/reception_states.js
index 945e14ed77..8849631476 100644
--- a/shopfloor_reception_mobile/static/src/scenario/reception_states.js
+++ b/shopfloor_reception_mobile/static/src/scenario/reception_states.js
@@ -130,15 +130,17 @@ export const reception_states = function () {
                 scan_input_placeholder_expiry: "Scan expiration date",
             },
             on_scan: (barcode) => {
-                // We merge the new name with whatever is already in .lot
-                // If .lot is null/undefined, we start with an empty object
-                this.line_being_handled.lot = {
-                    ...(this.line_being_handled.lot || {}),
-                    name: barcode.text,
-                };
+                this.wait_call(
+                    this.odoo.call("scan_lot_name", {
+                        picking_id: this.state.data.picking.id,
+                        selected_line_id: this.line_being_handled.id,
+                        lot_name: barcode.text,
+                    })
+                );
             },
             on_date_picker_selected: (expiration_date) => {
                 // We merge the new date with whatever is already in .lot
+                // If .lot is null/undefined, we start with an empty object
                 this.line_being_handled.lot = {
                     ...(this.line_being_handled.lot || {}),
                     expiration_date: expiration_date,

From eff17daaf9491b84344caf8917dade5473132f7a Mon Sep 17 00:00:00 2001
From: Nicolas Delbovier <nicolas.delbovier@acsone.eu>
Date: Thu, 12 Feb 2026 14:20:04 +0100
Subject: [PATCH 09/34] [IMP] shopfloor_reception: extract expiration date from
 barcode on lot name scan

Refactoring ideas in: https://github.com/OCA/wms/pull/1072/changes/3469638bee3846647d066dc7cb0081c249e226ff and https://github.com/OCA/wms/pull/1072/changes/c5f931bb2db637b021501625affa9954ddc20617
---
 shopfloor_reception/actions/__init__.py       |   1 +
 shopfloor_reception/actions/data.py           |   7 +-
 shopfloor_reception/actions/message.py        |  32 +++++
 shopfloor_reception/services/reception.py     |  33 ++++-
 shopfloor_reception/tests/__init__.py         |   1 +
 .../tests/test_multi_barcode.py               |   2 +-
 .../tests/test_scan_lot_name.py               | 113 ++++++++++++++++++
 7 files changed, 182 insertions(+), 7 deletions(-)
 create mode 100644 shopfloor_reception/actions/message.py
 create mode 100644 shopfloor_reception/tests/test_scan_lot_name.py

diff --git a/shopfloor_reception/actions/__init__.py b/shopfloor_reception/actions/__init__.py
index 0049231d56..7bb61dcadf 100644
--- a/shopfloor_reception/actions/__init__.py
+++ b/shopfloor_reception/actions/__init__.py
@@ -1,2 +1,3 @@
 from . import data
 from . import schema
+from . import message
diff --git a/shopfloor_reception/actions/data.py b/shopfloor_reception/actions/data.py
index 26ff59ab41..1f34efd288 100644
--- a/shopfloor_reception/actions/data.py
+++ b/shopfloor_reception/actions/data.py
@@ -24,8 +24,11 @@ def move_line(self, record, with_picking=False, **kw):
         lot_data = {}
         if lot := kw.get("lot"):
             lot_data = self._jsonify(lot, self._lot_parser)
-        elif lot_name := kw.get("lot_name"):
-            lot_data["name"] = lot_name
+        else:
+            if lot_name := kw.get("lot_name"):
+                lot_data["name"] = lot_name
+            if lot_expiration_date := kw.get("lot_expiration_date"):
+                lot_data["expiration_date"] = lot_expiration_date.isoformat()
 
         if lot_data:
             data["lot"] = data.get("lot") or {}
diff --git a/shopfloor_reception/actions/message.py b/shopfloor_reception/actions/message.py
new file mode 100644
index 0000000000..9771178ebd
--- /dev/null
+++ b/shopfloor_reception/actions/message.py
@@ -0,0 +1,32 @@
+# Copyright 2025 ACSONE SA/NV (https://www.acsone.eu)
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
+import logging
+
+from odoo import _
+
+from odoo.addons.component.core import Component
+
+_logger = logging.getLogger(__name__)
+
+
+class MessageAction(Component):
+    _inherit = "shopfloor.message.action"
+
+    def lot_already_exists_different_expiration_date(self, lot, expiration_date):
+        formatted_lot_expiration_date = self.work.env[
+            "ir.qweb.field.date"
+        ].value_to_html(lot.expiration_date, {})
+        formatted_provided_expiration_date = self.work.env[
+            "ir.qweb.field.date"
+        ].value_to_html(expiration_date, {})
+        return {
+            "message_type": "warning",
+            "body": _(
+                "A lot already exists with a different expiration date.\n\n"
+                "Lot '%(lot_name)s' expiration date: %(current)s "
+                "!= provided expiration date: %(provided)s",
+                lot_name=lot.name,
+                current=formatted_lot_expiration_date,
+                provided=formatted_provided_expiration_date,
+            ),
+        }
diff --git a/shopfloor_reception/services/reception.py b/shopfloor_reception/services/reception.py
index dc243e8727..57fb1634cc 100644
--- a/shopfloor_reception/services/reception.py
+++ b/shopfloor_reception/services/reception.py
@@ -1149,12 +1149,37 @@ def scan_lot_name(self, picking_id, selected_line_id, lot_name):
                 picking, selected_line, message=self.msg_store.record_not_found()
             )
 
-        existing_lot = self.env["stock.lot"].search(
-            [("name", "=", lot_name), ("product_id", "=", selected_line.product_id.id)]
+        existing_lot = self.env["stock.lot"]
+        lot_expiration_date = None
+
+        search = self._actions_for("search")
+        search_result = search.find(
+            barcode=lot_name,
+            types=["lot", "expiration_date"],
+            handler_kw={"lot": {"products": selected_line.product_id}},
         )
 
+        if search_result.type == "lot":
+            existing_lot = search_result.record
+
+        # Look for more info in the barcode
+        for result in search_result.parse_result:
+            if result.type == "expiration_date":
+                lot_expiration_date = result.value
+
+        message = None
+        if lot_expiration_date and existing_lot.expiration_date != lot_expiration_date:
+            message = self.msg_store.lot_already_exists_different_expiration_date(
+                existing_lot, lot_expiration_date
+            )
+
         res = self._response_for_set_lot(
-            picking, selected_line, lot=existing_lot, lot_name=lot_name
+            picking,
+            selected_line,
+            message=message,
+            lot=existing_lot,
+            lot_name=lot_name,
+            lot_expiration_date=lot_expiration_date,
         )
 
         return res
@@ -1202,7 +1227,7 @@ def set_lot_confirm_action(
         if not lot:
             lot = self.env["stock.lot"].new(self._create_lot_values(product, lot_name))
         if expiration_date:
-            lot.expiration_date = expiration_date
+            lot.expiration_date = expiration_date.replace("T", " ")
 
         # Convert in-memory record into real record
         if not lot._origin:
diff --git a/shopfloor_reception/tests/__init__.py b/shopfloor_reception/tests/__init__.py
index cc71f6d0ba..a49d367b7c 100644
--- a/shopfloor_reception/tests/__init__.py
+++ b/shopfloor_reception/tests/__init__.py
@@ -13,3 +13,4 @@
 from . import test_return_set_quantity
 from . import test_return_reception_done
 from . import test_recover
+from . import test_scan_lot_name
diff --git a/shopfloor_reception/tests/test_multi_barcode.py b/shopfloor_reception/tests/test_multi_barcode.py
index 82c9d40023..deaaac99a7 100644
--- a/shopfloor_reception/tests/test_multi_barcode.py
+++ b/shopfloor_reception/tests/test_multi_barcode.py
@@ -33,7 +33,7 @@ def test_scan_multiple_attribute_barcode(self):
                 BarcodeResult(type="lot", value=lot.name, raw=lot.name),
                 BarcodeResult(
                     type="expiration_date",
-                    value=fields.Date.to_date("2025-04-15"),
+                    value="2025-04-15",
                     raw="250415",
                 ),
             ]
diff --git a/shopfloor_reception/tests/test_scan_lot_name.py b/shopfloor_reception/tests/test_scan_lot_name.py
new file mode 100644
index 0000000000..918d0d89c1
--- /dev/null
+++ b/shopfloor_reception/tests/test_scan_lot_name.py
@@ -0,0 +1,113 @@
+# Copyright 2026 ACSONE SA/NV
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
+
+from datetime import timedelta
+from unittest import mock
+
+from odoo import fields
+
+from odoo.addons.shopfloor.actions.barcode_parser import BarcodeResult
+from odoo.addons.shopfloor.actions.search import SearchAction, SearchResult
+
+from .common import CommonCase
+
+
+class TestScanLotName(CommonCase):
+    @classmethod
+    def setUpClassBaseData(cls):
+        res = super().setUpClassBaseData()
+        cls.product_a.tracking = "lot"
+        return res
+
+    def test_scan_lot_name_extract_expiration_date_new_lot(self):
+        """
+        Test that the expiration date can be extracted from barcode scan
+        (case when the lot does not already exsit in db)
+        """
+        picking = self._create_picking()
+        lot = self._create_lot()
+        expiration_date = fields.Datetime.from_string("2022-07-02")
+        selected_move_line = picking.move_line_ids.filtered(
+            lambda l: l.product_id == self.product_a
+        )
+        selected_move_line.shopfloor_user_id = self.env.uid
+
+        with mock.patch.object(SearchAction, "find") as mock_find:
+            mock_find.return_value = SearchResult(
+                record=None,
+                type="None",
+                parse_result=[
+                    BarcodeResult(type="unknown", value=lot.name),
+                    BarcodeResult(type="expiration_date", value=expiration_date),
+                ],
+            )
+            res = self.service.dispatch(
+                "scan_lot_name",
+                params={
+                    "picking_id": picking.id,
+                    "selected_line_id": selected_move_line.id,
+                    "lot_name": lot.name,
+                },
+            )
+
+        self.assertEqual(
+            res["data"]["set_lot"]["selected_move_line"][0]["lot"]["expiration_date"],
+            expiration_date.isoformat(),
+        )
+        self.assertEqual(
+            res["data"]["set_lot"]["selected_move_line"][0]["lot"]["name"], lot.name
+        )
+
+    def test_scan_lot_name_extract_expiration_date_existing_lot(self):
+        """
+        When lot already exists, take the expiration date from the existing lot.
+
+        Ensure there is a warning in case of mismatch between expiration date found in
+        the barcode and the one on the existing lot.
+        """
+        picking = self._create_picking()
+
+        expiration_date = fields.Datetime.from_string("2022-07-02")
+        lot = self._create_lot(expiration_date=expiration_date)
+        self.assertEqual(lot.expiration_date, expiration_date)
+
+        selected_move_line = picking.move_line_ids.filtered(
+            lambda l: l.product_id == self.product_a
+        )
+        selected_move_line.shopfloor_user_id = self.env.uid
+
+        with mock.patch.object(SearchAction, "find") as mock_find:
+            mock_find.return_value = SearchResult(
+                record=lot,
+                type="lot",
+                parse_result=[
+                    BarcodeResult(type="unknown", value=lot.name),
+                    BarcodeResult(
+                        type="expiration_date",
+                        value=lot.expiration_date + timedelta(days=2),
+                    ),
+                ],
+            )
+            res = self.service.dispatch(
+                "scan_lot_name",
+                params={
+                    "picking_id": picking.id,
+                    "selected_line_id": selected_move_line.id,
+                    "lot_name": lot.name,
+                },
+            )
+
+        self.assertEqual(
+            res["data"]["set_lot"]["selected_move_line"][0]["lot"]["expiration_date"],
+            expiration_date.isoformat(),
+        )
+        self.assertEqual(
+            res["data"]["set_lot"]["selected_move_line"][0]["lot"]["name"],
+            lot.name,
+        )
+        self.assertEqual(
+            res["message"],
+            self.msg_store.lot_already_exists_different_expiration_date(
+                lot, lot.expiration_date + timedelta(days=2)
+            ),
+        )

From f199ad18ab207c0a2717c0dad9cd430abc586163 Mon Sep 17 00:00:00 2001
From: Nicolas Delbovier <nicolas.delbovier@acsone.eu>
Date: Wed, 11 Feb 2026 11:49:13 +0100
Subject: [PATCH 10/34] [FIX] shopfloor_reception: persist lot_name on
 validation error

When a user provides a lot name but forgets the expiration date, the `lot_name` was previously lost
in the response.

This change ensures that `lot_name` is included in the returned
data, allowing the UI to retain the value and
preventing the user from having to re-type it.
---
 shopfloor_reception/services/reception.py         | 1 +
 shopfloor_reception/tests/test_set_lot_confirm.py | 8 +++++++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/shopfloor_reception/services/reception.py b/shopfloor_reception/services/reception.py
index 57fb1634cc..47f835c237 100644
--- a/shopfloor_reception/services/reception.py
+++ b/shopfloor_reception/services/reception.py
@@ -1222,6 +1222,7 @@ def set_lot_confirm_action(
                 picking,
                 selected_line,
                 message=self.msg_store.expiration_date_missing(),
+                lot_name=lot_name,
             )
 
         if not lot:
diff --git a/shopfloor_reception/tests/test_set_lot_confirm.py b/shopfloor_reception/tests/test_set_lot_confirm.py
index 47066b75e9..118e606ec5 100644
--- a/shopfloor_reception/tests/test_set_lot_confirm.py
+++ b/shopfloor_reception/tests/test_set_lot_confirm.py
@@ -171,12 +171,18 @@ def test_ensure_expiry_date(self):
                 "lot_name": lot_name,
             },
         )
+
+        excepted_selected_move_line_data = self.data.move_lines(selected_move_line)
+        # The expected response should contain the lot name even if the lot is
+        # not defined on the move line already
+        excepted_selected_move_line_data[0]["lot"] = {"name": lot_name}
+
         self.assert_response(
             response,
             next_state="set_lot",
             data={
                 "picking": self.data.picking(picking),
-                "selected_move_line": self.data.move_lines(selected_move_line),
+                "selected_move_line": excepted_selected_move_line_data,
             },
             message=self.msg_store.expiration_date_missing(),
         )

From 1f96ac173d920bb6643e52e59326144a1cbc07c2 Mon Sep 17 00:00:00 2001
From: Nicolas Delbovier <nicolas.delbovier@acsone.eu>
Date: Thu, 12 Feb 2026 14:23:26 +0100
Subject: [PATCH 11/34] [IMP] shopfloor_reception: add missing unit test

---
 .../tests/test_set_lot_confirm.py             | 32 +++++++++++++++++++
 1 file changed, 32 insertions(+)

diff --git a/shopfloor_reception/tests/test_set_lot_confirm.py b/shopfloor_reception/tests/test_set_lot_confirm.py
index 118e606ec5..728e1b033f 100644
--- a/shopfloor_reception/tests/test_set_lot_confirm.py
+++ b/shopfloor_reception/tests/test_set_lot_confirm.py
@@ -122,6 +122,38 @@ def test_set_existing_lot_with_expiration_date(self):
             },
         )
 
+    @freeze_time("2020-01-01 11:00:00")
+    def test_set_existing_lot_overwrite_expiration_date(self):
+        self.product_a.use_expiration_date = True
+        picking = self._create_picking()
+        lot_expiration_date = "2022-08-23 12:00:00"
+        lot = self._create_lot(expiration_date=lot_expiration_date)
+        selected_move_line = picking.move_line_ids.filtered(
+            lambda l: l.product_id == self.product_a
+        )
+        selected_move_line.shopfloor_user_id = self.env.uid
+
+        new_expiration_date = "2022-08-27 12:00:00"
+        response = self.service.dispatch(
+            "set_lot_confirm_action",
+            params={
+                "picking_id": picking.id,
+                "selected_line_id": selected_move_line.id,
+                "lot_name": lot.name,
+                "expiration_date": new_expiration_date,
+            },
+        )
+        self.assertEqual(str(selected_move_line.expiration_date), new_expiration_date)
+        self.assert_response(
+            response,
+            next_state="set_quantity",
+            data={
+                "picking": self.data.picking(picking),
+                "selected_move_line": self.data.move_lines(selected_move_line),
+                "confirmation_required": None,
+            },
+        )
+
     @freeze_time("2020-01-01 11:00:00")
     def test_set_new_lot_and_expiration_date(self):
         picking = self._create_picking()

From d7214f6ae78b59abae14f2443de37c0092c07db8 Mon Sep 17 00:00:00 2001
From: Nicolas Delbovier <nicolas.delbovier@acsone.eu>
Date: Thu, 12 Feb 2026 11:46:09 +0100
Subject: [PATCH 12/34] [FIX] shopfloor_reception_mobile: normalize lot
 expiration dates to UTC

The frontend was sending expiration dates in the user's local timezone. Because Odoo expects datetime values in UTC, this caused "hour shifts" that could move the expiration date to the previous day in the database.

This fix ensures that the selected date is treated as local midnight and converted to the corresponding UTC timestamp before being sent to the server.
---
 .../static/src/scenario/reception.js          |  7 ------
 .../static/src/scenario/reception_states.js   | 23 ++++++++++++++++++-
 2 files changed, 22 insertions(+), 8 deletions(-)

diff --git a/shopfloor_reception_mobile/static/src/scenario/reception.js b/shopfloor_reception_mobile/static/src/scenario/reception.js
index 55c57dee53..93f7b9eac5 100644
--- a/shopfloor_reception_mobile/static/src/scenario/reception.js
+++ b/shopfloor_reception_mobile/static/src/scenario/reception.js
@@ -97,7 +97,6 @@ const Reception = {
             <template v-if="state_is('set_lot')">
                 <date-picker-input
                     v-if="line_being_handled.product.use_expiration_date"
-                    :handler_to_update_date="get_expiration_date_from_lot"
                     @date_picker_selected="state.on_date_picker_selected"
                 />
                 <item-detail-card
@@ -478,12 +477,6 @@ const Reception = {
 
             return true;
         },
-        get_expiration_date_from_lot: function (lot) {
-            if (!lot.expiration_date) {
-                return;
-            }
-            return lot.expiration_date.split("T")[0];
-        },
         move_card_color: function (move) {
             if (move.progress === 100) {
                 return "screen_step_done";
diff --git a/shopfloor_reception_mobile/static/src/scenario/reception_states.js b/shopfloor_reception_mobile/static/src/scenario/reception_states.js
index 8849631476..ebb4e0b383 100644
--- a/shopfloor_reception_mobile/static/src/scenario/reception_states.js
+++ b/shopfloor_reception_mobile/static/src/scenario/reception_states.js
@@ -139,11 +139,32 @@ export const reception_states = function () {
                 );
             },
             on_date_picker_selected: (expiration_date) => {
+                if (!expiration_date) return;
+
+                // We split and use the constructor to avoid JS auto-converting to UTC
+                // NB: JS uses the timezone info of the device
+                // NB: Yes, months are 0-indexed in JS, this is not a bug...
+                const [year, month, day] = expiration_date.split("-");
+                const localDate = new Date(year, month - 1, day, 0, 0, 0);
+
+                // 2. Convert local midnight to a UTC string. Odoo expects 'naive' UTC datetimes
+                // in the database. By converting here, we ensure data consistency: the
+                // backend stores the exact UTC moment, while the UI remains responsible
+                // for localizing that timestamp back to the user's specific timezone.
+                const utcYear = localDate.getUTCFullYear();
+                const utcMonth = String(localDate.getUTCMonth() + 1).padStart(2, "0");
+                const utcDay = String(localDate.getUTCDate()).padStart(2, "0");
+                const utcHours = String(localDate.getUTCHours()).padStart(2, "0");
+                const utcMinutes = String(localDate.getUTCMinutes()).padStart(2, "0");
+                const utcSeconds = String(localDate.getUTCSeconds()).padStart(2, "0");
+                // use the same format as odoo
+                const utcString = `${utcYear}-${utcMonth}-${utcDay} ${utcHours}:${utcMinutes}:${utcSeconds}`;
+
                 // We merge the new date with whatever is already in .lot
                 // If .lot is null/undefined, we start with an empty object
                 this.line_being_handled.lot = {
                     ...(this.line_being_handled.lot || {}),
-                    expiration_date: expiration_date,
+                    expiration_date: utcString,
                 };
             },
             on_confirm_lot: () => {

From a28efe12cc1a7c8d6783a9fc6fcc97b4ecaf9ec8 Mon Sep 17 00:00:00 2001
From: Nicolas Delbovier <nicolas.delbovier@acsone.eu>
Date: Thu, 12 Feb 2026 11:58:24 +0100
Subject: [PATCH 13/34] [IMP] shopfloor_reception_mobile: hide time from lot
 expiration date display

Updated the lot expiration display to show only the date component. Since the selection widget is restricted to dates, displaying the time was redundant.
---
 .../static/src/scenario/reception.js                 | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/shopfloor_reception_mobile/static/src/scenario/reception.js b/shopfloor_reception_mobile/static/src/scenario/reception.js
index 93f7b9eac5..afdcb2e9d2 100644
--- a/shopfloor_reception_mobile/static/src/scenario/reception.js
+++ b/shopfloor_reception_mobile/static/src/scenario/reception.js
@@ -323,7 +323,17 @@ const Reception = {
                         label: "Expiry date",
                         klass: "loud",
                         renderer: (rec, field) => {
-                            return this.utils.display.render_field_date(rec, field);
+                            return this.utils.display.format_date_display(
+                                _.result(rec, field.path),
+                                {
+                                    // Overwrite defaults to only show date and not time
+                                    format: {
+                                        day: "numeric",
+                                        month: "short",
+                                        year: "numeric",
+                                    },
+                                }
+                            );
                         },
                     },
                 ],

From 7baaa99ef9406fc32b081ef6095f84b3f0bf8b00 Mon Sep 17 00:00:00 2001
From: Nicolas Delbovier <nicolas.delbovier@acsone.eu>
Date: Thu, 12 Feb 2026 12:36:41 +0100
Subject: [PATCH 14/34] [IMP] shopfloor_reception_mobile: add red color for
 past lot expiration date

---
 .../static/src/scenario/reception.js          | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/shopfloor_reception_mobile/static/src/scenario/reception.js b/shopfloor_reception_mobile/static/src/scenario/reception.js
index afdcb2e9d2..8181a0c453 100644
--- a/shopfloor_reception_mobile/static/src/scenario/reception.js
+++ b/shopfloor_reception_mobile/static/src/scenario/reception.js
@@ -298,6 +298,23 @@ const Reception = {
                 },
             };
         },
+        _get_lot_expiration_date_klass: function () {
+            let klass = "loud";
+            const expiryValue = _.result(
+                this.line_being_handled,
+                "lot.expiration_date"
+            );
+
+            if (expiryValue) {
+                const expiryDate = new Date(expiryValue);
+                const now = new Date();
+                if (expiryDate < now) {
+                    klass += " red";
+                }
+            }
+            return klass;
+        },
+
         picking_detail_options_for_set_lot: function () {
             return {
                 key_title: "product.display_name",
@@ -321,7 +338,7 @@ const Reception = {
                     {
                         path: "lot.expiration_date",
                         label: "Expiry date",
-                        klass: "loud",
+                        klass: this._get_lot_expiration_date_klass(),
                         renderer: (rec, field) => {
                             return this.utils.display.format_date_display(
                                 _.result(rec, field.path),

From 931e86f9827bc151471cbed769e4860016c7ce45 Mon Sep 17 00:00:00 2001
From: Nicolas Delbovier <nicolas.delbovier@acsone.eu>
Date: Thu, 9 Apr 2026 16:19:28 +0200
Subject: [PATCH 15/34] [REF] shopfloor_reception_mobile: use
 refactored/improved date-picker-input code from
 https://github.com/OCA/wms/pull/1132

---
 shopfloor_reception_mobile/static/src/scenario/reception.js     | 2 +-
 .../static/src/scenario/reception_states.js                     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/shopfloor_reception_mobile/static/src/scenario/reception.js b/shopfloor_reception_mobile/static/src/scenario/reception.js
index 8181a0c453..761e0aa658 100644
--- a/shopfloor_reception_mobile/static/src/scenario/reception.js
+++ b/shopfloor_reception_mobile/static/src/scenario/reception.js
@@ -97,7 +97,7 @@ const Reception = {
             <template v-if="state_is('set_lot')">
                 <date-picker-input
                     v-if="line_being_handled.product.use_expiration_date"
-                    @date_picker_selected="state.on_date_picker_selected"
+                    @dateChange="state.on_date_change"
                 />
                 <item-detail-card
                     :record="line_being_handled"
diff --git a/shopfloor_reception_mobile/static/src/scenario/reception_states.js b/shopfloor_reception_mobile/static/src/scenario/reception_states.js
index ebb4e0b383..d758218bad 100644
--- a/shopfloor_reception_mobile/static/src/scenario/reception_states.js
+++ b/shopfloor_reception_mobile/static/src/scenario/reception_states.js
@@ -138,7 +138,7 @@ export const reception_states = function () {
                     })
                 );
             },
-            on_date_picker_selected: (expiration_date) => {
+            on_date_change: (expiration_date) => {
                 if (!expiration_date) return;
 
                 // We split and use the constructor to avoid JS auto-converting to UTC

From 5c75d827d40cc297bccaf8b8b1f7d77f5a8489e5 Mon Sep 17 00:00:00 2001
From: Nicolas Delbovier <nicolas.delbovier@acsone.eu>
Date: Wed, 18 Feb 2026 10:43:25 +0100
Subject: [PATCH 16/34] [FIX] shopfloor_reception: align component method
 naming and fix docstrings

- Rename internal methods to follow standard naming conventions, ensuring compatibility for downstream modules inheriting from this component.
- Updated docstrings to accurately reflect method behavior.
---
 shopfloor_reception/services/reception.py | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/shopfloor_reception/services/reception.py b/shopfloor_reception/services/reception.py
index 47f835c237..2d311bf86f 100644
--- a/shopfloor_reception/services/reception.py
+++ b/shopfloor_reception/services/reception.py
@@ -1194,10 +1194,6 @@ def set_lot_confirm_action(
             expiration_date: The expiration_date
 
         transitions:
-          - select_move: User clicked on back
-          - set_lot: Barcode not found. Ask user to create one from barcode
-          - set_lot: expiration_date has been set on the selected line
-          - set_lot: lot_it has been set on the selected line
           - set_lot: Error: expiration_date is required
           - set_quantity: User clicked on the confirm button
         """
@@ -1806,8 +1802,8 @@ def _list_stock_pickings_next_states(self):
     def _scan_line_next_states(self):
         return {"select_move", "set_lot", "set_quantity", "set_destination"}
 
-    def _set_lot_next_states(self):
-        return {"select_move", "set_lot", "set_quantity"}
+    def _set_lot_confirm_action_next_states(self):
+        return {"set_lot", "set_quantity"}
 
     def _scan_lot_name_next_states(self):
         return {"set_lot"}
@@ -1972,7 +1968,9 @@ def manual_select_move(self):
         return self._response_schema(next_states=self._scan_line_next_states())
 
     def set_lot_confirm_action(self):
-        return self._response_schema(next_states=self._set_lot_next_states())
+        return self._response_schema(
+            next_states=self._set_lot_confirm_action_next_states()
+        )
 
     def scan_lot_name(self):
         return self._response_schema(next_states=self._scan_lot_name_next_states())

From 27cc2cb8b2a7a597714a1453e3cade3338053942 Mon Sep 17 00:00:00 2001
From: Nicolas Delbovier <nicolas.delbovier@acsone.eu>
Date: Mon, 23 Feb 2026 15:39:55 +0100
Subject: [PATCH 17/34] [IMP] shopfloor_reception: use ISO format for lot
 expiration date

---
 shopfloor_reception/actions/data.py             | 16 +++++++++++++++-
 shopfloor_reception/services/reception.py       | 14 +++++++++-----
 shopfloor_reception/tests/test_scan_lot_name.py | 10 +++++++---
 3 files changed, 31 insertions(+), 9 deletions(-)

diff --git a/shopfloor_reception/actions/data.py b/shopfloor_reception/actions/data.py
index 1f34efd288..64bbe7abde 100644
--- a/shopfloor_reception/actions/data.py
+++ b/shopfloor_reception/actions/data.py
@@ -17,13 +17,27 @@ def _product_parser(self):
         res = super(DataAction, self)._product_parser
         return res + ["use_expiration_date"]
 
+    @property
+    def _lot_parser_reception(self):
+        return self._simple_record_parser() + [
+            "ref",
+            (
+                "expiration_date",
+                lambda rec, fname:
+                # Odoo Datetime fields are stored as naive UTC in the DB.
+                # Appending 'Z' (Zulu) explicitly tells the frontend the
+                # offset is +00:00
+                rec.expiration_date.isoformat() + "Z" if rec.expiration_date else None,
+            ),
+        ]
+
     @ensure_model("stock.move.line")
     def move_line(self, record, with_picking=False, **kw):
         data = super().move_line(record, with_picking, **kw)
 
         lot_data = {}
         if lot := kw.get("lot"):
-            lot_data = self._jsonify(lot, self._lot_parser)
+            lot_data = self._jsonify(lot, self._lot_parser_reception)
         else:
             if lot_name := kw.get("lot_name"):
                 lot_data["name"] = lot_name
diff --git a/shopfloor_reception/services/reception.py b/shopfloor_reception/services/reception.py
index 2d311bf86f..b966d50fdd 100644
--- a/shopfloor_reception/services/reception.py
+++ b/shopfloor_reception/services/reception.py
@@ -4,7 +4,7 @@
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl)
 
 
-from datetime import datetime, time
+from datetime import UTC, datetime, time
 
 import pytz
 from decorator import contextmanager
@@ -875,7 +875,7 @@ def _set_lot_from_parse(self, picking, line):
                     result.type == "expiration_date"
                     and line.product_id.use_expiration_date
                 ):
-                    expiration_date = result.value
+                    expiration_date = datetime.fromisoformat(result.value)
 
             if found:
                 return self.set_lot_confirm_action(
@@ -1185,7 +1185,7 @@ def scan_lot_name(self, picking_id, selected_line_id, lot_name):
         return res
 
     def set_lot_confirm_action(
-        self, picking_id, selected_line_id, lot_name, expiration_date=None
+        self, picking_id, selected_line_id, lot_name, expiration_date: datetime = None
     ):
         """Set lot and its expiration date
 
@@ -1224,7 +1224,8 @@ def set_lot_confirm_action(
         if not lot:
             lot = self.env["stock.lot"].new(self._create_lot_values(product, lot_name))
         if expiration_date:
-            lot.expiration_date = expiration_date.replace("T", " ")
+            # Odoo only accepts tz unaware datetimes
+            lot.expiration_date = expiration_date.astimezone(UTC).replace(tzinfo=None)
 
         # Convert in-memory record into real record
         if not lot._origin:
@@ -1650,7 +1651,10 @@ def set_lot_confirm_action(self):
                 "required": True,
             },
             "lot_name": {"type": "string", "required": True},
-            "expiration_date": {"type": "string"},
+            "expiration_date": {
+                "type": "datetime",
+                "coerce": datetime.fromisoformat,
+            },
         }
 
     def scan_lot_name(self):
diff --git a/shopfloor_reception/tests/test_scan_lot_name.py b/shopfloor_reception/tests/test_scan_lot_name.py
index 918d0d89c1..4958e927d4 100644
--- a/shopfloor_reception/tests/test_scan_lot_name.py
+++ b/shopfloor_reception/tests/test_scan_lot_name.py
@@ -1,7 +1,7 @@
 # Copyright 2026 ACSONE SA/NV
 # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
 
-from datetime import timedelta
+from datetime import UTC, datetime, timedelta
 from unittest import mock
 
 from odoo import fields
@@ -98,8 +98,12 @@ def test_scan_lot_name_extract_expiration_date_existing_lot(self):
             )
 
         self.assertEqual(
-            res["data"]["set_lot"]["selected_move_line"][0]["lot"]["expiration_date"],
-            expiration_date.isoformat(),
+            datetime.fromisoformat(
+                res["data"]["set_lot"]["selected_move_line"][0]["lot"][
+                    "expiration_date"
+                ]
+            ),
+            expiration_date.replace(tzinfo=UTC),
         )
         self.assertEqual(
             res["data"]["set_lot"]["selected_move_line"][0]["lot"]["name"],

From 08408e5967957f74b98feaf8ddb244b0ab9b5de1 Mon Sep 17 00:00:00 2001
From: Nicolas Delbovier <nicolas.delbovier@acsone.eu>
Date: Mon, 23 Feb 2026 15:40:26 +0100
Subject: [PATCH 18/34] [IMP] shopfloor_reception_mobile: use ISO format for
 lot expiration date

---
 .../static/src/scenario/reception_states.js   | 21 ++++---------------
 1 file changed, 4 insertions(+), 17 deletions(-)

diff --git a/shopfloor_reception_mobile/static/src/scenario/reception_states.js b/shopfloor_reception_mobile/static/src/scenario/reception_states.js
index d758218bad..b6e4bab428 100644
--- a/shopfloor_reception_mobile/static/src/scenario/reception_states.js
+++ b/shopfloor_reception_mobile/static/src/scenario/reception_states.js
@@ -141,30 +141,17 @@ export const reception_states = function () {
             on_date_change: (expiration_date) => {
                 if (!expiration_date) return;
 
-                // We split and use the constructor to avoid JS auto-converting to UTC
-                // NB: JS uses the timezone info of the device
-                // NB: Yes, months are 0-indexed in JS, this is not a bug...
+                // NB: Months are 0-indexed in JS
                 const [year, month, day] = expiration_date.split("-");
-                const localDate = new Date(year, month - 1, day, 0, 0, 0);
 
-                // 2. Convert local midnight to a UTC string. Odoo expects 'naive' UTC datetimes
-                // in the database. By converting here, we ensure data consistency: the
-                // backend stores the exact UTC moment, while the UI remains responsible
-                // for localizing that timestamp back to the user's specific timezone.
-                const utcYear = localDate.getUTCFullYear();
-                const utcMonth = String(localDate.getUTCMonth() + 1).padStart(2, "0");
-                const utcDay = String(localDate.getUTCDate()).padStart(2, "0");
-                const utcHours = String(localDate.getUTCHours()).padStart(2, "0");
-                const utcMinutes = String(localDate.getUTCMinutes()).padStart(2, "0");
-                const utcSeconds = String(localDate.getUTCSeconds()).padStart(2, "0");
-                // use the same format as odoo
-                const utcString = `${utcYear}-${utcMonth}-${utcDay} ${utcHours}:${utcMinutes}:${utcSeconds}`;
+                // JS will determine the time zone based on user's device
+                const localDate = new Date(year, month - 1, day, 0, 0, 0);
 
                 // We merge the new date with whatever is already in .lot
                 // If .lot is null/undefined, we start with an empty object
                 this.line_being_handled.lot = {
                     ...(this.line_being_handled.lot || {}),
-                    expiration_date: utcString,
+                    expiration_date: localDate.toISOString(),
                 };
             },
             on_confirm_lot: () => {

From cd7174544bd761095decdfb409d5ff3d55b11f8a Mon Sep 17 00:00:00 2001
From: Nicolas Delbovier <nicolas.delbovier@acsone.eu>
Date: Mon, 23 Feb 2026 16:54:35 +0100
Subject: [PATCH 19/34] [IMP] shopfloor_reception: prevent user from changing
 an existing expiration date on a lot

---
 shopfloor_reception/services/reception.py     | 32 ++++++++++++++-----
 .../tests/test_multi_barcode.py               |  1 +
 .../tests/test_set_lot_confirm.py             | 24 +++++++++++---
 3 files changed, 44 insertions(+), 13 deletions(-)

diff --git a/shopfloor_reception/services/reception.py b/shopfloor_reception/services/reception.py
index b966d50fdd..fe1e6981a7 100644
--- a/shopfloor_reception/services/reception.py
+++ b/shopfloor_reception/services/reception.py
@@ -1222,15 +1222,31 @@ def set_lot_confirm_action(
             )
 
         if not lot:
-            lot = self.env["stock.lot"].new(self._create_lot_values(product, lot_name))
-        if expiration_date:
-            # Odoo only accepts tz unaware datetimes
-            lot.expiration_date = expiration_date.astimezone(UTC).replace(tzinfo=None)
-
-        # Convert in-memory record into real record
-        if not lot._origin:
-            lot_vals = lot._convert_to_write(lot._cache)
+            lot_vals = self._create_lot_values(product, lot_name)
+            if expiration_date:
+                lot_vals["expiration_date"] = expiration_date.astimezone(UTC).replace(
+                    tzinfo=None
+                )
             lot = self.env["stock.lot"].create(lot_vals)
+        else:
+            if not expiration_date:
+                pass
+            elif not lot.expiration_date:
+                lot.expiration_date = expiration_date.astimezone(UTC).replace(
+                    tzinfo=None
+                )
+            elif lot.expiration_date.astimezone(UTC) != expiration_date.astimezone(UTC):
+                # Prevent user from overwritting an existing expiration date on an existing lot
+                return self._response_for_set_lot(
+                    picking,
+                    selected_line,
+                    message=self.msg_store.lot_already_exists_different_expiration_date(
+                        lot, expiration_date
+                    ),
+                    lot_name=lot_name,
+                    lot_expiration_date=expiration_date,
+                )
+
         selected_line.lot_id = lot.id
         selected_line._onchange_lot_id()
 
diff --git a/shopfloor_reception/tests/test_multi_barcode.py b/shopfloor_reception/tests/test_multi_barcode.py
index deaaac99a7..296af1f6a2 100644
--- a/shopfloor_reception/tests/test_multi_barcode.py
+++ b/shopfloor_reception/tests/test_multi_barcode.py
@@ -24,6 +24,7 @@ def test_scan_multiple_attribute_barcode(self):
         """
         picking = self._create_picking()
         lot = self._create_lot()
+        lot.expiration_date = None
         selected_move_line = picking.move_line_ids.filtered(
             lambda l: l.product_id == self.product_a
         )
diff --git a/shopfloor_reception/tests/test_set_lot_confirm.py b/shopfloor_reception/tests/test_set_lot_confirm.py
index 728e1b033f..cceacf0de2 100644
--- a/shopfloor_reception/tests/test_set_lot_confirm.py
+++ b/shopfloor_reception/tests/test_set_lot_confirm.py
@@ -123,7 +123,7 @@ def test_set_existing_lot_with_expiration_date(self):
         )
 
     @freeze_time("2020-01-01 11:00:00")
-    def test_set_existing_lot_overwrite_expiration_date(self):
+    def test_set_existing_lot_try_overwrite_expiration_date_error(self):
         self.product_a.use_expiration_date = True
         picking = self._create_picking()
         lot_expiration_date = "2022-08-23 12:00:00"
@@ -143,15 +143,29 @@ def test_set_existing_lot_overwrite_expiration_date(self):
                 "expiration_date": new_expiration_date,
             },
         )
-        self.assertEqual(str(selected_move_line.expiration_date), new_expiration_date)
+        self.assertEqual(
+            str(lot.expiration_date),
+            lot_expiration_date,
+            "Existing lot expiration date should not be overwritten",
+        )
+
+        # The error should send back the selected lot name and expiration date so
+        # to prevent clearing the UI fields after error message
+        move_line_response_data = self.data.move_lines(selected_move_line)
+        move_line_response_data[0]["lot"] = {
+            "name": lot.name,
+            "expiration_date": new_expiration_date.replace(" ", "T"),
+        }
         self.assert_response(
             response,
-            next_state="set_quantity",
+            next_state="set_lot",
             data={
                 "picking": self.data.picking(picking),
-                "selected_move_line": self.data.move_lines(selected_move_line),
-                "confirmation_required": None,
+                "selected_move_line": move_line_response_data,
             },
+            message=self.msg_store.lot_already_exists_different_expiration_date(
+                lot, new_expiration_date
+            ),
         )
 
     @freeze_time("2020-01-01 11:00:00")

From cb6389dd905f4231cb4b6842015b190b00f0337b Mon Sep 17 00:00:00 2001
From: Nicolas Delbovier <nicolas.delbovier@acsone.eu>
Date: Tue, 24 Feb 2026 08:08:17 +0100
Subject: [PATCH 20/34] [FIX] shopfloor_reception: fix Python 3.10
 compatibility

The 'UTC=timezone.utc' alias was introduced in Python 3.11.
To maintain support for environments running Python 3.10,  the alias is added manually at the beginning of the file
---
 shopfloor_reception/actions/data.py             | 6 +++---
 shopfloor_reception/services/reception.py       | 4 +++-
 shopfloor_reception/tests/test_scan_lot_name.py | 4 +++-
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/shopfloor_reception/actions/data.py b/shopfloor_reception/actions/data.py
index 64bbe7abde..6fea31a21e 100644
--- a/shopfloor_reception/actions/data.py
+++ b/shopfloor_reception/actions/data.py
@@ -25,9 +25,9 @@ def _lot_parser_reception(self):
                 "expiration_date",
                 lambda rec, fname:
                 # Odoo Datetime fields are stored as naive UTC in the DB.
-                # Appending 'Z' (Zulu) explicitly tells the frontend the
-                # offset is +00:00
-                rec.expiration_date.isoformat() + "Z" if rec.expiration_date else None,
+                rec.expiration_date.isoformat() + "+00:00"
+                if rec.expiration_date
+                else None,
             ),
         ]
 
diff --git a/shopfloor_reception/services/reception.py b/shopfloor_reception/services/reception.py
index fe1e6981a7..dc1b126ae0 100644
--- a/shopfloor_reception/services/reception.py
+++ b/shopfloor_reception/services/reception.py
@@ -4,7 +4,7 @@
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl)
 
 
-from datetime import UTC, datetime, time
+from datetime import datetime, time, timezone
 
 import pytz
 from decorator import contextmanager
@@ -17,6 +17,8 @@
 from odoo.addons.shopfloor.actions.search import SearchResult
 from odoo.addons.shopfloor.utils import to_float
 
+UTC = timezone.utc
+
 
 class Reception(Component):
     """
diff --git a/shopfloor_reception/tests/test_scan_lot_name.py b/shopfloor_reception/tests/test_scan_lot_name.py
index 4958e927d4..5fa01990c9 100644
--- a/shopfloor_reception/tests/test_scan_lot_name.py
+++ b/shopfloor_reception/tests/test_scan_lot_name.py
@@ -1,7 +1,7 @@
 # Copyright 2026 ACSONE SA/NV
 # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
 
-from datetime import UTC, datetime, timedelta
+from datetime import datetime, timedelta, timezone
 from unittest import mock
 
 from odoo import fields
@@ -11,6 +11,8 @@
 
 from .common import CommonCase
 
+UTC = timezone.utc
+
 
 class TestScanLotName(CommonCase):
     @classmethod

From 809b1fbd060122f1f24f7c8f6049b29655c729ef Mon Sep 17 00:00:00 2001
From: Nicolas Delbovier <nicolas.delbovier@acsone.eu>
Date: Tue, 24 Feb 2026 08:43:39 +0100
Subject: [PATCH 21/34] [FIX] shopfloor_reception: enforce lot creation
 restriction

Enforce the 'use_create_lots' setting from the picking type during the
reception process.
---
 shopfloor_reception/actions/message.py        |  9 +++++
 shopfloor_reception/services/reception.py     | 10 +++++
 .../tests/test_set_lot_confirm.py             | 40 +++++++++++++++++++
 3 files changed, 59 insertions(+)

diff --git a/shopfloor_reception/actions/message.py b/shopfloor_reception/actions/message.py
index 9771178ebd..5ac0571144 100644
--- a/shopfloor_reception/actions/message.py
+++ b/shopfloor_reception/actions/message.py
@@ -30,3 +30,12 @@ def lot_already_exists_different_expiration_date(self, lot, expiration_date):
                 provided=formatted_provided_expiration_date,
             ),
         }
+
+    def lot_creation_disabled(self, picking_type):
+        return {
+            "message_type": "error",
+            "body": _(
+                "The operation type '%(picking_type)s' does not allow to create new lots.",
+                picking_type=picking_type.display_name,
+            ),
+        }
diff --git a/shopfloor_reception/services/reception.py b/shopfloor_reception/services/reception.py
index dc1b126ae0..f8c709d383 100644
--- a/shopfloor_reception/services/reception.py
+++ b/shopfloor_reception/services/reception.py
@@ -1224,6 +1224,16 @@ def set_lot_confirm_action(
             )
 
         if not lot:
+            if not picking.picking_type_id.use_create_lots:
+                return self._response_for_set_lot(
+                    picking,
+                    selected_line,
+                    message=self.msg_store.lot_creation_disabled(
+                        picking.picking_type_id
+                    ),
+                    lot_name=lot_name,
+                    lot_expiration_date=expiration_date,
+                )
             lot_vals = self._create_lot_values(product, lot_name)
             if expiration_date:
                 lot_vals["expiration_date"] = expiration_date.astimezone(UTC).replace(
diff --git a/shopfloor_reception/tests/test_set_lot_confirm.py b/shopfloor_reception/tests/test_set_lot_confirm.py
index cceacf0de2..5a2230eea1 100644
--- a/shopfloor_reception/tests/test_set_lot_confirm.py
+++ b/shopfloor_reception/tests/test_set_lot_confirm.py
@@ -41,6 +41,7 @@ def test_set_existing_lot(self):
 
     def test_set_new_lot(self):
         picking = self._create_picking()
+        picking.picking_type_id.sudo().use_create_lots = True
         selected_move_line = picking.move_line_ids.filtered(
             lambda l: l.product_id == self.product_a
         )
@@ -171,6 +172,7 @@ def test_set_existing_lot_try_overwrite_expiration_date_error(self):
     @freeze_time("2020-01-01 11:00:00")
     def test_set_new_lot_and_expiration_date(self):
         picking = self._create_picking()
+        picking.picking_type_id.sudo().use_create_lots = True
         selected_move_line = picking.move_line_ids.filtered(
             lambda l: l.product_id == self.product_a
         )
@@ -237,3 +239,41 @@ def test_ensure_expiry_date(self):
             0,
             "No new lot should have been created in case of error.",
         )
+
+    def test_set_new_lot_creation_disabled_error(self):
+        picking = self._create_picking()
+        picking.picking_type_id.sudo().use_create_lots = False
+
+        selected_move_line = picking.move_line_ids.filtered(
+            lambda l: l.product_id == self.product_a
+        )
+        selected_move_line.shopfloor_user_id = self.env.uid
+
+        lot_name = "NewForbiddenLot"
+
+        nb_lots_before = self.env["stock.lot"].search_count([("name", "=", lot_name)])
+        response = self.service.dispatch(
+            "set_lot_confirm_action",
+            params={
+                "picking_id": picking.id,
+                "selected_line_id": selected_move_line.id,
+                "lot_name": lot_name,
+            },
+        )
+
+        # The response should keep us on 'set_lot' and show the error message
+        expected_selected_move_line_data = self.data.move_lines(selected_move_line)
+        expected_selected_move_line_data[0]["lot"] = {"name": lot_name}
+
+        self.assert_response(
+            response,
+            next_state="set_lot",
+            data={
+                "picking": self.data.picking(picking),
+                "selected_move_line": expected_selected_move_line_data,
+            },
+            message=self.msg_store.lot_creation_disabled(picking.picking_type_id),
+        )
+
+        nb_lots_after = self.env["stock.lot"].search_count([("name", "=", lot_name)])
+        self.assertEqual(nb_lots_after, nb_lots_before)

From dfb99477da0fe439a74715a9e101c8d77c46b9e0 Mon Sep 17 00:00:00 2001
From: Nicolas Delbovier <nicolas.delbovier@acsone.eu>
Date: Tue, 24 Feb 2026 12:09:33 +0100
Subject: [PATCH 22/34] [IMP] shopfloor_reception: prioritize lot_id over
 lot_name for state transitions

---
 shopfloor_reception/services/reception.py     | 45 ++++++++++---------
 shopfloor_reception/tests/test_select_move.py | 32 +++++++++++++
 2 files changed, 56 insertions(+), 21 deletions(-)

diff --git a/shopfloor_reception/services/reception.py b/shopfloor_reception/services/reception.py
index f8c709d383..15e1712185 100644
--- a/shopfloor_reception/services/reception.py
+++ b/shopfloor_reception/services/reception.py
@@ -75,6 +75,11 @@ def _check_picking_processible(self, pickings):
             states.append("draft")
         return super()._check_picking_processible(pickings, states=states)
 
+    def _move_line_needs_lot(self, move_line):
+        return (
+            move_line.product_id.tracking in ("lot", "serial") and not move_line.lot_id
+        )
+
     def _move_line_by_product(self, product):
         return self.env["stock.move.line"].search(
             self._domain_move_line_by_product(product)
@@ -200,13 +205,10 @@ def _response_for_confirm_new_package(
     def _select_document_from_move_lines(self, move_lines, msg_func):
         pickings = move_lines.move_id.picking_id
         if len(pickings) == 1:
-            if (
-                move_lines.product_id.tracking not in ("lot", "serial")
-                or move_lines.lot_id
-                or move_lines.lot_name
-            ):
-                return self._response_for_set_quantity(pickings, move_lines)
-            return self._response_for_set_lot(pickings, move_lines)
+            for line in move_lines:
+                if self._move_line_needs_lot(line):
+                    return self._response_for_set_lot(pickings, line)
+            return self._response_for_set_quantity(pickings, move_lines)
         elif len(pickings) > 1:
             return self._response_for_select_document(
                 pickings=pickings,
@@ -319,30 +321,31 @@ def _scan_line__find_or_create_line(self, picking, move, qty_done=1):
         return self._scan_line__assign_user(picking, line, qty_done)
 
     def _scan_line__recover(self, picking, line, default_qty):
-        product = line.product_id
         message = self.msg_store.recovered_previous_session()
         # Do not restore further than set_destination, because a destination location
         # might be set by default, and we want the user to be allowed to change it.
         if line.result_package_id:
             # Destination package is set, go to set_destination
             return self._response_for_set_destination(picking, line, message=message)
-        if product.tracking not in ("lot", "serial") or (line.lot_id or line.lot_name):
-            # If lot already set, go to set_quantity
-            rounding = line.product_uom_id.rounding
-            if float_is_zero(line.qty_done, precision_rounding=rounding):
-                # If no qty_done, set default qty_done
-                line.qty_done = default_qty
-            return self._before_state__set_quantity(picking, line, message=message)
-        # Otherwise go to select_lot
-        return self._response_for_set_lot(picking, line, message=message)
+
+        if self._move_line_needs_lot(line):
+            return self._response_for_set_lot(picking, line, message=message)
+
+        # If lot already set, go to set_quantity
+        rounding = line.product_uom_id.rounding
+        if float_is_zero(line.qty_done, precision_rounding=rounding):
+            # If no qty_done, set default qty_done
+            line.qty_done = default_qty
+        return self._before_state__set_quantity(picking, line, message=message)
 
     def _scan_line__assign_user(self, picking, line, qty_done):
-        product = line.product_id
         stock = self._actions_for("stock")
         stock.mark_move_line_as_picked(line, quantity=qty_done, split=False)
-        if product.tracking not in ("lot", "serial") or (line.lot_id or line.lot_name):
-            return self._before_state__set_quantity(picking, line)
-        return self._response_for_set_lot(picking, line)
+
+        if self._move_line_needs_lot(line):
+            return self._response_for_set_lot(picking, line)
+
+        return self._before_state__set_quantity(picking, line)
 
     def _select_line__filter_lines_by_packaging__return(self, lines, packaging):
         return_line = fields.first(
diff --git a/shopfloor_reception/tests/test_select_move.py b/shopfloor_reception/tests/test_select_move.py
index ad0ded79d9..ea79c1fe20 100644
--- a/shopfloor_reception/tests/test_select_move.py
+++ b/shopfloor_reception/tests/test_select_move.py
@@ -434,3 +434,35 @@ def test_manual_select_move(self):
                 "selected_move_line": self.data.move_lines(selected_move_line),
             },
         )
+
+    def test_select_move_next_state_ignores_lot_name(self):
+        picking = self._create_picking()
+
+        self.product_a.tracking = "lot"
+        self.product_b.tracking = "lot"
+
+        move_a = picking.move_ids.filtered(lambda m: m.product_id == self.product_a)
+        move_line_a = picking.move_line_ids.filtered(
+            lambda l: l.product_id == self.product_a
+        )
+        move_line_a.lot_id = self._create_lot()
+
+        move_b = picking.move_ids.filtered(lambda m: m.product_id == self.product_b)
+        move_line_b = picking.move_line_ids.filtered(
+            lambda l: l.product_id == self.product_b
+        )
+        move_line_b.lot_name = "Pre-Configured Lot Name"
+
+        # There is already a lot -> we skip "set_lot"
+        response_a = self.service.dispatch(
+            "manual_select_move",
+            params={"move_id": move_a.id},
+        )
+        self.assertEqual(response_a.get("next_state"), "set_quantity")
+
+        # There is a lot name but no lot record -> enter "set_lot"
+        response_b = self.service.dispatch(
+            "manual_select_move",
+            params={"move_id": move_b.id},
+        )
+        self.assertEqual(response_b.get("next_state"), "set_lot")

From ffb1b95e57f2647422c85563a2ef2064524cc39d Mon Sep 17 00:00:00 2001
From: Nicolas Delbovier <nicolas.delbovier@acsone.eu>
Date: Tue, 24 Feb 2026 14:37:26 +0100
Subject: [PATCH 23/34] [IMP] shopfloor_reception: resolve lot record from name
 for UI pre-fill

When a lot name is present on the move line, the system now attempts to find a matching existing
lot record. If found, the lot metadata is sent to the frontend to
pre-fill the screen, preventing redundant data entry.
---
 shopfloor_reception/services/reception.py     | 18 +++++++++++++++---
 shopfloor_reception/tests/test_select_move.py | 17 +++++++++++++++++
 2 files changed, 32 insertions(+), 3 deletions(-)

diff --git a/shopfloor_reception/services/reception.py b/shopfloor_reception/services/reception.py
index 15e1712185..aea3678bfc 100644
--- a/shopfloor_reception/services/reception.py
+++ b/shopfloor_reception/services/reception.py
@@ -207,7 +207,9 @@ def _select_document_from_move_lines(self, move_lines, msg_func):
         if len(pickings) == 1:
             for line in move_lines:
                 if self._move_line_needs_lot(line):
-                    return self._response_for_set_lot(pickings, line)
+                    return self._response_for_set_lot(
+                        pickings, line, lot_name=line.lot_name
+                    )
             return self._response_for_set_quantity(pickings, move_lines)
         elif len(pickings) > 1:
             return self._response_for_select_document(
@@ -329,7 +331,9 @@ def _scan_line__recover(self, picking, line, default_qty):
             return self._response_for_set_destination(picking, line, message=message)
 
         if self._move_line_needs_lot(line):
-            return self._response_for_set_lot(picking, line, message=message)
+            return self._response_for_set_lot(
+                picking, line, message=message, lot_name=line.lot_name
+            )
 
         # If lot already set, go to set_quantity
         rounding = line.product_uom_id.rounding
@@ -343,7 +347,7 @@ def _scan_line__assign_user(self, picking, line, qty_done):
         stock.mark_move_line_as_picked(line, quantity=qty_done, split=False)
 
         if self._move_line_needs_lot(line):
-            return self._response_for_set_lot(picking, line)
+            return self._response_for_set_lot(picking, line, lot_name=line.lot_name)
 
         return self._before_state__set_quantity(picking, line)
 
@@ -844,6 +848,14 @@ def _response_for_manual_selection(self):
 
     def _response_for_set_lot(self, picking, line, message=None, **kw):
         self._set_lot_from_parse(picking, line)
+
+        # Resolve existing lot from name to pre-fill metadata on the mobile UI.
+        if kw.get("lot_name") and not kw.get("lot_expiration_date"):
+            search = self._actions_for("search")
+            search_result = search.find(kw.get("lot_name"), types=["lot"])
+            if lot := search_result.record:
+                kw["lot"] = lot
+
         return self._response(
             next_state="set_lot",
             data={
diff --git a/shopfloor_reception/tests/test_select_move.py b/shopfloor_reception/tests/test_select_move.py
index ea79c1fe20..987a12c60e 100644
--- a/shopfloor_reception/tests/test_select_move.py
+++ b/shopfloor_reception/tests/test_select_move.py
@@ -452,6 +452,11 @@ def test_select_move_next_state_ignores_lot_name(self):
             lambda l: l.product_id == self.product_b
         )
         move_line_b.lot_name = "Pre-Configured Lot Name"
+        self._create_lot(
+            product_id=self.product_b.id,
+            name="Pre-Configured Lot Name",
+            expiration_date="2020-02-02 12:00:00",
+        )
 
         # There is already a lot -> we skip "set_lot"
         response_a = self.service.dispatch(
@@ -466,3 +471,15 @@ def test_select_move_next_state_ignores_lot_name(self):
             params={"move_id": move_b.id},
         )
         self.assertEqual(response_b.get("next_state"), "set_lot")
+
+        # The UI should receive the lot metadata so as to be able to prefill
+        self.assertEqual(
+            response_b["data"]["set_lot"]["selected_move_line"][0]["lot"]["name"],
+            "Pre-Configured Lot Name",
+        )
+        self.assertEqual(
+            response_b["data"]["set_lot"]["selected_move_line"][0]["lot"][
+                "expiration_date"
+            ],
+            "2020-02-02T12:00:00+00:00",
+        )

From 2f4896010dfd7352d47116bd8df29b1252f1b2ab Mon Sep 17 00:00:00 2001
From: Nicolas Delbovier <nicolas.delbovier@acsone.eu>
Date: Tue, 24 Feb 2026 14:42:45 +0100
Subject: [PATCH 24/34] [IMP] shopfloor_reception: auto-confirm lot when data
 is found in scan

Update '_response_for_set_lot' to check if lot information was already
resolved during parsing. If the parsed data is complete, the system now
bypasses the 'set_lot' entry screen and processes the confirmation
automatically.
---
 shopfloor_reception/services/reception.py       | 9 +++++++--
 shopfloor_reception/tests/test_multi_barcode.py | 3 ++-
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/shopfloor_reception/services/reception.py b/shopfloor_reception/services/reception.py
index aea3678bfc..751559e1e2 100644
--- a/shopfloor_reception/services/reception.py
+++ b/shopfloor_reception/services/reception.py
@@ -847,9 +847,14 @@ def _response_for_manual_selection(self):
         return self._response(next_state="manual_selection", data=data)
 
     def _response_for_set_lot(self, picking, line, message=None, **kw):
-        self._set_lot_from_parse(picking, line)
+        # Bypass "set_lot" screen and send lot info to endpoint directly if
+        # lot info have been found when parsing
+        response = self._set_lot_from_parse(picking, line)
+        if response:
+            return response
 
-        # Resolve existing lot from name to pre-fill metadata on the mobile UI.
+        # In case the lot_name has been filled on the move line (but not the lot_id)
+        # Send lot values to frontend to allow pre-fill the screen
         if kw.get("lot_name") and not kw.get("lot_expiration_date"):
             search = self._actions_for("search")
             search_result = search.find(kw.get("lot_name"), types=["lot"])
diff --git a/shopfloor_reception/tests/test_multi_barcode.py b/shopfloor_reception/tests/test_multi_barcode.py
index 296af1f6a2..f9a45de31a 100644
--- a/shopfloor_reception/tests/test_multi_barcode.py
+++ b/shopfloor_reception/tests/test_multi_barcode.py
@@ -48,10 +48,11 @@ def test_scan_multiple_attribute_barcode(self):
         data = self.data.picking(picking)
         self.assert_response(
             response,
-            next_state="set_lot",
+            next_state="set_quantity",
             data={
                 "picking": data,
                 "selected_move_line": self.data.move_lines(selected_move_line),
+                "confirmation_required": None,
             },
         )
         self.assertEqual(

From 83ceb30fcc3e0ffeb69e4e67eae7576df1268fca Mon Sep 17 00:00:00 2001
From: Nicolas Delbovier <nicolas.delbovier@acsone.eu>
Date: Fri, 17 Apr 2026 14:40:35 +0200
Subject: [PATCH 25/34] [IMP] shopfloor_reception: remove dead code

---
 shopfloor_reception/services/reception.py | 18 ------------------
 1 file changed, 18 deletions(-)

diff --git a/shopfloor_reception/services/reception.py b/shopfloor_reception/services/reception.py
index 751559e1e2..addfefcad1 100644
--- a/shopfloor_reception/services/reception.py
+++ b/shopfloor_reception/services/reception.py
@@ -202,24 +202,6 @@ def _response_for_confirm_new_package(
             next_state="confirm_new_package", data=data, message=message
         )
 
-    def _select_document_from_move_lines(self, move_lines, msg_func):
-        pickings = move_lines.move_id.picking_id
-        if len(pickings) == 1:
-            for line in move_lines:
-                if self._move_line_needs_lot(line):
-                    return self._response_for_set_lot(
-                        pickings, line, lot_name=line.lot_name
-                    )
-            return self._response_for_set_quantity(pickings, move_lines)
-        elif len(pickings) > 1:
-            return self._response_for_select_document(
-                pickings=pickings,
-                message=self.msg_store.multiple_picks_found_select_manually(),
-            )
-        # If no available picking with the right state has been found,
-        # return an error
-        return self._response_for_select_document(message=msg_func())
-
     def _scan_document__create_return(self, picking, return_type, barcode):
         stock = self._actions_for("stock")
         return_picking = stock.create_return_picking(picking, return_type, barcode)

From 9f759f2f715dfa1613cf78a2dd7feadad6f5f6a7 Mon Sep 17 00:00:00 2001
From: Nicolas Delbovier <nicolas.delbovier@acsone.eu>
Date: Fri, 17 Apr 2026 15:50:48 +0200
Subject: [PATCH 26/34] [REF] shopfloor_reception: improve code clarity of
 `set_lot_confirm_action`

Break down the function into smaller functions to isolate responsability and make code more readable
---
 shopfloor_reception/services/reception.py | 86 ++++++++++++++---------
 1 file changed, 52 insertions(+), 34 deletions(-)

diff --git a/shopfloor_reception/services/reception.py b/shopfloor_reception/services/reception.py
index addfefcad1..78549028ea 100644
--- a/shopfloor_reception/services/reception.py
+++ b/shopfloor_reception/services/reception.py
@@ -1203,6 +1203,7 @@ def set_lot_confirm_action(
         """
         picking = self.env["stock.picking"].browse(picking_id)
         selected_line = self.env["stock.move.line"].browse(selected_line_id)
+
         message = self._check_picking_processible(picking)
         if message:
             return self._response_for_set_lot(picking, selected_line, message=message)
@@ -1215,7 +1216,7 @@ def set_lot_confirm_action(
         product = selected_line.product_id
         lot = search.lot_from_scan(lot_name, products=product)
 
-        if selected_line.product_id.use_expiration_date and (
+        if product.use_expiration_date and (
             not expiration_date and not lot.expiration_date
         ):
             return self._response_for_set_lot(
@@ -1226,46 +1227,63 @@ def set_lot_confirm_action(
             )
 
         if not lot:
-            if not picking.picking_type_id.use_create_lots:
-                return self._response_for_set_lot(
-                    picking,
-                    selected_line,
-                    message=self.msg_store.lot_creation_disabled(
-                        picking.picking_type_id
-                    ),
-                    lot_name=lot_name,
-                    lot_expiration_date=expiration_date,
-                )
-            lot_vals = self._create_lot_values(product, lot_name)
-            if expiration_date:
-                lot_vals["expiration_date"] = expiration_date.astimezone(UTC).replace(
-                    tzinfo=None
-                )
-            lot = self.env["stock.lot"].create(lot_vals)
+            error_response = self._set_lot_confirm_action__handle_new_lot(
+                picking, selected_line, lot_name, expiration_date
+            )
+            if error_response:
+                return error_response
+            lot = self.env.context["lot"]
         else:
-            if not expiration_date:
-                pass
-            elif not lot.expiration_date:
-                lot.expiration_date = expiration_date.astimezone(UTC).replace(
-                    tzinfo=None
-                )
-            elif lot.expiration_date.astimezone(UTC) != expiration_date.astimezone(UTC):
-                # Prevent user from overwritting an existing expiration date on an existing lot
-                return self._response_for_set_lot(
-                    picking,
-                    selected_line,
-                    message=self.msg_store.lot_already_exists_different_expiration_date(
-                        lot, expiration_date
-                    ),
-                    lot_name=lot_name,
-                    lot_expiration_date=expiration_date,
-                )
+            error_response = self._set_lot_confirm_action__handle_existing_lot(
+                picking, selected_line, lot, expiration_date
+            )
+            if error_response:
+                return error_response
 
         selected_line.lot_id = lot.id
         selected_line._onchange_lot_id()
 
         return self._before_state__set_quantity(picking, selected_line)
 
+    def _set_lot_confirm_action__handle_new_lot(
+        self, picking, line, lot_name, expiration_date
+    ):
+        if not picking.picking_type_id.use_create_lots:
+            return self._response_for_set_lot(
+                picking,
+                line,
+                message=self.msg_store.lot_creation_disabled(picking.picking_type_id),
+                lot_name=lot_name,
+                lot_expiration_date=expiration_date,
+            )
+        lot_vals = self._create_lot_values(line.product_id, lot_name)
+        if expiration_date:
+            lot_vals["expiration_date"] = expiration_date.astimezone(UTC).replace(
+                tzinfo=None
+            )
+        lot = self.env["stock.lot"].create(lot_vals)
+        # Inject lot into context to propagate it through the call stack without extra queries
+        self.env.context = {**self.env.context} | {"lot": lot}
+
+    def _set_lot_confirm_action__handle_existing_lot(
+        self, picking, line, lot, expiration_date
+    ):
+        if not expiration_date:
+            return
+        elif not lot.expiration_date:
+            lot.expiration_date = expiration_date.astimezone(UTC).replace(tzinfo=None)
+        elif lot.expiration_date.astimezone(UTC) != expiration_date.astimezone(UTC):
+            # Prevent user from overwritting an existing expiration date on an existing lot
+            return self._response_for_set_lot(
+                picking,
+                line,
+                message=self.msg_store.lot_already_exists_different_expiration_date(
+                    lot, expiration_date
+                ),
+                lot_name=lot.name,
+                lot_expiration_date=expiration_date,
+            )
+
     def _create_lot_values(self, product, lot_name):
         return {
             "name": lot_name,

From 78376aa427be7cb390a024dea58097d0a3c5d0a9 Mon Sep 17 00:00:00 2001
From: Nicolas Delbovier <nicolas.delbovier@acsone.eu>
Date: Fri, 17 Apr 2026 15:17:00 +0200
Subject: [PATCH 27/34] [FIX] shopfloor_reception: make sure "set_lot" is
 skipped on existing lot scan

---
 shopfloor_reception/services/reception.py     | 58 +++++++++----------
 .../tests/test_scan_lot_name.py               | 23 ++++++++
 shopfloor_reception/tests/test_select_move.py |  9 +--
 3 files changed, 57 insertions(+), 33 deletions(-)

diff --git a/shopfloor_reception/services/reception.py b/shopfloor_reception/services/reception.py
index 78549028ea..446de8e8f3 100644
--- a/shopfloor_reception/services/reception.py
+++ b/shopfloor_reception/services/reception.py
@@ -313,9 +313,7 @@ def _scan_line__recover(self, picking, line, default_qty):
             return self._response_for_set_destination(picking, line, message=message)
 
         if self._move_line_needs_lot(line):
-            return self._response_for_set_lot(
-                picking, line, message=message, lot_name=line.lot_name
-            )
+            return self._set_lot(picking, line, message=message, lot_name=line.lot_name)
 
         # If lot already set, go to set_quantity
         rounding = line.product_uom_id.rounding
@@ -329,7 +327,7 @@ def _scan_line__assign_user(self, picking, line, qty_done):
         stock.mark_move_line_as_picked(line, quantity=qty_done, split=False)
 
         if self._move_line_needs_lot(line):
-            return self._response_for_set_lot(picking, line, lot_name=line.lot_name)
+            return self._set_lot(picking, line, lot_name=line.lot_name)
 
         return self._before_state__set_quantity(picking, line)
 
@@ -829,19 +827,12 @@ def _response_for_manual_selection(self):
         return self._response(next_state="manual_selection", data=data)
 
     def _response_for_set_lot(self, picking, line, message=None, **kw):
-        # Bypass "set_lot" screen and send lot info to endpoint directly if
-        # lot info have been found when parsing
-        response = self._set_lot_from_parse(picking, line)
-        if response:
-            return response
-
-        # In case the lot_name has been filled on the move line (but not the lot_id)
-        # Send lot values to frontend to allow pre-fill the screen
-        if kw.get("lot_name") and not kw.get("lot_expiration_date"):
-            search = self._actions_for("search")
-            search_result = search.find(kw.get("lot_name"), types=["lot"])
-            if lot := search_result.record:
-                kw["lot"] = lot
+        # Try pre-fill expiration_date for UI
+        if kw.get("lot_name") and not kw.get("lot_expiration_date") and not message:
+            lot = self._actions_for("search").lot_from_scan(
+                kw.get("lot_name"), line.product_id
+            )
+            kw["lot_expiration_date"] = lot.expiration_date or line.expiration_date
 
         return self._response(
             next_state="set_lot",
@@ -852,17 +843,15 @@ def _response_for_set_lot(self, picking, line, message=None, **kw):
             message=message,
         )
 
-    def _set_lot_from_parse(self, picking, line):
-        """
-        The lot has not been found in move lines before this call.
-
-        Following the picking type configuration, set it:
+    def _set_lot(self, picking, line, message=None, **kw):
+        # Bypass "set_lot" screen and send lot info to endpoint directly if
+        # lot info have been found when parsing
+        if response := self._set_lot_from_parse(picking, line):
+            return response
+        return self._response_for_set_lot(picking, line, message, **kw)
 
-            - on lot_id if record is found
-            - on lot_name if record is not found
-            - set expiration date if found in parse result
-        """
-        if line.shopfloor_should_create_lot and self.search_result.parse_result:
+    def _set_lot_from_parse(self, picking, line):
+        if self.search_result.parse_result:
             expiration_date = None
             lot_name = None
             found = False
@@ -886,6 +875,16 @@ def _set_lot_from_parse(self, picking, line):
                     picking.id, line.id, lot_name, expiration_date
                 )
 
+        # We could have found a lot, but with result type "unknow"
+        # Put this afterwards to favor multi-attribute barcode parsing
+        # logic first
+        if self.search_result.record and isinstance(
+            self.search_result.record, self.env["stock.lot"].__class__
+        ):
+            return self.set_lot_confirm_action(
+                picking.id, line.id, lot_name=self.search_result.record.name
+            )
+
     def _align_display_product_uom_qty(self, line, response):
         # This method aligns product uom qties on move lines.
         # In the shopfloor context, we might have multiple users working at
@@ -1212,9 +1211,10 @@ def set_lot_confirm_action(
                 picking, selected_line, message=self.msg_store.record_not_found()
             )
 
-        search = self._actions_for("search")
         product = selected_line.product_id
-        lot = search.lot_from_scan(lot_name, products=product)
+        lot = self.search_result.record or self._actions_for("search").lot_from_scan(
+            lot_name, product
+        )
 
         if product.use_expiration_date and (
             not expiration_date and not lot.expiration_date
diff --git a/shopfloor_reception/tests/test_scan_lot_name.py b/shopfloor_reception/tests/test_scan_lot_name.py
index 5fa01990c9..ff5e1e42e1 100644
--- a/shopfloor_reception/tests/test_scan_lot_name.py
+++ b/shopfloor_reception/tests/test_scan_lot_name.py
@@ -117,3 +117,26 @@ def test_scan_lot_name_extract_expiration_date_existing_lot(self):
                 lot, lot.expiration_date + timedelta(days=2)
             ),
         )
+
+    def test_scan_lot_name_auto_set_lot_on_move_line(self):
+        """
+        If lot exists and lot_name is set on the move line,
+        auto-fill the lot_id and skip "sel_lot" state.
+        """
+        picking = self._create_picking()
+        lot = self._create_lot()
+        selected_move_line = picking.move_line_ids.filtered(
+            lambda l: l.product_id == self.product_a
+        )
+        selected_move_line.lot_name = lot.name
+
+        res = self.service.dispatch(
+            "scan_line",
+            params={
+                "picking_id": picking.id,
+                "barcode": lot.name,
+            },
+        )
+
+        self.assertEqual(res["next_state"], "set_quantity")
+        self.assertEqual(selected_move_line.lot_id, lot)
diff --git a/shopfloor_reception/tests/test_select_move.py b/shopfloor_reception/tests/test_select_move.py
index 987a12c60e..7eca065d22 100644
--- a/shopfloor_reception/tests/test_select_move.py
+++ b/shopfloor_reception/tests/test_select_move.py
@@ -129,7 +129,8 @@ def test_scan_product_partial(self):
         )
 
         self.assertNotEqual(
-            previous_line.id, response["data"]["set_lot"]["selected_move_line"][0]["id"]
+            previous_line.id,
+            response["data"]["set_quantity"]["selected_move_line"][0]["id"],
         )
 
     def test_scan_packaging(self):
@@ -206,8 +207,8 @@ def test_scan_lot_concurrent(self):
             },
         )
         self.assertNotEqual(
-            res_u1["data"]["set_lot"]["selected_move_line"][0]["id"],
-            res_u2["data"]["set_lot"]["selected_move_line"][0]["id"],
+            res_u1["data"]["set_quantity"]["selected_move_line"][0]["id"],
+            res_u2["data"]["set_quantity"]["selected_move_line"][0]["id"],
         )
 
     def test_scan_not_tracked_product(self):
@@ -481,5 +482,5 @@ def test_select_move_next_state_ignores_lot_name(self):
             response_b["data"]["set_lot"]["selected_move_line"][0]["lot"][
                 "expiration_date"
             ],
-            "2020-02-02T12:00:00+00:00",
+            "2020-02-02T12:00:00",
         )

From 58530e1c5529f6e85255f76e684b63e67ed138b1 Mon Sep 17 00:00:00 2001
From: Nicolas Delbovier <nicolas.delbovier@acsone.eu>
Date: Wed, 29 Apr 2026 13:57:30 +0200
Subject: [PATCH 28/34] [FIX] shopfloor_reception: fix incorrect lot_name parse
 when scanning gs1

Co-authored-by: Copilot <copilot@github.com>
---
 shopfloor_reception/actions/data.py           |  5 +++++
 shopfloor_reception/actions/message.py        |  6 +++---
 shopfloor_reception/services/reception.py     | 18 +++++++++++++-----
 .../tests/test_scan_lot_name.py               | 19 ++++++++++++++++---
 4 files changed, 37 insertions(+), 11 deletions(-)

diff --git a/shopfloor_reception/actions/data.py b/shopfloor_reception/actions/data.py
index 6fea31a21e..64b4874142 100644
--- a/shopfloor_reception/actions/data.py
+++ b/shopfloor_reception/actions/data.py
@@ -38,6 +38,11 @@ def move_line(self, record, with_picking=False, **kw):
         lot_data = {}
         if lot := kw.get("lot"):
             lot_data = self._jsonify(lot, self._lot_parser_reception)
+            # add expiration_date from scan if not defined on existing lot
+            if not lot_data.get("expiration_date") and (
+                lot_expiration_date := kw.get("lot_expiration_date")
+            ):
+                lot_data["expiration_date"] = lot_expiration_date.isoformat()
         else:
             if lot_name := kw.get("lot_name"):
                 lot_data["name"] = lot_name
diff --git a/shopfloor_reception/actions/message.py b/shopfloor_reception/actions/message.py
index 5ac0571144..ef38141237 100644
--- a/shopfloor_reception/actions/message.py
+++ b/shopfloor_reception/actions/message.py
@@ -22,9 +22,9 @@ def lot_already_exists_different_expiration_date(self, lot, expiration_date):
         return {
             "message_type": "warning",
             "body": _(
-                "A lot already exists with a different expiration date.\n\n"
-                "Lot '%(lot_name)s' expiration date: %(current)s "
-                "!= provided expiration date: %(provided)s",
+                "This lot already exists with a different expiration date.\n\n"
+                "Lot: '%(lot_name)s'\nStored expiration date: %(current)s"
+                "\nProvided expiration date: %(provided)s",
                 lot_name=lot.name,
                 current=formatted_lot_expiration_date,
                 provided=formatted_provided_expiration_date,
diff --git a/shopfloor_reception/services/reception.py b/shopfloor_reception/services/reception.py
index 446de8e8f3..0809711aa0 100644
--- a/shopfloor_reception/services/reception.py
+++ b/shopfloor_reception/services/reception.py
@@ -1162,16 +1162,24 @@ def scan_lot_name(self, picking_id, selected_line_id, lot_name):
             handler_kw={"lot": {"products": selected_line.product_id}},
         )
 
-        if search_result.type == "lot":
-            existing_lot = search_result.record
-
         # Look for more info in the barcode
         for result in search_result.parse_result:
-            if result.type == "expiration_date":
+            if result.type == "lot":
+                lot_name = result.value
+            elif result.type == "expiration_date":
                 lot_expiration_date = result.value
 
+        if search_result.type == "lot":
+            existing_lot = search_result.record
+        if not existing_lot:
+            existing_lot = search.lot_from_scan(lot_name, selected_line.product_id)
+
         message = None
-        if lot_expiration_date and existing_lot.expiration_date != lot_expiration_date:
+        if (
+            lot_expiration_date
+            and existing_lot
+            and existing_lot.expiration_date != lot_expiration_date
+        ):
             message = self.msg_store.lot_already_exists_different_expiration_date(
                 existing_lot, lot_expiration_date
             )
diff --git a/shopfloor_reception/tests/test_scan_lot_name.py b/shopfloor_reception/tests/test_scan_lot_name.py
index ff5e1e42e1..6c054666ba 100644
--- a/shopfloor_reception/tests/test_scan_lot_name.py
+++ b/shopfloor_reception/tests/test_scan_lot_name.py
@@ -12,6 +12,9 @@
 from .common import CommonCase
 
 UTC = timezone.utc
+GTIN_AI = "01"
+LOT_AI = "10"
+EXPIRATION_DATE_AI = "17"
 
 
 class TestScanLotName(CommonCase):
@@ -34,13 +37,18 @@ def test_scan_lot_name_extract_expiration_date_new_lot(self):
         )
         selected_move_line.shopfloor_user_id = self.env.uid
 
+        gs1_barcode = (
+            f"{GTIN_AI}01234567890128{EXPIRATION_DATE_AI}220702{LOT_AI}{lot.name}"
+        )
+
         with mock.patch.object(SearchAction, "find") as mock_find:
             mock_find.return_value = SearchResult(
                 record=None,
                 type="None",
                 parse_result=[
-                    BarcodeResult(type="unknown", value=lot.name),
+                    BarcodeResult(type="unknown", value=gs1_barcode),
                     BarcodeResult(type="expiration_date", value=expiration_date),
+                    BarcodeResult(type="lot", value=lot.name),
                 ],
             )
             res = self.service.dispatch(
@@ -78,16 +86,21 @@ def test_scan_lot_name_extract_expiration_date_existing_lot(self):
         )
         selected_move_line.shopfloor_user_id = self.env.uid
 
+        gs1_barcode = (
+            f"{GTIN_AI}01234567890128{EXPIRATION_DATE_AI}220704{LOT_AI}{lot.name}"
+        )
+
         with mock.patch.object(SearchAction, "find") as mock_find:
             mock_find.return_value = SearchResult(
                 record=lot,
                 type="lot",
                 parse_result=[
-                    BarcodeResult(type="unknown", value=lot.name),
+                    BarcodeResult(type="unknown", value=gs1_barcode),
                     BarcodeResult(
                         type="expiration_date",
-                        value=lot.expiration_date + timedelta(days=2),
+                        value=expiration_date + timedelta(days=2),
                     ),
+                    BarcodeResult(type="lot", value=lot.name),
                 ],
             )
             res = self.service.dispatch(

From b20c3d0b5f21709e03faf0142f2ba994a6bef7d0 Mon Sep 17 00:00:00 2001
From: Nicolas Delbovier <nicolas.delbovier@acsone.eu>
Date: Mon, 4 May 2026 09:44:48 +0200
Subject: [PATCH 29/34] [REF] shopfloor_reception: rename endpoint
 'scan_lot_name' to 'scan_lot'

The previous naming 'scan_lot_name' was misleading as the endpoint
is designed to handle more than just a string identifier.

In many workflows, such as GS1 barcoding, the incoming data
contains multiple attributes (e.g., lot name, expiration date,
or weight). Renaming the endpoint to 'scan_lot' provides a more
generic and accurate description of its functional scope.
---
 shopfloor_reception/services/reception.py         | 15 ++++++++-------
 shopfloor_reception/tests/__init__.py             |  2 +-
 .../{test_scan_lot_name.py => test_scan_lot.py}   | 12 ++++++------
 3 files changed, 15 insertions(+), 14 deletions(-)
 rename shopfloor_reception/tests/{test_scan_lot_name.py => test_scan_lot.py} (94%)

diff --git a/shopfloor_reception/services/reception.py b/shopfloor_reception/services/reception.py
index 0809711aa0..d147617430 100644
--- a/shopfloor_reception/services/reception.py
+++ b/shopfloor_reception/services/reception.py
@@ -1141,7 +1141,7 @@ def _handle_backorder(self, picking, cancel_backorder=False):
             # Remove user_id on backorder, if any
             backorders_after.user_id = False
 
-    def scan_lot_name(self, picking_id, selected_line_id, lot_name):
+    def scan_lot(self, picking_id, selected_line_id, barcode):
         picking = self.env["stock.picking"].browse(picking_id)
         selected_line = self.env["stock.move.line"].browse(selected_line_id)
         message = self._check_picking_processible(picking)
@@ -1157,12 +1157,13 @@ def scan_lot_name(self, picking_id, selected_line_id, lot_name):
 
         search = self._actions_for("search")
         search_result = search.find(
-            barcode=lot_name,
+            barcode=barcode,
             types=["lot", "expiration_date"],
             handler_kw={"lot": {"products": selected_line.product_id}},
         )
 
         # Look for more info in the barcode
+        lot_name = barcode
         for result in search_result.parse_result:
             if result.type == "lot":
                 lot_name = result.value
@@ -1713,7 +1714,7 @@ def set_lot_confirm_action(self):
             },
         }
 
-    def scan_lot_name(self):
+    def scan_lot(self):
         return {
             "picking_id": {"coerce": to_int, "required": True, "type": "integer"},
             "selected_line_id": {
@@ -1721,7 +1722,7 @@ def scan_lot_name(self):
                 "type": "integer",
                 "required": True,
             },
-            "lot_name": {"type": "string", "required": True},
+            "barcode": {"type": "string", "required": True},
         }
 
     def set_quantity(self):
@@ -1865,7 +1866,7 @@ def _scan_line_next_states(self):
     def _set_lot_confirm_action_next_states(self):
         return {"set_lot", "set_quantity"}
 
-    def _scan_lot_name_next_states(self):
+    def _scan_lot_next_states(self):
         return {"set_lot"}
 
     def _set_quantity_next_states(self):
@@ -2032,8 +2033,8 @@ def set_lot_confirm_action(self):
             next_states=self._set_lot_confirm_action_next_states()
         )
 
-    def scan_lot_name(self):
-        return self._response_schema(next_states=self._scan_lot_name_next_states())
+    def scan_lot(self):
+        return self._response_schema(next_states=self._scan_lot_next_states())
 
     def set_quantity(self):
         return self._response_schema(next_states=self._set_quantity_next_states())
diff --git a/shopfloor_reception/tests/__init__.py b/shopfloor_reception/tests/__init__.py
index a49d367b7c..106133b0a2 100644
--- a/shopfloor_reception/tests/__init__.py
+++ b/shopfloor_reception/tests/__init__.py
@@ -13,4 +13,4 @@
 from . import test_return_set_quantity
 from . import test_return_reception_done
 from . import test_recover
-from . import test_scan_lot_name
+from . import test_scan_lot
diff --git a/shopfloor_reception/tests/test_scan_lot_name.py b/shopfloor_reception/tests/test_scan_lot.py
similarity index 94%
rename from shopfloor_reception/tests/test_scan_lot_name.py
rename to shopfloor_reception/tests/test_scan_lot.py
index 6c054666ba..e52a35183e 100644
--- a/shopfloor_reception/tests/test_scan_lot_name.py
+++ b/shopfloor_reception/tests/test_scan_lot.py
@@ -24,7 +24,7 @@ def setUpClassBaseData(cls):
         cls.product_a.tracking = "lot"
         return res
 
-    def test_scan_lot_name_extract_expiration_date_new_lot(self):
+    def test_scan_lot_extract_expiration_date_new_lot(self):
         """
         Test that the expiration date can be extracted from barcode scan
         (case when the lot does not already exsit in db)
@@ -52,11 +52,11 @@ def test_scan_lot_name_extract_expiration_date_new_lot(self):
                 ],
             )
             res = self.service.dispatch(
-                "scan_lot_name",
+                "scan_lot",
                 params={
                     "picking_id": picking.id,
                     "selected_line_id": selected_move_line.id,
-                    "lot_name": lot.name,
+                    "barcode": lot.name,
                 },
             )
 
@@ -68,7 +68,7 @@ def test_scan_lot_name_extract_expiration_date_new_lot(self):
             res["data"]["set_lot"]["selected_move_line"][0]["lot"]["name"], lot.name
         )
 
-    def test_scan_lot_name_extract_expiration_date_existing_lot(self):
+    def test_scan_lot_extract_expiration_date_existing_lot(self):
         """
         When lot already exists, take the expiration date from the existing lot.
 
@@ -104,11 +104,11 @@ def test_scan_lot_name_extract_expiration_date_existing_lot(self):
                 ],
             )
             res = self.service.dispatch(
-                "scan_lot_name",
+                "scan_lot",
                 params={
                     "picking_id": picking.id,
                     "selected_line_id": selected_move_line.id,
-                    "lot_name": lot.name,
+                    "barcode": lot.name,
                 },
             )
 

From f6130348fb0ff29cb0943ace9900c400e4c851c5 Mon Sep 17 00:00:00 2001
From: Nicolas Delbovier <nicolas.delbovier@acsone.eu>
Date: Mon, 4 May 2026 09:45:34 +0200
Subject: [PATCH 30/34] [REF] shopfloor_reception_mobile: use renammed endpoint
 'scan_lot_name' -> 'scan_lot'

---
 .../static/src/scenario/reception_states.js                   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/shopfloor_reception_mobile/static/src/scenario/reception_states.js b/shopfloor_reception_mobile/static/src/scenario/reception_states.js
index b6e4bab428..c0321abfdd 100644
--- a/shopfloor_reception_mobile/static/src/scenario/reception_states.js
+++ b/shopfloor_reception_mobile/static/src/scenario/reception_states.js
@@ -131,10 +131,10 @@ export const reception_states = function () {
             },
             on_scan: (barcode) => {
                 this.wait_call(
-                    this.odoo.call("scan_lot_name", {
+                    this.odoo.call("scan_lot", {
                         picking_id: this.state.data.picking.id,
                         selected_line_id: this.line_being_handled.id,
-                        lot_name: barcode.text,
+                        barcode: barcode.text,
                     })
                 );
             },

From 2fabdd3d40f8864d2ca759d42dda5796b7874950 Mon Sep 17 00:00:00 2001
From: Nicolas Delbovier <nicolas.delbovier@acsone.eu>
Date: Wed, 29 Apr 2026 16:38:53 +0200
Subject: [PATCH 31/34] [FIX] shopfloor_reception: restore expiration date
 clearing on new lot

The previous attempt to prefill expiration dates with the line expiration date caused an issue: if a user manually entered a date before scanning/entering
a lot name, the system would inadvertently overwrite and potentially accept the
wrong date for a new lot (the one from the line instead of the one entered by the user).

Reverting to the previous behavior where the date is cleared if no
existing lot is found. This ensures the user must explicitly provide
a date for new lots **after** scanning the name, preventing data integrity issues caused by
incorrect UI sequencing.
---
 shopfloor_reception/services/reception.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/shopfloor_reception/services/reception.py b/shopfloor_reception/services/reception.py
index d147617430..c62c06354f 100644
--- a/shopfloor_reception/services/reception.py
+++ b/shopfloor_reception/services/reception.py
@@ -832,7 +832,7 @@ def _response_for_set_lot(self, picking, line, message=None, **kw):
             lot = self._actions_for("search").lot_from_scan(
                 kw.get("lot_name"), line.product_id
             )
-            kw["lot_expiration_date"] = lot.expiration_date or line.expiration_date
+            kw["lot_expiration_date"] = lot.expiration_date
 
         return self._response(
             next_state="set_lot",

From 77fd5457e4da09592035cde113546e4faa48547a Mon Sep 17 00:00:00 2001
From: oca-ci <oca-ci@odoo-community.org>
Date: Mon, 4 May 2026 09:00:22 +0000
Subject: [PATCH 32/34] [UPD] Update shopfloor_reception.pot

---
 .../i18n/shopfloor_reception.pot              | 20 +++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/shopfloor_reception/i18n/shopfloor_reception.pot b/shopfloor_reception/i18n/shopfloor_reception.pot
index 419d7292ed..a9c79f1f71 100644
--- a/shopfloor_reception/i18n/shopfloor_reception.pot
+++ b/shopfloor_reception/i18n/shopfloor_reception.pot
@@ -54,3 +54,23 @@ msgstr ""
 #: model:stock.picking.type,name:shopfloor_reception.picking_type_reception_demo
 msgid "Reception"
 msgstr ""
+
+#. module: shopfloor_reception
+#. odoo-python
+#: code:addons/shopfloor_reception/actions/message.py:0
+#, python-format
+msgid ""
+"The operation type '%(picking_type)s' does not allow to create new lots."
+msgstr ""
+
+#. module: shopfloor_reception
+#. odoo-python
+#: code:addons/shopfloor_reception/actions/message.py:0
+#, python-format
+msgid ""
+"This lot already exists with a different expiration date.\n"
+"\n"
+"Lot: '%(lot_name)s'\n"
+"Stored expiration date: %(current)s\n"
+"Provided expiration date: %(provided)s"
+msgstr ""

From 867eb2c1d4bcbd7e346dd34902d094aad3f70354 Mon Sep 17 00:00:00 2001
From: OCA-git-bot <oca-git-bot@odoo-community.org>
Date: Mon, 4 May 2026 09:13:47 +0000
Subject: [PATCH 33/34] [BOT] post-merge updates

---
 README.md                                                | 6 +++---
 shopfloor/README.rst                                     | 2 +-
 shopfloor/__manifest__.py                                | 2 +-
 shopfloor/static/description/index.html                  | 2 +-
 shopfloor_reception/README.rst                           | 2 +-
 shopfloor_reception/__manifest__.py                      | 2 +-
 shopfloor_reception/static/description/index.html        | 2 +-
 shopfloor_reception_mobile/README.rst                    | 2 +-
 shopfloor_reception_mobile/__manifest__.py               | 2 +-
 shopfloor_reception_mobile/static/description/index.html | 2 +-
 10 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/README.md b/README.md
index ad919e6a2c..95df6d57ef 100644
--- a/README.md
+++ b/README.md
@@ -29,14 +29,14 @@ addon | version | maintainers | summary
 [sale_stock_release_channel_delivery_date](sale_stock_release_channel_delivery_date/) | 16.0.1.1.2 | <a href='https://github.com/jbaudoux'><img src='https://github.com/jbaudoux.png' width='32' height='32' style='border-radius:50%;' alt='jbaudoux'/></a> | Compute expected date based on available release channels
 [sale_stock_release_channel_partner_by_date](sale_stock_release_channel_partner_by_date/) | 16.0.1.1.0 | <a href='https://github.com/sebalix'><img src='https://github.com/sebalix.png' width='32' height='32' style='border-radius:50%;' alt='sebalix'/></a> | Release channels integration with Sales
 [sale_stock_release_channel_partner_by_date_delivery](sale_stock_release_channel_partner_by_date_delivery/) | 16.0.1.1.1 | <a href='https://github.com/sebalix'><img src='https://github.com/sebalix.png' width='32' height='32' style='border-radius:50%;' alt='sebalix'/></a> | Filters channels on sales based on selected carrier.
-[shopfloor](shopfloor/) | 16.0.2.16.3 | <a href='https://github.com/guewen'><img src='https://github.com/guewen.png' width='32' height='32' style='border-radius:50%;' alt='guewen'/></a> <a href='https://github.com/simahawk'><img src='https://github.com/simahawk.png' width='32' height='32' style='border-radius:50%;' alt='simahawk'/></a> <a href='https://github.com/sebalix'><img src='https://github.com/sebalix.png' width='32' height='32' style='border-radius:50%;' alt='sebalix'/></a> | manage warehouse operations with barcode scanners
+[shopfloor](shopfloor/) | 16.0.2.17.0 | <a href='https://github.com/guewen'><img src='https://github.com/guewen.png' width='32' height='32' style='border-radius:50%;' alt='guewen'/></a> <a href='https://github.com/simahawk'><img src='https://github.com/simahawk.png' width='32' height='32' style='border-radius:50%;' alt='simahawk'/></a> <a href='https://github.com/sebalix'><img src='https://github.com/sebalix.png' width='32' height='32' style='border-radius:50%;' alt='sebalix'/></a> | manage warehouse operations with barcode scanners
 [shopfloor_base](shopfloor_base/) | 16.0.1.2.1 | <a href='https://github.com/guewen'><img src='https://github.com/guewen.png' width='32' height='32' style='border-radius:50%;' alt='guewen'/></a> <a href='https://github.com/simahawk'><img src='https://github.com/simahawk.png' width='32' height='32' style='border-radius:50%;' alt='simahawk'/></a> <a href='https://github.com/sebalix'><img src='https://github.com/sebalix.png' width='32' height='32' style='border-radius:50%;' alt='sebalix'/></a> | Core module for creating mobile apps
 [shopfloor_batch_automatic_creation](shopfloor_batch_automatic_creation/) | 16.0.1.1.0 | <a href='https://github.com/guewen'><img src='https://github.com/guewen.png' width='32' height='32' style='border-radius:50%;' alt='guewen'/></a> | Create batch transfers for Cluster Picking
 [shopfloor_mobile](shopfloor_mobile/) | 16.0.1.4.1 | <a href='https://github.com/simahawk'><img src='https://github.com/simahawk.png' width='32' height='32' style='border-radius:50%;' alt='simahawk'/></a> | Mobile frontend for WMS Shopfloor app
 [shopfloor_mobile_base](shopfloor_mobile_base/) | 16.0.1.2.0 | <a href='https://github.com/simahawk'><img src='https://github.com/simahawk.png' width='32' height='32' style='border-radius:50%;' alt='simahawk'/></a> | Mobile frontend for WMS Shopfloor app
 [shopfloor_mobile_base_auth_api_key](shopfloor_mobile_base_auth_api_key/) | 16.0.1.0.0 |  | Provides authentication via API key to Shopfloor base mobile app
-[shopfloor_reception](shopfloor_reception/) | 16.0.1.6.8 | <a href='https://github.com/mmequignon'><img src='https://github.com/mmequignon.png' width='32' height='32' style='border-radius:50%;' alt='mmequignon'/></a> <a href='https://github.com/JuMiSanAr'><img src='https://github.com/JuMiSanAr.png' width='32' height='32' style='border-radius:50%;' alt='JuMiSanAr'/></a> | Reception scenario for shopfloor
-[shopfloor_reception_mobile](shopfloor_reception_mobile/) | 16.0.1.1.3 | <a href='https://github.com/JuMiSanAr'><img src='https://github.com/JuMiSanAr.png' width='32' height='32' style='border-radius:50%;' alt='JuMiSanAr'/></a> | Scenario for receiving products
+[shopfloor_reception](shopfloor_reception/) | 16.0.1.7.0 | <a href='https://github.com/mmequignon'><img src='https://github.com/mmequignon.png' width='32' height='32' style='border-radius:50%;' alt='mmequignon'/></a> <a href='https://github.com/JuMiSanAr'><img src='https://github.com/JuMiSanAr.png' width='32' height='32' style='border-radius:50%;' alt='JuMiSanAr'/></a> | Reception scenario for shopfloor
+[shopfloor_reception_mobile](shopfloor_reception_mobile/) | 16.0.1.2.0 | <a href='https://github.com/JuMiSanAr'><img src='https://github.com/JuMiSanAr.png' width='32' height='32' style='border-radius:50%;' alt='JuMiSanAr'/></a> | Scenario for receiving products
 [shopfloor_reception_packaging_dimension](shopfloor_reception_packaging_dimension/) | 16.0.1.0.0 | <a href='https://github.com/TDu'><img src='https://github.com/TDu.png' width='32' height='32' style='border-radius:50%;' alt='TDu'/></a> | Collect Packaging Dimension from the Reception scenario
 [shopfloor_reception_packaging_dimension_mobile](shopfloor_reception_packaging_dimension_mobile/) | 16.0.1.0.0 | <a href='https://github.com/TDu'><img src='https://github.com/TDu.png' width='32' height='32' style='border-radius:50%;' alt='TDu'/></a> | Frontend for the packaging dimension on reception scenario
 [shopfloor_reception_refund_return](shopfloor_reception_refund_return/) | 16.0.1.0.0 | <a href='https://github.com/mmequignon'><img src='https://github.com/mmequignon.png' width='32' height='32' style='border-radius:50%;' alt='mmequignon'/></a> | Mark created return as to refund
diff --git a/shopfloor/README.rst b/shopfloor/README.rst
index 8fba5a6686..88f562ba05 100644
--- a/shopfloor/README.rst
+++ b/shopfloor/README.rst
@@ -11,7 +11,7 @@ Shopfloor
    !! This file is generated by oca-gen-addon-readme !!
    !! changes will be overwritten.                   !!
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-   !! source digest: sha256:22f8e5b0353c5637d5aea9d6f6ae884fd29d5d25e456451b5d76e0926b14b45c
+   !! source digest: sha256:c15d6753dddf755436a53b85c4d516370700a548b898688c65362447fac692a6
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
 .. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png
diff --git a/shopfloor/__manifest__.py b/shopfloor/__manifest__.py
index 551ff614db..767715c160 100644
--- a/shopfloor/__manifest__.py
+++ b/shopfloor/__manifest__.py
@@ -6,7 +6,7 @@
 {
     "name": "Shopfloor",
     "summary": "manage warehouse operations with barcode scanners",
-    "version": "16.0.2.16.3",
+    "version": "16.0.2.17.0",
     "development_status": "Beta",
     "category": "Inventory",
     "website": "https://github.com/OCA/wms",
diff --git a/shopfloor/static/description/index.html b/shopfloor/static/description/index.html
index 6ebeeaeef1..49d39858d1 100644
--- a/shopfloor/static/description/index.html
+++ b/shopfloor/static/description/index.html
@@ -372,7 +372,7 @@ <h1>Shopfloor</h1>
 !! This file is generated by oca-gen-addon-readme !!
 !! changes will be overwritten.                   !!
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-!! source digest: sha256:22f8e5b0353c5637d5aea9d6f6ae884fd29d5d25e456451b5d76e0926b14b45c
+!! source digest: sha256:c15d6753dddf755436a53b85c4d516370700a548b898688c65362447fac692a6
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
 <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/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>
diff --git a/shopfloor_reception/README.rst b/shopfloor_reception/README.rst
index ccd148f33a..5fcf652f9e 100644
--- a/shopfloor_reception/README.rst
+++ b/shopfloor_reception/README.rst
@@ -11,7 +11,7 @@ Shopfloor Reception
    !! This file is generated by oca-gen-addon-readme !!
    !! changes will be overwritten.                   !!
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-   !! source digest: sha256:4a5cae1dea64b85f2f987a26658f70b634462808055727f8e4475218e37783a8
+   !! source digest: sha256:cfdee049f8d54795db4bbfe84208e158c79747d001200a55167286239b20231b
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
 .. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png
diff --git a/shopfloor_reception/__manifest__.py b/shopfloor_reception/__manifest__.py
index fcd3c221c6..26d837f398 100644
--- a/shopfloor_reception/__manifest__.py
+++ b/shopfloor_reception/__manifest__.py
@@ -1,7 +1,7 @@
 {
     "name": "Shopfloor Reception",
     "summary": "Reception scenario for shopfloor",
-    "version": "16.0.1.6.8",
+    "version": "16.0.1.7.0",
     "development_status": "Beta",
     "category": "Inventory",
     "website": "https://github.com/OCA/wms",
diff --git a/shopfloor_reception/static/description/index.html b/shopfloor_reception/static/description/index.html
index 030780eb90..213ce8c755 100644
--- a/shopfloor_reception/static/description/index.html
+++ b/shopfloor_reception/static/description/index.html
@@ -372,7 +372,7 @@ <h1>Shopfloor Reception</h1>
 !! This file is generated by oca-gen-addon-readme !!
 !! changes will be overwritten.                   !!
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-!! source digest: sha256:4a5cae1dea64b85f2f987a26658f70b634462808055727f8e4475218e37783a8
+!! source digest: sha256:cfdee049f8d54795db4bbfe84208e158c79747d001200a55167286239b20231b
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
 <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/wms/tree/16.0/shopfloor_reception"><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_reception"><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 implementation of the reception scenario.
diff --git a/shopfloor_reception_mobile/README.rst b/shopfloor_reception_mobile/README.rst
index c31048cc28..e678a68586 100644
--- a/shopfloor_reception_mobile/README.rst
+++ b/shopfloor_reception_mobile/README.rst
@@ -11,7 +11,7 @@ Shopfloor reception mobile
    !! This file is generated by oca-gen-addon-readme !!
    !! changes will be overwritten.                   !!
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-   !! source digest: sha256:379f4cd0674b8cebf272d622ff9e2103d9cc92fdf9bb6c0b3c685d57aaa10f49
+   !! source digest: sha256:5e6a2218a60dcf70dcdc216ad9005cf982c67033e066c3f7ba33e2b805dac4e2
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
 .. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png
diff --git a/shopfloor_reception_mobile/__manifest__.py b/shopfloor_reception_mobile/__manifest__.py
index 3511b01fe0..074f36392d 100644
--- a/shopfloor_reception_mobile/__manifest__.py
+++ b/shopfloor_reception_mobile/__manifest__.py
@@ -3,7 +3,7 @@
 {
     "name": "Shopfloor reception mobile",
     "summary": "Scenario for receiving products",
-    "version": "16.0.1.1.3",
+    "version": "16.0.1.2.0",
     "development_status": "Beta",
     "depends": ["shopfloor_mobile_base", "shopfloor_mobile", "shopfloor_reception"],
     "author": "Camptocamp, Odoo Community Association (OCA)",
diff --git a/shopfloor_reception_mobile/static/description/index.html b/shopfloor_reception_mobile/static/description/index.html
index d7c4894053..f7c11cee0f 100644
--- a/shopfloor_reception_mobile/static/description/index.html
+++ b/shopfloor_reception_mobile/static/description/index.html
@@ -372,7 +372,7 @@ <h1>Shopfloor reception mobile</h1>
 !! This file is generated by oca-gen-addon-readme !!
 !! changes will be overwritten.                   !!
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-!! source digest: sha256:379f4cd0674b8cebf272d622ff9e2103d9cc92fdf9bb6c0b3c685d57aaa10f49
+!! source digest: sha256:5e6a2218a60dcf70dcdc216ad9005cf982c67033e066c3f7ba33e2b805dac4e2
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
 <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/wms/tree/16.0/shopfloor_reception_mobile"><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_reception_mobile"><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>Frontend for the reception scenario in shopfloor.

From f687d7a629499c23cdf673538107efa9b8878bc4 Mon Sep 17 00:00:00 2001
From: Weblate <noreply@weblate.org>
Date: Mon, 4 May 2026 09:14:05 +0000
Subject: [PATCH 34/34] Update translation files

Updated by "Update PO files to match POT (msgmerge)" hook in Weblate.

Translation: wms-16.0/wms-16.0-shopfloor_reception
Translate-URL: https://translation.odoo-community.org/projects/wms-16-0/wms-16-0-shopfloor_reception/
---
 shopfloor_reception/i18n/it.po | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/shopfloor_reception/i18n/it.po b/shopfloor_reception/i18n/it.po
index bc65cfa65b..3d1b105418 100644
--- a/shopfloor_reception/i18n/it.po
+++ b/shopfloor_reception/i18n/it.po
@@ -61,6 +61,26 @@ msgstr "Movimenti prodotto (riga movimento di magazzino)"
 msgid "Reception"
 msgstr "Ricezione"
 
+#. module: shopfloor_reception
+#. odoo-python
+#: code:addons/shopfloor_reception/actions/message.py:0
+#, python-format
+msgid ""
+"The operation type '%(picking_type)s' does not allow to create new lots."
+msgstr ""
+
+#. module: shopfloor_reception
+#. odoo-python
+#: code:addons/shopfloor_reception/actions/message.py:0
+#, python-format
+msgid ""
+"This lot already exists with a different expiration date.\n"
+"\n"
+"Lot: '%(lot_name)s'\n"
+"Stored expiration date: %(current)s\n"
+"Provided expiration date: %(provided)s"
+msgstr ""
+
 #~ msgid "Is Shopfloor Created"
 #~ msgstr "Il reparto è crato"