diff --git a/core/page/data_import_tool/data_import_tool.py b/core/page/data_import_tool/data_import_tool.py index f18a61a254..84beef6690 100644 --- a/core/page/data_import_tool/data_import_tool.py +++ b/core/page/data_import_tool/data_import_tool.py @@ -267,10 +267,8 @@ def check_record(d, parenttype=None): if docfield.reqd and (val=='' or val==None): raise Exception, "%s is mandatory." % key - if docfield.fieldtype=='Select' and val: - if not docfield.options: - raise Exception, "Select options are missing for %s" - elif docfield.options.startswith('link:'): + if docfield.fieldtype=='Select' and val and docfield.options: + if docfield.options.startswith('link:'): link_doctype = docfield.options.split(':')[1] if not webnotes.conn.exists(link_doctype, val): raise Exception, "%s must be a valid %s" % (key, link_doctype) diff --git a/webnotes/country_info.json b/webnotes/country_info.json index a228ff1163..a9188d9d0d 100644 --- a/webnotes/country_info.json +++ b/webnotes/country_info.json @@ -2244,5 +2244,16 @@ "currency_fraction_units": 100, "currency_symbol": "P", "number_format": "#,###.##" + }, + "Aruba": { + "currency_fraction": "Cent", + "timezones": [ + "America/Aruba" + ], + "currency_name": "Aruban Florin", + "currency": "AWG", + "currency_fraction_units": 100, + "currency_symbol": "Afl", + "number_format": "#,###.##" } } \ No newline at end of file