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

Patch fixes (#15295)

Browse Source 
* patch fixes

* [Fix] disable shopify if any exception occured while
This commit is contained in:
Saurabh 2018-09-03 10:44:40 +05:30 committed by Nabin Hait
parent 02257449d9
commit 0754ece288
2 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
erpnext/patches/v10_0/added_extra_gst_custom_field.py
View File

@ -6,4 +6,7 @@ def execute():
if not company: if not company:
return 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) make_custom_fields(update=False)

16
erpnext/patches/v11_0/refactor_erpnext_shopify.py
View File

@ -21,9 +21,13 @@ def execute():
setup_app_type() setup_app_type()
def setup_app_type(): def setup_app_type():
shopify_settings = frappe.get_doc("Shopify Settings") try:
shopify_settings.app_type = 'Private' shopify_settings = frappe.get_doc("Shopify Settings")
shopify_settings.update_price_in_erpnext_price_list = 0 if getattr(shopify_settings, 'push_prices_to_shopify', None) else 1 shopify_settings.app_type = 'Private'
shopify_settings.flags.ignore_mandatory = True shopify_settings.update_price_in_erpnext_price_list = 0 if getattr(shopify_settings, 'push_prices_to_shopify', None) else 1
shopify_settings.ignore_permissions = True shopify_settings.flags.ignore_mandatory = True
shopify_settings.save() 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())