From c7c59db317222e27abf5b66fbfae8cc8fc2fe288 Mon Sep 17 00:00:00 2001
From: "Sunil Sharma (OpenERP)" <sunilsharma.sharma07@gmail.com>
Date: Thu, 21 Nov 2013 17:52:55 +0530
Subject: [PATCH 1/4] [IMM]:hr_recruitment:as per suggestion

bzr revid: sunilsharma.sharma07@gmail.com-20131121122255-b1lcr8e7wg39xmn0
---
 addons/hr_recruitment/hr_recruitment.py       |  7 ++++++-
 addons/hr_recruitment/hr_recruitment_demo.xml | 10 +++++-----
 addons/hr_recruitment/hr_recruitment_view.xml |  7 +++++--
 addons/hr_recruitment/res_config_view.xml     |  2 +-
 4 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/addons/hr_recruitment/hr_recruitment.py b/addons/hr_recruitment/hr_recruitment.py
index 9b8dc3f8703..ac75714bbf1 100644
--- a/addons/hr_recruitment/hr_recruitment.py
+++ b/addons/hr_recruitment/hr_recruitment.py
@@ -485,7 +485,12 @@ class hr_job(osv.osv):
                                          "create new applicants for this job position."),
         'application_count': fields.function(_application_count, type='integer', string="Total Applications"),
         'manager_id': fields.related('department_id', 'manager_id', type='many2one', string='Department Manager', relation='hr.employee', readonly=True, store=True),
-        'doc_count':fields.function(_get_attached_docs, string="Number of documents attached", type='int')
+        'doc_count':fields.function(_get_attached_docs, string="Number of documents attached", type='int'),
+        'user_id': fields.many2one('hr.employee', 'Recruitment Responsible'),
+    }
+
+    _defaults = {
+        'alias_name':'jobs@yourcompany.com',
     }
 
     def _auto_init(self, cr, context=None):
diff --git a/addons/hr_recruitment/hr_recruitment_demo.xml b/addons/hr_recruitment/hr_recruitment_demo.xml
index d84634bbb67..68513e3f555 100644
--- a/addons/hr_recruitment/hr_recruitment_demo.xml
+++ b/addons/hr_recruitment/hr_recruitment_demo.xml
@@ -16,7 +16,7 @@
     </record>
     <record id="hr_case_traineemca0" model="hr.applicant">
         <field name="name">Trainee - MCA</field>
-        <field name="job_id" ref="hr.job_developer"/>
+        <field name="job_id" ref="hr.job_trainee"/>
         <field name="type_id" ref="degree_bac5"/>
         <field name="categ_ids" eval="[(6,0,[ref('tag_applicant_manager')])]"/>
         <field eval="time.strftime('%Y-%m-10 18:15:00')" name="date"/>
@@ -45,7 +45,7 @@
     </record>
     <record id="hr_case_yrsexperienceinphp0" model="hr.applicant">
         <field name="name">Marketing Job</field>
-        <field name="job_id" ref="hr.job_developer"/>
+        <field name="job_id" ref="hr.job_trainee"/>
         <field name="type_id" ref="degree_bac5"/>
         <field name="categ_ids" eval="[(6,0,[ref('tag_applicant_manager')])]"/>
         <field eval="time.strftime('%Y-%m-25 16:25:52')" name="date"/>
@@ -69,7 +69,7 @@
     </record>
     <record id="hr_case_financejob0" model="hr.applicant">
         <field name="name">Finance Job</field>
-        <field name="job_id" ref="hr.job_developer"/>
+        <field name="job_id" ref="hr.job_trainee"/>
         <field name="type_id" ref="degree_licenced"/>
         <field name="categ_ids" eval="[(6,0,[ref('tag_applicant_reserve')])]"/>
         <field eval="time.strftime('%Y-%m-26 17:39:42')" name="date"/>
@@ -96,7 +96,7 @@
     </record>
     <record id="hr_case_programmer" model="hr.applicant">
         <field name="name">Programmer</field>
-        <field name="job_id" ref="hr.job_developer"/>
+        <field name="job_id" ref="hr.job_trainee"/>
         <field name="type_id" ref="degree_bac5"/>
         <field name="categ_ids" eval="[(6,0,[ref('tag_applicant_it')])]"/>
         <field eval="time.strftime('%Y-%m-12 17:49:19')" name="date"/>
