Merge pull request #625 from frappe/develop
chore: Merge develop to main
This commit is contained in:
commit
1f868feb08
@ -47,7 +47,7 @@
|
|||||||
"grid_page_length": 50,
|
"grid_page_length": 50,
|
||||||
"index_web_pages_for_search": 1,
|
"index_web_pages_for_search": 1,
|
||||||
"links": [],
|
"links": [],
|
||||||
"modified": "2025-02-28 14:55:33.801215",
|
"modified": "2025-03-02 14:03:49.372132",
|
||||||
"modified_by": "Administrator",
|
"modified_by": "Administrator",
|
||||||
"module": "FCRM",
|
"module": "FCRM",
|
||||||
"name": "CRM Global Settings",
|
"name": "CRM Global Settings",
|
||||||
@ -65,6 +65,30 @@
|
|||||||
"role": "System Manager",
|
"role": "System Manager",
|
||||||
"share": 1,
|
"share": 1,
|
||||||
"write": 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",
|
"row_format": "Dynamic",
|
||||||
|
|||||||
@ -25,7 +25,7 @@ class CRMServiceLevelAgreement(Document):
|
|||||||
if self.default:
|
if self.default:
|
||||||
other_slas = frappe.get_all(
|
other_slas = frappe.get_all(
|
||||||
"CRM Service Level Agreement",
|
"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"],
|
fields=["name"],
|
||||||
)
|
)
|
||||||
if other_slas:
|
if other_slas:
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user