test/jcrm
1
0
Fork 0
forked from test/crm
Code Pull Requests Activity

Merge pull request #625 from frappe/develop

Browse Source 
chore: Merge develop to main
This commit is contained in:
Shariq Ansari 2025-03-02 14:06:44 +05:30 committed by GitHub
commit 1f868feb08
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 26 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
crm/fcrm/doctype/crm_global_settings/crm_global_settings.json
View File

@ -47,7 +47,7 @@
"grid_page_length": 50,
"index_web_pages_for_search": 1,
"links": [],
"modified": "2025-02-28 14:55:33.801215",
"modified": "2025-03-02 14:03:49.372132",
"modified_by": "Administrator",
"module": "FCRM",
"name": "CRM Global Settings",
@ -65,6 +65,30 @@
"role": "System Manager",
"share": 1,
"write": 1
},
{
"create": 1,
"delete": 1,
"email": 1,
"export": 1,
"print": 1,
"read": 1,
"report": 1,
"role": "Sales User",
"share": 1,
"write": 1
},
{
"create": 1,
"delete": 1,
"email": 1,
"export": 1,
"print": 1,
"read": 1,
"report": 1,
"role": "Sales Manager",
"share": 1,
"write": 1
}
],
"row_format": "Dynamic",

2
crm/fcrm/doctype/crm_service_level_agreement/crm_service_level_agreement.py
View File

@ -25,7 +25,7 @@ class CRMServiceLevelAgreement(Document):
if self.default:
other_slas = frappe.get_all(
"CRM Service Level Agreement",
filters={"apply_on": self.apply_on, "default": True},
filters={"apply_on": self.apply_on, "default": True, "name": ["!=", self.name]},
fields=["name"],
)
if other_slas: