diff --git a/addons/website_blog/views/website_blog_views.xml b/addons/website_blog/views/website_blog_views.xml index 85386651ec1..a3cc6916d43 100644 --- a/addons/website_blog/views/website_blog_views.xml +++ b/addons/website_blog/views/website_blog_views.xml @@ -47,7 +47,7 @@ - + diff --git a/addons/website_sale_delivery/models/delivery.py b/addons/website_sale_delivery/models/delivery.py index 5a7270c7f1c..6b14ba8004e 100644 --- a/addons/website_sale_delivery/models/delivery.py +++ b/addons/website_sale_delivery/models/delivery.py @@ -9,4 +9,3 @@ class DeliveryCarrier(models.Model): _inherit = ['delivery.carrier', 'website.published.multi.mixin'] website_description = fields.Text(related='product_id.description_sale', string='Description for Online Quotations', readonly=False) - website_published = fields.Boolean(default=False) diff --git a/addons/website_sale_delivery/models/sale_order.py b/addons/website_sale_delivery/models/sale_order.py index 4cf21e3b587..3103fb06ab3 100644 --- a/addons/website_sale_delivery/models/sale_order.py +++ b/addons/website_sale_delivery/models/sale_order.py @@ -75,6 +75,7 @@ class SaleOrder(models.Model): def _get_delivery_methods(self): address = self.partner_shipping_id + # searching on website_published will also search for available website (_search method on computed field) return self.env['delivery.carrier'].sudo().search([('website_published', '=', True)]).available_carriers(address) @api.multi 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 0e60a35fb70..976b0971d7f 100644 --- a/addons/website_sale_delivery/views/website_sale_delivery_views.xml +++ b/addons/website_sale_delivery/views/website_sale_delivery_views.xml @@ -6,6 +6,9 @@ delivery.carrier + + + @@ -26,6 +29,7 @@ +