handle empty rows, validating naming-series

frappe/core/page/data_import_tool/importer.py

@@ -173,7 +173,21 @@ def get_doc(start_idx):
 			return doc
 
 	def main_doc_empty(row):
-		return not (row and ((len(row) > 1 and row[1]) or (len(row) > 2 and row[2])))
+		return not (row and filter(None, row))
+
+	def validate_naming(doc):
+		autoname = frappe.get_meta(doc['doctype']).autoname
+
+		if ".#####" in autoname or "hash" in autoname:
+			autoname = ""
+		elif autoname[0:5] == 'field':
+			autoname = autoname[6:]
+		elif ":" in autoname:
+			autoname = autoname[:len(autoname)-1]
+
+		if autoname and not doc[autoname]:
+			frappe.throw(_("{0} is a mandatory field".format(autoname)))
+		return True
 
 	users = frappe.db.sql_list("select name from tabUser")
 	def prepare_for_insert(doc):
@@ -307,6 +321,7 @@ def as_link(doctype, name):
 
 		try:
 			doc = get_doc(row_idx)
+			validate_naming(doc)
 			if pre_process:
 				pre_process(doc)