diff --git a/addons/website_sale_delivery/models/delivery.py b/addons/website_sale_delivery/models/delivery.py index e4b35a21..6d3ac4f0 100644 --- a/addons/website_sale_delivery/models/delivery.py +++ b/addons/website_sale_delivery/models/delivery.py @@ -10,3 +10,5 @@ class DeliveryCarrier(models.Model): website_description = fields.Text(related='product_id.description_sale', string='Description for Online Quotations') website_published = fields.Boolean(default=False) + website_ids = fields.Many2many('website', 'website_del_carrier_pub_rel', 'website_id', 'del_carrier_id', string='Websites', copy=False, + help='List of websites in which Product is published.') diff --git a/addons/website_sale_delivery/models/sale_order.py b/addons/website_sale_delivery/models/sale_order.py index f185e518..849cad81 100644 --- a/addons/website_sale_delivery/models/sale_order.py +++ b/addons/website_sale_delivery/models/sale_order.py @@ -73,7 +73,8 @@ class SaleOrder(models.Model): def _get_delivery_methods(self): address = self.partner_shipping_id - return self.env['delivery.carrier'].sudo().search([('website_published', '=', True)]).available_carriers(address) + domain = self.env['website'].get_current_website() + return self.env['delivery.carrier'].sudo().search([('website_published', '=', True), '|', ('website_ids', '=', False), ('website_ids', 'in', domain.id)]).available_carriers(address) @api.multi def _cart_update(self, product_id=None, line_id=None, add_qty=0, set_qty=0, **kwargs): diff --git a/addons/website_sale_delivery/views/website_sale_delivery_views.xml b/addons/website_sale_delivery/views/website_sale_delivery_views.xml index 4cc56d34..1e50cd7b 100644 --- a/addons/website_sale_delivery/views/website_sale_delivery_views.xml +++ b/addons/website_sale_delivery/views/website_sale_delivery_views.xml @@ -16,6 +16,9 @@ + + +