Merge remote-tracking branch 'odoo/7.0' into 7.0

OCA · Jan 6, 2015 · 90a9bde · 90a9bde
2 parents 25ac753 + 9191115
commit 90a9bde
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 5 deletions.
diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
@@ -3901,7 +3901,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
@@ -20,7 +20,6 @@
 ##############################################################################
 
 import logging
-import unicodedata
 
 from openerp import tools
 import openerp.modules
@@ -339,8 +338,7 @@ def _get_source(self, cr, uid, name, types, lang, source=None):
         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
@@ -192,7 +192,7 @@ def __init__(self, fname=None):
         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)