Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'develop'

Browse Source
This commit is contained in:
mbauskar 2017-06-28 11:01:40 +05:30
commit 4d5d3b7685
3 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/__init__.py
View File

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

7
erpnext/patches/v8_1/setup_gst_india.py
View File

@ -2,6 +2,7 @@ import frappe
from frappe.email import sendmail_to_system_managers from frappe.email import sendmail_to_system_managers
def execute(): def execute():
frappe.reload_doc('regional', 'doctype', 'gst_settings')
frappe.reload_doc('regional', 'doctype', 'gst_hsn_code') frappe.reload_doc('regional', 'doctype', 'gst_hsn_code')
for report_name in ('GST Sales Register', 'GST Purchase Register', for report_name in ('GST Sales Register', 'GST Purchase Register',
@ -30,5 +31,7 @@ Templates and update your Customer's and Supplier's GST Numbers.</p>
ERPNext Team. ERPNext Team.
""".format(gst_document_link="<a href='http://frappe.github.io/erpnext/user/manual/en/regional/india/'> ERPNext GST Document </a>") """.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

2
erpnext/regional/doctype/gst_settings/gst_settings.json
View File

@ -83,7 +83,7 @@
"issingle": 1, "issingle": 1,
"istable": 0, "istable": 0,
"max_attachments": 0, "max_attachments": 0,
"modified": "2017-06-27 16:20:21.206397", "modified": "2017-06-28 16:20:21.206397",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Regional", "module": "Regional",
"name": "GST Settings", "name": "GST Settings",