diff --git a/addons/hr/models/hr_job.py b/addons/hr/models/hr_job.py
index a9f0eda96a4..065a696d5a8 100644
--- a/addons/hr/models/hr_job.py
+++ b/addons/hr/models/hr_job.py
@@ -11,13 +11,14 @@ class Job(models.Model):
_inherit = ['mail.thread']
_order = 'sequence'
+ active = fields.Boolean(default=True)
name = fields.Char(string='Job Position', required=True, index='trigram', translate=True)
sequence = fields.Integer(default=10)
expected_employees = fields.Integer(compute='_compute_employees', string='Total Forecasted Employees', store=True,
help='Expected number of employees for this job position after new recruitment.')
no_of_employee = fields.Integer(compute='_compute_employees', string="Current Number of Employees", store=True,
help='Number of employees currently occupying this job position.')
- no_of_recruitment = fields.Integer(string='Expected New Employees', copy=False,
+ no_of_recruitment = fields.Integer(string='Target', copy=False,
help='Number of new employees you expect to recruit.', default=1)
no_of_hired_employee = fields.Integer(string='Hired Employees', copy=False,
help='Number of hired employees for this job position during recruitment phase.')
@@ -26,10 +27,6 @@ class Job(models.Model):
requirements = fields.Text('Requirements')
department_id = fields.Many2one('hr.department', string='Department', domain="['|', ('company_id', '=', False), ('company_id', '=', company_id)]")
company_id = fields.Many2one('res.company', string='Company', default=lambda self: self.env.company)
- state = fields.Selection([
- ('recruit', 'Recruitment in Progress'),
- ('open', 'Not Recruiting')
- ], string='Status', readonly=True, required=True, tracking=True, copy=False, default='recruit', help="Set whether the recruitment process is open or closed for this job position.")
_sql_constraints = [
('name_company_uniq', 'unique(name, company_id, department_id)', 'The name of the job position must be unique per department in company!'),
@@ -56,16 +53,3 @@ class Job(models.Model):
if 'name' not in default:
default['name'] = _("%s (copy)") % (self.name)
return super(Job, self).copy(default=default)
-
- def set_recruit(self):
- for record in self:
- no_of_recruitment = 1 if record.no_of_recruitment == 0 else record.no_of_recruitment
- record.write({'state': 'recruit', 'no_of_recruitment': no_of_recruitment})
- return True
-
- def set_open(self):
- return self.write({
- 'state': 'open',
- 'no_of_recruitment': 0,
- 'no_of_hired_employee': 0
- })
diff --git a/addons/hr/tests/__init__.py b/addons/hr/tests/__init__.py
index 17a4487628d..0fe90a1ae29 100644
--- a/addons/hr/tests/__init__.py
+++ b/addons/hr/tests/__init__.py
@@ -3,7 +3,6 @@
from . import test_hr_employee
from . import test_channel
-from . import test_hr_flow
from . import test_self_user_access
from . import test_multi_company
from . import test_resource
diff --git a/addons/hr/tests/test_hr_flow.py b/addons/hr/tests/test_hr_flow.py
deleted file mode 100644
index 22edd44f11a..00000000000
--- a/addons/hr/tests/test_hr_flow.py
+++ /dev/null
@@ -1,49 +0,0 @@
-# -*- coding: utf-8 -*-
-# Part of Odoo. See LICENSE file for full copyright and licensing details.
-
-from odoo.addons.hr.tests.common import TestHrCommon
-
-
-class TestHrFlow(TestHrCommon):
-
- @classmethod
- def setUpClass(cls):
- super(TestHrFlow, cls).setUpClass()
- cls.dep_rd = cls.env['hr.department'].create({
- 'name': 'Research & Development',
- })
- cls.job_developer = cls.env['hr.job'].create({
- 'name': 'Experienced Developer',
- 'department_id': cls.dep_rd.id,
- 'no_of_recruitment': 5,
- })
- cls.employee_niv = cls.env['hr.employee'].create({
- 'name': 'Sharlene Rhodes',
- })
- cls.job_developer = cls.job_developer.with_user(cls.res_users_hr_officer.id)
- cls.employee_niv = cls.employee_niv.with_user(cls.res_users_hr_officer.id)
-
- def test_open2recruit2close_job(self):
-
- """ Opening the job position for "Developer" and checking the job status and recruitment count. """
- self.job_developer.set_open()
- self.assertEqual(self.job_developer.state, 'open', "Job position of 'Job Developer' is in 'open' state.")
- self.assertEqual(self.job_developer.no_of_recruitment, 0,
- "Wrong number of recruitment for the job 'Job Developer'(%s found instead of 0)."
- % self.job_developer.no_of_recruitment)
-
- """ Recruiting employee "NIV" for the job position "Developer" and checking the job status and recruitment count. """
- self.job_developer.set_recruit()
- self.assertEqual(self.job_developer.state, 'recruit', "Job position of 'Job Developer' is in 'recruit' state.")
- self.assertEqual(self.job_developer.no_of_recruitment, 1,
- "Wrong number of recruitment for the job 'Job Developer'(%s found instead of 1.0)."
- % self.job_developer.no_of_recruitment)
-
- self.employee_niv.write({'job_id': self.job_developer.id})
-
- """ Closing the recruitment for the job position "Developer" by marking it as open. """
- self.job_developer.set_open()
- self.assertEqual(self.job_developer.state, 'open', "Job position of 'Job Developer' is in 'open' state.")
- self.assertEqual(self.job_developer.no_of_recruitment, 0,
- "Wrong number of recruitment for the job 'Job Developer'(%s found instead of 0)."
- % self.job_developer.no_of_recruitment)
diff --git a/addons/hr/views/hr_job_views.xml b/addons/hr/views/hr_job_views.xml
index afe5da5dbf6..695a2f91a2c 100644
--- a/addons/hr/views/hr_job_views.xml
+++ b/addons/hr/views/hr_job_views.xml
@@ -7,11 +7,7 @@
hr.job