From fc103250749575854609a4d959e05a82de416e02 Mon Sep 17 00:00:00 2001
From: Raffael Meyer <14891507+barredterra@users.noreply.github.com>
Date: Mon, 24 Apr 2023 15:21:42 +0200
Subject: [PATCH] fix: improve delete_contact_and_address (#20381)

---
 frappe/contacts/address_and_contact.py | 24 ++++++++++++++++--------
 1 file changed, 16 insertions(+), 8 deletions(-)

diff --git a/frappe/contacts/address_and_contact.py b/frappe/contacts/address_and_contact.py
index 4df32c6705..1d3a5d644c 100644
--- a/frappe/contacts/address_and_contact.py
+++ b/frappe/contacts/address_and_contact.py
@@ -149,18 +149,26 @@ def get_permitted_and_not_permitted_links(doctype):
 	return {"permitted_links": permitted_links, "not_permitted_links": not_permitted_links}
 
 
-def delete_contact_and_address(doctype, docname):
+def delete_contact_and_address(doctype: str, docname: str) -> None:
 	for parenttype in ("Contact", "Address"):
-		items = frappe.db.sql_list(
-			"""select parent from `tabDynamic Link`
-			where parenttype=%s and link_doctype=%s and link_name=%s""",
-			(parenttype, doctype, docname),
-		)
-
-		for name in items:
+		for name in frappe.get_all(
+			"Dynamic Link",
+			filters={
+				"parenttype": parenttype,
+				"link_doctype": doctype,
+				"link_name": docname,
+			},
+			pluck="parent",
+		):
 			doc = frappe.get_doc(parenttype, name)
 			if len(doc.links) == 1:
 				doc.delete()
+			else:
+				for link in doc.links:
+					if link.link_doctype == doctype and link.link_name == docname:
+						doc.remove(link)
+						doc.save()
+						break
 
 
 @frappe.whitelist()