nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-08-20 09:49:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: resolve item attribute backport conflict

Browse Source
This commit is contained in:
Mihir Kandoi
2026-06-18 22:38:23 +05:30
parent 0e244dd83a
commit d3c0d9b283
1 changed files with 0 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
erpnext/stock/doctype/item_attribute/item_attribute.py
View File

@@ -8,11 +8,8 @@ from frappe.model.document import Document
from frappe.utils import flt
from erpnext.controllers.item_variant import (
<<<<<<< HEAD
=======
InvalidItemAttributeValueError,
update_variant_attribute_values,
>>>>>>> 27d574dad5 (fix(stock): propagate renamed attribute values to variant items)
validate_is_incremental,
validate_item_attribute_value,
)