Merge lp:~openerp-dev/openobject-addons/trunk-bug-1219790-cod into lp:openobject-addons

[Chirag Dodiya(OpenERP)]

Hello,

     I have fixed this 2 bugs in hr recruitment,
       -> traceback when completing the survey,
       -> Print interview not working properly.

Thanks,
Chirag Dodiya(cod).

[PkLab.net (pklab)]

Hallo,
in your proposed branch the file survey/report/survey_browse_response.py calls to object registry = openerp.registry(cr.dbname) but I can't find the object openerp.registry in Trunk v.7.0.

Unmerged revisions

9063. By Chirag Dodiya(OpenERP) on 2014-01-27

[FIX]traceback when completing the survey

9062. By Chirag Dodiya(OpenERP) on 2014-01-21

[IMP]Improved yml test case

9061. By Chirag Dodiya(OpenERP) on 2014-01-21

[IMP]Improved code to solve traceback

9060. By Chirag Dodiya(OpenERP) on 2014-01-21

[FIX]Traceback: KeyError: active_ids

9059. By Chirag Dodiya(OpenERP) on 2014-01-21

[FIX]added applicant field in survey response and improved code to print interview

=== modified file 'hr_evaluation/test/test_hr_evaluation.yml'
--- hr_evaluation/test/test_hr_evaluation.yml	2013-10-27 12:31:04 +0000
+++ hr_evaluation/test/test_hr_evaluation.yml	2014-01-28 05:13:09 +0000
@@ -46,7 +46,7 @@
     interview_obj = self.pool.get('hr.evaluation.interview')
     interview_ids = interview_obj.search(cr, uid, [('evaluation_id','=', ref('hr_evaluation_evaluation_0'))])
     assert len(interview_ids), "Interview evaluation survey not created"
-    ctx = {'active_model':'hr.evaluation.interview', 'active_id': interview_ids[0], 'active_ids': [interview_ids], 'survey_id': ref("survey_2")}
+    ctx = {'active_model':'hr.evaluation.interview', 'active_id': interview_ids[0], 'active_ids': interview_ids, 'survey_id': ref("survey_2")}
     name_id = name_wiz_obj.create(cr, uid, {'survey_id': ref("survey_2")})
     ctx ["sur_name_id"] = name_id
     self.create(cr, uid, {str(ref("survey_question_2")) +"_" +str(ref("survey_answer_1")) + "_multi" :'tpa',

=== modified file 'survey/report/survey_browse_response.py'
--- survey/report/survey_browse_response.py	2013-11-27 15:32:57 +0000
+++ survey/report/survey_browse_response.py	2014-01-28 05:13:09 +0000
@@ -196,7 +196,7 @@
         if datas.has_key('form') and datas['form'].has_key('response_ids'):
             response_id = datas['form']['response_ids']
         elif context.has_key('response_id') and context['response_id']:
-            response_id = [int(context['response_id'][0])]
+            response_id = context['response_id']
         else:
             response_id = surv_resp_obj.search(cr, uid, [('survey_id', 'in', ids)])
 

=== modified file 'survey/survey.py'
--- survey/survey.py	2013-10-27 12:31:04 +0000
+++ survey/survey.py	2014-01-28 05:13:09 +0000
@@ -111,15 +111,19 @@
             context = {}
         datas = {}
         if 'response_id' in context:
-            response_id = context.get('response_id', 0)
-            datas['ids'] = [context.get('survey_id', 0)]
+            if context.get('response_id')[0] == 0:
+                response_id = self.pool.get('survey.response').search(cr, uid, [('applicant', '=', ids[0])], context=context)
+                datas['ids'] = [context.get('survey_id', 0)]
+            else:
+                response_id = context.get('response_id', 0)
+                datas['ids'] = [context.get('response_id', 0)]
         else:
             response_id = self.pool.get('survey.response').search(cr, uid, [('survey_id','=', ids)], context=context)
             datas['ids'] = ids
         page_setting = {'orientation': 'vertical', 'without_pagebreak': 0, 'paper_size': 'letter', 'page_number': 1, 'survey_title': 1}
         report = {}
         if response_id and response_id[0]:
-            context.update({'survey_id': datas['ids']})
+            context.update({'survey_id': datas['ids'], 'response_id':response_id})
             datas['form'] = page_setting
             datas['model'] = 'survey.print.answer'
             report = {
@@ -658,6 +662,7 @@
         'question_ids' : fields.one2many('survey.response.line', 'response_id', 'Answer'),
         'state' : fields.selection([('done', 'Finished '),('skip', 'Not Finished')], \
                             'Status', readonly=True),
+        'applicant': fields.integer("Applicant"),
     }
     _defaults = {
         'state' : lambda * a: "skip",

=== modified file 'survey/wizard/survey_answer.py'
--- survey/wizard/survey_answer.py	2013-10-27 12:31:04 +0000
+++ survey/wizard/survey_answer.py	2014-01-28 05:13:09 +0000
@@ -400,7 +400,7 @@
                     result['context'] = context
                 else:
                     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'})
+                    sur_response_obj.write(cr, uid, [int(sur_name_read.response)], {'state' : 'done'})
 
                     # mark the survey request as done; call 'survey_req_done' on its actual model
                     if context.get('active_model') in self.pool:
@@ -593,13 +593,13 @@
         response_id =  0
 
         if not sur_name_read['response']:
-            response_id = surv_all_resp_obj.create(cr, uid, {'response_type':'link', 'user_id':uid, 'date_create':datetime.datetime.now(), 'survey_id' : context['survey_id']})
+            response_id = surv_all_resp_obj.create(cr, uid, {'response_type':'link', 'user_id':uid, 'date_create':datetime.datetime.now(), 'survey_id' : context['survey_id'], 'applicant':context.get('active_ids',[0])[0]})
             surv_name_wiz.write(cr, uid, [context.get('sur_name_id', False)], {'response' : tools.ustr(response_id)})
         else:
             response_id = int(sur_name_read['response'])
 
         if response_id not in surv_all_resp_obj.search(cr, uid, []):
-            response_id = surv_all_resp_obj.create(cr, uid, {'response_type':'link', 'user_id':uid, 'date_create':datetime.datetime.now(), 'survey_id' : context.get('survey_id',False)})
+            response_id = surv_all_resp_obj.create(cr, uid, {'response_type':'link', 'user_id':uid, 'date_create':datetime.datetime.now(), 'survey_id' : context.get('survey_id',False), 'applicant':context.get('active_ids',[0])[0]})
             surv_name_wiz.write(cr, uid, [context.get('sur_name_id',False)], {'response' : tools.ustr(response_id)})
 
         #click first time on next button then increemnet on total start suvey