[CLEAN] hr: cleaned job form view, removing unnecessary groups, also changed

displayed number of employees (display current number + expected, not the
contraty). Updated hr_recruitment accordingly.

bzr revid: tde@openerp.com-20140210171511-z5277t6ilnvnc48d

diff --git a/addons/hr/hr_view.xml b/addons/hr/hr_view.xml
index bf723d5..c8aa202 100644 (file)
--- a/addons/hr/hr_view.xml
+++ b/addons/hr/hr_view.xml
@@ -339,19 +339,17 @@
                     </header>
                     <sheet>
                         <div class="oe_title">
-                            <label for="name" class="oe_edit_only" colspan="4"/>
-                            <h1><field name="name" class="oe_inline" nolabel="1" colspan="2"/></h1>
+                            <label for="name" class="oe_edit_only"/>
+                            <h1><field name="name" class="oe_inline"/></h1>
                         </div>
                         <div class="oe_right" name="buttons"/>
-                        <group>
-                            <group name="job_data">
-                                <field name="department_id" class="oe_inline"/>
-                                <label for="no_of_recruitment"/>
-                                <div>
-                                    <field name="no_of_recruitment" on_change="on_change_expected_employee(no_of_recruitment,no_of_employee)" class="oe_inline"/>
-                                    <p>Currently, <field name="no_of_employee" groups="base.group_user" colspan="0" class="oe_inline" style="padding-top: 1px"/> employees</p>
-                                </div>
-                            </group>
+                        <group name="employee_data">
+                            <field name="department_id" class="oe_inline"/>
+                            <label for="no_of_employee"/>no_of_recruitment
+                            <div>
+                                <field name="no_of_employee" on_change="on_change_expected_employee(no_of_recruitment,no_of_employee)" class="oe_inline"/>
+                                <p><field name="no_of_recruitment" groups="base.group_user" colspan="0" class="oe_inline" style="padding-top: 1px"/> new employee(s) expected</p>
+                            </div>
                         </group>
                         <div attrs="{'invisible': [('state', '!=', 'recruit')]}">
                             <label for="description"/>

diff --git a/addons/hr_recruitment/hr_recruitment_view.xml b/addons/hr_recruitment/hr_recruitment_view.xml
index 6379131..e6c26f9 100644 (file)
--- a/addons/hr_recruitment/hr_recruitment_view.xml
+++ b/addons/hr_recruitment/hr_recruitment_view.xml
@@ -343,7 +343,7 @@
         <field name="model">hr.job</field>
         <field name="inherit_id" ref="hr.view_hr_job_form"/>
         <field name="arch" type="xml">
-            <group name="job_data" position="inside">
+            <group name="employee_data" position="inside">
                 <label for="survey_id" groups="base.group_user"/>
                 <div groups="base.group_user">
                     <field name="survey_id" class="oe_inline" domain="[('type','=','Human Resources')]"/>