[MIG-MOV] website_hr_recruitment : finalize grouping models, and migrate xml and python to new api

4 files changed, 39 insertions, 41 deletions

diff --git a/addons/website_hr_recruitment/models/__init__.py b/addons/website_hr_recruitment/models/__init__.py
index 51930ad5d98..18a9584117d 100644
--- a/addons/website_hr_recruitment/models/__init__.py
+++ b/addons/website_hr_recruitment/models/__init__.py
@@ -1,6 +1,4 @@
 # -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
-import hr_job
 import hr_recruitment
-import hr_applicant
diff --git a/addons/website_hr_recruitment/models/hr_applicant.py b/addons/website_hr_recruitment/models/hr_applicant.py
deleted file mode 100644
index e630d27a595..00000000000
--- a/addons/website_hr_recruitment/models/hr_applicant.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# -*- coding: utf-8 -*-
-
-from odoo import models
-
-class Applicant(models.Model):
-
-    _inherit = 'hr.applicant'
-
-    def website_form_input_filter(self, request, values):
-        if 'partner_name' in values:
-            values.setdefault('name', '%s\'s Application' % values['partner_name'])
-        return values
diff --git a/addons/website_hr_recruitment/models/hr_job.py b/addons/website_hr_recruitment/models/hr_job.py
deleted file mode 100644
index 244ef5721fb..00000000000
--- a/addons/website_hr_recruitment/models/hr_job.py
+++ /dev/null
@@ -1,22 +0,0 @@
-# -*- coding: utf-8 -*-
-
-from odoo import api, fields, models
-
-class Job(models.Model):
-
-    _name = 'hr.job'
-    _inherit = ['hr.job', 'website.seo.metadata', 'website.published.mixin']
-
-    website_description = fields.Html('Website description', translate=True)
-
-    @api.multi
-    def _website_url(self, field_name, arg):
-        result = super(Job, self)._website_url(field_name, arg)
-        for job in self:
-            result[job.id] = "/jobs/detail/%s" % job.id
-        return result
-
-    @api.multi
-    def set_open(self):
-        self.write({'website_published': False})
-        return super(Job, self).set_open()
diff --git a/addons/website_hr_recruitment/models/hr_recruitment.py b/addons/website_hr_recruitment/models/hr_recruitment.py
index 0f2d87eb5f9..5560ccc5f87 100644
--- a/addons/website_hr_recruitment/models/hr_recruitment.py
+++ b/addons/website_hr_recruitment/models/hr_recruitment.py
@@ -1,14 +1,20 @@
+# -*- coding: utf-8 -*-
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+
 from urlparse import urljoin
 from werkzeug import url_encode
 
-from openerp import models, fields, api
-from openerp.addons.website.models.website import slug
+from odoo import api, fields, models
+from odoo.addons.website.models.website import slug
+
 
-class HrRecruitmentSource(models.Model):
+class RecruitmentSource(models.Model):
     _inherit = 'hr.recruitment.source'
 
-    @api.depends('source_id', 'source_id.name', 'job_id')
+    url = fields.Char(compute='_compute_url', string='Url Parameters')
+
     @api.one
+    @api.depends('source_id', 'source_id.name', 'job_id')
     def _compute_url(self):
         base_url = self.env['ir.config_parameter'].get_param('web.base.url')
         for source in self:
@@ -20,4 +26,32 @@ class HrRecruitmentSource(models.Model):
                 })
             ))
 
-    url = fields.Char(compute='_compute_url', string='Url Parameters')
\ No newline at end of file
+
+class Applicant(models.Model):
+
+    _inherit = 'hr.applicant'
+
+    def website_form_input_filter(self, request, values):
+        if 'partner_name' in values:
+            values.setdefault('name', '%s\'s Application' % values['partner_name'])
+        return values
+
+
+class Job(models.Model):
+
+    _name = 'hr.job'
+    _inherit = ['hr.job', 'website.seo.metadata', 'website.published.mixin']
+
+    website_description = fields.Html('Website description', translate=True)
+
+    @api.multi
+    def _website_url(self, field_name, arg):
+        result = super(Job, self)._website_url(field_name, arg)
+        for job in self:
+            result[job.id] = "/jobs/detail/%s" % job.id
+        return result
+
+    @api.multi
+    def set_open(self):
+        self.write({'website_published': False})
+        return super(Job, self).set_open()