From 983796fbd4f6d74212795dcee28e62efbc02af91 Mon Sep 17 00:00:00 2001 From: KanchanChauhan Date: Mon, 26 Sep 2016 18:16:50 +0530 Subject: [PATCH] Select only mandatory childtable fields on Select Mandatory (#2092) --- frappe/core/page/data_import_tool/data_import_tool.js | 10 +++++++--- .../data_import_tool/data_import_tool_columns.html | 1 + 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/frappe/core/page/data_import_tool/data_import_tool.js b/frappe/core/page/data_import_tool/data_import_tool.js index acf2e3fc8a..ae62de45d3 100644 --- a/frappe/core/page/data_import_tool/data_import_tool.js +++ b/frappe/core/page/data_import_tool/data_import_tool.js @@ -42,11 +42,15 @@ frappe.DataImportTool = Class.extend({ if(me.doctype) { // render select columns - var doctype_list = [frappe.get_doc('DocType', me.doctype)]; + var parent_doctype = frappe.get_doc('DocType', me.doctype); + parent_doctype["reqd"] = true; + var doctype_list = [parent_doctype]; + frappe.meta.get_table_fields(me.doctype).forEach(function(df) { - doctype_list.push(frappe.get_doc('DocType', df.options)); + var d = frappe.get_doc('DocType', df.options); + d["reqd"]=df.reqd; + doctype_list.push(d); }); - $(frappe.render_template("data_import_tool_columns", {doctype_list: doctype_list})) .appendTo(me.select_columns.empty()); } diff --git a/frappe/core/page/data_import_tool/data_import_tool_columns.html b/frappe/core/page/data_import_tool/data_import_tool_columns.html index d5a28181c7..7e579607fa 100644 --- a/frappe/core/page/data_import_tool/data_import_tool_columns.html +++ b/frappe/core/page/data_import_tool/data_import_tool_columns.html @@ -4,6 +4,7 @@
{% for f in doctype.fields %} {% if (frappe.model.no_value_type.indexOf(f.fieldtype)===-1) %} + {% doctype.reqd||(f.reqd=0);%}