mirror of
https://gitlab.com/flectra-hq/flectra.git
synced 2026-11-03 04:40:20 -06:00
[ODOO] Upstream Changes of Odoo to Flectra till commit ref. https://github.com/odoo/odoo/commit/d636c6c95cb6af5fead1509ce9723e23d5f5f762
This commit is contained in:
1 parent
e67b7e553c
commit
487ed76bc1
631 files changed
+10472
-3607
No files matched your search
@@ -302,7 +302,8 @@ class Import(models.TransientModel):
|
||||
try:
|
||||
thousand_separator = decimal_separator = False
|
||||
for val in preview_values:
|
||||
if val == '':
|
||||
val = val.strip()
|
||||
if not val:
|
||||
continue
|
||||
# value might have the currency symbol left or right from the value
|
||||
val = self._remove_currency_symbol(val)
|
||||
@@ -587,6 +588,7 @@ class Import(models.TransientModel):
|
||||
thousand_separator = options.get('float_thousand_separator', ' ')
|
||||
decimal_separator = options.get('float_decimal_separator', '.')
|
||||
for line in data:
|
||||
line[index] = line[index].strip()
|
||||
if not line[index]:
|
||||
continue
|
||||
line[index] = line[index].replace(thousand_separator, '').replace(decimal_separator, '.')
|
||||
@@ -620,9 +622,11 @@ class Import(models.TransientModel):
|
||||
# versions, for both data and pattern
|
||||
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:
|
||||
|
||||
Reference in new issue
Block a user