Techsystech
/
server-tools
mirror of https://github.com/OCA/server-tools.git
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[12.0][FIX] excel_import_export, problem on import with datetime field 

Can't import if the import file has date time field
pull/2505/head
kittiu 2020-03-15 15:44:39 +07:00 committed by Aungkokolin1997
parent deb6229a18
commit 492d477c39
2 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
excel_import_export/models/common.py
View File

@ -268,13 +268,12 @@ def _get_cell_value(cell, field_type=False):
datemode = 0 # From book.datemode, but we fix it for simplicity datemode = 0 # From book.datemode, but we fix it for simplicity
if field_type in ['date', 'datetime']: if field_type in ['date', 'datetime']:
ctype = xlrd.sheet.ctype_text.get(cell.ctype, 'unknown type') ctype = xlrd.sheet.ctype_text.get(cell.ctype, 'unknown type')
if ctype == 'number': if ctype in ('xldate', 'number'):
is_datetime = cell.value % 1 != 0.0
time_tuple = xlrd.xldate_as_tuple(cell.value, datemode) time_tuple = xlrd.xldate_as_tuple(cell.value, datemode)
date = dt(*time_tuple) date = dt(*time_tuple)
if field_type == 'date': value = (date.strftime("%Y-%m-%d %H:%M:%S")
value = date.strftime("%Y-%m-%d") if is_datetime else date.strftime("%Y-%m-%d"))
elif field_type == 'datetime':
value = date.strftime("%Y-%m-%d %H:%M:%S")
else: else:
value = cell.value value = cell.value
elif field_type in ['integer', 'float']: elif field_type in ['integer', 'float']:

13
excel_import_export/models/xlsx_import.py
View File

@ -203,14 +203,19 @@ class XLSXImport(models.AbstractModel):
'encoding': '', 'encoding': '',
'separator': '', 'separator': '',
'quoting': '"', 'quoting': '"',
'date_style': '', 'date_format': '%Y-%m-%d',
'datetime_style': '%Y-%m-%d %H:%M:%S', 'datetime_format': '%Y-%m-%d %H:%M:%S',
'float_thousand_separator': ',', 'float_thousand_separator': ',',
'float_decimal_separator': '.', 'float_decimal_separator': '.',
'fields': []}) 'fields': []})
if errors.get('messages'): if errors.get('messages'):
message = errors['messages']['message'].encode('utf-8') message = _('Error importing data')
raise ValidationError(message) messages = errors['messages']
if isinstance(messages, dict):
message = messages['message']
if isinstance(messages, list):
message = ', '.join([x['message'] for x in messages])
raise ValidationError(message.encode('utf-8'))
return self.env.ref(xml_id) return self.env.ref(xml_id)
except xlrd.XLRDError: except xlrd.XLRDError:
raise ValidationError( raise ValidationError(