From 6e042ea14701e05e8fbc166c1270f243ba3c06d4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= Date: Thu, 3 Oct 2013 14:14:14 +0200 Subject: [PATCH] [CLEAN] website_hr_recruitment: some cleaning in python Moved write_date column from website_hr_recruitment to hr, because it could be usefull to have this column directly existing in the model. Other website-related columns remains in the website module. Also moved python file into a new models directory; also renamed the file. Please use correct file name instead of finding a loosely-related file name. bzr revid: tde@openerp.com-20131003121414-2xd4nab2znfabdjj --- addons/hr/hr.py | 1 + addons/website_hr_recruitment/__init__.py | 2 +- addons/website_hr_recruitment/models/__init__.py | 1 + .../{recruitment.py => models/hr_job.py} | 5 +++-- 4 files changed, 6 insertions(+), 3 deletions(-) create mode 100644 addons/website_hr_recruitment/models/__init__.py rename addons/website_hr_recruitment/{recruitment.py => models/hr_job.py} (74%) diff --git a/addons/hr/hr.py b/addons/hr/hr.py index d19f1f7de8b..1ed3f263d10 100644 --- a/addons/hr/hr.py +++ b/addons/hr/hr.py @@ -122,6 +122,7 @@ class hr_job(osv.osv): 'company_id': fields.many2one('res.company', 'Company'), 'state': fields.selection([('open', 'No Recruitment'), ('recruit', 'Recruitement in Progress')], 'Status', readonly=True, required=True, help="By default 'In position', set it to 'In Recruitment' if recruitment process is going on for this job position."), + 'write_date': fields.datetime('Update Date', readonly=True), } _defaults = { 'company_id': lambda self,cr,uid,c: self.pool.get('res.company')._company_default_get(cr, uid, 'hr.job', context=c), diff --git a/addons/website_hr_recruitment/__init__.py b/addons/website_hr_recruitment/__init__.py index df7b1cd985d..9f86759e32b 100644 --- a/addons/website_hr_recruitment/__init__.py +++ b/addons/website_hr_recruitment/__init__.py @@ -1,2 +1,2 @@ import controllers -import recruitment +import models diff --git a/addons/website_hr_recruitment/models/__init__.py b/addons/website_hr_recruitment/models/__init__.py new file mode 100644 index 00000000000..755183a1d3c --- /dev/null +++ b/addons/website_hr_recruitment/models/__init__.py @@ -0,0 +1 @@ +import hr_job diff --git a/addons/website_hr_recruitment/recruitment.py b/addons/website_hr_recruitment/models/hr_job.py similarity index 74% rename from addons/website_hr_recruitment/recruitment.py rename to addons/website_hr_recruitment/models/hr_job.py index c5865f9d22e..bce498d22d0 100644 --- a/addons/website_hr_recruitment/recruitment.py +++ b/addons/website_hr_recruitment/models/hr_job.py @@ -2,11 +2,12 @@ from openerp.osv import osv, fields -# defined for access rules + class hr_job(osv.osv): + """ Override to add website-related columns: published, description. """ _inherit = "hr.job" + _columns = { - 'write_date': fields.datetime('Update Date', readonly=True), 'website_published': fields.boolean('Available in the website'), 'website_description': fields.html('Description for the website'), }