diff --git a/addons/survey/report/survey_analysis_report.py b/addons/survey/report/survey_analysis_report.py
index b4e7765346c..581f52d49be 100644
--- a/addons/survey/report/survey_analysis_report.py
+++ b/addons/survey/report/survey_analysis_report.py
@@ -22,15 +22,17 @@
import time
-from openerp import pooler, tools
+import openerp
+from openerp import tools
from openerp.report import report_sxw
from openerp.report.interface import report_rml
from openerp.tools import to_xml
class survey_analysis(report_rml):
def create(self, cr, uid, ids, datas, context):
- surv_obj = pooler.get_pool(cr.dbname).get('survey')
- user_obj = pooler.get_pool(cr.dbname).get('res.users')
+ registry = openerp.registry(cr.dbname)
+ surv_obj = registry['survey']
+ user_obj = registry['res.users']
rml_obj=report_sxw.rml_parse(cr, uid, surv_obj._name,context)
company=user_obj.browse(cr,uid,[uid],context)[0].company_id
diff --git a/addons/survey/report/survey_browse_response.py b/addons/survey/report/survey_browse_response.py
index f910140727d..4f2dd8544e0 100644
--- a/addons/survey/report/survey_browse_response.py
+++ b/addons/survey/report/survey_browse_response.py
@@ -22,7 +22,8 @@
import time
-from openerp import pooler, tools
+import openerp
+from openerp import tools
from openerp.report import report_sxw
from openerp.report.interface import report_rml
from openerp.tools import to_xml
@@ -33,6 +34,8 @@ class survey_browse_response(report_rml):
_display_ans_in_rows = 5
_pageSize = ('29.7cm','21.1cm')
+ registry = openerp.registry(cr.dbname)
+
if datas.has_key('form') and datas['form'].get('orientation','') == 'vertical':
if datas['form'].get('paper_size','') == 'letter':
_pageSize = ('21.6cm','27.9cm')
@@ -187,7 +190,7 @@ class survey_browse_response(report_rml):
"""
- surv_resp_obj = pooler.get_pool(cr.dbname).get('survey.response')
+ surv_resp_obj = registry['survey.response']
rml_obj=report_sxw.rml_parse(cr, uid, surv_resp_obj._name,context)
if datas.has_key('form') and datas['form'].has_key('response_ids'):
response_id = datas['form']['response_ids']
@@ -196,8 +199,8 @@ class survey_browse_response(report_rml):
else:
response_id = surv_resp_obj.search(cr, uid, [('survey_id', 'in', ids)])
- surv_resp_line_obj = pooler.get_pool(cr.dbname).get('survey.response.line')
- surv_obj = pooler.get_pool(cr.dbname).get('survey')
+ surv_resp_line_obj = registry['survey.response.line']
+ surv_obj = registry['survey']
for response in surv_resp_obj.browse(cr, uid, response_id):
for survey in surv_obj.browse(cr, uid, [response.survey_id.id]):
@@ -261,7 +264,7 @@ class survey_browse_response(report_rml):
elif que.type in ['table']:
if len(answer) and answer[0].state == "done":
- col_heading = pooler.get_pool(cr.dbname).get('survey.tbl.column.heading')
+ col_heading = registry['survey.tbl.column.heading']
cols_widhts = []
tbl_width = float(_tbl_widths.replace('cm', ''))
for i in range(0, len(que.column_heading_ids)):
diff --git a/addons/survey/report/survey_form.py b/addons/survey/report/survey_form.py
index 8375df6acaf..1868faeee03 100644
--- a/addons/survey/report/survey_form.py
+++ b/addons/survey/report/survey_form.py
@@ -20,7 +20,8 @@
#
##############################################################################
-from openerp import pooler, tools
+import openerp
+from openerp import tools
from openerp.report.interface import report_rml
from openerp.tools import to_xml
@@ -146,7 +147,7 @@ class survey_form(report_rml):
"""
- surv_obj = pooler.get_pool(cr.dbname).get('survey')
+ surv_obj = openerp.registry(cr.dbname)['survey']
for survey in surv_obj.browse(cr,uid,ids):
rml += """