Merge branch 'staging' into develop
diff --git a/erpnext/accounts/doctype/account/account.json b/erpnext/accounts/doctype/account/account.json
index 5bb55ec..5a0be5e 100644
--- a/erpnext/accounts/doctype/account/account.json
+++ b/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",
diff --git a/erpnext/patches/v10_0/added_extra_gst_custom_field.py b/erpnext/patches/v10_0/added_extra_gst_custom_field.py
index 98b1820..000e8fd 100644
--- a/erpnext/patches/v10_0/added_extra_gst_custom_field.py
+++ b/erpnext/patches/v10_0/added_extra_gst_custom_field.py
@@ -6,4 +6,7 @@
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)
\ No newline at end of file
diff --git a/erpnext/patches/v11_0/create_department_records_for_each_company.py b/erpnext/patches/v11_0/create_department_records_for_each_company.py
index da97476..c03cf98 100644
--- a/erpnext/patches/v11_0/create_department_records_for_each_company.py
+++ b/erpnext/patches/v11_0/create_department_records_for_each_company.py
@@ -3,6 +3,8 @@
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 @@
update_instructors(comp_dict)
+ frappe.local.lang = 'en'
+
def update_records(doctype, comp_dict):
when_then = []
for company in comp_dict:
diff --git a/erpnext/patches/v11_0/refactor_erpnext_shopify.py b/erpnext/patches/v11_0/refactor_erpnext_shopify.py
index d31afe5..68a37d5 100644
--- a/erpnext/patches/v11_0/refactor_erpnext_shopify.py
+++ b/erpnext/patches/v11_0/refactor_erpnext_shopify.py
@@ -21,9 +21,13 @@
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())
\ No newline at end of file
diff --git a/erpnext/patches/v11_0/update_department_lft_rgt.py b/erpnext/patches/v11_0/update_department_lft_rgt.py
index 0cb9aec..5a8837e 100644
--- a/erpnext/patches/v11_0/update_department_lft_rgt.py
+++ b/erpnext/patches/v11_0/update_department_lft_rgt.py
@@ -10,7 +10,7 @@
'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')))