From adc6b3641644e643c9d981f2debe21fec48db6c2 Mon Sep 17 00:00:00 2001
From: Chandresh Thakkar OSI <cthakkar@opensourceintegrators.com>
Date: Tue, 4 May 2021 02:06:01 +0530
Subject: [PATCH 01/45] [ADD] base_user_role_company: add per company user
 roles

---
 base_user_role_company/__init__.py            |  4 ++
 base_user_role_company/__manifest__.py        | 19 ++++++
 base_user_role_company/models/__init__.py     |  5 ++
 base_user_role_company/models/ir_http.py      | 23 +++++++
 base_user_role_company/models/role.py         | 65 +++++++++++++++++++
 base_user_role_company/readme/CONFIGURE.rst   |  6 ++
 .../readme/CONTRIBUTORS.rst                   |  4 ++
 base_user_role_company/readme/DESCRIPTION.rst |  9 +++
 base_user_role_company/readme/USAGE.rst       | 17 +++++
 base_user_role_company/tests/__init__.py      |  1 +
 .../tests/test_role_per_company.py            | 62 ++++++++++++++++++
 base_user_role_company/views/role.xml         | 14 ++++
 12 files changed, 229 insertions(+)
 create mode 100644 base_user_role_company/__init__.py
 create mode 100644 base_user_role_company/__manifest__.py
 create mode 100644 base_user_role_company/models/__init__.py
 create mode 100644 base_user_role_company/models/ir_http.py
 create mode 100644 base_user_role_company/models/role.py
 create mode 100644 base_user_role_company/readme/CONFIGURE.rst
 create mode 100644 base_user_role_company/readme/CONTRIBUTORS.rst
 create mode 100644 base_user_role_company/readme/DESCRIPTION.rst
 create mode 100644 base_user_role_company/readme/USAGE.rst
 create mode 100644 base_user_role_company/tests/__init__.py
 create mode 100644 base_user_role_company/tests/test_role_per_company.py
 create mode 100644 base_user_role_company/views/role.xml

diff --git a/base_user_role_company/__init__.py b/base_user_role_company/__init__.py
new file mode 100644
index 000000000..bb83730e9
--- /dev/null
+++ b/base_user_role_company/__init__.py
@@ -0,0 +1,4 @@
+# Copyright (C) 2021 Open Source Integrators
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
+from . import models
diff --git a/base_user_role_company/__manifest__.py b/base_user_role_company/__manifest__.py
new file mode 100644
index 000000000..5b1af0981
--- /dev/null
+++ b/base_user_role_company/__manifest__.py
@@ -0,0 +1,19 @@
+# Copyright (C) 2021 Open Source Integrators
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
+{
+    "name": "User roles by company",
+    "version": "14.0.1.0.0",
+    "category": "Tools",
+    "author": "Open Source Integrators, Odoo Community Association (OCA)",
+    "license": "AGPL-3",
+    "website": "https://github.com/OCA/server-backend",
+    "depends": ["base_user_role"],
+    "data": [
+        "views/role.xml",
+    ],
+    "installable": True,
+    "auto_install": True,
+    "maintainer": "dreispt",
+    "development_status": "Beta",
+}
diff --git a/base_user_role_company/models/__init__.py b/base_user_role_company/models/__init__.py
new file mode 100644
index 000000000..d38a0acf7
--- /dev/null
+++ b/base_user_role_company/models/__init__.py
@@ -0,0 +1,5 @@
+# Copyright (C) 2021 Open Source Integrators
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
+from . import role
+from . import ir_http
diff --git a/base_user_role_company/models/ir_http.py b/base_user_role_company/models/ir_http.py
new file mode 100644
index 000000000..7eaca704a
--- /dev/null
+++ b/base_user_role_company/models/ir_http.py
@@ -0,0 +1,23 @@
+# Copyright (C) 2021 Open Source Integrators
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
+from odoo import models
+from odoo.http import request
+
+
+class IrHttp(models.AbstractModel):
+    _inherit = "ir.http"
+
+    def session_info(self):
+        """
+        Based on the selected companies (cids),
+        calculate the roles to enable.
+        A role should be enabled only when it applies to all selected companies.
+        """
+        result = super(IrHttp, self).session_info()
+        if self.env.user.role_line_ids:
+            cids_str = request.httprequest.cookies.get("cids", str(self.env.company.id))
+            cids = [int(cid) for cid in cids_str.split(",")]
+            self.env.user._set_session_active_roles(cids)
+            self.env.user.set_groups_from_roles()
+        return result
diff --git a/base_user_role_company/models/role.py b/base_user_role_company/models/role.py
new file mode 100644
index 000000000..c6702494c
--- /dev/null
+++ b/base_user_role_company/models/role.py
@@ -0,0 +1,65 @@
+# Copyright (C) 2021 Open Source Integrators
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
+from odoo import _, api, fields, models
+from odoo.exceptions import ValidationError
+
+
+class ResUsersRoleLine(models.Model):
+    _inherit = "res.users.role.line"
+
+    company_id = fields.Many2one(
+        "res.company",
+        "Company",
+        help="If set, this role only applies when this is the main company selected."
+        " Otherwise it applies to all companies.",
+    )
+    active_role = fields.Boolean(string="Active Role", default=True)
+
+    @api.constrains("user_id", "company_id")
+    def _check_company(self):
+        for record in self:
+            if (
+                record.company_id
+                and record.company_id != record.user_id.company_id
+                and record.company_id not in record.user_id.company_ids
+            ):
+                raise ValidationError(
+                    _('User "{}" does not have access to the company "{}"').format(
+                        record.user_id.name, record.company_id.name
+                    )
+                )
+
+    _sql_constraints = [
+        (
+            "user_role_uniq",
+            "unique (user_id,role_id,company_id)",
+            "Roles can be assigned to a user only once at a time",
+        )
+    ]
+
+
+class ResUsers(models.Model):
+    _inherit = "res.users"
+
+    def _get_enabled_roles(self):
+        res = super()._get_enabled_roles()
+        return res.filtered("active_role")
+
+    @api.model
+    def _set_session_active_roles(self, cids):
+        """
+        Based on the selected companies (cids),
+        calculate the roles to enable.
+        A role should be enabled only when it applies to all selected companies.
+        """
+        for role_line in self.env.user.role_line_ids:
+            if not role_line.company_id:
+                role_line.active_role = True
+            elif role_line.company_id.id in cids:
+                is_on_companies = self.env.user.role_line_ids.filtered(
+                    lambda x: x.role_id == role_line.role_id and x.company_id.id in cids
+                )
+                role_line.active_role = len(is_on_companies) == len(cids)
+            else:
+                role_line.active_role = False
diff --git a/base_user_role_company/readme/CONFIGURE.rst b/base_user_role_company/readme/CONFIGURE.rst
new file mode 100644
index 000000000..c50bf9fec
--- /dev/null
+++ b/base_user_role_company/readme/CONFIGURE.rst
@@ -0,0 +1,6 @@
+Roles are set on the User form.
+
+The "Company" additional column allows to set a Role as only valid for specific companies.
+
+There is also a "Active Role" techincal field, only visible in developer mode.
+It shows what roles are active, after applying the company selection rules.
diff --git a/base_user_role_company/readme/CONTRIBUTORS.rst b/base_user_role_company/readme/CONTRIBUTORS.rst
new file mode 100644
index 000000000..c259741d2
--- /dev/null
+++ b/base_user_role_company/readme/CONTRIBUTORS.rst
@@ -0,0 +1,4 @@
+`Open Source Integrators <http://opensourceintegrators.com>`_
+
+  * Daniel Reis <dreis@opensourceintegrators.com>
+  * Chandresh Thakkar <cthakkr@opensourceintegrators.com>
diff --git a/base_user_role_company/readme/DESCRIPTION.rst b/base_user_role_company/readme/DESCRIPTION.rst
new file mode 100644
index 000000000..68507f1e4
--- /dev/null
+++ b/base_user_role_company/readme/DESCRIPTION.rst
@@ -0,0 +1,9 @@
+Enable User Roles depending on the Companies selected.
+
+A company specific Role will only be enabled
+if it is set for **all** the currently selected companies.
+
+For example, if a user is "Sales Manager" only for Company A,
+it will see that role enabled only if Company A is selected.
+If the user selects Company A and Company B,
+then the "Sales Manager" role won't be enabled.
diff --git a/base_user_role_company/readme/USAGE.rst b/base_user_role_company/readme/USAGE.rst
new file mode 100644
index 000000000..88dce6bc7
--- /dev/null
+++ b/base_user_role_company/readme/USAGE.rst
@@ -0,0 +1,17 @@
+Select the active companies from the web client widget, near the top right corner.
+When doing so, the User's security Groups are recomputed, based on the Roles.
+
+When the user changes the company selection, only the groups available to all active companies will be activated.
+
+For example:
+
+* A "SALES PERSON" and a "SALES MANAGER" roles are created.
+
+* A user is assigned to the roles:
+    * "SALES PERSON", with no specific company assigned (meaning all)
+    * "SALES MANAGER" only to "My Company (Chicago)"
+
+* When selecting active companies from the UI widget:
+    * If only "My Company (San Francisco)" is active, "SALES PERSON" will be active.
+    * If only "My Company (Chicago)" is active, "SALES PERSON" and "SALES MANAGER" will be active.
+    * If both "My Company (San Francisco)" and "My Company (Chicago)" is active, "SALES PERSON" will be active.
diff --git a/base_user_role_company/tests/__init__.py b/base_user_role_company/tests/__init__.py
new file mode 100644
index 000000000..cd7f7833f
--- /dev/null
+++ b/base_user_role_company/tests/__init__.py
@@ -0,0 +1 @@
+from . import test_role_per_company
diff --git a/base_user_role_company/tests/test_role_per_company.py b/base_user_role_company/tests/test_role_per_company.py
new file mode 100644
index 000000000..14cb869bf
--- /dev/null
+++ b/base_user_role_company/tests/test_role_per_company.py
@@ -0,0 +1,62 @@
+# Copyright 2021 Open Source Integrators
+# License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl).
+
+from odoo.tests.common import TransactionCase
+
+
+class TestUserRoleCompany(TransactionCase):
+    def setUp(self):
+        super().setUp()
+        # COMPANIES
+        self.Company = self.env["res.company"]
+        self.company1 = self.env.ref("base.main_company")
+        self.company2 = self.Company.create({"name": "company2"})
+        # ROLES
+        self.Role = self.env["res.users.role"]
+        self.roleA = self.Role.create({"name": "ROLE All Companies"})
+        self.roleB = self.Role.create({"name": "ROLE Company 1"})
+        self.roleC = self.Role.create({"name": "ROLE Company 1 and 2"})
+        # USER
+        # ==Role=== ==Company== C1  C2  C1+C2
+        # Role A                Yes Yes Yes
+        # Role B    Company1    Yes
+        # Role C    Company1    Yes     Yes
+        # Role C    Company2        Yes Yes
+        self.User = self.env["res.users"]
+        user_vals = {
+            "name": "ROLES TEST USER",
+            "login": "test_user",
+            "company_ids": [(6, 0, [self.company1.id, self.company2.id])],
+            "role_line_ids": [
+                (0, 0, {"role_id": self.roleA.id}),
+                (0, 0, {"role_id": self.roleB.id, "company_id": self.company1.id}),
+                (0, 0, {"role_id": self.roleC.id, "company_id": self.company1.id}),
+                (0, 0, {"role_id": self.roleC.id, "company_id": self.company2.id}),
+            ],
+        }
+        self.test_user = self.User.create(user_vals)
+        self.User = self.User.with_user(self.test_user)
+
+    def test_110_company_1(self):
+        "Company 1 selected: Tech and Settings roles are activated"
+        self.User._set_session_active_roles([self.company1.id])
+        active_roles = self.test_user.role_line_ids.filtered("active_role").mapped(
+            "role_id"
+        )
+        self.assertEqual(active_roles, self.roleA | self.roleB | self.roleC)
+
+    def test_120_company_2(self):
+        "Company 2 selected: only Tech role enabled"
+        self.User._set_session_active_roles([self.company2.id])
+        active_roles = self.test_user.role_line_ids.filtered("active_role").mapped(
+            "role_id"
+        )
+        self.assertEqual(active_roles, self.roleA | self.roleC)
+
+    def test_130_company_1_2(self):
+        "Settings Role enabled for Company 1 and 2"
+        self.User._set_session_active_roles([self.company1.id, self.company2.id])
+        active_roles = self.test_user.role_line_ids.filtered("active_role").mapped(
+            "role_id"
+        )
+        self.assertEqual(active_roles, self.roleA | self.roleC)
diff --git a/base_user_role_company/views/role.xml b/base_user_role_company/views/role.xml
new file mode 100644
index 000000000..bfcb01e8f
--- /dev/null
+++ b/base_user_role_company/views/role.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<odoo>
+    <record id="view_res_users_form_inherit_company" model="ir.ui.view">
+        <field name="name">res.users.form.inherit.company</field>
+        <field name="model">res.users</field>
+        <field name="inherit_id" ref="base_user_role.view_res_users_form_inherit" />
+        <field name="arch" type="xml">
+            <field name="role_id" position="after">
+                <field name="company_id" groups="base.group_multi_company" />
+                <field name="active_role" groups="base.group_no_one" readonly="1" />
+            </field>
+        </field>
+    </record>
+</odoo>

From 5849eccdcf3258a4ba898621bd74707e517778e9 Mon Sep 17 00:00:00 2001
From: oca-travis <oca+oca-travis@odoo-community.org>
Date: Wed, 19 May 2021 18:13:39 +0000
Subject: [PATCH 02/45] [UPD] Update base_user_role_company.pot

---
 .../i18n/base_user_role_company.pot           | 78 +++++++++++++++++++
 1 file changed, 78 insertions(+)
 create mode 100644 base_user_role_company/i18n/base_user_role_company.pot

diff --git a/base_user_role_company/i18n/base_user_role_company.pot b/base_user_role_company/i18n/base_user_role_company.pot
new file mode 100644
index 000000000..776c3cb0a
--- /dev/null
+++ b/base_user_role_company/i18n/base_user_role_company.pot
@@ -0,0 +1,78 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# 	* base_user_role_company
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 14.0\n"
+"Report-Msgid-Bugs-To: \n"
+"Last-Translator: \n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: base_user_role_company
+#: model:ir.model.fields,field_description:base_user_role_company.field_res_users_role_line__active_role
+msgid "Active Role"
+msgstr ""
+
+#. module: base_user_role_company
+#: model:ir.model.fields,field_description:base_user_role_company.field_res_users_role_line__company_id
+msgid "Company"
+msgstr ""
+
+#. module: base_user_role_company
+#: model:ir.model.fields,field_description:base_user_role_company.field_ir_http__display_name
+#: model:ir.model.fields,field_description:base_user_role_company.field_res_users__display_name
+#: model:ir.model.fields,field_description:base_user_role_company.field_res_users_role_line__display_name
+msgid "Display Name"
+msgstr ""
+
+#. module: base_user_role_company
+#: model:ir.model,name:base_user_role_company.model_ir_http
+msgid "HTTP Routing"
+msgstr ""
+
+#. module: base_user_role_company
+#: model:ir.model.fields,field_description:base_user_role_company.field_ir_http__id
+#: model:ir.model.fields,field_description:base_user_role_company.field_res_users__id
+#: model:ir.model.fields,field_description:base_user_role_company.field_res_users_role_line__id
+msgid "ID"
+msgstr ""
+
+#. module: base_user_role_company
+#: model:ir.model.fields,help:base_user_role_company.field_res_users_role_line__company_id
+msgid ""
+"If set, this role only applies when this is the main company selected. "
+"Otherwise it applies to all companies."
+msgstr ""
+
+#. module: base_user_role_company
+#: model:ir.model.fields,field_description:base_user_role_company.field_ir_http____last_update
+#: model:ir.model.fields,field_description:base_user_role_company.field_res_users____last_update
+#: model:ir.model.fields,field_description:base_user_role_company.field_res_users_role_line____last_update
+msgid "Last Modified on"
+msgstr ""
+
+#. module: base_user_role_company
+#: model:ir.model.constraint,message:base_user_role_company.constraint_res_users_role_line_user_role_uniq
+msgid "Roles can be assigned to a user only once at a time"
+msgstr ""
+
+#. module: base_user_role_company
+#: code:addons/base_user_role_company/models/role.py:0
+#, python-format
+msgid "User \"{}\" does not have access to the company \"{}\""
+msgstr ""
+
+#. module: base_user_role_company
+#: model:ir.model,name:base_user_role_company.model_res_users
+msgid "Users"
+msgstr ""
+
+#. module: base_user_role_company
+#: model:ir.model,name:base_user_role_company.model_res_users_role_line
+msgid "Users associated to a role"
+msgstr ""

From 3f39499b0fe82d755dfb9685f0c2f71f322ee01b Mon Sep 17 00:00:00 2001
From: OCA-git-bot <oca-git-bot@odoo-community.org>
Date: Wed, 19 May 2021 18:27:49 +0000
Subject: [PATCH 03/45] [UPD] README.rst

---
 base_user_role_company/README.rst             | 115 +++++
 .../static/description/index.html             | 467 ++++++++++++++++++
 2 files changed, 582 insertions(+)
 create mode 100644 base_user_role_company/README.rst
 create mode 100644 base_user_role_company/static/description/index.html

