diff --git a/addons/stock_delivery/wizard/stock_return_picking.py b/addons/stock_delivery/wizard/stock_return_picking.py
index c3530e6c350..2ff278c1b9c 100644
--- a/addons/stock_delivery/wizard/stock_return_picking.py
+++ b/addons/stock_delivery/wizard/stock_return_picking.py
@@ -10,7 +10,15 @@ class StockReturnPicking(models.TransientModel):
         # Prevent copy of the carrier and carrier price when generating return picking
         # (we have no integration of returns for now)
         new_picking, pick_type_id = super()._create_returns()
-        picking = self.env['stock.picking'].browse(new_picking)
-        picking.write({'carrier_id': False,
-                       'carrier_price': 0.0})
+        self._reset_carrier_id(new_picking)
         return new_picking, pick_type_id
+
+    def _reset_carrier_id(self, new_picking):
+        """ Prevent copy of the carrier and carrier price when generating return picking
+        (we have no integration of returns for now).
+        """
+        picking = self.env['stock.picking'].browse(new_picking)
+        picking.write({
+            'carrier_id': False,
+            'carrier_price': 0.0,
+        })
diff --git a/odoo/addons/base/i18n/base.pot b/odoo/addons/base/i18n/base.pot
index a61b473a0c0..3f92a48a69a 100644
--- a/odoo/addons/base/i18n/base.pot
+++ b/odoo/addons/base/i18n/base.pot
@@ -5032,6 +5032,19 @@ msgid ""
 "=============================\n"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_delivery_starshipit
+msgid ""
+"\n"
+"Send your shippings through Starshipit and track them online\n"
+"=======================================================\n"
+"\n"
+"Starshipit is the leading provider of integrated shipping and tracking solutions for growing e-commerce businesses.\n"
+"Seamlessly integrating with a large range of couriers and platforms,\n"
+"you can streamline every step of your fulfilment process,\n"
+"reduce handling time and improve customer experience.\n"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,description:base.module_delivery_bpost
 msgid ""
@@ -27410,6 +27423,11 @@ msgstr ""
 msgid "Standard Audit File for Tax Base module"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_delivery_starshipit
+msgid "Starshipit Shipping"
+msgstr ""
+
 #. module: base
 #: model_terms:ir.ui.view,arch_db:base.view_base_module_upgrade_install
 msgid "Start configuration"