From 1427b4ac3f6c49feebda25727d8ed8e3c60d3bf2 Mon Sep 17 00:00:00 2001 From: Khushi Rawat <142375893+khushi8112@users.noreply.github.com> Date: Thu, 4 Dec 2025 12:48:07 +0530 Subject: [PATCH] fix: conflicts --- erpnext/stock/doctype/item/item.py | 6 ------ 1 file changed, 6 deletions(-) diff --git a/erpnext/stock/doctype/item/item.py b/erpnext/stock/doctype/item/item.py index fe5cc4f69ef..fdaaa23c5af 100644 --- a/erpnext/stock/doctype/item/item.py +++ b/erpnext/stock/doctype/item/item.py @@ -307,14 +307,8 @@ class Item(Document): if self.stock_ledger_created(): frappe.throw(_("Cannot be a fixed asset item as Stock Ledger is created.")) -<<<<<<< HEAD - if not self.is_fixed_asset: - asset = frappe.db.get_all("Asset", filters={"item_code": self.name, "docstatus": 1}, limit=1) - if asset: -======= if not self.is_fixed_asset and not self.is_new(): if self.has_submitted_assets(): ->>>>>>> 70521fb9bf (fix: remove set_only_once from is_fixed_asset) frappe.throw( _('"Is Fixed Asset" cannot be unchecked, as Asset record exists against the item') )