Merge pull request #2900 from expsa/Esraa-Ensan-hr-tasks

user login

odex25_hr/exp_payroll_custom/templates/report_payslip.xml

@@ -3,9 +3,9 @@
 
     <template id="report_payslip_inherit" inherit_id="exp_hr_payroll.report_payslip">
 
-        <xpath expr="//span[@t-field='o.employee_id.identification_id']" position="replace">
-            <span t-field="o.employee_id.identity_number"/>
-        </xpath>
+<!--        <xpath expr="//span[@t-field='o.employee_id.identification_id']" position="replace">-->
+<!--            <span t-field="o.employee_id.identity_number"/>-->
+<!--        </xpath>-->
         <xpath expr="//div/table[2]/tbody" position="inside">
             <tr>
                 <td colspan="2">

odex25_hr/hr_base/i18n/ar_001.po

@@ -4790,16 +4790,11 @@ msgstr "اختيار تسجيل الدخول بالايميل او رقم اله
 msgid "Login Option"
 msgstr "تسجيل الدخول الافتراضي"
 
-#. module: hr_base
-#: code:addons/hr_base/models/hr_base.py:0
-#, python-format
-msgid "Email Address"
-msgstr "عنوان البريد الإلكتروني"
-
 
 #. module: hr_base
-#: code:addons/hr_base/models/hr_base.py:0
-#, python-format
-msgid "Identity Number"
-msgstr "رقم الهوية"
+#: model_terms:ir.ui.view,arch_db:hr_base.view_users_simple_form_inherit_hr
+msgid "Login"
+msgstr "تسجيل الدخول"
+
+
 

odex25_hr/hr_base/models/hr_base.py

@@ -616,7 +616,6 @@ class HrEmployee(models.Model):
                 'default_phone': self.work_phone,
                 'default_mobile': self.mobile_phone,
                 'default_login': login,
-                # 'default_login_label': login_label,
 
             }
         }

odex25_hr/hr_base/models/res_users.py

@@ -7,7 +7,6 @@ class ResUsers(models.Model):
 
     create_employee = fields.Boolean(store=False, default=True, copy=False, string="Technical field, whether to create an employee")
     create_employee_id = fields.Many2one('hr.employee', store=False, copy=False, string="Technical field, bind user to this employee on create")
-    # login_label = fields.Char()
 
 
     @api.model_create_multi

odex25_hr/hr_base/views/hr_base_view.xml

@@ -468,19 +468,13 @@
         <field name="model">res.users</field>
         <field name="inherit_id" ref="base.view_users_simple_form"/>
         <field name="arch" type="xml">
-<!--            <xpath expr="//label[@for='login']" position="replace">-->
-<!--                &lt;!&ndash; Remove static label and show nothing &ndash;&gt;-->
-<!--            </xpath>-->
 
-<!--            <xpath expr="//field[@name='login']" position="before">-->
-<!--                <div class="o_form_label">-->
-<!--                    <strong>-->
-<!--                        <field name="login_label" readonly="1"/>-->
-<!--                    </strong>-->
-<!--                </div>-->
-<!--            </xpath>-->
+        <xpath expr="//label[@for='login']" position="attributes">
+            <attribute name="string">Login</attribute>
+        </xpath>
+
+
             <xpath expr="//field[@name='mobile']" position="after">
-<!--                <field name="login_label" invisible="1"/>-->
                 <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)]}"/>
             </xpath>