Bläddra i källkod

Fixed version conflict

version-14
Nabin Hait 8 år sedan
förälder
incheckning
b208dcb16b
2 ändrade filer med 5 tillägg och 2 borttagningar
  1. +4
    -1
      frappe/core/page/data_import_tool/importer.py
  2. +1
    -1
      frappe/model/meta.py

+ 4
- 1
frappe/core/page/data_import_tool/importer.py Visa fil

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


+ 1
- 1
frappe/model/meta.py Visa fil

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



Laddar…
Avbryt
Spara