diff --git a/erpnext/assets/doctype/asset/asset.json b/erpnext/assets/doctype/asset/asset.json index e28eab9ed13..2683cf7ca96 100644 --- a/erpnext/assets/doctype/asset/asset.json +++ b/erpnext/assets/doctype/asset/asset.json @@ -541,17 +541,51 @@ }, { "fieldname": "purchase_receipt_item", - "fieldtype": "Link", + "fieldtype": "Data", "hidden": 1, - "label": "Purchase Receipt Item", - "options": "Purchase Receipt Item" + "label": "Purchase Receipt Item" }, { "fieldname": "purchase_invoice_item", - "fieldtype": "Link", + "fieldtype": "Data", "hidden": 1, +<<<<<<< HEAD "label": "Purchase Invoice Item", "options": "Purchase Invoice Item" +======= + "label": "Purchase Invoice Item" + }, + { + "fieldname": "insurance_details_tab", + "fieldtype": "Tab Break", + "label": "Insurance" + }, + { + "fieldname": "other_info_tab", + "fieldtype": "Tab Break", + "label": "Other Info" + }, + { + "fieldname": "connections_tab", + "fieldtype": "Tab Break", + "label": "Connections", + "show_dashboard": 1 + }, + { + "fieldname": "depreciation_tab", + "fieldtype": "Tab Break", + "label": "Depreciation" + }, + { + "fieldname": "accounting_dimensions_section", + "fieldtype": "Section Break", + "label": "Accounting Dimensions" + }, + { + "fieldname": "section_break_jtou", + "fieldtype": "Section Break", + "label": "Additional Info" +>>>>>>> 8af9dcb33e (fix: make purchase_receipt_item and purchase_invoice_item fields of data type) } ], "idx": 72, @@ -595,7 +629,7 @@ "link_fieldname": "target_asset" } ], - "modified": "2024-12-26 14:23:20.968882", + "modified": "2025-02-11 16:01:56.140904", "modified_by": "Administrator", "module": "Assets", "name": "Asset", diff --git a/erpnext/assets/doctype/asset/asset.py b/erpnext/assets/doctype/asset/asset.py index 994f36ae1f2..20cc65e8e5d 100644 --- a/erpnext/assets/doctype/asset/asset.py +++ b/erpnext/assets/doctype/asset/asset.py @@ -95,9 +95,9 @@ class Asset(AccountsController): purchase_amount: DF.Currency purchase_date: DF.Date | None purchase_invoice: DF.Link | None - purchase_invoice_item: DF.Link | None + purchase_invoice_item: DF.Data | None purchase_receipt: DF.Link | None - purchase_receipt_item: DF.Link | None + purchase_receipt_item: DF.Data | None split_from: DF.Link | None status: DF.Literal[ "Draft",