diff --git a/web_switch_company_warning/README.rst b/web_switch_company_warning/README.rst index e51ab70d..03aa5afa 100644 --- a/web_switch_company_warning/README.rst +++ b/web_switch_company_warning/README.rst @@ -14,13 +14,13 @@ Multicompany - Switch Company Warning :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html :alt: License: AGPL-3 .. |badge3| image:: https://img.shields.io/badge/github-OCA%2Fweb-lightgray.png?logo=github - :target: https://github.com/OCA/web/tree/11.0/web_switch_company_warning + :target: https://github.com/OCA/web/tree/12.0/web_switch_company_warning :alt: OCA/web .. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png - :target: https://translation.odoo-community.org/projects/web-11-0/web-11-0-web_switch_company_warning + :target: https://translation.odoo-community.org/projects/web-12-0/web-12-0-web_switch_company_warning :alt: Translate me on Weblate .. |badge5| image:: https://img.shields.io/badge/runbot-Try%20me-875A7B.png - :target: https://runbot.odoo-community.org/runbot/162/11.0 + :target: https://runbot.odoo-community.org/runbot/162/12.0 :alt: Try me on Runbot |badge1| |badge2| |badge3| |badge4| |badge5| @@ -45,7 +45,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. @@ -75,6 +75,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/web `_ project on GitHub. +This module is part of the `OCA/web `_ project on GitHub. You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute. diff --git a/web_switch_company_warning/__manifest__.py b/web_switch_company_warning/__manifest__.py index 0914970d..d3007d58 100644 --- a/web_switch_company_warning/__manifest__.py +++ b/web_switch_company_warning/__manifest__.py @@ -4,7 +4,7 @@ "name": "Multicompany - Switch Company Warning", "summary": "Show a warning if current company has been switched" " in another tab or window.", - "version": "11.0.1.0.0", + "version": "12.0.1.0.0", "category": "web", "website": "http://akretion.com", "license": "AGPL-3", diff --git a/web_switch_company_warning/static/description/index.html b/web_switch_company_warning/static/description/index.html index 250fbdd5..c34ecc47 100644 --- a/web_switch_company_warning/static/description/index.html +++ b/web_switch_company_warning/static/description/index.html @@ -367,7 +367,7 @@ ul.auto-toc { !! This file is generated by oca-gen-addon-readme !! !! changes will be overwritten. !! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! --> -

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

+

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

Shows a warning if current company has been switched in another tab or window.

Table of contents

@@ -396,7 +396,7 @@ ul.auto-toc {

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.

@@ -420,7 +420,7 @@ If you spotted it first, help us smashing it by providing a detailed and welcome

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/web project on GitHub.

+

This module is part of the OCA/web project on GitHub.

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

diff --git a/web_switch_company_warning/static/src/js/switch_company_warning.js b/web_switch_company_warning/static/src/js/switch_company_warning.js index c0c837a5..032bba4e 100644 --- a/web_switch_company_warning/static/src/js/switch_company_warning.js +++ b/web_switch_company_warning/static/src/js/switch_company_warning.js @@ -39,12 +39,7 @@ odoo.define('web_switch_company_warning.widget', function (require) { init: function(parent) { this._super(parent); var switchCompanyWarning = new SwitchCompanyWarningWidget(); - // Choose where to append depending on whether web_responsive is installed or not - if (document.getElementById('oe_main_menu_navbar')) { - switchCompanyWarning.appendTo('#oe_main_menu_navbar'); - } else { - switchCompanyWarning.insertAfter('.main-nav'); - } + switchCompanyWarning.insertAfter('.o_main_navbar'); } }); diff --git a/web_switch_company_warning/static/src/xml/switch_company_warning.xml b/web_switch_company_warning/static/src/xml/switch_company_warning.xml index 3bf86e9d..4a140079 100644 --- a/web_switch_company_warning/static/src/xml/switch_company_warning.xml +++ b/web_switch_company_warning/static/src/xml/switch_company_warning.xml @@ -1,7 +1,7 @@