diff --git a/base_user_role_company/README.rst b/base_user_role_company/README.rst
new file mode 100644
index 000000000..5b7d12252
--- /dev/null
+++ b/base_user_role_company/README.rst
@@ -0,0 +1,115 @@
+=====================
+User roles by company
+=====================
+
+.. !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+   !! This file is generated by oca-gen-addon-readme !!
+   !! changes will be overwritten.                   !!
+   !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+
+.. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png
+    :target: https://odoo-community.org/page/development-status
+    :alt: Beta
+.. |badge2| image:: https://img.shields.io/badge/licence-AGPL--3-blue.png
+    :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html
+    :alt: License: AGPL-3
+.. |badge3| image:: https://img.shields.io/badge/github-OCA%2Fserver--backend-lightgray.png?logo=github
+    :target: https://github.com/OCA/server-backend/tree/14.0/base_user_role_company
+    :alt: OCA/server-backend
+.. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png
+    :target: https://translation.odoo-community.org/projects/server-backend-14-0/server-backend-14-0-base_user_role_company
+    :alt: Translate me on Weblate
+.. |badge5| image:: https://img.shields.io/badge/runbot-Try%20me-875A7B.png
+    :target: https://runbot.odoo-community.org/runbot/253/14.0
+    :alt: Try me on Runbot
+
+|badge1| |badge2| |badge3| |badge4| |badge5| 
+
+Enable User Roles depending on the Companies selected.
+
+A company specific Role will only be enabled
+if it is set for **all** the currently selected companies.
+
+For example, if a user is "Sales Manager" only for Company A,
+it will see that role enabled only if Company A is selected.
+If the user selects Company A and Company B,
+then the "Sales Manager" role won't be enabled.
+
+**Table of contents**
+
+.. contents::
+   :local:
+
+Configuration
+=============
+
+Roles are set on the User form.
+
+The "Company" additional column allows to set a Role as only valid for specific companies.
+
+There is also a "Active Role" techincal field, only visible in developer mode.
+It shows what roles are active, after applying the company selection rules.
+
+Usage
+=====
+
+Select the active companies from the web client widget, near the top right corner.
+When doing so, the User's security Groups are recomputed, based on the Roles.
+
+When the user changes the company selection, only the groups available to all active companies will be activated.
+
+For example:
+
+* A "SALES PERSON" and a "SALES MANAGER" roles are created.
+
+* A user is assigned to the roles:
+    * "SALES PERSON", with no specific company assigned (meaning all)
+    * "SALES MANAGER" only to "My Company (Chicago)"
+
+* When selecting active companies from the UI widget:
+    * If only "My Company (San Francisco)" is active, "SALES PERSON" will be active.
+    * If only "My Company (Chicago)" is active, "SALES PERSON" and "SALES MANAGER" will be active.
+    * If both "My Company (San Francisco)" and "My Company (Chicago)" is active, "SALES PERSON" will be active.
+
+Bug Tracker
+===========
+
+Bugs are tracked on `GitHub Issues <https://github.com/OCA/server-backend/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 <https://github.com/OCA/server-backend/issues/new?body=module:%20base_user_role_company%0Aversion:%2014.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**>`_.
+
+Do not contact contributors directly about support or help with technical issues.
+
+Credits
+=======
+
+Authors
+~~~~~~~
+
+* Open Source Integrators
+
+Contributors
+~~~~~~~~~~~~
+
+`Open Source Integrators <http://opensourceintegrators.com>`_
+
+  * Daniel Reis <dreis@opensourceintegrators.com>
+  * Chandresh Thakkar <cthakkr@opensourceintegrators.com>
+
+Maintainers
+~~~~~~~~~~~
+
+This module is maintained by the OCA.
+
+.. image:: https://odoo-community.org/logo.png
+   :alt: Odoo Community Association
+   :target: https://odoo-community.org
+
+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/server-backend <https://github.com/OCA/server-backend/tree/14.0/base_user_role_company>`_ project on GitHub.
+
+You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.
diff --git a/base_user_role_company/static/description/index.html b/base_user_role_company/static/description/index.html
new file mode 100644
index 000000000..9eb4a6fcc
--- /dev/null
+++ b/base_user_role_company/static/description/index.html
@@ -0,0 +1,467 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+<meta name="generator" content="Docutils 0.15.1: http://docutils.sourceforge.net/" />
+<title>User roles by company</title>
+<style type="text/css">
+
+/*
+:Author: David Goodger (goodger@python.org)
+:Id: $Id: html4css1.css 7952 2016-07-26 18:15:59Z milde $
+:Copyright: This stylesheet has been placed in the public domain.
+
+Default cascading style sheet for the HTML output of Docutils.
+
+See http://docutils.sf.net/docs/howto/html-stylesheets.html for how to
+customize this style sheet.
+*/
+
+/* used to remove borders from tables and images */
+.borderless, table.borderless td, table.borderless th {
+  border: 0 }
+
+table.borderless td, table.borderless th {
+  /* Override padding for "table.docutils td" with "! important".
+     The right padding separates the table cells. */
+  padding: 0 0.5em 0 0 ! important }
+
+.first {
+  /* Override more specific margin styles with "! important". */
+  margin-top: 0 ! important }
+
+.last, .with-subtitle {
+  margin-bottom: 0 ! important }
+
+.hidden {
+  display: none }
+
+.subscript {
+  vertical-align: sub;
+  font-size: smaller }
+
+.superscript {
+  vertical-align: super;
+  font-size: smaller }
+
+a.toc-backref {
+  text-decoration: none ;
+  color: black }
+
+blockquote.epigraph {
+  margin: 2em 5em ; }
+
+dl.docutils dd {
+  margin-bottom: 0.5em }
+
+object[type="image/svg+xml"], object[type="application/x-shockwave-flash"] {
+  overflow: hidden;
+}
+
+/* Uncomment (and remove this text!) to get bold-faced definition list terms
+dl.docutils dt {
+  font-weight: bold }
+*/
+
+div.abstract {
+  margin: 2em 5em }
+
+div.abstract p.topic-title {
+  font-weight: bold ;
+  text-align: center }
+
+div.admonition, div.attention, div.caution, div.danger, div.error,
+div.hint, div.important, div.note, div.tip, div.warning {
+  margin: 2em ;
+  border: medium outset ;
+  padding: 1em }
+
+div.admonition p.admonition-title, div.hint p.admonition-title,
+div.important p.admonition-title, div.note p.admonition-title,
+div.tip p.admonition-title {
+  font-weight: bold ;
+  font-family: sans-serif }
+
+div.attention p.admonition-title, div.caution p.admonition-title,
+div.danger p.admonition-title, div.error p.admonition-title,
+div.warning p.admonition-title, .code .error {
+  color: red ;
+  font-weight: bold ;
+  font-family: sans-serif }
+
+/* Uncomment (and remove this text!) to get reduced vertical space in
+   compound paragraphs.
+div.compound .compound-first, div.compound .compound-middle {
+  margin-bottom: 0.5em }
+
+div.compound .compound-last, div.compound .compound-middle {
+  margin-top: 0.5em }
+*/
+
+div.dedication {
+  margin: 2em 5em ;
+  text-align: center ;
+  font-style: italic }
+
+div.dedication p.topic-title {
+  font-weight: bold ;
+  font-style: normal }
+
+div.figure {
+  margin-left: 2em ;
+  margin-right: 2em }
+
+div.footer, div.header {
+  clear: both;
+  font-size: smaller }
+
+div.line-block {
+  display: block ;
+  margin-top: 1em ;
+  margin-bottom: 1em }
+
+div.line-block div.line-block {
+  margin-top: 0 ;
+  margin-bottom: 0 ;
+  margin-left: 1.5em }
+
+div.sidebar {
+  margin: 0 0 0.5em 1em ;
+  border: medium outset ;
+  padding: 1em ;
+  background-color: #ffffee ;
+  width: 40% ;
+  float: right ;
+  clear: right }
+
+div.sidebar p.rubric {
+  font-family: sans-serif ;
+  font-size: medium }
+
+div.system-messages {
+  margin: 5em }
+
+div.system-messages h1 {
+  color: red }
+
+div.system-message {
+  border: medium outset ;
+  padding: 1em }
+
+div.system-message p.system-message-title {
+  color: red ;
+  font-weight: bold }
+
+div.topic {
+  margin: 2em }
+
+h1.section-subtitle, h2.section-subtitle, h3.section-subtitle,
+h4.section-subtitle, h5.section-subtitle, h6.section-subtitle {
+  margin-top: 0.4em }
+
+h1.title {
+  text-align: center }
+
+h2.subtitle {
+  text-align: center }
+
+hr.docutils {
+  width: 75% }
+
+img.align-left, .figure.align-left, object.align-left, table.align-left {
+  clear: left ;
+  float: left ;
+  margin-right: 1em }
+
+img.align-right, .figure.align-right, object.align-right, table.align-right {
+  clear: right ;
+  float: right ;
+  margin-left: 1em }
+
+img.align-center, .figure.align-center, object.align-center {
+  display: block;
+  margin-left: auto;
+  margin-right: auto;
+}
+
+table.align-center {
+  margin-left: auto;
+  margin-right: auto;
+}
+
+.align-left {
+  text-align: left }
+
+.align-center {
+  clear: both ;
+  text-align: center }
+
+.align-right {
+  text-align: right }
+
+/* reset inner alignment in figures */
+div.align-right {
+  text-align: inherit }
+
+/* div.align-center * { */
+/*   text-align: left } */
+
+.align-top    {
+  vertical-align: top }
+
+.align-middle {
+  vertical-align: middle }
+
+.align-bottom {
+  vertical-align: bottom }
+
+ol.simple, ul.simple {
+  margin-bottom: 1em }
+
+ol.arabic {
+  list-style: decimal }
+
+ol.loweralpha {
+  list-style: lower-alpha }
+
+ol.upperalpha {
+  list-style: upper-alpha }
+
+ol.lowerroman {
+  list-style: lower-roman }
+
+ol.upperroman {
+  list-style: upper-roman }
+
+p.attribution {
+  text-align: right ;
+  margin-left: 50% }
+
+p.caption {
+  font-style: italic }
+
+p.credits {
+  font-style: italic ;
+  font-size: smaller }
+
+p.label {
+  white-space: nowrap }
+
+p.rubric {
+  font-weight: bold ;
+  font-size: larger ;
+  color: maroon ;
+  text-align: center }
+
+p.sidebar-title {
+  font-family: sans-serif ;
+  font-weight: bold ;
+  font-size: larger }
+
+p.sidebar-subtitle {
+  font-family: sans-serif ;
+  font-weight: bold }
+
+p.topic-title {
+  font-weight: bold }
+
+pre.address {
+  margin-bottom: 0 ;
+  margin-top: 0 ;
+  font: inherit }
+
+pre.literal-block, pre.doctest-block, pre.math, pre.code {
+  margin-left: 2em ;
+  margin-right: 2em }
+
+pre.code .ln { color: grey; } /* line numbers */
+pre.code, code { background-color: #eeeeee }
+pre.code .comment, code .comment { color: #5C6576 }
+pre.code .keyword, code .keyword { color: #3B0D06; font-weight: bold }
+pre.code .literal.string, code .literal.string { color: #0C5404 }
+pre.code .name.builtin, code .name.builtin { color: #352B84 }
+pre.code .deleted, code .deleted { background-color: #DEB0A1}
+pre.code .inserted, code .inserted { background-color: #A3D289}
+
+span.classifier {
+  font-family: sans-serif ;
+  font-style: oblique }
+
+span.classifier-delimiter {
+  font-family: sans-serif ;
+  font-weight: bold }
+
+span.interpreted {
+  font-family: sans-serif }
+
+span.option {
+  white-space: nowrap }
+
+span.pre {
+  white-space: pre }
+
+span.problematic {
+  color: red }
+
+span.section-subtitle {
+  /* font-size relative to parent (h1..h6 element) */
+  font-size: 80% }
+
+table.citation {
+  border-left: solid 1px gray;
+  margin-left: 1px }
+
+table.docinfo {
+  margin: 2em 4em }
+
+table.docutils {
+  margin-top: 0.5em ;
+  margin-bottom: 0.5em }
+
+table.footnote {
+  border-left: solid 1px black;
+  margin-left: 1px }
+
+table.docutils td, table.docutils th,
+table.docinfo td, table.docinfo th {
+  padding-left: 0.5em ;
+  padding-right: 0.5em ;
+  vertical-align: top }
+
+table.docutils th.field-name, table.docinfo th.docinfo-name {
+  font-weight: bold ;
+  text-align: left ;
+  white-space: nowrap ;
+  padding-left: 0 }
+
+/* "booktabs" style (no vertical lines) */
+table.docutils.booktabs {
+  border: 0px;
+  border-top: 2px solid;
+  border-bottom: 2px solid;
+  border-collapse: collapse;
+}
+table.docutils.booktabs * {
+  border: 0px;
+}
+table.docutils.booktabs th {
+  border-bottom: thin solid;
+  text-align: left;
+}
+
+h1 tt.docutils, h2 tt.docutils, h3 tt.docutils,
+h4 tt.docutils, h5 tt.docutils, h6 tt.docutils {
+  font-size: 100% }
+
+ul.auto-toc {
+  list-style-type: none }
+
+</style>
+</head>
+<body>
+<div class="document" id="user-roles-by-company">
+<h1 class="title">User roles by company</h1>
+
+<!-- !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+!! This file is generated by oca-gen-addon-readme !!
+!! changes will be overwritten.                   !!
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
+<p><a class="reference external" href="https://odoo-community.org/page/development-status"><img alt="Beta" src="https://img.shields.io/badge/maturity-Beta-yellow.png" /></a> <a class="reference external" href="http://www.gnu.org/licenses/agpl-3.0-standalone.html"><img alt="License: AGPL-3" src="https://img.shields.io/badge/licence-AGPL--3-blue.png" /></a> <a class="reference external" href="https://github.com/OCA/server-backend/tree/14.0/base_user_role_company"><img alt="OCA/server-backend" src="https://img.shields.io/badge/github-OCA%2Fserver--backend-lightgray.png?logo=github" /></a> <a class="reference external" href="https://translation.odoo-community.org/projects/server-backend-14-0/server-backend-14-0-base_user_role_company"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external" href="https://runbot.odoo-community.org/runbot/253/14.0"><img alt="Try me on Runbot" src="https://img.shields.io/badge/runbot-Try%20me-875A7B.png" /></a></p>
+<p>Enable User Roles depending on the Companies selected.</p>
+<p>A company specific Role will only be enabled
+if it is set for <strong>all</strong> the currently selected companies.</p>
+<p>For example, if a user is “Sales Manager” only for Company A,
+it will see that role enabled only if Company A is selected.
+If the user selects Company A and Company B,
+then the “Sales Manager” role won’t be enabled.</p>
+<p><strong>Table of contents</strong></p>
+<div class="contents local topic" id="contents">
+<ul class="simple">
+<li><a class="reference internal" href="#configuration" id="id1">Configuration</a></li>
+<li><a class="reference internal" href="#usage" id="id2">Usage</a></li>
+<li><a class="reference internal" href="#bug-tracker" id="id3">Bug Tracker</a></li>
+<li><a class="reference internal" href="#credits" id="id4">Credits</a><ul>
+<li><a class="reference internal" href="#authors" id="id5">Authors</a></li>
+<li><a class="reference internal" href="#contributors" id="id6">Contributors</a></li>
+<li><a class="reference internal" href="#maintainers" id="id7">Maintainers</a></li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="section" id="configuration">
+<h1><a class="toc-backref" href="#id1">Configuration</a></h1>
+<p>Roles are set on the User form.</p>
+<p>The “Company” additional column allows to set a Role as only valid for specific companies.</p>
+<p>There is also a “Active Role” techincal field, only visible in developer mode.
+It shows what roles are active, after applying the company selection rules.</p>
+</div>
+<div class="section" id="usage">
+<h1><a class="toc-backref" href="#id2">Usage</a></h1>
+<p>Select the active companies from the web client widget, near the top right corner.
+When doing so, the User’s security Groups are recomputed, based on the Roles.</p>
+<p>When the user changes the company selection, only the groups available to all active companies will be activated.</p>
+<p>For example:</p>
+<ul class="simple">
+<li>A “SALES PERSON” and a “SALES MANAGER” roles are created.</li>
+<li><dl class="first docutils">
+<dt>A user is assigned to the roles:</dt>
+<dd><ul class="first last">
+<li>“SALES PERSON”, with no specific company assigned (meaning all)</li>
+<li>“SALES MANAGER” only to “My Company (Chicago)”</li>
+</ul>
+</dd>
+</dl>
+</li>
+<li><dl class="first docutils">
+<dt>When selecting active companies from the UI widget:</dt>
+<dd><ul class="first last">
+<li>If only “My Company (San Francisco)” is active, “SALES PERSON” will be active.</li>
+<li>If only “My Company (Chicago)” is active, “SALES PERSON” and “SALES MANAGER” will be active.</li>
+<li>If both “My Company (San Francisco)” and “My Company (Chicago)” is active, “SALES PERSON” will be active.</li>
+</ul>
+</dd>
+</dl>
+</li>
+</ul>
+</div>
+<div class="section" id="bug-tracker">
+<h1><a class="toc-backref" href="#id3">Bug Tracker</a></h1>
+<p>Bugs are tracked on <a class="reference external" href="https://github.com/OCA/server-backend/issues">GitHub Issues</a>.
+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
+<a class="reference external" href="https://github.com/OCA/server-backend/issues/new?body=module:%20base_user_role_company%0Aversion:%2014.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**">feedback</a>.</p>
+<p>Do not contact contributors directly about support or help with technical issues.</p>
+</div>
+<div class="section" id="credits">
+<h1><a class="toc-backref" href="#id4">Credits</a></h1>
+<div class="section" id="authors">
+<h2><a class="toc-backref" href="#id5">Authors</a></h2>
+<ul class="simple">
+<li>Open Source Integrators</li>
+</ul>
+</div>
+<div class="section" id="contributors">
+<h2><a class="toc-backref" href="#id6">Contributors</a></h2>
+<p><a class="reference external" href="http://opensourceintegrators.com">Open Source Integrators</a></p>
+<blockquote>
+<ul class="simple">
+<li>Daniel Reis &lt;<a class="reference external" href="mailto:dreis&#64;opensourceintegrators.com">dreis&#64;opensourceintegrators.com</a>&gt;</li>
+<li>Chandresh Thakkar &lt;<a class="reference external" href="mailto:cthakkr&#64;opensourceintegrators.com">cthakkr&#64;opensourceintegrators.com</a>&gt;</li>
+</ul>
+</blockquote>
+</div>
+<div class="section" id="maintainers">
+<h2><a class="toc-backref" href="#id7">Maintainers</a></h2>
+<p>This module is maintained by the OCA.</p>
+<a class="reference external image-reference" href="https://odoo-community.org"><img alt="Odoo Community Association" src="https://odoo-community.org/logo.png" /></a>
+<p>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.</p>
+<p>This module is part of the <a class="reference external" href="https://github.com/OCA/server-backend/tree/14.0/base_user_role_company">OCA/server-backend</a> project on GitHub.</p>
+<p>You are welcome to contribute. To learn how please visit <a class="reference external" href="https://odoo-community.org/page/Contribute">https://odoo-community.org/page/Contribute</a>.</p>
+</div>
+</div>
+</div>
+</body>
+</html>

From 43dca59c29802310ed0c3323d27617c08303942d Mon Sep 17 00:00:00 2001
From: OCA-git-bot <oca-git-bot@odoo-community.org>
Date: Wed, 19 May 2021 18:27:49 +0000
Subject: [PATCH 04/45] [ADD] icon.png

---
 .../static/description/icon.png                  | Bin 0 -> 9455 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 base_user_role_company/static/description/icon.png

diff --git a/base_user_role_company/static/description/icon.png b/base_user_role_company/static/description/icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..3a0328b516c4980e8e44cdb63fd945757ddd132d
GIT binary patch
literal 9455
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
Xviia!U7SGha1wx#SCgwmn*{w2TRX*I

literal 0
HcmV?d00001


From 5f84a9b85ab9fe3a99fb1041f8ec9556753ad8de Mon Sep 17 00:00:00 2001
From: Andrii Skrypka <andrijskrypa@ukr.net>
Date: Wed, 3 Nov 2021 10:04:09 +0200
Subject: [PATCH 05/45] [FIX] base_user_role_company: wrong xpath

---
 base_user_role_company/views/role.xml | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/base_user_role_company/views/role.xml b/base_user_role_company/views/role.xml
index bfcb01e8f..89bd80ad7 100644
--- a/base_user_role_company/views/role.xml
+++ b/base_user_role_company/views/role.xml
@@ -5,10 +5,13 @@
         <field name="model">res.users</field>
         <field name="inherit_id" ref="base_user_role.view_res_users_form_inherit" />
         <field name="arch" type="xml">
-            <field name="role_id" position="after">
+            <xpath
+                expr="//field[@name='role_line_ids']//field[@name='role_id']"
+                position="after"
+            >
                 <field name="company_id" groups="base.group_multi_company" />
                 <field name="active_role" groups="base.group_no_one" readonly="1" />
-            </field>
+            </xpath>
         </field>
     </record>
 </odoo>

From 31d424bf413266c4e31ed510e6c225f1938c370e Mon Sep 17 00:00:00 2001
From: OCA-git-bot <oca-git-bot@odoo-community.org>
Date: Thu, 4 Nov 2021 18:50:53 +0000
Subject: [PATCH 06/45] base_user_role_company 14.0.1.1.0

---
 base_user_role_company/__manifest__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/base_user_role_company/__manifest__.py b/base_user_role_company/__manifest__.py
index 5b1af0981..8e306b5c8 100644
--- a/base_user_role_company/__manifest__.py
+++ b/base_user_role_company/__manifest__.py
@@ -3,7 +3,7 @@
 
 {
     "name": "User roles by company",
-    "version": "14.0.1.0.0",
+    "version": "14.0.1.1.0",
     "category": "Tools",
     "author": "Open Source Integrators, Odoo Community Association (OCA)",
     "license": "AGPL-3",

From fa5145dbac421f0332a5907fa015128e8ac0e9c6 Mon Sep 17 00:00:00 2001
From: Riccardo Bellanova <r.bellanova@apuliasoftware.it>
Date: Tue, 15 Feb 2022 12:15:48 +0000
Subject: [PATCH 07/45] Added translation using Weblate (Italian)

---
 base_user_role_company/i18n/it.po | 79 +++++++++++++++++++++++++++++++
 1 file changed, 79 insertions(+)
 create mode 100644 base_user_role_company/i18n/it.po

diff --git a/base_user_role_company/i18n/it.po b/base_user_role_company/i18n/it.po
new file mode 100644
index 000000000..b48538f39
--- /dev/null
+++ b/base_user_role_company/i18n/it.po
@@ -0,0 +1,79 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# 	* base_user_role_company
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 14.0\n"
+"Report-Msgid-Bugs-To: \n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"Language: it\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+
+#. module: base_user_role_company
+#: model:ir.model.fields,field_description:base_user_role_company.field_res_users_role_line__active_role
+msgid "Active Role"
+msgstr ""
+
+#. module: base_user_role_company
+#: model:ir.model.fields,field_description:base_user_role_company.field_res_users_role_line__company_id
+msgid "Company"
+msgstr ""
+
+#. module: base_user_role_company
+#: model:ir.model.fields,field_description:base_user_role_company.field_ir_http__display_name
+#: model:ir.model.fields,field_description:base_user_role_company.field_res_users__display_name
+#: model:ir.model.fields,field_description:base_user_role_company.field_res_users_role_line__display_name
+msgid "Display Name"
+msgstr ""
+
+#. module: base_user_role_company
+#: model:ir.model,name:base_user_role_company.model_ir_http
+msgid "HTTP Routing"
+msgstr ""
+
+#. module: base_user_role_company
+#: model:ir.model.fields,field_description:base_user_role_company.field_ir_http__id
+#: model:ir.model.fields,field_description:base_user_role_company.field_res_users__id
+#: model:ir.model.fields,field_description:base_user_role_company.field_res_users_role_line__id
+msgid "ID"
+msgstr ""
+
+#. module: base_user_role_company
+#: model:ir.model.fields,help:base_user_role_company.field_res_users_role_line__company_id
+msgid ""
+"If set, this role only applies when this is the main company selected. "
+"Otherwise it applies to all companies."
+msgstr ""
+
+#. module: base_user_role_company
+#: model:ir.model.fields,field_description:base_user_role_company.field_ir_http____last_update
+#: model:ir.model.fields,field_description:base_user_role_company.field_res_users____last_update
+#: model:ir.model.fields,field_description:base_user_role_company.field_res_users_role_line____last_update
+msgid "Last Modified on"
+msgstr ""
+
+#. module: base_user_role_company
+#: model:ir.model.constraint,message:base_user_role_company.constraint_res_users_role_line_user_role_uniq
+msgid "Roles can be assigned to a user only once at a time"
+msgstr ""
+
+#. module: base_user_role_company
+#: code:addons/base_user_role_company/models/role.py:0
+#, python-format
+msgid "User \"{}\" does not have access to the company \"{}\""
+msgstr ""
+
+#. module: base_user_role_company
+#: model:ir.model,name:base_user_role_company.model_res_users
+msgid "Users"
+msgstr ""
+
+#. module: base_user_role_company
+#: model:ir.model,name:base_user_role_company.model_res_users_role_line
+msgid "Users associated to a role"
+msgstr ""

From 4b1dcf99f382a1aa1d5d8957bc1886a31e756c89 Mon Sep 17 00:00:00 2001
From: Daniel Reis <dreis@opensourceintegrators.com>
Date: Tue, 15 Feb 2022 12:34:49 +0000
Subject: [PATCH 08/45] [FIX] base_user_role_company: roles not properly
 applied on login

---
 base_user_role_company/models/__init__.py |  1 +
 base_user_role_company/models/ir_http.py  |  4 +--
 base_user_role_company/models/role.py     | 29 ++----------------
 base_user_role_company/models/user.py     | 36 +++++++++++++++++++++++
 base_user_role_company/views/role.xml     |  2 +-
 5 files changed, 42 insertions(+), 30 deletions(-)
 create mode 100644 base_user_role_company/models/user.py

diff --git a/base_user_role_company/models/__init__.py b/base_user_role_company/models/__init__.py
index d38a0acf7..32004dfac 100644
--- a/base_user_role_company/models/__init__.py
+++ b/base_user_role_company/models/__init__.py
@@ -2,4 +2,5 @@
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 
 from . import role
+from . import user
 from . import ir_http
diff --git a/base_user_role_company/models/ir_http.py b/base_user_role_company/models/ir_http.py
index 7eaca704a..65a6b3b91 100644
--- a/base_user_role_company/models/ir_http.py
+++ b/base_user_role_company/models/ir_http.py
@@ -18,6 +18,6 @@ def session_info(self):
         if self.env.user.role_line_ids:
             cids_str = request.httprequest.cookies.get("cids", str(self.env.company.id))
             cids = [int(cid) for cid in cids_str.split(",")]
-            self.env.user._set_session_active_roles(cids)
-            self.env.user.set_groups_from_roles()
+            # The first element of cids is the currently selected company
+            self.env.user.set_groups_from_roles(company_id=cids[0])
         return result
diff --git a/base_user_role_company/models/role.py b/base_user_role_company/models/role.py
index c6702494c..0fdd234d8 100644
--- a/base_user_role_company/models/role.py
+++ b/base_user_role_company/models/role.py
@@ -8,13 +8,14 @@
 class ResUsersRoleLine(models.Model):
     _inherit = "res.users.role.line"
 
+    allowed_company_ids = fields.Many2many(related="user_id.company_ids")
     company_id = fields.Many2one(
         "res.company",
         "Company",
+        domain="[('id', 'in', allowed_company_ids)]",
         help="If set, this role only applies when this is the main company selected."
         " Otherwise it applies to all companies.",
     )
-    active_role = fields.Boolean(string="Active Role", default=True)
 
     @api.constrains("user_id", "company_id")
     def _check_company(self):
@@ -37,29 +38,3 @@ def _check_company(self):
             "Roles can be assigned to a user only once at a time",
         )
     ]
-
-
-class ResUsers(models.Model):
-    _inherit = "res.users"
-
-    def _get_enabled_roles(self):
-        res = super()._get_enabled_roles()
-        return res.filtered("active_role")
-
-    @api.model
-    def _set_session_active_roles(self, cids):
-        """
-        Based on the selected companies (cids),
-        calculate the roles to enable.
-        A role should be enabled only when it applies to all selected companies.
-        """
-        for role_line in self.env.user.role_line_ids:
-            if not role_line.company_id:
-                role_line.active_role = True
-            elif role_line.company_id.id in cids:
-                is_on_companies = self.env.user.role_line_ids.filtered(
-                    lambda x: x.role_id == role_line.role_id and x.company_id.id in cids
-                )
-                role_line.active_role = len(is_on_companies) == len(cids)
-            else:
-                role_line.active_role = False
diff --git a/base_user_role_company/models/user.py b/base_user_role_company/models/user.py
new file mode 100644
index 000000000..edc9ee0d2
--- /dev/null
+++ b/base_user_role_company/models/user.py
@@ -0,0 +1,36 @@
+# Copyright (C) 2021 Open Source Integrators
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
+from odoo import api, models
+
+
+class ResUsers(models.Model):
+    _inherit = "res.users"
+
+    @classmethod
+    def authenticate(cls, db, login, password, user_agent_env):
+        uid = super().authenticate(db, login, password, user_agent_env)
+        # On login, ensure the proper roles are applied
+        # The last Role applied may not be the correct one,
+        # sonce the new session current company can be different
+        with cls.pool.cursor() as cr:
+            env = api.Environment(cr, uid, {})
+            if env.user.role_line_ids:
+                env.user.set_groups_from_roles()
+        return uid
+
+    def _get_enabled_roles(self):
+        res = super()._get_enabled_roles()
+        # Enable only the Roles corresponing to the currently selected company
+        if self.env.user.role_line_ids:
+            curr_company = self.env.company
+            res = res.filtered(
+                lambda x: not x.company_id or x.company_id == curr_company
+            )
+        return res
+
+    def set_groups_from_roles(self, force=False, company_id=False):
+        # When using the Company Switcher widget, the self.env.company is not yet set
+        if company_id:
+            self = self.with_company(company_id)
+        return super().set_groups_from_roles(force=force)
diff --git a/base_user_role_company/views/role.xml b/base_user_role_company/views/role.xml
index 89bd80ad7..9cb06b7e9 100644
--- a/base_user_role_company/views/role.xml
+++ b/base_user_role_company/views/role.xml
@@ -9,8 +9,8 @@
                 expr="//field[@name='role_line_ids']//field[@name='role_id']"
                 position="after"
             >
+                <field name="allowed_company_ids" invisible="1" />
                 <field name="company_id" groups="base.group_multi_company" />
-                <field name="active_role" groups="base.group_no_one" readonly="1" />
             </xpath>
         </field>
     </record>

From 77a34f8d0d4a10341b7e98885f350a9314d339e2 Mon Sep 17 00:00:00 2001
From: Riccardo Bellanova <r.bellanova@apuliasoftware.it>
Date: Tue, 15 Feb 2022 13:51:05 +0000
Subject: [PATCH 09/45] Translated using Weblate (Italian)

Currently translated at 100.0% (11 of 11 strings)

Translation: server-backend-14.0/server-backend-14.0-base_user_role_company
Translate-URL: https://translation.odoo-community.org/projects/server-backend-14-0/server-backend-14-0-base_user_role_company/it/
---
 base_user_role_company/i18n/it.po | 26 +++++++++++++++-----------
 1 file changed, 15 insertions(+), 11 deletions(-)

diff --git a/base_user_role_company/i18n/it.po b/base_user_role_company/i18n/it.po
index b48538f39..f28ab71a1 100644
--- a/base_user_role_company/i18n/it.po
+++ b/base_user_role_company/i18n/it.po
@@ -6,42 +6,44 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 14.0\n"
 "Report-Msgid-Bugs-To: \n"
-"Last-Translator: Automatically generated\n"
+"PO-Revision-Date: 2022-02-15 16:16+0000\n"
+"Last-Translator: Riccardo Bellanova <r.bellanova@apuliasoftware.it>\n"
 "Language-Team: none\n"
 "Language: it\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Weblate 4.3.2\n"
 
 #. module: base_user_role_company
 #: model:ir.model.fields,field_description:base_user_role_company.field_res_users_role_line__active_role
 msgid "Active Role"
-msgstr ""
+msgstr "Ruolo attivo"
 
 #. module: base_user_role_company
 #: model:ir.model.fields,field_description:base_user_role_company.field_res_users_role_line__company_id
 msgid "Company"
-msgstr ""
+msgstr "Azienda"
 
 #. module: base_user_role_company
 #: model:ir.model.fields,field_description:base_user_role_company.field_ir_http__display_name
 #: model:ir.model.fields,field_description:base_user_role_company.field_res_users__display_name
 #: model:ir.model.fields,field_description:base_user_role_company.field_res_users_role_line__display_name
 msgid "Display Name"
-msgstr ""
+msgstr "Nome visualizzato"
 
 #. module: base_user_role_company
 #: model:ir.model,name:base_user_role_company.model_ir_http
 msgid "HTTP Routing"
-msgstr ""
+msgstr "Rotta HTTP"
 
 #. module: base_user_role_company
 #: model:ir.model.fields,field_description:base_user_role_company.field_ir_http__id
 #: model:ir.model.fields,field_description:base_user_role_company.field_res_users__id
 #: model:ir.model.fields,field_description:base_user_role_company.field_res_users_role_line__id
 msgid "ID"
-msgstr ""
+msgstr "ID"
 
 #. module: base_user_role_company
 #: model:ir.model.fields,help:base_user_role_company.field_res_users_role_line__company_id
@@ -49,31 +51,33 @@ msgid ""
 "If set, this role only applies when this is the main company selected. "
 "Otherwise it applies to all companies."
 msgstr ""
+"Se impostato, questo ruolo si applica solo quando questa è l'azienda "
+"principale selezionata. Altrimenti vale per tutte le aziende."
 
 #. module: base_user_role_company
 #: model:ir.model.fields,field_description:base_user_role_company.field_ir_http____last_update
 #: model:ir.model.fields,field_description:base_user_role_company.field_res_users____last_update
 #: model:ir.model.fields,field_description:base_user_role_company.field_res_users_role_line____last_update
 msgid "Last Modified on"
-msgstr ""
+msgstr "Ultima modifica il"
 
 #. module: base_user_role_company
 #: model:ir.model.constraint,message:base_user_role_company.constraint_res_users_role_line_user_role_uniq
 msgid "Roles can be assigned to a user only once at a time"
-msgstr ""
+msgstr "I ruoli possono essere assegnati all'utente solo uno alla volta"
 
 #. module: base_user_role_company
 #: code:addons/base_user_role_company/models/role.py:0
 #, python-format
 msgid "User \"{}\" does not have access to the company \"{}\""
-msgstr ""
+msgstr "L'utente \"{}\" non ha l'accesso all'azienda \"{}\""
 
 #. module: base_user_role_company
 #: model:ir.model,name:base_user_role_company.model_res_users
 msgid "Users"
-msgstr ""
+msgstr "Utenti"
 
 #. module: base_user_role_company
 #: model:ir.model,name:base_user_role_company.model_res_users_role_line
 msgid "Users associated to a role"
-msgstr ""
+msgstr "Utenti associati al ruolo"

From f3f8bd2460678a8454e4d6126b94b0788ace7a7c Mon Sep 17 00:00:00 2001
From: Daniel Reis <dreis@opensourceintegrators.com>
Date: Wed, 2 Mar 2022 12:42:30 +0000
Subject: [PATCH 10/45] [FIX] base_user_role_company: wrong menus on re-login

Issue found on logout / relogin.
The user groups were applied correctly, but the main menu showed apps
the user did not have access to.

This was related to the menu caching mechanisn, that was disabled here.
---
 base_user_role_company/__init__.py             |  1 +
 base_user_role_company/controllers/__init__.py |  1 +
 base_user_role_company/controllers/main.py     | 16 ++++++++++++++++
 3 files changed, 18 insertions(+)
 create mode 100644 base_user_role_company/controllers/__init__.py
 create mode 100644 base_user_role_company/controllers/main.py

diff --git a/base_user_role_company/__init__.py b/base_user_role_company/__init__.py
index bb83730e9..efc2a3f33 100644
--- a/base_user_role_company/__init__.py
+++ b/base_user_role_company/__init__.py
@@ -1,4 +1,5 @@
 # Copyright (C) 2021 Open Source Integrators
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 
+from . import controllers
 from . import models
diff --git a/base_user_role_company/controllers/__init__.py b/base_user_role_company/controllers/__init__.py
new file mode 100644
index 000000000..12a7e529b
--- /dev/null
+++ b/base_user_role_company/controllers/__init__.py
@@ -0,0 +1 @@
+from . import main
diff --git a/base_user_role_company/controllers/main.py b/base_user_role_company/controllers/main.py
new file mode 100644
index 000000000..7df62870e
--- /dev/null
+++ b/base_user_role_company/controllers/main.py
@@ -0,0 +1,16 @@
+# Copyright (C) 2022 Open Source Integrators
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
+from odoo import http
+
+from odoo.addons.web.controllers.main import Home
+
+
+class HomeExtended(Home):
+    @http.route()
+    def web_load_menus(self, unique):
+        response = super().web_load_menus(unique)
+        # On logout & re-login we could see wrong menus being rendered
+        # To avoid this, menu http cache must be disabled
+        response.headers.remove("Cache-Control")
+        return response

From 668e5ec6fabc217fa1e0100100904cf435f6f928 Mon Sep 17 00:00:00 2001
From: Daniel Reis <dreis@opensourceintegrators.com>
Date: Thu, 3 Mar 2022 11:40:58 +0000
Subject: [PATCH 11/45] [FIX] base_user_role_company: fix tests

---
 base_user_role_company/models/user.py         |  5 +--
 .../tests/test_role_per_company.py            | 41 ++++++++++---------
 2 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/base_user_role_company/models/user.py b/base_user_role_company/models/user.py
index edc9ee0d2..1a2f6296b 100644
--- a/base_user_role_company/models/user.py
+++ b/base_user_role_company/models/user.py
@@ -22,10 +22,9 @@ def authenticate(cls, db, login, password, user_agent_env):
     def _get_enabled_roles(self):
         res = super()._get_enabled_roles()
         # Enable only the Roles corresponing to the currently selected company
-        if self.env.user.role_line_ids:
-            curr_company = self.env.company
+        if self.role_line_ids:
             res = res.filtered(
-                lambda x: not x.company_id or x.company_id == curr_company
+                lambda x: not x.company_id or x.company_id == self.env.company
             )
         return res
 
diff --git a/base_user_role_company/tests/test_role_per_company.py b/base_user_role_company/tests/test_role_per_company.py
index 14cb869bf..9b1ac1fcc 100644
--- a/base_user_role_company/tests/test_role_per_company.py
+++ b/base_user_role_company/tests/test_role_per_company.py
@@ -11,11 +11,18 @@ def setUp(self):
         self.Company = self.env["res.company"]
         self.company1 = self.env.ref("base.main_company")
         self.company2 = self.Company.create({"name": "company2"})
+        # GROUPS for roles
+        self.groupA = self.env.ref("base.group_user")
+        self.groupB = self.env.ref("base.group_system")
+        self.groupC = self.env.ref("base.group_partner_manager")
         # ROLES
         self.Role = self.env["res.users.role"]
         self.roleA = self.Role.create({"name": "ROLE All Companies"})
+        self.roleA.implied_ids |= self.groupA
         self.roleB = self.Role.create({"name": "ROLE Company 1"})
+        self.roleB.implied_ids |= self.groupB
         self.roleC = self.Role.create({"name": "ROLE Company 1 and 2"})
+        self.roleC.implied_ids |= self.groupC
         # USER
         # ==Role=== ==Company== C1  C2  C1+C2
         # Role A                Yes Yes Yes
@@ -35,28 +42,22 @@ def setUp(self):
             ],
         }
         self.test_user = self.User.create(user_vals)
-        self.User = self.User.with_user(self.test_user)
 
     def test_110_company_1(self):
-        "Company 1 selected: Tech and Settings roles are activated"
-        self.User._set_session_active_roles([self.company1.id])
-        active_roles = self.test_user.role_line_ids.filtered("active_role").mapped(
-            "role_id"
-        )
-        self.assertEqual(active_roles, self.roleA | self.roleB | self.roleC)
+        "Company 1 selected: Roles A, B and C are enabled"
+        self.test_user.set_groups_from_roles(company_id=self.company1.id)
+        expected = self.groupA | self.groupB | self.groupC
+        found = self.test_user.groups_id.filtered(lambda x: x in expected)
+        self.assertEqual(expected, found)
 
     def test_120_company_2(self):
-        "Company 2 selected: only Tech role enabled"
-        self.User._set_session_active_roles([self.company2.id])
-        active_roles = self.test_user.role_line_ids.filtered("active_role").mapped(
-            "role_id"
-        )
-        self.assertEqual(active_roles, self.roleA | self.roleC)
+        "Company 2 selected: Roles A and C are enabled"
+        self.test_user.set_groups_from_roles(company_id=self.company2.id)
+        enabled = self.test_user.groups_id
+        expected = self.groupA | self.groupC
+        found = enabled.filtered(lambda x: x in expected)
+        self.assertEqual(expected, found)
 
-    def test_130_company_1_2(self):
-        "Settings Role enabled for Company 1 and 2"
-        self.User._set_session_active_roles([self.company1.id, self.company2.id])
-        active_roles = self.test_user.role_line_ids.filtered("active_role").mapped(
-            "role_id"
-        )
-        self.assertEqual(active_roles, self.roleA | self.roleC)
+        not_expected = self.groupB
+        found = enabled.filtered(lambda x: x in not_expected)
+        self.assertFalse(found)

From 3b37c52ca70bda07b963c44ba6b2e47e250f0040 Mon Sep 17 00:00:00 2001
From: oca-travis <oca+oca-travis@odoo-community.org>
Date: Thu, 3 Mar 2022 15:29:25 +0000
Subject: [PATCH 12/45] [UPD] Update base_user_role_company.pot

---
 base_user_role_company/i18n/base_user_role_company.pot | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/base_user_role_company/i18n/base_user_role_company.pot b/base_user_role_company/i18n/base_user_role_company.pot
index 776c3cb0a..3b1fe1508 100644
--- a/base_user_role_company/i18n/base_user_role_company.pot
+++ b/base_user_role_company/i18n/base_user_role_company.pot
@@ -14,8 +14,8 @@ msgstr ""
 "Plural-Forms: \n"
 
 #. module: base_user_role_company
-#: model:ir.model.fields,field_description:base_user_role_company.field_res_users_role_line__active_role
-msgid "Active Role"
+#: model:ir.model.fields,field_description:base_user_role_company.field_res_users_role_line__allowed_company_ids
+msgid "Companies"
 msgstr ""
 
 #. module: base_user_role_company

From 4ad41ce0a2ed76ebf76804bd84c83f2f48863176 Mon Sep 17 00:00:00 2001
From: OCA-git-bot <oca-git-bot@odoo-community.org>
Date: Thu, 3 Mar 2022 15:33:16 +0000
Subject: [PATCH 13/45] base_user_role_company 14.0.2.0.0

---
 base_user_role_company/__manifest__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/base_user_role_company/__manifest__.py b/base_user_role_company/__manifest__.py
index 8e306b5c8..b5716f984 100644
--- a/base_user_role_company/__manifest__.py
+++ b/base_user_role_company/__manifest__.py
@@ -3,7 +3,7 @@
 
 {
     "name": "User roles by company",
-    "version": "14.0.1.1.0",
+    "version": "14.0.2.0.0",
     "category": "Tools",
     "author": "Open Source Integrators, Odoo Community Association (OCA)",
     "license": "AGPL-3",

From 6d90736364ca056e49ca366c76969cbd26d4c474 Mon Sep 17 00:00:00 2001
From: OCA Transbot <transbot@odoo-community.org>
Date: Thu, 3 Mar 2022 15:33:27 +0000
Subject: [PATCH 14/45] Update translation files

Updated by "Update PO files to match POT (msgmerge)" hook in Weblate.

Translation: server-backend-14.0/server-backend-14.0-base_user_role_company
Translate-URL: https://translation.odoo-community.org/projects/server-backend-14-0/server-backend-14-0-base_user_role_company/
---
 base_user_role_company/i18n/it.po | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/base_user_role_company/i18n/it.po b/base_user_role_company/i18n/it.po
index f28ab71a1..c587735df 100644
--- a/base_user_role_company/i18n/it.po
+++ b/base_user_role_company/i18n/it.po
@@ -17,9 +17,9 @@ msgstr ""
 "X-Generator: Weblate 4.3.2\n"
 
 #. module: base_user_role_company
-#: model:ir.model.fields,field_description:base_user_role_company.field_res_users_role_line__active_role
-msgid "Active Role"
-msgstr "Ruolo attivo"
+#: model:ir.model.fields,field_description:base_user_role_company.field_res_users_role_line__allowed_company_ids
+msgid "Companies"
+msgstr ""
 
 #. module: base_user_role_company
 #: model:ir.model.fields,field_description:base_user_role_company.field_res_users_role_line__company_id
@@ -81,3 +81,6 @@ msgstr "Utenti"
 #: model:ir.model,name:base_user_role_company.model_res_users_role_line
 msgid "Users associated to a role"
 msgstr "Utenti associati al ruolo"
+
+#~ msgid "Active Role"
+#~ msgstr "Ruolo attivo"

From 57e012c8386496311ac6e9cf9bcf097ce7792c47 Mon Sep 17 00:00:00 2001
From: OCA-git-bot <oca-git-bot@odoo-community.org>
Date: Thu, 3 Mar 2022 15:45:46 +0000
Subject: [PATCH 15/45] base_user_role_company 14.0.2.0.1

---
 base_user_role_company/__manifest__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/base_user_role_company/__manifest__.py b/base_user_role_company/__manifest__.py
index b5716f984..d39f645a7 100644
--- a/base_user_role_company/__manifest__.py
+++ b/base_user_role_company/__manifest__.py
@@ -3,7 +3,7 @@
 
 {
     "name": "User roles by company",
-    "version": "14.0.2.0.0",
+    "version": "14.0.2.0.1",
     "category": "Tools",
     "author": "Open Source Integrators, Odoo Community Association (OCA)",
     "license": "AGPL-3",

From d9950f57567f8cb9cf06a929e6178ddf3380adc9 Mon Sep 17 00:00:00 2001
From: Francesco Foresti <francesco.foresti@ooops404.com>
Date: Tue, 7 Mar 2023 17:07:28 +0000
Subject: [PATCH 16/45] Translated using Weblate (Italian)

Currently translated at 90.9% (10 of 11 strings)

Translation: server-backend-14.0/server-backend-14.0-base_user_role_company
Translate-URL: https://translation.odoo-community.org/projects/server-backend-14-0/server-backend-14-0-base_user_role_company/it/
---
 base_user_role_company/i18n/it.po | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/base_user_role_company/i18n/it.po b/base_user_role_company/i18n/it.po
index c587735df..90e9e0b20 100644
--- a/base_user_role_company/i18n/it.po
+++ b/base_user_role_company/i18n/it.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 14.0\n"
 "Report-Msgid-Bugs-To: \n"
-"PO-Revision-Date: 2022-02-15 16:16+0000\n"
-"Last-Translator: Riccardo Bellanova <r.bellanova@apuliasoftware.it>\n"
+"PO-Revision-Date: 2023-03-07 19:24+0000\n"
+"Last-Translator: Francesco Foresti <francesco.foresti@ooops404.com>\n"
 "Language-Team: none\n"
 "Language: it\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 4.3.2\n"
+"X-Generator: Weblate 4.14.1\n"
 
 #. module: base_user_role_company
 #: model:ir.model.fields,field_description:base_user_role_company.field_res_users_role_line__allowed_company_ids
@@ -36,7 +36,7 @@ msgstr "Nome visualizzato"
 #. module: base_user_role_company
 #: model:ir.model,name:base_user_role_company.model_ir_http
 msgid "HTTP Routing"
-msgstr "Rotta HTTP"
+msgstr "Instradamento HTTP"
 
 #. module: base_user_role_company
 #: model:ir.model.fields,field_description:base_user_role_company.field_ir_http__id

From 68838038aee49e7e5af45ce0cee63e703485e131 Mon Sep 17 00:00:00 2001
From: Urvisha-OSI <udesai@opensourceintegrators.com>
Date: Wed, 5 Apr 2023 12:43:55 +0530
Subject: [PATCH 17/45] [IMP] base_user_role_company: pre-commit stuff

---
 base_user_role_company/__manifest__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/base_user_role_company/__manifest__.py b/base_user_role_company/__manifest__.py
index d39f645a7..4b225993f 100644
--- a/base_user_role_company/__manifest__.py
+++ b/base_user_role_company/__manifest__.py
@@ -3,7 +3,7 @@
 
 {
     "name": "User roles by company",
-    "version": "14.0.2.0.1",
+    "version": "16.0.1.0.0",
     "category": "Tools",
     "author": "Open Source Integrators, Odoo Community Association (OCA)",
     "license": "AGPL-3",

From ebc9834afb025b6f6b584ca0cf9193dab873d824 Mon Sep 17 00:00:00 2001
From: Urvisha-OSI <udesai@opensourceintegrators.com>
Date: Wed, 5 Apr 2023 13:30:38 +0530
Subject: [PATCH 18/45] [MIG] base_user_role_company: Migration to 16.0

---
 base_user_role_company/README.rst                 | 15 ++++++++-------
 base_user_role_company/controllers/main.py        |  2 +-
 base_user_role_company/readme/CONTRIBUTORS.rst    |  1 +
 .../static/description/index.html                 |  9 +++++----
 4 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/base_user_role_company/README.rst b/base_user_role_company/README.rst
index 5b7d12252..a75e13635 100644
--- a/base_user_role_company/README.rst
+++ b/base_user_role_company/README.rst
@@ -14,14 +14,14 @@ User roles by company
     :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html
     :alt: License: AGPL-3
 .. |badge3| image:: https://img.shields.io/badge/github-OCA%2Fserver--backend-lightgray.png?logo=github
-    :target: https://github.com/OCA/server-backend/tree/14.0/base_user_role_company
+    :target: https://github.com/OCA/server-backend/tree/16.0/base_user_role_company
     :alt: OCA/server-backend
 .. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png
-    :target: https://translation.odoo-community.org/projects/server-backend-14-0/server-backend-14-0-base_user_role_company
+    :target: https://translation.odoo-community.org/projects/server-backend-16-0/server-backend-16-0-base_user_role_company
     :alt: Translate me on Weblate
-.. |badge5| image:: https://img.shields.io/badge/runbot-Try%20me-875A7B.png
-    :target: https://runbot.odoo-community.org/runbot/253/14.0
-    :alt: Try me on Runbot
+.. |badge5| image:: https://img.shields.io/badge/runboat-Try%20me-875A7B.png
+    :target: https://runboat.odoo-community.org/webui/builds.html?repo=OCA/server-backend&target_branch=16.0
+    :alt: Try me on Runboat
 
 |badge1| |badge2| |badge3| |badge4| |badge5| 
 
@@ -77,7 +77,7 @@ Bug Tracker
 Bugs are tracked on `GitHub Issues <https://github.com/OCA/server-backend/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 <https://github.com/OCA/server-backend/issues/new?body=module:%20base_user_role_company%0Aversion:%2014.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**>`_.
+`feedback <https://github.com/OCA/server-backend/issues/new?body=module:%20base_user_role_company%0Aversion:%2016.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**>`_.
 
 Do not contact contributors directly about support or help with technical issues.
 
@@ -96,6 +96,7 @@ Contributors
 
   * Daniel Reis <dreis@opensourceintegrators.com>
   * Chandresh Thakkar <cthakkr@opensourceintegrators.com>
+  * Urvisha Desai <udesai@opensourceintegrators.com>
 
 Maintainers
 ~~~~~~~~~~~
@@ -110,6 +111,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/server-backend <https://github.com/OCA/server-backend/tree/14.0/base_user_role_company>`_ project on GitHub.
+This module is part of the `OCA/server-backend <https://github.com/OCA/server-backend/tree/16.0/base_user_role_company>`_ project on GitHub.
 
 You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.
diff --git a/base_user_role_company/controllers/main.py b/base_user_role_company/controllers/main.py
index 7df62870e..7e75d6954 100644
--- a/base_user_role_company/controllers/main.py
+++ b/base_user_role_company/controllers/main.py
@@ -3,7 +3,7 @@
 
 from odoo import http
 
-from odoo.addons.web.controllers.main import Home
+from odoo.addons.web.controllers.home import Home
 
 
 class HomeExtended(Home):
diff --git a/base_user_role_company/readme/CONTRIBUTORS.rst b/base_user_role_company/readme/CONTRIBUTORS.rst
index c259741d2..3b275b35c 100644
--- a/base_user_role_company/readme/CONTRIBUTORS.rst
+++ b/base_user_role_company/readme/CONTRIBUTORS.rst
@@ -2,3 +2,4 @@
 
   * Daniel Reis <dreis@opensourceintegrators.com>
   * Chandresh Thakkar <cthakkr@opensourceintegrators.com>
+  * Urvisha Desai <udesai@opensourceintegrators.com>
diff --git a/base_user_role_company/static/description/index.html b/base_user_role_company/static/description/index.html
index 9eb4a6fcc..4eef8c25c 100644
--- a/base_user_role_company/static/description/index.html
+++ b/base_user_role_company/static/description/index.html
@@ -3,7 +3,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta name="generator" content="Docutils 0.15.1: http://docutils.sourceforge.net/" />
+<meta name="generator" content="Docutils: http://docutils.sourceforge.net/" />
 <title>User roles by company</title>
 <style type="text/css">
 
@@ -367,7 +367,7 @@ <h1 class="title">User roles by company</h1>
 !! This file is generated by oca-gen-addon-readme !!
 !! changes will be overwritten.                   !!
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
-<p><a class="reference external" href="https://odoo-community.org/page/development-status"><img alt="Beta" src="https://img.shields.io/badge/maturity-Beta-yellow.png" /></a> <a class="reference external" href="http://www.gnu.org/licenses/agpl-3.0-standalone.html"><img alt="License: AGPL-3" src="https://img.shields.io/badge/licence-AGPL--3-blue.png" /></a> <a class="reference external" href="https://github.com/OCA/server-backend/tree/14.0/base_user_role_company"><img alt="OCA/server-backend" src="https://img.shields.io/badge/github-OCA%2Fserver--backend-lightgray.png?logo=github" /></a> <a class="reference external" href="https://translation.odoo-community.org/projects/server-backend-14-0/server-backend-14-0-base_user_role_company"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external" href="https://runbot.odoo-community.org/runbot/253/14.0"><img alt="Try me on Runbot" src="https://img.shields.io/badge/runbot-Try%20me-875A7B.png" /></a></p>
+<p><a class="reference external" href="https://odoo-community.org/page/development-status"><img alt="Beta" src="https://img.shields.io/badge/maturity-Beta-yellow.png" /></a> <a class="reference external" href="http://www.gnu.org/licenses/agpl-3.0-standalone.html"><img alt="License: AGPL-3" src="https://img.shields.io/badge/licence-AGPL--3-blue.png" /></a> <a class="reference external" href="https://github.com/OCA/server-backend/tree/16.0/base_user_role_company"><img alt="OCA/server-backend" src="https://img.shields.io/badge/github-OCA%2Fserver--backend-lightgray.png?logo=github" /></a> <a class="reference external" href="https://translation.odoo-community.org/projects/server-backend-16-0/server-backend-16-0-base_user_role_company"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external" href="https://runboat.odoo-community.org/webui/builds.html?repo=OCA/server-backend&amp;target_branch=16.0"><img alt="Try me on Runboat" src="https://img.shields.io/badge/runboat-Try%20me-875A7B.png" /></a></p>
 <p>Enable User Roles depending on the Companies selected.</p>
 <p>A company specific Role will only be enabled
 if it is set for <strong>all</strong> the currently selected companies.</p>
@@ -430,7 +430,7 @@ <h1><a class="toc-backref" href="#id3">Bug Tracker</a></h1>
 <p>Bugs are tracked on <a class="reference external" href="https://github.com/OCA/server-backend/issues">GitHub Issues</a>.
 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
-<a class="reference external" href="https://github.com/OCA/server-backend/issues/new?body=module:%20base_user_role_company%0Aversion:%2014.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**">feedback</a>.</p>
+<a class="reference external" href="https://github.com/OCA/server-backend/issues/new?body=module:%20base_user_role_company%0Aversion:%2016.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**">feedback</a>.</p>
 <p>Do not contact contributors directly about support or help with technical issues.</p>
 </div>
 <div class="section" id="credits">
@@ -448,6 +448,7 @@ <h2><a class="toc-backref" href="#id6">Contributors</a></h2>
 <ul class="simple">
 <li>Daniel Reis &lt;<a class="reference external" href="mailto:dreis&#64;opensourceintegrators.com">dreis&#64;opensourceintegrators.com</a>&gt;</li>
 <li>Chandresh Thakkar &lt;<a class="reference external" href="mailto:cthakkr&#64;opensourceintegrators.com">cthakkr&#64;opensourceintegrators.com</a>&gt;</li>
+<li>Urvisha Desai &lt;<a class="reference external" href="mailto:udesai&#64;opensourceintegrators.com">udesai&#64;opensourceintegrators.com</a>&gt;</li>
 </ul>
 </blockquote>
 </div>
@@ -458,7 +459,7 @@ <h2><a class="toc-backref" href="#id7">Maintainers</a></h2>
 <p>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.</p>
-<p>This module is part of the <a class="reference external" href="https://github.com/OCA/server-backend/tree/14.0/base_user_role_company">OCA/server-backend</a> project on GitHub.</p>
+<p>This module is part of the <a class="reference external" href="https://github.com/OCA/server-backend/tree/16.0/base_user_role_company">OCA/server-backend</a> project on GitHub.</p>
 <p>You are welcome to contribute. To learn how please visit <a class="reference external" href="https://odoo-community.org/page/Contribute">https://odoo-community.org/page/Contribute</a>.</p>
 </div>
 </div>

From ed10b61012939adb157466801f52bc194d1ad748 Mon Sep 17 00:00:00 2001
From: oca-ci <oca-ci@odoo-community.org>
Date: Mon, 7 Aug 2023 08:58:56 +0000
Subject: [PATCH 19/45] [UPD] Update base_user_role_company.pot

---
 .../i18n/base_user_role_company.pot           | 32 ++++---------------
 1 file changed, 6 insertions(+), 26 deletions(-)

diff --git a/base_user_role_company/i18n/base_user_role_company.pot b/base_user_role_company/i18n/base_user_role_company.pot
index 3b1fe1508..bf5444082 100644
--- a/base_user_role_company/i18n/base_user_role_company.pot
+++ b/base_user_role_company/i18n/base_user_role_company.pot
@@ -4,7 +4,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 14.0\n"
+"Project-Id-Version: Odoo Server 16.0\n"
 "Report-Msgid-Bugs-To: \n"
 "Last-Translator: \n"
 "Language-Team: \n"
@@ -23,25 +23,11 @@ msgstr ""
 msgid "Company"
 msgstr ""
 
-#. module: base_user_role_company
-#: model:ir.model.fields,field_description:base_user_role_company.field_ir_http__display_name
-#: model:ir.model.fields,field_description:base_user_role_company.field_res_users__display_name
-#: model:ir.model.fields,field_description:base_user_role_company.field_res_users_role_line__display_name
-msgid "Display Name"
-msgstr ""
-
 #. module: base_user_role_company
 #: model:ir.model,name:base_user_role_company.model_ir_http
 msgid "HTTP Routing"
 msgstr ""
 
-#. module: base_user_role_company
-#: model:ir.model.fields,field_description:base_user_role_company.field_ir_http__id
-#: model:ir.model.fields,field_description:base_user_role_company.field_res_users__id
-#: model:ir.model.fields,field_description:base_user_role_company.field_res_users_role_line__id
-msgid "ID"
-msgstr ""
-
 #. module: base_user_role_company
 #: model:ir.model.fields,help:base_user_role_company.field_res_users_role_line__company_id
 msgid ""
@@ -50,28 +36,22 @@ msgid ""
 msgstr ""
 
 #. module: base_user_role_company
-#: model:ir.model.fields,field_description:base_user_role_company.field_ir_http____last_update
-#: model:ir.model.fields,field_description:base_user_role_company.field_res_users____last_update
-#: model:ir.model.fields,field_description:base_user_role_company.field_res_users_role_line____last_update
-msgid "Last Modified on"
+#: model:ir.model.constraint,message:base_user_role_company.constraint_res_users_role_line_user_role_uniq
+msgid "Roles can be assigned to a user only once at a time"
 msgstr ""
 
 #. module: base_user_role_company
-#: model:ir.model.constraint,message:base_user_role_company.constraint_res_users_role_line_user_role_uniq
-msgid "Roles can be assigned to a user only once at a time"
+#: model:ir.model,name:base_user_role_company.model_res_users
+msgid "User"
 msgstr ""
 
 #. module: base_user_role_company
+#. odoo-python
 #: code:addons/base_user_role_company/models/role.py:0
 #, python-format
 msgid "User \"{}\" does not have access to the company \"{}\""
 msgstr ""
 
-#. module: base_user_role_company
-#: model:ir.model,name:base_user_role_company.model_res_users
-msgid "Users"
-msgstr ""
-
 #. module: base_user_role_company
 #: model:ir.model,name:base_user_role_company.model_res_users_role_line
 msgid "Users associated to a role"

From 14acd7d55d63fadcc5b7aced93314acb5968ae20 Mon Sep 17 00:00:00 2001
From: OCA-git-bot <oca-git-bot@odoo-community.org>
Date: Mon, 7 Aug 2023 09:01:32 +0000
Subject: [PATCH 20/45] [UPD] README.rst

---
 base_user_role_company/README.rst                    | 6 +++---
 base_user_role_company/static/description/index.html | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/base_user_role_company/README.rst b/base_user_role_company/README.rst
index a75e13635..d8e9a80a9 100644
--- a/base_user_role_company/README.rst
+++ b/base_user_role_company/README.rst
@@ -19,9 +19,9 @@ User roles by company
 .. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png
     :target: https://translation.odoo-community.org/projects/server-backend-16-0/server-backend-16-0-base_user_role_company
     :alt: Translate me on Weblate
-.. |badge5| image:: https://img.shields.io/badge/runboat-Try%20me-875A7B.png
-    :target: https://runboat.odoo-community.org/webui/builds.html?repo=OCA/server-backend&target_branch=16.0
-    :alt: Try me on Runboat
+.. |badge5| image:: https://img.shields.io/badge/runbot-Try%20me-875A7B.png
+    :target: https://runbot.odoo-community.org/runbot/253/16.0
+    :alt: Try me on Runbot
 
 |badge1| |badge2| |badge3| |badge4| |badge5| 
 
diff --git a/base_user_role_company/static/description/index.html b/base_user_role_company/static/description/index.html
index 4eef8c25c..6ae86aaae 100644
--- a/base_user_role_company/static/description/index.html
+++ b/base_user_role_company/static/description/index.html
@@ -3,7 +3,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta name="generator" content="Docutils: http://docutils.sourceforge.net/" />
+<meta name="generator" content="Docutils 0.15.1: http://docutils.sourceforge.net/" />
 <title>User roles by company</title>
 <style type="text/css">
 
@@ -367,7 +367,7 @@ <h1 class="title">User roles by company</h1>
 !! This file is generated by oca-gen-addon-readme !!
 !! changes will be overwritten.                   !!
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
-<p><a class="reference external" href="https://odoo-community.org/page/development-status"><img alt="Beta" src="https://img.shields.io/badge/maturity-Beta-yellow.png" /></a> <a class="reference external" href="http://www.gnu.org/licenses/agpl-3.0-standalone.html"><img alt="License: AGPL-3" src="https://img.shields.io/badge/licence-AGPL--3-blue.png" /></a> <a class="reference external" href="https://github.com/OCA/server-backend/tree/16.0/base_user_role_company"><img alt="OCA/server-backend" src="https://img.shields.io/badge/github-OCA%2Fserver--backend-lightgray.png?logo=github" /></a> <a class="reference external" href="https://translation.odoo-community.org/projects/server-backend-16-0/server-backend-16-0-base_user_role_company"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external" href="https://runboat.odoo-community.org/webui/builds.html?repo=OCA/server-backend&amp;target_branch=16.0"><img alt="Try me on Runboat" src="https://img.shields.io/badge/runboat-Try%20me-875A7B.png" /></a></p>
+<p><a class="reference external" href="https://odoo-community.org/page/development-status"><img alt="Beta" src="https://img.shields.io/badge/maturity-Beta-yellow.png" /></a> <a class="reference external" href="http://www.gnu.org/licenses/agpl-3.0-standalone.html"><img alt="License: AGPL-3" src="https://img.shields.io/badge/licence-AGPL--3-blue.png" /></a> <a class="reference external" href="https://github.com/OCA/server-backend/tree/16.0/base_user_role_company"><img alt="OCA/server-backend" src="https://img.shields.io/badge/github-OCA%2Fserver--backend-lightgray.png?logo=github" /></a> <a class="reference external" href="https://translation.odoo-community.org/projects/server-backend-16-0/server-backend-16-0-base_user_role_company"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external" href="https://runbot.odoo-community.org/runbot/253/16.0"><img alt="Try me on Runbot" src="https://img.shields.io/badge/runbot-Try%20me-875A7B.png" /></a></p>
 <p>Enable User Roles depending on the Companies selected.</p>
 <p>A company specific Role will only be enabled
 if it is set for <strong>all</strong> the currently selected companies.</p>

From 16b28460223c676e6cbfb76fb8049a3df8c56d6d Mon Sep 17 00:00:00 2001
From: Weblate <noreply@weblate.org>
Date: Mon, 7 Aug 2023 11:11:44 +0000
Subject: [PATCH 21/45] Update translation files

Updated by "Update PO files to match POT (msgmerge)" hook in Weblate.

Translation: server-backend-16.0/server-backend-16.0-base_user_role_company
Translate-URL: https://translation.odoo-community.org/projects/server-backend-16-0/server-backend-16-0-base_user_role_company/
---
 base_user_role_company/i18n/it.po | 44 +++++++++++++------------------
 1 file changed, 18 insertions(+), 26 deletions(-)

diff --git a/base_user_role_company/i18n/it.po b/base_user_role_company/i18n/it.po
index 90e9e0b20..b1b4c8d84 100644
--- a/base_user_role_company/i18n/it.po
+++ b/base_user_role_company/i18n/it.po
@@ -26,25 +26,11 @@ msgstr ""
 msgid "Company"
 msgstr "Azienda"
 
-#. module: base_user_role_company
-#: model:ir.model.fields,field_description:base_user_role_company.field_ir_http__display_name
-#: model:ir.model.fields,field_description:base_user_role_company.field_res_users__display_name
-#: model:ir.model.fields,field_description:base_user_role_company.field_res_users_role_line__display_name
-msgid "Display Name"
-msgstr "Nome visualizzato"
-
 #. module: base_user_role_company
 #: model:ir.model,name:base_user_role_company.model_ir_http
 msgid "HTTP Routing"
 msgstr "Instradamento HTTP"
 
-#. module: base_user_role_company
-#: model:ir.model.fields,field_description:base_user_role_company.field_ir_http__id
-#: model:ir.model.fields,field_description:base_user_role_company.field_res_users__id
-#: model:ir.model.fields,field_description:base_user_role_company.field_res_users_role_line__id
-msgid "ID"
-msgstr "ID"
-
 #. module: base_user_role_company
 #: model:ir.model.fields,help:base_user_role_company.field_res_users_role_line__company_id
 msgid ""
@@ -54,33 +40,39 @@ msgstr ""
 "Se impostato, questo ruolo si applica solo quando questa è l'azienda "
 "principale selezionata. Altrimenti vale per tutte le aziende."
 
-#. module: base_user_role_company
-#: model:ir.model.fields,field_description:base_user_role_company.field_ir_http____last_update
-#: model:ir.model.fields,field_description:base_user_role_company.field_res_users____last_update
-#: model:ir.model.fields,field_description:base_user_role_company.field_res_users_role_line____last_update
-msgid "Last Modified on"
-msgstr "Ultima modifica il"
-
 #. module: base_user_role_company
 #: model:ir.model.constraint,message:base_user_role_company.constraint_res_users_role_line_user_role_uniq
 msgid "Roles can be assigned to a user only once at a time"
 msgstr "I ruoli possono essere assegnati all'utente solo uno alla volta"
 
 #. module: base_user_role_company
+#: model:ir.model,name:base_user_role_company.model_res_users
+msgid "User"
+msgstr ""
+
+#. module: base_user_role_company
+#. odoo-python
 #: code:addons/base_user_role_company/models/role.py:0
 #, python-format
 msgid "User \"{}\" does not have access to the company \"{}\""
 msgstr "L'utente \"{}\" non ha l'accesso all'azienda \"{}\""
 
-#. module: base_user_role_company
-#: model:ir.model,name:base_user_role_company.model_res_users
-msgid "Users"
-msgstr "Utenti"
-
 #. module: base_user_role_company
 #: model:ir.model,name:base_user_role_company.model_res_users_role_line
 msgid "Users associated to a role"
 msgstr "Utenti associati al ruolo"
 
+#~ msgid "Display Name"
+#~ msgstr "Nome visualizzato"
+
+#~ msgid "ID"
+#~ msgstr "ID"
+
+#~ msgid "Last Modified on"
+#~ msgstr "Ultima modifica il"
+
+#~ msgid "Users"
+#~ msgstr "Utenti"
+
 #~ msgid "Active Role"
 #~ msgstr "Ruolo attivo"

From 0afc40e7c06064391144c8591c47592b35d72f4a Mon Sep 17 00:00:00 2001
From: Ivorra78 <informatica@totmaterial.es>
Date: Fri, 25 Aug 2023 15:15:35 +0000
Subject: [PATCH 22/45] Added translation using Weblate (Spanish)

---
 base_user_role_company/i18n/es.po | 59 +++++++++++++++++++++++++++++++
 1 file changed, 59 insertions(+)
 create mode 100644 base_user_role_company/i18n/es.po

diff --git a/base_user_role_company/i18n/es.po b/base_user_role_company/i18n/es.po
new file mode 100644
index 000000000..d62535f71
--- /dev/null
+++ b/base_user_role_company/i18n/es.po
@@ -0,0 +1,59 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# 	* base_user_role_company
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 16.0\n"
+"Report-Msgid-Bugs-To: \n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"Language: es\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+
+#. module: base_user_role_company
+#: model:ir.model.fields,field_description:base_user_role_company.field_res_users_role_line__allowed_company_ids
+msgid "Companies"
+msgstr ""
+
+#. module: base_user_role_company
+#: model:ir.model.fields,field_description:base_user_role_company.field_res_users_role_line__company_id
+msgid "Company"
+msgstr ""
+
+#. module: base_user_role_company
+#: model:ir.model,name:base_user_role_company.model_ir_http
+msgid "HTTP Routing"
+msgstr ""
+
+#. module: base_user_role_company
+#: model:ir.model.fields,help:base_user_role_company.field_res_users_role_line__company_id
+msgid ""
+"If set, this role only applies when this is the main company selected. "
+"Otherwise it applies to all companies."
+msgstr ""
+
+#. module: base_user_role_company
+#: model:ir.model.constraint,message:base_user_role_company.constraint_res_users_role_line_user_role_uniq
+msgid "Roles can be assigned to a user only once at a time"
+msgstr ""
+
+#. module: base_user_role_company
+#: model:ir.model,name:base_user_role_company.model_res_users
+msgid "User"
+msgstr ""
+
+#. module: base_user_role_company
+#. odoo-python
+#: code:addons/base_user_role_company/models/role.py:0
+#, python-format
+msgid "User \"{}\" does not have access to the company \"{}\""
+msgstr ""
+
+#. module: base_user_role_company
+#: model:ir.model,name:base_user_role_company.model_res_users_role_line
+msgid "Users associated to a role"
+msgstr ""

From 1f872ae0539fe1c7e1eaff812ba21101820b449d Mon Sep 17 00:00:00 2001
From: Ivorra78 <informatica@totmaterial.es>
Date: Fri, 25 Aug 2023 15:15:52 +0000
Subject: [PATCH 23/45] Translated using Weblate (Spanish)

Currently translated at 100.0% (8 of 8 strings)

Translation: server-backend-16.0/server-backend-16.0-base_user_role_company
Translate-URL: https://translation.odoo-community.org/projects/server-backend-16-0/server-backend-16-0-base_user_role_company/es/
---
 base_user_role_company/i18n/es.po | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/base_user_role_company/i18n/es.po b/base_user_role_company/i18n/es.po
index d62535f71..d18ac72f0 100644
--- a/base_user_role_company/i18n/es.po
+++ b/base_user_role_company/i18n/es.po
@@ -6,28 +6,30 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 16.0\n"
 "Report-Msgid-Bugs-To: \n"
-"Last-Translator: Automatically generated\n"
+"PO-Revision-Date: 2023-08-28 09:10+0000\n"
+"Last-Translator: Ivorra78 <informatica@totmaterial.es>\n"
 "Language-Team: none\n"
 "Language: es\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Weblate 4.17\n"
 
 #. module: base_user_role_company
 #: model:ir.model.fields,field_description:base_user_role_company.field_res_users_role_line__allowed_company_ids
 msgid "Companies"
-msgstr ""
+msgstr "Compañías"
 
 #. module: base_user_role_company
 #: model:ir.model.fields,field_description:base_user_role_company.field_res_users_role_line__company_id
 msgid "Company"
-msgstr ""
+msgstr "Compañía"
 
 #. module: base_user_role_company
 #: model:ir.model,name:base_user_role_company.model_ir_http
 msgid "HTTP Routing"
-msgstr ""
+msgstr "Enrutamiento HTTP"
 
 #. module: base_user_role_company
 #: model:ir.model.fields,help:base_user_role_company.field_res_users_role_line__company_id
@@ -35,25 +37,27 @@ msgid ""
 "If set, this role only applies when this is the main company selected. "
 "Otherwise it applies to all companies."
 msgstr ""
+"Si se establece, este rol sólo se aplica cuando ésta es la compañía "
+"principal seleccionada. De lo contrario, se aplica a todas las compañías."
 
 #. module: base_user_role_company
 #: model:ir.model.constraint,message:base_user_role_company.constraint_res_users_role_line_user_role_uniq
 msgid "Roles can be assigned to a user only once at a time"
-msgstr ""
+msgstr "Las funciones sólo pueden asignarse a un usuario una vez cada vez"
 
 #. module: base_user_role_company
 #: model:ir.model,name:base_user_role_company.model_res_users
 msgid "User"
-msgstr ""
+msgstr "Usuario"
 
 #. module: base_user_role_company
 #. odoo-python
 #: code:addons/base_user_role_company/models/role.py:0
 #, python-format
 msgid "User \"{}\" does not have access to the company \"{}\""
-msgstr ""
+msgstr "Usuario \"{}\" no tiene acceso a la compañía \"{}\""
 
 #. module: base_user_role_company
 #: model:ir.model,name:base_user_role_company.model_res_users_role_line
 msgid "Users associated to a role"
-msgstr ""
+msgstr "Usuarios asociados a un papel"

From b535bb83d69893eb60aad239bc95b66be27afbc0 Mon Sep 17 00:00:00 2001
From: Pedro Castro Silva <pedrocs@exo.pt>
Date: Thu, 31 Aug 2023 10:26:55 +0000
Subject: [PATCH 24/45] Added translation using Weblate (Portuguese)

---
 base_user_role_company/i18n/pt.po | 59 +++++++++++++++++++++++++++++++
 1 file changed, 59 insertions(+)
 create mode 100644 base_user_role_company/i18n/pt.po

diff --git a/base_user_role_company/i18n/pt.po b/base_user_role_company/i18n/pt.po
new file mode 100644
index 000000000..dd61e9d1d
--- /dev/null
+++ b/base_user_role_company/i18n/pt.po
@@ -0,0 +1,59 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# 	* base_user_role_company
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 16.0\n"
+"Report-Msgid-Bugs-To: \n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"Language: pt\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: nplurals=2; plural=n > 1;\n"
+
+#. module: base_user_role_company
+#: model:ir.model.fields,field_description:base_user_role_company.field_res_users_role_line__allowed_company_ids
+msgid "Companies"
+msgstr ""
+
+#. module: base_user_role_company
+#: model:ir.model.fields,field_description:base_user_role_company.field_res_users_role_line__company_id
+msgid "Company"
+msgstr ""
+
+#. module: base_user_role_company
+#: model:ir.model,name:base_user_role_company.model_ir_http
+msgid "HTTP Routing"
+msgstr ""
+
+#. module: base_user_role_company
+#: model:ir.model.fields,help:base_user_role_company.field_res_users_role_line__company_id
+msgid ""
+"If set, this role only applies when this is the main company selected. "
+"Otherwise it applies to all companies."
+msgstr ""
+
+#. module: base_user_role_company
+#: model:ir.model.constraint,message:base_user_role_company.constraint_res_users_role_line_user_role_uniq
+msgid "Roles can be assigned to a user only once at a time"
+msgstr ""
+
+#. module: base_user_role_company
+#: model:ir.model,name:base_user_role_company.model_res_users
+msgid "User"
+msgstr ""
+
+#. module: base_user_role_company
+#. odoo-python
+#: code:addons/base_user_role_company/models/role.py:0
+#, python-format
+msgid "User \"{}\" does not have access to the company \"{}\""
+msgstr ""
+
+#. module: base_user_role_company
+#: model:ir.model,name:base_user_role_company.model_res_users_role_line
+msgid "Users associated to a role"
+msgstr ""

From 5b9ee69b07e8fd5ff056a260bea75da2b0622b51 Mon Sep 17 00:00:00 2001
From: Pedro Castro Silva <pedrocs@exo.pt>
Date: Thu, 31 Aug 2023 10:27:08 +0000
Subject: [PATCH 25/45] Translated using Weblate (Portuguese)

Currently translated at 100.0% (8 of 8 strings)

Translation: server-backend-16.0/server-backend-16.0-base_user_role_company
Translate-URL: https://translation.odoo-community.org/projects/server-backend-16-0/server-backend-16-0-base_user_role_company/pt/
---
 base_user_role_company/README.rst             | 15 ++++---
 base_user_role_company/i18n/pt.po             | 20 +++++----
 .../static/description/index.html             | 42 ++++++++++---------
 3 files changed, 43 insertions(+), 34 deletions(-)

diff --git a/base_user_role_company/README.rst b/base_user_role_company/README.rst
index d8e9a80a9..045352d84 100644
--- a/base_user_role_company/README.rst
+++ b/base_user_role_company/README.rst
@@ -2,10 +2,13 @@
 User roles by company
 =====================
 
-.. !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+.. 
+   !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
    !! This file is generated by oca-gen-addon-readme !!
    !! changes will be overwritten.                   !!
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+   !! source digest: sha256:d53f251191c84826b5c4436215ab4a9ca8699759795f4a2ce11149295f83ef6c
+   !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
 .. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png
     :target: https://odoo-community.org/page/development-status
@@ -19,11 +22,11 @@ User roles by company
 .. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png
     :target: https://translation.odoo-community.org/projects/server-backend-16-0/server-backend-16-0-base_user_role_company
     :alt: Translate me on Weblate
-.. |badge5| image:: https://img.shields.io/badge/runbot-Try%20me-875A7B.png
-    :target: https://runbot.odoo-community.org/runbot/253/16.0
-    :alt: Try me on Runbot
+.. |badge5| image:: https://img.shields.io/badge/runboat-Try%20me-875A7B.png
+    :target: https://runboat.odoo-community.org/builds?repo=OCA/server-backend&target_branch=16.0
+    :alt: Try me on Runboat
 
-|badge1| |badge2| |badge3| |badge4| |badge5| 
+|badge1| |badge2| |badge3| |badge4| |badge5|
 
 Enable User Roles depending on the Companies selected.
 
@@ -76,7 +79,7 @@ Bug Tracker
 
 Bugs are tracked on `GitHub Issues <https://github.com/OCA/server-backend/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
+If you spotted it first, help us to smash it by providing a detailed and welcomed
 `feedback <https://github.com/OCA/server-backend/issues/new?body=module:%20base_user_role_company%0Aversion:%2016.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**>`_.
 
 Do not contact contributors directly about support or help with technical issues.
diff --git a/base_user_role_company/i18n/pt.po b/base_user_role_company/i18n/pt.po
index dd61e9d1d..330ee22fc 100644
--- a/base_user_role_company/i18n/pt.po
+++ b/base_user_role_company/i18n/pt.po
@@ -6,28 +6,30 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 16.0\n"
 "Report-Msgid-Bugs-To: \n"
-"Last-Translator: Automatically generated\n"
+"PO-Revision-Date: 2023-08-31 10:35+0000\n"
+"Last-Translator: Pedro Castro Silva <pedrocs@exo.pt>\n"
 "Language-Team: none\n"
 "Language: pt\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
+"X-Generator: Weblate 4.17\n"
 
 #. module: base_user_role_company
 #: model:ir.model.fields,field_description:base_user_role_company.field_res_users_role_line__allowed_company_ids
 msgid "Companies"
-msgstr ""
+msgstr "Empresas"
 
 #. module: base_user_role_company
 #: model:ir.model.fields,field_description:base_user_role_company.field_res_users_role_line__company_id
 msgid "Company"
-msgstr ""
+msgstr "Empresa"
 
 #. module: base_user_role_company
 #: model:ir.model,name:base_user_role_company.model_ir_http
 msgid "HTTP Routing"
-msgstr ""
+msgstr "Encaminhamento HTTP"
 
 #. module: base_user_role_company
 #: model:ir.model.fields,help:base_user_role_company.field_res_users_role_line__company_id
@@ -35,25 +37,27 @@ msgid ""
 "If set, this role only applies when this is the main company selected. "
 "Otherwise it applies to all companies."
 msgstr ""
+"Se atribuída, esta função será aplicada apenas quando esta é a empresa "
+"principal selecionada. Caso contrário, aplicar-se-á a todas as empresas."
 
 #. module: base_user_role_company
 #: model:ir.model.constraint,message:base_user_role_company.constraint_res_users_role_line_user_role_uniq
 msgid "Roles can be assigned to a user only once at a time"
-msgstr ""
+msgstr "As funções podem ser atribuídas a um utilizador apenas uma vez"
 
 #. module: base_user_role_company
 #: model:ir.model,name:base_user_role_company.model_res_users
 msgid "User"
-msgstr ""
+msgstr "Utilizador"
 
 #. module: base_user_role_company
 #. odoo-python
 #: code:addons/base_user_role_company/models/role.py:0
 #, python-format
 msgid "User \"{}\" does not have access to the company \"{}\""
-msgstr ""
+msgstr "O utilizador \"{}\" não tem acesso à empresa \"{}\""
 
 #. module: base_user_role_company
 #: model:ir.model,name:base_user_role_company.model_res_users_role_line
 msgid "Users associated to a role"
-msgstr ""
+msgstr "Utilizadores associados a uma função"
diff --git a/base_user_role_company/static/description/index.html b/base_user_role_company/static/description/index.html
index 6ae86aaae..91b75ece6 100644
--- a/base_user_role_company/static/description/index.html
+++ b/base_user_role_company/static/description/index.html
@@ -1,20 +1,20 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta name="generator" content="Docutils 0.15.1: http://docutils.sourceforge.net/" />
+<meta name="generator" content="Docutils: https://docutils.sourceforge.io/" />
 <title>User roles by company</title>
 <style type="text/css">
 
 /*
 :Author: David Goodger (goodger@python.org)
-:Id: $Id: html4css1.css 7952 2016-07-26 18:15:59Z milde $
+:Id: $Id: html4css1.css 8954 2022-01-20 10:10:25Z milde $
 :Copyright: This stylesheet has been placed in the public domain.
 
 Default cascading style sheet for the HTML output of Docutils.
 
-See http://docutils.sf.net/docs/howto/html-stylesheets.html for how to
+See https://docutils.sourceforge.io/docs/howto/html-stylesheets.html for how to
 customize this style sheet.
 */
 
@@ -366,8 +366,10 @@ <h1 class="title">User roles by company</h1>
 <!-- !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 !! This file is generated by oca-gen-addon-readme !!
 !! changes will be overwritten.                   !!
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+!! source digest: sha256:d53f251191c84826b5c4436215ab4a9ca8699759795f4a2ce11149295f83ef6c
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
-<p><a class="reference external" href="https://odoo-community.org/page/development-status"><img alt="Beta" src="https://img.shields.io/badge/maturity-Beta-yellow.png" /></a> <a class="reference external" href="http://www.gnu.org/licenses/agpl-3.0-standalone.html"><img alt="License: AGPL-3" src="https://img.shields.io/badge/licence-AGPL--3-blue.png" /></a> <a class="reference external" href="https://github.com/OCA/server-backend/tree/16.0/base_user_role_company"><img alt="OCA/server-backend" src="https://img.shields.io/badge/github-OCA%2Fserver--backend-lightgray.png?logo=github" /></a> <a class="reference external" href="https://translation.odoo-community.org/projects/server-backend-16-0/server-backend-16-0-base_user_role_company"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external" href="https://runbot.odoo-community.org/runbot/253/16.0"><img alt="Try me on Runbot" src="https://img.shields.io/badge/runbot-Try%20me-875A7B.png" /></a></p>
+<p><a class="reference external image-reference" href="https://odoo-community.org/page/development-status"><img alt="Beta" src="https://img.shields.io/badge/maturity-Beta-yellow.png" /></a> <a class="reference external image-reference" href="http://www.gnu.org/licenses/agpl-3.0-standalone.html"><img alt="License: AGPL-3" src="https://img.shields.io/badge/licence-AGPL--3-blue.png" /></a> <a class="reference external image-reference" href="https://github.com/OCA/server-backend/tree/16.0/base_user_role_company"><img alt="OCA/server-backend" src="https://img.shields.io/badge/github-OCA%2Fserver--backend-lightgray.png?logo=github" /></a> <a class="reference external image-reference" href="https://translation.odoo-community.org/projects/server-backend-16-0/server-backend-16-0-base_user_role_company"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external image-reference" href="https://runboat.odoo-community.org/builds?repo=OCA/server-backend&amp;target_branch=16.0"><img alt="Try me on Runboat" src="https://img.shields.io/badge/runboat-Try%20me-875A7B.png" /></a></p>
 <p>Enable User Roles depending on the Companies selected.</p>
 <p>A company specific Role will only be enabled
 if it is set for <strong>all</strong> the currently selected companies.</p>
@@ -378,26 +380,26 @@ <h1 class="title">User roles by company</h1>
 <p><strong>Table of contents</strong></p>
 <div class="contents local topic" id="contents">
 <ul class="simple">
-<li><a class="reference internal" href="#configuration" id="id1">Configuration</a></li>
-<li><a class="reference internal" href="#usage" id="id2">Usage</a></li>
-<li><a class="reference internal" href="#bug-tracker" id="id3">Bug Tracker</a></li>
-<li><a class="reference internal" href="#credits" id="id4">Credits</a><ul>
-<li><a class="reference internal" href="#authors" id="id5">Authors</a></li>
-<li><a class="reference internal" href="#contributors" id="id6">Contributors</a></li>
-<li><a class="reference internal" href="#maintainers" id="id7">Maintainers</a></li>
+<li><a class="reference internal" href="#configuration" id="toc-entry-1">Configuration</a></li>
+<li><a class="reference internal" href="#usage" id="toc-entry-2">Usage</a></li>
+<li><a class="reference internal" href="#bug-tracker" id="toc-entry-3">Bug Tracker</a></li>
+<li><a class="reference internal" href="#credits" id="toc-entry-4">Credits</a><ul>
+<li><a class="reference internal" href="#authors" id="toc-entry-5">Authors</a></li>
+<li><a class="reference internal" href="#contributors" id="toc-entry-6">Contributors</a></li>
+<li><a class="reference internal" href="#maintainers" id="toc-entry-7">Maintainers</a></li>
 </ul>
 </li>
 </ul>
 </div>
 <div class="section" id="configuration">
-<h1><a class="toc-backref" href="#id1">Configuration</a></h1>
+<h1><a class="toc-backref" href="#toc-entry-1">Configuration</a></h1>
 <p>Roles are set on the User form.</p>
 <p>The “Company” additional column allows to set a Role as only valid for specific companies.</p>
 <p>There is also a “Active Role” techincal field, only visible in developer mode.
 It shows what roles are active, after applying the company selection rules.</p>
 </div>
 <div class="section" id="usage">
-<h1><a class="toc-backref" href="#id2">Usage</a></h1>
+<h1><a class="toc-backref" href="#toc-entry-2">Usage</a></h1>
 <p>Select the active companies from the web client widget, near the top right corner.
 When doing so, the User’s security Groups are recomputed, based on the Roles.</p>
 <p>When the user changes the company selection, only the groups available to all active companies will be activated.</p>
@@ -426,23 +428,23 @@ <h1><a class="toc-backref" href="#id2">Usage</a></h1>
 </ul>
 </div>
 <div class="section" id="bug-tracker">
-<h1><a class="toc-backref" href="#id3">Bug Tracker</a></h1>
+<h1><a class="toc-backref" href="#toc-entry-3">Bug Tracker</a></h1>
 <p>Bugs are tracked on <a class="reference external" href="https://github.com/OCA/server-backend/issues">GitHub Issues</a>.
 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
+If you spotted it first, help us to smash it by providing a detailed and welcomed
 <a class="reference external" href="https://github.com/OCA/server-backend/issues/new?body=module:%20base_user_role_company%0Aversion:%2016.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**">feedback</a>.</p>
 <p>Do not contact contributors directly about support or help with technical issues.</p>
 </div>
 <div class="section" id="credits">
-<h1><a class="toc-backref" href="#id4">Credits</a></h1>
+<h1><a class="toc-backref" href="#toc-entry-4">Credits</a></h1>
 <div class="section" id="authors">
-<h2><a class="toc-backref" href="#id5">Authors</a></h2>
+<h2><a class="toc-backref" href="#toc-entry-5">Authors</a></h2>
 <ul class="simple">
 <li>Open Source Integrators</li>
 </ul>
 </div>
 <div class="section" id="contributors">
-<h2><a class="toc-backref" href="#id6">Contributors</a></h2>
+<h2><a class="toc-backref" href="#toc-entry-6">Contributors</a></h2>
 <p><a class="reference external" href="http://opensourceintegrators.com">Open Source Integrators</a></p>
 <blockquote>
 <ul class="simple">
@@ -453,7 +455,7 @@ <h2><a class="toc-backref" href="#id6">Contributors</a></h2>
 </blockquote>
 </div>
 <div class="section" id="maintainers">
-<h2><a class="toc-backref" href="#id7">Maintainers</a></h2>
+<h2><a class="toc-backref" href="#toc-entry-7">Maintainers</a></h2>
 <p>This module is maintained by the OCA.</p>
 <a class="reference external image-reference" href="https://odoo-community.org"><img alt="Odoo Community Association" src="https://odoo-community.org/logo.png" /></a>
 <p>OCA, or the Odoo Community Association, is a nonprofit organization whose

From d86b3cc1a2d6ea709323b56ba33043fadfa31638 Mon Sep 17 00:00:00 2001
From: Enric Tobella <etobella@creublanca.es>
Date: Sat, 28 Oct 2023 15:00:44 +0200
Subject: [PATCH 26/45] [FIX] base_user_role_company: Pylint fix

---
 base_user_role_company/README.rst                      | 2 +-
 base_user_role_company/__manifest__.py                 | 2 +-
 base_user_role_company/i18n/base_user_role_company.pot | 2 +-
 base_user_role_company/i18n/es.po                      | 8 ++++++--
 base_user_role_company/i18n/it.po                      | 8 ++++++--
 base_user_role_company/i18n/pt.po                      | 8 ++++++--
 base_user_role_company/models/role.py                  | 5 +++--
 base_user_role_company/static/description/index.html   | 2 +-
 8 files changed, 25 insertions(+), 12 deletions(-)

diff --git a/base_user_role_company/README.rst b/base_user_role_company/README.rst
index 045352d84..41bf9632a 100644
--- a/base_user_role_company/README.rst
+++ b/base_user_role_company/README.rst
@@ -7,7 +7,7 @@ User roles by company
    !! This file is generated by oca-gen-addon-readme !!
    !! changes will be overwritten.                   !!
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-   !! source digest: sha256:d53f251191c84826b5c4436215ab4a9ca8699759795f4a2ce11149295f83ef6c
+   !! source digest: sha256:0efb0fd6750d2a16ed1275b1a45167c61e70b348fb1fdd06c873f6297088eb53
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
 .. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png
diff --git a/base_user_role_company/__manifest__.py b/base_user_role_company/__manifest__.py
index 4b225993f..cfa51811f 100644
--- a/base_user_role_company/__manifest__.py
+++ b/base_user_role_company/__manifest__.py
@@ -3,7 +3,7 @@
 
 {
     "name": "User roles by company",
-    "version": "16.0.1.0.0",
+    "version": "16.0.1.0.1",
     "category": "Tools",
     "author": "Open Source Integrators, Odoo Community Association (OCA)",
     "license": "AGPL-3",
diff --git a/base_user_role_company/i18n/base_user_role_company.pot b/base_user_role_company/i18n/base_user_role_company.pot
index bf5444082..f8900a366 100644
--- a/base_user_role_company/i18n/base_user_role_company.pot
+++ b/base_user_role_company/i18n/base_user_role_company.pot
@@ -49,7 +49,7 @@ msgstr ""
 #. odoo-python
 #: code:addons/base_user_role_company/models/role.py:0
 #, python-format
-msgid "User \"{}\" does not have access to the company \"{}\""
+msgid "User \"%(user)s\" does not have access to the company \"%(company)s\""
 msgstr ""
 
 #. module: base_user_role_company
diff --git a/base_user_role_company/i18n/es.po b/base_user_role_company/i18n/es.po
index d18ac72f0..db078f6e0 100644
--- a/base_user_role_company/i18n/es.po
+++ b/base_user_role_company/i18n/es.po
@@ -54,10 +54,14 @@ msgstr "Usuario"
 #. odoo-python
 #: code:addons/base_user_role_company/models/role.py:0
 #, python-format
-msgid "User \"{}\" does not have access to the company \"{}\""
-msgstr "Usuario \"{}\" no tiene acceso a la compañía \"{}\""
+msgid "User \"%(user)s\" does not have access to the company \"%(company)s\""
+msgstr ""
 
 #. module: base_user_role_company
 #: model:ir.model,name:base_user_role_company.model_res_users_role_line
 msgid "Users associated to a role"
 msgstr "Usuarios asociados a un papel"
+
+#, python-format
+#~ msgid "User \"{}\" does not have access to the company \"{}\""
+#~ msgstr "Usuario \"{}\" no tiene acceso a la compañía \"{}\""
diff --git a/base_user_role_company/i18n/it.po b/base_user_role_company/i18n/it.po
index b1b4c8d84..9c97a5692 100644
--- a/base_user_role_company/i18n/it.po
+++ b/base_user_role_company/i18n/it.po
@@ -54,14 +54,18 @@ msgstr ""
 #. odoo-python
 #: code:addons/base_user_role_company/models/role.py:0
 #, python-format
-msgid "User \"{}\" does not have access to the company \"{}\""
-msgstr "L'utente \"{}\" non ha l'accesso all'azienda \"{}\""
+msgid "User \"%(user)s\" does not have access to the company \"%(company)s\""
+msgstr ""
 
 #. module: base_user_role_company
 #: model:ir.model,name:base_user_role_company.model_res_users_role_line
 msgid "Users associated to a role"
 msgstr "Utenti associati al ruolo"
 
+#, python-format
+#~ msgid "User \"{}\" does not have access to the company \"{}\""
+#~ msgstr "L'utente \"{}\" non ha l'accesso all'azienda \"{}\""
+
 #~ msgid "Display Name"
 #~ msgstr "Nome visualizzato"
 
diff --git a/base_user_role_company/i18n/pt.po b/base_user_role_company/i18n/pt.po
index 330ee22fc..f0761ca21 100644
--- a/base_user_role_company/i18n/pt.po
+++ b/base_user_role_company/i18n/pt.po
@@ -54,10 +54,14 @@ msgstr "Utilizador"
 #. odoo-python
 #: code:addons/base_user_role_company/models/role.py:0
 #, python-format
-msgid "User \"{}\" does not have access to the company \"{}\""
-msgstr "O utilizador \"{}\" não tem acesso à empresa \"{}\""
+msgid "User \"%(user)s\" does not have access to the company \"%(company)s\""
+msgstr ""
 
 #. module: base_user_role_company
 #: model:ir.model,name:base_user_role_company.model_res_users_role_line
 msgid "Users associated to a role"
 msgstr "Utilizadores associados a uma função"
+
+#, python-format
+#~ msgid "User \"{}\" does not have access to the company \"{}\""
+#~ msgstr "O utilizador \"{}\" não tem acesso à empresa \"{}\""
diff --git a/base_user_role_company/models/role.py b/base_user_role_company/models/role.py
index 0fdd234d8..4e03df169 100644
--- a/base_user_role_company/models/role.py
+++ b/base_user_role_company/models/role.py
@@ -26,9 +26,10 @@ def _check_company(self):
                 and record.company_id not in record.user_id.company_ids
             ):
                 raise ValidationError(
-                    _('User "{}" does not have access to the company "{}"').format(
-                        record.user_id.name, record.company_id.name
+                    _(
+                        'User "%(user)s" does not have access to the company "%(company)s"'
                     )
+                    % {"user": record.user_id.name, "company": record.company_id.name}
                 )
 
     _sql_constraints = [
diff --git a/base_user_role_company/static/description/index.html b/base_user_role_company/static/description/index.html
index 91b75ece6..e73c5c3bd 100644
--- a/base_user_role_company/static/description/index.html
+++ b/base_user_role_company/static/description/index.html
@@ -367,7 +367,7 @@ <h1 class="title">User roles by company</h1>
 !! This file is generated by oca-gen-addon-readme !!
 !! changes will be overwritten.                   !!
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-!! source digest: sha256:d53f251191c84826b5c4436215ab4a9ca8699759795f4a2ce11149295f83ef6c
+!! source digest: sha256:0efb0fd6750d2a16ed1275b1a45167c61e70b348fb1fdd06c873f6297088eb53
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
 <p><a class="reference external image-reference" href="https://odoo-community.org/page/development-status"><img alt="Beta" src="https://img.shields.io/badge/maturity-Beta-yellow.png" /></a> <a class="reference external image-reference" href="http://www.gnu.org/licenses/agpl-3.0-standalone.html"><img alt="License: AGPL-3" src="https://img.shields.io/badge/licence-AGPL--3-blue.png" /></a> <a class="reference external image-reference" href="https://github.com/OCA/server-backend/tree/16.0/base_user_role_company"><img alt="OCA/server-backend" src="https://img.shields.io/badge/github-OCA%2Fserver--backend-lightgray.png?logo=github" /></a> <a class="reference external image-reference" href="https://translation.odoo-community.org/projects/server-backend-16-0/server-backend-16-0-base_user_role_company"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external image-reference" href="https://runboat.odoo-community.org/builds?repo=OCA/server-backend&amp;target_branch=16.0"><img alt="Try me on Runboat" src="https://img.shields.io/badge/runboat-Try%20me-875A7B.png" /></a></p>
 <p>Enable User Roles depending on the Companies selected.</p>

From 67d56f6efa5ba2c1f29d7c7e2fceb257b7449c60 Mon Sep 17 00:00:00 2001
From: Ivorra78 <informatica@totmaterial.es>
Date: Wed, 8 Nov 2023 12:30:50 +0000
Subject: [PATCH 27/45] Translated using Weblate (Spanish)

Currently translated at 100.0% (8 of 8 strings)

Translation: server-backend-16.0/server-backend-16.0-base_user_role_company
Translate-URL: https://translation.odoo-community.org/projects/server-backend-16-0/server-backend-16-0-base_user_role_company/es/
---
 base_user_role_company/i18n/es.po | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/base_user_role_company/i18n/es.po b/base_user_role_company/i18n/es.po
index db078f6e0..449ba51ab 100644
--- a/base_user_role_company/i18n/es.po
+++ b/base_user_role_company/i18n/es.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 16.0\n"
 "Report-Msgid-Bugs-To: \n"
-"PO-Revision-Date: 2023-08-28 09:10+0000\n"
+"PO-Revision-Date: 2023-11-08 14:36+0000\n"
 "Last-Translator: Ivorra78 <informatica@totmaterial.es>\n"
 "Language-Team: none\n"
 "Language: es\n"
@@ -55,7 +55,7 @@ msgstr "Usuario"
 #: code:addons/base_user_role_company/models/role.py:0
 #, python-format
 msgid "User \"%(user)s\" does not have access to the company \"%(company)s\""
-msgstr ""
+msgstr "El usuario \"%(user)s\" no tiene acceso a la empresa \"%(company)s\""
 
 #. module: base_user_role_company
 #: model:ir.model,name:base_user_role_company.model_res_users_role_line

From 933e01c5a128e5046ee06a33c903e671ea39f698 Mon Sep 17 00:00:00 2001
From: mymage <stefano.consolaro@mymage.it>
Date: Wed, 3 Jan 2024 12:28:04 +0000
Subject: [PATCH 28/45] Translated using Weblate (Italian)

Currently translated at 100.0% (8 of 8 strings)

Translation: server-backend-16.0/server-backend-16.0-base_user_role_company
Translate-URL: https://translation.odoo-community.org/projects/server-backend-16-0/server-backend-16-0-base_user_role_company/it/
---
 base_user_role_company/i18n/it.po | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/base_user_role_company/i18n/it.po b/base_user_role_company/i18n/it.po
index 9c97a5692..26a5fcfba 100644
--- a/base_user_role_company/i18n/it.po
+++ b/base_user_role_company/i18n/it.po
@@ -6,20 +6,20 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 14.0\n"
 "Report-Msgid-Bugs-To: \n"
-"PO-Revision-Date: 2023-03-07 19:24+0000\n"
-"Last-Translator: Francesco Foresti <francesco.foresti@ooops404.com>\n"
+"PO-Revision-Date: 2024-01-03 14:33+0000\n"
+"Last-Translator: mymage <stefano.consolaro@mymage.it>\n"
 "Language-Team: none\n"
 "Language: it\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 4.14.1\n"
+"X-Generator: Weblate 4.17\n"
 
 #. module: base_user_role_company
 #: model:ir.model.fields,field_description:base_user_role_company.field_res_users_role_line__allowed_company_ids
 msgid "Companies"
-msgstr ""
+msgstr "Aziende"
 
 #. module: base_user_role_company
 #: model:ir.model.fields,field_description:base_user_role_company.field_res_users_role_line__company_id
@@ -48,14 +48,14 @@ msgstr "I ruoli possono essere assegnati all'utente solo uno alla volta"
 #. module: base_user_role_company
 #: model:ir.model,name:base_user_role_company.model_res_users
 msgid "User"
-msgstr ""
+msgstr "Utente"
 
 #. module: base_user_role_company
 #. odoo-python
 #: code:addons/base_user_role_company/models/role.py:0
 #, python-format
 msgid "User \"%(user)s\" does not have access to the company \"%(company)s\""
-msgstr ""
+msgstr "L'utente \"%(user)s\" non ha accesso all'azienda \"%(company)s\""
 
 #. module: base_user_role_company
 #: model:ir.model,name:base_user_role_company.model_res_users_role_line

From 55e56f7bd842a042430dbf792dec5406f70427a3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Alix?= <sebastien.alix@camptocamp.com>
Date: Thu, 1 Feb 2024 10:06:46 +0100
Subject: [PATCH 29/45] base_user_role_company: allow same role in different
 companies

---
 base_user_role_company/README.rst              |  2 +-
 base_user_role_company/__manifest__.py         |  3 ++-
 .../static/description/index.html              |  3 +--
 base_user_role_company/views/user.xml          | 18 ++++++++++++++++++
 4 files changed, 22 insertions(+), 4 deletions(-)
 create mode 100644 base_user_role_company/views/user.xml

diff --git a/base_user_role_company/README.rst b/base_user_role_company/README.rst
index 41bf9632a..d37c35f24 100644
--- a/base_user_role_company/README.rst
+++ b/base_user_role_company/README.rst
@@ -7,7 +7,7 @@ User roles by company
    !! This file is generated by oca-gen-addon-readme !!
    !! changes will be overwritten.                   !!
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-   !! source digest: sha256:0efb0fd6750d2a16ed1275b1a45167c61e70b348fb1fdd06c873f6297088eb53
+   !! source digest: sha256:412b244590f18253b21a2f15b15c2cbbc8ec3decfc64dbf12973646123cb3193
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
 .. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png
diff --git a/base_user_role_company/__manifest__.py b/base_user_role_company/__manifest__.py
index cfa51811f..1e3d1cebf 100644
--- a/base_user_role_company/__manifest__.py
+++ b/base_user_role_company/__manifest__.py
@@ -3,7 +3,7 @@
 
 {
     "name": "User roles by company",
-    "version": "16.0.1.0.1",
+    "version": "16.0.1.1.0",
     "category": "Tools",
     "author": "Open Source Integrators, Odoo Community Association (OCA)",
     "license": "AGPL-3",
@@ -11,6 +11,7 @@
     "depends": ["base_user_role"],
     "data": [
         "views/role.xml",
+        "views/user.xml",
     ],
     "installable": True,
     "auto_install": True,
diff --git a/base_user_role_company/static/description/index.html b/base_user_role_company/static/description/index.html
index e73c5c3bd..7f7893cc3 100644
--- a/base_user_role_company/static/description/index.html
+++ b/base_user_role_company/static/description/index.html
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
@@ -367,7 +366,7 @@ <h1 class="title">User roles by company</h1>
 !! This file is generated by oca-gen-addon-readme !!
 !! changes will be overwritten.                   !!
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-!! source digest: sha256:0efb0fd6750d2a16ed1275b1a45167c61e70b348fb1fdd06c873f6297088eb53
+!! source digest: sha256:412b244590f18253b21a2f15b15c2cbbc8ec3decfc64dbf12973646123cb3193
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
 <p><a class="reference external image-reference" href="https://odoo-community.org/page/development-status"><img alt="Beta" src="https://img.shields.io/badge/maturity-Beta-yellow.png" /></a> <a class="reference external image-reference" href="http://www.gnu.org/licenses/agpl-3.0-standalone.html"><img alt="License: AGPL-3" src="https://img.shields.io/badge/licence-AGPL--3-blue.png" /></a> <a class="reference external image-reference" href="https://github.com/OCA/server-backend/tree/16.0/base_user_role_company"><img alt="OCA/server-backend" src="https://img.shields.io/badge/github-OCA%2Fserver--backend-lightgray.png?logo=github" /></a> <a class="reference external image-reference" href="https://translation.odoo-community.org/projects/server-backend-16-0/server-backend-16-0-base_user_role_company"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external image-reference" href="https://runboat.odoo-community.org/builds?repo=OCA/server-backend&amp;target_branch=16.0"><img alt="Try me on Runboat" src="https://img.shields.io/badge/runboat-Try%20me-875A7B.png" /></a></p>
 <p>Enable User Roles depending on the Companies selected.</p>
diff --git a/base_user_role_company/views/user.xml b/base_user_role_company/views/user.xml
new file mode 100644
index 000000000..51b4ea2a9
--- /dev/null
+++ b/base_user_role_company/views/user.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<!-- Copyright 2024 Camptocamp SA
+     License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). -->
+<odoo>
+    <record id="view_res_users_form_inherit" model="ir.ui.view">
+        <field name="name">res.users.form.inherit</field>
+        <field name="model">res.users</field>
+        <field name="inherit_id" ref="base_user_role.view_res_users_form_inherit" />
+        <field name="arch" type="xml">
+            <field name="role_id" position="attributes">
+                <!-- Remove the domain on existing roles. This allows to set
+                  the same role multiple times on a user as long as it is set on a
+                  different company. -->
+                <attribute name="domain">[]</attribute>
+            </field>
+        </field>
+    </record>
+</odoo>

From b4acf9c578c41ddb5b8594cfdc23aabe831ed2bc Mon Sep 17 00:00:00 2001
From: Robin Conjour <rconjour@wesolved.com>
Date: Mon, 26 Feb 2024 17:25:25 +0100
Subject: [PATCH 30/45] [IMP] base_user_role_company: black, isort, prettier

---
 base_user_role_company/README.rst             | 72 ++++++++++---------
 base_user_role_company/pyproject.toml         |  3 +
 .../readme/{CONFIGURE.rst => CONFIGURE.md}    |  8 ++-
 base_user_role_company/readme/CONTRIBUTORS.md |  5 ++
 .../readme/CONTRIBUTORS.rst                   |  5 --
 base_user_role_company/readme/DESCRIPTION.md  |  8 +++
 base_user_role_company/readme/DESCRIPTION.rst |  9 ---
 base_user_role_company/readme/USAGE.md        | 22 ++++++
 base_user_role_company/readme/USAGE.rst       | 17 -----
 .../static/description/index.html             | 55 +++++++-------
 10 files changed, 110 insertions(+), 94 deletions(-)
 create mode 100644 base_user_role_company/pyproject.toml
 rename base_user_role_company/readme/{CONFIGURE.rst => CONFIGURE.md} (57%)
 create mode 100644 base_user_role_company/readme/CONTRIBUTORS.md
 delete mode 100644 base_user_role_company/readme/CONTRIBUTORS.rst
 create mode 100644 base_user_role_company/readme/DESCRIPTION.md
 delete mode 100644 base_user_role_company/readme/DESCRIPTION.rst
 create mode 100644 base_user_role_company/readme/USAGE.md
 delete mode 100644 base_user_role_company/readme/USAGE.rst

diff --git a/base_user_role_company/README.rst b/base_user_role_company/README.rst
index d37c35f24..ab33ac016 100644
--- a/base_user_role_company/README.rst
+++ b/base_user_role_company/README.rst
@@ -17,26 +17,25 @@ User roles by company
     :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html
     :alt: License: AGPL-3
 .. |badge3| image:: https://img.shields.io/badge/github-OCA%2Fserver--backend-lightgray.png?logo=github
-    :target: https://github.com/OCA/server-backend/tree/16.0/base_user_role_company
+    :target: https://github.com/OCA/server-backend/tree/17.0/base_user_role_company
     :alt: OCA/server-backend
 .. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png
-    :target: https://translation.odoo-community.org/projects/server-backend-16-0/server-backend-16-0-base_user_role_company
+    :target: https://translation.odoo-community.org/projects/server-backend-17-0/server-backend-17-0-base_user_role_company
     :alt: Translate me on Weblate
 .. |badge5| image:: https://img.shields.io/badge/runboat-Try%20me-875A7B.png
-    :target: https://runboat.odoo-community.org/builds?repo=OCA/server-backend&target_branch=16.0
+    :target: https://runboat.odoo-community.org/builds?repo=OCA/server-backend&target_branch=17.0
     :alt: Try me on Runboat
 
 |badge1| |badge2| |badge3| |badge4| |badge5|
 
 Enable User Roles depending on the Companies selected.
 
-A company specific Role will only be enabled
-if it is set for **all** the currently selected companies.
+A company specific Role will only be enabled if it is set for **all**
+the currently selected companies.
 
-For example, if a user is "Sales Manager" only for Company A,
-it will see that role enabled only if Company A is selected.
-If the user selects Company A and Company B,
-then the "Sales Manager" role won't be enabled.
+For example, if a user is "Sales Manager" only for Company A, it will
+see that role enabled only if Company A is selected. If the user selects
+Company A and Company B, then the "Sales Manager" role won't be enabled.
 
 **Table of contents**
 
@@ -48,31 +47,40 @@ Configuration
 
 Roles are set on the User form.
 
-The "Company" additional column allows to set a Role as only valid for specific companies.
+The "Company" additional column allows to set a Role as only valid for
+specific companies.
 
-There is also a "Active Role" techincal field, only visible in developer mode.
-It shows what roles are active, after applying the company selection rules.
+There is also a "Active Role" techincal field, only visible in developer
+mode. It shows what roles are active, after applying the company
+selection rules.
 
 Usage
 =====
 
-Select the active companies from the web client widget, near the top right corner.
-When doing so, the User's security Groups are recomputed, based on the Roles.
+Select the active companies from the web client widget, near the top
+right corner. When doing so, the User's security Groups are recomputed,
+based on the Roles.
 
-When the user changes the company selection, only the groups available to all active companies will be activated.
+When the user changes the company selection, only the groups available
+to all active companies will be activated.
 
 For example:
 
-* A "SALES PERSON" and a "SALES MANAGER" roles are created.
+-  A "SALES PERSON" and a "SALES MANAGER" roles are created.
 
-* A user is assigned to the roles:
-    * "SALES PERSON", with no specific company assigned (meaning all)
-    * "SALES MANAGER" only to "My Company (Chicago)"
+-  A user is assigned to the roles:
 
-* When selecting active companies from the UI widget:
-    * If only "My Company (San Francisco)" is active, "SALES PERSON" will be active.
-    * If only "My Company (Chicago)" is active, "SALES PERSON" and "SALES MANAGER" will be active.
-    * If both "My Company (San Francisco)" and "My Company (Chicago)" is active, "SALES PERSON" will be active.
+   -  "SALES PERSON", with no specific company assigned (meaning all)
+   -  "SALES MANAGER" only to "My Company (Chicago)"
+
+-  When selecting active companies from the UI widget:
+
+   -  If only "My Company (San Francisco)" is active, "SALES PERSON"
+      will be active.
+   -  If only "My Company (Chicago)" is active, "SALES PERSON" and
+      "SALES MANAGER" will be active.
+   -  If both "My Company (San Francisco)" and "My Company (Chicago)" is
+      active, "SALES PERSON" will be active.
 
 Bug Tracker
 ===========
@@ -80,7 +88,7 @@ Bug Tracker
 Bugs are tracked on `GitHub Issues <https://github.com/OCA/server-backend/issues>`_.
 In case of trouble, please check there if your issue has already been reported.
 If you spotted it first, help us to smash it by providing a detailed and welcomed
-`feedback <https://github.com/OCA/server-backend/issues/new?body=module:%20base_user_role_company%0Aversion:%2016.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**>`_.
+`feedback <https://github.com/OCA/server-backend/issues/new?body=module:%20base_user_role_company%0Aversion:%2017.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**>`_.
 
 Do not contact contributors directly about support or help with technical issues.
 
@@ -88,21 +96,21 @@ Credits
 =======
 
 Authors
-~~~~~~~
+-------
 
 * Open Source Integrators
 
 Contributors
-~~~~~~~~~~~~
+------------
 
-`Open Source Integrators <http://opensourceintegrators.com>`_
+`Open Source Integrators <http://opensourceintegrators.com>`__
 
-  * Daniel Reis <dreis@opensourceintegrators.com>
-  * Chandresh Thakkar <cthakkr@opensourceintegrators.com>
-  * Urvisha Desai <udesai@opensourceintegrators.com>
+   -  Daniel Reis <dreis@opensourceintegrators.com>
+   -  Chandresh Thakkar <cthakkr@opensourceintegrators.com>
+   -  Urvisha Desai <udesai@opensourceintegrators.com>
 
 Maintainers
-~~~~~~~~~~~
+-----------
 
 This module is maintained by the OCA.
 
@@ -114,6 +122,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/server-backend <https://github.com/OCA/server-backend/tree/16.0/base_user_role_company>`_ project on GitHub.
+This module is part of the `OCA/server-backend <https://github.com/OCA/server-backend/tree/17.0/base_user_role_company>`_ project on GitHub.
 
 You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.
diff --git a/base_user_role_company/pyproject.toml b/base_user_role_company/pyproject.toml
new file mode 100644
index 000000000..4231d0ccc
--- /dev/null
+++ b/base_user_role_company/pyproject.toml
@@ -0,0 +1,3 @@
+[build-system]
+requires = ["whool"]
+build-backend = "whool.buildapi"
diff --git a/base_user_role_company/readme/CONFIGURE.rst b/base_user_role_company/readme/CONFIGURE.md
similarity index 57%
rename from base_user_role_company/readme/CONFIGURE.rst
rename to base_user_role_company/readme/CONFIGURE.md
index c50bf9fec..ae04da435 100644
--- a/base_user_role_company/readme/CONFIGURE.rst
+++ b/base_user_role_company/readme/CONFIGURE.md
@@ -1,6 +1,8 @@
 Roles are set on the User form.
 
-The "Company" additional column allows to set a Role as only valid for specific companies.
+The "Company" additional column allows to set a Role as only valid for
+specific companies.
 
-There is also a "Active Role" techincal field, only visible in developer mode.
-It shows what roles are active, after applying the company selection rules.
+There is also a "Active Role" techincal field, only visible in developer
+mode. It shows what roles are active, after applying the company
+selection rules.
diff --git a/base_user_role_company/readme/CONTRIBUTORS.md b/base_user_role_company/readme/CONTRIBUTORS.md
new file mode 100644
index 000000000..a3a565f21
--- /dev/null
+++ b/base_user_role_company/readme/CONTRIBUTORS.md
@@ -0,0 +1,5 @@
+[Open Source Integrators](http://opensourceintegrators.com)
+
+> - Daniel Reis \<<dreis@opensourceintegrators.com>\>
+> - Chandresh Thakkar \<<cthakkr@opensourceintegrators.com>\>
+> - Urvisha Desai \<<udesai@opensourceintegrators.com>\>
diff --git a/base_user_role_company/readme/CONTRIBUTORS.rst b/base_user_role_company/readme/CONTRIBUTORS.rst
deleted file mode 100644
index 3b275b35c..000000000
--- a/base_user_role_company/readme/CONTRIBUTORS.rst
+++ /dev/null
@@ -1,5 +0,0 @@
-`Open Source Integrators <http://opensourceintegrators.com>`_
-
-  * Daniel Reis <dreis@opensourceintegrators.com>
-  * Chandresh Thakkar <cthakkr@opensourceintegrators.com>
-  * Urvisha Desai <udesai@opensourceintegrators.com>
diff --git a/base_user_role_company/readme/DESCRIPTION.md b/base_user_role_company/readme/DESCRIPTION.md
new file mode 100644
index 000000000..2f93eb4b0
--- /dev/null
+++ b/base_user_role_company/readme/DESCRIPTION.md
@@ -0,0 +1,8 @@
+Enable User Roles depending on the Companies selected.
+
+A company specific Role will only be enabled if it is set for **all**
+the currently selected companies.
+
+For example, if a user is "Sales Manager" only for Company A, it will
+see that role enabled only if Company A is selected. If the user selects
+Company A and Company B, then the "Sales Manager" role won't be enabled.
diff --git a/base_user_role_company/readme/DESCRIPTION.rst b/base_user_role_company/readme/DESCRIPTION.rst
deleted file mode 100644
index 68507f1e4..000000000
--- a/base_user_role_company/readme/DESCRIPTION.rst
+++ /dev/null
@@ -1,9 +0,0 @@
-Enable User Roles depending on the Companies selected.
-
-A company specific Role will only be enabled
-if it is set for **all** the currently selected companies.
-
-For example, if a user is "Sales Manager" only for Company A,
-it will see that role enabled only if Company A is selected.
-If the user selects Company A and Company B,
-then the "Sales Manager" role won't be enabled.
diff --git a/base_user_role_company/readme/USAGE.md b/base_user_role_company/readme/USAGE.md
new file mode 100644
index 000000000..37769b5da
--- /dev/null
+++ b/base_user_role_company/readme/USAGE.md
@@ -0,0 +1,22 @@
+Select the active companies from the web client widget, near the top
+right corner. When doing so, the User's security Groups are recomputed,
+based on the Roles.
+
+When the user changes the company selection, only the groups available
+to all active companies will be activated.
+
+For example:
+
+- A "SALES PERSON" and a "SALES MANAGER" roles are created.
+
+- A user is assigned to the roles:  
+  - "SALES PERSON", with no specific company assigned (meaning all)
+  - "SALES MANAGER" only to "My Company (Chicago)"
+
+- When selecting active companies from the UI widget:  
+  - If only "My Company (San Francisco)" is active, "SALES PERSON" will
+    be active.
+  - If only "My Company (Chicago)" is active, "SALES PERSON" and "SALES
+    MANAGER" will be active.
+  - If both "My Company (San Francisco)" and "My Company (Chicago)" is
+    active, "SALES PERSON" will be active.
diff --git a/base_user_role_company/readme/USAGE.rst b/base_user_role_company/readme/USAGE.rst
deleted file mode 100644
index 88dce6bc7..000000000
--- a/base_user_role_company/readme/USAGE.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-Select the active companies from the web client widget, near the top right corner.
-When doing so, the User's security Groups are recomputed, based on the Roles.
-
-When the user changes the company selection, only the groups available to all active companies will be activated.
-
-For example:
-
-* A "SALES PERSON" and a "SALES MANAGER" roles are created.
-
-* A user is assigned to the roles:
-    * "SALES PERSON", with no specific company assigned (meaning all)
-    * "SALES MANAGER" only to "My Company (Chicago)"
-
-* When selecting active companies from the UI widget:
-    * If only "My Company (San Francisco)" is active, "SALES PERSON" will be active.
-    * If only "My Company (Chicago)" is active, "SALES PERSON" and "SALES MANAGER" will be active.
-    * If both "My Company (San Francisco)" and "My Company (Chicago)" is active, "SALES PERSON" will be active.
diff --git a/base_user_role_company/static/description/index.html b/base_user_role_company/static/description/index.html
index 7f7893cc3..d0cea181a 100644
--- a/base_user_role_company/static/description/index.html
+++ b/base_user_role_company/static/description/index.html
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
@@ -368,14 +369,13 @@ <h1 class="title">User roles by company</h1>
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 !! source digest: sha256:412b244590f18253b21a2f15b15c2cbbc8ec3decfc64dbf12973646123cb3193
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
-<p><a class="reference external image-reference" href="https://odoo-community.org/page/development-status"><img alt="Beta" src="https://img.shields.io/badge/maturity-Beta-yellow.png" /></a> <a class="reference external image-reference" href="http://www.gnu.org/licenses/agpl-3.0-standalone.html"><img alt="License: AGPL-3" src="https://img.shields.io/badge/licence-AGPL--3-blue.png" /></a> <a class="reference external image-reference" href="https://github.com/OCA/server-backend/tree/16.0/base_user_role_company"><img alt="OCA/server-backend" src="https://img.shields.io/badge/github-OCA%2Fserver--backend-lightgray.png?logo=github" /></a> <a class="reference external image-reference" href="https://translation.odoo-community.org/projects/server-backend-16-0/server-backend-16-0-base_user_role_company"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external image-reference" href="https://runboat.odoo-community.org/builds?repo=OCA/server-backend&amp;target_branch=16.0"><img alt="Try me on Runboat" src="https://img.shields.io/badge/runboat-Try%20me-875A7B.png" /></a></p>
+<p><a class="reference external image-reference" href="https://odoo-community.org/page/development-status"><img alt="Beta" src="https://img.shields.io/badge/maturity-Beta-yellow.png" /></a> <a class="reference external image-reference" href="http://www.gnu.org/licenses/agpl-3.0-standalone.html"><img alt="License: AGPL-3" src="https://img.shields.io/badge/licence-AGPL--3-blue.png" /></a> <a class="reference external image-reference" href="https://github.com/OCA/server-backend/tree/17.0/base_user_role_company"><img alt="OCA/server-backend" src="https://img.shields.io/badge/github-OCA%2Fserver--backend-lightgray.png?logo=github" /></a> <a class="reference external image-reference" href="https://translation.odoo-community.org/projects/server-backend-17-0/server-backend-17-0-base_user_role_company"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external image-reference" href="https://runboat.odoo-community.org/builds?repo=OCA/server-backend&amp;target_branch=17.0"><img alt="Try me on Runboat" src="https://img.shields.io/badge/runboat-Try%20me-875A7B.png" /></a></p>
 <p>Enable User Roles depending on the Companies selected.</p>
-<p>A company specific Role will only be enabled
-if it is set for <strong>all</strong> the currently selected companies.</p>
-<p>For example, if a user is “Sales Manager” only for Company A,
-it will see that role enabled only if Company A is selected.
-If the user selects Company A and Company B,
-then the “Sales Manager” role won’t be enabled.</p>
+<p>A company specific Role will only be enabled if it is set for <strong>all</strong>
+the currently selected companies.</p>
+<p>For example, if a user is “Sales Manager” only for Company A, it will
+see that role enabled only if Company A is selected. If the user selects
+Company A and Company B, then the “Sales Manager” role won’t be enabled.</p>
 <p><strong>Table of contents</strong></p>
 <div class="contents local topic" id="contents">
 <ul class="simple">
@@ -393,36 +393,35 @@ <h1 class="title">User roles by company</h1>
 <div class="section" id="configuration">
 <h1><a class="toc-backref" href="#toc-entry-1">Configuration</a></h1>
 <p>Roles are set on the User form.</p>
-<p>The “Company” additional column allows to set a Role as only valid for specific companies.</p>
-<p>There is also a “Active Role” techincal field, only visible in developer mode.
-It shows what roles are active, after applying the company selection rules.</p>
+<p>The “Company” additional column allows to set a Role as only valid for
+specific companies.</p>
+<p>There is also a “Active Role” techincal field, only visible in developer
+mode. It shows what roles are active, after applying the company
+selection rules.</p>
 </div>
 <div class="section" id="usage">
 <h1><a class="toc-backref" href="#toc-entry-2">Usage</a></h1>
-<p>Select the active companies from the web client widget, near the top right corner.
-When doing so, the User’s security Groups are recomputed, based on the Roles.</p>
-<p>When the user changes the company selection, only the groups available to all active companies will be activated.</p>
+<p>Select the active companies from the web client widget, near the top
+right corner. When doing so, the User’s security Groups are recomputed,
+based on the Roles.</p>
+<p>When the user changes the company selection, only the groups available
+to all active companies will be activated.</p>
 <p>For example:</p>
 <ul class="simple">
 <li>A “SALES PERSON” and a “SALES MANAGER” roles are created.</li>
-<li><dl class="first docutils">
-<dt>A user is assigned to the roles:</dt>
-<dd><ul class="first last">
+<li>A user is assigned to the roles:<ul>
 <li>“SALES PERSON”, with no specific company assigned (meaning all)</li>
 <li>“SALES MANAGER” only to “My Company (Chicago)”</li>
 </ul>
-</dd>
-</dl>
 </li>
-<li><dl class="first docutils">
-<dt>When selecting active companies from the UI widget:</dt>
-<dd><ul class="first last">
-<li>If only “My Company (San Francisco)” is active, “SALES PERSON” will be active.</li>
-<li>If only “My Company (Chicago)” is active, “SALES PERSON” and “SALES MANAGER” will be active.</li>
-<li>If both “My Company (San Francisco)” and “My Company (Chicago)” is active, “SALES PERSON” will be active.</li>
+<li>When selecting active companies from the UI widget:<ul>
+<li>If only “My Company (San Francisco)” is active, “SALES PERSON”
+will be active.</li>
+<li>If only “My Company (Chicago)” is active, “SALES PERSON” and
+“SALES MANAGER” will be active.</li>
+<li>If both “My Company (San Francisco)” and “My Company (Chicago)” is
+active, “SALES PERSON” will be active.</li>
 </ul>
-</dd>
-</dl>
 </li>
 </ul>
 </div>
@@ -431,7 +430,7 @@ <h1><a class="toc-backref" href="#toc-entry-3">Bug Tracker</a></h1>
 <p>Bugs are tracked on <a class="reference external" href="https://github.com/OCA/server-backend/issues">GitHub Issues</a>.
 In case of trouble, please check there if your issue has already been reported.
 If you spotted it first, help us to smash it by providing a detailed and welcomed
-<a class="reference external" href="https://github.com/OCA/server-backend/issues/new?body=module:%20base_user_role_company%0Aversion:%2016.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**">feedback</a>.</p>
+<a class="reference external" href="https://github.com/OCA/server-backend/issues/new?body=module:%20base_user_role_company%0Aversion:%2017.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**">feedback</a>.</p>
 <p>Do not contact contributors directly about support or help with technical issues.</p>
 </div>
 <div class="section" id="credits">
@@ -460,7 +459,7 @@ <h2><a class="toc-backref" href="#toc-entry-7">Maintainers</a></h2>
 <p>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.</p>
-<p>This module is part of the <a class="reference external" href="https://github.com/OCA/server-backend/tree/16.0/base_user_role_company">OCA/server-backend</a> project on GitHub.</p>
+<p>This module is part of the <a class="reference external" href="https://github.com/OCA/server-backend/tree/17.0/base_user_role_company">OCA/server-backend</a> project on GitHub.</p>
 <p>You are welcome to contribute. To learn how please visit <a class="reference external" href="https://odoo-community.org/page/Contribute">https://odoo-community.org/page/Contribute</a>.</p>
 </div>
 </div>

From c23094a08e530aa00833d86f47258f1d14bd79a9 Mon Sep 17 00:00:00 2001
From: Robin Conjour <rconjour@wesolved.com>
Date: Mon, 26 Feb 2024 17:26:08 +0100
Subject: [PATCH 31/45] [MIG] base_user_role_company: Migration to 17.0

---
 base_user_role_company/README.rst                      | 6 +++++-
 base_user_role_company/__manifest__.py                 | 2 +-
 base_user_role_company/i18n/base_user_role_company.pot | 2 +-
 base_user_role_company/models/ir_http.py               | 2 +-
 base_user_role_company/readme/CONTRIBUTORS.md          | 4 ++++
 base_user_role_company/static/description/index.html   | 9 +++++++--
 6 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/base_user_role_company/README.rst b/base_user_role_company/README.rst
index ab33ac016..8a18e12cc 100644
--- a/base_user_role_company/README.rst
+++ b/base_user_role_company/README.rst
@@ -7,7 +7,7 @@ User roles by company
    !! This file is generated by oca-gen-addon-readme !!
    !! changes will be overwritten.                   !!
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-   !! source digest: sha256:412b244590f18253b21a2f15b15c2cbbc8ec3decfc64dbf12973646123cb3193
+   !! source digest: sha256:f410f78e1dea8bfa8c874dff8407a15398a7e65dd94f41a61568afd5d859ea2b
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
 .. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png
@@ -109,6 +109,10 @@ Contributors
    -  Chandresh Thakkar <cthakkr@opensourceintegrators.com>
    -  Urvisha Desai <udesai@opensourceintegrators.com>
 
+`WeSolved <http://wesolved.com>`__
+
+   -  Robin Conjour <rconjour@wesolved.com>
+
 Maintainers
 -----------
 
diff --git a/base_user_role_company/__manifest__.py b/base_user_role_company/__manifest__.py
index 1e3d1cebf..c2246f73a 100644
--- a/base_user_role_company/__manifest__.py
+++ b/base_user_role_company/__manifest__.py
@@ -3,7 +3,7 @@
 
 {
     "name": "User roles by company",
-    "version": "16.0.1.1.0",
+    "version": "17.0.1.0.0",
     "category": "Tools",
     "author": "Open Source Integrators, Odoo Community Association (OCA)",
     "license": "AGPL-3",
diff --git a/base_user_role_company/i18n/base_user_role_company.pot b/base_user_role_company/i18n/base_user_role_company.pot
index f8900a366..828370c9a 100644
--- a/base_user_role_company/i18n/base_user_role_company.pot
+++ b/base_user_role_company/i18n/base_user_role_company.pot
@@ -4,7 +4,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 16.0\n"
+"Project-Id-Version: Odoo Server 17.0\n"
 "Report-Msgid-Bugs-To: \n"
 "Last-Translator: \n"
 "Language-Team: \n"
diff --git a/base_user_role_company/models/ir_http.py b/base_user_role_company/models/ir_http.py
index 65a6b3b91..972e66a21 100644
--- a/base_user_role_company/models/ir_http.py
+++ b/base_user_role_company/models/ir_http.py
@@ -14,7 +14,7 @@ def session_info(self):
         calculate the roles to enable.
         A role should be enabled only when it applies to all selected companies.
         """
-        result = super(IrHttp, self).session_info()
+        result = super().session_info()
         if self.env.user.role_line_ids:
             cids_str = request.httprequest.cookies.get("cids", str(self.env.company.id))
             cids = [int(cid) for cid in cids_str.split(",")]
diff --git a/base_user_role_company/readme/CONTRIBUTORS.md b/base_user_role_company/readme/CONTRIBUTORS.md
index a3a565f21..8fa3c89a9 100644
--- a/base_user_role_company/readme/CONTRIBUTORS.md
+++ b/base_user_role_company/readme/CONTRIBUTORS.md
@@ -3,3 +3,7 @@
 > - Daniel Reis \<<dreis@opensourceintegrators.com>\>
 > - Chandresh Thakkar \<<cthakkr@opensourceintegrators.com>\>
 > - Urvisha Desai \<<udesai@opensourceintegrators.com>\>
+
+[WeSolved](http://wesolved.com)
+
+> - Robin Conjour \<<rconjour@wesolved.com>\>
diff --git a/base_user_role_company/static/description/index.html b/base_user_role_company/static/description/index.html
index d0cea181a..6435a7556 100644
--- a/base_user_role_company/static/description/index.html
+++ b/base_user_role_company/static/description/index.html
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
@@ -367,7 +366,7 @@ <h1 class="title">User roles by company</h1>
 !! This file is generated by oca-gen-addon-readme !!
 !! changes will be overwritten.                   !!
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-!! source digest: sha256:412b244590f18253b21a2f15b15c2cbbc8ec3decfc64dbf12973646123cb3193
+!! source digest: sha256:f410f78e1dea8bfa8c874dff8407a15398a7e65dd94f41a61568afd5d859ea2b
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
 <p><a class="reference external image-reference" href="https://odoo-community.org/page/development-status"><img alt="Beta" src="https://img.shields.io/badge/maturity-Beta-yellow.png" /></a> <a class="reference external image-reference" href="http://www.gnu.org/licenses/agpl-3.0-standalone.html"><img alt="License: AGPL-3" src="https://img.shields.io/badge/licence-AGPL--3-blue.png" /></a> <a class="reference external image-reference" href="https://github.com/OCA/server-backend/tree/17.0/base_user_role_company"><img alt="OCA/server-backend" src="https://img.shields.io/badge/github-OCA%2Fserver--backend-lightgray.png?logo=github" /></a> <a class="reference external image-reference" href="https://translation.odoo-community.org/projects/server-backend-17-0/server-backend-17-0-base_user_role_company"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external image-reference" href="https://runboat.odoo-community.org/builds?repo=OCA/server-backend&amp;target_branch=17.0"><img alt="Try me on Runboat" src="https://img.shields.io/badge/runboat-Try%20me-875A7B.png" /></a></p>
 <p>Enable User Roles depending on the Companies selected.</p>
@@ -451,6 +450,12 @@ <h2><a class="toc-backref" href="#toc-entry-6">Contributors</a></h2>
 <li>Urvisha Desai &lt;<a class="reference external" href="mailto:udesai&#64;opensourceintegrators.com">udesai&#64;opensourceintegrators.com</a>&gt;</li>
 </ul>
 </blockquote>
+<p><a class="reference external" href="http://wesolved.com">WeSolved</a></p>
+<blockquote>
+<ul class="simple">
+<li>Robin Conjour &lt;<a class="reference external" href="mailto:rconjour&#64;wesolved.com">rconjour&#64;wesolved.com</a>&gt;</li>
+</ul>
+</blockquote>
 </div>
 <div class="section" id="maintainers">
 <h2><a class="toc-backref" href="#toc-entry-7">Maintainers</a></h2>

From d11ad41c6cf96b8ec6acdf0c0bb3cd70b89228f5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Didderen?= <jeremy.didderen@noviat.com>
Date: Wed, 3 Apr 2024 16:11:32 +0200
Subject: [PATCH 32/45] [IMP/FIX] base_user_role_company - re-add logic around
 multi active cids

---
 base_user_role_company/README.rst             |  2 +-
 base_user_role_company/__manifest__.py        |  2 +-
 base_user_role_company/models/ir_http.py      |  3 +--
 base_user_role_company/models/user.py         | 26 ++++++++++++-------
 .../static/description/index.html             |  2 +-
 .../tests/test_role_per_company.py            | 22 ++++++++++++++--
 base_user_role_company/views/role.xml         |  3 +++
 7 files changed, 43 insertions(+), 17 deletions(-)

diff --git a/base_user_role_company/README.rst b/base_user_role_company/README.rst
index 8a18e12cc..28feafe1a 100644
--- a/base_user_role_company/README.rst
+++ b/base_user_role_company/README.rst
@@ -7,7 +7,7 @@ User roles by company
    !! This file is generated by oca-gen-addon-readme !!
    !! changes will be overwritten.                   !!
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-   !! source digest: sha256:f410f78e1dea8bfa8c874dff8407a15398a7e65dd94f41a61568afd5d859ea2b
+   !! source digest: sha256:bda3edd68fb07a268d9aef2212886132194a6946ffb608f88d4a596c43db7cb5
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
 .. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png
diff --git a/base_user_role_company/__manifest__.py b/base_user_role_company/__manifest__.py
index c2246f73a..6425f46d6 100644
--- a/base_user_role_company/__manifest__.py
+++ b/base_user_role_company/__manifest__.py
@@ -3,7 +3,7 @@
 
 {
     "name": "User roles by company",
-    "version": "17.0.1.0.0",
+    "version": "17.0.1.1.0",
     "category": "Tools",
     "author": "Open Source Integrators, Odoo Community Association (OCA)",
     "license": "AGPL-3",
diff --git a/base_user_role_company/models/ir_http.py b/base_user_role_company/models/ir_http.py
index 972e66a21..2bdbddbf8 100644
--- a/base_user_role_company/models/ir_http.py
+++ b/base_user_role_company/models/ir_http.py
@@ -18,6 +18,5 @@ def session_info(self):
         if self.env.user.role_line_ids:
             cids_str = request.httprequest.cookies.get("cids", str(self.env.company.id))
             cids = [int(cid) for cid in cids_str.split(",")]
-            # The first element of cids is the currently selected company
-            self.env.user.set_groups_from_roles(company_id=cids[0])
+            self.env.user.with_context(active_company_ids=cids).set_groups_from_roles()
         return result
diff --git a/base_user_role_company/models/user.py b/base_user_role_company/models/user.py
index 1a2f6296b..f050be474 100644
--- a/base_user_role_company/models/user.py
+++ b/base_user_role_company/models/user.py
@@ -21,15 +21,21 @@ def authenticate(cls, db, login, password, user_agent_env):
 
     def _get_enabled_roles(self):
         res = super()._get_enabled_roles()
-        # Enable only the Roles corresponing to the currently selected company
         if self.role_line_ids:
-            res = res.filtered(
-                lambda x: not x.company_id or x.company_id == self.env.company
-            )
+            active_roles = self.env["res.users.role.line"]
+            if self.env.context.get("active_company_ids"):
+                company_ids = self.env.context.get("active_company_ids")
+            else:
+                company_ids = self.company_id.ids
+            for role_line in self.role_line_ids:
+                if not role_line.company_id:
+                    active_roles |= role_line
+                elif role_line.company_id.id in company_ids:
+                    role_line_companies = self.role_line_ids.filtered(
+                        lambda x, rl=role_line: x.role_id == rl.role_id
+                        and x.company_id.id in company_ids
+                    )
+                    if len(role_line_companies) == len(company_ids):
+                        active_roles |= role_line
+            return active_roles
         return res
-
-    def set_groups_from_roles(self, force=False, company_id=False):
-        # When using the Company Switcher widget, the self.env.company is not yet set
-        if company_id:
-            self = self.with_company(company_id)
-        return super().set_groups_from_roles(force=force)
diff --git a/base_user_role_company/static/description/index.html b/base_user_role_company/static/description/index.html
index 6435a7556..89adabb23 100644
--- a/base_user_role_company/static/description/index.html
+++ b/base_user_role_company/static/description/index.html
@@ -366,7 +366,7 @@ <h1 class="title">User roles by company</h1>
 !! This file is generated by oca-gen-addon-readme !!
 !! changes will be overwritten.                   !!
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-!! source digest: sha256:f410f78e1dea8bfa8c874dff8407a15398a7e65dd94f41a61568afd5d859ea2b
+!! source digest: sha256:bda3edd68fb07a268d9aef2212886132194a6946ffb608f88d4a596c43db7cb5
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
 <p><a class="reference external image-reference" href="https://odoo-community.org/page/development-status"><img alt="Beta" src="https://img.shields.io/badge/maturity-Beta-yellow.png" /></a> <a class="reference external image-reference" href="http://www.gnu.org/licenses/agpl-3.0-standalone.html"><img alt="License: AGPL-3" src="https://img.shields.io/badge/licence-AGPL--3-blue.png" /></a> <a class="reference external image-reference" href="https://github.com/OCA/server-backend/tree/17.0/base_user_role_company"><img alt="OCA/server-backend" src="https://img.shields.io/badge/github-OCA%2Fserver--backend-lightgray.png?logo=github" /></a> <a class="reference external image-reference" href="https://translation.odoo-community.org/projects/server-backend-17-0/server-backend-17-0-base_user_role_company"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external image-reference" href="https://runboat.odoo-community.org/builds?repo=OCA/server-backend&amp;target_branch=17.0"><img alt="Try me on Runboat" src="https://img.shields.io/badge/runboat-Try%20me-875A7B.png" /></a></p>
 <p>Enable User Roles depending on the Companies selected.</p>
diff --git a/base_user_role_company/tests/test_role_per_company.py b/base_user_role_company/tests/test_role_per_company.py
index 9b1ac1fcc..98b0c50bb 100644
--- a/base_user_role_company/tests/test_role_per_company.py
+++ b/base_user_role_company/tests/test_role_per_company.py
@@ -45,14 +45,32 @@ def setUp(self):
 
     def test_110_company_1(self):
         "Company 1 selected: Roles A, B and C are enabled"
-        self.test_user.set_groups_from_roles(company_id=self.company1.id)
+        self.test_user.with_context(
+            active_company_ids=self.company1.ids
+        ).set_groups_from_roles()
         expected = self.groupA | self.groupB | self.groupC
         found = self.test_user.groups_id.filtered(lambda x: x in expected)
         self.assertEqual(expected, found)
 
     def test_120_company_2(self):
         "Company 2 selected: Roles A and C are enabled"
-        self.test_user.set_groups_from_roles(company_id=self.company2.id)
+        self.test_user.with_context(
+            active_company_ids=self.company2.ids
+        ).set_groups_from_roles()
+        enabled = self.test_user.groups_id
+        expected = self.groupA | self.groupC
+        found = enabled.filtered(lambda x: x in expected)
+        self.assertEqual(expected, found)
+
+        not_expected = self.groupB
+        found = enabled.filtered(lambda x: x in not_expected)
+        self.assertFalse(found)
+
+    def test_130_all_company(self):
+        "All Company selected: Roles A and C are enabled"
+        self.test_user.with_context(
+            active_company_ids=[self.company1.id, self.company2.id]
+        ).set_groups_from_roles()
         enabled = self.test_user.groups_id
         expected = self.groupA | self.groupC
         found = enabled.filtered(lambda x: x in expected)
diff --git a/base_user_role_company/views/role.xml b/base_user_role_company/views/role.xml
index 9cb06b7e9..0a0a22e3f 100644
--- a/base_user_role_company/views/role.xml
+++ b/base_user_role_company/views/role.xml
@@ -5,6 +5,9 @@
         <field name="model">res.users</field>
         <field name="inherit_id" ref="base_user_role.view_res_users_form_inherit" />
         <field name="arch" type="xml">
+            <field name="role_id" position="attributes">
+                <attribute name="domain">[]</attribute>
+            </field>
             <xpath
                 expr="//field[@name='role_line_ids']//field[@name='role_id']"
                 position="after"

From 9395d569542963e382c32ad8e5ac16db8ffe8a2e Mon Sep 17 00:00:00 2001
From: "Pedro M. Baeza" <pedro.baeza@tecnativa.com>
Date: Thu, 2 May 2024 15:52:04 +0200
Subject: [PATCH 33/45] [FIX] base_user_role_company: Line too long

---
 base_user_role_company/README.rst                    | 2 +-
 base_user_role_company/__manifest__.py               | 2 +-
 base_user_role_company/models/role.py                | 3 ++-
 base_user_role_company/static/description/index.html | 2 +-
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/base_user_role_company/README.rst b/base_user_role_company/README.rst
index 28feafe1a..7164c5859 100644
--- a/base_user_role_company/README.rst
+++ b/base_user_role_company/README.rst
@@ -7,7 +7,7 @@ User roles by company
    !! This file is generated by oca-gen-addon-readme !!
    !! changes will be overwritten.                   !!
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-   !! source digest: sha256:bda3edd68fb07a268d9aef2212886132194a6946ffb608f88d4a596c43db7cb5
+   !! source digest: sha256:3b8bc6ff8f0969332ac9de6043d82b9d25601b8efd62d8546e6a7c661e91036d
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
 .. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png
diff --git a/base_user_role_company/__manifest__.py b/base_user_role_company/__manifest__.py
index 6425f46d6..a192fcc08 100644
--- a/base_user_role_company/__manifest__.py
+++ b/base_user_role_company/__manifest__.py
@@ -3,7 +3,7 @@
 
 {
     "name": "User roles by company",
-    "version": "17.0.1.1.0",
+    "version": "17.0.1.1.1",
     "category": "Tools",
     "author": "Open Source Integrators, Odoo Community Association (OCA)",
     "license": "AGPL-3",
diff --git a/base_user_role_company/models/role.py b/base_user_role_company/models/role.py
index 4e03df169..06a8df328 100644
--- a/base_user_role_company/models/role.py
+++ b/base_user_role_company/models/role.py
@@ -27,7 +27,8 @@ def _check_company(self):
             ):
                 raise ValidationError(
                     _(
-                        'User "%(user)s" does not have access to the company "%(company)s"'
+                        'User "%(user)s" does not have access to the company '
+                        '"%(company)s"'
                     )
                     % {"user": record.user_id.name, "company": record.company_id.name}
                 )
diff --git a/base_user_role_company/static/description/index.html b/base_user_role_company/static/description/index.html
index 89adabb23..e1eb0cf40 100644
--- a/base_user_role_company/static/description/index.html
+++ b/base_user_role_company/static/description/index.html
@@ -366,7 +366,7 @@ <h1 class="title">User roles by company</h1>
 !! This file is generated by oca-gen-addon-readme !!
 !! changes will be overwritten.                   !!
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-!! source digest: sha256:bda3edd68fb07a268d9aef2212886132194a6946ffb608f88d4a596c43db7cb5
+!! source digest: sha256:3b8bc6ff8f0969332ac9de6043d82b9d25601b8efd62d8546e6a7c661e91036d
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
 <p><a class="reference external image-reference" href="https://odoo-community.org/page/development-status"><img alt="Beta" src="https://img.shields.io/badge/maturity-Beta-yellow.png" /></a> <a class="reference external image-reference" href="http://www.gnu.org/licenses/agpl-3.0-standalone.html"><img alt="License: AGPL-3" src="https://img.shields.io/badge/licence-AGPL--3-blue.png" /></a> <a class="reference external image-reference" href="https://github.com/OCA/server-backend/tree/17.0/base_user_role_company"><img alt="OCA/server-backend" src="https://img.shields.io/badge/github-OCA%2Fserver--backend-lightgray.png?logo=github" /></a> <a class="reference external image-reference" href="https://translation.odoo-community.org/projects/server-backend-17-0/server-backend-17-0-base_user_role_company"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external image-reference" href="https://runboat.odoo-community.org/builds?repo=OCA/server-backend&amp;target_branch=17.0"><img alt="Try me on Runboat" src="https://img.shields.io/badge/runboat-Try%20me-875A7B.png" /></a></p>
 <p>Enable User Roles depending on the Companies selected.</p>

From c6710173b73dbaa240c4d687d733113ef1ba080e Mon Sep 17 00:00:00 2001
From: Bert Van Groenendael <bert.vangroenendael@dynapps.be>
Date: Tue, 22 Oct 2024 15:58:05 +0200
Subject: [PATCH 34/45] [IMP] base_user_role_company: pre-commit stuff

---
 base_user_role_company/README.rst               | 10 +++++-----
 .../static/description/index.html               | 17 ++++++++++-------
 2 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/base_user_role_company/README.rst b/base_user_role_company/README.rst
index 7164c5859..f59ad0ce1 100644
--- a/base_user_role_company/README.rst
+++ b/base_user_role_company/README.rst
@@ -17,13 +17,13 @@ User roles by company
     :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html
     :alt: License: AGPL-3
 .. |badge3| image:: https://img.shields.io/badge/github-OCA%2Fserver--backend-lightgray.png?logo=github
-    :target: https://github.com/OCA/server-backend/tree/17.0/base_user_role_company
+    :target: https://github.com/OCA/server-backend/tree/18.0/base_user_role_company
     :alt: OCA/server-backend
 .. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png
-    :target: https://translation.odoo-community.org/projects/server-backend-17-0/server-backend-17-0-base_user_role_company
+    :target: https://translation.odoo-community.org/projects/server-backend-18-0/server-backend-18-0-base_user_role_company
     :alt: Translate me on Weblate
 .. |badge5| image:: https://img.shields.io/badge/runboat-Try%20me-875A7B.png
-    :target: https://runboat.odoo-community.org/builds?repo=OCA/server-backend&target_branch=17.0
+    :target: https://runboat.odoo-community.org/builds?repo=OCA/server-backend&target_branch=18.0
     :alt: Try me on Runboat
 
 |badge1| |badge2| |badge3| |badge4| |badge5|
@@ -88,7 +88,7 @@ Bug Tracker
 Bugs are tracked on `GitHub Issues <https://github.com/OCA/server-backend/issues>`_.
 In case of trouble, please check there if your issue has already been reported.
 If you spotted it first, help us to smash it by providing a detailed and welcomed
-`feedback <https://github.com/OCA/server-backend/issues/new?body=module:%20base_user_role_company%0Aversion:%2017.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**>`_.
+`feedback <https://github.com/OCA/server-backend/issues/new?body=module:%20base_user_role_company%0Aversion:%2018.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**>`_.
 
 Do not contact contributors directly about support or help with technical issues.
 
@@ -126,6 +126,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/server-backend <https://github.com/OCA/server-backend/tree/17.0/base_user_role_company>`_ project on GitHub.
+This module is part of the `OCA/server-backend <https://github.com/OCA/server-backend/tree/18.0/base_user_role_company>`_ project on GitHub.
 
 You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.
diff --git a/base_user_role_company/static/description/index.html b/base_user_role_company/static/description/index.html
index e1eb0cf40..f4b1b4fb6 100644
--- a/base_user_role_company/static/description/index.html
+++ b/base_user_role_company/static/description/index.html
@@ -8,10 +8,11 @@
 
 /*
 :Author: David Goodger (goodger@python.org)
-:Id: $Id: html4css1.css 8954 2022-01-20 10:10:25Z milde $
+:Id: $Id: html4css1.css 9511 2024-01-13 09:50:07Z milde $
 :Copyright: This stylesheet has been placed in the public domain.
 
 Default cascading style sheet for the HTML output of Docutils.
+Despite the name, some widely supported CSS2 features are used.
 
 See https://docutils.sourceforge.io/docs/howto/html-stylesheets.html for how to
 customize this style sheet.
@@ -274,7 +275,7 @@
   margin-left: 2em ;
   margin-right: 2em }
 
-pre.code .ln { color: grey; } /* line numbers */
+pre.code .ln { color: gray; } /* line numbers */
 pre.code, code { background-color: #eeeeee }
 pre.code .comment, code .comment { color: #5C6576 }
 pre.code .keyword, code .keyword { color: #3B0D06; font-weight: bold }
@@ -300,7 +301,7 @@
 span.pre {
   white-space: pre }
 
-span.problematic {
+span.problematic, pre.problematic {
   color: red }
 
 span.section-subtitle {
@@ -368,7 +369,7 @@ <h1 class="title">User roles by company</h1>
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 !! source digest: sha256:3b8bc6ff8f0969332ac9de6043d82b9d25601b8efd62d8546e6a7c661e91036d
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
-<p><a class="reference external image-reference" href="https://odoo-community.org/page/development-status"><img alt="Beta" src="https://img.shields.io/badge/maturity-Beta-yellow.png" /></a> <a class="reference external image-reference" href="http://www.gnu.org/licenses/agpl-3.0-standalone.html"><img alt="License: AGPL-3" src="https://img.shields.io/badge/licence-AGPL--3-blue.png" /></a> <a class="reference external image-reference" href="https://github.com/OCA/server-backend/tree/17.0/base_user_role_company"><img alt="OCA/server-backend" src="https://img.shields.io/badge/github-OCA%2Fserver--backend-lightgray.png?logo=github" /></a> <a class="reference external image-reference" href="https://translation.odoo-community.org/projects/server-backend-17-0/server-backend-17-0-base_user_role_company"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external image-reference" href="https://runboat.odoo-community.org/builds?repo=OCA/server-backend&amp;target_branch=17.0"><img alt="Try me on Runboat" src="https://img.shields.io/badge/runboat-Try%20me-875A7B.png" /></a></p>
+<p><a class="reference external image-reference" href="https://odoo-community.org/page/development-status"><img alt="Beta" src="https://img.shields.io/badge/maturity-Beta-yellow.png" /></a> <a class="reference external image-reference" href="http://www.gnu.org/licenses/agpl-3.0-standalone.html"><img alt="License: AGPL-3" src="https://img.shields.io/badge/licence-AGPL--3-blue.png" /></a> <a class="reference external image-reference" href="https://github.com/OCA/server-backend/tree/18.0/base_user_role_company"><img alt="OCA/server-backend" src="https://img.shields.io/badge/github-OCA%2Fserver--backend-lightgray.png?logo=github" /></a> <a class="reference external image-reference" href="https://translation.odoo-community.org/projects/server-backend-18-0/server-backend-18-0-base_user_role_company"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external image-reference" href="https://runboat.odoo-community.org/builds?repo=OCA/server-backend&amp;target_branch=18.0"><img alt="Try me on Runboat" src="https://img.shields.io/badge/runboat-Try%20me-875A7B.png" /></a></p>
 <p>Enable User Roles depending on the Companies selected.</p>
 <p>A company specific Role will only be enabled if it is set for <strong>all</strong>
 the currently selected companies.</p>
@@ -429,7 +430,7 @@ <h1><a class="toc-backref" href="#toc-entry-3">Bug Tracker</a></h1>
 <p>Bugs are tracked on <a class="reference external" href="https://github.com/OCA/server-backend/issues">GitHub Issues</a>.
 In case of trouble, please check there if your issue has already been reported.
 If you spotted it first, help us to smash it by providing a detailed and welcomed
-<a class="reference external" href="https://github.com/OCA/server-backend/issues/new?body=module:%20base_user_role_company%0Aversion:%2017.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**">feedback</a>.</p>
+<a class="reference external" href="https://github.com/OCA/server-backend/issues/new?body=module:%20base_user_role_company%0Aversion:%2018.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**">feedback</a>.</p>
 <p>Do not contact contributors directly about support or help with technical issues.</p>
 </div>
 <div class="section" id="credits">
@@ -460,11 +461,13 @@ <h2><a class="toc-backref" href="#toc-entry-6">Contributors</a></h2>
 <div class="section" id="maintainers">
 <h2><a class="toc-backref" href="#toc-entry-7">Maintainers</a></h2>
 <p>This module is maintained by the OCA.</p>
-<a class="reference external image-reference" href="https://odoo-community.org"><img alt="Odoo Community Association" src="https://odoo-community.org/logo.png" /></a>
+<a class="reference external image-reference" href="https://odoo-community.org">
+<img alt="Odoo Community Association" src="https://odoo-community.org/logo.png" />
+</a>
 <p>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.</p>
-<p>This module is part of the <a class="reference external" href="https://github.com/OCA/server-backend/tree/17.0/base_user_role_company">OCA/server-backend</a> project on GitHub.</p>
+<p>This module is part of the <a class="reference external" href="https://github.com/OCA/server-backend/tree/18.0/base_user_role_company">OCA/server-backend</a> project on GitHub.</p>
 <p>You are welcome to contribute. To learn how please visit <a class="reference external" href="https://odoo-community.org/page/Contribute">https://odoo-community.org/page/Contribute</a>.</p>
 </div>
 </div>

From 51ccaaa88cc97bec84505ff65a94e0c378aa87df Mon Sep 17 00:00:00 2001
From: Bert Van Groenendael <bert.vangroenendael@dynapps.be>
Date: Wed, 23 Oct 2024 10:12:01 +0200
Subject: [PATCH 35/45] [MIG] base_user_role_company: Migration to 18.0

---
 base_user_role_company/README.rst                    | 4 ++++
 base_user_role_company/__manifest__.py               | 2 +-
 base_user_role_company/models/ir_http.py             | 2 +-
 base_user_role_company/models/role.py                | 4 ++--
 base_user_role_company/models/user.py                | 8 ++++----
 base_user_role_company/readme/CONTRIBUTORS.md        | 4 ++++
 base_user_role_company/static/description/index.html | 6 ++++++
 base_user_role_company/views/role.xml                | 2 +-
 8 files changed, 23 insertions(+), 9 deletions(-)

diff --git a/base_user_role_company/README.rst b/base_user_role_company/README.rst
index f59ad0ce1..184839e31 100644
--- a/base_user_role_company/README.rst
+++ b/base_user_role_company/README.rst
@@ -113,6 +113,10 @@ Contributors
 
    -  Robin Conjour <rconjour@wesolved.com>
 
+`Dynapps <http://dynapps.eu>`__
+
+   -  Bert Van Groenendael <bert.vangroenendael@dynapps.eu>
+
 Maintainers
 -----------
 
diff --git a/base_user_role_company/__manifest__.py b/base_user_role_company/__manifest__.py
index a192fcc08..f2340b0d0 100644
--- a/base_user_role_company/__manifest__.py
+++ b/base_user_role_company/__manifest__.py
@@ -3,7 +3,7 @@
 
 {
     "name": "User roles by company",
-    "version": "17.0.1.1.1",
+    "version": "18.0.1.0.0",
     "category": "Tools",
     "author": "Open Source Integrators, Odoo Community Association (OCA)",
     "license": "AGPL-3",
diff --git a/base_user_role_company/models/ir_http.py b/base_user_role_company/models/ir_http.py
index 2bdbddbf8..a635453fa 100644
--- a/base_user_role_company/models/ir_http.py
+++ b/base_user_role_company/models/ir_http.py
@@ -17,6 +17,6 @@ def session_info(self):
         result = super().session_info()
         if self.env.user.role_line_ids:
             cids_str = request.httprequest.cookies.get("cids", str(self.env.company.id))
-            cids = [int(cid) for cid in cids_str.split(",")]
+            cids = [int(cid) for cid in cids_str.split("-")]
             self.env.user.with_context(active_company_ids=cids).set_groups_from_roles()
         return result
diff --git a/base_user_role_company/models/role.py b/base_user_role_company/models/role.py
index 06a8df328..3cadca8a0 100644
--- a/base_user_role_company/models/role.py
+++ b/base_user_role_company/models/role.py
@@ -1,7 +1,7 @@
 # Copyright (C) 2021 Open Source Integrators
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 
-from odoo import _, api, fields, models
+from odoo import api, fields, models
 from odoo.exceptions import ValidationError
 
 
@@ -26,7 +26,7 @@ def _check_company(self):
                 and record.company_id not in record.user_id.company_ids
             ):
                 raise ValidationError(
-                    _(
+                    self.env._(
                         'User "%(user)s" does not have access to the company '
                         '"%(company)s"'
                     )
diff --git a/base_user_role_company/models/user.py b/base_user_role_company/models/user.py
index f050be474..38a84af6d 100644
--- a/base_user_role_company/models/user.py
+++ b/base_user_role_company/models/user.py
@@ -8,16 +8,16 @@ class ResUsers(models.Model):
     _inherit = "res.users"
 
     @classmethod
-    def authenticate(cls, db, login, password, user_agent_env):
-        uid = super().authenticate(db, login, password, user_agent_env)
+    def authenticate(cls, db, credential, user_agent_env):
+        auth_info = super().authenticate(db, credential, user_agent_env)
         # On login, ensure the proper roles are applied
         # The last Role applied may not be the correct one,
         # sonce the new session current company can be different
         with cls.pool.cursor() as cr:
-            env = api.Environment(cr, uid, {})
+            env = api.Environment(cr, auth_info["uid"], {})
             if env.user.role_line_ids:
                 env.user.set_groups_from_roles()
-        return uid
+        return auth_info
 
     def _get_enabled_roles(self):
         res = super()._get_enabled_roles()
diff --git a/base_user_role_company/readme/CONTRIBUTORS.md b/base_user_role_company/readme/CONTRIBUTORS.md
index 8fa3c89a9..62de1987e 100644
--- a/base_user_role_company/readme/CONTRIBUTORS.md
+++ b/base_user_role_company/readme/CONTRIBUTORS.md
@@ -7,3 +7,7 @@
 [WeSolved](http://wesolved.com)
 
 > - Robin Conjour \<<rconjour@wesolved.com>\>
+
+[Dynapps](http://dynapps.eu)
+
+> - Bert Van Groenendael \<<bert.vangroenendael@dynapps.eu>\>
diff --git a/base_user_role_company/static/description/index.html b/base_user_role_company/static/description/index.html
index f4b1b4fb6..836d5dc80 100644
--- a/base_user_role_company/static/description/index.html
+++ b/base_user_role_company/static/description/index.html
@@ -457,6 +457,12 @@ <h2><a class="toc-backref" href="#toc-entry-6">Contributors</a></h2>
 <li>Robin Conjour &lt;<a class="reference external" href="mailto:rconjour&#64;wesolved.com">rconjour&#64;wesolved.com</a>&gt;</li>
 </ul>
 </blockquote>
+<p><a class="reference external" href="http://dynapps.eu">Dynapps</a></p>
+<blockquote>
+<ul class="simple">
+<li>Bert Van Groenendael &lt;<a class="reference external" href="mailto:bert.vangroenendael&#64;dynapps.eu">bert.vangroenendael&#64;dynapps.eu</a>&gt;</li>
+</ul>
+</blockquote>
 </div>
 <div class="section" id="maintainers">
 <h2><a class="toc-backref" href="#toc-entry-7">Maintainers</a></h2>
diff --git a/base_user_role_company/views/role.xml b/base_user_role_company/views/role.xml
index 0a0a22e3f..c55748426 100644
--- a/base_user_role_company/views/role.xml
+++ b/base_user_role_company/views/role.xml
@@ -12,7 +12,7 @@
                 expr="//field[@name='role_line_ids']//field[@name='role_id']"
                 position="after"
             >
-                <field name="allowed_company_ids" invisible="1" />
+                <field name="allowed_company_ids" column_invisible="1" />
                 <field name="company_id" groups="base.group_multi_company" />
             </xpath>
         </field>

From 51393c47e84d99f6cdfe7bd327869a361e50bd63 Mon Sep 17 00:00:00 2001
From: oca-ci <oca-ci@odoo-community.org>
Date: Fri, 28 Feb 2025 10:37:14 +0000
Subject: [PATCH 36/45] [UPD] Update base_user_role_company.pot

---
 base_user_role_company/i18n/base_user_role_company.pot | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/base_user_role_company/i18n/base_user_role_company.pot b/base_user_role_company/i18n/base_user_role_company.pot
index 828370c9a..8ff8a0392 100644
--- a/base_user_role_company/i18n/base_user_role_company.pot
+++ b/base_user_role_company/i18n/base_user_role_company.pot
@@ -4,7 +4,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 17.0\n"
+"Project-Id-Version: Odoo Server 18.0\n"
 "Report-Msgid-Bugs-To: \n"
 "Last-Translator: \n"
 "Language-Team: \n"
@@ -48,7 +48,6 @@ msgstr ""
 #. module: base_user_role_company
 #. odoo-python
 #: code:addons/base_user_role_company/models/role.py:0
-#, python-format
 msgid "User \"%(user)s\" does not have access to the company \"%(company)s\""
 msgstr ""
 

From 4c0ff4acb53e91f74f9fc33959c876f49d68b836 Mon Sep 17 00:00:00 2001
From: OCA-git-bot <oca-git-bot@odoo-community.org>
Date: Fri, 28 Feb 2025 10:38:54 +0000
Subject: [PATCH 37/45] [BOT] post-merge updates

---
 base_user_role_company/README.rst             | 34 +++++++++----------
 .../static/description/index.html             | 10 +++---
 2 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/base_user_role_company/README.rst b/base_user_role_company/README.rst
index 184839e31..b96b2d626 100644
--- a/base_user_role_company/README.rst
+++ b/base_user_role_company/README.rst
@@ -7,7 +7,7 @@ User roles by company
    !! This file is generated by oca-gen-addon-readme !!
    !! changes will be overwritten.                   !!
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-   !! source digest: sha256:3b8bc6ff8f0969332ac9de6043d82b9d25601b8efd62d8546e6a7c661e91036d
+   !! source digest: sha256:1aa712436ef7a83928100a1e88d3c598d69a61f61d9a93405cb66fff6c445daa
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
 .. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png
@@ -66,21 +66,21 @@ to all active companies will be activated.
 
 For example:
 
--  A "SALES PERSON" and a "SALES MANAGER" roles are created.
+- A "SALES PERSON" and a "SALES MANAGER" roles are created.
 
--  A user is assigned to the roles:
+- A user is assigned to the roles:
 
-   -  "SALES PERSON", with no specific company assigned (meaning all)
-   -  "SALES MANAGER" only to "My Company (Chicago)"
+  - "SALES PERSON", with no specific company assigned (meaning all)
+  - "SALES MANAGER" only to "My Company (Chicago)"
 
--  When selecting active companies from the UI widget:
+- When selecting active companies from the UI widget:
 
-   -  If only "My Company (San Francisco)" is active, "SALES PERSON"
-      will be active.
-   -  If only "My Company (Chicago)" is active, "SALES PERSON" and
-      "SALES MANAGER" will be active.
-   -  If both "My Company (San Francisco)" and "My Company (Chicago)" is
-      active, "SALES PERSON" will be active.
+  - If only "My Company (San Francisco)" is active, "SALES PERSON" will
+    be active.
+  - If only "My Company (Chicago)" is active, "SALES PERSON" and "SALES
+    MANAGER" will be active.
+  - If both "My Company (San Francisco)" and "My Company (Chicago)" is
+    active, "SALES PERSON" will be active.
 
 Bug Tracker
 ===========
@@ -105,17 +105,17 @@ Contributors
 
 `Open Source Integrators <http://opensourceintegrators.com>`__
 
-   -  Daniel Reis <dreis@opensourceintegrators.com>
-   -  Chandresh Thakkar <cthakkr@opensourceintegrators.com>
-   -  Urvisha Desai <udesai@opensourceintegrators.com>
+   - Daniel Reis <dreis@opensourceintegrators.com>
+   - Chandresh Thakkar <cthakkr@opensourceintegrators.com>
+   - Urvisha Desai <udesai@opensourceintegrators.com>
 
 `WeSolved <http://wesolved.com>`__
 
-   -  Robin Conjour <rconjour@wesolved.com>
+   - Robin Conjour <rconjour@wesolved.com>
 
 `Dynapps <http://dynapps.eu>`__
 
-   -  Bert Van Groenendael <bert.vangroenendael@dynapps.eu>
+   - Bert Van Groenendael <bert.vangroenendael@dynapps.eu>
 
 Maintainers
 -----------
diff --git a/base_user_role_company/static/description/index.html b/base_user_role_company/static/description/index.html
index 836d5dc80..b239da977 100644
--- a/base_user_role_company/static/description/index.html
+++ b/base_user_role_company/static/description/index.html
@@ -367,7 +367,7 @@ <h1 class="title">User roles by company</h1>
 !! This file is generated by oca-gen-addon-readme !!
 !! changes will be overwritten.                   !!
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-!! source digest: sha256:3b8bc6ff8f0969332ac9de6043d82b9d25601b8efd62d8546e6a7c661e91036d
+!! source digest: sha256:1aa712436ef7a83928100a1e88d3c598d69a61f61d9a93405cb66fff6c445daa
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
 <p><a class="reference external image-reference" href="https://odoo-community.org/page/development-status"><img alt="Beta" src="https://img.shields.io/badge/maturity-Beta-yellow.png" /></a> <a class="reference external image-reference" href="http://www.gnu.org/licenses/agpl-3.0-standalone.html"><img alt="License: AGPL-3" src="https://img.shields.io/badge/licence-AGPL--3-blue.png" /></a> <a class="reference external image-reference" href="https://github.com/OCA/server-backend/tree/18.0/base_user_role_company"><img alt="OCA/server-backend" src="https://img.shields.io/badge/github-OCA%2Fserver--backend-lightgray.png?logo=github" /></a> <a class="reference external image-reference" href="https://translation.odoo-community.org/projects/server-backend-18-0/server-backend-18-0-base_user_role_company"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external image-reference" href="https://runboat.odoo-community.org/builds?repo=OCA/server-backend&amp;target_branch=18.0"><img alt="Try me on Runboat" src="https://img.shields.io/badge/runboat-Try%20me-875A7B.png" /></a></p>
 <p>Enable User Roles depending on the Companies selected.</p>
@@ -415,10 +415,10 @@ <h1><a class="toc-backref" href="#toc-entry-2">Usage</a></h1>
 </ul>
 </li>
 <li>When selecting active companies from the UI widget:<ul>
-<li>If only “My Company (San Francisco)” is active, “SALES PERSON”
-will be active.</li>
-<li>If only “My Company (Chicago)” is active, “SALES PERSON” and
-“SALES MANAGER” will be active.</li>
+<li>If only “My Company (San Francisco)” is active, “SALES PERSON” will
+be active.</li>
+<li>If only “My Company (Chicago)” is active, “SALES PERSON” and “SALES
+MANAGER” will be active.</li>
 <li>If both “My Company (San Francisco)” and “My Company (Chicago)” is
 active, “SALES PERSON” will be active.</li>
 </ul>

From 5c5ba5b2f05c3533767ff36d0cfae107d5ae00b0 Mon Sep 17 00:00:00 2001
From: Weblate <noreply@weblate.org>
Date: Fri, 28 Feb 2025 11:53:29 +0000
Subject: [PATCH 38/45] Update translation files

Updated by "Update PO files to match POT (msgmerge)" hook in Weblate.

Translation: server-backend-18.0/server-backend-18.0-base_user_role_company
Translate-URL: https://translation.odoo-community.org/projects/server-backend-18-0/server-backend-18-0-base_user_role_company/
---
 base_user_role_company/i18n/es.po | 1 -
 base_user_role_company/i18n/it.po | 1 -
 base_user_role_company/i18n/pt.po | 1 -
 3 files changed, 3 deletions(-)

diff --git a/base_user_role_company/i18n/es.po b/base_user_role_company/i18n/es.po
index 449ba51ab..c4964b6d7 100644
--- a/base_user_role_company/i18n/es.po
+++ b/base_user_role_company/i18n/es.po
@@ -53,7 +53,6 @@ msgstr "Usuario"
 #. module: base_user_role_company
 #. odoo-python
 #: code:addons/base_user_role_company/models/role.py:0
-#, python-format
 msgid "User \"%(user)s\" does not have access to the company \"%(company)s\""
 msgstr "El usuario \"%(user)s\" no tiene acceso a la empresa \"%(company)s\""
 
diff --git a/base_user_role_company/i18n/it.po b/base_user_role_company/i18n/it.po
index 26a5fcfba..7dbeca9b2 100644
--- a/base_user_role_company/i18n/it.po
+++ b/base_user_role_company/i18n/it.po
@@ -53,7 +53,6 @@ msgstr "Utente"
 #. module: base_user_role_company
 #. odoo-python
 #: code:addons/base_user_role_company/models/role.py:0
-#, python-format
 msgid "User \"%(user)s\" does not have access to the company \"%(company)s\""
 msgstr "L'utente \"%(user)s\" non ha accesso all'azienda \"%(company)s\""
 
diff --git a/base_user_role_company/i18n/pt.po b/base_user_role_company/i18n/pt.po
index f0761ca21..ab10fd6c0 100644
--- a/base_user_role_company/i18n/pt.po
+++ b/base_user_role_company/i18n/pt.po
@@ -53,7 +53,6 @@ msgstr "Utilizador"
 #. module: base_user_role_company
 #. odoo-python
 #: code:addons/base_user_role_company/models/role.py:0
-#, python-format
 msgid "User \"%(user)s\" does not have access to the company \"%(company)s\""
 msgstr ""
 

From d2254c9b2a7b0dca019c7208eeccb3ff8cf08291 Mon Sep 17 00:00:00 2001
From: "tom.vermeeren" <tom.vermeeren@dynapps.be>
Date: Tue, 6 May 2025 13:21:59 +0200
Subject: [PATCH 39/45] [FIX] base_user_role_company: Roles are filtered so
 none which exceed date_to are used

---
 base_user_role_company/models/user.py         |  2 +-
 base_user_role_company/tests/__init__.py      |  1 +
 .../tests/test_use_only_enabled_roles.py      | 62 +++++++++++++++++++
 3 files changed, 64 insertions(+), 1 deletion(-)
 create mode 100644 base_user_role_company/tests/test_use_only_enabled_roles.py

diff --git a/base_user_role_company/models/user.py b/base_user_role_company/models/user.py
index 38a84af6d..368b2ba26 100644
--- a/base_user_role_company/models/user.py
+++ b/base_user_role_company/models/user.py
@@ -27,7 +27,7 @@ def _get_enabled_roles(self):
                 company_ids = self.env.context.get("active_company_ids")
             else:
                 company_ids = self.company_id.ids
-            for role_line in self.role_line_ids:
+            for role_line in res:
                 if not role_line.company_id:
                     active_roles |= role_line
                 elif role_line.company_id.id in company_ids:
diff --git a/base_user_role_company/tests/__init__.py b/base_user_role_company/tests/__init__.py
index cd7f7833f..7ddf192b2 100644
--- a/base_user_role_company/tests/__init__.py
+++ b/base_user_role_company/tests/__init__.py
@@ -1 +1,2 @@
 from . import test_role_per_company
+from . import test_use_only_enabled_roles
diff --git a/base_user_role_company/tests/test_use_only_enabled_roles.py b/base_user_role_company/tests/test_use_only_enabled_roles.py
new file mode 100644
index 000000000..4b95e455a
--- /dev/null
+++ b/base_user_role_company/tests/test_use_only_enabled_roles.py
@@ -0,0 +1,62 @@
+# Copyright 2021 Open Source Integrators
+# License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl).
+from datetime import timedelta
+
+from odoo import fields
+from odoo.tests.common import TransactionCase
+
+
+class TestUserRoleCompany(TransactionCase):
+    @classmethod
+    def setUpClass(cls):
+        super().setUpClass()
+        cls.company1 = cls.env.ref("base.main_company")
+        # GROUPS for roles
+        cls.groupA = cls.env.ref("base.group_user")
+        cls.groupB = cls.env.ref("base.group_system")
+        # ROLES
+        cls.Role = cls.env["res.users.role"]
+        cls.roleA = cls.Role.create({"name": "Role internal user"})
+        cls.roleA.implied_ids |= cls.groupA
+        cls.roleB = cls.Role.create({"name": "Role system user"})
+        # USER with roles
+        cls.roleB.implied_ids |= cls.groupB
+        cls.User = cls.env["res.users"]
+        user_vals = {
+            "name": "Role test user",
+            "login": "role_test_user",
+            "company_ids": [(fields.Command.set([cls.company1.id]))],
+            "role_line_ids": [
+                (fields.Command.create({"role_id": cls.roleA.id})),
+                (
+                    fields.Command.create(
+                        {
+                            "role_id": cls.roleB.id,
+                            "date_to": fields.Date.today() + timedelta(days=1),
+                        }
+                    )
+                ),
+            ],
+        }
+        cls.test_user = cls.User.create(user_vals)
+
+    def test_110_enabled_role_is_used(self):
+        # User should be in group A and B because date_to is in the future
+        self.test_user.with_context(
+            active_company_ids=self.company1.ids
+        ).set_groups_from_roles()
+        expected = self.groupA | self.groupB
+        found = self.test_user.groups_id.filtered(lambda x: x in expected)
+        self.assertEqual(expected, found)
+
+    def test_120_disabled_role_is_not_used(self):
+        # User should not be in group B because date_to is in the past
+        self.test_user.role_line_ids.filtered(
+            lambda x: x.role_id == self.roleB
+        ).date_to = fields.Date.today() - timedelta(days=1)
+        self.test_user.with_context(
+            active_company_ids=self.company1.ids
+        ).set_groups_from_roles()
+        expected = self.groupA
+        found = self.test_user.groups_id.filtered(lambda x: x in expected)
+        self.assertEqual(expected, found)

From e7d558db1e5712f5d98f0cb1d7f0ac1aca787cb2 Mon Sep 17 00:00:00 2001
From: Sylvain LE GAL <sylvain.legal@grap.coop>
Date: Tue, 13 May 2025 21:24:59 +0200
Subject: [PATCH 40/45] [FIX] base_user_role_company: Do not auto install this
 module.

the _company module is an extra module used in a multi company context (and only in some situation). It is totally useless in mono company. As 2 modules exists, it doesn't makes sense to make the second auto_installable
---
 base_user_role_company/__manifest__.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/base_user_role_company/__manifest__.py b/base_user_role_company/__manifest__.py
index f2340b0d0..6883e3440 100644
--- a/base_user_role_company/__manifest__.py
+++ b/base_user_role_company/__manifest__.py
@@ -14,7 +14,6 @@
         "views/user.xml",
     ],
     "installable": True,
-    "auto_install": True,
     "maintainer": "dreispt",
     "development_status": "Beta",
 }

From c5f510ceb53183fec8f39818cf0d10b279889b6c Mon Sep 17 00:00:00 2001
From: OCA-git-bot <oca-git-bot@odoo-community.org>
Date: Tue, 13 May 2025 19:27:13 +0000
Subject: [PATCH 41/45] [BOT] post-merge updates

---
 base_user_role_company/README.rst                    | 2 +-
 base_user_role_company/__manifest__.py               | 2 +-
 base_user_role_company/static/description/index.html | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/base_user_role_company/README.rst b/base_user_role_company/README.rst
index b96b2d626..7a9514334 100644
--- a/base_user_role_company/README.rst
+++ b/base_user_role_company/README.rst
@@ -7,7 +7,7 @@ User roles by company
    !! This file is generated by oca-gen-addon-readme !!
    !! changes will be overwritten.                   !!
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-   !! source digest: sha256:1aa712436ef7a83928100a1e88d3c598d69a61f61d9a93405cb66fff6c445daa
+   !! source digest: sha256:d90e7b9416c2e2d894cb106b436d3d8efe090f9c77ff78f5bb3958e0e2075887
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
 .. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png
diff --git a/base_user_role_company/__manifest__.py b/base_user_role_company/__manifest__.py
index 6883e3440..3a0cfcc93 100644
--- a/base_user_role_company/__manifest__.py
+++ b/base_user_role_company/__manifest__.py
@@ -3,7 +3,7 @@
 
 {
     "name": "User roles by company",
-    "version": "18.0.1.0.0",
+    "version": "18.0.1.0.1",
     "category": "Tools",
     "author": "Open Source Integrators, Odoo Community Association (OCA)",
     "license": "AGPL-3",
diff --git a/base_user_role_company/static/description/index.html b/base_user_role_company/static/description/index.html
index b239da977..24be0defe 100644
--- a/base_user_role_company/static/description/index.html
+++ b/base_user_role_company/static/description/index.html
@@ -367,7 +367,7 @@ <h1 class="title">User roles by company</h1>
 !! This file is generated by oca-gen-addon-readme !!
 !! changes will be overwritten.                   !!
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-!! source digest: sha256:1aa712436ef7a83928100a1e88d3c598d69a61f61d9a93405cb66fff6c445daa
+!! source digest: sha256:d90e7b9416c2e2d894cb106b436d3d8efe090f9c77ff78f5bb3958e0e2075887
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
 <p><a class="reference external image-reference" href="https://odoo-community.org/page/development-status"><img alt="Beta" src="https://img.shields.io/badge/maturity-Beta-yellow.png" /></a> <a class="reference external image-reference" href="http://www.gnu.org/licenses/agpl-3.0-standalone.html"><img alt="License: AGPL-3" src="https://img.shields.io/badge/licence-AGPL--3-blue.png" /></a> <a class="reference external image-reference" href="https://github.com/OCA/server-backend/tree/18.0/base_user_role_company"><img alt="OCA/server-backend" src="https://img.shields.io/badge/github-OCA%2Fserver--backend-lightgray.png?logo=github" /></a> <a class="reference external image-reference" href="https://translation.odoo-community.org/projects/server-backend-18-0/server-backend-18-0-base_user_role_company"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external image-reference" href="https://runboat.odoo-community.org/builds?repo=OCA/server-backend&amp;target_branch=18.0"><img alt="Try me on Runboat" src="https://img.shields.io/badge/runboat-Try%20me-875A7B.png" /></a></p>
 <p>Enable User Roles depending on the Companies selected.</p>

From d412d13a3a6ce60d6b61e145807fef12e59b214e Mon Sep 17 00:00:00 2001
From: OCA-git-bot <oca-git-bot@odoo-community.org>
Date: Sun, 18 May 2025 18:30:49 +0000
Subject: [PATCH 42/45] [BOT] post-merge updates

---
 base_user_role_company/README.rst                    | 2 +-
 base_user_role_company/__manifest__.py               | 2 +-
 base_user_role_company/static/description/index.html | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/base_user_role_company/README.rst b/base_user_role_company/README.rst
index 7a9514334..371a3955a 100644
--- a/base_user_role_company/README.rst
+++ b/base_user_role_company/README.rst
@@ -7,7 +7,7 @@ User roles by company
    !! This file is generated by oca-gen-addon-readme !!
    !! changes will be overwritten.                   !!
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-   !! source digest: sha256:d90e7b9416c2e2d894cb106b436d3d8efe090f9c77ff78f5bb3958e0e2075887
+   !! source digest: sha256:22170e229c468ec41046141f10de50f397080458a7de6004f4a453721c02ca2f
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
 .. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png
diff --git a/base_user_role_company/__manifest__.py b/base_user_role_company/__manifest__.py
index 3a0cfcc93..11b6db480 100644
--- a/base_user_role_company/__manifest__.py
+++ b/base_user_role_company/__manifest__.py
@@ -3,7 +3,7 @@
 
 {
     "name": "User roles by company",
-    "version": "18.0.1.0.1",
+    "version": "18.0.1.0.2",
     "category": "Tools",
     "author": "Open Source Integrators, Odoo Community Association (OCA)",
     "license": "AGPL-3",
diff --git a/base_user_role_company/static/description/index.html b/base_user_role_company/static/description/index.html
index 24be0defe..801191b24 100644
--- a/base_user_role_company/static/description/index.html
+++ b/base_user_role_company/static/description/index.html
@@ -367,7 +367,7 @@ <h1 class="title">User roles by company</h1>
 !! This file is generated by oca-gen-addon-readme !!
 !! changes will be overwritten.                   !!
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-!! source digest: sha256:d90e7b9416c2e2d894cb106b436d3d8efe090f9c77ff78f5bb3958e0e2075887
+!! source digest: sha256:22170e229c468ec41046141f10de50f397080458a7de6004f4a453721c02ca2f
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
 <p><a class="reference external image-reference" href="https://odoo-community.org/page/development-status"><img alt="Beta" src="https://img.shields.io/badge/maturity-Beta-yellow.png" /></a> <a class="reference external image-reference" href="http://www.gnu.org/licenses/agpl-3.0-standalone.html"><img alt="License: AGPL-3" src="https://img.shields.io/badge/licence-AGPL--3-blue.png" /></a> <a class="reference external image-reference" href="https://github.com/OCA/server-backend/tree/18.0/base_user_role_company"><img alt="OCA/server-backend" src="https://img.shields.io/badge/github-OCA%2Fserver--backend-lightgray.png?logo=github" /></a> <a class="reference external image-reference" href="https://translation.odoo-community.org/projects/server-backend-18-0/server-backend-18-0-base_user_role_company"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external image-reference" href="https://runboat.odoo-community.org/builds?repo=OCA/server-backend&amp;target_branch=18.0"><img alt="Try me on Runboat" src="https://img.shields.io/badge/runboat-Try%20me-875A7B.png" /></a></p>
 <p>Enable User Roles depending on the Companies selected.</p>

From e58ebc8abdfbb17afc32e0de47c5358d7467ac91 Mon Sep 17 00:00:00 2001
From: Milan Topuzov <milan.topuzov@salewise.io>
Date: Thu, 9 Oct 2025 13:51:50 +0200
Subject: [PATCH 43/45] [MIG] base_user_role_company: Migration to 19.0 (bump
 version to 19.0.1.0.0)

---
 base_user_role_company/__manifest__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/base_user_role_company/__manifest__.py b/base_user_role_company/__manifest__.py
index 11b6db480..6a1ad2700 100644
--- a/base_user_role_company/__manifest__.py
+++ b/base_user_role_company/__manifest__.py
@@ -3,7 +3,7 @@
 
 {
     "name": "User roles by company",
-    "version": "18.0.1.0.2",
+    "version": "19.0.1.0.0",
     "category": "Tools",
     "author": "Open Source Integrators, Odoo Community Association (OCA)",
     "license": "AGPL-3",

From 71b8f4730439d3bf312478878203511e2595412d Mon Sep 17 00:00:00 2001
From: Milan Topuzov <milan.topuzov@salewise.io>
Date: Thu, 9 Oct 2025 13:57:33 +0200
Subject: [PATCH 44/45] [IMP] pre-commit auto-fixes

---
 base_user_role_company/README.rst             | 48 ++++++++++---------
 .../static/description/index.html             | 40 +++++++++-------
 2 files changed, 49 insertions(+), 39 deletions(-)

diff --git a/base_user_role_company/README.rst b/base_user_role_company/README.rst
index 371a3955a..3bbeeabc9 100644
--- a/base_user_role_company/README.rst
+++ b/base_user_role_company/README.rst
@@ -1,3 +1,7 @@
+.. image:: https://odoo-community.org/readme-banner-image
+   :target: https://odoo-community.org/get-involved?utm_source=readme
+   :alt: Odoo Community Association
+
 =====================
 User roles by company
 =====================
@@ -13,17 +17,17 @@ User roles by company
 .. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png
     :target: https://odoo-community.org/page/development-status
     :alt: Beta
-.. |badge2| image:: https://img.shields.io/badge/licence-AGPL--3-blue.png
+.. |badge2| image:: https://img.shields.io/badge/license-AGPL--3-blue.png
     :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html
     :alt: License: AGPL-3
 .. |badge3| image:: https://img.shields.io/badge/github-OCA%2Fserver--backend-lightgray.png?logo=github
-    :target: https://github.com/OCA/server-backend/tree/18.0/base_user_role_company
+    :target: https://github.com/OCA/server-backend/tree/19.0/base_user_role_company
     :alt: OCA/server-backend
 .. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png
-    :target: https://translation.odoo-community.org/projects/server-backend-18-0/server-backend-18-0-base_user_role_company
+    :target: https://translation.odoo-community.org/projects/server-backend-19-0/server-backend-19-0-base_user_role_company
     :alt: Translate me on Weblate
 .. |badge5| image:: https://img.shields.io/badge/runboat-Try%20me-875A7B.png
-    :target: https://runboat.odoo-community.org/builds?repo=OCA/server-backend&target_branch=18.0
+    :target: https://runboat.odoo-community.org/builds?repo=OCA/server-backend&target_branch=19.0
     :alt: Try me on Runboat
 
 |badge1| |badge2| |badge3| |badge4| |badge5|
@@ -66,21 +70,21 @@ to all active companies will be activated.
 
 For example:
 
-- A "SALES PERSON" and a "SALES MANAGER" roles are created.
+-  A "SALES PERSON" and a "SALES MANAGER" roles are created.
 
-- A user is assigned to the roles:
+-  A user is assigned to the roles:
 
-  - "SALES PERSON", with no specific company assigned (meaning all)
-  - "SALES MANAGER" only to "My Company (Chicago)"
+   -  "SALES PERSON", with no specific company assigned (meaning all)
+   -  "SALES MANAGER" only to "My Company (Chicago)"
 
-- When selecting active companies from the UI widget:
+-  When selecting active companies from the UI widget:
 
-  - If only "My Company (San Francisco)" is active, "SALES PERSON" will
-    be active.
-  - If only "My Company (Chicago)" is active, "SALES PERSON" and "SALES
-    MANAGER" will be active.
-  - If both "My Company (San Francisco)" and "My Company (Chicago)" is
-    active, "SALES PERSON" will be active.
+   -  If only "My Company (San Francisco)" is active, "SALES PERSON"
+      will be active.
+   -  If only "My Company (Chicago)" is active, "SALES PERSON" and
+      "SALES MANAGER" will be active.
+   -  If both "My Company (San Francisco)" and "My Company (Chicago)" is
+      active, "SALES PERSON" will be active.
 
 Bug Tracker
 ===========
@@ -88,7 +92,7 @@ Bug Tracker
 Bugs are tracked on `GitHub Issues <https://github.com/OCA/server-backend/issues>`_.
 In case of trouble, please check there if your issue has already been reported.
 If you spotted it first, help us to smash it by providing a detailed and welcomed
-`feedback <https://github.com/OCA/server-backend/issues/new?body=module:%20base_user_role_company%0Aversion:%2018.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**>`_.
+`feedback <https://github.com/OCA/server-backend/issues/new?body=module:%20base_user_role_company%0Aversion:%2019.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**>`_.
 
 Do not contact contributors directly about support or help with technical issues.
 
@@ -105,17 +109,17 @@ Contributors
 
 `Open Source Integrators <http://opensourceintegrators.com>`__
 
-   - Daniel Reis <dreis@opensourceintegrators.com>
-   - Chandresh Thakkar <cthakkr@opensourceintegrators.com>
-   - Urvisha Desai <udesai@opensourceintegrators.com>
+   -  Daniel Reis <dreis@opensourceintegrators.com>
+   -  Chandresh Thakkar <cthakkr@opensourceintegrators.com>
+   -  Urvisha Desai <udesai@opensourceintegrators.com>
 
 `WeSolved <http://wesolved.com>`__
 
-   - Robin Conjour <rconjour@wesolved.com>
+   -  Robin Conjour <rconjour@wesolved.com>
 
 `Dynapps <http://dynapps.eu>`__
 
-   - Bert Van Groenendael <bert.vangroenendael@dynapps.eu>
+   -  Bert Van Groenendael <bert.vangroenendael@dynapps.eu>
 
 Maintainers
 -----------
@@ -130,6 +134,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/server-backend <https://github.com/OCA/server-backend/tree/18.0/base_user_role_company>`_ project on GitHub.
+This module is part of the `OCA/server-backend <https://github.com/OCA/server-backend/tree/19.0/base_user_role_company>`_ project on GitHub.
 
 You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.
diff --git a/base_user_role_company/static/description/index.html b/base_user_role_company/static/description/index.html
index 801191b24..7a8443e4d 100644
--- a/base_user_role_company/static/description/index.html
+++ b/base_user_role_company/static/description/index.html
@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 <meta name="generator" content="Docutils: https://docutils.sourceforge.io/" />
-<title>User roles by company</title>
+<title>README.rst</title>
 <style type="text/css">
 
 /*
@@ -360,16 +360,21 @@
 </style>
 </head>
 <body>
-<div class="document" id="user-roles-by-company">
-<h1 class="title">User roles by company</h1>
+<div class="document">
 
+
+<a class="reference external image-reference" href="https://odoo-community.org/get-involved?utm_source=readme">
+<img alt="Odoo Community Association" src="https://odoo-community.org/readme-banner-image" />
+</a>
+<div class="section" id="user-roles-by-company">
+<h1>User roles by company</h1>
 <!-- !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 !! This file is generated by oca-gen-addon-readme !!
 !! changes will be overwritten.                   !!
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 !! source digest: sha256:22170e229c468ec41046141f10de50f397080458a7de6004f4a453721c02ca2f
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
-<p><a class="reference external image-reference" href="https://odoo-community.org/page/development-status"><img alt="Beta" src="https://img.shields.io/badge/maturity-Beta-yellow.png" /></a> <a class="reference external image-reference" href="http://www.gnu.org/licenses/agpl-3.0-standalone.html"><img alt="License: AGPL-3" src="https://img.shields.io/badge/licence-AGPL--3-blue.png" /></a> <a class="reference external image-reference" href="https://github.com/OCA/server-backend/tree/18.0/base_user_role_company"><img alt="OCA/server-backend" src="https://img.shields.io/badge/github-OCA%2Fserver--backend-lightgray.png?logo=github" /></a> <a class="reference external image-reference" href="https://translation.odoo-community.org/projects/server-backend-18-0/server-backend-18-0-base_user_role_company"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external image-reference" href="https://runboat.odoo-community.org/builds?repo=OCA/server-backend&amp;target_branch=18.0"><img alt="Try me on Runboat" src="https://img.shields.io/badge/runboat-Try%20me-875A7B.png" /></a></p>
+<p><a class="reference external image-reference" href="https://odoo-community.org/page/development-status"><img alt="Beta" src="https://img.shields.io/badge/maturity-Beta-yellow.png" /></a> <a class="reference external image-reference" href="http://www.gnu.org/licenses/agpl-3.0-standalone.html"><img alt="License: AGPL-3" src="https://img.shields.io/badge/license-AGPL--3-blue.png" /></a> <a class="reference external image-reference" href="https://github.com/OCA/server-backend/tree/19.0/base_user_role_company"><img alt="OCA/server-backend" src="https://img.shields.io/badge/github-OCA%2Fserver--backend-lightgray.png?logo=github" /></a> <a class="reference external image-reference" href="https://translation.odoo-community.org/projects/server-backend-19-0/server-backend-19-0-base_user_role_company"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external image-reference" href="https://runboat.odoo-community.org/builds?repo=OCA/server-backend&amp;target_branch=19.0"><img alt="Try me on Runboat" src="https://img.shields.io/badge/runboat-Try%20me-875A7B.png" /></a></p>
 <p>Enable User Roles depending on the Companies selected.</p>
 <p>A company specific Role will only be enabled if it is set for <strong>all</strong>
 the currently selected companies.</p>
@@ -391,7 +396,7 @@ <h1 class="title">User roles by company</h1>
 </ul>
 </div>
 <div class="section" id="configuration">
-<h1><a class="toc-backref" href="#toc-entry-1">Configuration</a></h1>
+<h2><a class="toc-backref" href="#toc-entry-1">Configuration</a></h2>
 <p>Roles are set on the User form.</p>
 <p>The “Company” additional column allows to set a Role as only valid for
 specific companies.</p>
@@ -400,7 +405,7 @@ <h1><a class="toc-backref" href="#toc-entry-1">Configuration</a></h1>
 selection rules.</p>
 </div>
 <div class="section" id="usage">
-<h1><a class="toc-backref" href="#toc-entry-2">Usage</a></h1>
+<h2><a class="toc-backref" href="#toc-entry-2">Usage</a></h2>
 <p>Select the active companies from the web client widget, near the top
 right corner. When doing so, the User’s security Groups are recomputed,
 based on the Roles.</p>
@@ -415,10 +420,10 @@ <h1><a class="toc-backref" href="#toc-entry-2">Usage</a></h1>
 </ul>
 </li>
 <li>When selecting active companies from the UI widget:<ul>
-<li>If only “My Company (San Francisco)” is active, “SALES PERSON” will
-be active.</li>
-<li>If only “My Company (Chicago)” is active, “SALES PERSON” and “SALES
-MANAGER” will be active.</li>
+<li>If only “My Company (San Francisco)” is active, “SALES PERSON”
+will be active.</li>
+<li>If only “My Company (Chicago)” is active, “SALES PERSON” and
+“SALES MANAGER” will be active.</li>
 <li>If both “My Company (San Francisco)” and “My Company (Chicago)” is
 active, “SALES PERSON” will be active.</li>
 </ul>
@@ -426,23 +431,23 @@ <h1><a class="toc-backref" href="#toc-entry-2">Usage</a></h1>
 </ul>
 </div>
 <div class="section" id="bug-tracker">
-<h1><a class="toc-backref" href="#toc-entry-3">Bug Tracker</a></h1>
+<h2><a class="toc-backref" href="#toc-entry-3">Bug Tracker</a></h2>
 <p>Bugs are tracked on <a class="reference external" href="https://github.com/OCA/server-backend/issues">GitHub Issues</a>.
 In case of trouble, please check there if your issue has already been reported.
 If you spotted it first, help us to smash it by providing a detailed and welcomed
-<a class="reference external" href="https://github.com/OCA/server-backend/issues/new?body=module:%20base_user_role_company%0Aversion:%2018.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**">feedback</a>.</p>
+<a class="reference external" href="https://github.com/OCA/server-backend/issues/new?body=module:%20base_user_role_company%0Aversion:%2019.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**">feedback</a>.</p>
 <p>Do not contact contributors directly about support or help with technical issues.</p>
 </div>
 <div class="section" id="credits">
-<h1><a class="toc-backref" href="#toc-entry-4">Credits</a></h1>
+<h2><a class="toc-backref" href="#toc-entry-4">Credits</a></h2>
 <div class="section" id="authors">
-<h2><a class="toc-backref" href="#toc-entry-5">Authors</a></h2>
+<h3><a class="toc-backref" href="#toc-entry-5">Authors</a></h3>
 <ul class="simple">
 <li>Open Source Integrators</li>
 </ul>
 </div>
 <div class="section" id="contributors">
-<h2><a class="toc-backref" href="#toc-entry-6">Contributors</a></h2>
+<h3><a class="toc-backref" href="#toc-entry-6">Contributors</a></h3>
 <p><a class="reference external" href="http://opensourceintegrators.com">Open Source Integrators</a></p>
 <blockquote>
 <ul class="simple">
@@ -465,7 +470,7 @@ <h2><a class="toc-backref" href="#toc-entry-6">Contributors</a></h2>
 </blockquote>
 </div>
 <div class="section" id="maintainers">
-<h2><a class="toc-backref" href="#toc-entry-7">Maintainers</a></h2>
+<h3><a class="toc-backref" href="#toc-entry-7">Maintainers</a></h3>
 <p>This module is maintained by the OCA.</p>
 <a class="reference external image-reference" href="https://odoo-community.org">
 <img alt="Odoo Community Association" src="https://odoo-community.org/logo.png" />
@@ -473,10 +478,11 @@ <h2><a class="toc-backref" href="#toc-entry-7">Maintainers</a></h2>
 <p>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.</p>
-<p>This module is part of the <a class="reference external" href="https://github.com/OCA/server-backend/tree/18.0/base_user_role_company">OCA/server-backend</a> project on GitHub.</p>
+<p>This module is part of the <a class="reference external" href="https://github.com/OCA/server-backend/tree/19.0/base_user_role_company">OCA/server-backend</a> project on GitHub.</p>
 <p>You are welcome to contribute. To learn how please visit <a class="reference external" href="https://odoo-community.org/page/Contribute">https://odoo-community.org/page/Contribute</a>.</p>
 </div>
 </div>
 </div>
+</div>
 </body>
 </html>

From 0250393ea05d8934708c04cf697f1e5e23a926cf Mon Sep 17 00:00:00 2001
From: Milan Topuzov <milan.topuzov@salewise.io>
Date: Thu, 9 Oct 2025 14:00:09 +0200
Subject: [PATCH 45/45] [MIG] base_user_role_company: migrate to 19.0

- Replace groups_id with group_ids in views/actions
- Bump version to 19.0.1.0.0; adjust manifests/assets
- Use env attributes and Domain expressions
- Adopt new Constraint/Index APIs where applicable

Functional changes
---
 base_user_role_company/controllers/main.py    |  7 +++---
 base_user_role_company/models/ir_http.py      |  4 ++--
 base_user_role_company/models/role.py         | 18 +++++++--------
 base_user_role_company/models/user.py         | 23 +++++++++----------
 base_user_role_company/tests/__init__.py      |  1 +
 .../tests/test_load_menus.py                  | 14 +++++++++++
 .../tests/test_role_per_company.py            | 21 ++++++++++++++---
 .../tests/test_use_only_enabled_roles.py      |  4 ++--
 8 files changed, 61 insertions(+), 31 deletions(-)
 create mode 100644 base_user_role_company/tests/test_load_menus.py

diff --git a/base_user_role_company/controllers/main.py b/base_user_role_company/controllers/main.py
index 7e75d6954..b81f07643 100644
--- a/base_user_role_company/controllers/main.py
+++ b/base_user_role_company/controllers/main.py
@@ -8,9 +8,10 @@
 
 class HomeExtended(Home):
     @http.route()
-    def web_load_menus(self, unique):
-        response = super().web_load_menus(unique)
+    def web_load_menus(self, *args, **kwargs):
+        response = super().web_load_menus(*args, **kwargs)
         # On logout & re-login we could see wrong menus being rendered
         # To avoid this, menu http cache must be disabled
-        response.headers.remove("Cache-Control")
+        # Using .pop() as Werkzeug Headers no longer supports __delitem__ (del)
+        response.headers.pop("Cache-Control", None)
         return response
diff --git a/base_user_role_company/models/ir_http.py b/base_user_role_company/models/ir_http.py
index a635453fa..43c097290 100644
--- a/base_user_role_company/models/ir_http.py
+++ b/base_user_role_company/models/ir_http.py
@@ -8,13 +8,13 @@
 class IrHttp(models.AbstractModel):
     _inherit = "ir.http"
 
-    def session_info(self):
+    def session_info(self, *args, **kwargs):
         """
         Based on the selected companies (cids),
         calculate the roles to enable.
         A role should be enabled only when it applies to all selected companies.
         """
-        result = super().session_info()
+        result = super().session_info(*args, **kwargs)
         if self.env.user.role_line_ids:
             cids_str = request.httprequest.cookies.get("cids", str(self.env.company.id))
             cids = [int(cid) for cid in cids_str.split("-")]
diff --git a/base_user_role_company/models/role.py b/base_user_role_company/models/role.py
index 3cadca8a0..40b6ca895 100644
--- a/base_user_role_company/models/role.py
+++ b/base_user_role_company/models/role.py
@@ -28,15 +28,15 @@ def _check_company(self):
                 raise ValidationError(
                     self.env._(
                         'User "%(user)s" does not have access to the company '
-                        '"%(company)s"'
+                        '"%(company)s"',
+                        user=record.user_id.name,
+                        company=record.company_id.name,
                     )
-                    % {"user": record.user_id.name, "company": record.company_id.name}
                 )
 
-    _sql_constraints = [
-        (
-            "user_role_uniq",
-            "unique (user_id,role_id,company_id)",
-            "Roles can be assigned to a user only once at a time",
-        )
-    ]
+    # Override parent unique constraint to allow the same role multiple times
+    # for a user, provided company_id differs.
+    _user_role_uniq = models.Constraint(
+        "UNIQUE (user_id, role_id, company_id)",
+        "Roles can be assigned to a user only once at a time",
+    )
diff --git a/base_user_role_company/models/user.py b/base_user_role_company/models/user.py
index 368b2ba26..9b80ce522 100644
--- a/base_user_role_company/models/user.py
+++ b/base_user_role_company/models/user.py
@@ -7,20 +7,18 @@
 class ResUsers(models.Model):
     _inherit = "res.users"
 
-    @classmethod
-    def authenticate(cls, db, credential, user_agent_env):
-        auth_info = super().authenticate(db, credential, user_agent_env)
-        # On login, ensure the proper roles are applied
-        # The last Role applied may not be the correct one,
-        # sonce the new session current company can be different
-        with cls.pool.cursor() as cr:
-            env = api.Environment(cr, auth_info["uid"], {})
+    def authenticate(self, *args, **kwargs):
+        auth_info = super().authenticate(*args, **kwargs)
+        # Ensure proper roles are applied for the logged-in user
+        uid = auth_info.get("uid") if isinstance(auth_info, dict) else None
+        if uid:
+            env = api.Environment(self.env.cr, uid, {})
             if env.user.role_line_ids:
                 env.user.set_groups_from_roles()
         return auth_info
 
-    def _get_enabled_roles(self):
-        res = super()._get_enabled_roles()
+    def _get_enabled_roles(self, *args, **kwargs):
+        res = super()._get_enabled_roles(*args, **kwargs)
         if self.role_line_ids:
             active_roles = self.env["res.users.role.line"]
             if self.env.context.get("active_company_ids"):
@@ -32,8 +30,9 @@ def _get_enabled_roles(self):
                     active_roles |= role_line
                 elif role_line.company_id.id in company_ids:
                     role_line_companies = self.role_line_ids.filtered(
-                        lambda x, rl=role_line: x.role_id == rl.role_id
-                        and x.company_id.id in company_ids
+                        lambda x, rl=role_line: (
+                            x.role_id == rl.role_id and x.company_id.id in company_ids
+                        )
                     )
                     if len(role_line_companies) == len(company_ids):
                         active_roles |= role_line
diff --git a/base_user_role_company/tests/__init__.py b/base_user_role_company/tests/__init__.py
index 7ddf192b2..c92695ddb 100644
--- a/base_user_role_company/tests/__init__.py
+++ b/base_user_role_company/tests/__init__.py
@@ -1,2 +1,3 @@
 from . import test_role_per_company
 from . import test_use_only_enabled_roles
+from . import test_load_menus
diff --git a/base_user_role_company/tests/test_load_menus.py b/base_user_role_company/tests/test_load_menus.py
new file mode 100644
index 000000000..65232035c
--- /dev/null
+++ b/base_user_role_company/tests/test_load_menus.py
@@ -0,0 +1,14 @@
+# Copyright 2026 Open Source Integrators
+# License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl).
+
+from odoo.tests.common import HttpCase
+
+
+class LoadMenusTests(HttpCase):
+    def setUp(self):
+        super().setUp()
+        self.authenticate("admin", "admin")
+
+    def test_load_menus(self):
+        "Expect no errors on HomeExtended.web_load_menus controller"
+        self.url_open("/web/webclient/load_menus")
diff --git a/base_user_role_company/tests/test_role_per_company.py b/base_user_role_company/tests/test_role_per_company.py
index 98b0c50bb..ee7c26e09 100644
--- a/base_user_role_company/tests/test_role_per_company.py
+++ b/base_user_role_company/tests/test_role_per_company.py
@@ -1,6 +1,7 @@
 # Copyright 2021 Open Source Integrators
 # License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl).
 
+from odoo.exceptions import ValidationError
 from odoo.tests.common import TransactionCase
 
 
@@ -11,6 +12,7 @@ def setUp(self):
         self.Company = self.env["res.company"]
         self.company1 = self.env.ref("base.main_company")
         self.company2 = self.Company.create({"name": "company2"})
+        self.company3 = self.Company.create({"name": "company3"})
         # GROUPS for roles
         self.groupA = self.env.ref("base.group_user")
         self.groupB = self.env.ref("base.group_system")
@@ -49,7 +51,7 @@ def test_110_company_1(self):
             active_company_ids=self.company1.ids
         ).set_groups_from_roles()
         expected = self.groupA | self.groupB | self.groupC
-        found = self.test_user.groups_id.filtered(lambda x: x in expected)
+        found = self.test_user.group_ids.filtered(lambda x: x in expected)
         self.assertEqual(expected, found)
 
     def test_120_company_2(self):
@@ -57,7 +59,7 @@ def test_120_company_2(self):
         self.test_user.with_context(
             active_company_ids=self.company2.ids
         ).set_groups_from_roles()
-        enabled = self.test_user.groups_id
+        enabled = self.test_user.group_ids
         expected = self.groupA | self.groupC
         found = enabled.filtered(lambda x: x in expected)
         self.assertEqual(expected, found)
@@ -71,7 +73,7 @@ def test_130_all_company(self):
         self.test_user.with_context(
             active_company_ids=[self.company1.id, self.company2.id]
         ).set_groups_from_roles()
-        enabled = self.test_user.groups_id
+        enabled = self.test_user.group_ids
         expected = self.groupA | self.groupC
         found = enabled.filtered(lambda x: x in expected)
         self.assertEqual(expected, found)
@@ -79,3 +81,16 @@ def test_130_all_company(self):
         not_expected = self.groupB
         found = enabled.filtered(lambda x: x in not_expected)
         self.assertFalse(found)
+
+    def test_140_company_3(self):
+        "Company 3 selected: ValidationError"
+        user_vals = {
+            "name": "ROLES TEST USER 2",
+            "login": "test_user_2",
+            "company_ids": [(6, 0, [self.company1.id, self.company2.id])],
+            "role_line_ids": [
+                (0, 0, {"role_id": self.roleA.id, "company_id": self.company3.id}),
+            ],
+        }
+        with self.assertRaises(ValidationError):
+            self.User.create(user_vals)
diff --git a/base_user_role_company/tests/test_use_only_enabled_roles.py b/base_user_role_company/tests/test_use_only_enabled_roles.py
index 4b95e455a..98b62f9f2 100644
--- a/base_user_role_company/tests/test_use_only_enabled_roles.py
+++ b/base_user_role_company/tests/test_use_only_enabled_roles.py
@@ -46,7 +46,7 @@ def test_110_enabled_role_is_used(self):
             active_company_ids=self.company1.ids
         ).set_groups_from_roles()
         expected = self.groupA | self.groupB
-        found = self.test_user.groups_id.filtered(lambda x: x in expected)
+        found = self.test_user.group_ids.filtered(lambda x: x in expected)
         self.assertEqual(expected, found)
 
     def test_120_disabled_role_is_not_used(self):
@@ -58,5 +58,5 @@ def test_120_disabled_role_is_not_used(self):
             active_company_ids=self.company1.ids
         ).set_groups_from_roles()
         expected = self.groupA
-        found = self.test_user.groups_id.filtered(lambda x: x in expected)
+        found = self.test_user.group_ids.filtered(lambda x: x in expected)
         self.assertEqual(expected, found)