From 9d3faec1b76f3ab0c777826d0bfd6f1fb0a0863f Mon Sep 17 00:00:00 2001 From: Paramjit Singh Sahota Date: Wed, 15 May 2013 18:22:53 +0530 Subject: [PATCH 1/6] [IMP] Added Launch Recruitment and Print Interview in kanban card in Job positions. bzr revid: psa@tinyerp.com-20130515125253-o7vg2vmmxb9hf9vy --- addons/hr_recruitment/hr_recruitment_view.xml | 8 +++++++- addons/hr_recruitment/static/src/css/job_position.css | 3 +++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/addons/hr_recruitment/hr_recruitment_view.xml b/addons/hr_recruitment/hr_recruitment_view.xml index 96ddd2e9e4e..7fd7ebce51a 100644 --- a/addons/hr_recruitment/hr_recruitment_view.xml +++ b/addons/hr_recruitment/hr_recruitment_view.xml @@ -346,6 +346,7 @@ + @@ -370,7 +371,12 @@ Application - + + diff --git a/addons/hr_recruitment/static/src/css/job_position.css b/addons/hr_recruitment/static/src/css/job_position.css index 0f30df708dd..a52291b974a 100644 --- a/addons/hr_recruitment/static/src/css/job_position.css +++ b/addons/hr_recruitment/static/src/css/job_position.css @@ -32,3 +32,6 @@ font-size: 11px; color: gray; } +.openerp .oe_kanban_footer_right { + float: right; +} From 0c62543724319eaeb957f14cff05caecee9d1fb9 Mon Sep 17 00:00:00 2001 From: Paramjit Singh Sahota Date: Wed, 15 May 2013 18:56:25 +0530 Subject: [PATCH 2/6] [IMP] Improved string 'recruitement' => 'recruitment'. bzr revid: psa@tinyerp.com-20130515132625-r7t7ittv2zqno1rc --- addons/hr/hr.py | 4 ++-- addons/hr/hr_view.xml | 2 +- addons/hr/i18n/hr.pot | 4 ++-- addons/hr/test/open2recruit2close_job.yml | 4 ++-- addons/hr_recruitment/hr_recruitment_view.xml | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/addons/hr/hr.py b/addons/hr/hr.py index 8491ca39312..d8497f7f589 100644 --- a/addons/hr/hr.py +++ b/addons/hr/hr.py @@ -117,7 +117,7 @@ class hr_job(osv.osv): 'requirements': fields.text('Requirements'), 'department_id': fields.many2one('hr.department', 'Department'), 'company_id': fields.many2one('res.company', 'Company'), - 'state': fields.selection([('open', 'No Recruitment'), ('recruit', 'Recruitement in Progress')], 'Status', readonly=True, required=True, + 'state': fields.selection([('open', 'No Recruitment'), ('recruit', 'Recruitment 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."), 'color': fields.integer('Color Index'), } @@ -136,7 +136,7 @@ class hr_job(osv.osv): context = {} return {'value': {'expected_employees': no_of_recruitment + no_of_employee}} - def job_recruitement(self, cr, uid, ids, *args): + def job_recruitment(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 self.write(cr, uid, [job.id], {'state': 'recruit', 'no_of_recruitment': no_of_recruitment}) diff --git a/addons/hr/hr_view.xml b/addons/hr/hr_view.xml index b130f47a888..5476901382f 100644 --- a/addons/hr/hr_view.xml +++ b/addons/hr/hr_view.xml @@ -324,7 +324,7 @@
-
diff --git a/addons/hr/i18n/hr.pot b/addons/hr/i18n/hr.pot index bee35b49346..7bb34f2ce68 100644 --- a/addons/hr/i18n/hr.pot +++ b/addons/hr/i18n/hr.pot @@ -162,7 +162,7 @@ msgstr "" #. module: hr #: view:hr.job:0 -msgid "Launch Recruitement" +msgid "Launch Recruitment" msgstr "" #. module: hr @@ -690,7 +690,7 @@ msgstr "" #. module: hr #: selection:hr.job,state:0 -msgid "Recruitement in Progress" +msgid "Recruitment in Progress" msgstr "" #. module: hr diff --git a/addons/hr/test/open2recruit2close_job.yml b/addons/hr/test/open2recruit2close_job.yml index 5a01b55439b..c1d5c606d56 100644 --- a/addons/hr/test/open2recruit2close_job.yml +++ b/addons/hr/test/open2recruit2close_job.yml @@ -10,10 +10,10 @@ - state == 'open' - no_of_recruitment == 0 - - Now, Recruitement is started so I start recruitement of Job Postion of "Developer" Profile. + Now, Recruitment is started so I start recruitment of Job Postion of "Developer" Profile. - !python {model: hr.job}: | - self.job_recruitement(cr, uid, [ref('job_developer')]) + self.job_recruitment(cr, uid, [ref('job_developer')]) - I check 'state' and number of 'Expected in Recruitment' after initiating the recruitment - diff --git a/addons/hr_recruitment/hr_recruitment_view.xml b/addons/hr_recruitment/hr_recruitment_view.xml index 7fd7ebce51a..408d2080839 100644 --- a/addons/hr_recruitment/hr_recruitment_view.xml +++ b/addons/hr_recruitment/hr_recruitment_view.xml @@ -375,7 +375,7 @@ From 1a0daca6b2e9550b28035543990ea201c9bfeccc Mon Sep 17 00:00:00 2001 From: Paramjit Singh Sahota Date: Thu, 16 May 2013 15:20:52 +0530 Subject: [PATCH 3/6] [IMP] Added 'state' field in kanban view to get the kanban header with the state name. bzr revid: psa@tinyerp.com-20130516095052-hhoan2uzybtgbqkb --- addons/hr_recruitment/hr_recruitment_view.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/addons/hr_recruitment/hr_recruitment_view.xml b/addons/hr_recruitment/hr_recruitment_view.xml index 408d2080839..f1a25de92fe 100644 --- a/addons/hr_recruitment/hr_recruitment_view.xml +++ b/addons/hr_recruitment/hr_recruitment_view.xml @@ -348,6 +348,7 @@ +
From 90585320ee318e2ded07d951ec4b06da7eadff15 Mon Sep 17 00:00:00 2001 From: Paramjit Singh Sahota Date: Thu, 16 May 2013 17:03:30 +0530 Subject: [PATCH 4/6] [IMP] Added Recruitment Done button in kanban. bzr revid: psa@tinyerp.com-20130516113330-e43v2aqwh7r1pk3o --- addons/hr_recruitment/hr_recruitment_view.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/hr_recruitment/hr_recruitment_view.xml b/addons/hr_recruitment/hr_recruitment_view.xml index f1a25de92fe..d67427dc382 100644 --- a/addons/hr_recruitment/hr_recruitment_view.xml +++ b/addons/hr_recruitment/hr_recruitment_view.xml @@ -374,9 +374,9 @@
From 92992932a83b44fb4f2d72f2d511552eaa986bb3 Mon Sep 17 00:00:00 2001 From: Paramjit Singh Sahota Date: Fri, 17 May 2013 11:49:53 +0530 Subject: [PATCH 5/6] [IMP] Added css kanban_draghandle. bzr revid: psa@tinyerp.com-20130517061953-5qu18at7zkrzjjiu --- addons/hr_recruitment/static/src/css/job_position.css | 3 +++ 1 file changed, 3 insertions(+) diff --git a/addons/hr_recruitment/static/src/css/job_position.css b/addons/hr_recruitment/static/src/css/job_position.css index a52291b974a..07f721f468d 100644 --- a/addons/hr_recruitment/static/src/css/job_position.css +++ b/addons/hr_recruitment/static/src/css/job_position.css @@ -35,3 +35,6 @@ .openerp .oe_kanban_footer_right { float: right; } +.openerp .oe_kanban_draghandle { + height: 114px; +} \ No newline at end of file From 1d9a315be4ffef5acb7e7967e0707cfc75596077 Mon Sep 17 00:00:00 2001 From: Paramjit Singh Sahota Date: Fri, 17 May 2013 12:27:10 +0530 Subject: [PATCH 6/6] [Revert] Reverted some code of last commits which was removed by mistake. bzr revid: psa@tinyerp.com-20130517065710-zktm4zm955w0wlgf --- addons/hr_recruitment/hr_recruitment_view.xml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/addons/hr_recruitment/hr_recruitment_view.xml b/addons/hr_recruitment/hr_recruitment_view.xml index e0c2725e39c..b830c10be20 100644 --- a/addons/hr_recruitment/hr_recruitment_view.xml +++ b/addons/hr_recruitment/hr_recruitment_view.xml @@ -374,6 +374,10 @@
Expected in Recruitment
+ + +

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

+