nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-24 23:49:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor: renamed gross purchase amount to net purchase amount

Browse Source
This commit is contained in:
Khushi Rawat
2025-05-23 01:03:23 +05:30
committed by khushi8112
parent 3c70cbbaf8
commit 58eda49549
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
erpnext/assets/doctype/asset/asset.json
View File

@@ -31,7 +31,7 @@
"purchase_date", "purchase_date",
"available_for_use_date", "available_for_use_date",
"column_break_23", "column_break_23",
"gross_purchase_amount", "net_purchase_amount",
"purchase_amount", "purchase_amount",
"asset_quantity", "asset_quantity",
"additional_asset_cost", "additional_asset_cost",
@@ -226,13 +226,6 @@
"print_hide": 1, "print_hide": 1,
"read_only": 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", "fieldname": "available_for_use_date",
"fieldtype": "Date", "fieldtype": "Date",
@@ -558,6 +551,13 @@
"fieldname": "is_composite_component", "fieldname": "is_composite_component",
"fieldtype": "Check", "fieldtype": "Check",
"label": "Is Composite Component" "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, "idx": 72,
@@ -601,7 +601,7 @@
"link_fieldname": "target_asset" "link_fieldname": "target_asset"
} }
], ],
"modified": "2025-05-20 13:44:06.229177", "modified": "2025-05-23 00:53:54.249309",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Assets", "module": "Assets",
"name": "Asset", "name": "Asset",

2
erpnext/assets/doctype/asset/asset.py
View File

@@ -70,7 +70,6 @@ class Asset(AccountsController):
disposal_date: DF.Date | None disposal_date: DF.Date | None
finance_books: DF.Table[AssetFinanceBook] finance_books: DF.Table[AssetFinanceBook]
frequency_of_depreciation: DF.Int frequency_of_depreciation: DF.Int
gross_purchase_amount: DF.Currency
image: DF.AttachImage | None image: DF.AttachImage | None
insurance_end_date: DF.Date | None insurance_end_date: DF.Date | None
insurance_start_date: DF.Date | None insurance_start_date: DF.Date | None
@@ -86,6 +85,7 @@ class Asset(AccountsController):
location: DF.Link location: DF.Link
maintenance_required: DF.Check maintenance_required: DF.Check
naming_series: DF.Literal["ACC-ASS-.YYYY.-"] naming_series: DF.Literal["ACC-ASS-.YYYY.-"]
net_purchase_amount: DF.Currency
next_depreciation_date: DF.Date | None next_depreciation_date: DF.Date | None
opening_accumulated_depreciation: DF.Currency opening_accumulated_depreciation: DF.Currency
opening_number_of_booked_depreciations: DF.Int opening_number_of_booked_depreciations: DF.Int