diff --git a/website_sale_product_multi_website/__manifest__.py b/website_sale_product_multi_website/__manifest__.py index 2d8c6ee60e..07eaffda4f 100644 --- a/website_sale_product_multi_website/__manifest__.py +++ b/website_sale_product_multi_website/__manifest__.py @@ -1,7 +1,7 @@ { "name": "Multi-website product", "summary": "Show products in many web-sites", - "version": "17.0.1.0.0", + "version": "18.0.1.0.0", "category": "Website", "author": "Odoo Community Association (OCA), Adhoc S.A.", "license": "AGPL-3", diff --git a/website_sale_product_multi_website/static/tests/tours/website_sale_complete_flow.js b/website_sale_product_multi_website/static/tests/tours/website_sale_complete_flow.js index 1c86794a21..350ab92ad4 100644 --- a/website_sale_product_multi_website/static/tests/tours/website_sale_complete_flow.js +++ b/website_sale_product_multi_website/static/tests/tours/website_sale_complete_flow.js @@ -11,7 +11,7 @@ odoo.define("website_sale_tour.tour", function (require) { url: "/shop?search=Storage Box", }, [ - // Testing b2c with Tax-Excluded Prices + // Testing b2c with Tax-Excluded Prices. { content: "Open product page", trigger: '.oe_product_cart a:contains("Storage Box")', @@ -24,7 +24,7 @@ odoo.define("website_sale_tour.tour", function (require) { content: "Check b2b Tax-Excluded Prices", trigger: ".product_price .oe_price .oe_currency_value:containsExact(79.00)", - run: function () {}, // It's a check + isChecked: true, }, { content: "Click on add to cart", @@ -40,17 +40,17 @@ odoo.define("website_sale_tour.tour", function (require) { content: "Check Price b2b subtotal", trigger: "tr#order_total_untaxed .oe_currency_value:containsExact(158.00)", - run: function () {}, // It's a check + isChecked: true, }, { content: "Check Price b2b Sale Tax(15%)", trigger: "tr#order_total_taxes .oe_currency_value:containsExact(23.70)", - run: function () {}, // It's a check + isChecked: true, }, { content: "Check Price b2b Total amount", trigger: "tr#order_total .oe_currency_value:containsExact(181.70)", - run: function () {}, // It's a check + isChecked: true, }, { content: "Fulfill billing address form", @@ -93,14 +93,14 @@ odoo.define("website_sale_tour.tour", function (require) { "Check selected billing address is same as typed in previous step", trigger: "#shipping_and_billing:contains(SO1 Billing Street, 33):contains(SO1BillingCity):contains(Afghanistan)", - run: function () {}, // It's a check + isChecked: true, }, { content: "Check selected shipping address is same as typed in previous step", trigger: "#shipping_and_billing:contains(17, SO1 Shipping Road):contains(SO1ShippingCity):contains(Afghanistan)", - run: function () {}, // It's a check + isChecked: true, }, { content: "Click for edit address", @@ -134,7 +134,7 @@ odoo.define("website_sale_tour.tour", function (require) { "Check selected billing address is same as typed in previous step", trigger: "#shipping_and_billing:contains(SO1 Billing Street Edited, 33):contains(SO1BillingCityEdited):contains(Afghanistan)", - run: function () {}, // It's a check + isChecked: true, }, { content: "Select `Wire Transfer` payment method", @@ -232,7 +232,7 @@ odoo.define("website_sale_tour.tour", function (require) { content: "Check b2c Tax-Included Prices", trigger: ".product_price .oe_price .oe_currency_value:containsExact(90.85)", - run: function () {}, // It's a check + isChecked: true, }, { content: "Click on add to cart", @@ -248,17 +248,17 @@ odoo.define("website_sale_tour.tour", function (require) { content: "Check Price b2c total", trigger: "tr#order_total_untaxed .oe_currency_value:containsExact(158.00)", - run: function () {}, // It's a check + isChecked: true, }, { content: "Check Price b2c Sale Tax(15%)", trigger: "tr#order_total_taxes .oe_currency_value:containsExact(23.70)", - run: function () {}, // It's a check + isChecked: true, }, { content: "Check Price b2c Total amount", trigger: "tr#order_total .oe_currency_value:containsExact(181.70)", - run: function () {}, // It's a check + isChecked: true, }, { content: "Click on Login Button", @@ -395,14 +395,14 @@ odoo.define("website_sale_tour.tour", function (require) { "Check selected billing address is same as typed in previous step", trigger: "#shipping_and_billing:contains(SO1 Billing Street Edited, 33):contains(SO1BillingCityEdited):contains(Afghanistan)", - run: function () {}, // It's a check + isChecked: true, }, { content: "Check selected shipping address is same as typed in previous step", trigger: "#shipping_and_billing:contains(SO2New Shipping Street, 5):contains(SO2NewShipping):contains(Afghanistan)", - run: function () {}, // It's a check + isChecked: true, }, { content: "Select `Wire Transfer` payment method", diff --git a/website_sale_product_multi_website/views/product_template_views.xml b/website_sale_product_multi_website/views/product_template_views.xml index 3291907205..2756ff0ef5 100644 --- a/website_sale_product_multi_website/views/product_template_views.xml +++ b/website_sale_product_multi_website/views/product_template_views.xml @@ -18,7 +18,7 @@ - product.product.website.inherit.view.tree + product.product.website.inherit.view.list product.product @@ -36,7 +36,7 @@ - product_template_view_tree.view.tree + product_template_view_tree.view.list product.template