From 66a179507cbf7259cb38cc6fdd5a9f03d1c00cfa Mon Sep 17 00:00:00 2001 From: Manas Solanki Date: Tue, 19 Dec 2017 15:11:42 +0530 Subject: [PATCH] fix for the new docs with the child table (#4654) * fix for the new docs with the child table * Update data_import.py --- frappe/core/doctype/data_import/data_import.py | 2 +- frappe/core/doctype/data_import/importer.py | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/frappe/core/doctype/data_import/data_import.py b/frappe/core/doctype/data_import/data_import.py index 7e0b8cc605..95764709a1 100644 --- a/frappe/core/doctype/data_import/data_import.py +++ b/frappe/core/doctype/data_import/data_import.py @@ -30,7 +30,7 @@ class DataImport(Document): @frappe.whitelist() def import_data(data_import): - frappe.db.set_value("Data Import", data_import, "import_status", "In Progress") + frappe.db.set_value("Data Import", data_import, "import_status", "In Progress", update_modified=False) frappe.publish_realtime("data_import_progress", {"progress": "0", "data_import": data_import, "reload": True}, user=frappe.session.user) enqueue(upload, queue='default', timeout=6000, event='data_import', diff --git a/frappe/core/doctype/data_import/importer.py b/frappe/core/doctype/data_import/importer.py index 1b43047f63..8dcc129309 100644 --- a/frappe/core/doctype/data_import/importer.py +++ b/frappe/core/doctype/data_import/importer.py @@ -181,7 +181,7 @@ def upload(rows = None, submit_after_import=None, ignore_encoding_errors=False, if dt == doctype: doc.update(d) else: - if not overwrite: + if not overwrite and doc.get("name"): d['parent'] = doc["name"] d['parenttype'] = doctype d['parentfield'] = parentfield @@ -365,7 +365,7 @@ def upload(rows = None, submit_after_import=None, ignore_encoding_errors=False, doc = parent.append(parentfield, doc) parent.save() else: - if overwrite and doc["name"] and frappe.db.exists(doctype, doc["name"]): + if overwrite and doc.get("name") and frappe.db.exists(doctype, doc["name"]): original = frappe.get_doc(doctype, doc["name"]) original_name = original.name original.update(doc) @@ -464,8 +464,10 @@ def upload(rows = None, submit_after_import=None, ignore_encoding_errors=False, data_import_doc.save() if data_import_doc.import_status in ["Successful", "Partially Successful"]: data_import_doc.submit() + publish_progress(100, True) + else: + publish_progress(0, True) frappe.db.commit() - publish_progress(100, True) else: return log_message