From afb1b15fec076d454b7e91d5df2999d8dd4ed492 Mon Sep 17 00:00:00 2001
From: "Ysa (Open ERP)" <ysa@tinyerp.co.in>
Date: Fri, 9 Apr 2010 16:52:38 +0530
Subject: [PATCH] [IMP] survey, hr_recruitment, hr_evaluation :- improve
 action_print_survey method.

bzr revid: ysa@tinyerp.co.in-20100409112238-7q2n1grep79z05fp
---
 addons/hr_evaluation/hr_evaluation.py   | 33 +++----------------------
 addons/hr_recruitment/hr_recruitment.py | 31 +++--------------------
 addons/survey/survey.py                 | 11 ++++++---
 3 files changed, 15 insertions(+), 60 deletions(-)

diff --git a/addons/hr_evaluation/hr_evaluation.py b/addons/hr_evaluation/hr_evaluation.py
index 590c1a9ad83..1d0be1f288e 100644
--- a/addons/hr_evaluation/hr_evaluation.py
+++ b/addons/hr_evaluation/hr_evaluation.py
@@ -313,37 +313,12 @@ class hr_evaluation_interview(osv.osv):
         """
         if not context:
             context = {}
+
         record = self.browse(cr, uid, ids, context)
         record = record and record[0]
-        datas = {}
-        page_setting = {'orientation': 'vertical', 'without_pagebreak': 0, 'paper_size': 'letter', 'page_number': 1, 'survey_title': 1}
-        report = {}
-        if record:
-            datas['ids'] = [record.survey_id.id]
-            response_id = record.response.id
-            if response_id:
-                context.update({'survey_id': datas['ids'], 'response_id' : [response_id], 'response_no':0})
-                datas['form'] = page_setting
-                datas['model'] = 'survey.print.answer'
-                report = {
-                    'type': 'ir.actions.report.xml',
-                    'report_name': 'survey.browse.response',
-                    'datas': datas,
-                    'nodestroy': True,
-                    'context' : context
-                }
-            else:
-                datas['form'] = page_setting
-                datas['model'] = 'survey.print'
-                report = {
-                    'type': 'ir.actions.report.xml',
-                    'report_name': 'survey.form',
-                    'datas': datas,
-                    'nodestroy':True,
-                    'context' : context
-                }
-        return report
-
+        context.update({'survey_id': record.survey_id.id, 'response_id' : [record.response.id], 'response_no':0,})
+        value = self.pool.get("survey").action_print_survey(cr, uid, ids, context)
+        return value            
 
 hr_evaluation_interview()
 
diff --git a/addons/hr_recruitment/hr_recruitment.py b/addons/hr_recruitment/hr_recruitment.py
index fca0455e18a..6fe8b91aa3e 100644
--- a/addons/hr_recruitment/hr_recruitment.py
+++ b/addons/hr_recruitment/hr_recruitment.py
@@ -163,36 +163,11 @@ class hr_applicant(osv.osv):
         """
         if not context:
             context = {}
-        datas = {}
         record = self.browse(cr, uid, ids, context)
         record = record and record[0]
-        page_setting = {'orientation': 'vertical', 'without_pagebreak': 0, 'paper_size': 'letter', 'page_number': 1, 'survey_title': 1}
-        report = {}
-        if record:
-            datas['ids'] = [record.survey.id]
-            response_id = record.response
-            if response_id:
-                context.update({'survey_id': datas['ids'], 'response_id' : [response_id], 'response_no':0,})
-                datas['form'] = page_setting
-                datas['model'] = 'survey.print.answer'
-                report = {
-                    'type': 'ir.actions.report.xml',
-                    'report_name': 'survey.browse.response',
-                    'datas': datas,
-                    'nodestroy': True,
-                    'context' : context
-                }
-            else:
-                datas['form'] = page_setting
-                datas['model'] = 'survey.print'
-                report = {
-                    'type': 'ir.actions.report.xml',
-                    'report_name': 'survey.form',
-                    'datas': datas,
-                    'nodestroy':True,
-                    'context' : context
-                }
-        return report
+        context.update({'survey_id': record.survey.id, 'response_id' : [record.response], 'response_no':0,})
+        value = self.pool.get("survey").action_print_survey(cr, uid, ids, context)
+        return value
     
 hr_applicant()
 
diff --git a/addons/survey/survey.py b/addons/survey/survey.py
index 5acc1c73d06..968590a5d07 100644
--- a/addons/survey/survey.py
+++ b/addons/survey/survey.py
@@ -108,11 +108,15 @@ class survey(osv.osv):
         if not context:
             context = {}
         datas = {}
-        response_id = self.pool.get('survey.response').search(cr, uid, [('survey_id','=', ids)], context=context)
+        if 'response_id' in context:
+            response_id = context.get('response_id', 0)
+            datas['ids'] = [context.get('survey_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 = {}
-        datas['ids'] = ids
-        if response_id:
+        if response_id and response_id[0]:
             context.update({'survey_id': datas['ids']})
             datas['form'] = page_setting
             datas['model'] = 'survey.print.answer'
@@ -124,6 +128,7 @@ class survey(osv.osv):
                 'context' : context
             }
         else:
+            
             datas['form'] = page_setting
             datas['model'] = 'survey.print'
             report = {