resolved merge conflicts

erpnext/__init__.py

@@ -2,7 +2,7 @@
 from __future__ import unicode_literals
 import frappe
 
-__version__ = '8.1.6'
+__version__ = '8.1.7'
 
 
 def get_default_company(user=None):

erpnext/templates/pages/regional/india/update-gstin.html

@@ -5,8 +5,16 @@
 {% block header %}<h2>Update GSTIN</h2>{% endblock %}
 
 {% block page_content %}
-<h3>{{ party.name }}</h3>
-{% if invalid_gstin %}
+<h3>{{ party_name }}</h3>
+{% if not_found %}
+	<p class='alert alert-danger' style='max-width: 300px;'>
+		Company Not Found
+	</p>
+	<p>
+		If this problem persists, please contact the company.
+	</p>
+
+{% elif invalid_gstin %}
 	<p class='alert alert-danger' style='max-width: 300px;'>
 		Invalid GSTIN
 	</p>

erpnext/templates/pages/regional/india/update_gstin.py

@@ -4,6 +4,7 @@ from frappe import _
 def get_context(context):
 	context.no_cache = 1
 	party = frappe.form_dict.party
+	context.party_name = party
 
 	try:
 		update_gstin(context)
@@ -18,7 +19,8 @@ def get_context(context):
 		party_name = frappe.db.get_value('Supplier', party)
 
 	if not party_name:
-		frappe.throw(_("Not Found"), frappe.DoesNotExistError)
+		context.not_found = 1
+		return
 
 	context.party = frappe.get_doc(party_type, party_name)
 	context.party.onload()