Merge branch 'develop'

This commit is contained in:
Nabin Hait 2017-12-26 18:33:00 +05:30
commit 8895e89315
4 changed files with 5 additions and 3 deletions

View file

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

View file

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

View file

@ -45,7 +45,7 @@ $.extend(frappe.model, {
}
}
if(cur_frm && isPlain) cur_frm.dirty();
}