From bf8b359b299ab0ed0ffd181ead397e7da35f12d7 Mon Sep 17 00:00:00 2001 From: Laurent Smet Date: Tue, 21 Feb 2017 13:45:00 +0100 Subject: [PATCH] [FIX] delivery: fix bad Exception handling When get_price() is called during tests, a ValidationError was returned but not catched correctly due to the unavailability of delivery service. Because this method is called during the creation of new sale order, it leads to some operational error (broken cursor). --- addons/delivery/models/delivery_carrier.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/delivery/models/delivery_carrier.py b/addons/delivery/models/delivery_carrier.py index ee2d61753b6..f8fce9294ef 100644 --- a/addons/delivery/models/delivery_carrier.py +++ b/addons/delivery/models/delivery_carrier.py @@ -120,7 +120,7 @@ class DeliveryCarrier(models.Model): try: computed_price = self.get_shipping_price_from_so(order)[0] self.available = True - except UserError as e: + except ValidationError as e: # No suitable delivery method found, probably configuration error _logger.info("Carrier %s: %s, not found", self.name, e.name) computed_price = 0.0