From 0c89cd55248a7d9bab6750375fb6ae7c9a4e339c Mon Sep 17 00:00:00 2001
From: Mihir Kandoi <kandoimihir@gmail.com>
Date: Tue, 27 Jan 2026 11:07:52 +0530
Subject: [PATCH 1/2] fix: show message if image is removed from item
 description

(cherry picked from commit b49c679a508f70a3c4ade05f4c7e618e6546b7a8)

# Conflicts:
#	erpnext/stock/doctype/item/item.py
---
 erpnext/stock/doctype/item/item.py | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/erpnext/stock/doctype/item/item.py b/erpnext/stock/doctype/item/item.py
index fdaaa23c5af..bbcab3ca922 100644
--- a/erpnext/stock/doctype/item/item.py
+++ b/erpnext/stock/doctype/item/item.py
@@ -227,9 +227,33 @@ class Item(Document):
 
 	def validate_description(self):
 		"""Clean HTML description if set"""
+<<<<<<< HEAD
 		if cint(frappe.db.get_single_value("Stock Settings", "clean_description_html")):
+=======
+		if (
+			cint(frappe.get_single_value("Stock Settings", "clean_description_html"))
+			and self.description != self.item_name  # perf: Avoid cleaning up a fallback
+		):
+			old_desc = self.description
+>>>>>>> b49c679a50 (fix: show message if image is removed from item description)
 			self.description = clean_html(self.description)
 
+			if (
+				old_desc
+				and self.description
+				and "<img src" in old_desc
+				and "<img src" not in self.description
+			):
+				frappe.msgprint(
+					_(
+						'Image in the description has been removed. To disable this behavior, uncheck "{0}" in {1}.'
+					).format(
+						frappe.get_meta("Stock Settings").get_label("clean_description_html"),
+						get_link_to_form("Stock Settings"),
+					),
+					alert=True,
+				)
+
 	def validate_customer_provided_part(self):
 		if self.is_customer_provided_item:
 			if self.is_purchase_item:

From 90d6bb34dce3478b2efbb3cbd910d18621f4f896 Mon Sep 17 00:00:00 2001
From: Mihir Kandoi <kandoimihir@gmail.com>
Date: Tue, 27 Jan 2026 14:38:19 +0530
Subject: [PATCH 2/2] chore: resolve conflicts

---
 erpnext/stock/doctype/item/item.py | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/erpnext/stock/doctype/item/item.py b/erpnext/stock/doctype/item/item.py
index bbcab3ca922..2f98aff00f2 100644
--- a/erpnext/stock/doctype/item/item.py
+++ b/erpnext/stock/doctype/item/item.py
@@ -227,15 +227,8 @@ class Item(Document):
 
 	def validate_description(self):
 		"""Clean HTML description if set"""
-<<<<<<< HEAD
 		if cint(frappe.db.get_single_value("Stock Settings", "clean_description_html")):
-=======
-		if (
-			cint(frappe.get_single_value("Stock Settings", "clean_description_html"))
-			and self.description != self.item_name  # perf: Avoid cleaning up a fallback
-		):
 			old_desc = self.description
->>>>>>> b49c679a50 (fix: show message if image is removed from item description)
 			self.description = clean_html(self.description)
 
 			if (