Skip to content

Dependencies fix, product optional for return labels #269

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jans23 merged 2 commits into from
May 13, 2026
Merged

Dependencies fix, product optional for return labels #269

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e58b7f7
Dependencies fix, product optional for return labels
KDRdev May 12, 2026
e4b6843
Make sure company is always set
KDRdev May 12, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions delivery_dhl_parcel_de/__manifest__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@
"delivery_carrier_account",
"base_iso3166",
"stock_picking_declared_value",
"mrp",
"product_harmonized_system",
],
"data": [
"data/data.xml",
Expand Down
6 changes: 3 additions & 3 deletions delivery_dhl_parcel_de/models/delivery_carrier.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion delivery_dhl_parcel_de/views/delivery_carrier.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
Loading