[IMP] shopfoor: Refactor write_destination_on_lines

shopfloor/actions/stock.py

@@ -1,4 +1,5 @@
 # Copyright 2020 Camptocamp SA (http://www.camptocamp.com)
+# Copyright 2025 Michael Tietz (MT Software) <[email protected]>
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
 from odoo import _, fields
 from odoo.tools.float_utils import float_round
@@ -228,3 +229,25 @@ def no_putaway_available(self, picking_types, move_lines):
         # when no putaway is found, the move line destination stays the
         # default's of the picking type
         return any(line.location_dest_id in base_locations for line in move_lines)
+
+    def _lock_lines(self, lines):
+        self._actions_for("lock").for_update(lines)
+
+    def _set_destination_on_lines(self, lines, location_dest):
+        # when writing the destination on the package level, it writes
+        # on the moves and move lines
+        lines_with_package_level = lines.package_level_id.move_line_ids
+        lines_without_package_level = lines - lines_with_package_level
+        if lines_with_package_level:
+            lines_with_package_level.package_level_id.location_dest_id = location_dest
+        if lines_without_package_level:
+            lines_without_package_level.location_dest_id = location_dest
+
+    def _unload_package(self, lines):
+        lines.result_package_id = False
+
+    def set_destination_and_unload_lines(self, lines, location_dest, unload=False):
+        self._lock_lines(lines)
+        self._set_destination_on_lines(lines, location_dest)
+        if unload:
+            self._unload_package(lines)

shopfloor/services/cluster_picking.py

@@ -1147,8 +1147,11 @@ def set_destination_all(self, picking_batch_id, barcode, confirmation=None):
         return self._unload_end(batch, completion_info_popup=completion_info_popup)
 
     def _unload_write_destination_on_lines(self, lines, location):
-        lines.write({"shopfloor_unloaded": True, "location_dest_id": location.id})
-        lines.package_level_id.location_dest_id = location
+        stock = self._actions_for("stock")
+        stock.set_destination_and_unload_lines(
+            lines, location, self.work.menu.unload_package_at_destination
+        )
+        lines.write({"shopfloor_unloaded": True})
         for line in lines:
             # We set the picking to done only when the last line is
             # unloaded to avoid backorders.
@@ -1158,8 +1161,6 @@ def _unload_write_destination_on_lines(self, lines, location):
             picking_lines = picking.mapped("move_line_ids")
             if all(line.shopfloor_unloaded for line in picking_lines):
                 picking._action_done()
-        if self.work.menu.unload_package_at_destination:
-            lines.result_package_id = False
 
     def _unload_end(self, batch, completion_info_popup=None):
         """Try to close the batch if all transfers are done.
@@ -1279,15 +1280,11 @@ def unload_scan_destination(
             batch, package, lines, barcode, confirmation=confirmation
         )
 
-    def _lock_lines(self, lines):
-        """Lock move lines"""
-        self._actions_for("lock").for_update(lines)
-
     def _unload_scan_destination_lines(
         self, batch, package, lines, barcode, confirmation=None
     ):
         # Lock move lines that will be updated
-        self._lock_lines(lines)
+        self._actions_for("lock").for_update(lines)
         first_line = fields.first(lines)
         scanned_location = self._actions_for("search").location_from_scan(barcode)
         if not scanned_location:

shopfloor/services/location_content_transfer.py

@@ -456,10 +456,9 @@ def _find_transfer_move_lines(self, location):
         )
         return lines
 
-    # hook used in module shopfloor_checkout_sync
     def _write_destination_on_lines(self, lines, location, package=None):
-        lines.location_dest_id = location
-        lines.package_level_id.location_dest_id = location
+        stock = self._actions_for("stock")
+        stock.set_destination_and_unload_lines(lines, location)
         if package:
             lines.result_package_id = package
 

shopfloor/services/single_pack_transfer.py

@@ -1,6 +1,7 @@
 # Copyright 2020-2021 Camptocamp SA (http://www.camptocamp.com)
 # Copyright 2020-2021 Jacques-Etienne Baudoux (BCIM) <[email protected]>
 # Copyright 2020 Akretion (http://www.akretion.com)
+# Copyright 2025 Michael Tietz (MT Software) <[email protected]>
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
 from odoo import fields
 
@@ -266,10 +267,10 @@ def _router_validate_success(self, package_level):
         return self._response_for_start(message=message, popup=completion_info_popup)
 
     def _set_destination_and_done(self, package_level, scanned_location):
-        # when writing the destination on the package level, it writes
-        # on the move lines
-        package_level.location_dest_id = scanned_location
         stock = self._actions_for("stock")
+        stock.set_destination_and_unload_lines(
+            package_level.move_line_ids, scanned_location
+        )
         stock.put_package_level_in_move(package_level)
         stock.validate_moves(package_level.move_line_ids.move_id)
 

shopfloor/services/zone_picking.py

@@ -1036,7 +1036,7 @@ def _set_destination_package(self, move_line, quantity, package):
             )
             return (package_changed, response)
         stock = self._actions_for("stock")
-        self._lock_lines(move_line)
+        stock._lock_lines(move_line)
         try:
             stock.mark_move_line_as_picked(
                 move_line, quantity, package, check_user=True
@@ -1591,11 +1591,10 @@ def set_destination_all(self, barcode, confirmation=None):
         return self._set_destination_all_response(buffer_lines, message=message)
 
     def _write_destination_on_lines(self, lines, location):
-        self._lock_lines(lines)
-        lines.location_dest_id = location
-        lines.package_level_id.location_dest_id = location
-        if self.work.menu.unload_package_at_destination:
-            lines.result_package_id = False
+        stock = self._actions_for("stock")
+        stock.set_destination_and_unload_lines(
+            lines, location, unload=self.work.menu.unload_package_at_destination
+        )
 
     def unload_split(self):
         """Indicates that now the buffer must be treated line per line
