nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-27 08:54:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #50211 from frappe/mergify/bp/version-15-hotfix/pr-50209

Browse Source 
fix: set status to Draft for auto-created assets from Purchase Receipt (backport #50209)
This commit is contained in:
Khushi Rawat
2025-10-23 23:33:42 +05:30
committed by GitHub
parent 977464e6a7 ee5e4eccec
commit c6c4e31b32
5 changed files with 22 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -518,6 +518,7 @@
"read_only": 1 "read_only": 1
}, },
{ {
"default": "0",
"depends_on": "eval:doc.docstatus > 0", "depends_on": "eval:doc.docstatus > 0",
"fieldname": "additional_asset_cost", "fieldname": "additional_asset_cost",
"fieldtype": "Currency", "fieldtype": "Currency",
@@ -596,7 +597,7 @@
"link_fieldname": "target_asset" "link_fieldname": "target_asset"
} }
], ],
"modified": "2025-05-20 00:44:06.229177", "modified": "2025-10-23 22:43:33.634452",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Assets", "module": "Assets",
"name": "Asset", "name": "Asset",
@@ -641,4 +642,4 @@
"states": [], "states": [],
"title_field": "asset_name", "title_field": "asset_name",
"track_changes": 1 "track_changes": 1
} }

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

@@ -69,6 +69,7 @@ class Asset(AccountsController):
default_finance_book: DF.Link | None default_finance_book: DF.Link | None
department: DF.Link | None department: DF.Link | None
depr_entry_posting_status: DF.Literal["", "Successful", "Failed"] depr_entry_posting_status: DF.Literal["", "Successful", "Failed"]
depreciation_completed: DF.Check
depreciation_method: DF.Literal["", "Straight Line", "Double Declining Balance", "Manual"] depreciation_method: DF.Literal["", "Straight Line", "Double Declining Balance", "Manual"]
disposal_date: DF.Date | None disposal_date: DF.Date | None
finance_books: DF.Table[AssetFinanceBook] finance_books: DF.Table[AssetFinanceBook]
@@ -152,7 +153,9 @@ class Asset(AccountsController):
) )
self.validate_expected_value_after_useful_life() self.validate_expected_value_after_useful_life()
self.set_total_booked_depreciations() self.set_total_booked_depreciations()
self.total_asset_cost = self.gross_purchase_amount
def before_save(self):
self.total_asset_cost = self.gross_purchase_amount + self.additional_asset_cost
self.status = self.get_status() self.status = self.get_status()
def on_submit(self): def on_submit(self):

1
erpnext/controllers/buying_controller.py
View File

@@ -878,6 +878,7 @@ class BuyingController(SubcontractingController):
"asset_category": item_data.get("asset_category"), "asset_category": item_data.get("asset_category"),
"location": row.asset_location, "location": row.asset_location,
"company": self.company, "company": self.company,
"status": "Draft",
"supplier": self.supplier, "supplier": self.supplier,
"purchase_date": self.posting_date, "purchase_date": self.posting_date,
"calculate_depreciation": 0, "calculate_depreciation": 0,

1
erpnext/patches.txt
View File

@@ -422,3 +422,4 @@ execute:frappe.db.set_single_value("Accounts Settings", "fetch_valuation_rate_fo
erpnext.patches.v15_0.add_company_payment_gateway_account erpnext.patches.v15_0.add_company_payment_gateway_account
erpnext.patches.v15_0.update_uae_zero_rated_fetch erpnext.patches.v15_0.update_uae_zero_rated_fetch
erpnext.patches.v15_0.update_fieldname_in_accounting_dimension_filter erpnext.patches.v15_0.update_fieldname_in_accounting_dimension_filter
erpnext.patches.v15_0.set_asset_status_if_not_already_set

13
erpnext/patches/v15_0/set_asset_status_if_not_already_set.py Normal file
View File

@@ -0,0 +1,13 @@
import frappe
from frappe.query_builder import DocType
def execute():
Asset = DocType("Asset")
query = (
frappe.qb.update(Asset)
.set(Asset.status, "Draft")
.where((Asset.docstatus == 0) & ((Asset.status.isnull()) | (Asset.status == "")))
)
query.run()