From bf6d044446f0bbed8b839567b27511d29c47e2e9 Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Tue, 26 Dec 2017 14:31:14 +0530 Subject: [PATCH 1/4] Version 10 change log --- frappe/change_log/{ => v10}/v10_0_0.md | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename frappe/change_log/{ => v10}/v10_0_0.md (100%) 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 From 98036fd018f6d744f517f65da65058c3497d614e Mon Sep 17 00:00:00 2001 From: Manas Solanki Date: Tue, 26 Dec 2017 16:11:10 +0530 Subject: [PATCH 2/4] don't throw error if there is autoname controller (#4687) --- frappe/core/doctype/data_import/importer.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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") From 42d8ca63fbe388ac5ae38af95dbfa446ad5469ca Mon Sep 17 00:00:00 2001 From: Vishal Dhayagude Date: Tue, 26 Dec 2017 18:25:06 +0530 Subject: [PATCH 3/4] [fix] Remove dirty call in sync.js (#4688) --- frappe/public/js/frappe/model/sync.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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(); + } From 7c2782e5941f44b3e8ef2b688cb512a1d1cacc51 Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Tue, 26 Dec 2017 19:03:00 +0600 Subject: [PATCH 4/4] bumped to version 10.0.3 --- frappe/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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()