pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[REF] report_webkit: removed openerp.pooler imports.

Browse Source 
bzr revid: vmt@openerp.com-20130327122144-gqg0ez63g7ksoqaw
This commit is contained in:
Vo Minh Thu
2013-03-27 13:21:44 +01:00
parent f507ca0982
commit 6e1cb22110
3 changed files with 15 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/report_webkit/report_helper.py
+2 -2
View File
@@ -29,7 +29,7 @@
#
##############################################################################
from openerp import pooler
import openerp
class WebKitHelper(object):
"""Set of usefull report helper"""
@@ -37,7 +37,7 @@ class WebKitHelper(object):
"constructor"
self.cursor = cursor
self.uid = uid
self.pool = pooler.get_pool(self.cursor.dbname)
self.pool = openerp.registry(self.cursor.dbname)
self.report_id = report_id
self.context = context
addons/report_webkit/webkit_report.py
+8 -10
View File
@@ -39,7 +39,6 @@ import time
import logging
from openerp import netsvc
from openerp import pooler
from report_helper import WebKitHelper
from openerp.report.report_sxw import *
from openerp import addons
@@ -126,7 +125,7 @@ class WebKitParser(report_sxw):
def get_lib(self, cursor, uid):
"""Return the lib wkhtml path"""
proxy = self.pool.get('ir.config_parameter')
proxy = self.pool['ir.config_parameter']
webkit_path = proxy.get_param(cursor, uid, 'webkit_path')
if not webkit_path:
@@ -242,7 +241,7 @@ class WebKitParser(report_sxw):
def translate_call(self, src):
"""Translate String."""
ir_translation = self.pool.get('ir.translation')
ir_translation = self.pool['ir.translation']
res = ir_translation._get_source(self.parser_instance.cr, self.parser_instance.uid,
None, 'report', self.parser_instance.localcontext.get('lang', 'en_US'), src)
if not res :
@@ -255,13 +254,12 @@ class WebKitParser(report_sxw):
# just try to find an xml id for the report
cr = cursor
import openerp.pooler as pooler
pool = pooler.get_pool(cr.dbname)
found_xml_ids = pool.get("ir.model.data").search(cr, uid, [["model", "=", "ir.actions.report.xml"], \
pool = openerp.registry(cr.dbname)
found_xml_ids = pool["ir.model.data"].search(cr, uid, [["model", "=", "ir.actions.report.xml"], \
["res_id", "=", report_xml.id]], context=context)
xml_id = None
if found_xml_ids:
xml_id = pool.get("ir.model.data").read(cr, uid, found_xml_ids[0], ["module", "name"])
xml_id = pool["ir.model.data"].read(cr, uid, found_xml_ids[0], ["module", "name"])
xml_id = "%s.%s" % (xml_id["module"], xml_id["name"])
if context is None:
@@ -275,7 +273,7 @@ class WebKitParser(report_sxw):
self.name2,
context=context)
self.pool = pooler.get_pool(cursor.dbname)
self.pool = pool
objs = self.getObjects(cursor, uid, ids, context)
self.parser_instance.set_context(objs, data, ids, report_xml.report_type)
@@ -367,8 +365,8 @@ class WebKitParser(report_sxw):
def create(self, cursor, uid, ids, data, context=None):
"""We override the create function in order to handle generator
Code taken from report openoffice. Thanks guys :) """
pool = pooler.get_pool(cursor.dbname)
ir_obj = pool.get('ir.actions.report.xml')
pool = openerp.registry(cursor.dbname)
ir_obj = pool['ir.actions.report.xml']
report_xml_ids = ir_obj.search(cursor, uid,
[('report_name', '=', self.name[7:])], context=context)
if report_xml_ids:
addons/report_webkit/wizard/report_webkit_actions.py
+5 -6
View File
@@ -31,7 +31,6 @@
from openerp.tools.translate import _
from openerp.osv import fields, osv
from openerp import pooler
class report_webkit_actions(osv.osv_memory):
_name = "report.webkit.actions"
@@ -61,13 +60,13 @@ class report_webkit_actions(osv.osv_memory):
if not record_id or (active_model and active_model != 'ir.actions.report.xml'):
return res
report = self.pool.get('ir.actions.report.xml').browse(
report = self.pool['ir.actions.report.xml'].browse(
cr,
uid,
context.get('active_id'),
context=context
)
ir_values_obj = self.pool.get('ir.values')
ir_values_obj = self.pool['ir.values']
ids = ir_values_obj.search(
cr,
uid,
@@ -93,7 +92,7 @@ class report_webkit_actions(osv.osv_memory):
"""
if context is None:
context = {}
report_obj = self.pool.get('ir.actions.report.xml')
report_obj = self.pool['ir.actions.report.xml']
for current in self.browse(cr, uid, ids, context=context):
report = report_obj.browse(
cr,
@@ -102,7 +101,7 @@ class report_webkit_actions(osv.osv_memory):
context=context
)
if current.print_button:
ir_values_obj = pooler.get_pool(cr.dbname).get('ir.values')
ir_values_obj = self.pool['ir.values']
res = ir_values_obj.set(
cr,
uid,
@@ -114,7 +113,7 @@ class report_webkit_actions(osv.osv_memory):
isobject=True
)
else:
ir_values_obj = pooler.get_pool(cr.dbname).get('ir.values')
ir_values_obj = self.pool['ir.values']
res = ir_values_obj.set(
cr,
uid,