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 "