Merge fefcaf3c34 into d506870d82

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',

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(
+        availables = self._get_delivery_methods()
-            [('website_published', '=', True),
+        pickables = availables - address
-             ('id', 'not in', address.ids)]).available_carriers(
+        
-            address)
+        return pickables.available_carriers(self.partner_id)