odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[MERGE] merged trunk. 

bzr revid: vmt@openerp.com-20110516090036-d0yr21s1ofqu8tiq
This commit is contained in:
Vo Minh Thu 2011-05-16 11:00:36 +02:00
parent 48b2466676 2015bd7a3e
commit ffb6fdd3a9
4 changed files with 409 additions and 292 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

632
openerp/addons/base/i18n/sv.po
View File

File diff suppressed because it is too large Load Diff

6
openerp/addons/base/ir/ir_cron.py
View File

@ -20,6 +20,7 @@
############################################################################## ##############################################################################
import time import time
import logging
from datetime import datetime from datetime import datetime
from dateutil.relativedelta import relativedelta from dateutil.relativedelta import relativedelta
import netsvc import netsvc
@ -91,10 +92,13 @@ class ir_cron(osv.osv, netsvc.Agent):
if m and hasattr(m, func): if m and hasattr(m, func):
f = getattr(m, func) f = getattr(m, func)
try: try:
netsvc.log('cron', (cr.dbname,uid,'*',model,func)+tuple(args), channel=logging.DEBUG,
depth=(None if self._logger.isEnabledFor(logging.DEBUG_RPC_ANSWER) else 1), fn='object.execute')
f(cr, uid, *args) f(cr, uid, *args)
except Exception, e: except Exception, e:
cr.rollback() cr.rollback()
self._logger.exception("Job call of self.pool.get('%s').%s(cr, uid, *%r) failed" % (model, func, args)) logger=logging.getLogger('cron')
logger.exception("Job call of self.pool.get('%s').%s(cr, uid, *%r) failed" % (model, func, args))
def _poolJobs(self, db_name, check=False): def _poolJobs(self, db_name, check=False):

21
openerp/netsvc.py
View File

@ -393,19 +393,22 @@ def replace_request_password(args):
args[2] = '*' args[2] = '*'
return args return args
class OpenERPDispatcher: def log(title, msg, channel=logging.DEBUG_RPC, depth=None, fn=""):
def log(self, title, msg, channel=logging.DEBUG_RPC, depth=None): logger = logging.getLogger(title)
logger = logging.getLogger(title) if logger.isEnabledFor(channel):
if logger.isEnabledFor(channel): indent=''
for line in pformat(msg, depth=depth).split('\n'): indent_after=' '*len(fn)
logger.log(channel, line) for line in (fn+pformat(msg, depth=depth)).split('\n'):
logger.log(channel, indent+line)
indent=indent_after
class OpenERPDispatcher:
def log(self, title, msg, channel=logging.DEBUG_RPC, depth=None, fn=""):
log(title, msg, channel=channel, depth=depth, fn=fn)
def dispatch(self, service_name, method, params): def dispatch(self, service_name, method, params):
try: try:
logger = logging.getLogger('result') logger = logging.getLogger('result')
self.log('service', service_name) self.log('service', tuple(replace_request_password(params)), depth=(None if logger.isEnabledFor(logging.DEBUG_RPC_ANSWER) else 1), fn='%s.%s'%(service_name,method))
self.log('method', method)
self.log('params', replace_request_password(params), depth=(None if logger.isEnabledFor(logging.DEBUG_RPC_ANSWER) else 1))
auth = getattr(self, 'auth_provider', None) auth = getattr(self, 'auth_provider', None)
result = ExportService.getService(service_name).dispatch(method, auth, params) result = ExportService.getService(service_name).dispatch(method, auth, params)
self.log('result', result, channel=logging.DEBUG_RPC_ANSWER) self.log('result', result, channel=logging.DEBUG_RPC_ANSWER)

42
openerp/tools/yaml_import.py
View File

