From cd5c10a47f27b77b39cd102012979bbeece2a4ea Mon Sep 17 00:00:00 2001 From: "Lucas Perais (lpe)" Date: Tue, 10 Jul 2018 11:18:26 +0200 Subject: [PATCH] [FIX] website_sale_delivery: we should be able to pay if the order only contains services Two use cases must work: Should hide payment AND display errors when order contains deliverable product Should show payment AND not display errors when order contains only services (event tickets) Linked OPW 1864744 Linked PR v11.0 #25679 closes #25692 --- addons/website_sale_delivery/models/sale_order.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/addons/website_sale_delivery/models/sale_order.py b/addons/website_sale_delivery/models/sale_order.py index 63f2f20208b..43aa2f63d86 100644 --- a/addons/website_sale_delivery/models/sale_order.py +++ b/addons/website_sale_delivery/models/sale_order.py @@ -95,8 +95,10 @@ class SaleOrder(models.Model): @api.model def _get_errors(self, order): + # Do not Forward port in v11.0 as the API was refactored by f9a8c53e485445bc8e3474eb3978b0f83d5645c7 + has_stockable_products = any(order.order_line.filtered(lambda line: line.product_id.type in ['consu', 'product'])) errors = super(SaleOrder, self)._get_errors(order) - if not order._get_delivery_methods(): + if not order._get_delivery_methods() and has_stockable_products: errors.append( (_('Sorry, we are unable to ship your order'), _('No shipping method is available for your current order and shipping address. '