vassili/seitime-frappe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Fixed version conflict

Browse source
This commit is contained in:
Nabin Hait 2016-10-18 15:24:38 +05:30
commit b208dcb16b
2 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
frappe/core/page/data_import_tool/importer.py
View file

@ -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:

2
frappe/model/meta.py
View file

@ -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()