diff --git a/addons/hr_recruitment/hr_recruitment_view.xml b/addons/hr_recruitment/hr_recruitment_view.xml index dded03374a0..6839d54c855 100644 --- a/addons/hr_recruitment/hr_recruitment_view.xml +++ b/addons/hr_recruitment/hr_recruitment_view.xml @@ -366,19 +366,16 @@
-

-
- %% +
+
-
-
- -
- -
- -
+
+
+
+ +
+
-
Expected New Employees
-
Expected New Employee
+
Expected New Employees
+
Expected New Employee
Forecast
-

To start a recruitment phase for this job position,click here

+

To start the recruitment,click here

diff --git a/addons/hr_recruitment/res_config.py b/addons/hr_recruitment/res_config.py index 7078500bba7..25bb15646f1 100644 --- a/addons/hr_recruitment/res_config.py +++ b/addons/hr_recruitment/res_config.py @@ -40,20 +40,18 @@ class hr_applicant_settings(osv.osv_memory): def get_default_alias_prefix(self, cr, uid, ids, context=None): alias_name = '' mail_alias = self.pool.get('mail.alias') - model_ids = self.pool.get('ir.model').search(cr, uid, [('model', '=', 'hr.applicant')], context=context) - alias_ids = mail_alias.search(cr, uid, [('alias_model_id', '=', model_ids[0])], context=context) - if alias_ids: - alias_name = mail_alias.browse(cr, uid, alias_ids[0], context=context).alias_name + alias = self.pool.get('ir.model.data').get_object(cr, uid, 'hr_recruitment', 'mail_alias_jobs') + if alias: + alias_name = alias.alias_name return {'alias_prefix': alias_name} def set_default_alias_prefix(self, cr, uid, ids, context=None): mail_alias = self.pool.get('mail.alias') record = self.browse(cr, uid, ids[0], context=context) if record.alias_prefix: - model_ids = self.pool.get('ir.model').search(cr, uid, [('model', '=', 'hr.applicant')], context=context) - alias_ids = mail_alias.search(cr, uid, [('alias_model_id', '=', model_ids[0])], context=context) - if alias_ids: - mail_alias.write(cr, uid, alias_ids[0],{'alias_name': record.alias_prefix}, context=context) + alias = self.pool.get('ir.model.data').get_object(cr, uid, 'hr_recruitment', 'mail_alias_jobs') + if alias: + alias.write({'alias_name': record.alias_prefix}) else: mail_alias.create_unique_alias(cr, uid, {'alias_name': record.alias_prefix}, model_name="hr.applicant", context=context) diff --git a/addons/hr_recruitment/static/src/css/job_position.css b/addons/hr_recruitment/static/src/css/job_position.css index 050a6c9a9ad..700192abccd 100644 --- a/addons/hr_recruitment/static/src/css/job_position.css +++ b/addons/hr_recruitment/static/src/css/job_position.css @@ -1,17 +1,19 @@ .openerp .oe_kanban_job{ width: 355px; - min-height: 152px !important; + min-height: 125px !important; } .openerp .oe_job { font-size: 112%; + position: inline; margin: 3px 3px; - margin-left: 55px; + margin-left: 70px; color: #4c4c4c; } .openerp img.oe_kanban_avatar { - margin-top: -23px; - width: 45px; - height: 45px; + margin-top: -40px; + position: absolute; + width: 60px; + height: 60px; } .openerp .oe_launch_recruitment{ float: right; @@ -26,9 +28,11 @@ text-decoration: underline } .openerp .oe_name { - margin-left: 55px; - margin-top: -22px; - margin-bottom: -15px; + font-size: 14px; +} +.openerp .oe_manager_name { + margin-left: 70px; + position: absolute; font-size: 11px; color: gray; } @@ -40,7 +44,7 @@ color: #4c4c4c; } .openerp .oe_start_recruitment { - padding-top: 10px; + padding-top: 20px; } .openerp .oe_start_recruitment p { font-size: 14px;