From 4736fbc9f236718f5d7de19ce958265d2a947428 Mon Sep 17 00:00:00 2001 From: Jared Kipe Date: Mon, 11 Oct 2021 12:50:48 -0700 Subject: [PATCH] [FIX] delivery_hibou: multi-rating orders insurance --- delivery_hibou/models/delivery.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/delivery_hibou/models/delivery.py b/delivery_hibou/models/delivery.py index c7bff160..0d96d5b2 100644 --- a/delivery_hibou/models/delivery.py +++ b/delivery_hibou/models/delivery.py @@ -20,7 +20,7 @@ class DeliveryCarrier(models.Model): value = 0.0 if order: if order.order_line: - value = sum(order.order_line.filtered(lambda l: l.type != 'service').mapped('price_subtotal')) + value = sum(order.order_line.filtered(lambda l: l.product_id.type != 'service').mapped('price_subtotal')) else: return value if picking: @@ -203,9 +203,9 @@ class DeliveryCarrier(models.Model): res = [] for carrier in self: - carrier_packages = packages.filtered(lambda p: not p.carrier_tracking_ref and - (not p.carrier_id or p.carrier_id == carrier) and - p.packaging_id.package_carrier_type in (False, '', 'none', carrier.delivery_type)) + carrier_packages = packages and packages.filtered(lambda p: not p.carrier_tracking_ref and + (not p.carrier_id or p.carrier_id == carrier) and + p.packaging_id.package_carrier_type in (False, '', 'none', carrier.delivery_type)) if packages and not carrier_packages: continue if hasattr(carrier, '%s_rate_shipment_multi' % self.delivery_type):