From 546bec984fef29e1e0f733bd43676bc9cc988981 Mon Sep 17 00:00:00 2001 From: Shankarv19bcr Date: Sat, 1 Mar 2025 20:52:45 +0530 Subject: [PATCH 1/2] fix: ignore current document in default SLA validation --- .../crm_service_level_agreement/crm_service_level_agreement.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crm/fcrm/doctype/crm_service_level_agreement/crm_service_level_agreement.py b/crm/fcrm/doctype/crm_service_level_agreement/crm_service_level_agreement.py index d8f3f669..1cae4aa6 100644 --- a/crm/fcrm/doctype/crm_service_level_agreement/crm_service_level_agreement.py +++ b/crm/fcrm/doctype/crm_service_level_agreement/crm_service_level_agreement.py @@ -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: From 7a99e80ccf43306dbb3a85a071bff0db41b192d6 Mon Sep 17 00:00:00 2001 From: Shariq Ansari Date: Sun, 2 Mar 2025 14:05:40 +0530 Subject: [PATCH 2/2] fix: allow sales user & manager to crud crm global settings --- .../crm_global_settings.json | 26 ++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-) diff --git a/crm/fcrm/doctype/crm_global_settings/crm_global_settings.json b/crm/fcrm/doctype/crm_global_settings/crm_global_settings.json index 9214f829..ce29f4dc 100644 --- a/crm/fcrm/doctype/crm_global_settings/crm_global_settings.json +++ b/crm/fcrm/doctype/crm_global_settings/crm_global_settings.json @@ -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",