Merge branch 'main' into main-hotfix
This commit is contained in:
commit
c1203d465a
@ -1,4 +1,4 @@
|
|||||||
|
|
||||||
__version__ = "1.40.0"
|
__version__ = "1.48.2"
|
||||||
__title__ = "Frappe CRM"
|
__title__ = "Frappe CRM"
|
||||||
|
|
||||||
|
|||||||
@ -1,5 +1,6 @@
|
|||||||
import frappe
|
import frappe
|
||||||
from bs4 import BeautifulSoup
|
from bs4 import BeautifulSoup
|
||||||
|
from frappe.config import get_modules_from_all_apps_for_user
|
||||||
from frappe.core.api.file import get_max_file_size
|
from frappe.core.api.file import get_max_file_size
|
||||||
from frappe.translate import get_all_translations
|
from frappe.translate import get_all_translations
|
||||||
from frappe.utils import cstr, split_emails, validate_email_address
|
from frappe.utils import cstr, split_emails, validate_email_address
|
||||||
@ -63,10 +64,10 @@ def check_app_permission():
|
|||||||
if frappe.session.user == "Administrator":
|
if frappe.session.user == "Administrator":
|
||||||
return True
|
return True
|
||||||
|
|
||||||
# allowed_modules = frappe.utils.modules.get_modules_from_all_apps_for_user()
|
allowed_modules = get_modules_from_all_apps_for_user()
|
||||||
# allowed_modules = [x["module_name"] for x in allowed_modules]
|
allowed_modules = [x["module_name"] for x in allowed_modules]
|
||||||
# if "FCRM" not in allowed_modules:
|
if "FCRM" not in allowed_modules:
|
||||||
# return False
|
return False
|
||||||
|
|
||||||
roles = frappe.get_roles()
|
roles = frappe.get_roles()
|
||||||
if any(
|
if any(
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user