diff options
| author | Christophe Simonis <chs@odoo.com> | 2018-07-23 16:03:25 +0200 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2018-07-23 16:03:25 +0200 |
| commit | 4e76173a430089c242b9cda35b70b6c833dad8b9 (patch) | |
| tree | ee183f9c5cace15a0705430a580909c2ed8f013e /odoo/tools | |
| parent | 78a6124d5ab4eb0b44fdcbd455d9f322d18b8a70 (diff) | |
| parent | 219d2296d67488855891573c979857c5fbfd1ebe (diff) | |
[MERGE] forward port branch 11.0 up to 219d2296d67
Diffstat (limited to 'odoo/tools')
| -rw-r--r-- | odoo/tools/misc.py | 2 | ||||
| -rw-r--r-- | odoo/tools/pycompat.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/odoo/tools/misc.py b/odoo/tools/misc.py index 725971e0143..8b1d7107c0d 100644 --- a/odoo/tools/misc.py +++ b/odoo/tools/misc.py @@ -1139,7 +1139,7 @@ def formatLang(env, value, digits=None, grouping=True, monetary=False, dp=False, digits = decimal_precision_obj.precision_get(dp) elif currency_obj: digits = currency_obj.decimal_places - elif (hasattr(value, '_field') and isinstance(value._field, (float_field, function_field)) and value._field.digits): + elif (hasattr(value, '_field') and getattr(value._field, 'digits', None)): digits = value._field.digits[1] if not digits and digits is not 0: digits = DEFAULT_DIGITS diff --git a/odoo/tools/pycompat.py b/odoo/tools/pycompat.py index 14195c4fa79..5f25e23e977 100644 --- a/odoo/tools/pycompat.py +++ b/odoo/tools/pycompat.py @@ -13,7 +13,7 @@ PY2 = sys.version_info[0] == 2 _Writer = collections.namedtuple('_Writer', 'writerow writerows') if PY2: - # pylint: disable=long-builtin,unichr-builtin,unicode-builtin + # pylint: disable=long-builtin,unichr-builtin,unicode-builtin,undefined-variable unichr = unichr text_type = unicode string_types = (str, unicode) |