diff --git a/frappe/__init__.py b/frappe/__init__.py index 2d7d01e763..3d7e8fb0a4 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__ = '10.0.2' +__version__ = '10.0.3' __title__ = "Frappe Framework" local = Local() diff --git a/frappe/change_log/v10_0_0.md b/frappe/change_log/v10/v10_0_0.md similarity index 100% rename from frappe/change_log/v10_0_0.md rename to frappe/change_log/v10/v10_0_0.md diff --git a/frappe/core/doctype/data_import/importer.py b/frappe/core/doctype/data_import/importer.py index 95336c84b3..19d88b7df5 100644 --- a/frappe/core/doctype/data_import/importer.py +++ b/frappe/core/doctype/data_import/importer.py @@ -211,7 +211,9 @@ def upload(rows = None, submit_after_import=None, ignore_encoding_errors=False, return True if (autoname and autoname not in doc) or (autoname and not doc[autoname]): - frappe.throw(_("{0} is a mandatory field".format(autoname))) + from frappe.model.base_document import get_controller + if not hasattr(get_controller(doctype), "autoname"): + frappe.throw(_("{0} is a mandatory field".format(autoname))) return True users = frappe.db.sql_list("select name from tabUser") diff --git a/frappe/public/js/frappe/model/sync.js b/frappe/public/js/frappe/model/sync.js index 6dd2433fc6..645585b082 100644 --- a/frappe/public/js/frappe/model/sync.js +++ b/frappe/public/js/frappe/model/sync.js @@ -45,7 +45,7 @@ $.extend(frappe.model, { } } - if(cur_frm && isPlain) cur_frm.dirty(); + }