From 96d1520a5e7c402669e812dd9a5f7fc3f35eb284 Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@odoo.com>
Date: Tue, 6 Jan 2015 10:18:11 +0100
Subject: [PATCH 1/3] [FIX] base: no line feed in translations

Revert "[FIX] ir_translation: remove control characters from translations"
This reverts commit 6d4e1cc73e4b3754f3c14edbd3307525edd2dd8b.

This was intended to clean malformed translations but it introduced the side
effect of removing all '\n' in translations.

Fixes #4092, opw 619175
---
 openerp/addons/base/ir/ir_translation.py | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/openerp/addons/base/ir/ir_translation.py b/openerp/addons/base/ir/ir_translation.py
index 0ff497e0274..cdbec59c65c 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
@@ -339,8 +338,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:

From ae34a1e93ec3e6e54ece9d546d527af5787f5c3f Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@odoo.com>
Date: Tue, 6 Jan 2015 18:03:58 +0100
Subject: [PATCH 2/3] [IMP] config: remove deprecated comment

It was intended to be replaced by log-handler at first but log-level is still
a very convenient way to manage the level of debug.
---
 openerp/tools/config.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/openerp/tools/config.py b/openerp/tools/config.py
index 4b3ba6909f6..193d758ef7d 100644
--- a/openerp/tools/config.py
+++ b/openerp/tools/config.py
@@ -192,7 +192,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)
 

From 91911159f5bc12046d791744ff23562378be047f Mon Sep 17 00:00:00 2001
From: Denis Ledoux <dle@odoo.com>
Date: Tue, 6 Jan 2015 18:50:28 +0100
Subject: [PATCH 3/3] [FIX] web: editable list, no re-rendering on field
 validation

When adding several lines in an editable list (adding 7 lines to an invoice for instance), then clicking on the first row direcly after having filled the last line, the value of the cell sometimes had the value of the last line. Just a display bug, but still.

Using internal_set_value avoid the re-rendering of the cell, and solve the above issue

opw-620111
---
 addons/web/static/src/js/view_form.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index aceb3e665fd..48df090a8d9 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -3892,7 +3892,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){