@@ -133,6 +133,6 @@
         <field name="state">recruit</field>
         <field name="no_of_recruitment">5</field>
     </record>
- 
+
   </data>
 </openerp>
\ 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 1207511bec1..653aa611358 100644
--- a/addons/hr_recruitment/hr_recruitment_view.xml
+++ b/addons/hr_recruitment/hr_recruitment_view.xml
@@ -344,7 +344,7 @@
                 </div>
             </group>
             <xpath expr="//field[@name='department_id']" position="after">
-                    <label for="alias_name" string="Email Alias" attrs="{'invisible': [('alias_domain', '=', False)]}"/>
+                    <label for="alias_name" string="Specific Email Address" attrs="{'invisible': [('alias_domain', '=', False)]}" help ="Define a specific contact address for this job position. If you keep it empty, the default email address will be used (jobs@yourcompany.com in human resources settings)"/>
                     <div name="alias_def" attrs="{'invisible': [('alias_domain', '=', False)]}">
                         <field name="alias_id" class="oe_read_only oe_inline"
                                 string="Email Alias" required="0"/>
@@ -353,6 +353,9 @@
                         </div>
                     </div>
             </xpath>
+            <xpath expr="//field[@name='department_id']" position="before">
+                <field name="user_id" class="oe_inline"/>
+            </xpath>
             <div name="buttons" position="inside">
                 <button string="Applications" name="%(action_hr_job_applications)d" type="action"/>
                 <button name="attachment_tree_view" string="Documents" type="object"/>
@@ -402,7 +405,7 @@
                                             <field name="name"/>
                                         </div>
                                         <div class="oe_job oe_department oe_kanban_ellipsis">
-                                            <field name="department_id"/>
+                                            <field name="user_id"/>
                                             <span t-if="record.manager_id.value" class="oe_manager_name">
                                                 (<t t-esc="record.manager_id.value"/>)
                                             </span>
diff --git a/addons/hr_recruitment/res_config_view.xml b/addons/hr_recruitment/res_config_view.xml
index f59d3694f1a..9963abc4a9c 100644
--- a/addons/hr_recruitment/res_config_view.xml
+++ b/addons/hr_recruitment/res_config_view.xml
@@ -27,7 +27,7 @@
                 </div>
                 <xpath expr="//div[@name='hr_recruitment']" position="after">
                     <div attrs="{'invisible': ['|',('module_hr_recruitment','=',False),('alias_domain', '=', False)]}">
-                        <label string="Your job email address"/>
+                        <label string="Default job email address"/>
                         <field name="alias_prefix" class="oe_inline" attrs="{'required': [('alias_domain', '!=', False)]}"/>
                         @
                         <field name="alias_domain" class="oe_inline" readonly="1"/>

From 6974db0568c724c6684a91bac9dddbd7b7825032 Mon Sep 17 00:00:00 2001
From: "Sunil Sharma (OpenERP)" <sunilsharma.sharma07@gmail.com>
Date: Fri, 22 Nov 2013 11:08:50 +0530
Subject: [PATCH 2/4] [IMP]:hr_recruitment:improve responsible for recruitment
 avatar image

bzr revid: sunilsharma.sharma07@gmail.com-20131122053850-2y9mqir2uzxmb75y
---
 addons/hr_recruitment/hr_recruitment_view.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/hr_recruitment/hr_recruitment_view.xml b/addons/hr_recruitment/hr_recruitment_view.xml
index 653aa611358..38e6ea8a27f 100644
--- a/addons/hr_recruitment/hr_recruitment_view.xml
+++ b/addons/hr_recruitment/hr_recruitment_view.xml
@@ -394,10 +394,10 @@
                                     </ul>
                                 </div>
                                 <div class = "oe_kanban_content">
-                                    <t t-if="record.manager_id.raw_value">
-                                        <img t-att-src="kanban_image('hr.employee', 'image_medium', record.manager_id.raw_value[0])" t-att-title="record.manager_id.value" class="oe_kanban_avatar oe_job_avatar"/>
+                                    <t t-if="record.user_id.raw_value">
+                                        <img t-att-src="kanban_image('hr.employee', 'image_medium', record.user_id.raw_value[0])" t-att-title="record.user_id.value" class="oe_kanban_avatar oe_job_avatar"/>
                                     </t>
