diff --git a/frappe/core/page/data_import_tool/importer.py b/frappe/core/page/data_import_tool/importer.py index 0cf6233f19..6d72eda383 100644 --- a/frappe/core/page/data_import_tool/importer.py +++ b/frappe/core/page/data_import_tool/importer.py @@ -120,7 +120,10 @@ def upload(rows = None, submit_after_import=None, ignore_encoding_errors=False, d[fieldname] = getdate(parse_date(d[fieldname])) if d[fieldname] else None elif fieldtype == "Datetime": if d[fieldname]: - _date, _time = d[fieldname].split() + if " " in d[fieldname]: + _date, _time = d[fieldname].split() + else: + _date, _time = d[fieldname], '00:00:00' _date = parse_date(d[fieldname]) d[fieldname] = get_datetime(_date + " " + _time) else: diff --git a/frappe/model/meta.py b/frappe/model/meta.py index ed456898b3..876effe8c5 100644 --- a/frappe/model/meta.py +++ b/frappe/model/meta.py @@ -283,7 +283,7 @@ class Meta(Document): `[doctype]_dashboard.py` file in the doctype folder''' try: module = load_doctype_module(self.name, suffix='_dashboard') - data = frappe._dict(module.data) + data = frappe._dict(module.get_data()) except ImportError: data = frappe._dict()