Merge branch 'develop'

frappe · Jul 13, 2017 · 777b16f · 777b16f
2 parents 012f5b0 + efaf9f5
commit 777b16f
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 3 deletions.
diff --git a/erpnext/__init__.py b/erpnext/__init__.py
@@ -2,7 +2,7 @@
 from __future__ import unicode_literals
 import frappe
 
-__version__ = '8.4.0'
+__version__ = '8.4.1'
 
 def get_default_company(user=None):
 	'''Get default company for user'''

diff --git a/erpnext/patches.txt b/erpnext/patches.txt
@@ -415,5 +415,5 @@ erpnext.patches.v8_1.gst_fixes #2017-07-06
 erpnext.patches.v8_0.update_production_orders
 erpnext.patches.v8_1.remove_sales_invoice_from_returned_serial_no
 erpnext.patches.v8_1.allow_invoice_copy_to_edit_after_submit
-erpnext.patches.v8_1.update_gst_state
-erpnext.patches.v8_1.add_hsn_sac_codes
+erpnext.patches.v8_1.add_hsn_sac_codes
+erpnext.patches.v8_1.update_gst_state
diff --git a/erpnext/patches/v8_1/update_gst_state.py b/erpnext/patches/v8_1/update_gst_state.py
@@ -2,5 +2,12 @@
 from erpnext.regional.india import states
 
 def execute():
+	company = frappe.get_all('Company', filters = {'country': 'India'})
+	if not company:
+		return
+
+	if not frappe.db.get_value("Custom Field", filters={'fieldname':'gst_state'}):
+		return
+
 	frappe.db.sql("update `tabCustom Field` set options=%s where fieldname='gst_state'", '\n'.join(states))
 	frappe.db.sql("update `tabAddress` set gst_state='Chhattisgarh' where gst_state='Chattisgarh'")