From ed6f2dc42f85edf82e9216d2af20e83935fe43bb Mon Sep 17 00:00:00 2001
From: Anand Doshi <anand@erpnext.com>
Date: Thu, 18 Feb 2016 19:49:45 +0530
Subject: [PATCH] [fix] synchronously load doctypes for linked with

---
 frappe/public/js/frappe/form/linked_with.js | 2 +-
 frappe/public/js/frappe/model/model.js      | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/frappe/public/js/frappe/form/linked_with.js b/frappe/public/js/frappe/form/linked_with.js
index 5c777001ba..344b79df59 100644
--- a/frappe/public/js/frappe/form/linked_with.js
+++ b/frappe/public/js/frappe/form/linked_with.js
@@ -65,7 +65,7 @@ frappe.ui.form.LinkedWith = Class.extend({
 					// add additional fields to __linked_doctypes
 					me.frm.__linked_doctypes[dt].add_fields = frappe.listview_settings[dt].add_fields;
 				}
-			});
+			}, /*async*/ false);
 		}));
 	},
 
diff --git a/frappe/public/js/frappe/model/model.js b/frappe/public/js/frappe/model/model.js
index 8c2634c5c9..1fd0754964 100644
--- a/frappe/public/js/frappe/model/model.js
+++ b/frappe/public/js/frappe/model/model.js
@@ -81,7 +81,7 @@ $.extend(frappe.model, {
 		return docfield[0];
 	},
 
-	with_doctype: function(doctype, callback) {
+	with_doctype: function(doctype, callback, async) {
 		if(locals.DocType[doctype]) {
 			callback && callback();
 		} else {
@@ -98,6 +98,7 @@ $.extend(frappe.model, {
 					with_parent: 1,
 					cached_timestamp: cached_timestamp
 				},
+				async: async,
 				freeze: true,
 				callback: function(r) {
 					if(r.exc) {