diff --git a/erpnext/assets/doctype/asset/asset.py b/erpnext/assets/doctype/asset/asset.py index cf556a659c0..88c462e1dfb 100644 --- a/erpnext/assets/doctype/asset/asset.py +++ b/erpnext/assets/doctype/asset/asset.py @@ -860,6 +860,14 @@ class Asset(AccountsController): months = month_diff(to_date, from_date) total_days = get_total_days(to_date, row.frequency_of_depreciation) + print("\n"*10) + print("from_date: ", from_date) + print("to_date: ", to_date) + print("\n") + print("days: ", days) + print("total_days: ", total_days) + print("\n"*10) + return (depreciation_amount * flt(days)) / flt(total_days), days, months @@ -1100,8 +1108,16 @@ def is_cwip_accounting_enabled(asset_category): def get_total_days(date, frequency): period_start_date = add_months(date, cint(frequency) * -1) + if is_last_day_of_the_month(date): + period_start_date = get_last_day(period_start_date) + return date_diff(date, period_start_date) +def is_last_day_of_the_month(date): + last_day_of_the_month = get_last_day(date) + + return getdate(last_day_of_the_month) == getdate(date) + @erpnext.allow_regional def get_depreciation_amount(asset, depreciable_value, row):