From 5060163ef28547074e8c8cb7d8bfbfcbb5c74672 Mon Sep 17 00:00:00 2001
From: dasz <dasz@odoo.com>
Date: Wed, 1 Feb 2023 09:23:22 +0000
Subject: [PATCH] [FIX] hr,base: fix layout of simple user form, access rights
 on create_employee

company_id is not in the group with phone, which makes it unaligned and weird looking, you can
see that especially when HR is installed and adds a boolean with a longer label.

this commit closes odoo/odoo#111567.
task 3127608

Signed-off-by: Kevin Baptiste <kba@odoo.com>
---
 addons/hr/views/res_users.xml              | 2 +-
 odoo/addons/base/views/res_users_views.xml | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/addons/hr/views/res_users.xml b/addons/hr/views/res_users.xml
index 2323cd6da1f..842c3760959 100644
--- a/addons/hr/views/res_users.xml
+++ b/addons/hr/views/res_users.xml
@@ -206,7 +206,7 @@
             <field name="arch" type="xml">
                 <xpath expr="//field[@name='mobile']" position="after">
                     <field name="create_employee_id" force_save="1" invisible="1"/>
-                    <field name="create_employee" force_save="1" string="Create Employee" invisible="not context.get('allow_create_employee', True)" attrs="{'invisible': [('create_employee_id', '>', 0)]}"/>
+                    <field name="create_employee" force_save="1" string="Create Employee" invisible="not context.get('allow_create_employee', True)" attrs="{'invisible': [('create_employee_id', '>', 0)]}" groups="hr.group_hr_user"/>
                 </xpath>
             </field>
         </record>
diff --git a/odoo/addons/base/views/res_users_views.xml b/odoo/addons/base/views/res_users_views.xml
index 0ba5eaca74b..b196173c367 100644
--- a/odoo/addons/base/views/res_users_views.xml
+++ b/odoo/addons/base/views/res_users_views.xml
@@ -203,10 +203,9 @@ if records:
                                 <field name="login"
                                         placeholder="e.g. email@yourcompany.com"/>
                             </h2>
-                            <label for="company_id" groups="base.group_multi_company"/>
-                            <field name="company_id" context="{'user_preference': 0}" groups="base.group_multi_company"/>
                         </div>
                         <group name="phone_numbers">
+                            <field name="company_id" context="{'user_preference': 0}" groups="base.group_multi_company"/>
                             <label for="groups_id" string="Access Rights"
                                     attrs="{'invisible': [('id', '>', 0)]}" groups="base.group_no_one"/>
                             <div attrs="{'invisible': [('id', '>', 0)]}" groups="base.group_no_one">