[MERGE]

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

diff --git a/addons/hr/hr_view.xml b/addons/hr/hr_view.xml
index 266ade6..6bd3de1 100644 (file)
--- a/addons/hr/hr_view.xml
+++ b/addons/hr/hr_view.xml
@@ -10,11 +10,7 @@
         <menuitem id="menu_hr_configuration" name="Configuration" parent="hr.menu_hr_root" groups="base.group_hr_manager" sequence="50"/>
         <menuitem id="menu_hr_management" name="Human Resources" parent="hr.menu_hr_configuration" sequence="25"/>
 
-        <!--
-        ==========
-        Employee
-        ==========
-        -->
+        <!--Employee form view -->
         <record id="view_employee_form" model="ir.ui.view">
             <field name="name">hr.employee.form</field>
             <field name="model">hr.employee</field>
@@ -48,15 +44,17 @@
                         </group>
                         <notebook>
                             <page string="Information">
-                                <group col="4">
-                                    <group string="Linked User">
+                                <group>
+                                    <group>
                                         <field name="parent_id" />
                                         <field name="coach_id"/>
                                     </group>
                                     <group>
-                                        <field name="identification_id" groups="base.group_hr_user"/>
+                                        <!--<field name="identification_id" groups="base.group_hr_user"/>-->
                                         <field name="passport_id" groups="base.group_hr_user"/>
                                         <field name="otherid" groups="base.group_hr_user"/>
+                                    </group>
+                                    <group name="active_group">
                                         <field name="active"/>
                                     </group>
                                 <!-- <group string="General">
@@ -98,7 +96,7 @@
                     <field name="department_id"/>
                     <field name="job_id"/>
                     <field name="parent_id"/>
-                    <field name="coach_id" invisible="1" />
+                    <field name="coach_id" invisible="1"/>
                 </tree>
             </field>
         </record>
@@ -246,7 +244,7 @@
                     <field name="company_id" groups="base.group_multi_company"/>
                     <field name="department_id"/>
                     <field name="job_id"/>
-                    <field name="coach_id" invisible="1" />
+                    <field name="coach_id" invisible="1"/>
                 </tree>
             </field>
         </record>
@@ -283,8 +281,8 @@
             <field name="arch" type="xml">
                 <form string="Employee Category" version="7.0">
                     <group>
-                        <field name="name" />
-                        <field name="parent_id" />
+                        <field name="name"/>
+                        <field name="parent_id"/>
                     </group>
                 </form>
             </field>
@@ -358,8 +356,10 @@
             <field name="arch" type="xml">
                 <form string="Job" version="7.0">
                     <header>
-                        <button name="job_recruitement" string="In Recruitement" states="open" type="object"/>
-                        <button name="job_open" string="Recruitment Done" states="recruit" type="object"/>
+                        <span groups="base.group_user">
+                            <button name="job_recruitement" string="In Recruitement" states="open" type="object"/>
+                            <button name="job_open" string="Recruitment Done" states="recruit" type="object"/>
+                        </span>
                         <field name="state" widget="statusbar" statusbar_visible="recruit,open"/>
                     </header>
                     <sheet>
@@ -375,10 +375,14 @@
                             <field name="employee_ids" widget="many2many_tags" mode="tree,form"/>
                         </h2>
                         <group col="4">
-                            <field name="company_id" widget="selection" groups="base.group_multi_company"/>
-                            <field name="no_of_recruitment" on_change="on_change_expected_employee(no_of_recruitment,no_of_employee)"/>
-                            <field name="no_of_employee"/>
-                            <field name="expected_employees"/>
+                            <group>
+                                <field name="company_id" widget="selection" groups="base.group_multi_company"/>
+                                <field name="no_of_employee"/>
+                                <field name="expected_employees"/>
+                            </group>
+                            <group>
+                                <field name="no_of_recruitment" on_change="on_change_expected_employee(no_of_recruitment,no_of_employee)"/>
+                            </group>
                         </group>
                         <notebook>
                             <page string="Description">
@@ -399,8 +403,8 @@
             <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="Job">
-                    <field name="name" />
-                    <field name="department_id" />
+                    <field name="name"/>
+                    <field name="department_id"/>
                     <field name="company_id" groups="base.group_multi_company"/>
                     <field name="expected_employees"/>
                     <field name="no_of_employee"/>
@@ -444,8 +448,8 @@
             <field name="arch" type="xml">
                 <form string="Job" version="7.0">
                     <group col="4">
-                        <field name="name" />
-                        <field name="department_id" />
+                        <field name="name"/>
+                        <field name="department_id"/>
                     </group>
                     <label for="description"/>
                     <field name="description"/>