fixup! [MIG] stock_picking_type_shipping_policy: Migration to 18.0

Author: sebalix

stock_picking_type_shipping_policy/migrations/18.0.1.0.0/pre-migrate.py

@@ -0,0 +1,37 @@
+# Copyright 2025 Camptocamp SA
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl)
+import logging
+
+from odoo import tools
+
+_logger = logging.getLogger(__name__)
+
+
+def migrate(cr, version):
+    if not version:
+        return
+    migrate_stock_picking_type_shipping_policy(cr)
+
+
+def migrate_stock_picking_type_shipping_policy(cr):
+    _logger.info("Create 'stock_picking_type.force_move_type' column...")
+    tools.sql.create_column(cr, "stock_picking_type", "force_move_type", "boolean")
+    _logger.info("Update operation types configuration...")
+    # Odoo 18.0 comes with a new '<stock.picking.type>.move_type' field sets
+    # by default to 'direct' (= As soon as possible).
+    # If the current module is installed, we want this field sets with the
+    # value that was configured in old field 'shipping_policy'.
+    queries = [
+        """
+            UPDATE stock_picking_type
+            SET force_move_type=true, move_type='direct'
+            WHERE shipping_policy='force_as_soon_as_possible';
+        """,
+        """
+            UPDATE stock_picking_type
+            SET force_move_type=true, move_type='one'
+            WHERE shipping_policy='force_all_products_ready';
+        """,
+    ]
+    for query in queries:
+        cr.execute(query)

stock_picking_type_shipping_policy/models/__init__.py

@@ -1,2 +1,2 @@
-from . import stock_move
+from . import stock_picking
 from . import stock_picking_type

stock_picking_type_shipping_policy/models/stock_move.py

@@ -0,0 +1,14 @@
+# Copyright 2025 Camptocamp SA
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl)
+from odoo import models
+
+
+class StockPicking(models.Model):
+    _inherit = "stock.picking"
+
+    def _compute_move_type(self):
+        # pylint: disable=missing-return
+        super()._compute_move_type()
+        for record in self:
+            if record.picking_type_id.force_move_type:
+                record.move_type = record.picking_type_id.move_type

stock_picking_type_shipping_policy/models/stock_picking.py

@@ -1,27 +1,16 @@
 # Copyright 2020 Camptocamp SA
 # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl)
-from odoo import api, fields, models
+from odoo import fields, models
 
 
 class StockPickingType(models.Model):
     _inherit = "stock.picking.type"
 
-    @api.model
-    def _default_shipping_policy(self):
-        return "procurement_group"
-
-    @api.model
-    def _selection_shipping_policy(self):
-        return [
-            ("procurement_group", "Take from procurement group"),
-            ("force_as_soon_as_possible", "Force to as soon as possible"),
-            ("force_all_products_ready", "Force to when all products are ready"),
-        ]
-
-    shipping_policy = fields.Selection(
+    force_move_type = fields.Boolean(
         string="Force Shipping Policy",
-        selection="_selection_shipping_policy",
-        default=lambda r: r._default_shipping_policy(),
-        help="Allows to force the shipping policy on pickings according to the"
-        " picking type.",
+        help=(
+            "Force the shipping policy of the operation type "
+            "(ignore the one from procurement group)"
+        ),
+        default=False,
     )

stock_picking_type_shipping_policy/models/stock_picking_type.py

@@ -1,2 +1,3 @@
 - Akim Juillerat \<<akim.juillerat@camptocamp.com>\>
 - Phuc Tran Thanh \<<phuc@trobz.com>\>
+- Sébastien Alix \<<sebastien.alix@camptocamp.com>\>

stock_picking_type_shipping_policy/readme/CONTRIBUTORS.md

@@ -1,9 +1,13 @@
-This module adds a Shipping Policy field on Operations Types in order to
-force a specific Shipping Policy on Pickings according to their types.
+By default Odoo takes the Shipping Policy set in the procurement group,
+or fallbacks on the one configured on the Operation Type.
+
+This module adds a Force Shipping Policy field on Operations Types to ensure
+transfers will take the policy according to their types, ignoring the one set
+on the Procurement Group.
 
 This is especially useful if you use a pick-pack-ship setup with the
-release of operation (stock_available_to_promise_release) module along
-side with the stock_routing_operation that may split operations by zone
+release of operation (`stock_available_to_promise_release`) module along
+side with the `stock_dynamic_routing` that may split operations by zone
 of the warehouse. In that case, you want to be sure the pack operations
 will wait all different picks to be processed before releasing the
 availability of the pack operation.

stock_picking_type_shipping_policy/readme/DESCRIPTION.md

@@ -61,9 +61,9 @@ def _validate_picking(self, picking):
         picking.move_line_ids.write({"picked": True})
         picking._action_done()
 
-    def test_shipping_policy(self):
-        self.pack_type.shipping_policy = "force_all_products_ready"
-        self.pick_type.shipping_policy = "force_as_soon_as_possible"
+    def test_force_move_type(self):
+        self.pack_type.write({"move_type": "one", "force_move_type": True})
+        self.pick_type.write({"move_type": "direct", "force_move_type": True})
         move = self._run_procurement(self.product, 10)
         pick_picking = move.picking_id
         self._validate_picking(pick_picking)

stock_picking_type_shipping_policy/tests/test_stock_picking_type_shipping_policy.py

@@ -5,8 +5,8 @@
         <field name="model">stock.picking.type</field>
         <field name="inherit_id" ref="stock.view_picking_type_form" />
         <field name="arch" type="xml">
-            <field name="create_backorder" position="after">
-                <field name="shipping_policy" />
+            <field name="move_type" position="after">
+                <field name="force_move_type" />
             </field>
         </field>
     </record>