diff options
| author | Denis Ledoux <dle@odoo.com> | 2015-01-06 18:56:10 +0100 |
|---|---|---|
| committer | Denis Ledoux <dle@odoo.com> | 2015-01-06 18:56:10 +0100 |
| commit | 879fca0856aef43e2b9bbf782de9b77b0caaab2f (patch) | |
| tree | b15a7ad24fb7a18c788dc7d9c5201c82203fe5ff | |
| parent | 643bbcb00b93c7da0d92eca7b8c1ab3c6cf9b3fc (diff) | |
| parent | 91911159f5bc12046d791744ff23562378be047f (diff) | |
[MERGE] forward port of branch 7.0 up to 9191115
| -rw-r--r-- | addons/web/static/src/js/view_form.js | 2 | ||||
| -rw-r--r-- | openerp/addons/base/ir/ir_translation.py | 4 | ||||
| -rw-r--r-- | openerp/tools/config.py | 2 |
3 files changed, 3 insertions, 5 deletions
diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js index b9951c32186..9a10841cfd0 100644 --- a/addons/web/static/src/js/view_form.js +++ b/addons/web/static/src/js/view_form.js @@ -4116,7 +4116,7 @@ instance.web.form.One2ManyListView = instance.web.ListView.extend({ r = record; _.each(self.editor.form.fields, function(field){ field._inhibit_on_change_flag = true; - field.set_value(r.attributes[field.name]); + field.internal_set_value(r.attributes[field.name]); field._inhibit_on_change_flag = false; }); return _.every(self.editor.form.fields, function(field){ diff --git a/openerp/addons/base/ir/ir_translation.py b/openerp/addons/base/ir/ir_translation.py index 15c0a2a7c7e..b6a7a722ddb 100644 --- a/openerp/addons/base/ir/ir_translation.py +++ b/openerp/addons/base/ir/ir_translation.py @@ -20,7 +20,6 @@ ############################################################################## import logging -import unicodedata from openerp import tools import openerp.modules @@ -336,8 +335,7 @@ class ir_translation(osv.osv): trad = res and res[0] or u'' if source and not trad: return tools.ustr(source) - # Remove control characters - return filter(lambda c: unicodedata.category(c) != 'Cc', tools.ustr(trad)) + return trad def create(self, cr, uid, vals, context=None): if context is None: diff --git a/openerp/tools/config.py b/openerp/tools/config.py index 7320d29ed8c..5961f3706ff 100644 --- a/openerp/tools/config.py +++ b/openerp/tools/config.py @@ -181,7 +181,7 @@ class configmanager(object): levels = ['info', 'debug_rpc', 'warn', 'test', 'critical', 'debug_sql', 'error', 'debug', 'debug_rpc_answer', 'notset'] group.add_option('--log-level', dest='log_level', type='choice', choices=levels, - my_default='info', help='specify the level of the logging. Accepted values: ' + str(levels) + ' (deprecated option).') + my_default='info', help='specify the level of the logging. Accepted values: ' + str(levels)) parser.add_option_group(group) |