@ -114,7 +114,7 @@ class RecordDictWrapper(dict):
records do not strictly behave like dict, so we force them to. records do not strictly behave like dict, so we force them to.
""" """
def __init__(self, record): def __init__(self, record):
self.record = record self.record = record
def __getitem__(self, key): def __getitem__(self, key):
if key in self.record: if key in self.record:
return self.record[key] return self.record[key]
@ -174,10 +174,16 @@ class YamlInterpreter(object):
else: else:
module = self.module module = self.module
checked_xml_id = xml_id checked_xml_id = xml_id
_, id = self.pool.get('ir.model.data').get_object_reference(self.cr, self.uid, module, checked_xml_id) try:
self.id_map[xml_id] = id _, id = self.pool.get('ir.model.data').get_object_reference(self.cr, self.uid, module, checked_xml_id)
self.id_map[xml_id] = id
except ValueError, e:
raise ValueError("""%s not found when processing %s.
This Yaml file appears to depend on missing data. This often happens for
tests that belong to a module's test suite and depend on each other.""" % (checked_xml_id, self.filename))
return id return id
def get_context(self, node, eval_dict): def get_context(self, node, eval_dict):
context = self.context.copy() context = self.context.copy()
if node.context: if node.context:
@ -186,7 +192,7 @@ class YamlInterpreter(object):
def isnoupdate(self, node): def isnoupdate(self, node):
return self.noupdate or node.noupdate or False return self.noupdate or node.noupdate or False
def _get_first_result(self, results, default=False): def _get_first_result(self, results, default=False):
if len(results): if len(results):
value = results[0] value = results[0]
@ -195,7 +201,7 @@ class YamlInterpreter(object):
else: else:
value = default value = default
return value return value
def process_comment(self, node): def process_comment(self, node):
return node return node
@ -419,7 +425,7 @@ class YamlInterpreter(object):
raise raise
else: else:
self.assert_report.record(True, python.severity) self.assert_report.record(True, python.severity)
def process_workflow(self, node): def process_workflow(self, node):
workflow, values = node.items()[0] workflow, values = node.items()[0]
if self.isnoupdate(workflow) and self.mode != 'init': if self.isnoupdate(workflow) and self.mode != 'init':
@ -438,7 +444,7 @@ class YamlInterpreter(object):
local_context = {'obj': lambda x: value_model.browse(self.cr, self.uid, x, context=self.context)} local_context = {'obj': lambda x: value_model.browse(self.cr, self.uid, x, context=self.context)}
local_context.update(self.id_map) local_context.update(self.id_map)
id = eval(value['eval'], self.eval_context, local_context) id = eval(value['eval'], self.eval_context, local_context)
if workflow.uid is not None: if workflow.uid is not None:
uid = workflow.uid uid = workflow.uid
else: else:
@ -450,7 +456,7 @@ class YamlInterpreter(object):
import openerp.netsvc as netsvc import openerp.netsvc as netsvc
wf_service = netsvc.LocalService("workflow") wf_service = netsvc.LocalService("workflow")
wf_service.trg_validate(uid, workflow.model, id, workflow.action, self.cr) wf_service.trg_validate(uid, workflow.model, id, workflow.action, self.cr)
def _eval_params(self, model, params): def _eval_params(self, model, params):
args = [] args = []
for i, param in enumerate(params): for i, param in enumerate(params):
@ -476,7 +482,7 @@ class YamlInterpreter(object):
value = param # scalar value value = param # scalar value
args.append(value) args.append(value)
return args return args
def process_function(self, node): def process_function(self, node):
function, params = node.items()[0] function, params = node.items()[0]
if self.isnoupdate(function) and self.mode != 'init': if self.isnoupdate(function) and self.mode != 'init':
@ -489,7 +495,7 @@ class YamlInterpreter(object):
args = self._eval_params(function.model, params) args = self._eval_params(function.model, params)
method = function.name method = function.name
getattr(model, method)(self.cr, self.uid, *args) getattr(model, method)(self.cr, self.uid, *args)
def _set_group_values(self, node, values): def _set_group_values(self, node, values):
if node.groups: if node.groups:
group_names = node.groups.split(',') group_names = node.groups.split(',')
@ -570,7 +576,7 @@ class YamlInterpreter(object):
values['icon'] = node.icon values['icon'] = node.icon
self._set_group_values(node, values) self._set_group_values(node, values)
pid = self.pool.get('ir.model.data')._update(self.cr, 1, \ pid = self.pool.get('ir.model.data')._update(self.cr, 1, \
'ir.ui.menu', self.module, values, node.id, mode=self.mode, \ 'ir.ui.menu', self.module, values, node.id, mode=self.mode, \
noupdate=self.isnoupdate(node), res_id=res and res[0] or False) noupdate=self.isnoupdate(node), res_id=res and res[0] or False)
@ -640,7 +646,7 @@ class YamlInterpreter(object):
self.pool.get('ir.model.data')._unlink(self.cr, 1, node.model, ids) self.pool.get('ir.model.data')._unlink(self.cr, 1, node.model, ids)
else: else:
self.logger.log(logging.TEST, "Record not deleted.") self.logger.log(logging.TEST, "Record not deleted.")
def process_url(self, node): def process_url(self, node):
self.validate_xml_id(node.id) self.validate_xml_id(node.id)
@ -657,7 +663,7 @@ class YamlInterpreter(object):
self.pool.get('ir.model.data').ir_set(self.cr, 1, 'action', \ self.pool.get('ir.model.data').ir_set(self.cr, 1, 'action', \
keyword, node.url, ["ir.actions.url"], value, replace=replace, \ keyword, node.url, ["ir.actions.url"], value, replace=replace, \
noupdate=self.isnoupdate(node), isobject=True, xml_id=node.id) noupdate=self.isnoupdate(node), isobject=True, xml_id=node.id)
def process_ir_set(self, node): def process_ir_set(self, node):
if not self.mode == 'init': if not self.mode == 'init':
return False return False
@ -708,13 +714,13 @@ class YamlInterpreter(object):
replace = node.replace or True replace = node.replace or True
self.pool.get('ir.model.data').ir_set(self.cr, 1, 'action', \ self.pool.get('ir.model.data').ir_set(self.cr, 1, 'action', \
keyword, values['name'], [values['model']], value, replace=replace, isobject=True, xml_id=xml_id) keyword, values['name'], [values['model']], value, replace=replace, isobject=True, xml_id=xml_id)
def process_none(self): def process_none(self):
""" """
Empty node or commented node should not pass silently. Empty node or commented node should not pass silently.
""" """
self._log_assert_failure(logging.WARNING, "You have an empty block in your tests.") self._log_assert_failure(logging.WARNING, "You have an empty block in your tests.")
def process(self, yaml_string): def process(self, yaml_string):
""" """
@ -732,7 +738,7 @@ class YamlInterpreter(object):
except Exception, e: except Exception, e:
self.logger.exception(e) self.logger.exception(e)
raise raise
def _process_node(self, node): def _process_node(self, node):
if is_comment(node): if is_comment(node):
self.process_comment(node) self.process_comment(node)
@ -770,7 +776,7 @@ class YamlInterpreter(object):
self.process_none() self.process_none()
else: else:
raise YamlImportException("Can not process YAML block: %s" % node) raise YamlImportException("Can not process YAML block: %s" % node)
def _log(self, node, is_preceded_by_comment): def _log(self, node, is_preceded_by_comment):
if is_comment(node): if is_comment(node):
is_preceded_by_comment = True is_preceded_by_comment = True