From 6470d26d1934d0937b4e9046806554ac45c782cc Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Fri, 8 Dec 2017 15:51:25 +0530 Subject: [PATCH] [minor] import and assign --- frappe/core/page/data_import_tool/importer.py | 5 +++++ frappe/public/js/frappe/form/footer/assign_to.js | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/frappe/core/page/data_import_tool/importer.py b/frappe/core/page/data_import_tool/importer.py index a340860980..158d460bee 100644 --- a/frappe/core/page/data_import_tool/importer.py +++ b/frappe/core/page/data_import_tool/importer.py @@ -119,6 +119,9 @@ def upload(rows = None, submit_after_import=None, ignore_encoding_errors=False, fieldname = column_idx_to_fieldname[(dt, parentfield)][column_idx] fieldtype = column_idx_to_fieldtype[(dt, parentfield)][column_idx] + if not fieldname: + continue + d[fieldname] = rows[idx][column_idx] if fieldtype in ("Int", "Check"): d[fieldname] = cint(d[fieldname]) @@ -184,6 +187,8 @@ def upload(rows = None, submit_after_import=None, ignore_encoding_errors=False, autoname = autoname[6:] elif autoname=='naming_series:': autoname = 'naming_series' + else: + return True if autoname and not doc[autoname]: frappe.throw(_("{0} is a mandatory field".format(autoname))) diff --git a/frappe/public/js/frappe/form/footer/assign_to.js b/frappe/public/js/frappe/form/footer/assign_to.js index 950443de57..80aa38369f 100644 --- a/frappe/public/js/frappe/form/footer/assign_to.js +++ b/frappe/public/js/frappe/form/footer/assign_to.js @@ -136,12 +136,12 @@ frappe.ui.form.AssignToDialog = Class.extend({ {fieldtype: 'Link', fieldname:'assign_to', options:'User', label:__("Assign To"), reqd:true, filters: {'user_type': 'System User'}}, {fieldtype:'Check', fieldname:'myself', label:__("Assign to me"), "default":0}, - {fieldtype:'Small Text', fieldname:'description', label:__("Comment"), reqd:true}, + {fieldtype:'Small Text', fieldname:'description', label:__("Comment")}, {fieldtype: 'Section Break'}, {fieldtype: 'Column Break'}, {fieldtype:'Date', fieldname:'date', label: __("Complete By")}, {fieldtype:'Check', fieldname:'notify', - label:__("Notify by Email"), "default":1}, + label:__("Notify by Email")}, {fieldtype: 'Column Break'}, {fieldtype:'Select', fieldname:'priority', label: __("Priority"), options:[