[FIX] stock_picking_delivery_link: Ensure the delivery type is correctly passed to context

Author: rousseldenis

stock_picking_delivery_link/models/stock_picking.py

@@ -56,16 +56,23 @@ def _pre_put_in_pack_hook(self, move_line_ids):
             return res
 
     def _set_delivery_package_type(self, batch_pack=False):
+        """
+        As we want to filter package types on carrier even on internal
+        pickings, we pass the delivery type to the context from
+        the related carrier taken from the delivery picking.
+        """
         self.ensure_one()
         res = super()._set_delivery_package_type(batch_pack=batch_pack)
+        context = res.get("context", self.env.context)
         context = dict(
-            self.env.context,
+            context,
             current_package_carrier_type=self.ship_carrier_id.delivery_type,
         )
         # As we pass the `delivery_type` ('fixed' or 'base_on_rule' by default) in a
         # key which corresponds to the `package_carrier_type` ('none' to default), we
         # make a conversion. No conversion needed for other carriers as the
         # `delivery_type` and`package_carrier_type` will be the same in these cases.
         if context["current_package_carrier_type"] in ["fixed", "base_on_rule"]:
-            context["current_package_carrier_type"] = "none"
+            context = dict(context, current_package_carrier_type="none")
+        res["context"] = context
         return res

stock_picking_delivery_link/tests/models/delivery_carrier.py

@@ -0,0 +1,13 @@
+# Copyright 2023 ACSONE SA/NV (https://www.acsone.eu)
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
+
+from odoo import fields, models
+
+
+class DeliveryCarrier(models.Model):
+
+    _inherit = "delivery.carrier"
+
+    delivery_type = fields.Selection(
+        selection_add=[("test", "Test")], ondelete={"test": "cascade"}
+    )

stock_picking_delivery_link/tests/test_delivery_link.py

@@ -1,6 +1,7 @@
 # Copyright 2021-2021 Camptocamp SA
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
 
+from odoo_test_helper import FakeModelLoader
 
 from .common import StockPickingDeliveryLinkCommonCase
 
@@ -27,6 +28,17 @@ def setUpClass(cls):
             }
         )
 
+        cls.loader = FakeModelLoader(cls.env, cls.__module__)
+        cls.loader.backup_registry()
+        from .models.delivery_carrier import DeliveryCarrier
+
+        cls.loader.update_registry((DeliveryCarrier,))
+
+    @classmethod
+    def tearDownClass(cls):
+        cls.loader.restore_registry()
+        super().tearDownClass()
+
     def test_ship_data_from_pick(self):
         move1 = self._create_move(
             self.product,
@@ -138,8 +150,60 @@ def test_put_in_pack_from_pick_with_wizard(self):
         # check the action is a dict
         self.assertIsInstance(pip_action, dict)
         pip_action_model = pip_action["res_model"]
+        pip_action_context = pip_action["context"]
+        # We make sure the correct action was returned
+        self.assertEqual(pip_action_model, "choose.delivery.package")
+        self.assertEqual("none", pip_action_context.get("current_package_carrier_type"))
+
+    def test_put_in_pack_from_pick_with_wizard_carrier(self):
+        """
+        Normally the "choose package type" wizard is triggered only if a carrier is
+        set on the picking (usually on ship picking). This module permits to force
+        the wizard if there is no carrier set but if there is a shipping carrier and
+        set_delivery_package_type_on_put_in_pack set on the package type.
+
+        Try with forcing from pick picking type => wizard ok
+        """
+        self.test_carrier.delivery_type = "test"
+        self.wh.delivery_steps = "pick_ship"
+        self.env["stock.quant"]._update_available_quantity(
+            self.product, self.shelf1_loc, 20.0
+        )
+        ship_move = self.env["stock.move"].create(
+            {
+                "name": "The ship move",
+                "product_id": self.product.id,
+                "product_uom_qty": 5.0,
+                "product_uom": self.product.uom_id.id,
+                "location_id": self.shelf2_loc.id,
+                "location_dest_id": self.customer_location.id,
+                "warehouse_id": self.wh.id,
+                "picking_type_id": self.wh.out_type_id.id,
+                "procure_method": "make_to_order",
+                "state": "draft",
+            }
+        )
+        ship_move._assign_picking()
+        ship_move._action_confirm()
+        pick_move = ship_move.move_orig_ids[0]
+        pick_picking = pick_move.picking_id
+        ship_picking = ship_move.picking_id
+        # set a carrier on shipment picking
+        ship_picking.carrier_id = self.test_carrier
+        # force wizard on pick operation picking_type_id
+        pick_picking.picking_type_id.set_delivery_package_type_on_put_in_pack = True
+        pick_picking.action_assign()
+        pick_picking.move_line_ids.filtered(
+            lambda ml: ml.product_id == self.product
+        ).qty_done = 5.0
+        pip_action = pick_picking.action_put_in_pack()
+        # check the action is a dict
+        self.assertIsInstance(pip_action, dict)
+        pip_action_model = pip_action["res_model"]
+        pip_action_context = pip_action["context"]
         # We make sure the correct action was returned
         self.assertEqual(pip_action_model, "choose.delivery.package")
+        self.assertEqual("test", pip_action_context.get("current_package_carrier_type"))
 
     def test_put_in_pack_from_pick_without_wizard(self):
         """