odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[MERGE] survey: fix code of survey.request to satisfy sequence of appraisals in hr.evaluation.interview 

bzr revid: rco@openerp.com-20120109140209-lc4v3yromapaonhy
This commit is contained in:
Raphael Collet 2012-01-09 15:02:09 +01:00
parent c328bc1e20 fd5d00946f
commit aabacffb77
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
addons/hr_evaluation/hr_evaluation.py
View File

@ -276,9 +276,6 @@ class survey_request(osv.osv):
_columns = {
'is_evaluation': fields.boolean('Is Appraisal?'),
}
_defaults = {
'state': 'waiting_answer',
}
survey_request()

5
addons/survey/wizard/survey_answer.py
View File

@ -391,6 +391,11 @@ class survey_question_wiz(osv.osv_memory):
survey_obj.write(cr, uid, survey_id, {'tot_comp_survey' : sur_rec.tot_comp_survey + 1})
sur_response_obj.write(cr, uid, [sur_name_read.response], {'state' : 'done'})
# mark the survey request as done; call 'survey_req_done' on its actual model
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)
if sur_rec.send_response:
survey_data = survey_obj.browse(cr, uid, survey_id)
response_id = surv_name_wiz.read(cr, uid, context.get('sur_name_id',False))['response']