diff --git a/addons/account/account.py b/addons/account/account.py index 8c7f058acc6..bb24aec1748 100644 --- a/addons/account/account.py +++ b/addons/account/account.py @@ -25,8 +25,9 @@ from dateutil.relativedelta import relativedelta from operator import itemgetter import time +import openerp from openerp import SUPERUSER_ID -from openerp import pooler, tools +from openerp import tools from openerp.osv import fields, osv from openerp.tools.translate import _ from openerp.tools.float_utils import float_round @@ -1883,7 +1884,7 @@ class account_tax(osv.osv): def get_precision_tax(): def change_digit_tax(cr): - res = pooler.get_pool(cr.dbname).get('decimal.precision').precision_get(cr, SUPERUSER_ID, 'Account') + res = openerp.registry(cr.dbname)['decimal.precision'].precision_get(cr, SUPERUSER_ID, 'Account') return (16, res+2) return change_digit_tax diff --git a/addons/account/account_financial_report.py b/addons/account/account_financial_report.py index 1d9a4a794eb..6a2b1bd5e8f 100644 --- a/addons/account/account_financial_report.py +++ b/addons/account/account_financial_report.py @@ -25,7 +25,6 @@ from dateutil.relativedelta import relativedelta from operator import itemgetter from openerp import netsvc -from openerp import pooler from openerp.osv import fields, osv import openerp.addons.decimal_precision as dp from openerp.tools.translate import _ diff --git a/addons/account/account_invoice.py b/addons/account/account_invoice.py index af762611ec2..30bdc2eedac 100644 --- a/addons/account/account_invoice.py +++ b/addons/account/account_invoice.py @@ -24,7 +24,6 @@ from lxml import etree import openerp.addons.decimal_precision as dp import openerp.exceptions -from openerp import pooler from openerp.osv import fields, osv, orm from openerp.tools.translate import _ diff --git a/addons/account/project/report/analytic_journal.py b/addons/account/project/report/analytic_journal.py index e91de96940e..1ca1ffb3ca4 100644 --- a/addons/account/project/report/analytic_journal.py +++ b/addons/account/project/report/analytic_journal.py @@ -21,7 +21,6 @@ import time -from openerp import pooler from openerp.report import report_sxw # diff --git a/addons/account/project/report/cost_ledger.py b/addons/account/project/report/cost_ledger.py index 04b8edeb166..e594ab92a63 100644 --- a/addons/account/project/report/cost_ledger.py +++ b/addons/account/project/report/cost_ledger.py @@ -21,7 +21,6 @@ import time -from openerp import pooler from openerp.report import report_sxw class account_analytic_cost_ledger(report_sxw.rml_parse): diff --git a/addons/account/project/report/inverted_analytic_balance.py b/addons/account/project/report/inverted_analytic_balance.py index 829dd03df02..bd86bcfe257 100644 --- a/addons/account/project/report/inverted_analytic_balance.py +++ b/addons/account/project/report/inverted_analytic_balance.py @@ -21,7 +21,6 @@ import time -from openerp import pooler from openerp.report import report_sxw class account_inverted_analytic_balance(report_sxw.rml_parse): diff --git a/addons/account/project/report/quantity_cost_ledger.py b/addons/account/project/report/quantity_cost_ledger.py index 1fe77f6e878..b22558b900f 100644 --- a/addons/account/project/report/quantity_cost_ledger.py +++ b/addons/account/project/report/quantity_cost_ledger.py @@ -20,7 +20,6 @@ ############################################################################## import time -from openerp import pooler from openerp.report import report_sxw class account_analytic_quantity_cost_ledger(report_sxw.rml_parse): diff --git a/addons/account/report/account_print_overdue.py b/addons/account/report/account_print_overdue.py index 68c1c35ef53..d030c136964 100644 --- a/addons/account/report/account_print_overdue.py +++ b/addons/account/report/account_print_overdue.py @@ -22,7 +22,6 @@ import time from openerp.report import report_sxw -from openerp import pooler class Overdue(report_sxw.rml_parse): def __init__(self, cr, uid, name, context): @@ -38,7 +37,7 @@ class Overdue(report_sxw.rml_parse): def _tel_get(self,partner): if not partner: return False - res_partner = pooler.get_pool(self.cr.dbname).get('res.partner') + res_partner = self.pool['res.partner'] addresses = res_partner.address_get(self.cr, self.uid, [partner.id], ['invoice']) adr_id = addresses and addresses['invoice'] or False if adr_id: @@ -49,7 +48,7 @@ class Overdue(report_sxw.rml_parse): return False def _lines_get(self, partner): - moveline_obj = pooler.get_pool(self.cr.dbname).get('account.move.line') + moveline_obj = self.pool['account.move.line'] movelines = moveline_obj.search(self.cr, self.uid, [('partner_id', '=', partner.id), ('account_id.type', 'in', ['receivable', 'payable']), @@ -58,7 +57,7 @@ class Overdue(report_sxw.rml_parse): return movelines def _message(self, obj, company): - company_pool = pooler.get_pool(self.cr.dbname).get('res.company') + company_pool = self.pool['res.company'] message = company_pool.browse(self.cr, self.uid, company.id, {'lang':obj.lang}).overdue_msg return message.split('\n') diff --git a/addons/account/report/account_report.py b/addons/account/report/account_report.py index d6cc784c767..11a6374b24e 100644 --- a/addons/account/report/account_report.py +++ b/addons/account/report/account_report.py @@ -23,7 +23,6 @@ import time from datetime import datetime from dateutil.relativedelta import relativedelta -from openerp import pooler from openerp import tools from openerp.osv import fields,osv @@ -123,7 +122,7 @@ class report_aged_receivable(osv.osv): """ This view will be used in dashboard The reason writing this code here is, we need to check date range from today to first date of fiscal year. """ - pool_obj_fy = pooler.get_pool(cr.dbname).get('account.fiscalyear') + pool_obj_fy = self.pool['account.fiscalyear'] today = time.strftime('%Y-%m-%d') fy_id = pool_obj_fy.find(cr, uid, exception=False) LIST_RANGES = [] @@ -141,7 +140,7 @@ class report_aged_receivable(osv.osv): cr.execute('delete from temp_range') for range in LIST_RANGES: - pooler.get_pool(cr.dbname).get('temp.range').create(cr, uid, {'name':range}) + self.pool['temp.range'].create(cr, uid, {'name':range}) cr.execute(""" create or replace view report_aged_receivable as ( diff --git a/addons/account/report/common_report_header.py b/addons/account/report/common_report_header.py index cedc4ccf5c4..cf3c3a71ff1 100644 --- a/addons/account/report/common_report_header.py +++ b/addons/account/report/common_report_header.py @@ -19,9 +19,9 @@ # ############################################################################## -from openerp import pooler from openerp.tools.translate import _ +# Mixin to use with rml_parse, so self.pool will be defined. class common_report_header(object): def _sum_debit(self, period_id=False, journal_id=False): @@ -75,17 +75,17 @@ class common_report_header(object): def get_start_period(self, data): if data.get('form', False) and data['form'].get('period_from', False): - return pooler.get_pool(self.cr.dbname).get('account.period').browse(self.cr,self.uid,data['form']['period_from']).name + return self.pool.get('account.period').browse(self.cr,self.uid,data['form']['period_from']).name return '' def get_end_period(self, data): if data.get('form', False) and data['form'].get('period_to', False): - return pooler.get_pool(self.cr.dbname).get('account.period').browse(self.cr, self.uid, data['form']['period_to']).name + return self.pool.get('account.period').browse(self.cr, self.uid, data['form']['period_to']).name return '' def _get_account(self, data): if data.get('form', False) and data['form'].get('chart_account_id', False): - return pooler.get_pool(self.cr.dbname).get('account.account').browse(self.cr, self.uid, data['form']['chart_account_id']).name + return self.pool.get('account.account').browse(self.cr, self.uid, data['form']['chart_account_id']).name return '' def _get_sortby(self, data): @@ -120,12 +120,12 @@ class common_report_header(object): def _get_fiscalyear(self, data): if data.get('form', False) and data['form'].get('fiscalyear_id', False): - return pooler.get_pool(self.cr.dbname).get('account.fiscalyear').browse(self.cr, self.uid, data['form']['fiscalyear_id']).name + return self.pool.get('account.fiscalyear').browse(self.cr, self.uid, data['form']['fiscalyear_id']).name return '' def _get_company(self, data): if data.get('form', False) and data['form'].get('chart_account_id', False): - return pooler.get_pool(self.cr.dbname).get('account.account').browse(self.cr, self.uid, data['form']['chart_account_id']).company_id.name + return self.pool.get('account.account').browse(self.cr, self.uid, data['form']['chart_account_id']).company_id.name return '' def _get_journal(self, data): @@ -137,7 +137,7 @@ class common_report_header(object): def _get_currency(self, data): if data.get('form', False) and data['form'].get('chart_account_id', False): - return pooler.get_pool(self.cr.dbname).get('account.account').browse(self.cr, self.uid, data['form']['chart_account_id']).company_id.currency_id.symbol + return self.pool.get('account.account').browse(self.cr, self.uid, data['form']['chart_account_id']).company_id.currency_id.symbol return '' #vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/account/wizard/account_invoice_state.py b/addons/account/wizard/account_invoice_state.py index 9fab19ff42c..70d2984cef0 100644 --- a/addons/account/wizard/account_invoice_state.py +++ b/addons/account/wizard/account_invoice_state.py @@ -21,7 +21,6 @@ from openerp.osv import osv from openerp.tools.translate import _ -from openerp import pooler class account_invoice_confirm(osv.osv_memory): """ @@ -34,8 +33,7 @@ class account_invoice_confirm(osv.osv_memory): def invoice_confirm(self, cr, uid, ids, context=None): if context is None: context = {} - pool_obj = pooler.get_pool(cr.dbname) - account_invoice_obj = pool_obj.get('account.invoice') + account_invoice_obj = self.pool['account.invoice'] data_inv = account_invoice_obj.read(cr, uid, context['active_ids'], ['state'], context=context) for record in data_inv: if record['state'] not in ('draft','proforma','proforma2'): @@ -58,8 +56,7 @@ class account_invoice_cancel(osv.osv_memory): def invoice_cancel(self, cr, uid, ids, context=None): if context is None: context = {} - pool_obj = pooler.get_pool(cr.dbname) - account_invoice_obj = pool_obj.get('account.invoice') + account_invoice_obj = self.pool['account.invoice'] data_inv = account_invoice_obj.read(cr, uid, context['active_ids'], ['state'], context=context) for record in data_inv: if record['state'] in ('cancel','paid'): diff --git a/addons/account_bank_statement_extensions/report/bank_statement_balance_report.py b/addons/account_bank_statement_extensions/report/bank_statement_balance_report.py index 9f28b083603..59b8efb23e1 100644 --- a/addons/account_bank_statement_extensions/report/bank_statement_balance_report.py +++ b/addons/account_bank_statement_extensions/report/bank_statement_balance_report.py @@ -21,15 +21,12 @@ ############################################################################## import time + from openerp.report import report_sxw -from openerp import pooler -import logging -_logger = logging.getLogger(__name__) class bank_statement_balance_report(report_sxw.rml_parse): def set_context(self, objects, data, ids, report_type=None): - #_logger.warning('addons.'+__name__, 'set_context, objects = %s, data = %s, ids = %s' % (objects, data, ids)) cr = self.cr uid = self.uid context = self.context diff --git a/addons/account_budget/report/analytic_account_budget_report.py b/addons/account_budget/report/analytic_account_budget_report.py index eed8ded213f..6701fc06a2b 100644 --- a/addons/account_budget/report/analytic_account_budget_report.py +++ b/addons/account_budget/report/analytic_account_budget_report.py @@ -22,7 +22,6 @@ import time import datetime -from openerp import pooler from openerp.report import report_sxw class analytic_account_budget_report(report_sxw.rml_parse): diff --git a/addons/account_budget/report/crossovered_budget_report.py b/addons/account_budget/report/crossovered_budget_report.py index 4a3b632a8de..70cbdecb713 100644 --- a/addons/account_budget/report/crossovered_budget_report.py +++ b/addons/account_budget/report/crossovered_budget_report.py @@ -22,7 +22,6 @@ import time import datetime -from openerp import pooler from openerp.report import report_sxw import operator from openerp import osv diff --git a/addons/account_followup/report/account_followup_print.py b/addons/account_followup/report/account_followup_print.py index 16d88d69572..eecba81acb9 100644 --- a/addons/account_followup/report/account_followup_print.py +++ b/addons/account_followup/report/account_followup_print.py @@ -22,7 +22,6 @@ import time from collections import defaultdict -from openerp import pooler from openerp.report import report_sxw class report_rappel(report_sxw.rml_parse): @@ -38,9 +37,8 @@ class report_rappel(report_sxw.rml_parse): }) def _ids_to_objects(self, ids): - pool = pooler.get_pool(self.cr.dbname) all_lines = [] - for line in pool.get('account_followup.stat.by.partner').browse(self.cr, self.uid, ids): + for line in self.pool['account_followup.stat.by.partner'].browse(self.cr, self.uid, ids): if line not in all_lines: all_lines.append(line) return all_lines @@ -49,8 +47,7 @@ class report_rappel(report_sxw.rml_parse): return self._lines_get_with_partner(stat_by_partner_line.partner_id, stat_by_partner_line.company_id.id) def _lines_get_with_partner(self, partner, company_id): - pool = pooler.get_pool(self.cr.dbname) - moveline_obj = pool.get('account.move.line') + moveline_obj = self.pool['account.move.line'] moveline_ids = moveline_obj.search(self.cr, self.uid, [ ('partner_id', '=', partner.id), ('account_id.type', '=', 'receivable'), @@ -80,7 +77,7 @@ class report_rappel(report_sxw.rml_parse): if context is None: context = {} context.update({'lang': stat_line.partner_id.lang}) - fp_obj = pooler.get_pool(self.cr.dbname).get('account_followup.followup') + fp_obj = self.pool['account_followup.followup'] fp_line = fp_obj.browse(self.cr, self.uid, followup_id, context=context).followup_line if not fp_line: raise osv.except_osv(_('Error!'),_("The followup plan defined for the current company does not have any followup action.")) @@ -94,10 +91,10 @@ class report_rappel(report_sxw.rml_parse): li_delay.sort(reverse=True) a = {} #look into the lines of the partner that already have a followup level, and take the description of the higher level for which it is available - partner_line_ids = pooler.get_pool(self.cr.dbname).get('account.move.line').search(self.cr, self.uid, [('partner_id','=',stat_line.partner_id.id),('reconcile_id','=',False),('company_id','=',stat_line.company_id.id),('blocked','=',False),('state','!=','draft'),('debit','!=',False),('account_id.type','=','receivable'),('followup_line_id','!=',False)]) + partner_line_ids = self.pool['account.move.line'].search(self.cr, self.uid, [('partner_id','=',stat_line.partner_id.id),('reconcile_id','=',False),('company_id','=',stat_line.company_id.id),('blocked','=',False),('state','!=','draft'),('debit','!=',False),('account_id.type','=','receivable'),('followup_line_id','!=',False)]) partner_max_delay = 0 partner_max_text = '' - for i in pooler.get_pool(self.cr.dbname).get('account.move.line').browse(self.cr, self.uid, partner_line_ids, context=context): + for i in self.pool['account.move.line'].browse(self.cr, self.uid, partner_line_ids, context=context): if i.followup_line_id.delay > partner_max_delay and i.followup_line_id.description: partner_max_delay = i.followup_line_id.delay partner_max_text = i.followup_line_id.description @@ -107,7 +104,7 @@ class report_rappel(report_sxw.rml_parse): 'partner_name': stat_line.partner_id.name, 'date': time.strftime('%Y-%m-%d'), 'company_name': stat_line.company_id.name, - 'user_signature': pooler.get_pool(self.cr.dbname).get('res.users').browse(self.cr, self.uid, self.uid, context).signature or '', + 'user_signature': self.pool['res.users'].browse(self.cr, self.uid, self.uid, context).signature or '', } return text diff --git a/addons/account_payment/report/payment_order.py b/addons/account_payment/report/payment_order.py index 112476dd080..a851a54ecbb 100644 --- a/addons/account_payment/report/payment_order.py +++ b/addons/account_payment/report/payment_order.py @@ -21,7 +21,6 @@ import time -from openerp import pooler from openerp.report import report_sxw class payment_order(report_sxw.rml_parse): @@ -38,8 +37,7 @@ class payment_order(report_sxw.rml_parse): def _get_invoice_name(self, invoice_id): if invoice_id: - pool = pooler.get_pool(self.cr.dbname) - value_name = pool.get('account.invoice').name_get(self.cr, self.uid, [invoice_id]) + value_name = self.pool['account.invoice'].name_get(self.cr, self.uid, [invoice_id]) if value_name: return value_name[0][1] return False @@ -67,8 +65,7 @@ class payment_order(report_sxw.rml_parse): def _get_account_name(self,bank_id): if bank_id: - pool = pooler.get_pool(self.cr.dbname) - value_name = pool.get('res.partner.bank').name_get(self.cr, self.uid, [bank_id]) + value_name = self.pool['res.partner.bank'].name_get(self.cr, self.uid, [bank_id]) if value_name: return value_name[0][1] return False diff --git a/addons/audittrail/audittrail.py b/addons/audittrail/audittrail.py index 0debdf11492..811c5387697 100644 --- a/addons/audittrail/audittrail.py +++ b/addons/audittrail/audittrail.py @@ -19,10 +19,10 @@ # ############################################################################## +import openerp from openerp.osv import fields, osv import openerp.service.model from openerp.tools.translate import _ -from openerp import pooler import time from openerp import tools from openerp import SUPERUSER_ID @@ -113,7 +113,6 @@ class audittrail_rule(osv.osv): value = "ir.actions.act_window" + ',' + str(w_id[0]) val_id = ir_values_obj.search(cr, uid, [('model', '=', thisrule.object_id.model), ('value', '=', value)]) if val_id: - ir_values_obj = pooler.get_pool(cr.dbname).get('ir.values') res = ir_values_obj.unlink(cr, uid, [val_id[0]]) self.write(cr, uid, [thisrule.id], {"state": "draft"}) #End Loop @@ -212,7 +211,7 @@ def create_log_line(cr, uid, log_id, model, lines=None): """ if lines is None: lines = [] - pool = pooler.get_pool(cr.dbname) + pool = openerp.registry(cr.dbname) obj_pool = pool.get(model.model) model_pool = pool.get('ir.model') field_pool = pool.get('ir.model.fields') @@ -251,7 +250,7 @@ def log_fct(cr, uid_orig, model, method, fct_src, *args, **kw): @return: Returns result as per method of Object proxy """ - pool = pooler.get_pool(cr.dbname) + pool = openerp.registry(cr.dbname) resource_pool = pool.get(model) model_pool = pool.get('ir.model') model_ids = model_pool.search(cr, SUPERUSER_ID, [('model', '=', model)]) @@ -492,7 +491,7 @@ def check_rules(cr, uid, model, method): @param method: method to log: create, read, unlink,write,actions,workflow actions @return: True or False """ - pool = pooler.get_pool(cr.dbname) + pool = openerp.registry(cr.dbname) if 'audittrail.rule' in pool.models: model_ids = pool.get('ir.model').search(cr, SUPERUSER_ID, [('model', '=', model)]) model_id = model_ids and model_ids[0] or False diff --git a/addons/auth_ldap/users_ldap.py b/addons/auth_ldap/users_ldap.py index a63d52209ba..e8778449da5 100644 --- a/addons/auth_ldap/users_ldap.py +++ b/addons/auth_ldap/users_ldap.py @@ -23,7 +23,6 @@ import logging from ldap.filter import filter_format import openerp.exceptions -from openerp import pooler from openerp import tools from openerp.osv import fields, osv from openerp import SUPERUSER_ID @@ -188,7 +187,7 @@ class CompanyLDAP(osv.osv): user_id = res[0] elif conf['create_user']: _logger.debug("Creating new OpenERP user \"%s\" from LDAP" % login) - user_obj = self.pool.get('res.users') + user_obj = self.pool['res.users'] values = self.map_ldap_attributes(cr, uid, conf, login, ldap_entry) if conf['user']: user_id = user_obj.copy(cr, SUPERUSER_ID, conf['user'], @@ -246,8 +245,8 @@ class users(osv.osv): user_id = super(users, self).login(db, login, password) if user_id: return user_id - cr = pooler.get_db(db).cursor() - ldap_obj = pooler.get_pool(db).get('res.company.ldap') + cr = self.pool.db.cursor() + ldap_obj = self.pool['res.company.ldap'] for conf in ldap_obj.get_ldap_dicts(cr): entry = ldap_obj.authenticate(conf, login, password) if entry: @@ -269,12 +268,12 @@ class users(osv.osv): except openerp.exceptions.AccessDenied: pass - cr = pooler.get_db(db).cursor() + cr = self.pool.db.cursor() cr.execute('SELECT login FROM res_users WHERE id=%s AND active=TRUE', (int(uid),)) res = cr.fetchone() if res: - ldap_obj = pooler.get_pool(db).get('res.company.ldap') + ldap_obj = self.pool['res.company.ldap'] for conf in ldap_obj.get_ldap_dicts(cr): if ldap_obj.authenticate(conf, res[0], passwd): self._uid_cache.setdefault(db, {})[uid] = passwd diff --git a/addons/base_report_designer/base_report_designer.py b/addons/base_report_designer/base_report_designer.py index 180a534b07f..359f41c4aa2 100644 --- a/addons/base_report_designer/base_report_designer.py +++ b/addons/base_report_designer/base_report_designer.py @@ -24,7 +24,6 @@ import openerp.modules.registry from openerp.osv import osv from openerp_sxw2rml import sxw2rml from StringIO import StringIO -from openerp import pooler from openerp import addons @@ -46,20 +45,19 @@ class report_xml(osv.osv): ''' Untested function ''' - pool = pooler.get_pool(cr.dbname) sxwval = StringIO(base64.decodestring(file_sxw)) if file_type=='sxw': fp = open(addons.get_module_resource('base_report_designer','openerp_sxw2rml', 'normalized_oo2rml.xsl'),'rb') if file_type=='odt': fp = open(addons.get_module_resource('base_report_designer','openerp_sxw2rml', 'normalized_odt2rml.xsl'),'rb') - report = pool.get('ir.actions.report.xml').write(cr, uid, [report_id], { + report = self.pool['ir.actions.report.xml'].write(cr, uid, [report_id], { 'report_sxw_content': base64.decodestring(file_sxw), 'report_rml_content': str(sxw2rml(sxwval, xsl=fp.read())), }) # FIXME: this should be moved to an override of the ir.actions.report_xml.create() method cr.commit() - pool.get('ir.actions.report.xml').register_all(cr) + self.pool['ir.actions.report.xml'].register_all(cr) openerp.modules.registry.RegistryManager.signal_registry_change(cr.dbname) return True diff --git a/addons/base_report_designer/wizard/base_report_designer_modify.py b/addons/base_report_designer/wizard/base_report_designer_modify.py index abef384cd91..838f591a2f4 100644 --- a/addons/base_report_designer/wizard/base_report_designer_modify.py +++ b/addons/base_report_designer/wizard/base_report_designer_modify.py @@ -24,7 +24,7 @@ import base64 import time import urllib -from openerp import osv, pooler, tools +from openerp import osv, tools from openerp.osv import fields, osv from openerp.tools.translate import _ @@ -39,9 +39,9 @@ class base_report_sxw(osv.osv_memory): def get_report(self, cr, uid, ids, context=None): data = self.read(cr, uid, ids, context=context)[0] - data_obj = self.pool.get('ir.model.data') + data_obj = self.pool['ir.model.data'] id2 = data_obj._get_id(cr, uid, 'base_report_designer', 'view_base_report_file_sxw') - report = self.pool.get('ir.actions.report.xml').browse(cr, uid, data['report_id'], context=context) + report = self.pool['ir.actions.report.xml'].browse(cr, uid, data['report_id'], context=context) if id2: id2 = data_obj.browse(cr, uid, id2, context=context).res_id return { @@ -74,9 +74,9 @@ class base_report_file_sxw(osv.osv_memory): """ res = super(base_report_file_sxw, self).default_get(cr, uid, fields, context=context) - report_id1 = self.pool.get('base.report.sxw').search(cr,uid,[]) - data = self.pool.get('base.report.sxw').read(cr, uid, report_id1, context=context)[0] - report = self.pool.get('ir.actions.report.xml').browse(cr, uid, data['report_id'], context=context) + report_id1 = self.pool['base.report.sxw'].search(cr,uid,[]) + data = self.pool['base.report.sxw'].read(cr, uid, report_id1, context=context)[0] + report = self.pool['ir.actions.report.xml'].browse(cr, uid, data['report_id'], context=context) if context is None: context={} if 'report_id' in fields: @@ -97,14 +97,14 @@ class base_report_file_sxw(osv.osv_memory): sxwval = StringIO.StringIO(base64.decodestring(data['file_sxw_upload'])) fp = tools.file_open('normalized_oo2rml.xsl',subdir='addons/base_report_designer/openerp_sxw2rml') newrmlcontent = str(openerp_sxw2rml.sxw2rml(sxwval, xsl=fp.read())) - report = self.pool.get('ir.actions.report.xml').write(cr, uid, [data['report_id']], { + report = self.pool['ir.actions.report.xml'].write(cr, uid, [data['report_id']], { 'report_sxw_content': base64.decodestring(data['file_sxw_upload']), 'report_rml_content': newrmlcontent }) cr.commit() - data_obj = self.pool.get('ir.model.data') + data_obj = self.pool['ir.model.data'] id2 = data_obj._get_id(cr, uid, 'base_report_designer', 'view_base_report_file_rml') - report = self.pool.get('ir.actions.report.xml').browse(cr, uid, data['report_id'], context=context) + report = self.pool['ir.actions.report.xml'].browse(cr, uid, data['report_id'], context=context) if id2: id2 = data_obj.browse(cr, uid, id2, context=context).res_id return { @@ -135,9 +135,9 @@ class base_report_rml_save(osv.osv_memory): """ res = super(base_report_rml_save, self).default_get(cr, uid, fields, context=context) - report_id = self.pool.get('base.report.sxw').search(cr,uid,[]) - data = self.pool.get('base.report.file.sxw').read(cr, uid, report_id, context=context)[0] - report = self.pool.get('ir.actions.report.xml').browse(cr, uid, data['report_id'], context=context) + report_id = self.pool['base.report.sxw'].search(cr,uid,[]) + data = self.pool['base.report.file.sxw'].read(cr, uid, report_id, context=context)[0] + report = self.pool['ir.actions.report.xml'].browse(cr, uid, data['report_id'], context=context) if 'file_rml' in fields: res['file_rml'] = base64.encodestring(report.report_rml_content) diff --git a/addons/base_setup/base_setup.py b/addons/base_setup/base_setup.py index 3e7c1d1f846..ac4ce5b55b6 100644 --- a/addons/base_setup/base_setup.py +++ b/addons/base_setup/base_setup.py @@ -21,7 +21,6 @@ import simplejson import cgi -from openerp import pooler from openerp import tools from openerp.osv import fields, osv from openerp.tools.translate import _ diff --git a/addons/decimal_precision/decimal_precision.py b/addons/decimal_precision/decimal_precision.py index d4d3d29dce0..ab0979291bd 100644 --- a/addons/decimal_precision/decimal_precision.py +++ b/addons/decimal_precision/decimal_precision.py @@ -19,8 +19,9 @@ # ############################################################################## +import openerp from openerp import SUPERUSER_ID -from openerp import pooler, tools +from openerp import tools from openerp.osv import osv, fields class decimal_precision(osv.osv): @@ -57,7 +58,7 @@ class decimal_precision(osv.osv): res = super(decimal_precision, self).write(cr, uid, ids, data, *args, **argv) self.precision_get.clear_cache(self) for obj in self.pool.obj_list(): - for colname, col in self.pool.get(obj)._columns.items(): + for colname, col in self.pool[obj]._columns.items(): if isinstance(col, (fields.float, fields.function)): col.digits_change(cr) return res @@ -66,7 +67,8 @@ decimal_precision() def get_precision(application): def change_digit(cr): - res = pooler.get_pool(cr.dbname).get('decimal.precision').precision_get(cr, SUPERUSER_ID, application) + decimal_precision = openerp.registry(cr.dbname)['decimal.precision'] + res = decimal_precision.precision_get(cr, SUPERUSER_ID, application) return (16, res) return change_digit diff --git a/addons/document/document.py b/addons/document/document.py index 85468e00509..9b1fdc1d66b 100644 --- a/addons/document/document.py +++ b/addons/document/document.py @@ -31,7 +31,6 @@ from StringIO import StringIO import psycopg2 import openerp -from openerp import pooler from openerp import tools from openerp.osv import fields, osv from openerp.osv.orm import except_orm @@ -620,7 +619,7 @@ class node_context(object): if context is None: context = {} context['uid'] = uid - self._dirobj = pooler.get_pool(cr.dbname).get('document.directory') + self._dirobj = openerp.registry(cr.dbname).get('document.directory') self.node_file_class = node_file self.extra_ctx = {} # Extra keys for context, that do _not_ trigger inequality assert self._dirobj @@ -1999,7 +1998,7 @@ class nodefd_content(StringIO, node_descriptor): par = self._get_parent() uid = par.context.uid - cr = pooler.get_db(par.context.dbname).cursor() + cr = openerp.registry(par.context.dbname).db.cursor() try: if self.mode in ('w', 'w+', 'r+'): data = self.getvalue() @@ -2052,7 +2051,7 @@ class nodefd_static(StringIO, node_descriptor): par = self._get_parent() # uid = par.context.uid - cr = pooler.get_db(par.context.dbname).cursor() + cr = openerp.registry(par.context.dbname).db.cursor() try: if self.mode in ('w', 'w+', 'r+'): data = self.getvalue() diff --git a/addons/document_ftp/ftpserver/abstracted_fs.py b/addons/document_ftp/ftpserver/abstracted_fs.py index 7f88c81b2c3..a83843eb1a5 100644 --- a/addons/document_ftp/ftpserver/abstracted_fs.py +++ b/addons/document_ftp/ftpserver/abstracted_fs.py @@ -9,7 +9,8 @@ import errno import glob import fnmatch -from openerp import pooler, netsvc, sql_db +import openerp +from openerp import sql_db import openerp.service from openerp.service import security from openerp.osv import osv @@ -192,7 +193,7 @@ class abstracted_fs(object): if dir: cr = dir.cr uid = dir.uid - pool = pooler.get_pool(node.context.dbname) + pool = openerp.registry(node.context.dbname) object=dir and dir.object or False object2=dir and dir.object2 or False res=pool.get('ir.attachment').search(cr,uid,[('name','like',prefix),('parent_id','=',object and object.type in ('directory','ressource') and object.id or False),('res_id','=',object2 and object2.id or False),('res_model','=',object2 and object2._name or False)]) @@ -291,7 +292,7 @@ class abstracted_fs(object): if dbname not in self.db_list(): raise IOError(errno.ENOENT,'Invalid database path: %s.' % dbname) try: - db = pooler.get_db(dbname) + db = openerp.registry(dbname).db except Exception: raise OSError(1, 'Database cannot be used.') cr = db.cursor() @@ -324,7 +325,7 @@ class abstracted_fs(object): """ Get cr, uid, pool from a node """ assert node - db = pooler.get_db(node.context.dbname) + db = openerp.registry.(node.context.dbname).db return db.cursor(), node.context.uid def get_node_cr(self, node): diff --git a/addons/document_ftp/ftpserver/authorizer.py b/addons/document_ftp/ftpserver/authorizer.py index 5a64ca8f7a0..e863eeb39ec 100644 --- a/addons/document_ftp/ftpserver/authorizer.py +++ b/addons/document_ftp/ftpserver/authorizer.py @@ -48,7 +48,6 @@ class authorizer: if not len(paths)>2: return True db_name = paths[1] - db,pool = pooler.get_db_and_pool(db_name) res = security.login(db_name, username, self.password) return bool(res) diff --git a/addons/document_webdav/dav_fs.py b/addons/document_webdav/dav_fs.py index 1781a02d76e..a8ef9082b2c 100644 --- a/addons/document_webdav/dav_fs.py +++ b/addons/document_webdav/dav_fs.py @@ -37,7 +37,7 @@ except ImportError: from DAV.davcmd import copyone, copytree, moveone, movetree, delone, deltree import openerp -from openerp import pooler, sql_db, netsvc +from openerp import sql_db, netsvc import openerp.service from openerp.tools import misc @@ -494,9 +494,9 @@ class openerp_dav_handler(dav_interface): self.parent.auth_provider.checkRequest(self.parent, uri, dbname) res = self.parent.auth_provider.auth_creds[dbname] user, passwd, dbn2, uid = res - db,pool = pooler.get_db_and_pool(dbname) - cr = db.cursor() - return cr, uid, pool, dbname, uri2 + registry = openerp.registry(dbname) + cr = registery.db.cursor() + return cr, uid, registry, dbname, uri2 def uri2object(self, cr, uid, pool, uri): if not uid: diff --git a/addons/hr_attendance/report/attendance_by_month.py b/addons/hr_attendance/report/attendance_by_month.py index 69ce9511ac2..8e8f95c81e1 100644 --- a/addons/hr_attendance/report/attendance_by_month.py +++ b/addons/hr_attendance/report/attendance_by_month.py @@ -23,7 +23,7 @@ from datetime import datetime, timedelta from dateutil.relativedelta import relativedelta import time -from openerp import netsvc, pooler +import openerp from openerp.report import report_sxw from openerp.report.interface import report_rml from openerp.report.interface import toxml @@ -46,7 +46,8 @@ def lengthmonth(year, month): class report_custom(report_rml): def create_xml(self, cr, uid, ids, datas, context=None): - obj_emp = pooler.get_pool(cr.dbname).get('hr.employee') + registry = openerp.registry(cr.dbname) + obj_emp = registry['hr.employee'] if context is None: context = {} month = datetime(datas['form']['year'], datas['form']['month'], 1) @@ -102,14 +103,14 @@ class report_custom(report_rml): days_xml.append(today_xml) user_xml.append(user_repr % '\n'.join(days_xml)) - rpt_obj = pooler.get_pool(cr.dbname).get('hr.employee') + rpt_obj = obj_emp rml_obj=report_sxw.rml_parse(cr, uid, rpt_obj._name,context) header_xml = '''
%s %s
- ''' % (str(rml_obj.formatLang(time.strftime("%Y-%m-%d"),date=True))+' ' + str(time.strftime("%H:%M")),to_xml(pooler.get_pool(cr.dbname).get('res.users').browse(cr,uid,uid).company_id.name)) + ''' % (str(rml_obj.formatLang(time.strftime("%Y-%m-%d"),date=True))+' ' + str(time.strftime("%H:%M")),to_xml(registry['res.users'].browse(cr,uid,uid).company_id.name)) first_date = str(month) som = datetime.strptime(first_date, '%Y-%m-%d %H:%M:%S') diff --git a/addons/hr_attendance/report/attendance_errors.py b/addons/hr_attendance/report/attendance_errors.py index 411a1139def..811f4d8d906 100644 --- a/addons/hr_attendance/report/attendance_errors.py +++ b/addons/hr_attendance/report/attendance_errors.py @@ -22,7 +22,6 @@ import datetime import time -from openerp import pooler from openerp.report import report_sxw class attendance_print(report_sxw.rml_parse): diff --git a/addons/hr_attendance/report/timesheet.py b/addons/hr_attendance/report/timesheet.py index 321bb6bacc9..42dd686eba3 100644 --- a/addons/hr_attendance/report/timesheet.py +++ b/addons/hr_attendance/report/timesheet.py @@ -24,7 +24,8 @@ from datetime import datetime from dateutil.relativedelta import relativedelta 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, toxml from openerp.tools.translate import _ @@ -38,7 +39,8 @@ def to_hour(h): class report_custom(report_rml): def create_xml(self, cr, uid, ids, datas, context=None): - obj_emp = pooler.get_pool(cr.dbname).get('hr.employee') + registry = openerp.registry(cr.dbname) + obj_emp = registry['hr.employee'] emp_ids = datas['active_ids'] start_date = datetime.strptime(datas['form']['init_date'], '%Y-%m-%d') @@ -49,14 +51,14 @@ class report_custom(report_rml): if last_monday < first_monday: first_monday, last_monday = last_monday, first_monday - rpt_obj = pooler.get_pool(cr.dbname).get('hr.employee') + rpt_obj = obj_emp rml_obj=report_sxw.rml_parse(cr, uid, rpt_obj._name,context) header_xml = '''
%s %s
- ''' % (str(rml_obj.formatLang(time.strftime("%Y-%m-%d"),date=True))+' ' + str(time.strftime("%H:%M")),pooler.get_pool(cr.dbname).get('res.users').browse(cr,uid,uid).company_id.name) + ''' % (str(rml_obj.formatLang(time.strftime("%Y-%m-%d"),date=True))+' ' + str(time.strftime("%H:%M")),registry['res.users'].browse(cr,uid,uid).company_id.name) user_xml = [] for employee_id in emp_ids: emp = obj_emp.read(cr, uid, [employee_id], ['id', 'name'])[0] diff --git a/addons/hr_holidays/report/holidays_summary_report.py b/addons/hr_holidays/report/holidays_summary_report.py index f60d7a3ee1c..d39ae53d5b6 100644 --- a/addons/hr_holidays/report/holidays_summary_report.py +++ b/addons/hr_holidays/report/holidays_summary_report.py @@ -22,12 +22,11 @@ import datetime import time +import openerp from openerp.osv import fields, osv from openerp.report.interface import report_rml from openerp.report.interface import toxml -from openerp import pooler -import time from openerp.report import report_sxw from openerp.tools import ustr from openerp.tools.translate import _ @@ -50,8 +49,9 @@ def emp_create_xml(self, cr, uid, dept, holiday_type, row_id, empid, name, som, display={} if dept==0: count=0 - p_id=pooler.get_pool(cr.dbname).get('hr.holidays').search(cr, uid, [('employee_id','in',[empid,False]), ('type', '=', 'remove')]) - ids_date = pooler.get_pool(cr.dbname).get('hr.holidays').read(cr, uid, p_id, ['date_from','date_to','holiday_status_id','state']) + registry = openerp.registry(cr.dbname) + p_id = registry['hr.holidays'].search(cr, uid, [('employee_id','in',[empid,False]), ('type', '=', 'remove')]) + ids_date = registry['hr.holidays'].read(cr, uid, p_id, ['date_from','date_to','holiday_status_id','state']) for index in range(1,61): diff=index-1 @@ -85,12 +85,12 @@ def emp_create_xml(self, cr, uid, dept, holiday_type, row_id, empid, name, som, class report_custom(report_rml): def create_xml(self, cr, uid, ids, data, context): - obj_dept = pooler.get_pool(cr.dbname).get('hr.department') - obj_emp = pooler.get_pool(cr.dbname).get('hr.employee') + registry = openerp.registry(cr.dbname) + obj_dept = registry['hr.department'] + obj_emp = registry['hr.employee'] depts=[] emp_id={} -# done={} - rpt_obj = pooler.get_pool(cr.dbname).get('hr.holidays') + rpt_obj = registry['hr.holidays'] rml_obj=report_sxw.rml_parse(cr, uid, rpt_obj._name,context) cr.execute("SELECT name FROM res_company") res=cr.fetchone()[0] @@ -242,7 +242,7 @@ class report_custom(report_rml): %s %s - ''' % (str(rml_obj.formatLang(time.strftime("%Y-%m-%d"),date=True))+' ' + str(time.strftime("%H:%M")),to_xml(pooler.get_pool(cr.dbname).get('res.users').browse(cr,uid,uid).company_id.name)) + ''' % (str(rml_obj.formatLang(time.strftime("%Y-%m-%d"),date=True))+' ' + str(time.strftime("%H:%M")),to_xml(registry['res.users'].browse(cr,uid,uid).company_id.name)) # Computing the xml xml=''' diff --git a/addons/hr_timesheet/report/user_timesheet.py b/addons/hr_timesheet/report/user_timesheet.py index b86a6e8e89d..63edf3cc398 100644 --- a/addons/hr_timesheet/report/user_timesheet.py +++ b/addons/hr_timesheet/report/user_timesheet.py @@ -20,12 +20,12 @@ ############################################################################## import datetime +import time +import openerp from openerp.report.interface import report_rml from openerp.report.interface import toxml from openerp.tools.translate import _ -import time -from openerp import pooler from openerp.report import report_sxw from openerp.tools import ustr from openerp.tools import to_xml @@ -45,10 +45,11 @@ class report_custom(report_rml): return _weekdays[weekday] def create_xml(self, cr, uid, ids, data, context): + registry = openerp.registry(cr.dbname) # Get the user id from the selected employee record emp_id = data['form']['employee_id'] - emp_obj = pooler.get_pool(cr.dbname).get('hr.employee') + emp_obj = registry['hr.employee'] user_id = emp_obj.browse(cr, uid, emp_id).user_id.id empl_name = emp_obj.browse(cr, uid, emp_id).name @@ -87,7 +88,7 @@ class report_custom(report_rml): %.2f ''' - rpt_obj = pooler.get_pool(cr.dbname).get('hr.employee') + rpt_obj = registry['hr.employee'] rml_obj = report_sxw.rml_parse(cr, uid, rpt_obj._name,context) if user_id: header_xml = ''' @@ -95,12 +96,12 @@ class report_custom(report_rml): %s %s - ''' % (str(rml_obj.formatLang(time.strftime("%Y-%m-%d"),date=True))+' ' + str(time.strftime("%H:%M")),to_xml(pooler.get_pool(cr.dbname).get('res.users').browse(cr,uid,user_id).company_id.name)) + ''' % (str(rml_obj.formatLang(time.strftime("%Y-%m-%d"),date=True))+' ' + str(time.strftime("%H:%M")),to_xml(registry['res.users'].browse(cr,uid,user_id).company_id.name)) account_xml = [] for account, telems in accounts.iteritems(): aid, aname = account - aname = pooler.get_pool(cr.dbname).get('account.analytic.account').name_get(cr, uid, [aid], context) + aname = registry['account.analytic.account'].name_get(cr, uid, [aid], context) aname = aname[0][1] account_xml.append('' % (aid, toxml(aname))) diff --git a/addons/hr_timesheet/report/users_timesheet.py b/addons/hr_timesheet/report/users_timesheet.py index 4827994f2cd..d8c4927947d 100644 --- a/addons/hr_timesheet/report/users_timesheet.py +++ b/addons/hr_timesheet/report/users_timesheet.py @@ -20,10 +20,11 @@ ############################################################################## import datetime +import time + +import openerp from openerp.report.interface import report_rml from openerp.report.interface import toxml -import time -from openerp import pooler from openerp.tools.translate import _ from openerp.report import report_sxw from openerp.tools import ustr @@ -78,6 +79,7 @@ class report_custom(report_rml): return _weekdays[weekday] def create_xml(self, cr, uid, ids, data, context): + registry = openerp.registry(cr.dbname) # Computing the dates (start of month: som, and end of month: eom) som = datetime.date(data['form']['year'], data['form']['month'], 1) @@ -88,7 +90,7 @@ class report_custom(report_rml): date_xml.append('2.5cm%s,2cm\n' % (',0.7cm' * lengthmonth(som.year, som.month))) emp_xml='' - emp_obj = pooler.get_pool(cr.dbname).get('hr.employee') + emp_obj = registry['hr.employee'] for id in data['form']['employee_ids']: user = emp_obj.browse(cr, uid, id).user_id.id empl_name = emp_obj.browse(cr, uid, id).name @@ -97,14 +99,14 @@ class report_custom(report_rml): # Computing the xml #Without this, report don't show non-ascii characters (TO CHECK) date_xml = '\n'.join(date_xml) - rpt_obj = pooler.get_pool(cr.dbname).get('hr.employee') + rpt_obj = emp_obj rml_obj=report_sxw.rml_parse(cr, uid, rpt_obj._name,context) header_xml = '''
%s %s
- ''' % (str(rml_obj.formatLang(time.strftime("%Y-%m-%d"),date=True))+' ' + str(time.strftime("%H:%M")),pooler.get_pool(cr.dbname).get('res.users').browse(cr,uid,uid).company_id.name) + ''' % (str(rml_obj.formatLang(time.strftime("%Y-%m-%d"),date=True))+' ' + str(time.strftime("%H:%M")),registry['res.users'].browse(cr,uid,uid).company_id.name) xml=''' diff --git a/addons/hr_timesheet_invoice/report/account_analytic_profit.py b/addons/hr_timesheet_invoice/report/account_analytic_profit.py index 57fd06b0c34..bfaf585aff5 100644 --- a/addons/hr_timesheet_invoice/report/account_analytic_profit.py +++ b/addons/hr_timesheet_invoice/report/account_analytic_profit.py @@ -20,7 +20,6 @@ ############################################################################## from openerp.report import report_sxw -from openerp import pooler class account_analytic_profit(report_sxw.rml_parse): def __init__(self, cr, uid, name, context): @@ -32,13 +31,13 @@ class account_analytic_profit(report_sxw.rml_parse): 'line': self._line, }) def _user_ids(self, lines): - user_obj=pooler.get_pool(self.cr.dbname).get('res.users') + user_obj = self.pool['res.users'] ids=list(set([b.user_id.id for b in lines])) return user_obj.browse(self.cr, self.uid, ids) def _journal_ids(self, form, user_id): - line_obj=pooler.get_pool(self.cr.dbname).get('account.analytic.line') - journal_obj=pooler.get_pool(self.cr.dbname).get('account.analytic.journal') + line_obj = self.pool['account.analytic.line'] + journal_obj = self.pool['account.analytic.journal'] line_ids=line_obj.search(self.cr, self.uid, [ ('date', '>=', form['date_from']), ('date', '<=', form['date_to']), @@ -49,10 +48,9 @@ class account_analytic_profit(report_sxw.rml_parse): return journal_obj.browse(self.cr, self.uid, ids) def _line(self, form, journal_ids, user_ids): - pool=pooler.get_pool(self.cr.dbname) - line_obj=pool.get('account.analytic.line') - product_obj=pool.get('product.product') - price_obj=pool.get('product.pricelist') + line_obj = self.pool['account.analytic.line'] + product_obj = self.pool['product.product'] + price_obj = self.pool['product.pricelist'] ids=line_obj.search(self.cr, self.uid, [ ('date', '>=', form['date_from']), ('date', '<=', form['date_to']), @@ -109,7 +107,7 @@ class account_analytic_profit(report_sxw.rml_parse): return res.values() def _lines(self, form): - line_obj=pooler.get_pool(self.cr.dbname).get('account.analytic.line') + line_obj = self.pool['account.analytic.line'] ids=line_obj.search(self.cr, self.uid, [ ('date', '>=', form['date_from']), ('date', '<=', form['date_to']), diff --git a/addons/l10n_br/account.py b/addons/l10n_br/account.py index 05ad589ab82..1adb6d92baa 100644 --- a/addons/l10n_br/account.py +++ b/addons/l10n_br/account.py @@ -17,7 +17,7 @@ #along with this program. If not, see . # ################################################################################# -from openerp import pooler +import openerp from openerp.osv import fields, osv TAX_CODE_COLUMNS = { @@ -92,7 +92,8 @@ class account_tax_code(osv.osv): def get_precision_tax(): def change_digit_tax(cr): - res = pooler.get_pool(cr.dbname).get('decimal.precision').precision_get(cr, 1, 'Account') + decimal_precision = openerp.registry(cr.dbname)['decimal.precision'] + res = decimal_precision.precision_get(cr, 1, 'Account') return (16, res+2) return change_digit_tax diff --git a/addons/l10n_lu/wizard/print_vat.py b/addons/l10n_lu/wizard/print_vat.py index 9e1190cfae5..abd5c7ce298 100644 --- a/addons/l10n_lu/wizard/print_vat.py +++ b/addons/l10n_lu/wizard/print_vat.py @@ -5,8 +5,9 @@ #Tranquil IT Systems from __future__ import with_statement + +import openerp from openerp.osv import fields, osv -from openerp import pooler from openerp import tools from openerp.tools.translate import _ from openerp.report.render import render @@ -30,8 +31,8 @@ class report_custom(report_int): def create(self, cr, uid, ids, datas, context=None): - pool = pooler.get_pool(cr.dbname) - taxobj = pool.get('account.tax.code') + registry = openerp.registry(cr.dbname) + taxobj = registry['account.tax.code'] if context is None: context = {} @@ -40,7 +41,7 @@ class report_custom(report_int): for t in taxobj.browse(cr, uid, code_ids, {'period_id': datas['form']['period_id']}): if str(t.code): result['case_'+str(t.code)] = '%.2f' % (t.sum_period or 0.0, ) - user = pool.get('res.users').browse(cr, uid, uid, context) + user = registry['res.users'].browse(cr, uid, uid, context) # Not Clean, to be changed partner = user.company_id.partner_id diff --git a/addons/mail/update.py b/addons/mail/update.py index bcec6f5f8b6..94416aeb356 100644 --- a/addons/mail/update.py +++ b/addons/mail/update.py @@ -5,7 +5,7 @@ import sys import urllib import urllib2 -from openerp import pooler +import openerp from openerp import release from openerp.osv import fields, osv from openerp.tools.translate import _ @@ -26,7 +26,7 @@ def get_sys_logs(self, cr, uid): """ Utility method to send a publisher warranty get logs messages. """ - pool = pooler.get_pool(cr.dbname) + pool = openerp.registry(cr.dbname) dbuuid = pool.get('ir.config_parameter').get_param(cr, uid, 'database.uuid') db_create_date = pool.get('ir.config_parameter').get_param(cr, uid, 'database.create_date') 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): diff --git a/addons/mrp_operations/report/mrp_code_barcode.py b/addons/mrp_operations/report/mrp_code_barcode.py index ee9b7a64a40..ea2ba7165b4 100644 --- a/addons/mrp_operations/report/mrp_code_barcode.py +++ b/addons/mrp_operations/report/mrp_code_barcode.py @@ -19,7 +19,6 @@ # ############################################################################## -from openerp import pooler import time from openerp.report import report_sxw diff --git a/addons/mrp_operations/report/mrp_wc_barcode.py b/addons/mrp_operations/report/mrp_wc_barcode.py index 746ed6d71c7..ee1bbe64cd4 100644 --- a/addons/mrp_operations/report/mrp_wc_barcode.py +++ b/addons/mrp_operations/report/mrp_wc_barcode.py @@ -19,7 +19,6 @@ # ############################################################################## -from openerp import pooler import time from openerp.report import report_sxw diff --git a/addons/point_of_sale/report/pos_receipt.py b/addons/point_of_sale/report/pos_receipt.py index 6272de95db7..bc9d1853f5b 100644 --- a/addons/point_of_sale/report/pos_receipt.py +++ b/addons/point_of_sale/report/pos_receipt.py @@ -21,7 +21,6 @@ import time from openerp.report import report_sxw -from openerp import pooler def titlize(journal_name): words = journal_name.split() @@ -34,7 +33,7 @@ class order(report_sxw.rml_parse): def __init__(self, cr, uid, name, context): super(order, self).__init__(cr, uid, name, context=context) - user = pooler.get_pool(cr.dbname).get('res.users').browse(cr, uid, uid, context=context) + user = self.pool['res.users'].browse(cr, uid, uid, context=context) partner = user.company_id.partner_id self.localcontext.update({ diff --git a/addons/process/process.py b/addons/process/process.py index 30b37a8b0e2..30a1865af4b 100644 --- a/addons/process/process.py +++ b/addons/process/process.py @@ -19,7 +19,6 @@ # ############################################################################## -from openerp import pooler from openerp import tools from openerp.osv import fields, osv @@ -53,24 +52,23 @@ class process_process(osv.osv): } def search_by_model(self, cr, uid, res_model, context=None): - pool = pooler.get_pool(cr.dbname) - model_ids = (res_model or None) and pool.get('ir.model').search(cr, uid, [('model', '=', res_model)]) + model_ids = (res_model or None) and self.pool['ir.model'].search(cr, uid, [('model', '=', res_model)]) domain = (model_ids or []) and [('model_id', 'in', model_ids)] result = [] # search all processes - res = pool.get('process.process').search(cr, uid, domain) + res = self.pool['process.process'].search(cr, uid, domain) if res: - res = pool.get('process.process').browse(cr, uid, res, context=context) + res = self.pool['process.process'].browse(cr, uid, res, context=context) for process in res: result.append((process.id, process.name)) return result # else search process nodes - res = pool.get('process.node').search(cr, uid, domain) + res = self.pool['process.node'].search(cr, uid, domain) if res: - res = pool.get('process.node').browse(cr, uid, res, context=context) + res = self.pool['process.node'].browse(cr, uid, res, context=context) for node in res: if (node.process_id.id, node.process_id.name) not in result: result.append((node.process_id.id, node.process_id.name)) @@ -79,9 +77,8 @@ class process_process(osv.osv): def graph_get(self, cr, uid, id, res_model, res_id, scale, context=None): - pool = pooler.get_pool(cr.dbname) - process = pool.get('process.process').browse(cr, uid, id, context=context) + process = self.pool['process.process'].browse(cr, uid, id, context=context) name = process.name resource = False @@ -92,16 +89,16 @@ class process_process(osv.osv): perm = False if res_model: - states = dict(pool.get(res_model).fields_get(cr, uid, context=context).get('state', {}).get('selection', {})) + states = dict(self.pool[res_model].fields_get(cr, uid, context=context).get('state', {}).get('selection', {})) if res_id: - current_object = pool.get(res_model).browse(cr, uid, res_id, context=context) - current_user = pool.get('res.users').browse(cr, uid, uid, context=context) + current_object = self.pool[res_model].browse(cr, uid, res_id, context=context) + current_user = self.pool['res.users'].browse(cr, uid, uid, context=context) expr_context = Env(current_object, current_user) resource = current_object.name if 'state' in current_object: state = states.get(current_object.state, 'N/A') - perm = pool.get(res_model).perm_read(cr, uid, [res_id], context=context)[0] + perm = self.pool[res_model].perm_read(cr, uid, [res_id], context=context)[0] notes = process.note or "N/A" nodes = {} @@ -122,12 +119,12 @@ class process_process(osv.osv): # get assosiated workflow if data['model']: - wkf_ids = self.pool.get('workflow').search(cr, uid, [('osv', '=', data['model'])]) + wkf_ids = self.pool['workflow'].search(cr, uid, [('osv', '=', data['model'])]) data['workflow'] = (wkf_ids or False) and wkf_ids[0] if 'directory_id' in node and node.directory_id: data['directory_id'] = node.directory_id.id - data['directory'] = self.pool.get('document.directory').get_resource_path(cr, uid, data['directory_id'], data['model'], False) + data['directory'] = self.pool['document.directory'].get_resource_path(cr, uid, data['directory_id'], data['model'], False) if node.menu_id: data['menu'] = {'name': node.menu_id.complete_name, 'id': node.menu_id.id} @@ -189,15 +186,15 @@ class process_process(osv.osv): nodes[nid]['res'] = resource = {'id': ref_id, 'model': ref_model} - refobj = pool.get(ref_model).browse(cr, uid, ref_id, context=context) - fields = pool.get(ref_model).fields_get(cr, uid, context=context) + refobj = self.pool[ref_model].browse(cr, uid, ref_id, context=context) + fields = self.pool[ref_model].fields_get(cr, uid, context=context) # check for directory_id from inherited from document module if nodes[nid].get('directory_id', False): - resource['directory'] = self.pool.get('document.directory').get_resource_path(cr, uid, nodes[nid]['directory_id'], ref_model, ref_id) + resource['directory'] = self.pool['document.directory'].get_resource_path(cr, uid, nodes[nid]['directory_id'], ref_model, ref_id) - resource['name'] = pool.get(ref_model).name_get(cr, uid, [ref_id], context=context)[0][1] - resource['perm'] = pool.get(ref_model).perm_read(cr, uid, [ref_id], context=context)[0] + resource['name'] = self.pool[ref_model].name_get(cr, uid, [ref_id], context=context)[0][1] + resource['perm'] = self.pool[ref_model].perm_read(cr, uid, [ref_id], context=context)[0] ref_expr_context = Env(refobj, current_user) try: @@ -261,8 +258,7 @@ class process_process(osv.osv): if not default: default = {} - pool = pooler.get_pool(cr.dbname) - process = pool.get('process.process').browse(cr, uid, id, context=context) + process = self.pool['process.process'].browse(cr, uid, id, context=context) nodes = {} transitions = {} @@ -275,7 +271,7 @@ class process_process(osv.osv): for t in node.transition_out: tr = transitions.setdefault(t.id, {}) tr['source'] = node.id - nodes[node.id] = pool.get('process.node').copy(cr, uid, node.id, context=context) + nodes[node.id] = self.pool['process.node'].copy(cr, uid, node.id, context=context) # then copy transitions with new nodes for tid, tr in transitions.items(): @@ -283,7 +279,7 @@ class process_process(osv.osv): 'source_node_id': nodes[tr['source']], 'target_node_id': nodes[tr['target']] } - tr = pool.get('process.transition').copy(cr, uid, tid, default=vals, context=context) + tr = self.pool['process.transition'].copy(cr, uid, tid, default=vals, context=context) # and finally copy the process itself with new nodes default.update({ @@ -379,7 +375,7 @@ class process_transition_action(osv.osv): if not default: default = {} - state = self.pool.get('process.transition.action').browse(cr, uid, id, context=context).state + state = self.pool['process.transition.action'].browse(cr, uid, id, context=context).state if state: default['state'] = state diff --git a/addons/procurement/schedulers.py b/addons/procurement/schedulers.py index c09d9a22a16..1009873beb2 100644 --- a/addons/procurement/schedulers.py +++ b/addons/procurement/schedulers.py @@ -21,8 +21,8 @@ from datetime import datetime from dateutil.relativedelta import relativedelta -from openerp import netsvc -from openerp import pooler + +import openerp from openerp.osv import osv from openerp.osv import fields from openerp.tools.translate import _ @@ -56,7 +56,7 @@ class procurement_order(osv.osv): context = {} try: if use_new_cursor: - cr = pooler.get_db(use_new_cursor).cursor() + cr = openerp.registry(use_new_cursor).db.cursor() procurement_obj = self.pool.get('procurement.order') if not ids: @@ -218,7 +218,7 @@ class procurement_order(osv.osv): if context is None: context = {} if use_new_cursor: - cr = pooler.get_db(use_new_cursor).cursor() + cr = openerp.registry(use_new_cursor).db.cursor() orderpoint_obj = self.pool.get('stock.warehouse.orderpoint') procurement_obj = self.pool.get('procurement.order') diff --git a/addons/procurement/wizard/orderpoint_procurement.py b/addons/procurement/wizard/orderpoint_procurement.py index 8f5f373772d..2d5b91d4c81 100644 --- a/addons/procurement/wizard/orderpoint_procurement.py +++ b/addons/procurement/wizard/orderpoint_procurement.py @@ -25,7 +25,6 @@ # import threading -from openerp import pooler from openerp.osv import fields,osv class procurement_compute(osv.osv_memory): @@ -50,7 +49,7 @@ class procurement_compute(osv.osv_memory): """ proc_obj = self.pool.get('procurement.order') #As this function is in a new thread, I need to open a new cursor, because the old one may be closed - new_cr = pooler.get_db(cr.dbname).cursor() + new_cr = self.pool.db.cursor() for proc in self.browse(new_cr, uid, ids, context=context): proc_obj._procure_orderpoint_confirm(new_cr, uid, automatic=proc.automatic, use_new_cursor=new_cr.dbname, context=context) #close the new cursor diff --git a/addons/procurement/wizard/schedulers_all.py b/addons/procurement/wizard/schedulers_all.py index 9311ffcd11d..c60ac989274 100644 --- a/addons/procurement/wizard/schedulers_all.py +++ b/addons/procurement/wizard/schedulers_all.py @@ -20,7 +20,6 @@ ############################################################################## import threading -from openerp import pooler from openerp.osv import fields, osv @@ -46,7 +45,7 @@ class procurement_compute_all(osv.osv_memory): """ proc_obj = self.pool.get('procurement.order') #As this function is in a new thread, i need to open a new cursor, because the old one may be closed - new_cr = pooler.get_db(cr.dbname).cursor() + new_cr = self.pool.db.cursor() for proc in self.browse(new_cr, uid, ids, context=context): proc_obj.run_scheduler(new_cr, uid, automatic=proc.automatic, use_new_cursor=new_cr.dbname,\ context=context) diff --git a/addons/product/report/product_pricelist.py b/addons/product/report/product_pricelist.py index 5e9f8cf0a8a..9b0708f5d4a 100644 --- a/addons/product/report/product_pricelist.py +++ b/addons/product/report/product_pricelist.py @@ -21,7 +21,6 @@ import time -from openerp import pooler from openerp.osv import osv from openerp.report import report_sxw from openerp.tools.translate import _ @@ -63,20 +62,17 @@ class product_pricelist(report_sxw.rml_parse): return True def _get_pricelist(self, pricelist_id): - pool = pooler.get_pool(self.cr.dbname) - pricelist = pool.get('product.pricelist').read(self.cr, self.uid, [pricelist_id], ['name'], context=self.localcontext)[0] + pricelist = self.pool.get('product.pricelist').read(self.cr, self.uid, [pricelist_id], ['name'], context=self.localcontext)[0] return pricelist['name'] def _get_currency(self, pricelist_id): - pool = pooler.get_pool(self.cr.dbname) - pricelist = pool.get('product.pricelist').read(self.cr, self.uid, [pricelist_id], ['currency_id'], context=self.localcontext)[0] + pricelist = self.pool.get('product.pricelist').read(self.cr, self.uid, [pricelist_id], ['currency_id'], context=self.localcontext)[0] return pricelist['currency_id'][1] # TODO 7.0 - remove this method, its unused def _get_currency_symbol(self, pricelist_id): - pool = pooler.get_pool(self.cr.dbname) - pricelist = pool.get('product.pricelist').read(self.cr, self.uid, [pricelist_id], ['currency_id'], context=self.localcontext)[0] - symbol = pool.get('res.currency').read(self.cr, self.uid, [pricelist['currency_id'][0]], ['symbol'], context=self.localcontext)[0] + pricelist = self.pool.get('product.pricelist').read(self.cr, self.uid, [pricelist_id], ['currency_id'], context=self.localcontext)[0] + symbol = self.pool.get('res.currency').read(self.cr, self.uid, [pricelist['currency_id'][0]], ['symbol'], context=self.localcontext)[0] return symbol['symbol'] or '' def _get_categories(self, products, form): @@ -84,20 +80,19 @@ class product_pricelist(report_sxw.rml_parse): res=[] self.pricelist = form['price_list'] self._set_quantity(form) - pool = pooler.get_pool(self.cr.dbname) pro_ids=[] for product in products: pro_ids.append(product.id) if product.categ_id.id not in cat_ids: cat_ids.append(product.categ_id.id) - cats = pool.get('product.category').name_get(self.cr, self.uid, cat_ids, context=self.localcontext) + cats = self.pool.get('product.category').name_get(self.cr, self.uid, cat_ids, context=self.localcontext) if not cats: return res for cat in cats: - product_ids=pool.get('product.product').search(self.cr, self.uid, [('id', 'in', pro_ids), ('categ_id', '=', cat[0])], context=self.localcontext) + product_ids=self.pool.get('product.product').search(self.cr, self.uid, [('id', 'in', pro_ids), ('categ_id', '=', cat[0])], context=self.localcontext) products = [] - for product in pool.get('product.product').read(self.cr, self.uid, product_ids, ['name', 'code'], context=self.localcontext): + for product in self.pool.get('product.product').read(self.cr, self.uid, product_ids, ['name', 'code'], context=self.localcontext): val = { 'id':product['id'], 'name':product['name'], @@ -116,13 +111,12 @@ class product_pricelist(report_sxw.rml_parse): def _get_price(self, pricelist_id, product_id, qty): sale_price_digits = self.get_digits(dp='Product Price') - pool = pooler.get_pool(self.cr.dbname) pricelist = self.pool.get('product.pricelist').browse(self.cr, self.uid, [pricelist_id], context=self.localcontext)[0] - price_dict = pool.get('product.pricelist').price_get(self.cr, self.uid, [pricelist_id], product_id, qty, context=self.localcontext) + price_dict = self.pool.get('product.pricelist').price_get(self.cr, self.uid, [pricelist_id], product_id, qty, context=self.localcontext) if price_dict[pricelist_id]: price = self.formatLang(price_dict[pricelist_id], digits=sale_price_digits, currency_obj=pricelist.currency_id) else: - res = pool.get('product.product').read(self.cr, self.uid, [product_id]) + res = self.pool.get('product.product').read(self.cr, self.uid, [product_id]) price = self.formatLang(res[0]['list_price'], digits=sale_price_digits, currency_obj=pricelist.currency_id) return price diff --git a/addons/product_expiry/product_expiry.py b/addons/product_expiry/product_expiry.py index e939e594437..457b4428522 100644 --- a/addons/product_expiry/product_expiry.py +++ b/addons/product_expiry/product_expiry.py @@ -19,8 +19,9 @@ ############################################################################## import datetime + +import openerp from openerp.osv import fields, osv -from openerp import pooler class stock_production_lot(osv.osv): _inherit = 'stock.production.lot' @@ -34,7 +35,7 @@ class stock_production_lot(osv.osv): if not context.get('product_id', False): date = False else: - product = pooler.get_pool(cr.dbname).get('product.product').browse( + product = openerp.registry(cr.dbname)['product.product'].browse( cr, uid, context['product_id']) duration = getattr(product, dtype) # set date to False when no expiry time specified on the product diff --git a/addons/project_timesheet/project_timesheet.py b/addons/project_timesheet/project_timesheet.py index c1f8f6409a9..6c2b2b0e13b 100644 --- a/addons/project_timesheet/project_timesheet.py +++ b/addons/project_timesheet/project_timesheet.py @@ -22,7 +22,6 @@ import time import datetime from openerp.osv import fields, osv -from openerp import pooler from openerp import tools from openerp.tools.translate import _ diff --git a/addons/purchase/purchase.py b/addons/purchase/purchase.py index 23f889b136f..6258a18e399 100644 --- a/addons/purchase/purchase.py +++ b/addons/purchase/purchase.py @@ -25,7 +25,6 @@ from dateutil.relativedelta import relativedelta from operator import attrgetter from openerp.osv import fields, osv -from openerp import pooler from openerp.tools.translate import _ import openerp.addons.decimal_precision as dp from openerp.osv.orm import browse_record, browse_null diff --git a/addons/purchase/report/order.py b/addons/purchase/report/order.py index e415af53434..68d92970aa0 100644 --- a/addons/purchase/report/order.py +++ b/addons/purchase/report/order.py @@ -21,8 +21,6 @@ import time from openerp.report import report_sxw -from openerp.osv import osv -from openerp import pooler class order(report_sxw.rml_parse): def __init__(self, cr, uid, name, context): diff --git a/addons/purchase/report/request_quotation.py b/addons/purchase/report/request_quotation.py index 1179e704eb0..7be23113584 100644 --- a/addons/purchase/report/request_quotation.py +++ b/addons/purchase/report/request_quotation.py @@ -21,8 +21,6 @@ import time from openerp.report import report_sxw -from openerp.osv import osv -from openerp import pooler class request_quotation(report_sxw.rml_parse): def __init__(self, cr, uid, name, context): diff --git a/addons/purchase/res_config.py b/addons/purchase/res_config.py index 130247037a4..b773c57adb1 100644 --- a/addons/purchase/res_config.py +++ b/addons/purchase/res_config.py @@ -20,7 +20,6 @@ ############################################################################## from openerp.osv import fields, osv -from openerp import pooler from openerp.tools.translate import _ class purchase_config_settings(osv.osv_memory): diff --git a/addons/purchase/wizard/purchase_order_group.py b/addons/purchase/wizard/purchase_order_group.py index b47f4e608a8..57875bc6acb 100644 --- a/addons/purchase/wizard/purchase_order_group.py +++ b/addons/purchase/wizard/purchase_order_group.py @@ -21,8 +21,6 @@ import time from openerp.osv import fields, osv -from openerp import netsvc -from openerp import pooler from openerp.osv.orm import browse_record, browse_null from openerp.tools.translate import _ diff --git a/addons/purchase_requisition/report/requisition.py b/addons/purchase_requisition/report/requisition.py index 315a34d37e9..d7d38f2114e 100644 --- a/addons/purchase_requisition/report/requisition.py +++ b/addons/purchase_requisition/report/requisition.py @@ -21,8 +21,6 @@ import time from openerp.report import report_sxw -from openerp.osv import osv -from openerp import pooler class requisition(report_sxw.rml_parse): def __init__(self, cr, uid, name, context): diff --git a/addons/report_intrastat/report/invoice.py b/addons/report_intrastat/report/invoice.py index c1f3823c9d8..c38a62774ac 100644 --- a/addons/report_intrastat/report/invoice.py +++ b/addons/report_intrastat/report/invoice.py @@ -21,7 +21,6 @@ import time from openerp.report import report_sxw -from openerp import pooler class account_invoice_intrastat(report_sxw.rml_parse): def __init__(self, cr, uid, name, context): diff --git a/addons/report_webkit/report_helper.py b/addons/report_webkit/report_helper.py index bc2eb9397ec..af9408b834e 100644 --- a/addons/report_webkit/report_helper.py +++ b/addons/report_webkit/report_helper.py @@ -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 diff --git a/addons/report_webkit/webkit_report.py b/addons/report_webkit/webkit_report.py index f4f65e56596..65ce0b7f707 100644 --- a/addons/report_webkit/webkit_report.py +++ b/addons/report_webkit/webkit_report.py @@ -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: diff --git a/addons/report_webkit/wizard/report_webkit_actions.py b/addons/report_webkit/wizard/report_webkit_actions.py index b0e761752f6..4080d0a4034 100644 --- a/addons/report_webkit/wizard/report_webkit_actions.py +++ b/addons/report_webkit/wizard/report_webkit_actions.py @@ -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, diff --git a/addons/sale/res_config.py b/addons/sale/res_config.py index 3fb8e049e8d..6548591da1e 100644 --- a/addons/sale/res_config.py +++ b/addons/sale/res_config.py @@ -22,7 +22,6 @@ import logging from openerp.osv import fields, osv -from openerp import pooler from openerp.tools.translate import _ _logger = logging.getLogger(__name__) diff --git a/addons/sale/sale.py b/addons/sale/sale.py index bf9e9484b9f..5ee22f3c569 100644 --- a/addons/sale/sale.py +++ b/addons/sale/sale.py @@ -22,7 +22,6 @@ from datetime import datetime, timedelta from dateutil.relativedelta import relativedelta import time -from openerp import pooler from openerp.osv import fields, osv from openerp.tools.translate import _ from openerp.tools import DEFAULT_SERVER_DATE_FORMAT, DEFAULT_SERVER_DATETIME_FORMAT, DATETIME_FORMATS_MAP, float_compare diff --git a/addons/sale_stock/res_config.py b/addons/sale_stock/res_config.py index 3a6dcb404dd..d06b6a81b32 100644 --- a/addons/sale_stock/res_config.py +++ b/addons/sale_stock/res_config.py @@ -20,7 +20,6 @@ ############################################################################## from openerp.osv import fields, osv -from openerp import pooler from openerp.tools.translate import _ class sale_configuration(osv.osv_memory): diff --git a/addons/stock/report/lot_overview.py b/addons/stock/report/lot_overview.py index 9d6626bbd14..c8e80ac54b9 100644 --- a/addons/stock/report/lot_overview.py +++ b/addons/stock/report/lot_overview.py @@ -18,7 +18,6 @@ # along with this program. If not, see . # ############################################################################## -from openerp import pooler import time from openerp.report import report_sxw @@ -35,7 +34,7 @@ class lot_overview(report_sxw.rml_parse): }) def process(self, location_id): - location_obj = pooler.get_pool(self.cr.dbname).get('stock.location') + location_obj = self.pool['stock.location'] data = location_obj._product_get_report(self.cr,self.uid, [location_id]) data['location_name'] = location_obj.read(self.cr, self.uid, [location_id],['complete_name'])[0]['complete_name'] diff --git a/addons/stock/report/lot_overview_all.py b/addons/stock/report/lot_overview_all.py index ca6611de89b..aba97fa6e1e 100644 --- a/addons/stock/report/lot_overview_all.py +++ b/addons/stock/report/lot_overview_all.py @@ -18,7 +18,6 @@ # along with this program. If not, see . # ############################################################################## -from openerp import pooler import time from openerp.report import report_sxw @@ -35,7 +34,7 @@ class lot_overview_all(report_sxw.rml_parse): }) def process(self, location_id): - location_obj = pooler.get_pool(self.cr.dbname).get('stock.location') + location_obj = self.pool['stock.location'] data = location_obj._product_get_all_report(self.cr,self.uid, [location_id]) data['location_name'] = location_obj.read(self.cr, self.uid, [location_id],['complete_name'])[0]['complete_name'] self.price_total = 0.0 diff --git a/addons/stock/report/picking.py b/addons/stock/report/picking.py index a33ec28cb35..512d124ee0c 100644 --- a/addons/stock/report/picking.py +++ b/addons/stock/report/picking.py @@ -22,7 +22,6 @@ import time from openerp.report import report_sxw from openerp.osv import osv -from openerp import pooler class picking(report_sxw.rml_parse): def __init__(self, cr, uid, name, context): diff --git a/addons/stock/report/product_stock.py b/addons/stock/report/product_stock.py index 9ccda54b693..0315c44281b 100644 --- a/addons/stock/report/product_stock.py +++ b/addons/stock/report/product_stock.py @@ -22,13 +22,13 @@ from datetime import datetime from dateutil.relativedelta import relativedelta +import openerp from openerp import osv import time from openerp.report.interface import report_int from openerp.report.render import render import stock_graph -from openerp import pooler import StringIO class external_pdf(render): @@ -45,24 +45,25 @@ class report_stock(report_int): def create(self, cr, uid, ids, datas, context=None): if context is None: context = {} + registry = openerp.registry(cr.dbname) product_ids = ids if 'location_id' in context: location_id = context['location_id'] else: - warehouse_id = pooler.get_pool(cr.dbname).get('stock.warehouse').search(cr, uid, [])[0] - location_id = pooler.get_pool(cr.dbname).get('stock.warehouse').browse(cr, uid, warehouse_id).lot_stock_id.id + warehouse_id = registry['stock.warehouse'].search(cr, uid, [])[0] + location_id = registry['stock.warehouse'].browse(cr, uid, warehouse_id).lot_stock_id.id - loc_ids = pooler.get_pool(cr.dbname).get('stock.location').search(cr, uid, [('location_id','child_of',[location_id])]) + loc_ids = registry['stock.location'].search(cr, uid, [('location_id','child_of',[location_id])]) now = time.strftime('%Y-%m-%d') dt_from = now dt_to = now - names = dict(pooler.get_pool(cr.dbname).get('product.product').name_get(cr, uid, product_ids)) + names = dict(registry['product.product'].name_get(cr, uid, product_ids)) for name in names: names[name] = names[name].encode('utf8') products = {} - prods = pooler.get_pool(cr.dbname).get('stock.location')._product_all_get(cr, uid, location_id, product_ids) + prods = registry['stock.location']._product_all_get(cr, uid, location_id, product_ids) for p in prods: products[p] = [(now,prods[p])] diff --git a/addons/stock/report/stock_by_location.py b/addons/stock/report/stock_by_location.py index 7ca209c9ed2..153b92f077c 100644 --- a/addons/stock/report/stock_by_location.py +++ b/addons/stock/report/stock_by_location.py @@ -19,7 +19,7 @@ # ############################################################################## -from openerp import pooler +import openerp from openerp.report.interface import report_rml from openerp.report.interface import toxml @@ -47,16 +47,17 @@ class report_custom(report_rml): """ def process(location_id, level): + registry = openerp.registry(cr.dbname) xml = '' - location_name = pooler.get_pool(cr.dbname).get('stock.location').read(cr, uid, [location_id], ['name']) + location_name = registry['stock.location'].read(cr, uid, [location_id], ['name']) xml += "" xml += location_name[0]['name'] + '' - prod_info = pooler.get_pool(cr.dbname).get('stock.location')._product_get(cr, uid, location_id) + prod_info = registry['stock.location']._product_get(cr, uid, location_id) xml += "" for prod_id in prod_info.keys(): if prod_info[prod_id] != 0.0: - prod_name = pooler.get_pool(cr.dbname).get('product.product').read(cr, uid, [prod_id], ['name']) + prod_name = registry['product.product'].read(cr, uid, [prod_id], ['name']) xml += prod_name[0]['name'] + '\n' xml += '' @@ -66,7 +67,7 @@ class report_custom(report_rml): xml += str(prod_info[prod_id]) + '\n' xml += '' - location_child = pooler.get_pool(cr.dbname).get('stock.location').read(cr, uid, [location_id], ['child_ids']) + location_child = registry['stock.location'].read(cr, uid, [location_id], ['child_ids']) for child_id in location_child[0]['child_ids']: xml += process(child_id, level+1) return xml 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 += """