Kuldeep Joshi(OpenERP) has proposed merging
lp:~openerp-dev/openobject-addons/trunk-hr-modification-kjo into
lp:~openerp-dev/openobject-addons/trunk-hr_improvements-sbh.
Requested reviews:
Bhumika (OpenERP) (sbh-openerp)
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-hr-modification-kjo/+merge/109117
--
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-hr-modification-kjo/+merge/109117
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openobject-addons/trunk-hr_improvements-sbh.
=== modified file 'hr/hr.py'
--- hr/hr.py 2012-05-23 06:38:32 +0000
+++ hr/hr.py 2012-06-07 11:56:27 +0000
@@ -110,7 +110,7 @@
'requirements': fields.text('Requirements'),
'department_id': fields.many2one('hr.department', 'Department'),
'company_id': fields.many2one('res.company', 'Company'),
- 'state': fields.selection([('open', 'In Position'),('recruit', 'In Recruitement'),('old', 'Old')], 'Status', readonly=True, required=True),
+ 'state': fields.selection([('open', 'In Position'),('recruit', 'In Recruitement'),('done', 'Done')], 'Status', readonly=True, required=True, help='By default all job are \'In position\', set it \'In Recruitment\' if recruitment process is going on for this job position.'),
}
_defaults = {
'expected_employees': 1,
@@ -128,10 +128,6 @@
context = {}
return {'value': {'expected_employees': no_of_recruitment + no_of_employee}}
- def job_old(self, cr, uid, ids, *args):
- self.write(cr, uid, ids, {'state': 'old', 'no_of_recruitment': 0})
- return True
-
def job_recruitement(self, cr, uid, ids, *args):
for job in self.browse(cr, uid, ids):
no_of_recruitment = job.no_of_recruitment == 0 and 1 or job.no_of_recruitment
@@ -139,7 +135,7 @@
return True
def job_open(self, cr, uid, ids, *args):
- self.write(cr, uid, ids, {'state': 'open', 'no_of_recruitment': 0})
+ self.write(cr, uid, ids, {'state': 'done', 'no_of_recruitment': 0})
return True
hr_job()
=== modified file 'hr/hr_view.xml'
--- hr/hr_view.xml 2012-06-05 07:27:34 +0000
+++ hr/hr_view.xml 2012-06-07 11:56:27 +0000
@@ -347,8 +347,7 @@
<form layout="manual">
<header>
<button name="job_recruitement" string="In Recruitement" states="open" type="object"/>
- <button name="job_open" string="In Position" states="old,recruit" type="object"/>
- <button name="job_old" string="Mark as Old" states="open,recruit" type="object"/>
+ <button name="job_open" string="Recruitment Done" states="recruit" type="object"/>
<field name="state" widget="statusbar" statusbar_visible="recruit,open"/>
</header>
<sheet string="Job" layout="auto">
_______________________________________________
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
