[IMP] form view

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

diff --git a/addons/hr/hr_view.xml b/addons/hr/hr_view.xml
index 44c65da..54ced53 100644 (file)
--- a/addons/hr/hr_view.xml
+++ b/addons/hr/hr_view.xml
@@ -21,9 +21,6 @@
                 <form string="Employee" version="7.0">
                     <sheet>
                         <field name="photo" widget='image' class="oe_right" on_change="onchange_photo(photo)"/>    
-                        <div class="oe_right oe_button_box" name="button_box">
-                            <!-- Put here related buttons -->
-                        </div>
                         <div class="oe_title">
                             <label for="name" class="oe_edit_only"/>
                             <h1>
@@ -38,6 +35,9 @@
                             <label for="category_ids" class="oe_edit_only"/>
                             <h3><field name="category_ids" widget="many2many_tags"/></h3>
                         </div>
+                        <div class="oe_right oe_button_box" name="button_box">
+                            <!-- Put here related buttons -->
+                        </div>
                         <group colspan="4" col="4">
                             <field name="work_email" widget="email" />
                             <field name="work_phone"/>
@@ -48,20 +48,18 @@
                             <page string="Information">
                                 <group>
                                     <group>
+                                        <field name="user_id" on_change="onchange_user(user_id)"/>
                                         <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">
-                                    <field name="user_id" on_change="onchange_user(user_id)"/>
-                                </group> -->
                                 </group>
                                 <field name="notes" placeholder="Other Information ..." colspan="4"/>
                             </page>
@@ -372,19 +370,15 @@
                             <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>
-                            <field name="employee_ids" widget="many2many_tags" mode="tree,form"/>
-                        </h2>
-                        <group col="4">
-                            <group>
-                                <field name="company_id" widget="selection" groups="base.group_multi_company"/>
-                            </group>
+                        <group>
                             <group>
                                 <field name="no_of_employee"/>
                                 <field name="expected_employees"/>
                                 <field name="no_of_recruitment" on_change="on_change_expected_employee(no_of_recruitment,no_of_employee)"/>
                             </group>
+                            <group>
+                                <field name="company_id" widget="selection" groups="base.group_multi_company"/>
+                            </group>
                         </group>
                         <notebook>
                             <page string="Description">