diff --git a/addons/hr_evaluation/__openerp__.py b/addons/hr_evaluation/__openerp__.py
index bed442dc2ad..f082d9bfcef 100644
--- a/addons/hr_evaluation/__openerp__.py
+++ b/addons/hr_evaluation/__openerp__.py
@@ -20,7 +20,7 @@
##############################################################################
{
- "name" : "Periodic Evaluations",
+ "name" : "HR Periodic Appraisals",
"version": "0.1",
"author": "OpenERP SA",
"category": "Human Resources",
diff --git a/addons/hr_evaluation/hr_evaluation.py b/addons/hr_evaluation/hr_evaluation.py
index 03ff1692009..e1d451c9f7f 100644
--- a/addons/hr_evaluation/hr_evaluation.py
+++ b/addons/hr_evaluation/hr_evaluation.py
@@ -28,13 +28,13 @@ from tools.translate import _
class hr_evaluation_plan(osv.osv):
_name = "hr_evaluation.plan"
- _description = "Evaluation Plan"
+ _description = "Appraisal Plan"
_columns = {
- 'name': fields.char("Evaluation Plan", size=64, required=True),
+ 'name': fields.char("Appraisal Plan", size=64, required=True),
'company_id': fields.many2one('res.company', 'Company', required=True),
- 'phase_ids': fields.one2many('hr_evaluation.plan.phase', 'plan_id', 'Evaluation Phases'),
- 'month_first': fields.integer('First Evaluation in (months)', help="This number of months will be used to schedule the first evaluation date of the employee when selecting an evaluation plan. "),
- 'month_next': fields.integer('Periodicity of Evaluations (months)', help="The number of month that depicts the delay between each evaluation of this plan (after the first one)."),
+ 'phase_ids': fields.one2many('hr_evaluation.plan.phase', 'plan_id', 'Appraisal Phases'),
+ 'month_first': fields.integer('First Appraisal in (months)', help="This number of months will be used to schedule the first evaluation date of the employee when selecting an evaluation plan. "),
+ 'month_next': fields.integer('Periodicity of Appraisal (months)', help="The number of month that depicts the delay between each evaluation of this plan (after the first one)."),
'active': fields.boolean('Active')
}
_defaults = {
@@ -47,13 +47,13 @@ hr_evaluation_plan()
class hr_evaluation_plan_phase(osv.osv):
_name = "hr_evaluation.plan.phase"
- _description = "Evaluation Plan Phase"
+ _description = "Appraisal Plan Phase"
_order = "sequence"
_columns = {
'name': fields.char("Phase", size=64, required=True),
'sequence': fields.integer("Sequence"),
'company_id': fields.related('plan_id', 'company_id', type='many2one', relation='res.company', string='Company', store=True, readonly=True),
- 'plan_id': fields.many2one('hr_evaluation.plan','Evaluation Plan', ondelete='cascade'),
+ 'plan_id': fields.many2one('hr_evaluation.plan','Appraisal Plan', ondelete='cascade'),
'action': fields.selection([
('top-down','Top-Down Appraisal Requests'),
('bottom-up','Bottom-Up Appraisal Requests'),
@@ -101,8 +101,8 @@ class hr_employee(osv.osv):
_name = "hr.employee"
_inherit="hr.employee"
_columns = {
- 'evaluation_plan_id': fields.many2one('hr_evaluation.plan', 'Evaluation Plan'),
- 'evaluation_date': fields.date('Next Evaluation Date', help="The date of the next evaluation is computed by the evaluation plan's dates (first evaluation + periodicity)."),
+ 'evaluation_plan_id': fields.many2one('hr_evaluation.plan', 'Appraisal Plan'),
+ 'evaluation_date': fields.date('Next Appraisal Date', help="The date of the next appraisal is computed by the appraisal plan's dates (first appraisal + periodicity)."),
}
def run_employee_evaluation(self, cr, uid, automatic=False, use_new_cursor=False, context=None):
@@ -141,12 +141,12 @@ hr_employee()
class hr_evaluation(osv.osv):
_name = "hr_evaluation.evaluation"
- _description = "Employee Evaluation"
+ _description = "Employee Appraisal"
_rec_name = 'employee_id'
_columns = {
- 'date': fields.date("Evaluation Deadline", required=True, select=True),
+ 'date': fields.date("Appraisal Deadline", required=True, select=True),
'employee_id': fields.many2one('hr.employee', "Employee", required=True),
- 'note_summary': fields.text('Evaluation Summary'),
+ 'note_summary': fields.text('Appraisal Summary'),
'note_action': fields.text('Action Plan',
help="If the evaluation does not meet the expectations, you can propose"+
"an action plan"),
@@ -271,7 +271,7 @@ hr_evaluation()
class survey_request(osv.osv):
_inherit = "survey.request"
_columns = {
- 'is_evaluation': fields.boolean('Is Evaluation?'),
+ 'is_evaluation': fields.boolean('Is Appraisal?'),
}
_defaults = {
'state': 'waiting_answer',
@@ -283,11 +283,11 @@ class hr_evaluation_interview(osv.osv):
_name = 'hr.evaluation.interview'
_inherits = {'survey.request': 'request_id'}
_rec_name = 'request_id'
- _description = 'Evaluation Interview'
+ _description = 'Appraisal Interview'
_columns = {
'request_id': fields.many2one('survey.request','Request_id', ondelete='cascade', required=True),
'user_to_review_id': fields.many2one('hr.employee', 'Employee to Interview'),
- 'evaluation_id': fields.many2one('hr_evaluation.evaluation', 'Evaluation Form'),
+ 'evaluation_id': fields.many2one('hr_evaluation.evaluation', 'Appraisal Form'),
}
_defaults = {
'is_evaluation': True,
@@ -314,7 +314,7 @@ class hr_evaluation_interview(osv.osv):
wating_id = 0
tot_done_req = 1
if not id.evaluation_id.id:
- raise osv.except_osv(_('Warning !'),_("You cannot start evaluation without Evaluation."))
+ raise osv.except_osv(_('Warning !'),_("You cannot start evaluation without Appraisal."))
records = hr_eval_obj.browse(cr, uid, [id.evaluation_id.id], context=context)[0].survey_request_ids
for child in records:
if child.state == "draft":
diff --git a/addons/hr_evaluation/hr_evaluation_data.xml b/addons/hr_evaluation/hr_evaluation_data.xml
index b69671f2343..6745b997b3f 100644
--- a/addons/hr_evaluation/hr_evaluation_data.xml
+++ b/addons/hr_evaluation/hr_evaluation_data.xml
@@ -1210,6 +1210,24 @@ Once the form had been filled, the employee send it to his supervisor.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/addons/hr_evaluation/hr_evaluation_view.xml b/addons/hr_evaluation/hr_evaluation_view.xml
index 46b9994c09e..e15b461d2e2 100644
--- a/addons/hr_evaluation/hr_evaluation_view.xml
+++ b/addons/hr_evaluation/hr_evaluation_view.xml
@@ -7,7 +7,7 @@
hr_evaluation.plan
search
-
+
@@ -25,18 +25,17 @@
hr_evaluation.plan
form
-
- Evaluation Plans
+ Appraisal Plans
hr_evaluation.plan
form
tree,form
-
-
+
+
@@ -73,7 +72,7 @@
hr_evaluation.plan.phase
form
-
@@ -126,7 +125,7 @@
hr_evaluation.plan.phase
tree
-
+
@@ -142,7 +141,7 @@
-
+
@@ -155,9 +154,9 @@
hr_evaluation.evaluation
form
-
diff --git a/addons/hr_evaluation/security/hr_evaluation_security.xml b/addons/hr_evaluation/security/hr_evaluation_security.xml
index c99ddf41545..e2f7978daea 100644
--- a/addons/hr_evaluation/security/hr_evaluation_security.xml
+++ b/addons/hr_evaluation/security/hr_evaluation_security.xml
@@ -33,6 +33,22 @@
['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]
+
+
+ Employee Interview
+
+ ['|',('user_id','=',user.id),('user_id','=',False)]
+
+
+
+
+
+ Employee Interview - HR
+
+ [(1,'=',1)]
+
+
+
diff --git a/addons/hr_evaluation/security/ir.model.access.csv b/addons/hr_evaluation/security/ir.model.access.csv
index 1a90b98931d..377098a6fe6 100644
--- a/addons/hr_evaluation/security/ir.model.access.csv
+++ b/addons/hr_evaluation/security/ir.model.access.csv
@@ -4,6 +4,7 @@
"access_hr_evaluation_plan_user","hr_evaluation.plan.user","model_hr_evaluation_plan","base.group_hr_user",1,1,1,1
"access_hr_evaluation_plan_phase_user","hr_evaluation.plan.phase.user","model_hr_evaluation_plan_phase","base.group_hr_user",1,1,1,1
"access_hr_evaluation_interview_user","hr.evaluation.interview.user","model_hr_evaluation_interview","base.group_hr_user",1,1,1,1
+"access_hr_evaluation_interview_employee","hr.evaluation.interview.employee","model_hr_evaluation_interview","base.group_user",1,1,1,0
"access_hr_evaluation_report","hr.evaluation.report","model_hr_evaluation_report","base.group_hr_manager",1,1,1,1
"access_survey_type_hr_manager","survey.type","survey.model_survey_type","base.group_hr_manager",1,1,1,1
"access_survey_hr_manager","survey.hr.manager","survey.model_survey","base.group_hr_manager",1,1,1,1
@@ -25,6 +26,7 @@
"access_survey_response_hr_user","survey.response.hr.user","survey.model_survey_response","base.group_hr_user",1,1,1,0
"access_survey_history_hr_user","survey.history.hr.user","survey.model_survey_history","base.group_hr_user",1,1,1,0
"access_survey_request_hr_user","survey.request.hr.user","survey.model_survey_request","base.group_hr_user",1,1,1,0
+"access_survey_request_hr_employee","survey.request.hr.employee","survey.model_survey_request","base.group_user",1,1,1,0
"access_survey_question_column_heading_hr_user","survey.question.column.heading.hr.user","survey.model_survey_question_column_heading","base.group_hr_user",1,0,0,0
"access_survey_response_line_hr_user","survey.response.line.hr.user","survey.model_survey_response_line","base.group_hr_user",1,1,1,0
"access_survey_tbl_column_heading_hr_user","survey.tbl.column.heading.hr.user","survey.model_survey_tbl_column_heading","base.group_hr_user",1,1,1,0