From 860396e68c5d38368817b259a90ec9f72e102b6f Mon Sep 17 00:00:00 2001 From: Ernesto Tejeda Date: Sat, 3 Oct 2020 00:56:27 -0400 Subject: [PATCH] [MIG] website_sale_vat_required: Migration to 13.0 --- website_sale_vat_required/README.rst | 10 ++++---- website_sale_vat_required/__manifest__.py | 9 ++++---- website_sale_vat_required/controllers/main.py | 2 +- .../static/description/index.html | 6 ++--- .../src/js/website_sale_vat_required.tour.js | 2 +- .../tests/test_website_sale_vat_required.py | 2 +- .../demo_assets.xml => views/assets.xml} | 0 website_sale_vat_required/views/templates.xml | 23 ++++--------------- 8 files changed, 20 insertions(+), 34 deletions(-) rename website_sale_vat_required/{demo/demo_assets.xml => views/assets.xml} (100%) diff --git a/website_sale_vat_required/README.rst b/website_sale_vat_required/README.rst index 7e5ec36417..3f733cf01f 100644 --- a/website_sale_vat_required/README.rst +++ b/website_sale_vat_required/README.rst @@ -14,13 +14,13 @@ e-commerce required VAT :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html :alt: License: AGPL-3 .. |badge3| image:: https://img.shields.io/badge/github-OCA%2Fe--commerce-lightgray.png?logo=github - :target: https://github.com/OCA/e-commerce/tree/12.0/website_sale_vat_required + :target: https://github.com/OCA/e-commerce/tree/13.0/website_sale_vat_required :alt: OCA/e-commerce .. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png - :target: https://translation.odoo-community.org/projects/e-commerce-12-0/e-commerce-12-0-website_sale_vat_required + :target: https://translation.odoo-community.org/projects/e-commerce-13-0/e-commerce-13-0-website_sale_vat_required :alt: Translate me on Weblate .. |badge5| image:: https://img.shields.io/badge/runbot-Try%20me-875A7B.png - :target: https://runbot.odoo-community.org/runbot/113/12.0 + :target: https://runbot.odoo-community.org/runbot/113/13.0 :alt: Try me on Runbot |badge1| |badge2| |badge3| |badge4| |badge5| @@ -49,7 +49,7 @@ Bug Tracker Bugs are tracked on `GitHub Issues `_. In case of trouble, please check there if your issue has already been reported. If you spotted it first, help us smashing it by providing a detailed and welcomed -`feedback `_. +`feedback `_. Do not contact contributors directly about support or help with technical issues. @@ -84,6 +84,6 @@ OCA, or the Odoo Community Association, is a nonprofit organization whose mission is to support the collaborative development of Odoo features and promote its widespread use. -This module is part of the `OCA/e-commerce `_ project on GitHub. +This module is part of the `OCA/e-commerce `_ project on GitHub. You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute. diff --git a/website_sale_vat_required/__manifest__.py b/website_sale_vat_required/__manifest__.py index c9ac6a5d49..a5dc76b631 100644 --- a/website_sale_vat_required/__manifest__.py +++ b/website_sale_vat_required/__manifest__.py @@ -5,14 +5,13 @@ { "name": "e-commerce required VAT", "summary": "VAT number required in checkout form", - "version": "12.0.1.0.0", + "version": "13.0.1.0.0", "category": "Website", - "author": "Agile Business Group, " "Tecnativa, " "Odoo Community Association (OCA)", + "author": "Agile Business Group, Tecnativa, Odoo Community Association (OCA)", "website": "https://github.com/OCA/e-commerce", "license": "AGPL-3", - "depends": ["website_sale", "base_vat",], - "data": ["views/templates.xml",], - "demo": ["demo/demo_assets.xml",], + "depends": ["website_sale", "base_vat"], + "data": ["views/templates.xml", "views/assets.xml"], "installable": True, "auto_install": False, } diff --git a/website_sale_vat_required/controllers/main.py b/website_sale_vat_required/controllers/main.py index 653805eff5..1e12e9d839 100644 --- a/website_sale_vat_required/controllers/main.py +++ b/website_sale_vat_required/controllers/main.py @@ -7,6 +7,6 @@ class WebsiteSale(WebsiteSale): def _get_mandatory_billing_fields(self): - result = super(WebsiteSale, self)._get_mandatory_billing_fields() + result = super()._get_mandatory_billing_fields() result.append("vat") return result diff --git a/website_sale_vat_required/static/description/index.html b/website_sale_vat_required/static/description/index.html index 327d59fc5b..27c8cd1eff 100644 --- a/website_sale_vat_required/static/description/index.html +++ b/website_sale_vat_required/static/description/index.html @@ -367,7 +367,7 @@

