OCA · jdidderen · Jan 31, 2025
diff --git a/base_user_role_company/README.rst b/base_user_role_company/README.rst
@@ -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,13 +105,13 @@ Contributors
 
 `Open Source Integrators <http://opensourceintegrators.com>`__
 
-   -  Daniel Reis <[email protected]>
-   -  Chandresh Thakkar <[email protected]>
-   -  Urvisha Desai <[email protected]>
+   - Daniel Reis <[email protected]>
+   - Chandresh Thakkar <[email protected]>
+   - Urvisha Desai <[email protected]>
 
 `WeSolved <http://wesolved.com>`__
 
-   -  Robin Conjour <[email protected]>
+   - Robin Conjour <[email protected]>
 
 Maintainers
 -----------

diff --git a/base_user_role_company/__manifest__.py b/base_user_role_company/__manifest__.py
@@ -10,8 +10,7 @@
     "website": "https://github.com/OCA/server-backend",
     "depends": ["base_user_role"],
     "data": [
-        "views/role.xml",
-        "views/user.xml",
+        "views/res_users_views.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
@@ -8,10 +8,11 @@
 
 /*
 :Author: David Goodger ([email protected])
-: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 {
@@ -414,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>
@@ -460,7 +461,9 @@ <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>

diff --git a/base_user_role_company/views/role.xml → ...er_role_company/views/res_users_views.xml b/base_user_role_company/views/role.xml → ...er_role_company/views/res_users_views.xml
@@ -6,13 +6,16 @@
         <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>
             <xpath
                 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>

diff --git a/base_user_role_company/views/user.xml b/base_user_role_company/views/user.xml