diff --git a/addons/mrp/report/bom_structure.py b/addons/mrp/report/bom_structure.py index ae26bc4f8cd..b153ea2e4e9 100644 --- a/addons/mrp/report/bom_structure.py +++ b/addons/mrp/report/bom_structure.py @@ -21,8 +21,6 @@ import time from openerp.report import report_sxw -from openerp.osv import osv -from openerp import pooler class bom_structure(report_sxw.rml_parse): def __init__(self, cr, uid, name, context): diff --git a/addons/mrp/report/price.py b/addons/mrp/report/price.py index 2e37011e2bc..5afd6b3ee49 100644 --- a/addons/mrp/report/price.py +++ b/addons/mrp/report/price.py @@ -20,7 +20,8 @@ ############################################################################## import time -from openerp import pooler + +import openerp from openerp.report.interface import report_rml from openerp.tools import to_xml from openerp.report import report_sxw @@ -30,14 +31,14 @@ from openerp.tools.translate import _ class report_custom(report_rml): def create_xml(self, cr, uid, ids, datas, context=None): number = (datas.get('form', False) and datas['form']['number']) or 1 - pool = pooler.get_pool(cr.dbname) - product_pool = pool.get('product.product') - product_uom_pool = pool.get('product.uom') - supplier_info_pool = pool.get('product.supplierinfo') - workcenter_pool = pool.get('mrp.workcenter') - user_pool = pool.get('res.users') - bom_pool = pool.get('mrp.bom') - pricelist_pool = pool.get('product.pricelist') + registry = openerp.registry(cr.dbname) + product_pool = registry.get('product.product') + product_uom_pool = registry.get('product.uom') + supplier_info_pool = registry.get('product.supplierinfo') + workcenter_pool = registry.get('mrp.workcenter') + user_pool = registry.get('res.users') + bom_pool = registry.get('mrp.bom') + pricelist_pool = registry.get('product.pricelist') rml_obj=report_sxw.rml_parse(cr, uid, product_pool._name,context) rml_obj.localcontext.update({'lang':context.get('lang',False)}) company_currency = user_pool.browse(cr, uid, uid).company_id.currency_id diff --git a/addons/mrp/res_config.py b/addons/mrp/res_config.py index c780576099c..22a14addcd1 100644 --- a/addons/mrp/res_config.py +++ b/addons/mrp/res_config.py @@ -20,7 +20,6 @@ ############################################################################## from openerp.osv import fields, osv -from openerp import pooler from openerp.tools.translate import _ class mrp_config_settings(osv.osv_memory):