diff --git a/erpnext/assets/doctype/asset/asset.json b/erpnext/assets/doctype/asset/asset.json index 253412de3b5..0733f29670a 100644 --- a/erpnext/assets/doctype/asset/asset.json +++ b/erpnext/assets/doctype/asset/asset.json @@ -31,7 +31,7 @@ "purchase_date", "available_for_use_date", "column_break_23", - "gross_purchase_amount", + "net_purchase_amount", "purchase_amount", "asset_quantity", "additional_asset_cost", @@ -226,13 +226,6 @@ "print_hide": 1, "read_only": 1 }, - { - "fieldname": "gross_purchase_amount", - "fieldtype": "Currency", - "label": "Net Purchase Amount", - "mandatory_depends_on": "eval:(!doc.is_composite_asset || doc.docstatus==1)", - "options": "Company:company:default_currency" - }, { "fieldname": "available_for_use_date", "fieldtype": "Date", @@ -558,6 +551,13 @@ "fieldname": "is_composite_component", "fieldtype": "Check", "label": "Is Composite Component" + }, + { + "fieldname": "net_purchase_amount", + "fieldtype": "Currency", + "label": "Net Purchase Amount", + "mandatory_depends_on": "eval:(!doc.is_composite_asset || doc.docstatus==1)", + "options": "Company:company:default_currency" } ], "idx": 72, @@ -601,7 +601,7 @@ "link_fieldname": "target_asset" } ], - "modified": "2025-05-20 13:44:06.229177", + "modified": "2025-05-23 00:53:54.249309", "modified_by": "Administrator", "module": "Assets", "name": "Asset", diff --git a/erpnext/assets/doctype/asset/asset.py b/erpnext/assets/doctype/asset/asset.py index 981970add04..d4f32c86223 100644 --- a/erpnext/assets/doctype/asset/asset.py +++ b/erpnext/assets/doctype/asset/asset.py @@ -70,7 +70,6 @@ class Asset(AccountsController): disposal_date: DF.Date | None finance_books: DF.Table[AssetFinanceBook] frequency_of_depreciation: DF.Int - gross_purchase_amount: DF.Currency image: DF.AttachImage | None insurance_end_date: DF.Date | None insurance_start_date: DF.Date | None @@ -86,6 +85,7 @@ class Asset(AccountsController): location: DF.Link maintenance_required: DF.Check naming_series: DF.Literal["ACC-ASS-.YYYY.-"] + net_purchase_amount: DF.Currency next_depreciation_date: DF.Date | None opening_accumulated_depreciation: DF.Currency opening_number_of_booked_depreciations: DF.Int