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

fix:linter issue

Browse Source 
(cherry picked from commit be0cb5289f)

# Conflicts:
#	erpnext/assets/doctype/asset_depreciation_schedule/asset_depreciation_schedule.py
This commit is contained in:
Nabin Hait
2024-04-04 18:28:29 +05:30
committed by Mergify
parent 854d4a9c79
commit 0cd94b017f
1 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
erpnext/assets/doctype/asset_depreciation_schedule/asset_depreciation_schedule.py
View File

@@ -699,7 +699,14 @@ def get_straight_line_or_manual_depr_amount(
) )
), ),
add_days( 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
=======
get_last_day(
add_months(row.depreciation_start_date, -1 * row.frequency_of_depreciation)
),
1,
>>>>>>> be0cb5289f (fix:linter issue)
), ),
) )
+ 1 + 1