Merge branch 'staging' into production

Author: sahil28297

frappe/__init__.py

@@ -24,7 +24,7 @@
 	sys.setdefaultencoding("utf-8")
 
 __frappe_version__ = '12.8.1'
-__version__ = '2.0.10'
+__version__ = '2.0.11'
 __title__ = "Frappe Framework"
 
 local = Local()

frappe/contacts/address_and_contact.py

@@ -13,6 +13,7 @@ def load_address_and_contact(doc, key=None):
 	from frappe.contacts.doctype.address.address import get_address_display, get_condensed_address
 
 	filters = [
+		["Address", "disabled", "=", 0],
 		["Dynamic Link", "link_doctype", "=", doc.doctype],
 		["Dynamic Link", "link_name", "=", doc.name],
 		["Dynamic Link", "parenttype", "=", "Address"],

frappe/permissions.py

@@ -61,7 +61,7 @@ def has_permission(doctype, ptype="read", doc=None, verbose=False, user=None, ra
 		if isinstance(doc, string_types):
 			doc = frappe.get_doc(meta.name, doc)
 		perm = get_doc_permissions(doc, user=user, ptype=ptype).get(ptype)
-		if not perm: push_perm_check_log(_('User {0} does not have access to this document').format(frappe.bold(user)))
+		if not perm: push_perm_check_log(_('User {0} does not have access to document type {1}.').format(frappe.bold(user), frappe.bold(doctype)))
 	else:
 		if ptype=="submit" and not cint(meta.is_submittable):
 			push_perm_check_log(_("Document Type is not submittable"))
@@ -74,7 +74,7 @@ def has_permission(doctype, ptype="read", doc=None, verbose=False, user=None, ra
 		role_permissions = get_role_permissions(meta, user=user)
 		perm = role_permissions.get(ptype)
 		if not perm:
-			push_perm_check_log(_('User {0} does not have doctype access via role permission for document {1}').format(frappe.bold(user), frappe.bold(doctype)))
+			push_perm_check_log(_('User {0} does not have access to document type {1} via role permission.').format(frappe.bold(user), frappe.bold(doctype)))
 
 	def false_if_not_shared():
 		if ptype in ("read", "write", "share", "email", "print"):

frappe/public/js/frappe/form/controls/multiselect_pills.js

@@ -129,7 +129,8 @@ frappe.ui.form.ControlMultiSelectPills = frappe.ui.form.ControlAutocomplete.exte
 	get_data() {
 		let data;
 		if(this.df.get_data) {
-			data = this.df.get_data();
+			let txt = this.$input.val();
+			data = this.df.get_data(txt);
 			if (data && data.then) {
 				data.then((r) => {
 					this.set_data(r);