From fefcaf3c3483f187e7334cc2d87ec20caa371381 Mon Sep 17 00:00:00 2001 From: ArPol Date: Tue, 21 Jan 2025 14:52:02 +0100 Subject: [PATCH] [FIX][16.0] restrict_delivery_method correction --- restrict_delivery_method/__manifest__.py | 2 +- restrict_delivery_method/models/sale_order.py | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/restrict_delivery_method/__manifest__.py b/restrict_delivery_method/__manifest__.py index 8e67e33e1..247601172 100644 --- a/restrict_delivery_method/__manifest__.py +++ b/restrict_delivery_method/__manifest__.py @@ -30,7 +30,7 @@ 'company': 'Cybrosys Techno Solutions', 'maintainer': 'Cybrosys Techno Solutions', 'website': 'https://www.cybrosys.com', - 'depends': ['sale', 'delivery', 'website_sale'], + 'depends': ['sale', 'delivery', 'website_sale', 'website_sale_delivery'], 'data': [ 'views/delivery_carrier_views.xml', 'views/sale_order_views.xml', diff --git a/restrict_delivery_method/models/sale_order.py b/restrict_delivery_method/models/sale_order.py index 6475be7a3..54dfd3a64 100644 --- a/restrict_delivery_method/models/sale_order.py +++ b/restrict_delivery_method/models/sale_order.py @@ -51,7 +51,7 @@ class SaleOrder(models.Model): """From this function the controller gets the restricted methods value""" address = self.delivery_method_ids - return self.env['delivery.carrier'].sudo().search( - [('website_published', '=', True), - ('id', 'not in', address.ids)]).available_carriers( - address) + availables = self._get_delivery_methods() + pickables = availables - address + + return pickables.available_carriers(self.partner_id)