From aff3c88483b7ce562d2574bad8a75aed65e082c3 Mon Sep 17 00:00:00 2001
From: "Ysa(Open ERP)" <>
Date: Tue, 2 Mar 2010 18:54:06 +0530
Subject: [PATCH] [IMP] hr_recruitment :- add two button in applicants view.
 and improvement in survey module

bzr revid: apa@tinyerp.com-20100302132406-rh4vmdxp3tuy0lyl
---
 addons/hr_recruitment/hr_hr_view.xml           | 13 ++++---------
 addons/survey/report/survey_browse_response.py |  2 +-
 2 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/addons/hr_recruitment/hr_hr_view.xml b/addons/hr_recruitment/hr_hr_view.xml
index 41462c672e5..67f5ef6783c 100644
--- a/addons/hr_recruitment/hr_hr_view.xml
+++ b/addons/hr_recruitment/hr_hr_view.xml
@@ -68,7 +68,7 @@
         <field name="type">form</field>
         <field name="arch" type="xml">
             <form string="Jobs - Recruitment Form">
-                <group colspan="4" col="7">
+                <group colspan="4" col="8">
                     <field name="name" string="Subject"/>
                     <label string="Stage: " align="1.0"/>
                     <group colspan="1" col="2">
@@ -78,20 +78,15 @@
                     <field name="user_id"/>
                     <button string="Schedule a Phone Call"
                         name="%(wizard_hr_job_reschedule_phone_call)d" icon="gtk-redo" type="action"/>
+                    <button name="%(survey.action_view_survey_question_message)d" string="Interview Question" type="action"
+						icon="gtk-execute" context="{'survey_id': survey, 'response_id': response ,'active' : response, 'object' : 'hr.applicant', 'cur_id' :active_id}" attrs="{'readonly':[('survey','=',False)]}"/>
                     <newline/>
                     <field name="partner_name"/>
                     <field name="job_id"/>
                     <field name="department_id" widget="selection"/>
                     <button name="%(wizard_hr_job_meeting_set)d" string="Schedule Meeting" icon="terp-hr" type="action"/>
-					<label string=" " colspan = "1"/>
-					<label string=" " colspan = "1"/>
-					<label string=" " colspan = "1"/>
-					<label string=" " colspan = "1"/>
-					<label string=" " colspan = "1"/>
-					<button name="%(survey.action_view_survey_question_message)d" string="Interview Question" type="action"
-						icon="gtk-execute" context="{'survey_id': survey, 'response_id': response ,'active' : response, 'object' : 'hr.applicant', 'cur_id' :active_id}" attrs="{'readonly':[('survey','=',False)]}"/>
 					<button name="%(survey.survey_browse_response)d" string="Print Interview" type="action"
-						icon="gtk-execute" context="{'survey_id': survey, 'response_id' : response,}" attrs="{'readonly':[('survey','=',False)]}"/>
+						icon="gtk-print" context="{'survey_id': survey, 'response_id' : response,}" attrs="{'readonly':[('response','=',False)]}" />
 				</group>
                 <notebook colspan="4">
                     <page string="Job Info">
diff --git a/addons/survey/report/survey_browse_response.py b/addons/survey/report/survey_browse_response.py
index 2cc9fd0de8b..1ba53f4cd33 100644
--- a/addons/survey/report/survey_browse_response.py
+++ b/addons/survey/report/survey_browse_response.py
@@ -186,7 +186,7 @@ class survey_browse_response(report_rml):
         surv_resp_obj = pooler.get_pool(cr.dbname).get('survey.response')
         if datas.has_key('form') and datas['form'].has_key('response_ids'):
             response_id = datas['form']['response_ids'][0][2]
-        elif context.has_key('response_id'):
+        elif context.has_key('response_id') and context['response_id']:
             response_id = [int(context['response_id'])]
         else:
             response_id = surv_resp_obj.search(cr, uid, [('survey_id', 'in', ids)])