nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-08-29 22:58:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: resolving conflicts

Browse Source
This commit is contained in:
Shllokkk
2026-08-29 13:03:59 +05:30
committed by GitHub
parent c2261f6129
commit c6082617ec
1 changed files with 0 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
erpnext/crm/utils.py
View File

@@ -255,14 +255,10 @@ class CRMNote(Document):
notify_mentions(self.doctype, self.name, note)
@frappe.whitelist()
<<<<<<< HEAD
def edit_note(self, note, row_id):
=======
def edit_note(self, note: str, row_id: str):
# db_update() skips the write check that save() does in add_note/delete_note
self.check_permission("write")
>>>>>>> eb49f51 (fix(crm): check write permission in edit_note)
for d in self.notes:
if cstr(d.name) == row_id:
d.note = note