From 0cd94b017f4ac395517aa40a8fe746e3826e31d8 Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Thu, 4 Apr 2024 18:28:29 +0530 Subject: [PATCH] fix:linter issue (cherry picked from commit be0cb5289f920f6d5a7c26df08090fec3e21f249) # Conflicts: # erpnext/assets/doctype/asset_depreciation_schedule/asset_depreciation_schedule.py --- .../asset_depreciation_schedule.py | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/erpnext/assets/doctype/asset_depreciation_schedule/asset_depreciation_schedule.py b/erpnext/assets/doctype/asset_depreciation_schedule/asset_depreciation_schedule.py index 5eb7a3f3d7f..fd94faa8cc9 100644 --- a/erpnext/assets/doctype/asset_depreciation_schedule/asset_depreciation_schedule.py +++ b/erpnext/assets/doctype/asset_depreciation_schedule/asset_depreciation_schedule.py @@ -699,7 +699,14 @@ def get_straight_line_or_manual_depr_amount( ) ), add_days( +<<<<<<< HEAD get_last_day(add_months(row.depreciation_start_date, -1 * row.frequency_of_depreciation)), 1 +======= + get_last_day( + add_months(row.depreciation_start_date, -1 * row.frequency_of_depreciation) + ), + 1, +>>>>>>> be0cb5289f (fix:linter issue) ), ) + 1