nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-06-02 11:49:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #55254 from frappe/mergify/bp/version-16-hotfix/pr-55126

Browse Source 
fix: asset scrap flow related changes (backport #55126)
This commit is contained in:
Khushi Rawat
2026-05-29 15:48:03 +05:30
committed by GitHub
parent 6d747420a3 d82e03edb6
commit 63aff0098c
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
erpnext/assets/doctype/asset/depreciation.py
View File

@@ -7,6 +7,7 @@ from frappe import _
from frappe.query_builder import Order from frappe.query_builder import Order
from frappe.query_builder.functions import Max, Min from frappe.query_builder.functions import Max, Min
from frappe.utils import ( from frappe.utils import (
DateTimeLikeObject,
add_months, add_months,
cint, cint,
flt, flt,
@@ -359,7 +360,8 @@ def get_message_for_depr_entry_posting_error(asset_links, error_log_links):
@frappe.whitelist() @frappe.whitelist()
def scrap_asset(asset_name, scrap_date=None): def scrap_asset(asset_name: str, scrap_date: DateTimeLikeObject | None = None):
frappe.has_permission("Asset", "write", asset_name, throw=True)
asset = frappe.get_doc("Asset", asset_name) asset = frappe.get_doc("Asset", asset_name)
scrap_date = getdate(scrap_date) or getdate(today()) scrap_date = getdate(scrap_date) or getdate(today())
asset.db_set("disposal_date", scrap_date) asset.db_set("disposal_date", scrap_date)
@@ -448,7 +450,8 @@ def create_journal_entry_for_scrap(asset, scrap_date):
@frappe.whitelist() @frappe.whitelist()
def restore_asset(asset_name): def restore_asset(asset_name: str):
frappe.has_permission("Asset", "write", asset_name, throw=True)
asset = frappe.get_doc("Asset", asset_name) asset = frappe.get_doc("Asset", asset_name)
reverse_depreciation_entry_made_on_disposal(asset) reverse_depreciation_entry_made_on_disposal(asset)
reset_depreciation_schedule(asset, get_note_for_restore(asset)) reset_depreciation_schedule(asset, get_note_for_restore(asset))