@@ -1676,10 +1675,6 @@ def unload_scan_pack(self, package_id, barcode):
             unload_single_message=self.msg_store.barcode_no_match(package.name),
         )
 
-    def _lock_lines(self, lines):
-        """Lock move lines"""
-        self._actions_for("lock").for_update(lines)
-
     def unload_set_destination(self, package_id, barcode, confirmation=None):
         """Scan the final destination for move lines in the buffer with the
         destination package

shopfloor_checkout_sync/__init__.py

@@ -1,2 +1 @@
 from . import actions
-from . import services

shopfloor_checkout_sync/actions/__init__.py

@@ -1 +1,2 @@
 from . import checkout_sync
+from . import stock

shopfloor_checkout_sync/actions/checkout_sync.py

@@ -16,19 +16,20 @@ def _has_to_sync_destination(self, lines):
         # the sync has already been done
         return any(line.location_dest_id.child_ids for line in lines)
 
-    def _all_lines_to_lock(self, lines):
+    def _all_moves(self, lines):
         if self._has_to_sync_destination(lines):
             dest_pickings = lines.move_id._moves_to_sync_checkout()
             all_moves = self.env["stock.move"].union(*dest_pickings.values())
-            # add lock on all the lines that will be synchronized on the
-            # destination so other transactions will wait before trying to
-            # change the destination
-            lines = lines | all_moves.move_line_ids
-        return lines
+            return all_moves
+        return lines.move_id
+
+    def _all_lines_to_lock(self, lines):
+        # add lock on all the lines that will be synchronized on the
+        # destination so other transactions will wait before trying to
+        # change the destination
+        all_moves = self._all_moves(lines)
+        return lines | all_moves.move_line_ids
 
     def _sync_checkout(self, lines, location):
-        moves = lines.mapped("move_id")
-        if self._has_to_sync_destination(lines):
-            dest_pickings = moves._moves_to_sync_checkout()
-            all_moves = self.env["stock.move"].union(*dest_pickings.values())
-            all_moves.sync_checkout_destination(location)
+        all_moves = self._all_moves(lines)
+        all_moves.sync_checkout_destination(location)

shopfloor_checkout_sync/actions/stock.py

@@ -0,0 +1,18 @@
+# Copyright 2024 Michael Tietz (MT Software) <[email protected]>
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
+
+from odoo.addons.component.core import Component
+
+
+class StockAction(Component):
+    _inherit = "shopfloor.stock.action"
+
+    def _set_destination_on_lines(self, lines, location_dest):
+        checkout_sync = self._actions_for("checkout.sync")
+        checkout_sync._sync_checkout(lines, location_dest)
+        super()._set_destination_on_lines(lines, location_dest)
+
+    def set_destination_and_unload_lines(self, lines, location_dest, unload=False):
+        checkout_sync = self._actions_for("checkout.sync")
+        all_lines = checkout_sync._all_lines_to_lock(lines)
+        super().set_destination_and_unload_lines(all_lines, location_dest, unload)

shopfloor_checkout_sync/readme/CONTRIBUTORS.rst

@@ -1,2 +1,3 @@
 * Guewen Baconnier <[email protected]>
 * `Trobz <https://trobz.com>`_:
+* Michael Tietz (MT Software) <[email protected]>

shopfloor_single_product_transfer/services/single_product_transfer.py

@@ -10,7 +10,6 @@
 
 from odoo.addons.base_rest.components.service import to_int
 from odoo.addons.component.core import Component
-from odoo.addons.component.exception import NoComponentError
 from odoo.addons.shopfloor.utils import to_float
 
 _logger = logging.getLogger("shopfloor.services.single_product_transfer")
@@ -612,31 +611,9 @@ def _set_quantity__check_location(
                 move_line, message=message, asking_confirmation=confirmation or None
             )
 
-    def _lock_lines(self, lines):
-        self._actions_for("lock").for_update(lines)
-
     def _write_destination_on_lines(self, lines, location):
-        # TODO
-        # '_write_destination_on_lines' is implemented in:
-        #
-        #   - 'location_content_transfer'
-        #   - 'zone_picking'
-        #   - 'cluster_picking' (but it is called '_unload_write_destination_on_lines')
-        #
-        # And all of them has a different implementation,
-        # To refactor later.
-        try:
-            # TODO lose dependency on 'shopfloor_checkout_sync' to avoid having
-            # yet another glue module. In the long term we should make
-            # 'shopfloor_checkout_sync' use events and trash the overrides made
-            # on all scenarios.
-            checkout_sync = self._actions_for("checkout.sync")
-        except NoComponentError:
-            self._lock_lines(lines)
-        else:
-            self._lock_lines(checkout_sync._all_lines_to_lock(lines))
-            checkout_sync._sync_checkout(lines, location)
-        lines.location_dest_id = location
+        stock = self._actions_for("stock")
+        stock.set_destination_and_unload_lines(lines, location)
 
     def _set_quantity__post_move(self, move_line, location, confirmation=None):
         # TODO qty_done = 0: transfer_no_qty_done
@@ -864,7 +841,7 @@ def set_quantity(self, selected_line_id, barcode, quantity, confirmation=None):
             # TODO Should probably return to scan_product or scan_location?
             return self._response_for_set_quantity(move_line)
 
-        self._lock_lines(move_line)
+        self._actions_for("stock")._lock_lines(move_line)
         if move_line.state == "done":
             message = self.msg_store.move_already_done()
             return self._response_for_set_quantity(move_line, message=message)