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

Revert "fix: Raise exception if apps are on incompatible branches"

Browse Source
This commit is contained in:
Rushabh Mehta 2019-04-08 17:10:56 +05:30 committed by GitHub
parent b0c939d280
commit 1412a681f3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 1 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
erpnext/__init__.py
View File

@ -145,14 +145,3 @@ def is_member():
if last_membership and getdate(last_membership.to_date) > getdate(): if last_membership and getdate(last_membership.to_date) > getdate():
return True return True
return False return False
def check_branch_compatibility_with_frappe():
from frappe.utils.change_log import get_versions
versions = get_versions()
frappe_branch = versions["frappe"]["branch"]
erpnext_branch = versions["erpnext"]["branch"]
if frappe_branch in ("hotfix", "master") and erpnext_branch == "develop":
raise frappe.IncompatibleApp("Frappe is on branch: {} and ERPNext is on branch: {}".format(frappe_branch, erpnext_branch))
if erpnext_branch in ("hotfix", "master") and frappe_branch == "develop":
raise frappe.IncompatibleApp("Frappe is on branch: {} and ERPNext is on branch: {}".format(frappe_branch, erpnext_branch))

2
erpnext/hooks.py
View File

@ -27,8 +27,6 @@ doctype_js = {
welcome_email = "erpnext.setup.utils.welcome_email" welcome_email = "erpnext.setup.utils.welcome_email"
connect = "erpnext.check_branch_compatibility_with_frappe"
# setup wizard # setup wizard
setup_wizard_requires = "assets/erpnext/js/setup_wizard.js" setup_wizard_requires = "assets/erpnext/js/setup_wizard.js"
setup_wizard_stages = "erpnext.setup.setup_wizard.setup_wizard.get_setup_stages" setup_wizard_stages = "erpnext.setup.setup_wizard.setup_wizard.get_setup_stages"