From 84aa5d4bde0c84c25b837a16c9ccc1d0ff6ce46c Mon Sep 17 00:00:00 2001
From: "Chirag Dodiya (OpenERP Trainee)" <chiragdd7@gmail.com>
Date: Fri, 30 Aug 2013 15:00:47 +0530
Subject: [PATCH] [IMP]Improved form view of Job Position and added
 message_post method in hr.applicant and edit hr_recruitment_data.xml

bzr revid: chiragdd7@gmail.com-20130830093047-hitxtu0kj1hex7xu
---
 addons/hr/hr_view.xml                         | 32 +++++++++----------
 addons/hr_recruitment/hr_recruitment.py       |  1 +
 addons/hr_recruitment/hr_recruitment_data.xml |  8 -----
 3 files changed, 16 insertions(+), 25 deletions(-)

diff --git a/addons/hr/hr_view.xml b/addons/hr/hr_view.xml
index 2da914fb88f..42a2d75b618 100644
--- a/addons/hr/hr_view.xml
+++ b/addons/hr/hr_view.xml
@@ -349,25 +349,23 @@
                         </div>
                         <div class="oe_right oe_job_button_box" name="buttons"/>
                         <group>
-                            <group colspan="4">
-                                <group name="job_data">
-                                    <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 name="job_data">
+                                <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>
-                            <div colspan="4">
-                                <label for="description"/>
-                                <field name="description"/>
-                            </div>
-                            <div colspan="4">
-                                <label for="requirements"/>
-                                <field name="requirements"/>
-                            </div>
                         </group>
+                        <div>
+                            <label for="description"/>
+                            <field name="description"/>
+                        </div>
+                        <div>
+                            <label for="requirements"/>
+                            <field name="requirements"/>
+                        </div>
                     </sheet>
                     <div class="oe_chatter">
                         <field name="message_follower_ids" widget="mail_followers"/>
diff --git a/addons/hr_recruitment/hr_recruitment.py b/addons/hr_recruitment/hr_recruitment.py
index 12a8a41cbf4..2fe40699ffc 100644
--- a/addons/hr_recruitment/hr_recruitment.py
+++ b/addons/hr_recruitment/hr_recruitment.py
@@ -419,6 +419,7 @@ class hr_applicant(osv.Model):
                                                      'department_id': applicant.department_id.id
                                                      })
                 self.write(cr, uid, [applicant.id], {'emp_id': emp_id}, context=context)
+                self.message_post(cr, uid, [applicant.id], body=_('Applicant <b>Hired</b>'), subtype="hr_recruitment.mt_applicant_employee", context=context)
             else:
                 raise osv.except_osv(_('Warning!'), _('You must define an Applied Job and a Contact Name for this applicant.'))
 
diff --git a/addons/hr_recruitment/hr_recruitment_data.xml b/addons/hr_recruitment/hr_recruitment_data.xml
index cd12b401632..4d16bd3ba11 100644
--- a/addons/hr_recruitment/hr_recruitment_data.xml
+++ b/addons/hr_recruitment/hr_recruitment_data.xml
@@ -483,14 +483,6 @@
     </record>
 
     <!-- Job-related subtypes for messaging / Chatter -->
-    <record id="mt_job_applicant_new" model="mail.message.subtype">
-        <field name="name">Applicant Created</field>
-        <field name="res_model">hr.job</field>
-        <field name="default" eval="False"/>
-        <field name="parent_id" eval="ref('mt_applicant_new')"/>
-        <field name="relation_field">job_id</field>
-    </record>
-
     <record id="mt_job_applicant_stage" model="mail.message.subtype">
         <field name="name">Application Stage Changed</field>
         <field name="res_model">hr.job</field>