From 273f62bc785658ec72ce54f13b5c032d47b34785 Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Tue, 8 Oct 2013 11:22:07 +0200 Subject: [PATCH] [IMP] move translate flag out of base qweb rendering bzr revid: xmo@openerp.com-20131008092207-m27ox8pebl36a45p --- openerp/addons/base/ir/ir_qweb.py | 1 - openerp/tests/addons/test_converter/tests/test_html.py | 6 +++--- openerp/tests/test_qweb.py | 2 -- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/openerp/addons/base/ir/ir_qweb.py b/openerp/addons/base/ir/ir_qweb.py index f9b960852f0..ac15f9ff56b 100644 --- a/openerp/addons/base/ir/ir_qweb.py +++ b/openerp/addons/base/ir/ir_qweb.py @@ -434,7 +434,6 @@ class FieldConverter(osv.AbstractModel): ('data-oe-id', record.id), ('data-oe-field', field_name), ('data-oe-type', field_type), - ('data-oe-translate', '1' if column.translate else '0'), ('data-oe-expression', t_att['field']), ] diff --git a/openerp/tests/addons/test_converter/tests/test_html.py b/openerp/tests/addons/test_converter/tests/test_html.py index 026cfae7f3c..20f55986ffe 100644 --- a/openerp/tests/addons/test_converter/tests/test_html.py +++ b/openerp/tests/addons/test_converter/tests/test_html.py @@ -106,7 +106,7 @@ class TestCurrencyExport(TestExport): converted, '' + 'data-oe-expression="obj.value">' '0.12' ' {symbol}'.format( obj=obj, @@ -124,7 +124,7 @@ class TestCurrencyExport(TestExport): converted, '' + 'data-oe-expression="obj.value">' '{symbol} ' '0.12' ''.format( @@ -144,7 +144,7 @@ class TestCurrencyExport(TestExport): converted, '' + 'data-oe-expression="obj.value">' '0.12' ' {symbol}'.format( obj=obj, diff --git a/openerp/tests/test_qweb.py b/openerp/tests/test_qweb.py index 17e47dc6096..3bdff5e63d0 100644 --- a/openerp/tests/test_qweb.py +++ b/openerp/tests/test_qweb.py @@ -31,7 +31,6 @@ class TestQWebTField(common.TransactionCase): result, '%s' % ( company_id, "My Test Company",)) @@ -54,7 +53,6 @@ class TestQWebTField(common.TransactionCase): result, '%s' % ( company_id, cgi.escape(s.encode('utf-8')),))