From b181b81ebf033cf61b691f98b2f713df2bb5ea80 Mon Sep 17 00:00:00 2001 From: Anand Doshi Date: Thu, 10 Mar 2016 17:50:27 +0530 Subject: [PATCH 1/2] [fix] mark new row as Custom Field in Customize Form to make it draggable --- frappe/custom/doctype/customize_form/customize_form.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/frappe/custom/doctype/customize_form/customize_form.js b/frappe/custom/doctype/customize_form/customize_form.js index e8eb4f3de4..ad18048554 100644 --- a/frappe/custom/doctype/customize_form/customize_form.js +++ b/frappe/custom/doctype/customize_form/customize_form.js @@ -97,6 +97,10 @@ frappe.ui.form.on("Customize Form Field", { msgprint(__("Cannot delete standard field. You can hide it if you want")); throw "cannot delete custom field"; } + }, + fields_add: function(frm, cdt, cdn) { + var f = frappe.model.get_doc(cdt, cdn); + f.is_custom_field = 1; } }); From fd7b1cfab52bd9fb593f3db37978a37aa745ead4 Mon Sep 17 00:00:00 2001 From: Anand Doshi Date: Fri, 11 Mar 2016 10:13:41 +0530 Subject: [PATCH 2/2] [fix] Data Import Tool: handle datetime parsing --- frappe/core/page/data_import_tool/importer.py | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/frappe/core/page/data_import_tool/importer.py b/frappe/core/page/data_import_tool/importer.py index 3e2d618e63..363fcc2c47 100644 --- a/frappe/core/page/data_import_tool/importer.py +++ b/frappe/core/page/data_import_tool/importer.py @@ -12,7 +12,7 @@ from frappe import _ from frappe.utils.csvutils import getlink from frappe.utils.dateutils import parse_date -from frappe.utils import cint, cstr, flt +from frappe.utils import cint, cstr, flt, getdate, get_datetime from frappe.core.page.data_import_tool.data_import_tool import get_data_keys #@frappe.async.handler @@ -111,7 +111,14 @@ 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] = parse_date(d[fieldname]) if d[fieldname] else None + d[fieldname] = getdate(parse_date(d[fieldname])) if d[fieldname] else None + elif fieldtype == "Datetime": + if d[fieldname]: + _date, _time = d[fieldname].split(" ") + _date = parse_date(d[fieldname]) + d[fieldname] = get_datetime(_date + " " + _time) + else: + d[fieldname] = None except IndexError: pass