nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-04-28 11:08:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: conflicts

Browse Source
This commit is contained in:
Khushi Rawat
2025-12-04 12:48:07 +05:30
committed by GitHub
parent fd6e42e15e
commit 1427b4ac3f
1 changed files with 0 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -307,14 +307,8 @@ class Item(Document):
if self.stock_ledger_created(): if self.stock_ledger_created():
frappe.throw(_("Cannot be a fixed asset item as Stock Ledger is 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 not self.is_fixed_asset and not self.is_new():
if self.has_submitted_assets(): if self.has_submitted_assets():
>>>>>>> 70521fb9bf (fix: remove set_only_once from is_fixed_asset)
frappe.throw( frappe.throw(
_('"Is Fixed Asset" cannot be unchecked, as Asset record exists against the item') _('"Is Fixed Asset" cannot be unchecked, as Asset record exists against the item')
) )