pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[IMP] removed survey_req_draft method and used active_model to determin survey request

Browse Source 
bzr revid: han@tinyerp.com-20120106102034-qnyfyil9kiop2k1c
This commit is contained in:
Hardik Ansodariy (OpenERP)
2012-01-06 15:50:34 +05:30
parent 278ab8a96a
commit 7f49d4d173
2 changed files with 4 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/hr_evaluation/hr_evaluation.py
+1 -7
View File
@@ -224,8 +224,6 @@ class hr_evaluation(osv.osv):
wait = True
if not wait:
hr_eval_inter_obj.survey_req_waiting_answer(cr, uid, [int_id], context=context)
elif wait:
hr_eval_inter_obj.survey_req_draft_answer(cr, uid, [int_id], context=context)
if (not wait) and phase.mail_feature:
body = phase.mail_body % {'employee_name': child.name, 'user_signature': child.user_id.signature,
@@ -279,7 +277,7 @@ class survey_request(osv.osv):
'is_evaluation': fields.boolean('Is Appraisal?'),
}
_defaults = {
'state': 'waiting_answer',
'state': 'draft',
}
survey_request()
@@ -311,10 +309,6 @@ class hr_evaluation_interview(osv.osv):
def survey_req_waiting_answer(self, cr, uid, ids, context=None):
self.write(cr, uid, ids, { 'state': 'waiting_answer'}, context=context)
return True
def survey_req_draft_answer(self, cr, uid, ids, context=None):
self.write(cr, uid, ids, { 'state': 'draft'}, context=context)
return True
def survey_req_done(self, cr, uid, ids, context=None):
hr_eval_obj = self.pool.get('hr_evaluation.evaluation')
addons/survey/wizard/survey_answer.py
+3 -6
View File
@@ -56,7 +56,6 @@ class survey_question_wiz(osv.osv_memory):
que_col_head = self.pool.get('survey.question.column.heading')
user_obj = self.pool.get('res.users')
mail_message = self.pool.get('mail.message')
obj_module = self.pool.get('ir.module.module')
if view_type in ['form']:
wiz_id = 0
@@ -395,11 +394,9 @@ class survey_question_wiz(osv.osv_memory):
survey_data = survey_obj.browse(cr, uid, survey_id)
response_id = surv_name_wiz.read(cr, uid, context.get('sur_name_id',False))['response']
context.update({'response_id':response_id})
module_id = obj_module.search(cr, uid, [('name', '=', 'hr_evaluation')])
state = obj_module.browse(cr, uid, module_id, context=context)[0].state
if state == 'installed':
interview_id = context.get('active_ids',False)
eval_inter_obj = self.pool.get('hr.evaluation.interview').survey_req_done(cr, uid, interview_id, context=context)
survey_req_obj = self.pool.get(context.get('active_model'))
if survey_req_obj and hasattr(survey_req_obj, 'survey_req_done'):
survey_req_obj.survey_req_done(cr, uid, context.get('active_ids', []), context=context)
report = self.create_report(cr, uid, [survey_id], 'report.survey.browse.response', survey_data.title,context)
attachments = {}
file = open(addons.get_module_resource('survey', 'report') + survey_data.title + ".pdf")