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

fix: resolve conflict

Browse Source
This commit is contained in:
Khushi Rawat
2026-05-29 15:05:41 +05:30
committed by GitHub
parent e3f03a21c3
commit abe19e1212
1 changed files with 0 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -359,12 +359,8 @@ def get_message_for_depr_entry_posting_error(asset_links, error_log_links):
@frappe.whitelist() @frappe.whitelist()
<<<<<<< HEAD
def scrap_asset(asset_name, scrap_date=None):
=======
def scrap_asset(asset_name: str, scrap_date: DateTimeLikeObject | None = None): def scrap_asset(asset_name: str, scrap_date: DateTimeLikeObject | None = None):
frappe.has_permission("Asset", "write", asset_name, throw=True) frappe.has_permission("Asset", "write", asset_name, throw=True)
>>>>>>> 21bb8fe979 (fix: asset scrap flow related changes)
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)
@@ -453,12 +449,8 @@ def create_journal_entry_for_scrap(asset, scrap_date):
@frappe.whitelist() @frappe.whitelist()
<<<<<<< HEAD
def restore_asset(asset_name):
=======
def restore_asset(asset_name: str): def restore_asset(asset_name: str):
frappe.has_permission("Asset", "write", asset_name, throw=True) frappe.has_permission("Asset", "write", asset_name, throw=True)
>>>>>>> 21bb8fe979 (fix: asset scrap flow related changes)
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))