summaryrefslogtreecommitdiff
path: root/addons/base_import/models
diff options
context:
space:
mode:
authorChristophe Simonis <chs@odoo.com>2018-03-21 19:36:58 +0100
committerChristophe Simonis <chs@odoo.com>2018-03-21 19:36:58 +0100
commit6773bdbe327ec6dbc9d6120de63258770efddadb (patch)
tree72787d4e15fc9032e532d8fcbb0847bd9ac9494a /addons/base_import/models
parent9239ec7de85e928bce86303d30fdab00ae90aa41 (diff)
parente8f630e44df6460a9027cc07fd79d2a4e11ce17c (diff)
[MERGE] forward port branch 11.0 up to e8f630e44df
Diffstat (limited to 'addons/base_import/models')
-rw-r--r--addons/base_import/models/base_import.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/addons/base_import/models/base_import.py b/addons/base_import/models/base_import.py
index f5af6b89483..ff59aff918a 100644
--- a/addons/base_import/models/base_import.py
+++ b/addons/base_import/models/base_import.py
@@ -623,8 +623,10 @@ class Import(models.TransientModel):
user_format = pycompat.to_native(options.get('%s_format' % field['type']))
for num, line in enumerate(data):
if line[index]:
+ line[index] = line[index].strip()
+ if line[index]:
try:
- line[index] = dt.strftime(dt.strptime(pycompat.to_native(line[index].strip()), user_format), server_format)
+ line[index] = dt.strftime(dt.strptime(pycompat.to_native(line[index]), user_format), server_format)
except ValueError as e:
raise ValueError(_("Column %s contains incorrect values. Error in line %d: %s") % (name, num + 1, e))
except Exception as e: