[MERGE] openerp.pooler is deprecated.
bzr revid: vmt@openerp.com-20130327164045-ziw4lj50owdvmfbwmaster
Vo Minh Thu
commit
d6ea526e36
|
|
@ -53,5 +53,12 @@ multi_process = False
|
|||
# Is the server running with gevent.
|
||||
evented = False
|
||||
|
||||
def registry(database_name):
|
||||
"""
|
||||
Return the model registry for the given database. If the registry does not
|
||||
exist yet, it is created on the fly.
|
||||
"""
|
||||
return modules.registry.RegistryManager.get(database_name)
|
||||
|
||||
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
|
||||
|
||||
|
|
|
|||
|
|
@ -123,7 +123,7 @@ class ir_cron(osv.osv):
|
|||
try:
|
||||
args = str2tuple(args)
|
||||
openerp.modules.registry.RegistryManager.check_registry_signaling(cr.dbname)
|
||||
registry = openerp.pooler.get_pool(cr.dbname)
|
||||
registry = openerp.registry(cr.dbname)
|
||||
model = registry.get(model_name)
|
||||
if model and hasattr(model, method_name):
|
||||
method = getattr(model, method_name)
|
||||
|
|
@ -223,7 +223,7 @@ class ir_cron(osv.osv):
|
|||
_logger.debug('Starting job `%s`.', job['name'])
|
||||
job_cr = db.cursor()
|
||||
try:
|
||||
registry = openerp.pooler.get_pool(db_name)
|
||||
registry = openerp.registry(db_name)
|
||||
registry[cls._name]._process_job(job_cr, job, lock_cr)
|
||||
except Exception:
|
||||
_logger.exception('Unexpected exception while processing cron job %r', job)
|
||||
|
|
|
|||
|
|
@ -26,7 +26,7 @@ import types
|
|||
|
||||
import openerp
|
||||
from openerp import SUPERUSER_ID
|
||||
from openerp import netsvc, pooler, tools
|
||||
from openerp import netsvc, tools
|
||||
from openerp.osv import fields,osv
|
||||
from openerp.osv.orm import Model
|
||||
from openerp.tools.safe_eval import safe_eval as eval
|
||||
|
|
@ -50,7 +50,7 @@ def _get_fields_type(self, cr, uid, context=None):
|
|||
|
||||
def _in_modules(self, cr, uid, ids, field_name, arg, context=None):
|
||||
#pseudo-method used by fields.function in ir.model/ir.model.fields
|
||||
module_pool = self.pool.get("ir.module.module")
|
||||
module_pool = self.pool["ir.module.module"]
|
||||
installed_module_ids = module_pool.search(cr, uid, [('state','=','installed')])
|
||||
installed_module_names = module_pool.read(cr, uid, installed_module_ids, ['name'], context=context)
|
||||
installed_modules = set(x['name'] for x in installed_module_names)
|
||||
|
|
@ -71,7 +71,7 @@ class ir_model(osv.osv):
|
|||
res = dict.fromkeys(ids)
|
||||
for model in models:
|
||||
if self.pool.get(model.model):
|
||||
res[model.id] = self.pool.get(model.model).is_transient()
|
||||
res[model.id] = self.pool[model.model].is_transient()
|
||||
else:
|
||||
_logger.error('Missing model %s' % (model.model, ))
|
||||
return res
|
||||
|
|
@ -91,7 +91,7 @@ class ir_model(osv.osv):
|
|||
models = self.browse(cr, uid, ids)
|
||||
res = {}
|
||||
for model in models:
|
||||
res[model.id] = self.pool.get("ir.ui.view").search(cr, uid, [('model', '=', model.model)])
|
||||
res[model.id] = self.pool["ir.ui.view"].search(cr, uid, [('model', '=', model.model)])
|
||||
return res
|
||||
|
||||
_columns = {
|
||||
|
|
@ -144,7 +144,7 @@ class ir_model(osv.osv):
|
|||
|
||||
def _drop_table(self, cr, uid, ids, context=None):
|
||||
for model in self.browse(cr, uid, ids, context):
|
||||
model_pool = self.pool.get(model.model)
|
||||
model_pool = self.pool[model.model]
|
||||
cr.execute('select relkind from pg_class where relname=%s', (model_pool._table,))
|
||||
result = cr.fetchone()
|
||||
if result and result[0] == 'v':
|
||||
|
|
@ -168,7 +168,7 @@ class ir_model(osv.osv):
|
|||
if not context.get(MODULE_UNINSTALL_FLAG):
|
||||
# only reload pool for normal unlink. For module uninstall the
|
||||
# reload is done independently in openerp.modules.loading
|
||||
pooler.restart_pool(cr.dbname)
|
||||
openerp.modules.registry.RegistryManager.new(cr.dbname)
|
||||
|
||||
return res
|
||||
|
||||
|
|
@ -193,8 +193,7 @@ class ir_model(osv.osv):
|
|||
field_name=vals['name'],
|
||||
field_state='manual',
|
||||
select=vals.get('select_level', '0'))
|
||||
self.pool.get(vals['model'])._auto_init(cr, ctx)
|
||||
#pooler.restart_pool(cr.dbname)
|
||||
self.pool[vals['model']]._auto_init(cr, ctx)
|
||||
return res
|
||||
|
||||
def instanciate(self, cr, user, model, context=None):
|
||||
|
|
@ -298,7 +297,7 @@ class ir_model_fields(osv.osv):
|
|||
|
||||
def _drop_column(self, cr, uid, ids, context=None):
|
||||
for field in self.browse(cr, uid, ids, context):
|
||||
model = self.pool.get(field.model)
|
||||
model = self.pool[field.model]
|
||||
cr.execute('select relkind from pg_class where relname=%s', (model._table,))
|
||||
result = cr.fetchone()
|
||||
cr.execute("SELECT column_name FROM information_schema.columns WHERE table_name ='%s' and column_name='%s'" %(model._table, field.name))
|
||||
|
|
@ -323,7 +322,7 @@ class ir_model_fields(osv.osv):
|
|||
|
||||
def create(self, cr, user, vals, context=None):
|
||||
if 'model_id' in vals:
|
||||
model_data = self.pool.get('ir.model').browse(cr, user, vals['model_id'])
|
||||
model_data = self.pool['ir.model'].browse(cr, user, vals['model_id'])
|
||||
vals['model'] = model_data.model
|
||||
if context is None:
|
||||
context = {}
|
||||
|
|
@ -338,18 +337,18 @@ class ir_model_fields(osv.osv):
|
|||
if not vals['name'].startswith('x_'):
|
||||
raise except_orm(_('Error'), _("Custom fields must have a name that starts with 'x_' !"))
|
||||
|
||||
if vals.get('relation',False) and not self.pool.get('ir.model').search(cr, user, [('model','=',vals['relation'])]):
|
||||
if vals.get('relation',False) and not self.pool['ir.model'].search(cr, user, [('model','=',vals['relation'])]):
|
||||
raise except_orm(_('Error'), _("Model %s does not exist!") % vals['relation'])
|
||||
|
||||
if self.pool.get(vals['model']):
|
||||
self.pool.get(vals['model']).__init__(self.pool, cr)
|
||||
self.pool[vals['model']].__init__(self.pool, cr)
|
||||
#Added context to _auto_init for special treatment to custom field for select_level
|
||||
ctx = dict(context,
|
||||
field_name=vals['name'],
|
||||
field_state='manual',
|
||||
select=vals.get('select_level', '0'),
|
||||
update_custom_fields=True)
|
||||
self.pool.get(vals['model'])._auto_init(cr, ctx)
|
||||
self.pool[vals['model']]._auto_init(cr, ctx)
|
||||
|
||||
return res
|
||||
|
||||
|
|
@ -498,7 +497,7 @@ class ir_model_constraint(Model):
|
|||
Delete PostgreSQL foreign keys and constraints tracked by this model.
|
||||
"""
|
||||
|
||||
if uid != SUPERUSER_ID and not self.pool.get('ir.model.access').check_groups(cr, uid, "base.group_system"):
|
||||
if uid != SUPERUSER_ID and not self.pool['ir.model.access'].check_groups(cr, uid, "base.group_system"):
|
||||
raise except_orm(_('Permission Denied'), (_('Administrator access is required to uninstall a module')))
|
||||
|
||||
context = dict(context or {})
|
||||
|
|
@ -559,7 +558,7 @@ class ir_model_relation(Model):
|
|||
Delete PostgreSQL many2many relations tracked by this model.
|
||||
"""
|
||||
|
||||
if uid != SUPERUSER_ID and not self.pool.get('ir.model.access').check_groups(cr, uid, "base.group_system"):
|
||||
if uid != SUPERUSER_ID and not self.pool['ir.model.access'].check_groups(cr, uid, "base.group_system"):
|
||||
raise except_orm(_('Permission Denied'), (_('Administrator access is required to uninstall a module')))
|
||||
|
||||
ids_set = set(ids)
|
||||
|
|
@ -685,7 +684,7 @@ class ir_model_access(osv.osv):
|
|||
# TransientModel records have no access rights, only an implicit access rule
|
||||
if not self.pool.get(model_name):
|
||||
_logger.error('Missing model %s' % (model_name, ))
|
||||
elif self.pool.get(model_name).is_transient():
|
||||
elif self.pool[model_name].is_transient():
|
||||
return True
|
||||
|
||||
# We check if a specific rule exists
|
||||
|
|
@ -793,7 +792,7 @@ class ir_model_data(osv.osv):
|
|||
|
||||
for model in result:
|
||||
try:
|
||||
r = dict(self.pool.get(model).name_get(cr, uid, result[model].keys(), context=context))
|
||||
r = dict(self.pool[model].name_get(cr, uid, result[model].keys(), context=context))
|
||||
for key,val in result[model].items():
|
||||
result2[val] = r.get(key, False)
|
||||
except:
|
||||
|
|
@ -867,7 +866,7 @@ class ir_model_data(osv.osv):
|
|||
def get_object(self, cr, uid, module, xml_id, context=None):
|
||||
"""Returns a browsable record for the given module name and xml_id or raise ValueError if not found"""
|
||||
res_model, res_id = self.get_object_reference(cr, uid, module, xml_id)
|
||||
result = self.pool.get(res_model).browse(cr, uid, res_id, context=context)
|
||||
result = self.pool[res_model].browse(cr, uid, res_id, context=context)
|
||||
if not result.exists():
|
||||
raise ValueError('No record found for unique ID %s.%s. It may have been deleted.' % (module, xml_id))
|
||||
return result
|
||||
|
|
@ -1001,7 +1000,7 @@ class ir_model_data(osv.osv):
|
|||
cr.execute('select * from ir_values where model=%s and key=%s and name=%s'+where,(model, key, name))
|
||||
res = cr.fetchone()
|
||||
if not res:
|
||||
ir_values_obj = pooler.get_pool(cr.dbname).get('ir.values')
|
||||
ir_values_obj = openerp.registry(cr.dbname)['ir.values']
|
||||
ir_values_obj.set(cr, uid, key, key2, name, models, value, replace, isobject, meta)
|
||||
elif xml_id:
|
||||
cr.execute('UPDATE ir_values set value=%s WHERE model=%s and key=%s and name=%s'+where,(value, model, key, name))
|
||||
|
|
@ -1020,7 +1019,7 @@ class ir_model_data(osv.osv):
|
|||
|
||||
ids = self.search(cr, uid, [('module', 'in', modules_to_remove)])
|
||||
|
||||
if uid != 1 and not self.pool.get('ir.model.access').check_groups(cr, uid, "base.group_system"):
|
||||
if uid != 1 and not self.pool['ir.model.access'].check_groups(cr, uid, "base.group_system"):
|
||||
raise except_orm(_('Permission Denied'), (_('Administrator access is required to uninstall a module')))
|
||||
|
||||
context = dict(context or {})
|
||||
|
|
@ -1063,7 +1062,7 @@ class ir_model_data(osv.osv):
|
|||
if model == 'ir.model.fields':
|
||||
# Don't remove the LOG_ACCESS_COLUMNS unless _log_access
|
||||
# has been turned off on the model.
|
||||
field = self.pool.get(model).browse(cr, uid, [res_id], context=context)[0]
|
||||
field = self.pool[model].browse(cr, uid, [res_id], context=context)[0]
|
||||
if field.name in openerp.osv.orm.LOG_ACCESS_COLUMNS and self.pool[field.model]._log_access:
|
||||
continue
|
||||
if field.name == 'id':
|
||||
|
|
@ -1071,7 +1070,7 @@ class ir_model_data(osv.osv):
|
|||
_logger.info('Deleting %s@%s', res_id, model)
|
||||
try:
|
||||
cr.execute('SAVEPOINT record_unlink_save')
|
||||
self.pool.get(model).unlink(cr, uid, [res_id], context=context)
|
||||
self.pool[model].unlink(cr, uid, [res_id], context=context)
|
||||
except Exception:
|
||||
_logger.info('Unable to delete %s@%s', res_id, model, exc_info=True)
|
||||
cr.execute('ROLLBACK TO SAVEPOINT record_unlink_save')
|
||||
|
|
@ -1084,8 +1083,8 @@ class ir_model_data(osv.osv):
|
|||
unlink_if_refcount((model, res_id) for model, res_id in to_unlink
|
||||
if model == 'ir.model.fields')
|
||||
|
||||
ir_model_relation = self.pool.get('ir.model.relation')
|
||||
ir_module_module = self.pool.get('ir.module.module')
|
||||
ir_model_relation = self.pool['ir.model.relation']
|
||||
ir_module_module = self.pool['ir.module.module']
|
||||
modules_to_remove_ids = ir_module_module.search(cr, uid, [('name', 'in', modules_to_remove)])
|
||||
relation_ids = ir_model_relation.search(cr, uid, [('module', 'in', modules_to_remove_ids)])
|
||||
ir_model_relation._module_data_uninstall(cr, uid, relation_ids, context)
|
||||
|
|
@ -1118,6 +1117,6 @@ class ir_model_data(osv.osv):
|
|||
for (model, res_id) in to_unlink:
|
||||
if self.pool.get(model):
|
||||
_logger.info('Deleting %s@%s', res_id, model)
|
||||
self.pool.get(model).unlink(cr, uid, [res_id])
|
||||
self.pool[model].unlink(cr, uid, [res_id])
|
||||
|
||||
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
|
||||
|
|
|
|||
|
|
@ -39,7 +39,7 @@ except ImportError:
|
|||
from StringIO import StringIO # NOQA
|
||||
|
||||
import openerp
|
||||
from openerp import modules, pooler, tools, addons
|
||||
from openerp import modules, tools, addons
|
||||
from openerp.modules.db import create_categories
|
||||
from openerp.tools.parse_version import parse_version
|
||||
from openerp.tools.translate import _
|
||||
|
|
@ -473,14 +473,14 @@ class module(osv.osv):
|
|||
function(cr, uid, ids, context=context)
|
||||
|
||||
cr.commit()
|
||||
_, pool = pooler.restart_pool(cr.dbname, update_module=True)
|
||||
registry = openerp.modules.registry.RegistryManager.new(cr.dbname, update_module=True)
|
||||
|
||||
config = pool.get('res.config').next(cr, uid, [], context=context) or {}
|
||||
config = registry['res.config'].next(cr, uid, [], context=context) or {}
|
||||
if config.get('type') not in ('ir.actions.act_window_close',):
|
||||
return config
|
||||
|
||||
# reload the client; open the first available root menu
|
||||
menu_obj = self.pool.get('ir.ui.menu')
|
||||
menu_obj = registry['ir.ui.menu']
|
||||
menu_ids = menu_obj.search(cr, uid, [('parent_id', '=', False)], context=context)
|
||||
return {
|
||||
'type': 'ir.actions.client',
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@
|
|||
#
|
||||
##############################################################################
|
||||
|
||||
from openerp import pooler
|
||||
import openerp
|
||||
from openerp.osv import osv, fields
|
||||
from openerp.tools.translate import _
|
||||
|
||||
|
|
@ -87,7 +87,7 @@ class base_module_upgrade(osv.osv_memory):
|
|||
ir_module.download(cr, uid, ids, context=context)
|
||||
cr.commit() # save before re-creating cursor below
|
||||
|
||||
pooler.restart_pool(cr.dbname, update_module=True)
|
||||
openerp.modules.registry.RegistryManager.new(cr.dbname, update_module=True)
|
||||
|
||||
ir_model_data = self.pool.get('ir.model.data')
|
||||
__, res_id = ir_model_data.get_object_reference(cr, uid, 'base', 'view_base_module_upgrade_install')
|
||||
|
|
|
|||
|
|
@ -23,7 +23,7 @@ from operator import attrgetter
|
|||
import re
|
||||
|
||||
import openerp
|
||||
from openerp import pooler, SUPERUSER_ID
|
||||
from openerp import SUPERUSER_ID
|
||||
from openerp.osv import osv, fields
|
||||
from openerp.tools import ustr
|
||||
from openerp.tools.translate import _
|
||||
|
|
@ -72,7 +72,7 @@ class res_config_configurable(osv.osv_memory):
|
|||
res['nodestroy'] = False
|
||||
return res
|
||||
# reload the client; open the first available root menu
|
||||
menu_obj = self.pool.get('ir.ui.menu')
|
||||
menu_obj = self.pool['ir.ui.menu']
|
||||
menu_ids = menu_obj.search(cr, uid, [('parent_id', '=', False)], context=context)
|
||||
return {
|
||||
'type': 'ir.actions.client',
|
||||
|
|
@ -271,7 +271,7 @@ class res_config_installer(osv.osv_memory):
|
|||
:returns: a list of all installed modules in this installer
|
||||
:rtype: [browse_record]
|
||||
"""
|
||||
modules = self.pool.get('ir.module.module')
|
||||
modules = self.pool['ir.module.module']
|
||||
|
||||
selectable = [field for field in self._columns
|
||||
if type(self._columns[field]) is fields.boolean]
|
||||
|
|
@ -353,7 +353,7 @@ class res_config_installer(osv.osv_memory):
|
|||
return fields
|
||||
|
||||
def execute(self, cr, uid, ids, context=None):
|
||||
modules = self.pool.get('ir.module.module')
|
||||
modules = self.pool['ir.module.module']
|
||||
to_install = list(self.modules_to_install(
|
||||
cr, uid, ids, context=context))
|
||||
_logger.info('Selecting addons %s to install', to_install)
|
||||
|
|
@ -363,7 +363,7 @@ class res_config_installer(osv.osv_memory):
|
|||
'to install', ['uninstalled'], context=context)
|
||||
cr.commit()
|
||||
openerp.modules.registry.RegistryManager.signal_registry_change(cr.dbname)
|
||||
new_db, self.pool = pooler.restart_pool(cr.dbname, update_module=True)
|
||||
openerp.modules.registry.RegistryManager.new(cr.dbname, update_module=True)
|
||||
|
||||
res_config_installer()
|
||||
|
||||
|
|
@ -455,8 +455,8 @@ class res_config_settings(osv.osv_memory):
|
|||
'other': ['other_field', ...],
|
||||
}
|
||||
"""
|
||||
ir_model_data = self.pool.get('ir.model.data')
|
||||
ir_module = self.pool.get('ir.module.module')
|
||||
ir_model_data = self.pool['ir.model.data']
|
||||
ir_module = self.pool['ir.module.module']
|
||||
def ref(xml_id):
|
||||
mod, xml = xml_id.split('.', 1)
|
||||
return ir_model_data.get_object(cr, uid, mod, xml, context)
|
||||
|
|
@ -478,7 +478,7 @@ class res_config_settings(osv.osv_memory):
|
|||
return {'default': defaults, 'group': groups, 'module': modules, 'other': others}
|
||||
|
||||
def default_get(self, cr, uid, fields, context=None):
|
||||
ir_values = self.pool.get('ir.values')
|
||||
ir_values = self.pool['ir.values']
|
||||
classified = self._get_classified_fields(cr, uid, context)
|
||||
|
||||
res = super(res_config_settings, self).default_get(cr, uid, fields, context)
|
||||
|
|
@ -505,8 +505,8 @@ class res_config_settings(osv.osv_memory):
|
|||
return res
|
||||
|
||||
def execute(self, cr, uid, ids, context=None):
|
||||
ir_values = self.pool.get('ir.values')
|
||||
ir_module = self.pool.get('ir.module.module')
|
||||
ir_values = self.pool['ir.values']
|
||||
ir_module = self.pool['ir.module.module']
|
||||
classified = self._get_classified_fields(cr, uid, context)
|
||||
|
||||
config = self.browse(cr, uid, ids[0], context)
|
||||
|
|
@ -572,7 +572,7 @@ class res_config_settings(osv.osv_memory):
|
|||
|
||||
def cancel(self, cr, uid, ids, context=None):
|
||||
# ignore the current record, and send the action to reopen the view
|
||||
act_window = self.pool.get('ir.actions.act_window')
|
||||
act_window = self.pool['ir.actions.act_window']
|
||||
action_ids = act_window.search(cr, uid, [('res_model', '=', self._name)])
|
||||
if action_ids:
|
||||
return act_window.read(cr, uid, action_ids[0], [], context=context)
|
||||
|
|
@ -588,7 +588,7 @@ class res_config_settings(osv.osv_memory):
|
|||
if isinstance(ids, (int, long)):
|
||||
ids = [ids]
|
||||
|
||||
act_window = self.pool.get('ir.actions.act_window')
|
||||
act_window = self.pool['ir.actions.act_window']
|
||||
action_ids = act_window.search(cr, uid, [('res_model', '=', self._name)], context=context)
|
||||
name = self._name
|
||||
if action_ids:
|
||||
|
|
@ -606,8 +606,8 @@ class res_config_settings(osv.osv_memory):
|
|||
- t[1]: long: id of the menuitem's action
|
||||
"""
|
||||
module_name, menu_xml_id = menu_xml_id.split('.')
|
||||
dummy, menu_id = self.pool.get('ir.model.data').get_object_reference(cr, uid, module_name, menu_xml_id)
|
||||
ir_ui_menu = self.pool.get('ir.ui.menu').browse(cr, uid, menu_id, context=context)
|
||||
dummy, menu_id = self.pool['ir.model.data'].get_object_reference(cr, uid, module_name, menu_xml_id)
|
||||
ir_ui_menu = self.pool['ir.ui.menu'].browse(cr, uid, menu_id, context=context)
|
||||
|
||||
return (ir_ui_menu.complete_name, ir_ui_menu.action.id)
|
||||
|
||||
|
|
@ -621,7 +621,7 @@ class res_config_settings(osv.osv_memory):
|
|||
"""
|
||||
model_name, field_name = full_field_name.rsplit('.', 1)
|
||||
|
||||
return self.pool.get(model_name).fields_get(cr, uid, allfields=[field_name], context=context)[field_name]['string']
|
||||
return self.pool[model_name].fields_get(cr, uid, allfields=[field_name], context=context)[field_name]['string']
|
||||
|
||||
def get_config_warning(self, cr, msg, context=None):
|
||||
"""
|
||||
|
|
@ -652,7 +652,7 @@ class res_config_settings(osv.osv_memory):
|
|||
Cannot find any account journal of %s type for this company.\n\nYou can create one in the %%(menu:account.menu_account_config)s.
|
||||
"""
|
||||
|
||||
res_config_obj = pooler.get_pool(cr.dbname).get('res.config.settings')
|
||||
res_config_obj = openerp.registry(cr.dbname)['res.config.settings']
|
||||
regex_path = r'%\(((?:menu|field):[a-z_\.]*)\)s'
|
||||
|
||||
# Process the message
|
||||
|
|
|
|||
|
|
@ -27,13 +27,13 @@ import re
|
|||
|
||||
import openerp
|
||||
from openerp import SUPERUSER_ID
|
||||
from openerp import pooler, tools
|
||||
from openerp import tools
|
||||
from openerp.osv import osv, fields
|
||||
from openerp.tools.translate import _
|
||||
|
||||
class format_address(object):
|
||||
def fields_view_get_address(self, cr, uid, arch, context={}):
|
||||
user_obj = self.pool.get('res.users')
|
||||
user_obj = self.pool['res.users']
|
||||
fmt = user_obj.browse(cr, SUPERUSER_ID, uid, context).company_id.country_id
|
||||
fmt = fmt and fmt.address_format
|
||||
layouts = {
|
||||
|
|
@ -154,7 +154,7 @@ class res_partner_title(osv.osv):
|
|||
}
|
||||
|
||||
def _lang_get(self, cr, uid, context=None):
|
||||
lang_pool = self.pool.get('res.lang')
|
||||
lang_pool = self.pool['res.lang']
|
||||
ids = lang_pool.search(cr, uid, [], context=context)
|
||||
res = lang_pool.read(cr, uid, ids, ['code', 'name'], context)
|
||||
return [(r['code'], r['name']) for r in res]
|
||||
|
|
@ -287,7 +287,7 @@ class res_partner(osv.osv, format_address):
|
|||
|
||||
def fields_view_get(self, cr, user, view_id=None, view_type='form', context=None, toolbar=False, submenu=False):
|
||||
if (not view_id) and (view_type=='form') and context and context.get('force_email', False):
|
||||
view_id = self.pool.get('ir.model.data').get_object_reference(cr, user, 'base', 'view_partner_simple_form')[1]
|
||||
view_id = self.pool['ir.model.data'].get_object_reference(cr, user, 'base', 'view_partner_simple_form')[1]
|
||||
res = super(res_partner,self).fields_view_get(cr, user, view_id, view_type, context, toolbar=toolbar, submenu=submenu)
|
||||
if view_type == 'form':
|
||||
res['arch'] = self.fields_view_get_address(cr, user, res['arch'], context=context)
|
||||
|
|
@ -299,7 +299,7 @@ class res_partner(osv.osv, format_address):
|
|||
'tz': lambda self, cr, uid, ctx: ctx.get('tz', False),
|
||||
'customer': True,
|
||||
'category_id': _default_category,
|
||||
'company_id': lambda self, cr, uid, ctx: self.pool.get('res.company')._company_default_get(cr, uid, 'res.partner', context=ctx),
|
||||
'company_id': lambda self, cr, uid, ctx: self.pool['res.company']._company_default_get(cr, uid, 'res.partner', context=ctx),
|
||||
'color': 0,
|
||||
'is_company': False,
|
||||
'type': 'default',
|
||||
|
|
@ -336,12 +336,12 @@ class res_partner(osv.osv, format_address):
|
|||
|
||||
def onchange_state(self, cr, uid, ids, state_id, context=None):
|
||||
if state_id:
|
||||
country_id = self.pool.get('res.country.state').browse(cr, uid, state_id, context).country_id.id
|
||||
country_id = self.pool['res.country.state'].browse(cr, uid, state_id, context).country_id.id
|
||||
return {'value':{'country_id':country_id}}
|
||||
return {}
|
||||
|
||||
def _check_ean_key(self, cr, uid, ids, context=None):
|
||||
for partner_o in pooler.get_pool(cr.dbname).get('res.partner').read(cr, uid, ids, ['ean13',]):
|
||||
for partner_o in self.pool['res.partner'].read(cr, uid, ids, ['ean13',]):
|
||||
thisean=partner_o['ean13']
|
||||
if thisean and thisean!='':
|
||||
if len(thisean)!=13:
|
||||
|
|
@ -487,7 +487,7 @@ class res_partner(osv.osv, format_address):
|
|||
|
||||
def email_send(self, cr, uid, ids, email_from, subject, body, on_error=''):
|
||||
while len(ids):
|
||||
self.pool.get('ir.cron').create(cr, uid, {
|
||||
self.pool['ir.cron'].create(cr, uid, {
|
||||
'name': 'Send Partner Emails',
|
||||
'user_id': uid,
|
||||
'model': 'res.partner',
|
||||
|
|
@ -523,12 +523,12 @@ class res_partner(osv.osv, format_address):
|
|||
if res: return res
|
||||
if not context.get('category_id', False):
|
||||
return False
|
||||
return _('Partners: ')+self.pool.get('res.partner.category').browse(cr, uid, context['category_id'], context).name
|
||||
return _('Partners: ')+self.pool['res.partner.category'].browse(cr, uid, context['category_id'], context).name
|
||||
|
||||
def main_partner(self, cr, uid):
|
||||
''' Return the id of the main partner
|
||||
'''
|
||||
model_data = self.pool.get('ir.model.data')
|
||||
model_data = self.pool['ir.model.data']
|
||||
return model_data.browse(cr, uid,
|
||||
model_data.search(cr, uid, [('module','=','base'),
|
||||
('name','=','main_partner')])[0],
|
||||
|
|
|
|||
|
|
@ -26,7 +26,7 @@ from lxml.builder import E
|
|||
|
||||
import openerp
|
||||
from openerp import SUPERUSER_ID
|
||||
from openerp import pooler, tools
|
||||
from openerp import tools
|
||||
import openerp.exceptions
|
||||
from openerp.osv import fields,osv
|
||||
from openerp.osv.orm import browse_record
|
||||
|
|
@ -98,7 +98,7 @@ class groups(osv.osv):
|
|||
raise osv.except_osv(_('Error'),
|
||||
_('The name of the group can not start with "-"'))
|
||||
res = super(groups, self).write(cr, uid, ids, vals, context=context)
|
||||
self.pool.get('ir.model.access').call_cache_clearing_methods(cr)
|
||||
self.pool['ir.model.access'].call_cache_clearing_methods(cr)
|
||||
return res
|
||||
|
||||
groups()
|
||||
|
|
@ -178,7 +178,7 @@ class res_users(osv.osv):
|
|||
partner.onchange_type method, but applied to the user object.
|
||||
"""
|
||||
partner_ids = [user.partner_id.id for user in self.browse(cr, uid, ids, context=context)]
|
||||
return self.pool.get('res.partner').onchange_type(cr, uid, partner_ids, is_company, context=context)
|
||||
return self.pool['res.partner'].onchange_type(cr, uid, partner_ids, is_company, context=context)
|
||||
|
||||
def onchange_address(self, cr, uid, ids, use_parent_address, parent_id, context=None):
|
||||
""" Wrapper on the user.partner onchange_address, because some calls to the
|
||||
|
|
@ -186,7 +186,7 @@ class res_users(osv.osv):
|
|||
partner.onchange_type method, but applied to the user object.
|
||||
"""
|
||||
partner_ids = [user.partner_id.id for user in self.browse(cr, uid, ids, context=context)]
|
||||
return self.pool.get('res.partner').onchange_address(cr, uid, partner_ids, use_parent_address, parent_id, context=context)
|
||||
return self.pool['res.partner'].onchange_address(cr, uid, partner_ids, use_parent_address, parent_id, context=context)
|
||||
|
||||
def _check_company(self, cr, uid, ids, context=None):
|
||||
return all(((this.company_id in this.company_ids) or not this.company_ids) for this in self.browse(cr, uid, ids, context))
|
||||
|
|
@ -202,7 +202,7 @@ class res_users(osv.osv):
|
|||
def _get_company(self,cr, uid, context=None, uid2=False):
|
||||
if not uid2:
|
||||
uid2 = uid
|
||||
user = self.pool.get('res.users').read(cr, uid, uid2, ['company_id'], context)
|
||||
user = self.pool['res.users'].read(cr, uid, uid2, ['company_id'], context)
|
||||
company_id = user.get('company_id', False)
|
||||
return company_id and company_id[0] or False
|
||||
|
||||
|
|
@ -243,7 +243,7 @@ class res_users(osv.osv):
|
|||
'company_id': _get_company,
|
||||
'company_ids': _get_companies,
|
||||
'groups_id': _get_group,
|
||||
'image': lambda self, cr, uid, ctx={}: self.pool.get('res.partner')._get_default_image(cr, uid, False, ctx, colorize=True),
|
||||
'image': lambda self, cr, uid, ctx={}: self.pool['res.partner']._get_default_image(cr, uid, False, ctx, colorize=True),
|
||||
}
|
||||
|
||||
# User can write on a few of his own fields (but not his groups for example)
|
||||
|
|
@ -266,7 +266,7 @@ class res_users(osv.osv):
|
|||
uid = SUPERUSER_ID
|
||||
|
||||
result = super(res_users, self).read(cr, uid, ids, fields=fields, context=context, load=load)
|
||||
canwrite = self.pool.get('ir.model.access').check(cr, uid, 'res.users', 'write', False)
|
||||
canwrite = self.pool['ir.model.access'].check(cr, uid, 'res.users', 'write', False)
|
||||
if not canwrite:
|
||||
if isinstance(ids, (int, long)):
|
||||
result = override_password(result)
|
||||
|
|
@ -291,8 +291,8 @@ class res_users(osv.osv):
|
|||
res = super(res_users, self).write(cr, uid, ids, values, context=context)
|
||||
|
||||
# clear caches linked to the users
|
||||
self.pool.get('ir.model.access').call_cache_clearing_methods(cr)
|
||||
clear = partial(self.pool.get('ir.rule').clear_cache, cr)
|
||||
self.pool['ir.model.access'].call_cache_clearing_methods(cr)
|
||||
clear = partial(self.pool['ir.rule'].clear_cache, cr)
|
||||
map(clear, ids)
|
||||
db = cr.dbname
|
||||
if db in self._uid_cache:
|
||||
|
|
@ -352,7 +352,7 @@ class res_users(osv.osv):
|
|||
return result
|
||||
|
||||
def action_get(self, cr, uid, context=None):
|
||||
dataobj = self.pool.get('ir.model.data')
|
||||
dataobj = self.pool['ir.model.data']
|
||||
data_id = dataobj._get_id(cr, SUPERUSER_ID, 'base', 'action_res_users_my')
|
||||
return dataobj.browse(cr, uid, data_id, context=context).res_id
|
||||
|
||||
|
|
@ -372,7 +372,7 @@ class res_users(osv.osv):
|
|||
if not password:
|
||||
return False
|
||||
user_id = False
|
||||
cr = pooler.get_db(db).cursor()
|
||||
cr = self.pool.db.cursor()
|
||||
try:
|
||||
# autocommit: our single update request will be performed atomically.
|
||||
# (In this way, there is no opportunity to have two transactions
|
||||
|
|
@ -423,10 +423,10 @@ class res_users(osv.osv):
|
|||
# Successfully logged in as admin!
|
||||
# Attempt to guess the web base url...
|
||||
if user_agent_env and user_agent_env.get('base_location'):
|
||||
cr = pooler.get_db(db).cursor()
|
||||
cr = self.pool.db.cursor()
|
||||
try:
|
||||
base = user_agent_env['base_location']
|
||||
self.pool.get('ir.config_parameter').set_param(cr, uid, 'web.base.url', base)
|
||||
self.pool['ir.config_parameter'].set_param(cr, uid, 'web.base.url', base)
|
||||
cr.commit()
|
||||
except Exception:
|
||||
_logger.exception("Failed to update web.base.url configuration parameter")
|
||||
|
|
@ -442,7 +442,7 @@ class res_users(osv.osv):
|
|||
raise openerp.exceptions.AccessDenied()
|
||||
if self._uid_cache.get(db, {}).get(uid) == passwd:
|
||||
return
|
||||
cr = pooler.get_db(db).cursor()
|
||||
cr = self.pool.db.cursor()
|
||||
try:
|
||||
self.check_credentials(cr, uid, passwd)
|
||||
if self._uid_cache.has_key(db):
|
||||
|
|
@ -690,7 +690,7 @@ class groups_view(osv.osv):
|
|||
|
||||
def get_user_groups_view(self, cr, uid, context=None):
|
||||
try:
|
||||
view = self.pool.get('ir.model.data').get_object(cr, SUPERUSER_ID, 'base', 'user_groups_view', context)
|
||||
view = self.pool['ir.model.data'].get_object(cr, SUPERUSER_ID, 'base', 'user_groups_view', context)
|
||||
assert view and view._table_name == 'ir.ui.view'
|
||||
except Exception:
|
||||
view = False
|
||||
|
|
@ -826,7 +826,7 @@ class users_view(osv.osv):
|
|||
def fields_get(self, cr, uid, allfields=None, context=None, write_access=True):
|
||||
res = super(users_view, self).fields_get(cr, uid, allfields, context, write_access)
|
||||
# add reified groups fields
|
||||
for app, kind, gs in self.pool.get('res.groups').get_groups_by_application(cr, uid, context):
|
||||
for app, kind, gs in self.pool['res.groups'].get_groups_by_application(cr, uid, context):
|
||||
if kind == 'selection':
|
||||
# selection group field
|
||||
tips = ['%s: %s' % (g.name, g.comment) for g in gs if g.comment]
|
||||
|
|
|
|||
|
|
@ -95,7 +95,7 @@ def preload_registry(dbname):
|
|||
""" Preload a registry, and start the cron."""
|
||||
try:
|
||||
update_module = True if openerp.tools.config['init'] or openerp.tools.config['update'] else False
|
||||
db, registry = openerp.pooler.get_db_and_pool(dbname,update_module=update_module)
|
||||
openerp.modules.registry.RegistryManager.new(dbname, update_module=update_module)
|
||||
except Exception:
|
||||
_logger.exception('Failed to initialize database `%s`.', dbname)
|
||||
|
||||
|
|
@ -103,8 +103,8 @@ def run_test_file(dbname, test_file):
|
|||
""" Preload a registry, possibly run a test file, and start the cron."""
|
||||
try:
|
||||
config = openerp.tools.config
|
||||
db, registry = openerp.pooler.get_db_and_pool(dbname, update_module=config['init'] or config['update'])
|
||||
cr = db.cursor()
|
||||
registry = openerp.modules.registry.RegistryManager.new(dbname, update_module=config['init'] or config['update'])
|
||||
cr = registry.db.cursor()
|
||||
_logger.info('loading test file %s', test_file)
|
||||
openerp.tools.convert_yaml_import(cr, 'base', file(test_file), 'test', {}, 'test', True)
|
||||
cr.rollback()
|
||||
|
|
@ -125,7 +125,8 @@ def export_translation():
|
|||
|
||||
fileformat = os.path.splitext(config["translate_out"])[-1][1:].lower()
|
||||
buf = file(config["translate_out"], "w")
|
||||
cr = openerp.pooler.get_db(dbname).cursor()
|
||||
registry = openerp.modules.registry.RegistryManager.new(dbname)
|
||||
cr = registry.db.cursor()
|
||||
openerp.tools.trans_export(config["language"],
|
||||
config["translate_modules"] or ["all"], buf, fileformat, cr)
|
||||
cr.close()
|
||||
|
|
@ -138,7 +139,8 @@ def import_translation():
|
|||
context = {'overwrite': config["overwrite_existing_translations"]}
|
||||
dbname = config['db_name']
|
||||
|
||||
cr = openerp.pooler.get_db(dbname).cursor()
|
||||
registry = openerp.modules.registry.RegistryManager.new(dbname)
|
||||
cr = registry.db.cursor()
|
||||
openerp.tools.trans_load( cr, config["translate_in"], config["language"],
|
||||
context=context)
|
||||
cr.commit()
|
||||
|
|
|
|||
|
|
@ -53,4 +53,9 @@ allow_local_service = True
|
|||
# Introduced around 2013.03.
|
||||
allow_report_int_registration = True
|
||||
|
||||
# If True, the functions in openerp.pooler can be used.
|
||||
# Introduced around 2013.03 (actually they are deprecated since much longer
|
||||
# but no warning was dispayed in the logs).
|
||||
openerp_pooler = True
|
||||
|
||||
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
|
||||
|
|
|
|||
|
|
@ -33,7 +33,6 @@ import openerp.osv as osv
|
|||
import openerp.tools as tools
|
||||
import openerp.tools.osutil as osutil
|
||||
from openerp.tools.safe_eval import safe_eval as eval
|
||||
import openerp.pooler as pooler
|
||||
from openerp.tools.translate import _
|
||||
|
||||
import zipfile
|
||||
|
|
|
|||
|
|
@ -35,7 +35,6 @@ import openerp.modules.db
|
|||
import openerp.modules.graph
|
||||
import openerp.modules.migration
|
||||
import openerp.osv as osv
|
||||
import openerp.pooler as pooler
|
||||
import openerp.tools as tools
|
||||
from openerp import SUPERUSER_ID
|
||||
|
||||
|
|
@ -129,17 +128,17 @@ def load_module_graph(cr, graph, status=None, perform_checks=True, skip_modules=
|
|||
|
||||
processed_modules = []
|
||||
loaded_modules = []
|
||||
pool = pooler.get_pool(cr.dbname)
|
||||
registry = openerp.registry(cr.dbname)
|
||||
migrations = openerp.modules.migration.MigrationManager(cr, graph)
|
||||
_logger.debug('loading %d packages...', len(graph))
|
||||
|
||||
# Query manual fields for all models at once and save them on the registry
|
||||
# so the initialization code for each model does not have to do it
|
||||
# one model at a time.
|
||||
pool.fields_by_model = {}
|
||||
registry.fields_by_model = {}
|
||||
cr.execute('SELECT * FROM ir_model_fields WHERE state=%s', ('manual',))
|
||||
for field in cr.dictfetchall():
|
||||
pool.fields_by_model.setdefault(field['model'], []).append(field)
|
||||
registry.fields_by_model.setdefault(field['model'], []).append(field)
|
||||
|
||||
# register, instantiate and initialize models for each modules
|
||||
for index, package in enumerate(graph):
|
||||
|
|
@ -153,17 +152,17 @@ def load_module_graph(cr, graph, status=None, perform_checks=True, skip_modules=
|
|||
migrations.migrate_module(package, 'pre')
|
||||
load_openerp_module(package.name)
|
||||
|
||||
models = pool.load(cr, package)
|
||||
models = registry.load(cr, package)
|
||||
|
||||
loaded_modules.append(package.name)
|
||||
if hasattr(package, 'init') or hasattr(package, 'update') or package.state in ('to install', 'to upgrade'):
|
||||
init_module_models(cr, package.name, models)
|
||||
pool._init_modules.add(package.name)
|
||||
registry._init_modules.add(package.name)
|
||||
status['progress'] = float(index) / len(graph)
|
||||
|
||||
# Can't put this line out of the loop: ir.module.module will be
|
||||
# registered by init_module_models() above.
|
||||
modobj = pool.get('ir.module.module')
|
||||
modobj = registry['ir.module.module']
|
||||
|
||||
if perform_checks:
|
||||
modobj.check(cr, SUPERUSER_ID, [module_id])
|
||||
|
|
@ -219,7 +218,7 @@ def load_module_graph(cr, graph, status=None, perform_checks=True, skip_modules=
|
|||
|
||||
# The query won't be valid for models created later (i.e. custom model
|
||||
# created after the registry has been loaded), so empty its result.
|
||||
pool.fields_by_model = None
|
||||
registry.fields_by_model = None
|
||||
|
||||
cr.commit()
|
||||
|
||||
|
|
@ -258,7 +257,7 @@ def load_marked_modules(cr, graph, states, force, progressdict, report, loaded_m
|
|||
def load_modules(db, force_demo=False, status=None, update_module=False):
|
||||
# TODO status['progress'] reporting is broken: used twice (and reset each
|
||||
# time to zero) in load_module_graph, not fine-grained enough.
|
||||
# It should be a method exposed by the pool.
|
||||
# It should be a method exposed by the registry.
|
||||
initialize_sys_path()
|
||||
|
||||
force = []
|
||||
|
|
@ -275,8 +274,9 @@ def load_modules(db, force_demo=False, status=None, update_module=False):
|
|||
if not tools.config['without_demo']:
|
||||
tools.config["demo"]['all'] = 1
|
||||
|
||||
# This is a brand new pool, just created in pooler.get_db_and_pool()
|
||||
pool = pooler.get_pool(cr.dbname)
|
||||
# This is a brand new registry, just created in
|
||||
# openerp.modules.registry.RegistryManger.new().
|
||||
registry = openerp.registry(cr.dbname)
|
||||
|
||||
if 'base' in tools.config['update'] or 'all' in tools.config['update']:
|
||||
cr.execute("update ir_module_module set state=%s where name=%s and state=%s", ('to upgrade', 'base', 'installed'))
|
||||
|
|
@ -290,7 +290,7 @@ def load_modules(db, force_demo=False, status=None, update_module=False):
|
|||
|
||||
# processed_modules: for cleanup step after install
|
||||
# loaded_modules: to avoid double loading
|
||||
report = pool._assertion_report
|
||||
report = registry._assertion_report
|
||||
loaded_modules, processed_modules = load_module_graph(cr, graph, status, perform_checks=update_module, report=report)
|
||||
|
||||
if tools.config['load_language']:
|
||||
|
|
@ -299,7 +299,7 @@ def load_modules(db, force_demo=False, status=None, update_module=False):
|
|||
|
||||
# STEP 2: Mark other modules to be loaded/updated
|
||||
if update_module:
|
||||
modobj = pool.get('ir.module.module')
|
||||
modobj = registry['ir.module.module']
|
||||
if ('base' in tools.config['init']) or ('base' in tools.config['update']):
|
||||
_logger.info('updating modules list')
|
||||
modobj.update_list(cr, SUPERUSER_ID)
|
||||
|
|
@ -341,13 +341,13 @@ def load_modules(db, force_demo=False, status=None, update_module=False):
|
|||
# load custom models
|
||||
cr.execute('select model from ir_model where state=%s', ('manual',))
|
||||
for model in cr.dictfetchall():
|
||||
pool.get('ir.model').instanciate(cr, SUPERUSER_ID, model['model'], {})
|
||||
registry['ir.model'].instanciate(cr, SUPERUSER_ID, model['model'], {})
|
||||
|
||||
# STEP 4: Finish and cleanup installations
|
||||
if processed_modules:
|
||||
cr.execute("""select model,name from ir_model where id NOT IN (select distinct model_id from ir_model_access)""")
|
||||
for (model, name) in cr.fetchall():
|
||||
model_obj = pool.get(model)
|
||||
model_obj = registry.get(model)
|
||||
if model_obj and not model_obj.is_transient():
|
||||
_logger.warning('The model %s has no access rules, consider adding one. E.g. access_%s,access_%s,model_%s,,1,1,1,1',
|
||||
model, model.replace('.', '_'), model.replace('.', '_'), model.replace('.', '_'))
|
||||
|
|
@ -356,20 +356,20 @@ def load_modules(db, force_demo=False, status=None, update_module=False):
|
|||
# been replaced by owner-only access rights
|
||||
cr.execute("""select distinct mod.model, mod.name from ir_model_access acc, ir_model mod where acc.model_id = mod.id""")
|
||||
for (model, name) in cr.fetchall():
|
||||
model_obj = pool.get(model)
|
||||
model_obj = registry.get(model)
|
||||
if model_obj and model_obj.is_transient():
|
||||
_logger.warning('The transient model %s (%s) should not have explicit access rules!', model, name)
|
||||
|
||||
cr.execute("SELECT model from ir_model")
|
||||
for (model,) in cr.fetchall():
|
||||
obj = pool.get(model)
|
||||
obj = registry.get(model)
|
||||
if obj:
|
||||
obj._check_removed_columns(cr, log=True)
|
||||
else:
|
||||
_logger.warning("Model %s is declared but cannot be loaded! (Perhaps a module was partially removed or renamed)", model)
|
||||
|
||||
# Cleanup orphan records
|
||||
pool.get('ir.model.data')._process_end(cr, SUPERUSER_ID, processed_modules)
|
||||
registry['ir.model.data']._process_end(cr, SUPERUSER_ID, processed_modules)
|
||||
|
||||
for kind in ('init', 'demo', 'update'):
|
||||
tools.config[kind] = {}
|
||||
|
|
@ -403,12 +403,12 @@ def load_modules(db, force_demo=False, status=None, update_module=False):
|
|||
cr.execute("SELECT id FROM ir_module_module WHERE state=%s", ('to remove',))
|
||||
mod_ids_to_remove = [x[0] for x in cr.fetchall()]
|
||||
if mod_ids_to_remove:
|
||||
pool.get('ir.module.module').module_uninstall(cr, SUPERUSER_ID, mod_ids_to_remove)
|
||||
registry['ir.module.module'].module_uninstall(cr, SUPERUSER_ID, mod_ids_to_remove)
|
||||
# Recursive reload, should only happen once, because there should be no
|
||||
# modules to remove next time
|
||||
cr.commit()
|
||||
_logger.info('Reloading registry once more after uninstalling modules')
|
||||
return pooler.restart_pool(cr.dbname, force_demo, status, update_module)
|
||||
return openerp.modules.registry.RegistryManger.new(cr.dbname, force_demo, status, update_module)
|
||||
|
||||
if report.failures:
|
||||
_logger.error('At least one test failed when loading the modules.')
|
||||
|
|
@ -416,7 +416,7 @@ def load_modules(db, force_demo=False, status=None, update_module=False):
|
|||
_logger.info('Modules loaded.')
|
||||
|
||||
# STEP 7: call _register_hook on every model
|
||||
for model in pool.models.values():
|
||||
for model in registry.models.values():
|
||||
model._register_hook(cr)
|
||||
|
||||
finally:
|
||||
|
|
|
|||
|
|
@ -33,7 +33,6 @@ import openerp.osv as osv
|
|||
import openerp.tools as tools
|
||||
import openerp.tools.osutil as osutil
|
||||
from openerp.tools.safe_eval import safe_eval as eval
|
||||
import openerp.pooler as pooler
|
||||
from openerp.tools.translate import _
|
||||
|
||||
import zipfile
|
||||
|
|
|
|||
|
|
@ -25,27 +25,36 @@
|
|||
|
||||
"""
|
||||
|
||||
import logging
|
||||
import openerp.conf.deprecation
|
||||
from openerp.modules.registry import RegistryManager
|
||||
|
||||
_logger = logging.getLogger(__name__)
|
||||
|
||||
def get_db_and_pool(db_name, force_demo=False, status=None, update_module=False):
|
||||
"""Create and return a database connection and a newly initialized registry."""
|
||||
assert openerp.conf.deprecation.openerp_pooler
|
||||
_logger.warning('openerp.pooler.get_db_and_pool() is deprecated.')
|
||||
registry = RegistryManager.get(db_name, force_demo, status, update_module)
|
||||
return registry.db, registry
|
||||
|
||||
|
||||
def restart_pool(db_name, force_demo=False, status=None, update_module=False):
|
||||
"""Delete an existing registry and return a database connection and a newly initialized registry."""
|
||||
_logger.warning('openerp.pooler.restart_pool() is deprecated.')
|
||||
assert openerp.conf.deprecation.openerp_pooler
|
||||
registry = RegistryManager.new(db_name, force_demo, status, update_module)
|
||||
return registry.db, registry
|
||||
|
||||
def get_db(db_name):
|
||||
"""Return a database connection. The corresponding registry is initialized."""
|
||||
assert openerp.conf.deprecation.openerp_pooler
|
||||
return get_db_and_pool(db_name)[0]
|
||||
|
||||
|
||||
def get_pool(db_name, force_demo=False, status=None, update_module=False):
|
||||
"""Return a model registry."""
|
||||
assert openerp.conf.deprecation.openerp_pooler
|
||||
return get_db_and_pool(db_name, force_demo, status, update_module)[1]
|
||||
|
||||
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
|
||||
|
|
|
|||
|
|
@ -22,6 +22,7 @@
|
|||
import os
|
||||
import time
|
||||
|
||||
import openerp
|
||||
import openerp.tools as tools
|
||||
from openerp.tools.safe_eval import safe_eval as eval
|
||||
import print_xml
|
||||
|
|
@ -31,7 +32,6 @@ import common
|
|||
from openerp.osv.osv import except_osv
|
||||
from openerp.osv.orm import browse_null
|
||||
from openerp.osv.orm import browse_record_list
|
||||
import openerp.pooler as pooler
|
||||
from pychart import *
|
||||
import misc
|
||||
import cStringIO
|
||||
|
|
@ -127,22 +127,22 @@ class report_custom(report_int):
|
|||
def create(self, cr, uid, ids, datas, context=None):
|
||||
if not context:
|
||||
context={}
|
||||
self.pool = pooler.get_pool(cr.dbname)
|
||||
report = self.pool.get('ir.report.custom').browse(cr, uid, [datas['report_id']])[0]
|
||||
self.pool = openerp.registry(cr.dbname)
|
||||
report = self.pool['ir.report.custom'].browse(cr, uid, [datas['report_id']])[0]
|
||||
datas['model'] = report.model_id.model
|
||||
if report.menu_id:
|
||||
ids = self.pool.get(report.model_id.model).search(cr, uid, [])
|
||||
ids = self.pool[report.model_id.model].search(cr, uid, [])
|
||||
datas['ids'] = ids
|
||||
|
||||
report_id = datas['report_id']
|
||||
report = self.pool.get('ir.report.custom').read(cr, uid, [report_id], context=context)[0]
|
||||
fields = self.pool.get('ir.report.custom.fields').read(cr, uid, report['fields_child0'], context=context)
|
||||
report = self.pool['ir.report.custom'].read(cr, uid, [report_id], context=context)[0]
|
||||
fields = self.pool['ir.report.custom.fields'].read(cr, uid, report['fields_child0'], context=context)
|
||||
|
||||
fields.sort(lambda x,y : x['sequence'] - y['sequence'])
|
||||
|
||||
if report['field_parent']:
|
||||
parent_field = self.pool.get('ir.model.fields').read(cr, uid, [report['field_parent'][0]], ['model'])
|
||||
model_name = self.pool.get('ir.model').read(cr, uid, [report['model_id'][0]], ['model'], context=context)[0]['model']
|
||||
parent_field = self.pool['ir.model.fields'].read(cr, uid, [report['field_parent'][0]], ['model'])
|
||||
model_name = self.pool['ir.model'].read(cr, uid, [report['model_id'][0]], ['model'], context=context)[0]['model']
|
||||
|
||||
fct = {
|
||||
'id': lambda x: x,
|
||||
|
|
@ -158,7 +158,7 @@ class report_custom(report_int):
|
|||
field_child = f['field_child'+str(i)]
|
||||
if field_child:
|
||||
row.append(
|
||||
self.pool.get('ir.model.fields').read(cr, uid, [field_child[0]], ['name'], context=context)[0]['name']
|
||||
self.pool['ir.model.fields'].read(cr, uid, [field_child[0]], ['name'], context=context)[0]['name']
|
||||
)
|
||||
if f['fc'+str(i)+'_operande']:
|
||||
fct_name = 'id'
|
||||
|
|
@ -171,7 +171,7 @@ class report_custom(report_int):
|
|||
cond.append(None)
|
||||
new_fields.append(row)
|
||||
new_cond.append(cond)
|
||||
objs = self.pool.get(model_name).browse(cr, uid, ids)
|
||||
objs = self.pool[model_name].browse(cr, uid, ids)
|
||||
|
||||
# Group by
|
||||
groupby = None
|
||||
|
|
@ -340,7 +340,7 @@ class report_custom(report_int):
|
|||
|
||||
|
||||
def _create_lines(self, cr, uid, ids, report, fields, results, context):
|
||||
pool = pooler.get_pool(cr.dbname)
|
||||
pool = openerp.registry(cr.dbname)
|
||||
pdf_string = cStringIO.StringIO()
|
||||
can = canvas.init(fname=pdf_string, format='pdf')
|
||||
|
||||
|
|
@ -371,7 +371,7 @@ class report_custom(report_int):
|
|||
for f in fields:
|
||||
field_id = (f['field_child3'] and f['field_child3'][0]) or (f['field_child2'] and f['field_child2'][0]) or (f['field_child1'] and f['field_child1'][0]) or (f['field_child0'] and f['field_child0'][0])
|
||||
if field_id:
|
||||
type = pool.get('ir.model.fields').read(cr, uid, [field_id],['ttype'])
|
||||
type = pool['ir.model.fields'].read(cr, uid, [field_id],['ttype'])
|
||||
if type[0]['ttype'] == 'date':
|
||||
date_idx = idx
|
||||
fct[idx] = process_date[report['frequency']]
|
||||
|
|
@ -444,7 +444,7 @@ class report_custom(report_int):
|
|||
|
||||
|
||||
def _create_bars(self, cr, uid, ids, report, fields, results, context):
|
||||
pool = pooler.get_pool(cr.dbname)
|
||||
pool = openerp.registry(cr.dbname)
|
||||
pdf_string = cStringIO.StringIO()
|
||||
can = canvas.init(fname=pdf_string, format='pdf')
|
||||
|
||||
|
|
@ -472,7 +472,7 @@ class report_custom(report_int):
|
|||
for f in fields:
|
||||
field_id = (f['field_child3'] and f['field_child3'][0]) or (f['field_child2'] and f['field_child2'][0]) or (f['field_child1'] and f['field_child1'][0]) or (f['field_child0'] and f['field_child0'][0])
|
||||
if field_id:
|
||||
type = pool.get('ir.model.fields').read(cr, uid, [field_id],['ttype'])
|
||||
type = pool['ir.model.fields'].read(cr, uid, [field_id],['ttype'])
|
||||
if type[0]['ttype'] == 'date':
|
||||
date_idx = idx
|
||||
fct[idx] = process_date[report['frequency']]
|
||||
|
|
|
|||
|
|
@ -23,7 +23,8 @@ import os
|
|||
import re
|
||||
|
||||
from lxml import etree
|
||||
import openerp.pooler as pooler
|
||||
|
||||
import openerp
|
||||
|
||||
import openerp
|
||||
import openerp.tools as tools
|
||||
|
|
@ -96,8 +97,8 @@ class report_rml(report_int):
|
|||
if report_type == 'raw':
|
||||
return xml, report_type
|
||||
rml = self.create_rml(cr, xml, uid, context)
|
||||
pool = pooler.get_pool(cr.dbname)
|
||||
ir_actions_report_xml_obj = pool.get('ir.actions.report.xml')
|
||||
registry = openerp.registry(cr.dbname)
|
||||
ir_actions_report_xml_obj = registry['ir.actions.report.xml']
|
||||
report_xml_ids = ir_actions_report_xml_obj.search(cr, uid, [('report_name', '=', self.name[7:])], context=context)
|
||||
self.title = report_xml_ids and ir_actions_report_xml_obj.browse(cr,uid,report_xml_ids)[0].name or 'OpenERP Report'
|
||||
create_doc = self.generators[report_type]
|
||||
|
|
@ -146,8 +147,8 @@ class report_rml(report_int):
|
|||
self.internal_header=True
|
||||