Merge branch 'hotfix'
diff --git a/erpnext/__init__.py b/erpnext/__init__.py
index 3448dbc..8c387dd 100644
--- a/erpnext/__init__.py
+++ b/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):
diff --git a/erpnext/setup/setup_wizard/setup_wizard.py b/erpnext/setup/setup_wizard/setup_wizard.py
index 47e64d7..5c7697e 100644
--- a/erpnext/setup/setup_wizard/setup_wizard.py
+++ b/erpnext/setup/setup_wizard/setup_wizard.py
@@ -196,7 +196,7 @@
hr_settings.save()
domain_settings = frappe.get_doc("Domain Settings")
- domain_settings.append('active_domains', dict(domain=args.domain))
+ domain_settings.append('active_domains', dict(domain=_(args.domain)))
domain_settings.save()
def create_feed_and_todo():
diff --git a/erpnext/templates/pages/regional/india/update-gstin.html b/erpnext/templates/pages/regional/india/update-gstin.html
index 5c4f7ae..3d9ab5d 100644
--- a/erpnext/templates/pages/regional/india/update-gstin.html
+++ b/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>
diff --git a/erpnext/templates/pages/regional/india/update_gstin.py b/erpnext/templates/pages/regional/india/update_gstin.py
index 0d4ec37..643aafe 100644
--- a/erpnext/templates/pages/regional/india/update_gstin.py
+++ b/erpnext/templates/pages/regional/india/update_gstin.py
@@ -4,6 +4,7 @@
def get_context(context):
context.no_cache = 1
party = frappe.form_dict.party
+ context.party_name = party
try:
update_gstin(context)
@@ -11,16 +12,17 @@
context.invalid_gstin = 1
party_type = 'Customer'
- party = frappe.db.get_value('Customer', party)
+ party_name = frappe.db.get_value('Customer', party)
- if not party:
+ if not party_name:
party_type = 'Supplier'
- party = frappe.db.get_value('Supplier', party)
+ party_name = frappe.db.get_value('Supplier', party)
- if not party:
- frappe.throw(_("Not Found"), frappe.DoesNotExistError)
+ if not party_name:
+ context.not_found = 1
+ return
- context.party = frappe.get_doc(party_type, party)
+ context.party = frappe.get_doc(party_type, party_name)
context.party.onload()