Merge branch 'staging' into develop

erpnext/accounts/doctype/account/account.json

@@ -625,7 +625,7 @@
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2018-07-08 09:47:04.287841", 
+ "modified": "2018-09-05 09:47:04.287841", 
  "modified_by": "Administrator", 
  "module": "Accounts", 
  "name": "Account", 

erpnext/patches/v10_0/added_extra_gst_custom_field.py

@@ -6,4 +6,7 @@ def execute():
 	if not company:
 		return
 
+	frappe.reload_doc("hr", "doctype", "Employee Tax Exemption Declaration")
+	frappe.reload_doc("hr", "doctype", "Employee Tax Exemption Proof Submission")
+
 	make_custom_fields(update=False)

erpnext/patches/v11_0/create_department_records_for_each_company.py

@@ -3,6 +3,8 @@ from frappe import _
 from frappe.utils.nestedset import rebuild_tree
 
 def execute():
+	frappe.local.lang = frappe.db.get_default("lang") or 'en'
+
 	for doctype in ['department', 'leave_period', 'staffing_plan', 'job_opening', 'payroll_entry']:
 		frappe.reload_doc("hr", "doctype", doctype)
 
@@ -37,6 +39,8 @@ def execute():
 
 	update_instructors(comp_dict)
 
+	frappe.local.lang = 'en'
+
 def update_records(doctype, comp_dict):
 	when_then = []
 	for company in comp_dict:

erpnext/patches/v11_0/refactor_erpnext_shopify.py

@@ -21,9 +21,13 @@ def execute():
 		setup_app_type()
 
 def setup_app_type():
-	shopify_settings = frappe.get_doc("Shopify Settings")
-	shopify_settings.app_type = 'Private'
-	shopify_settings.update_price_in_erpnext_price_list =  0 if getattr(shopify_settings, 'push_prices_to_shopify', None) else 1
-	shopify_settings.flags.ignore_mandatory = True
-	shopify_settings.ignore_permissions = True
-	shopify_settings.save()
+	try:
+		shopify_settings = frappe.get_doc("Shopify Settings")
+		shopify_settings.app_type = 'Private'
+		shopify_settings.update_price_in_erpnext_price_list =  0 if getattr(shopify_settings, 'push_prices_to_shopify', None) else 1
+		shopify_settings.flags.ignore_mandatory = True
+		shopify_settings.ignore_permissions = True
+		shopify_settings.save()
+	except Exception:
+		frappe.db.set_value("Shopify Shopify", None, "enable_shopify", 0)
+		frappe.log_error(frappe.get_traceback())

erpnext/patches/v11_0/update_department_lft_rgt.py

@@ -10,7 +10,7 @@ def execute():
 			'doctype': 'Department',
 			'department_name': _('All Departments'),
 			'is_group': 1
-		}).insert(ignore_permissions=True)
+		}).insert(ignore_permissions=True, ignore_mandatory=True)
 
 	frappe.db.sql("""update `tabDepartment` set parent_department = '{0}'
 		where is_group = 0""".format(_('All Departments')))