e-commerce required VAT

!! This file is generated by oca-gen-addon-readme !! !! changes will be overwritten. !! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! --> -

Beta License: AGPL-3 OCA/e-commerce Translate me on Weblate Try me on Runbot

+

Beta License: AGPL-3 OCA/e-commerce Translate me on Weblate Try me on Runbot

This module extends checkout e-commerce form in order to force user to fill ‘VAT number’ field.

Table of contents

@@ -398,7 +398,7 @@

Bug Tracker

Bugs are tracked on GitHub Issues. In case of trouble, please check there if your issue has already been reported. If you spotted it first, help us smashing it by providing a detailed and welcomed -feedback.

+feedback.

Do not contact contributors directly about support or help with technical issues.

@@ -432,7 +432,7 @@

Maintainers

OCA, or the Odoo Community Association, is a nonprofit organization whose mission is to support the collaborative development of Odoo features and promote its widespread use.

-

This module is part of the OCA/e-commerce project on GitHub.

+

This module is part of the OCA/e-commerce project on GitHub.

You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.

diff --git a/website_sale_vat_required/static/src/js/website_sale_vat_required.tour.js b/website_sale_vat_required/static/src/js/website_sale_vat_required.tour.js index c237972183..a48bbf65d5 100644 --- a/website_sale_vat_required/static/src/js/website_sale_vat_required.tour.js +++ b/website_sale_vat_required/static/src/js/website_sale_vat_required.tour.js @@ -18,7 +18,7 @@ odoo.define("website_sale_vat_required.tour", function(require) { content: "Set VAT", trigger: "div.o_has_error label[for='vat']", extra_trigger: "div.o_has_error label[for='vat']", - run: function(actions) { + run: function() { $('div.o_has_error input[name="vat"]').val("US01234567891"); if ($("#div_phone").hasClass("o_has_error")) { $("#div_phone input").val("11111111"); diff --git a/website_sale_vat_required/tests/test_website_sale_vat_required.py b/website_sale_vat_required/tests/test_website_sale_vat_required.py index ed2fe3d336..e5b94a4749 100644 --- a/website_sale_vat_required/tests/test_website_sale_vat_required.py +++ b/website_sale_vat_required/tests/test_website_sale_vat_required.py @@ -3,7 +3,7 @@ from odoo.tests.common import HttpCase -class TestUi(HttpCase): +class TestWebsiteSaleVatRequired(HttpCase): def test_website_sale_vat_required(self): self.env.user.partner_id.vat = False self.browser_js( diff --git a/website_sale_vat_required/demo/demo_assets.xml b/website_sale_vat_required/views/assets.xml similarity index 100% rename from website_sale_vat_required/demo/demo_assets.xml rename to website_sale_vat_required/views/assets.xml diff --git a/website_sale_vat_required/views/templates.xml b/website_sale_vat_required/views/templates.xml index 9e8d0a7cb7..6ee8da2946 100644 --- a/website_sale_vat_required/views/templates.xml +++ b/website_sale_vat_required/views/templates.xml @@ -5,24 +5,11 @@ inherit_id="website_sale.address_b2b" name="Address Management" > - - - -
- - -
- + + mode[1] == 'billing'