Pinakin Nayi (OpenERP) has proposed merging
lp:~openerp-commiter/openobject-addons/trunk-hr_improvements-sbh-job_position-pna
into lp:~openerp-dev/openobject-addons/trunk-hr_improvements-sbh.
Requested reviews:
OpenERP R&D Team (openerp-dev)
For more details, see:
https://code.launchpad.net/~openerp-commiter/openobject-addons/trunk-hr_improvements-sbh-job_position-pna/+merge/106319
Hello,
hr_recruitment: Improve job position view.
Thank you,
pna
--
https://code.launchpad.net/~openerp-commiter/openobject-addons/trunk-hr_improvements-sbh-job_position-pna/+merge/106319
Your team OpenERP R&D Team is requested to review the proposed merge of
lp:~openerp-commiter/openobject-addons/trunk-hr_improvements-sbh-job_position-pna
into lp:~openerp-dev/openobject-addons/trunk-hr_improvements-sbh.
=== modified file 'hr/hr.py'
--- hr/hr.py 2012-04-02 08:57:18 +0000
+++ hr/hr.py 2012-05-18 07:18:18 +0000
@@ -93,18 +93,18 @@
_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'),
=== modified file 'hr/i18n/hr.pot'
--- hr/i18n/hr.pot 2012-05-10 13:21:50 +0000
+++ hr/i18n/hr.pot 2012-05-18 07:18:18 +0000
@@ -197,7 +197,7 @@
#. 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 @@
#. module: hr
#: field:hr.job,expected_employees:0
-msgid "Expected Employees"
+msgid "Total Employees"
msgstr ""
#. module: hr
@@ -702,5 +702,10 @@
#. 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 ""
=== modified file 'hr_recruitment/hr_recruitment.py'
--- hr_recruitment/hr_recruitment.py 2012-05-17 13:21:01 +0000
+++ hr_recruitment/hr_recruitment.py 2012-05-18 07:18:18 +0000
@@ -538,8 +538,19 @@
_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 = {}
+ for rec in self.browse(cr, uid, ids, context=context):
+ if rec.survey_id:
+ context.update({'survey_id': rec.survey_id.id, 'response_id': [0], 'response_no': 0,})
+ value = self.pool.get("survey").action_print_survey(cr, uid, ids, context=context)
+ return value
+
hr_job()
+<<<<<<< TREE
class crm_meeting(osv.osv):
_inherit = 'crm.meeting'
_columns = {
@@ -547,3 +558,5 @@
}
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+=======
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:>>>>>>> MERGE-SOURCE
=== modified file 'hr_recruitment/hr_recruitment_view.xml'
--- hr_recruitment/hr_recruitment_view.xml 2012-05-18 06:26:52 +0000
+++ hr_recruitment/hr_recruitment_view.xml 2012-05-18 07:18:18 +0000
@@ -355,6 +355,9 @@
<field name="department_id" position="after">
<field name="survey_id"/>
</field>
+ <field name="expected_employees" position="after">
+ <button name="action_print_survey" string="Interview" type="object" icon="gtk-print" attrs="{'invisible':[('survey_id','=',False)]}" colspan="2"/>
+ </field>
</field>
</record>
=== modified file 'hr_recruitment/i18n/hr_recruitment.pot'
--- hr_recruitment/i18n/hr_recruitment.pot 2012-02-08 01:08:30 +0000
+++ hr_recruitment/i18n/hr_recruitment.pot 2012-05-18 07:18:18 +0000
@@ -240,6 +240,16 @@
msgstr ""
#. module: hr_recruitment
+#: view:hr.job:0
+msgid "Interview"
+msgstr ""
+
+#. module: hr_recruitment
+#: constraint:hr.job:0
+msgid "Warning! You must select Interview Form"
+msgstr ""
+
+#. module: hr_recruitment
#: help:hr.job,survey_id:0
msgid ""
"Choose an interview form for this job position and you will be able to print/"
_______________________________________________
Mailing list: https://launchpad.net/~openerp-dev-gtk
Post to : [email protected]
Unsubscribe : https://launchpad.net/~openerp-dev-gtk
More help : https://help.launchpad.net/ListHelp
