pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[MERGE] forward port of branch 7.0 up to 9191115

Browse Source
This commit is contained in:
Denis Ledoux
2015-01-06 18:56:10 +01:00
parent 643bbcb00b 91911159f5
commit 879fca0856
3 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/web/static/src/js/view_form.js
+1 -1
View File
@@ -4116,7 +4116,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){
openerp/addons/base/ir/ir_translation.py
+1 -3
View File
@@ -20,7 +20,6 @@
############################################################################## ##############################################################################
import logging import logging
import unicodedata
from openerp import tools from openerp import tools
import openerp.modules import openerp.modules
@@ -336,8 +335,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:
openerp/tools/config.py
+1 -1
View File
@@ -181,7 +181,7 @@ class configmanager(object):
levels = ['info', 'debug_rpc', 'warn', 'test', 'critical', levels = ['info', 'debug_rpc', 'warn', 'test', 'critical',
'debug_sql', 'error', 'debug', 'debug_rpc_answer', 'notset'] 'debug_sql', 'error', 'debug', 'debug_rpc_answer', 'notset']
group.add_option('--log-level', dest='log_level', type='choice', choices=levels, 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) parser.add_option_group(group)