From f5bdd59310471f5f6e412cffdb71739531db558d Mon Sep 17 00:00:00 2001
From: "Chirag Dodiya (OpenERP Trainee)" <chiragdd7@gmail.com>
Date: Fri, 23 Aug 2013 18:54:28 +0530
Subject: [PATCH] [IMP] Improved view of Job Position and Applications

bzr revid: chiragdd7@gmail.com-20130823132428-os79zm92txk26r97
---
 addons/hr/hr_view.xml                         | 16 +++++++++-------
 addons/hr/static/src/css/hr.css               |  6 +-----
 addons/hr_recruitment/hr_recruitment_view.xml | 16 ++++++++++------
 3 files changed, 20 insertions(+), 18 deletions(-)

diff --git a/addons/hr/hr_view.xml b/addons/hr/hr_view.xml
index b24fcee3ed4..2da914fb88f 100644
--- a/addons/hr/hr_view.xml
+++ b/addons/hr/hr_view.xml
@@ -343,18 +343,20 @@
                         <field name="state" widget="statusbar" statusbar_visible="recruit,open"/>
                     </header>
                     <sheet>
-                        <div class="oe_job_title_form">
-                            <label string="Job Name and Department" class="oe_edit_only" colspan="4"/>
-                            <h1><field name="name" class="oe_inline" nolabel="1" colspan="2"/>(<field name="department_id" class="oe_inline" nolabel="1" colspan="2"/>)</h1>
+                        <div class="oe_title">
+                            <label string="Job Name" class="oe_edit_only" colspan="4"/>
+                            <h1><field name="name" class="oe_inline" nolabel="1" colspan="2"/></h1>
                         </div>
                         <div class="oe_right oe_job_button_box" name="buttons"/>
                         <group>
                             <group colspan="4">
                                 <group name="job_data">
-                                    <field name="no_of_employee" groups="base.group_user"/>
-                                    <field name="no_of_recruitment" on_change="on_change_expected_employee(no_of_recruitment,no_of_employee)"/>
-                                    <field name="expected_employees" groups="base.group_user"/>
-                                    <field name="company_id" widget="selection" groups="base.group_multi_company"/>
+                                    <field name="department_id"/>
+                                    <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"/> employees</p>
+                                    </div>
                                 </group>
                             </group>
                             <div colspan="4">
diff --git a/addons/hr/static/src/css/hr.css b/addons/hr/static/src/css/hr.css
index 9e288c687e5..f1f00bfe28c 100644
--- a/addons/hr/static/src/css/hr.css
+++ b/addons/hr/static/src/css/hr.css
@@ -73,10 +73,6 @@
   width: auto;
   float: none;
 }
-.openerp .oe_job_title_form {
-  width: 75%;
-  float: left;
-}
 .openerp .oe_job_button_box {
   width: 24%;
-}
\ No newline at end of file
+}
diff --git a/addons/hr_recruitment/hr_recruitment_view.xml b/addons/hr_recruitment/hr_recruitment_view.xml
index 7577140e8f9..afd1a8c6714 100644
--- a/addons/hr_recruitment/hr_recruitment_view.xml
+++ b/addons/hr_recruitment/hr_recruitment_view.xml
@@ -89,10 +89,10 @@
                     <label for="partner_name" class="oe_edit_only"/>
                     <h2 style="display: inline-block;">
                         <field name="partner_name" class="oe_inline"/>
-                    </h2>
-                    <button string="Create Employee" name="create_employee_from_applicant" type="object"
+                        <button string="Create Employee" name="create_employee_from_applicant" type="object"
                                     class="oe_link oe_inline" style="margin-left: 8px;"
                                     attrs="{'invisible': [('emp_id', '!=', False)]}"/> 
+                    </h2>
                 </div>
                 <group>
                     <group>
@@ -334,12 +334,12 @@
         <field name="model">hr.job</field>
         <field name="inherit_id" ref="hr.view_hr_job_form"/>
         <field name="arch" type="xml">
-            <field name="expected_employees" version="7.0" position="after">
+            <group name="job_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')]"/>
                 </div>
-            </field>
+            </group>
             <xpath expr="//group[@name='job_data']" position="after">
                 <group name="group_alias"
                         attrs="{'invisible': [('alias_domain', '=', False)]}">
@@ -351,7 +351,6 @@
                             <field name="alias_name" class="oe_inline"/>@<field name="alias_domain" class="oe_inline" readonly="1"/>
                         </div>
                     </div>
-                    <field name="alias_contact" class="oe_inline" string="Accept Emails From"/>
                 </group>
             </xpath>
             <div name="buttons" position="inside">
@@ -402,7 +401,7 @@
                                         <div class="oe_job oe_name oe_kanban_ellipsis">
                                             <field name="name"/>
                                         </div>
-                                        <div class="oe_job_alias oe_kanban_ellipsis" t-if=" record.alias_id.value">
+                                        <div class="oe_job_alias oe_kanban_ellipsis" t-if=" record.alias_id.value and record.state.raw_value == 'recruit'">
                                             <span class="oe_e">%%</span><small><field name="alias_id"/></small>
                                         </div>
                                         <div class="oe_job oe_department">
@@ -452,6 +451,11 @@
             <field name="view_type">form</field>
             <field name="view_mode">kanban,tree,form</field>
             <field name="context">{'search_default_in_recruitment': 1}</field>
+            <field name="help" type="html">
+              <p class="oe_view_nocontent_create">
+                Click here to create a new job or remove the filter on On Recruitment. Define job position profile and manage all your recruitment in a context of a particular job: print interview survey, define number of expected new employees, and manage its recruitment pipe
+              </p>
+            </field>
         </record>
 
     <!-- Stage Tree View -->