vassili/seitime-frappe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 4

Merge pull request #1622 from anandpdoshi/fix/data-import-datetime

Browse source 
[fix] Data Import Tool: handle datetime parsing
This commit is contained in:
Anand Doshi 2016-03-11 11:56:10 +05:30
commit d3d0b246f0
2 changed files with 13 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
frappe/core/page/data_import_tool/importer.py
View file

@ -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

4
frappe/custom/doctype/customize_form/customize_form.js
View file

@ -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;
}
});