From 9f22af90b0630bb31c3898b6c40521d32abbddc4 Mon Sep 17 00:00:00 2001 From: "Foram Katharotiya (OpenERP)" Date: Tue, 18 Sep 2012 17:00:50 +0530 Subject: [PATCH 1/3] [IMP] improve code in hr_evolution bzr revid: fka@tinyerp.com-20120918113050-fdmjegoq0r7tilbm --- addons/hr_evaluation/hr_evaluation_data.xml | 6 ------ addons/hr_evaluation/hr_evaluation_view.xml | 2 +- addons/hr_evaluation/security/ir.model.access.csv | 2 +- addons/survey/wizard/survey_answer.py | 1 - 4 files changed, 2 insertions(+), 9 deletions(-) diff --git a/addons/hr_evaluation/hr_evaluation_data.xml b/addons/hr_evaluation/hr_evaluation_data.xml index 2cf656a72bb..1c197715cb7 100644 --- a/addons/hr_evaluation/hr_evaluation_data.xml +++ b/addons/hr_evaluation/hr_evaluation_data.xml @@ -399,12 +399,6 @@ Once the form had been filled, the employee send it to his supervisor. char - - Title - - char - - 1 1 diff --git a/addons/hr_evaluation/hr_evaluation_view.xml b/addons/hr_evaluation/hr_evaluation_view.xml index 8744567c597..29d68d7a12c 100644 --- a/addons/hr_evaluation/hr_evaluation_view.xml +++ b/addons/hr_evaluation/hr_evaluation_view.xml @@ -239,7 +239,7 @@ Appraisal hr_evaluation.evaluation form - tree,form,graph + tree,form {"search_default_next_month":1} diff --git a/addons/hr_evaluation/security/ir.model.access.csv b/addons/hr_evaluation/security/ir.model.access.csv index f9b8897eb01..a304ee84c10 100644 --- a/addons/hr_evaluation/security/ir.model.access.csv +++ b/addons/hr_evaluation/security/ir.model.access.csv @@ -39,4 +39,4 @@ access_survey_response_hr_employee,survey.response.employee,survey.model_survey_ access_survey_question_column_heading_hr_employee,survey.question.column.heading.employee,survey.model_survey_question_column_heading,base.group_user,1,0,0,0 access_survey_response_line_hr_employee,survey.response.line.employee,survey.model_survey_response_line,base.group_user,1,1,1,0 access_survey_response_answer_hr_employee,survey.response.answer.hr.employee,survey.model_survey_response_answer,base.group_user,1,1,1,0 - +access_survey_tbl_column_heading_hr_employee,survey.tbl.column.heading,survey.model_survey_tbl_column_heading,base.group_user,1,1,1,0 diff --git a/addons/survey/wizard/survey_answer.py b/addons/survey/wizard/survey_answer.py index 2b774a22feb..59bbb629168 100644 --- a/addons/survey/wizard/survey_answer.py +++ b/addons/survey/wizard/survey_answer.py @@ -600,7 +600,6 @@ class survey_question_wiz(osv.osv_memory): if context.has_key('cur_id'): if context.has_key('request') and context.get('request',False): self.pool.get(context.get('object',False)).write(cr, uid, [int(context.get('cur_id',False))], {'response' : response_id}) - self.pool.get(context.get('object',False)).survey_req_done(cr, uid, [int(context.get('cur_id'))], context) else: self.pool.get(context.get('object',False)).write(cr, uid, [int(context.get('cur_id',False))], {'response' : response_id}) if sur_name_read['store_ans'] and type(safe_eval(sur_name_read['store_ans'])) == dict: From 2d8aed78463c1ba5049bcae449b4d7b41a7bea13 Mon Sep 17 00:00:00 2001 From: "Foram Katharotiya (OpenERP)" Date: Tue, 18 Sep 2012 18:11:55 +0530 Subject: [PATCH 2/3] [IMP] change statename cancelled to draft in appraisal form bzr revid: fka@tinyerp.com-20120918124155-4uy3d2z3f787tzav --- addons/survey/survey.py | 6 +++--- addons/survey/survey_view.xml | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/addons/survey/survey.py b/addons/survey/survey.py index dde3130e9c5..be3d0f518c5 100644 --- a/addons/survey/survey.py +++ b/addons/survey/survey.py @@ -59,7 +59,7 @@ class survey(osv.osv): help="Set to one if survey is answerable only once"), 'response_user': fields.integer('Maximum Answer per User', help="Set to one if you require only one Answer per user"), - 'state': fields.selection([('open', 'Open'), ('cancel', 'Cancelled'),('close', 'Closed') ], 'Status', readonly=True), + 'state': fields.selection([('draft', 'Draft'),('open', 'Open'), ('close', 'Closed') ], 'Status', readonly=True), 'responsible_id': fields.many2one('res.users', 'Responsible', help="User responsible for survey"), 'tot_start_survey': fields.integer("Total Started Survey", readonly=1), 'tot_comp_survey': fields.integer("Total Completed Survey", readonly=1), @@ -87,8 +87,8 @@ class survey(osv.osv): self.write(cr, uid, ids, {'state': 'close', 'date_close': strftime("%Y-%m-%d %H:%M:%S") }) return True - def survey_cancel(self, cr, uid, ids, arg): - self.write(cr, uid, ids, {'state': 'cancel' }) + def survey_draft(self, cr, uid, ids, arg): + self.write(cr, uid, ids, {'state': 'draft' }) return True def copy(self, cr, uid, ids, default=None, context=None): diff --git a/addons/survey/survey_view.xml b/addons/survey/survey_view.xml index 8f855084069..ac23c5a7f3f 100644 --- a/addons/survey/survey_view.xml +++ b/addons/survey/survey_view.xml @@ -19,10 +19,10 @@
-
From f3067a68f0683f396e817e3e216bedf1230dd53b Mon Sep 17 00:00:00 2001 From: "Foram Katharotiya (OpenERP)" Date: Tue, 18 Sep 2012 18:25:56 +0530 Subject: [PATCH 3/3] [IMP] improve code bzr revid: fka@tinyerp.com-20120918125556-sthjavjc6yvc399b --- addons/hr_evaluation/test/test_hr_evaluation.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/addons/hr_evaluation/test/test_hr_evaluation.yml b/addons/hr_evaluation/test/test_hr_evaluation.yml index 2bdc3513962..a66731531fa 100644 --- a/addons/hr_evaluation/test/test_hr_evaluation.yml +++ b/addons/hr_evaluation/test/test_hr_evaluation.yml @@ -54,7 +54,6 @@ str(ref("survey_question_2")) +"_" +str(ref("survey_answer_20")) + "_multi" :'3', str(ref("survey_question_2")) +"_" +str(ref("survey_answer_25")) + "_multi" :'2011-12-02 16:42:00', str(ref("survey_question_2")) +"_" +str(ref("survey_answer_43")) + "_multi" :'HR', - str(ref("survey_question_2")) +"_" +str(ref("survey_answer_98")) + "_multi" :'tpa review' }, context = ctx) - I close this Evaluation survey by giving answer of questions.