test/crm
1
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

chore: resolved conflict

Browse Source
This commit is contained in:
Shariq Ansari 2025-06-23 13:27:15 +05:30 committed by GitHub
parent f0b295a907
commit d9555f62f8
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
crm/api/__init__.py
View File

@ -98,15 +98,11 @@ def accept_invitation(key: str | None = None):
@frappe.whitelist() @frappe.whitelist()
def invite_by_email(emails: str, role: str): def invite_by_email(emails: str, role: str):
<<<<<<< HEAD
frappe.only_for("Sales Manager")
=======
frappe.only_for(["Sales Manager", "System Manager"]) frappe.only_for(["Sales Manager", "System Manager"])
if role not in ["System Manager", "Sales Manager", "Sales User"]: if role not in ["System Manager", "Sales Manager", "Sales User"]:
frappe.throw("Cannot invite for this role") frappe.throw("Cannot invite for this role")
>>>>>>> 03abe0b5 (fix: create crm user on accepting invite)
if not emails: if not emails:
return return
email_string = validate_email_address(emails, throw=False) email_string = validate_email_address(emails, throw=False)