summaryrefslogtreecommitdiff
path: root/odoo/models.py
diff options
context:
space:
mode:
authorChristophe Simonis <chs@odoo.com>2017-04-24 12:53:34 +0200
committerChristophe Simonis <chs@odoo.com>2017-04-24 12:53:34 +0200
commit64b7d4e8a8df180bc598e2df56992d373e23b44b (patch)
treee5683925601ffc151d185b374cd8b4a713d23def /odoo/models.py
parent7350a50a2eb41f8df595b4791edfe5ee3f06de63 (diff)
parent3f6e573c67a2ef6cbaf9bbeda1d0a2f286809266 (diff)
[MERGE] forward port branch 10.0 up to 3f6e573c67a
Diffstat (limited to 'odoo/models.py')
-rw-r--r--odoo/models.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/odoo/models.py b/odoo/models.py
index 56923cd1558..8d326925325 100644
--- a/odoo/models.py
+++ b/odoo/models.py
@@ -1855,7 +1855,7 @@ class BaseModel(object):
if ftype == 'many2one':
value = value[0]
elif ftype in ('date', 'datetime'):
- locale = self._context.get('lang', 'en_US')
+ locale = self._context.get('lang') or 'en_US'
fmt = DEFAULT_SERVER_DATETIME_FORMAT if ftype == 'datetime' else DEFAULT_SERVER_DATE_FORMAT
tzinfo = None
range_start = value