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

chore: resolved conflicts

Browse Source
This commit is contained in:
Khushi Rawat
2025-02-19 15:50:53 +05:30
committed by GitHub
parent f043b46696
commit 9b8623dd64
1 changed files with 0 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
erpnext/patches/v15_0/create_asset_depreciation_schedules_from_assets.py
View File

@@ -3,15 +3,12 @@ from frappe.utils import cstr
def execute(): def execute():
<<<<<<< HEAD
frappe.reload_doc("assets", "doctype", "Asset Depreciation Schedule") frappe.reload_doc("assets", "doctype", "Asset Depreciation Schedule")
frappe.reload_doc("assets", "doctype", "Asset Finance Book") frappe.reload_doc("assets", "doctype", "Asset Finance Book")
frappe.reload_doc("assets", "doctype", "Asset") frappe.reload_doc("assets", "doctype", "Asset")
assets = get_details_of_draft_or_submitted_depreciable_assets() assets = get_details_of_draft_or_submitted_depreciable_assets()
=======
>>>>>>> 7324dcb7c8 (fix: patch for creating asset depreciation schedule records)
asset_finance_books_map = get_asset_finance_books_map() asset_finance_books_map = get_asset_finance_books_map()
asset_depreciation_schedules_map = get_asset_depreciation_schedules_map() asset_depreciation_schedules_map = get_asset_depreciation_schedules_map()