diff options
| author | Christophe Simonis <chs@odoo.com> | 2017-03-17 17:55:30 +0100 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2017-03-17 17:55:30 +0100 |
| commit | 31ebb077734a4fda87df8eb19a88c0591f7e79e2 (patch) | |
| tree | 5d98b60cf7771f05cfe1740f5475e3e1575b2cc9 /odoo | |
| parent | 2c1257fe88a20d0f501977c02863f818ca7d1dd4 (diff) | |
| parent | aefdf96c25973778f3a00c06b107c30e440b0d94 (diff) | |
[MERGE] forward port branch saas-11 up to aefdf96c259
Diffstat (limited to 'odoo')
| -rw-r--r-- | odoo/addons/base/ir/ir_qweb/fields.py | 6 | ||||
| -rw-r--r-- | odoo/addons/test_converter/tests/test_html.py | 8 |
2 files changed, 7 insertions, 7 deletions
diff --git a/odoo/addons/base/ir/ir_qweb/fields.py b/odoo/addons/base/ir/ir_qweb/fields.py index c7dadb1ce8f..f0c7d576672 100644 --- a/odoo/addons/base/ir/ir_qweb/fields.py +++ b/odoo/addons/base/ir/ir_qweb/fields.py @@ -122,7 +122,7 @@ class IntegerConverter(models.AbstractModel): @api.model def value_to_html(self, value, options): - return unicodifier(self.user_lang().format('%d', value, grouping=True)) + return unicodifier(self.user_lang().format('%d', value, grouping=True).replace(r'-', u'\u2011')) class FloatConverter(models.AbstractModel): @@ -142,7 +142,7 @@ class FloatConverter(models.AbstractModel): value = float_utils.float_round(value, precision_digits=precision) fmt = '%.{precision}f'.format(precision=precision) - formatted = self.user_lang().format(fmt, value, grouping=True) + formatted = self.user_lang().format(fmt, value, grouping=True).replace(r'-', u'\u2011') # %f does not strip trailing zeroes. %g does but its precision causes # it to switch to scientific notation starting at a million *and* to @@ -322,7 +322,7 @@ class MonetaryConverter(models.AbstractModel): lang = self.user_lang() formatted_amount = lang.format(fmt, display_currency.round(value), - grouping=True, monetary=True).replace(r' ', u'\N{NO-BREAK SPACE}') + grouping=True, monetary=True).replace(r' ', u'\N{NO-BREAK SPACE}').replace(r'-', u'\u2011') pre = post = u'' if display_currency.position == 'before': diff --git a/odoo/addons/test_converter/tests/test_html.py b/odoo/addons/test_converter/tests/test_html.py index d084e0c4055..85d2c511fcd 100644 --- a/odoo/addons/test_converter/tests/test_html.py +++ b/odoo/addons/test_converter/tests/test_html.py @@ -72,8 +72,8 @@ class TestFloatExport(TestBasicExport): def test_float(self): converter = self.get_converter('float') - value = converter(42.0) - self.assertEqual(value, "42.0") + value = converter(-42.0) + self.assertEqual(value, u"\u201142.0") value = converter(42.0100) self.assertEqual(value, "42.01") @@ -115,12 +115,12 @@ class TestCurrencyExport(TestExport): def test_currency_post(self): currency = self.create(self.Currency, name="Test", symbol=u"test") - obj = self.create(self.Model, value=0.12) + obj = self.create(self.Model, value=-0.12) converted = self.convert(obj, dest=currency) self.assertEqual( - converted, '<span class="oe_currency_value">0.12</span>' + converted, '<span class="oe_currency_value">\u20110.12</span>' u'\N{NO-BREAK SPACE}{symbol}'.format( obj=obj, symbol=currency.symbol.encode('utf-8') |