diff --git a/addons/website_sale/models/product_product.py b/addons/website_sale/models/product_product.py index da5165d37a1..54dcc1ae7c6 100644 --- a/addons/website_sale/models/product_product.py +++ b/addons/website_sale/models/product_product.py @@ -83,9 +83,6 @@ class Product(models.Model): # the template extra images here return variant_images + self.product_tmpl_id._get_images()[1:] - def _is_sold_out(self): - combination_info = self.with_context(website_sale_stock_get_quantity=True).product_tmpl_id._get_combination_info(product_id=self.id) - return combination_info['product_type'] == 'product' and combination_info['free_qty'] <= 0 def _website_show_quick_add(self): website = self.env['website'].get_current_website() diff --git a/addons/website_sale/models/product_template.py b/addons/website_sale/models/product_template.py index ae2d53eb5ed..81be788f462 100644 --- a/addons/website_sale/models/product_template.py +++ b/addons/website_sale/models/product_template.py @@ -377,8 +377,6 @@ class ProductTemplate(models.Model): if product.id: product.website_url = "/shop/%s" % slug(product) - def _is_sold_out(self): - return self.product_variant_id._is_sold_out() def _get_website_ribbon(self): if self.website_ribbon_id: diff --git a/addons/website_sale_stock/models/product_product.py b/addons/website_sale_stock/models/product_product.py index 91e7c69ef03..399c21c5145 100644 --- a/addons/website_sale_stock/models/product_product.py +++ b/addons/website_sale_stock/models/product_product.py @@ -17,3 +17,7 @@ class ProductProduct(models.Model): cart._get_common_product_lines(product=self).mapped('product_uom_qty') ) return 0 + + def _is_sold_out(self): + combination_info = self.with_context(website_sale_stock_get_quantity=True).product_tmpl_id._get_combination_info(product_id=self.id) + return combination_info['product_type'] == 'product' and combination_info['free_qty'] <= 0 diff --git a/addons/website_sale_stock/models/product_template.py b/addons/website_sale_stock/models/product_template.py index 38fe17bc2fa..ac2fafca299 100644 --- a/addons/website_sale_stock/models/product_template.py +++ b/addons/website_sale_stock/models/product_template.py @@ -48,3 +48,6 @@ class ProductTemplate(models.Model): }) return combination_info + + def _is_sold_out(self): + return self.product_variant_id._is_sold_out() diff --git a/addons/website_sale_stock_wishlist/__manifest__.py b/addons/website_sale_stock_wishlist/__manifest__.py index 833b9a6e2a3..9d8affb006a 100644 --- a/addons/website_sale_stock_wishlist/__manifest__.py +++ b/addons/website_sale_stock_wishlist/__manifest__.py @@ -13,7 +13,7 @@ Allow the user to select if he wants to receive email notifications when a produ 'website_sale_wishlist', ], 'data': [ - 'views/templates.xml', + 'views/website_sale_stock_wishlist_templates.xml', 'data/template_email.xml', 'data/ir_cron_data.xml', ], diff --git a/addons/website_sale_stock_wishlist/views/templates.xml b/addons/website_sale_stock_wishlist/views/website_sale_stock_wishlist_templates.xml similarity index 64% rename from addons/website_sale_stock_wishlist/views/templates.xml rename to addons/website_sale_stock_wishlist/views/website_sale_stock_wishlist_templates.xml index 83ea182c90a..1a53348717d 100644 --- a/addons/website_sale_stock_wishlist/views/templates.xml +++ b/addons/website_sale_stock_wishlist/views/website_sale_stock_wishlist_templates.xml @@ -10,5 +10,15 @@ Be notified when back in stock + + + + diff --git a/addons/website_sale_wishlist/views/website_sale_wishlist_template.xml b/addons/website_sale_wishlist/views/website_sale_wishlist_template.xml index f1e3be5fd8b..3efdd370e7e 100644 --- a/addons/website_sale_wishlist/views/website_sale_wishlist_template.xml +++ b/addons/website_sale_wishlist/views/website_sale_wishlist_template.xml @@ -200,7 +200,7 @@ Contact Us -