Merge branch 'master' into develop

frappe/__init__.py

@@ -14,7 +14,7 @@ import os, sys, importlib, inspect, json
 from .exceptions import *
 from .utils.jinja import get_jenv, get_template, render_template, get_email_from_template
 
-__version__ = '8.6.3'
+__version__ = '8.6.4'
 __title__ = "Frappe Framework"
 
 local = Local()

frappe/core/page/data_import_tool/importer.py

@@ -118,7 +118,8 @@ def upload(rows = None, submit_after_import=None, ignore_encoding_errors=False,
 								elif fieldtype in ("Float", "Currency", "Percent"):
 									d[fieldname] = flt(d[fieldname])
 								elif fieldtype == "Date":
-									d[fieldname] = getdate(parse_date(d[fieldname])) if d[fieldname] else None
+									if d[fieldname] and isinstance(d[fieldname], basestring):
+										d[fieldname] = getdate(parse_date(d[fieldname]))
 								elif fieldtype == "Datetime":
 									if d[fieldname]:
 										if " " in d[fieldname]:

frappe/public/js/frappe/form/quick_entry.js

@@ -141,7 +141,7 @@ frappe.ui.form.QuickEntryForm = Class.extend({
 						frappe.ui.form.update_calling_link(me.dialog.doc);
 					} else {
 						if(me.after_insert) {
-							me.after_insert(me.dialig.doc);
+							me.after_insert(me.dialog.doc);
 						} else {
 							me.open_from_if_not_list();
 						}