Merge branch 'develop'
diff --git a/erpnext/__init__.py b/erpnext/__init__.py
index f3dda93..a14017d 100644
--- a/erpnext/__init__.py
+++ b/erpnext/__init__.py
@@ -2,7 +2,7 @@
from __future__ import unicode_literals
import frappe
-__version__ = '8.1.4'
+__version__ = '8.1.5'
def get_default_company(user=None):
diff --git a/erpnext/patches/v8_1/setup_gst_india.py b/erpnext/patches/v8_1/setup_gst_india.py
index 2b915d2..efdb9c5 100644
--- a/erpnext/patches/v8_1/setup_gst_india.py
+++ b/erpnext/patches/v8_1/setup_gst_india.py
@@ -2,6 +2,7 @@
from frappe.email import sendmail_to_system_managers
def execute():
+ frappe.reload_doc('regional', 'doctype', 'gst_settings')
frappe.reload_doc('regional', 'doctype', 'gst_hsn_code')
for report_name in ('GST Sales Register', 'GST Purchase Register',
@@ -30,5 +31,7 @@
ERPNext Team.
""".format(gst_document_link="<a href='http://frappe.github.io/erpnext/user/manual/en/regional/india/'> ERPNext GST Document </a>")
- sendmail_to_system_managers("[Important] ERPNext GST updates", message)
-
+ try:
+ sendmail_to_system_managers("[Important] ERPNext GST updates", message)
+ except Exception as e:
+ pass
\ No newline at end of file
diff --git a/erpnext/regional/doctype/gst_settings/gst_settings.json b/erpnext/regional/doctype/gst_settings/gst_settings.json
index b399a5e..61af138 100644
--- a/erpnext/regional/doctype/gst_settings/gst_settings.json
+++ b/erpnext/regional/doctype/gst_settings/gst_settings.json
@@ -83,7 +83,7 @@
"issingle": 1,
"istable": 0,
"max_attachments": 0,
- "modified": "2017-06-27 16:20:21.206397",
+ "modified": "2017-06-28 16:20:21.206397",
"modified_by": "Administrator",
"module": "Regional",
"name": "GST Settings",