diff --git a/erpnext/public/js/controllers/buying.js b/erpnext/public/js/controllers/buying.js
index e4369ffe96b..802cc056c6a 100644
--- a/erpnext/public/js/controllers/buying.js
+++ b/erpnext/public/js/controllers/buying.js
@@ -133,7 +133,6 @@ erpnext.buying.BuyingController = erpnext.TransactionController.extend({
 	supplier_address: function() {
 		erpnext.utils.get_address_display(this.frm);
 		erpnext.utils.set_taxes_from_address(this.frm, "supplier_address", "supplier_address", "supplier_address");
-		erpnext.utils.set_place_of_supply(this.frm)
 	},
 
 	buying_price_list: function() {
diff --git a/erpnext/public/js/utils.js b/erpnext/public/js/utils.js
index baac95798e2..9b1c94e5ba0 100755
--- a/erpnext/public/js/utils.js
+++ b/erpnext/public/js/utils.js
@@ -116,19 +116,6 @@ $.extend(erpnext.utils, {
 		}
 	},
 
-	set_place_of_supply: function(frm){
-		frappe.call({
-			method: "erpnext.regional.india.utils.get_place_of_supply",
-			args: {
-				"party_details": frm.doc,
-				"doctype": frm.doc.doctype
-			},
-			callback: function(r){
-					frm.set_value("place_of_supply", r.message)
-			}
-		})
-	},
-
 	add_indicator_for_multicompany: function(frm, info) {
 		frm.dashboard.stats_area.removeClass('hidden');
 		frm.dashboard.stats_area_row.addClass('flex');
diff --git a/erpnext/regional/india/taxes.js b/erpnext/regional/india/taxes.js
index 950ba069fb1..33de01adad8 100644
--- a/erpnext/regional/india/taxes.js
+++ b/erpnext/regional/india/taxes.js
@@ -35,6 +35,10 @@ erpnext.setup_auto_gst_taxation = (doctype) => {
 				callback: function(r) {
 					if(r.message) {
 						frm.set_value('taxes_and_charges', r.message.taxes_and_charges);
+						frm.set_value('place_of_supply', r.message.place_of_supply);
+					} else if (frm.doc.is_internal_supplier || frm.doc.is_internal_customer) {
+						frm.set_value('taxes_and_charges', '');
+						frm.set_value('taxes', []);
 					}
 				}
 			});
diff --git a/erpnext/regional/india/utils.py b/erpnext/regional/india/utils.py
index 9da835224b0..d2a6c2dbcfa 100644
--- a/erpnext/regional/india/utils.py
+++ b/erpnext/regional/india/utils.py
@@ -136,12 +136,8 @@ def test_method():
 	'''test function'''
 	return 'overridden'
 
-@frappe.whitelist()
 def get_place_of_supply(party_details, doctype):
 	if not frappe.get_meta('Address').has_field('gst_state'): return
-	if isinstance(party_details, string_types):
-		party_details = json.loads(party_details)
-		party_details = frappe._dict(party_details)
 
 	if doctype in ("Sales Invoice", "Delivery Note", "Sales Order"):
 		address_name = party_details.shipping_address_name or party_details.customer_address
@@ -175,11 +171,11 @@ def get_regional_address_details(party_details, doctype, company, return_taxes=N
 		get_tax_template_for_sez(party_details, master_doctype, company, 'Customer')
 		get_tax_template_based_on_category(master_doctype, company, party_details)
 
-		if party_details.get('taxes_and_charges') and return_taxes:
+		if party_details.get('taxes_and_charges'):
 			return party_details
 
 		if not party_details.company_gstin:
-			return
+			return party_details
 
 	elif doctype in ("Purchase Invoice", "Purchase Order", "Purchase Receipt"):
 		master_doctype = "Purchase Taxes and Charges Template"
@@ -187,15 +183,15 @@ def get_regional_address_details(party_details, doctype, company, return_taxes=N
 		get_tax_template_for_sez(party_details, master_doctype, company, 'Supplier')
 		get_tax_template_based_on_category(master_doctype, company, party_details)
 
-		if party_details.get('taxes_and_charges') and return_taxes:
+		if party_details.get('taxes_and_charges'):
 			return party_details
 
 		if not party_details.supplier_gstin:
-			return
+			return party_details
 
-	if not party_details.place_of_supply: return
+	if not party_details.place_of_supply: return party_details
 
-	if not party_details.company_gstin: return
+	if not party_details.company_gstin: return party_details
 
 	if ((doctype in ("Sales Invoice", "Delivery Note", "Sales Order") and party_details.company_gstin
 		and party_details.company_gstin[:2] != party_details.place_of_supply[:2]) or (doctype in ("Purchase Invoice",
@@ -205,7 +201,7 @@ def get_regional_address_details(party_details, doctype, company, return_taxes=N
 		default_tax = get_tax_template(master_doctype, company, 0, party_details.company_gstin[:2])
 
 	if not default_tax:
-		return
+		return party_details
 	party_details["taxes_and_charges"] = default_tax
 	party_details.taxes = get_taxes_and_charges(master_doctype, default_tax)
 
diff --git a/erpnext/selling/sales_common.js b/erpnext/selling/sales_common.js
index 802fb5661db..15a9a1ab882 100644
--- a/erpnext/selling/sales_common.js
+++ b/erpnext/selling/sales_common.js
@@ -117,7 +117,6 @@ erpnext.selling.SellingController = erpnext.TransactionController.extend({
 	customer_address: function() {
 		erpnext.utils.get_address_display(this.frm, "customer_address");
 		erpnext.utils.set_taxes_from_address(this.frm, "customer_address", "customer_address", "shipping_address_name");
-		erpnext.utils.set_place_of_supply(this.frm)
 	},
 
 	shipping_address_name: function() {