diff --git a/delivery_dhl_parcel_de/__manifest__.py b/delivery_dhl_parcel_de/__manifest__.py
index 63b80d19..773f0e0e 100644
--- a/delivery_dhl_parcel_de/__manifest__.py
+++ b/delivery_dhl_parcel_de/__manifest__.py
@@ -13,6 +13,8 @@
         "delivery_carrier_account",
         "base_iso3166",
         "stock_picking_declared_value",
+        "mrp",
+        "product_harmonized_system",
     ],
     "data": [
         "data/data.xml",
diff --git a/delivery_dhl_parcel_de/models/delivery_carrier.py b/delivery_dhl_parcel_de/models/delivery_carrier.py
index f8ce2aef..3f9c4412 100644
--- a/delivery_dhl_parcel_de/models/delivery_carrier.py
+++ b/delivery_dhl_parcel_de/models/delivery_carrier.py
@@ -327,13 +327,13 @@ def dhl_parcel_de_provider_get_package_info(self, picking, insurance_value):
         europe_group_id = self.env.ref("base.europe")
         if recipient_address_id.country_id not in europe_group_id.country_ids:
             product_data = self.prepare_product_data_request(picking)
+            company = self.company_id or self.env.company
+            currency = company.currency_id and company.currency_id.name
             package_data["customs"] = {
                 "exportType": self.dhl_export_type,
                 "exportDescription": self.dhl_export_type_description or "",
                 "postalCharges": {
-                    "currency": self.company_id
-                    and self.company_id.currency_id
-                    and self.company_id.currency_id.name,
+                    "currency": currency,
                     "value": picking.sale_id.order_line.filtered(
                         lambda x: x.is_delivery
                     )[:1].price_subtotal
diff --git a/delivery_dhl_parcel_de/views/delivery_carrier.xml b/delivery_dhl_parcel_de/views/delivery_carrier.xml
index a920e30c..0e6b78cf 100644
--- a/delivery_dhl_parcel_de/views/delivery_carrier.xml
+++ b/delivery_dhl_parcel_de/views/delivery_carrier.xml
@@ -27,7 +27,7 @@
                             />
                             <field
                                 name="dhl_services_name"
-                                required="delivery_type == 'dhl_parcel_de_provider'"
+                                required="delivery_type == 'dhl_parcel_de_provider' and not is_return_shipment"
                             />
                             <field
                                 name="dhl_premium"