@@ -13,7 +13,7 @@ import os, sys, importlib, inspect, json | |||||
from .exceptions import * | from .exceptions import * | ||||
from .utils.jinja import get_jenv, get_template, render_template | from .utils.jinja import get_jenv, get_template, render_template | ||||
__version__ = "7.0.44" | |||||
__version__ = "7.0.45" | |||||
local = Local() | local = Local() | ||||
@@ -115,7 +115,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 | d[fieldname] = getdate(parse_date(d[fieldname])) if d[fieldname] else None | ||||
elif fieldtype == "Datetime": | elif fieldtype == "Datetime": | ||||
if d[fieldname]: | 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]) | _date = parse_date(d[fieldname]) | ||||
d[fieldname] = get_datetime(_date + " " + _time) | d[fieldname] = get_datetime(_date + " " + _time) | ||||
else: | else: | ||||
@@ -270,7 +270,7 @@ class Meta(Document): | |||||
`[doctype]_dashboard.py` file in the doctype folder''' | `[doctype]_dashboard.py` file in the doctype folder''' | ||||
try: | try: | ||||
module = load_doctype_module(self.name, suffix='_dashboard') | module = load_doctype_module(self.name, suffix='_dashboard') | ||||
data = frappe._dict(module.data) | |||||
data = frappe._dict(module.get_data()) | |||||
except ImportError: | except ImportError: | ||||
data = frappe._dict() | data = frappe._dict() | ||||