From 4396cbd0cc9bfcfc4ed7d3b0b356286297419b36 Mon Sep 17 00:00:00 2001 From: rohitwaghchaure Date: Mon, 31 Jul 2017 10:15:06 +0530 Subject: [PATCH 1/3] [Fix] Getting an error datetime.datetime is not iterable during importing purchase invoice data (#3818) --- frappe/core/page/data_import_tool/importer.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/frappe/core/page/data_import_tool/importer.py b/frappe/core/page/data_import_tool/importer.py index 3514c1b877..dd4a872111 100644 --- a/frappe/core/page/data_import_tool/importer.py +++ b/frappe/core/page/data_import_tool/importer.py @@ -118,7 +118,8 @@ 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] = getdate(parse_date(d[fieldname])) if d[fieldname] else None + if d[fieldname] and isinstance(d[fieldname], basestring): + d[fieldname] = getdate(parse_date(d[fieldname])) elif fieldtype == "Datetime": if d[fieldname]: if " " in d[fieldname]: From c4292ac6a45ebd0cd8f49faf8e938a73f0db15b0 Mon Sep 17 00:00:00 2001 From: ci2014 Date: Mon, 31 Jul 2017 06:57:00 +0200 Subject: [PATCH 2/3] Update quick_entry.js (#3815) Fix typo --- frappe/public/js/frappe/form/quick_entry.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/public/js/frappe/form/quick_entry.js b/frappe/public/js/frappe/form/quick_entry.js index 299f14176d..ffce4dceff 100644 --- a/frappe/public/js/frappe/form/quick_entry.js +++ b/frappe/public/js/frappe/form/quick_entry.js @@ -141,7 +141,7 @@ frappe.ui.form.QuickEntryForm = Class.extend({ frappe.ui.form.update_calling_link(me.dialog.doc); } else { if(me.after_insert) { - me.after_insert(me.dialig.doc); + me.after_insert(me.dialog.doc); } else { me.open_from_if_not_list(); } From 99317b2f65045612602aed5c967efecdebd3c5ff Mon Sep 17 00:00:00 2001 From: mbauskar Date: Mon, 31 Jul 2017 12:50:09 +0600 Subject: [PATCH 3/3] bumped to version 8.6.4 --- frappe/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/__init__.py b/frappe/__init__.py index cd5c0cd7f4..3b99b44b9e 100644 --- a/frappe/__init__.py +++ b/frappe/__init__.py @@ -14,7 +14,7 @@ import os, sys, importlib, inspect, json from .exceptions import * from .utils.jinja import get_jenv, get_template, render_template, get_email_from_template -__version__ = '8.6.3' +__version__ = '8.6.4' __title__ = "Frappe Framework" local = Local()