[MIG] base_user_role_company: Migration to 18.0

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
 -----------
 

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"'
                     )

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()

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>\>

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>

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" />
                 <field name="company_id" groups="base.group_multi_company" />
             </xpath>
         </field>