nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-15 11:09:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: resolve conflicts

Browse Source
This commit is contained in:
Mihir Kandoi
2026-01-27 14:38:19 +05:30
committed by GitHub
parent 0c89cd5524
commit 90d6bb34dc
1 changed files with 0 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
erpnext/stock/doctype/item/item.py
View File

@@ -227,15 +227,8 @@ class Item(Document):
def validate_description(self): def validate_description(self):
"""Clean HTML description if set""" """Clean HTML description if set"""
<<<<<<< HEAD
if cint(frappe.db.get_single_value("Stock Settings", "clean_description_html")): 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 old_desc = self.description
>>>>>>> b49c679a50 (fix: show message if image is removed from item description)
self.description = clean_html(self.description) self.description = clean_html(self.description)
if ( if (