From 90d6bb34dce3478b2efbb3cbd910d18621f4f896 Mon Sep 17 00:00:00 2001 From: Mihir Kandoi Date: Tue, 27 Jan 2026 14:38:19 +0530 Subject: [PATCH] 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 (