summaryrefslogtreecommitdiff
path: root/addons/hr_evaluation/security
diff options
context:
space:
mode:
authorAMP (OpenERP) <amp@tinyerp.com>2010-09-18 13:09:24 +0530
committerAMP (OpenERP) <amp@tinyerp.com>2010-09-18 13:09:24 +0530
commitb4a3da2cc0c5167fa2041d2de854cbd86add03cb (patch)
treebe94ce8cf0d81724714a0f21fe81f3ae2f6ce1b6 /addons/hr_evaluation/security
parent01d5194378e7d90642dbfcf1925a8ebfcdf6119b (diff)
[MOD]hr_*: usability improvement
bzr revid: amp@tinyerp.com-20100918073924-3020grhwot6v837w
Diffstat (limited to 'addons/hr_evaluation/security')
-rw-r--r--addons/hr_evaluation/security/ir.model.access.csv4
1 files changed, 1 insertions, 3 deletions
diff --git a/addons/hr_evaluation/security/ir.model.access.csv b/addons/hr_evaluation/security/ir.model.access.csv
index 47cb2dbebd1..d5c554f03f6 100644
--- a/addons/hr_evaluation/security/ir.model.access.csv
+++ b/addons/hr_evaluation/security/ir.model.access.csv
@@ -12,12 +12,10 @@
"access_hr_evaluation_plan_phase_system","hr_evaluation.plan.phase.system","model_hr_evaluation_plan_phase","base.group_system",1,1,1,1
"access_hr_evaluation_evaluation_system","hr_evaluation.evaluation.system","model_hr_evaluation_evaluation","base.group_system",1,0,0,0
"access_hr_evaluation_interview_system","hr.evaluation.interview.system","model_hr_evaluation_interview","base.group_system",1,0,0,0
-<<<<<<< TREE
"access_hr_evaluation_evaluation_employee","hr_evaluation.evaluation.employee","model_hr_evaluation_evaluation","base.group_user",1,0,0,0
"access_hr_evaluation_interview_employee","hr.evaluation.interview.employee","model_hr_evaluation_interview","base.group_user",1,0,0,0
"access_hr_evaluation_user","hr_evaluation.user","model_hr_evaluation_plan","base.group_hr_user",1,0,0,0
"access_hr_evaluation_employee","hr_evaluation.employee","model_hr_evaluation_plan","base.group_user",1,0,0,0
-=======
"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
"access_survey_history_manager","survey.history","survey.model_survey_history","base.group_hr_manager",1,1,1,1
@@ -34,4 +32,4 @@
"access_survey_answer_hr_user","survey.answer.hr.user","survey.model_survey_answer","base.group_hr_user",1,1,1,0
"access_survey_response_answer_hr_user","survey.response.answer.hr.user","survey.model_survey_response_answer","base.group_hr_user",1,1,1,0
"access_survey_type_hr_user","survey.type.hr.user","survey.model_survey_type","base.group_hr_user",1,1,1,0
-"access_survey_question_hr_user","survey.question.hr.user","survey.model_survey_question","base.group_hr_user",1,1,1,0>>>>>>> MERGE-SOURCE
+"access_survey_question_hr_user","survey.question.hr.user","survey.model_survey_question","base.group_hr_user",1,1,1,0>>>>>>>