[FIX] website_event, website_sale: _order on is_published

As fbbf24f58ac introduced multiwebsite and `website_published` became a
related and/or a computed field (depending of the mixin), we should not order
on this field as it is not on DB anymore.

We now have the field `is_published` that replace `website_published`.

3 files changed, 3 insertions, 3 deletions

diff --git a/addons/website_event/controllers/main.py b/addons/website_event/controllers/main.py
index 33e51724613..acff56f9321 100644
--- a/addons/website_event/controllers/main.py
+++ b/addons/website_event/controllers/main.py
@@ -123,7 +123,7 @@ class WebsiteEventController(http.Controller):
             order = 'date_begin desc'
         if searches["country"] != 'all':   # if we are looking for a specific country
             order = 'is_online, ' + order  # show physical events first
-        order = 'website_published desc, ' + order
+        order = 'is_published desc, ' + order
         events = Event.search(dom_without("none"), limit=step, offset=pager['offset'], order=order)
 
         values = {
diff --git a/addons/website_sale/controllers/main.py b/addons/website_sale/controllers/main.py
index efde362d80b..cc1e2f8642a 100644
--- a/addons/website_sale/controllers/main.py
+++ b/addons/website_sale/controllers/main.py
@@ -174,7 +174,7 @@ class WebsiteSale(http.Controller):
     def _get_search_order(self, post):
         # OrderBy will be parsed in orm and so no direct sql injection
         # id is added to be sure that order is a unique sort key
-        return 'website_published desc,%s , id desc' % post.get('order', 'website_sequence desc')
+        return 'is_published desc,%s , id desc' % post.get('order', 'website_sequence desc')
 
     def _get_search_domain(self, search, category, attrib_values):
         domain = request.website.sale_product_domain()
diff --git a/addons/website_sale/models/product.py b/addons/website_sale/models/product.py
index 1eee941a0dc..3e166b2382a 100644
--- a/addons/website_sale/models/product.py
+++ b/addons/website_sale/models/product.py
@@ -106,7 +106,7 @@ class ProductPublicCategory(models.Model):
 
 class ProductTemplate(models.Model):
     _inherit = ["product.template", "website.seo.metadata", 'website.published.multi.mixin', 'rating.mixin']
-    _order = 'website_published desc, website_sequence desc, name'
+    _order = 'is_published desc, website_sequence desc, name'
     _name = 'product.template'
     _mail_post_access = 'read'