Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

chore: additional_asset_cost field (backport #38904) (#38906)

Browse Source 
chore: additional_asset_cost field (#38904)

(cherry picked from commit 283763dfb2affa6a0b7bb29e19123c3e1fb27f30)

Co-authored-by: Anand Baburajan <anandbaburajan@gmail.com>
This commit is contained in:
mergify[bot] 2023-12-21 16:55:41 +05:30 committed by GitHub
parent eabb956aca
commit a99470e017
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -36,6 +36,7 @@
"purchase_invoice",
"available_for_use_date",
"total_asset_cost",
"additional_asset_cost",
"column_break_23",
"gross_purchase_amount",
"asset_quantity",
@ -538,6 +539,14 @@
"label": "Total Asset Cost",
"options": "Company:company:default_currency",
"read_only": 1
},
{
"depends_on": "eval:doc.docstatus > 0",
"fieldname": "additional_asset_cost",
"fieldtype": "Currency",
"label": "Additional Asset Cost",
"options": "Company:company:default_currency",
"read_only": 1
}
],
"idx": 72,
@ -581,7 +590,7 @@
"link_fieldname": "target_asset"
}
],
"modified": "2023-12-20 16:50:21.128595",
"modified": "2023-12-21 16:46:20.732869",
"modified_by": "Administrator",
"module": "Assets",
"name": "Asset",

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

@ -50,6 +50,7 @@ class Asset(AccountsController):
from erpnext.assets.doctype.asset_finance_book.asset_finance_book import AssetFinanceBook
additional_asset_cost: DF.Currency
amended_from: DF.Link | None
asset_category: DF.Link | None
asset_name: DF.Data
@ -145,6 +146,7 @@ class Asset(AccountsController):
).format(asset_depr_schedules_links)
)
self.total_asset_cost = self.gross_purchase_amount
self.status = self.get_status()
def on_submit(self):

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

@ -95,6 +95,7 @@ class AssetRepair(AccountsController):
if self.capitalize_repair_cost:
self.asset_doc.total_asset_cost += self.repair_cost
self.asset_doc.additional_asset_cost += self.repair_cost
if self.get("stock_consumption"):
self.check_for_stock_items_and_warehouse()
@ -133,6 +134,7 @@ class AssetRepair(AccountsController):
if self.capitalize_repair_cost:
self.asset_doc.total_asset_cost -= self.repair_cost
self.asset_doc.additional_asset_cost -= self.repair_cost
if self.get("stock_consumption"):
self.increase_stock_quantity()