[MERGE] forward port of branch saas-3 up to 879fca0
This commit is contained in:
commit
4c1908088c
|
@ -4412,7 +4412,7 @@ instance.web.form.One2ManyListView = instance.web.ListView.extend({
|
||||||
r = record;
|
r = record;
|
||||||
_.each(self.editor.form.fields, function(field){
|
_.each(self.editor.form.fields, function(field){
|
||||||
field._inhibit_on_change_flag = true;
|
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;
|
field._inhibit_on_change_flag = false;
|
||||||
});
|
});
|
||||||
return _.every(self.editor.form.fields, function(field){
|
return _.every(self.editor.form.fields, function(field){
|
||||||
|
|
|
@ -20,7 +20,6 @@
|
||||||
##############################################################################
|
##############################################################################
|
||||||
|
|
||||||
import logging
|
import logging
|
||||||
import unicodedata
|
|
||||||
|
|
||||||
from openerp import tools
|
from openerp import tools
|
||||||
import openerp.modules
|
import openerp.modules
|
||||||
|
@ -357,8 +356,7 @@ class ir_translation(osv.osv):
|
||||||
trad = res and res[0] or u''
|
trad = res and res[0] or u''
|
||||||
if source and not trad:
|
if source and not trad:
|
||||||
return tools.ustr(source)
|
return tools.ustr(source)
|
||||||
# Remove control characters
|
return trad
|
||||||
return filter(lambda c: unicodedata.category(c) != 'Cc', tools.ustr(trad))
|
|
||||||
|
|
||||||
def create(self, cr, uid, vals, context=None):
|
def create(self, cr, uid, vals, context=None):
|
||||||
if context is None:
|
if context is None:
|
||||||
|
|
|
@ -203,7 +203,7 @@ class configmanager(object):
|
||||||
]
|
]
|
||||||
group.add_option('--log-level', dest='log_level', type='choice',
|
group.add_option('--log-level', dest='log_level', type='choice',
|
||||||
choices=levels, my_default='info',
|
choices=levels, my_default='info',
|
||||||
help='specify the level of the logging. Accepted values: %s (deprecated option).' % (levels,))
|
help='specify the level of the logging. Accepted values: %s.' % (levels,))
|
||||||
|
|
||||||
parser.add_option_group(group)
|
parser.add_option_group(group)
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue