From 1412a681f3747909ded4b406755955defa19c42d Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Mon, 8 Apr 2019 17:10:56 +0530 Subject: [PATCH] Revert "fix: Raise exception if apps are on incompatible branches" --- erpnext/__init__.py | 13 +------------ erpnext/hooks.py | 2 -- 2 files changed, 1 insertion(+), 14 deletions(-) diff --git a/erpnext/__init__.py b/erpnext/__init__.py index 21abfaf360..993a4e6038 100644 --- a/erpnext/__init__.py +++ b/erpnext/__init__.py @@ -144,15 +144,4 @@ def is_member(): last_membership = get_last_membership() if last_membership and getdate(last_membership.to_date) > getdate(): return True - 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)) + return False \ No newline at end of file diff --git a/erpnext/hooks.py b/erpnext/hooks.py index dbb5aff3d9..ccdd412c18 100644 --- a/erpnext/hooks.py +++ b/erpnext/hooks.py @@ -27,8 +27,6 @@ doctype_js = { welcome_email = "erpnext.setup.utils.welcome_email" -connect = "erpnext.check_branch_compatibility_with_frappe" - # setup wizard setup_wizard_requires = "assets/erpnext/js/setup_wizard.js" setup_wizard_stages = "erpnext.setup.setup_wizard.setup_wizard.get_setup_stages"