diff --git a/addons/hr/hr.py b/addons/hr/hr.py
index bd0c730d92d..726cf036051 100644
--- a/addons/hr/hr.py
+++ b/addons/hr/hr.py
@@ -93,18 +93,18 @@ class hr_job(osv.osv):
_description = "Job Description"
_columns = {
'name': fields.char('Job Name', size=128, required=True, select=True),
- 'expected_employees': fields.function(_no_of_employee, string='Expected Employees', help='Required number of employees in total for that job.',
+ 'expected_employees': fields.function(_no_of_employee, string='Total Employees', help='Expected number of employees in total for this job position after new recruitment.',
store = {
'hr.job': (lambda self,cr,uid,ids,c=None: ids, ['no_of_recruitment'], 10),
'hr.employee': (_get_job_position, ['job_id'], 10),
},
multi='no_of_employee'),
- 'no_of_employee': fields.function(_no_of_employee, string="Number of Employees", help='Number of employees with that job.',
+ 'no_of_employee': fields.function(_no_of_employee, string="Number of Employees", help='Number of employees currently having this job position.',
store = {
'hr.employee': (_get_job_position, ['job_id'], 10),
},
multi='no_of_employee'),
- 'no_of_recruitment': fields.float('Expected in Recruitment'),
+ 'no_of_recruitment': fields.float('Expected in Recruitment', help='Number of new employees you expect to recruit.'),
'employee_ids': fields.one2many('hr.employee', 'job_id', 'Employees'),
'description': fields.text('Job Description'),
'requirements': fields.text('Requirements'),
diff --git a/addons/hr/i18n/hr.pot b/addons/hr/i18n/hr.pot
index c0f57787a35..15bc696e705 100644
--- a/addons/hr/i18n/hr.pot
+++ b/addons/hr/i18n/hr.pot
@@ -197,7 +197,7 @@ msgstr ""
#. module: hr
#: help:hr.job,expected_employees:0
-msgid "Required number of employees in total for that job."
+msgid "Expected number of employees in total for this job position after new recruitment."
msgstr ""
#. module: hr
@@ -290,7 +290,7 @@ msgstr ""
#. module: hr
#: field:hr.job,expected_employees:0
-msgid "Expected Employees"
+msgid "Total Employees"
msgstr ""
#. module: hr
@@ -702,5 +702,10 @@ msgstr ""
#. module: hr
#: field:hr.job,no_of_employee:0
-msgid "Number of Employees"
+msgid "Number of employees currently having this job position."
+msgstr ""
+
+#. module: hr
+#: field:hr.job,no_of_recruitment:0
+msgid "Number of new employees you expect to recruit."
msgstr ""
diff --git a/addons/hr_recruitment/hr_recruitment.py b/addons/hr_recruitment/hr_recruitment.py
index 0c6e36d8dbd..22871e935a4 100644
--- a/addons/hr_recruitment/hr_recruitment.py
+++ b/addons/hr_recruitment/hr_recruitment.py
@@ -538,6 +538,24 @@ class hr_job(osv.osv):
_columns = {
'survey_id': fields.many2one('survey', 'Interview Form', help="Choose an interview form for this job position and you will be able to print/answer this interview from all applicants who apply for this job"),
}
+
+ def action_print_survey(self, cr, uid, ids, context=None):
+ if context is None:
+ context = {}
+ datas = {}
+ record = self.browse(cr, uid, ids, context=context)[0]
+ if record.survey_id:
+ datas['ids'] = [record.survey_id.id]
+ datas['model'] = 'survey.print'
+ context.update({'response_id': [0], 'response_no': 0,})
+ return {
+ 'type': 'ir.actions.report.xml',
+ 'report_name': 'survey.form',
+ 'datas': datas,
+ 'context' : context,
+ 'nodestroy':True,
+ }
+
hr_job()
class crm_meeting(osv.osv):
@@ -546,4 +564,4 @@ class crm_meeting(osv.osv):
'applicant_id': fields.many2one('hr.applicant','Applicant Meeting'),
}
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ 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 7e4d3dcc24b..151c84e29d1 100644
--- a/addons/hr_recruitment/hr_recruitment_view.xml
+++ b/addons/hr_recruitment/hr_recruitment_view.xml
@@ -346,8 +346,9 @@
form
-
-
+
+
+
diff --git a/addons/hr_recruitment/i18n/hr_recruitment.pot b/addons/hr_recruitment/i18n/hr_recruitment.pot
index a341fb3cd9e..7521fab460e 100644
--- a/addons/hr_recruitment/i18n/hr_recruitment.pot
+++ b/addons/hr_recruitment/i18n/hr_recruitment.pot
@@ -234,6 +234,11 @@ msgstr ""
msgid "Interview Form"
msgstr ""
+#. module: hr_recruitment
+#: view:hr.job:0
+msgid "Interview"
+msgstr ""
+
#. module: hr_recruitment
#: help:hr.job,survey_id:0
msgid ""