-                                    <t t-if="record.manager_id.raw_value === false">
+                                    <t t-if="record.user_id.raw_value === false">
                                         <img t-att-src='_s + "/base/static/src/img/avatar.png"' class="oe_kanban_avatar oe_job_avatar"/>
                                     </t>
                                     <div class="oe_job_detail">

From 4a5ee2721c703954f9ab6db2ee290c1a3549b70a Mon Sep 17 00:00:00 2001
From: "Sunil Sharma (OpenERP)" <sunilsharma.sharma07@gmail.com>
Date: Fri, 22 Nov 2013 14:11:13 +0530
Subject: [PATCH 3/4] [IMP]:hr_recruitment:improve as per suggestion

bzr revid: sunilsharma.sharma07@gmail.com-20131122084113-x9poguilfogtc5fn
---
 addons/hr_recruitment/hr_recruitment.py       | 2 +-
 addons/hr_recruitment/hr_recruitment_view.xml | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/hr_recruitment/hr_recruitment.py b/addons/hr_recruitment/hr_recruitment.py
index ac75714bbf1..53e468a602a 100644
--- a/addons/hr_recruitment/hr_recruitment.py
+++ b/addons/hr_recruitment/hr_recruitment.py
@@ -490,7 +490,7 @@ class hr_job(osv.osv):
     }
 
     _defaults = {
-        'alias_name':'jobs@yourcompany.com',
+        'alias_name':lambda self,cr,uid,c: self.pool.get('hr.config.settings').get_default_alias_prefix(cr,uid,uid,c).get('alias_prefix')
     }
 
     def _auto_init(self, cr, context=None):
diff --git a/addons/hr_recruitment/hr_recruitment_view.xml b/addons/hr_recruitment/hr_recruitment_view.xml
index 38e6ea8a27f..958865fe0d1 100644
--- a/addons/hr_recruitment/hr_recruitment_view.xml
+++ b/addons/hr_recruitment/hr_recruitment_view.xml
@@ -344,7 +344,7 @@
                 </div>
             </group>
             <xpath expr="//field[@name='department_id']" position="after">
-                    <label for="alias_name" string="Specific Email Address" attrs="{'invisible': [('alias_domain', '=', False)]}" help ="Define a specific contact address for this job position. If you keep it empty, the default email address will be used (jobs@yourcompany.com in human resources settings)"/>
+                    <label for="alias_name" string="Specific Email Address" attrs="{'invisible': [('alias_domain', '=', False)]}" help ="Define a specific contact address for this job position. If you keep it empty, the default email address will be used which is in human resources settings"/>
                     <div name="alias_def" attrs="{'invisible': [('alias_domain', '=', False)]}">
                         <field name="alias_id" class="oe_read_only oe_inline"
                                 string="Email Alias" required="0"/>
@@ -353,7 +353,7 @@
                         </div>
                     </div>
             </xpath>
-            <xpath expr="//field[@name='department_id']" position="before">
+            <xpath expr="//field[@name='department_id']" position="after">
                 <field name="user_id" class="oe_inline"/>
             </xpath>
             <div name="buttons" position="inside">

From 05f8171d52f3433e5a62be26c58bca39bf3c3fac Mon Sep 17 00:00:00 2001
From: "Sunil Sharma (OpenERP)" <sunilsharma.sharma07@gmail.com>
Date: Fri, 22 Nov 2013 14:14:04 +0530
Subject: [PATCH 4/4] [IMP]:hr_recruitment:improve as per suggestion

bzr revid: sunilsharma.sharma07@gmail.com-20131122084404-cfv3rn7dmu6cwvd3
---
 addons/hr_recruitment/hr_recruitment.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/hr_recruitment/hr_recruitment.py b/addons/hr_recruitment/hr_recruitment.py
index 53e468a602a..9fc4139f0a4 100644
--- a/addons/hr_recruitment/hr_recruitment.py
+++ b/addons/hr_recruitment/hr_recruitment.py
@@ -490,7 +490,7 @@ class hr_job(osv.osv):
     }
 
     _defaults = {
-        'alias_name':lambda self,cr,uid,c: self.pool.get('hr.config.settings').get_default_alias_prefix(cr,uid,uid,c).get('alias_prefix')
+        'alias_name':lambda self,cr,uid,c: self.pool.get('hr.config.settings').get_default_alias_prefix(cr,uid,uid,c)['alias_prefix']
     }
 
     def _auto_init(self, cr, context=None):