[IMP]:hr,hr_payroll:improved view

[odoo/odoo.git] / addons / hr / hr_view.xml

diff --git a/addons/hr/hr_view.xml b/addons/hr/hr_view.xml
index 13f1696..266ade6 100644 (file)
--- a/addons/hr/hr_view.xml
+++ b/addons/hr/hr_view.xml
@@ -30,10 +30,10 @@
                             <label for="name" class="oe_edit_only"/>
                             <h1>
                                 <field name="name" class="oe_inline"/>
-                                <label class="oe_inline" string="," attrs="{'invisible': [('company_id', '=', False)]}" groups="base.group_multi_company"/>
-                                <field class="oe_inline" name="company_id" groups="base.group_multi_company" on_change="onchange_company(company_id)"/>
-                                <label class="oe_inline" string="at" attrs="{'invisible': [('job_id', '=', False)]}"/>
+                                <label class="oe_inline" string="," attrs="{'invisible': [('job_id', '=', False)]}"/>
                                 <field class="oe_inline" name="job_id" domain="[('state','!=','old')]" context="{'form_view_ref': 'hr.view_hr_job_employee_form'}"/>
+                                <label class="oe_inline" string="at" attrs="{'invisible': [('company_id', '=', False)]}" groups="base.group_multi_company"/>
+                                <field class="oe_inline" name="company_id" groups="base.group_multi_company" on_change="onchange_company(company_id)"/>
                             </h1>
                             <label for="department_id" class="oe_edit_only"/>
                             <h2><field name="department_id" on_change="onchange_department_id(department_id)"/></h2>
@@ -366,7 +366,9 @@
                         <label for="name" class="oe_edit_only"/>
                         <h1>
                             <field name="name" class="oe_inline"/>
-                            (<field name="department_id" class="oe_inline"/>)
+                            <label class="oe_inline" string="(" attrs="{'invisible': [('department_id', '=', False)]}"/>
+                            <field name="department_id" class="oe_inline"/>
+                            <label class="oe_inline" string=")" attrs="{'invisible': [('department_id', '=', False)]}"/>
                         </h1>
                         <label for="employee_ids" class="oe_edit_only"/>
                         <h2>