Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: resolved conflict

Browse Source
This commit is contained in:
Nabin Hait 2024-02-21 11:37:47 +05:30 committed by GitHub
parent ee2d108bef
commit a0c0ab7709
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 0 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -561,11 +561,8 @@ def modify_depreciation_schedule_for_asset_repairs(asset, notes):
def reverse_depreciation_entry_made_after_disposal(asset, date): def reverse_depreciation_entry_made_after_disposal(asset, date):
for row in asset.get("finance_books"): for row in asset.get("finance_books"):
asset_depr_schedule_doc = get_asset_depr_schedule_doc(asset.name, "Active", row.finance_book) asset_depr_schedule_doc = get_asset_depr_schedule_doc(asset.name, "Active", row.finance_book)
<<<<<<< HEAD
=======
if not asset_depr_schedule_doc or not asset_depr_schedule_doc.get("depreciation_schedule"): if not asset_depr_schedule_doc or not asset_depr_schedule_doc.get("depreciation_schedule"):
continue continue
>>>>>>> 17f85de6fb (fix: Issues regarding asset cancellation and deletion)
for schedule_idx, schedule in enumerate(asset_depr_schedule_doc.get("depreciation_schedule")): for schedule_idx, schedule in enumerate(asset_depr_schedule_doc.get("depreciation_schedule")):
if schedule.schedule_date == date and schedule.journal_entry: if schedule.schedule_date == date and schedule.journal_entry: