Skip to content

Commit

Permalink
Merge PR #880 into 14.0
Browse files Browse the repository at this point in the history
Signed-off-by pedrobaeza
  • Loading branch information
OCA-git-bot committed Sep 17, 2024
2 parents 50073f2 + 4c5c8a5 commit a9caef5
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion delivery_price_method/models/delivery_carrier.py
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ def rate_shipment(self, order):

def send_shipping(self, pickings):
res = super().send_shipping(pickings)
if self.price_method in ("fixed", "base_on_rule"):
if isinstance(res, list) and self.price_method in ("fixed", "base_on_rule"):
rates = getattr(self, "%s_send_shipping" % self.price_method)(pickings)
for index, rate in enumerate(rates):
del rate["tracking_number"] # remove offending key
Expand Down

0 comments on commit a9caef5

Please sign in to comment.