From e3f03a21c3b60f724c2fbf6f559dae1e90f80f76 Mon Sep 17 00:00:00 2001 From: khushi8112 Date: Thu, 21 May 2026 12:14:08 +0530 Subject: [PATCH 1/3] fix: asset scrap flow related changes (cherry picked from commit 21bb8fe979332a99b467dbf172f6af539f4c9922) # Conflicts: # erpnext/assets/doctype/asset/depreciation.py --- erpnext/assets/doctype/asset/depreciation.py | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/erpnext/assets/doctype/asset/depreciation.py b/erpnext/assets/doctype/asset/depreciation.py index 1a9788be48e..83a82ac8f88 100644 --- a/erpnext/assets/doctype/asset/depreciation.py +++ b/erpnext/assets/doctype/asset/depreciation.py @@ -359,7 +359,12 @@ def get_message_for_depr_entry_posting_error(asset_links, error_log_links): @frappe.whitelist() +<<<<<<< HEAD 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) +>>>>>>> 21bb8fe979 (fix: asset scrap flow related changes) asset = frappe.get_doc("Asset", asset_name) scrap_date = getdate(scrap_date) or getdate(today()) asset.db_set("disposal_date", scrap_date) @@ -448,7 +453,12 @@ def create_journal_entry_for_scrap(asset, scrap_date): @frappe.whitelist() +<<<<<<< HEAD def restore_asset(asset_name): +======= +def restore_asset(asset_name: str): + frappe.has_permission("Asset", "write", asset_name, throw=True) +>>>>>>> 21bb8fe979 (fix: asset scrap flow related changes) asset = frappe.get_doc("Asset", asset_name) reverse_depreciation_entry_made_on_disposal(asset) reset_depreciation_schedule(asset, get_note_for_restore(asset)) From abe19e1212bdd35c7bcfc339b973db9bfc12c955 Mon Sep 17 00:00:00 2001 From: Khushi Rawat <142375893+khushi8112@users.noreply.github.com> Date: Fri, 29 May 2026 15:05:41 +0530 Subject: [PATCH 2/3] fix: resolve conflict --- erpnext/assets/doctype/asset/depreciation.py | 8 -------- 1 file changed, 8 deletions(-) diff --git a/erpnext/assets/doctype/asset/depreciation.py b/erpnext/assets/doctype/asset/depreciation.py index 83a82ac8f88..1f0d12bdcd5 100644 --- a/erpnext/assets/doctype/asset/depreciation.py +++ b/erpnext/assets/doctype/asset/depreciation.py @@ -359,12 +359,8 @@ def get_message_for_depr_entry_posting_error(asset_links, error_log_links): @frappe.whitelist() -<<<<<<< HEAD -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) ->>>>>>> 21bb8fe979 (fix: asset scrap flow related changes) asset = frappe.get_doc("Asset", asset_name) scrap_date = getdate(scrap_date) or getdate(today()) asset.db_set("disposal_date", scrap_date) @@ -453,12 +449,8 @@ def create_journal_entry_for_scrap(asset, scrap_date): @frappe.whitelist() -<<<<<<< HEAD -def restore_asset(asset_name): -======= def restore_asset(asset_name: str): frappe.has_permission("Asset", "write", asset_name, throw=True) ->>>>>>> 21bb8fe979 (fix: asset scrap flow related changes) asset = frappe.get_doc("Asset", asset_name) reverse_depreciation_entry_made_on_disposal(asset) reset_depreciation_schedule(asset, get_note_for_restore(asset)) From d82e03edb65043e4d866bd1a00d949f313fe8f3e Mon Sep 17 00:00:00 2001 From: Khushi Rawat <142375893+khushi8112@users.noreply.github.com> Date: Fri, 29 May 2026 15:21:58 +0530 Subject: [PATCH 3/3] fix: import DateTimeLikeObject --- erpnext/assets/doctype/asset/depreciation.py | 1 + 1 file changed, 1 insertion(+) diff --git a/erpnext/assets/doctype/asset/depreciation.py b/erpnext/assets/doctype/asset/depreciation.py index 1f0d12bdcd5..1ee43cb6d63 100644 --- a/erpnext/assets/doctype/asset/depreciation.py +++ b/erpnext/assets/doctype/asset/depreciation.py @@ -7,6 +7,7 @@ from frappe import _ from frappe.query_builder import Order from frappe.query_builder.functions import Max, Min from frappe.utils import ( + DateTimeLikeObject, add_months, cint, flt,