Merge pull request #40883 from rohitwaghchaure/fixed-13004
fix: incorrect operator causing incorrect validation
diff --git a/erpnext/assets/doctype/asset/test_asset.py b/erpnext/assets/doctype/asset/test_asset.py
index 088641a..1b3951e 100644
--- a/erpnext/assets/doctype/asset/test_asset.py
+++ b/erpnext/assets/doctype/asset/test_asset.py
@@ -232,7 +232,11 @@
asset.precision("gross_purchase_amount"),
)
pro_rata_amount, _, _ = _get_pro_rata_amt(
- asset.finance_books[0], 9000, get_last_day(add_months(purchase_date, 1)), date
+ asset.finance_books[0],
+ 9000,
+ get_last_day(add_months(purchase_date, 1)),
+ date,
+ original_schedule_date=get_last_day(nowdate()),
)
pro_rata_amount = flt(pro_rata_amount, asset.precision("gross_purchase_amount"))
self.assertEqual(
@@ -314,7 +318,11 @@
self.assertEqual(first_asset_depr_schedule.status, "Cancelled")
pro_rata_amount, _, _ = _get_pro_rata_amt(
- asset.finance_books[0], 9000, get_last_day(add_months(purchase_date, 1)), date
+ asset.finance_books[0],
+ 9000,
+ get_last_day(add_months(purchase_date, 1)),
+ date,
+ original_schedule_date=get_last_day(nowdate()),
)
pro_rata_amount = flt(pro_rata_amount, asset.precision("gross_purchase_amount"))
@@ -332,7 +340,6 @@
),
("Debtors - _TC", 25000.0, 0.0),
)
-
gle = get_gl_entries("Sales Invoice", si.name)
self.assertSequenceEqual(gle, expected_gle)
@@ -378,7 +385,7 @@
self.assertEqual(frappe.db.get_value("Asset", asset.name, "status"), "Sold")
- expected_values = [["2023-03-31", 12000, 36000], ["2023-05-23", 1742.47, 37742.47]]
+ expected_values = [["2023-03-31", 12000, 36000], ["2023-05-23", 1737.7, 37737.7]]
second_asset_depr_schedule = get_depr_schedule(asset.name, "Active")
@@ -391,7 +398,7 @@
expected_gle = (
(
"_Test Accumulated Depreciations - _TC",
- 37742.47,
+ 37737.7,
0.0,
),
(
@@ -402,7 +409,7 @@
(
"_Test Gain/Loss on Asset Disposal - _TC",
0.0,
- 17742.47,
+ 17737.7,
),
("Debtors - _TC", 40000.0, 0.0),
)
@@ -707,25 +714,24 @@
)
expected_schedules = [
- ["2023-01-31", 1021.98, 1021.98],
- ["2023-02-28", 923.08, 1945.06],
- ["2023-03-31", 1021.98, 2967.04],
- ["2023-04-30", 989.01, 3956.05],
- ["2023-05-31", 1021.98, 4978.03],
- ["2023-06-30", 989.01, 5967.04],
- ["2023-07-31", 1021.98, 6989.02],
- ["2023-08-31", 1021.98, 8011.0],
- ["2023-09-30", 989.01, 9000.01],
- ["2023-10-31", 1021.98, 10021.99],
- ["2023-11-30", 989.01, 11011.0],
- ["2023-12-31", 989.0, 12000.0],
+ ["2023-01-31", 1019.18, 1019.18],
+ ["2023-02-28", 920.55, 1939.73],
+ ["2023-03-31", 1019.18, 2958.91],
+ ["2023-04-30", 986.3, 3945.21],
+ ["2023-05-31", 1019.18, 4964.39],
+ ["2023-06-30", 986.3, 5950.69],
+ ["2023-07-31", 1019.18, 6969.87],
+ ["2023-08-31", 1019.18, 7989.05],
+ ["2023-09-30", 986.3, 8975.35],
+ ["2023-10-31", 1019.18, 9994.53],
+ ["2023-11-30", 986.3, 10980.83],
+ ["2023-12-31", 1019.17, 12000.0],
]
schedules = [
[cstr(d.schedule_date), d.depreciation_amount, d.accumulated_depreciation_amount]
for d in get_depr_schedule(asset.name, "Draft")
]
-
self.assertEqual(schedules, expected_schedules)
def test_schedule_for_straight_line_method_for_existing_asset(self):
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 d22377d..9fd15c1 100644
--- a/erpnext/assets/doctype/asset_depreciation_schedule/asset_depreciation_schedule.py
+++ b/erpnext/assets/doctype/asset_depreciation_schedule/asset_depreciation_schedule.py
@@ -313,7 +313,6 @@
has_wdv_or_dd_non_yearly_pro_rata,
number_of_pending_depreciations,
)
-
if not has_pro_rata or (
n < (cint(final_number_of_depreciations) - 1) or final_number_of_depreciations == 2
):
@@ -338,6 +337,7 @@
depreciation_amount,
from_date,
date_of_disposal,
+ original_schedule_date=schedule_date,
)
if depreciation_amount > 0:
@@ -565,23 +565,27 @@
)
-def _get_pro_rata_amt(row, depreciation_amount, from_date, to_date, has_wdv_or_dd_non_yearly_pro_rata=False):
+def _get_pro_rata_amt(
+ row,
+ depreciation_amount,
+ from_date,
+ to_date,
+ has_wdv_or_dd_non_yearly_pro_rata=False,
+ original_schedule_date=None,
+):
days = date_diff(to_date, from_date)
months = month_diff(to_date, from_date)
if has_wdv_or_dd_non_yearly_pro_rata:
- total_days = get_total_days(to_date, 12)
+ total_days = get_total_days(original_schedule_date or to_date, 12)
else:
- total_days = get_total_days(to_date, row.frequency_of_depreciation)
-
+ total_days = get_total_days(original_schedule_date or to_date, row.frequency_of_depreciation)
return (depreciation_amount * flt(days)) / flt(total_days), days, months
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)
@@ -657,7 +661,7 @@
),
1,
),
- )
+ ) + 1
to_date = get_last_day(
add_months(row.depreciation_start_date, schedule_idx * row.frequency_of_depreciation)
@@ -679,24 +683,33 @@
# if the Depreciation Schedule is being prepared for the first time
else:
if row.daily_prorata_based:
- daily_depr_amount = (
+ amount = (
flt(asset.gross_purchase_amount)
- flt(asset.opening_accumulated_depreciation)
- flt(row.expected_value_after_useful_life)
- ) / date_diff(
- get_last_day(
- add_months(
- row.depreciation_start_date,
- flt(row.total_number_of_depreciations - asset.number_of_depreciations_booked - 1)
- * row.frequency_of_depreciation,
- )
- ),
- add_days(
- get_last_day(add_months(row.depreciation_start_date, -1 * row.frequency_of_depreciation)),
- 1,
- ),
)
+ total_days = (
+ date_diff(
+ get_last_day(
+ add_months(
+ row.depreciation_start_date,
+ flt(row.total_number_of_depreciations - asset.number_of_depreciations_booked - 1)
+ * row.frequency_of_depreciation,
+ )
+ ),
+ add_days(
+ get_last_day(
+ add_months(row.depreciation_start_date, -1 * row.frequency_of_depreciation)
+ ),
+ 1,
+ ),
+ )
+ + 1
+ )
+
+ daily_depr_amount = amount / total_days
+
to_date = get_last_day(
add_months(row.depreciation_start_date, schedule_idx * row.frequency_of_depreciation)
)
@@ -708,7 +721,6 @@
),
1,
)
-
return daily_depr_amount * (date_diff(to_date, from_date) + 1)
else:
return (
diff --git a/erpnext/stock/report/item_prices/item_prices.js b/erpnext/stock/report/item_prices/item_prices.js
index 868b503..6724c1a 100644
--- a/erpnext/stock/report/item_prices/item_prices.js
+++ b/erpnext/stock/report/item_prices/item_prices.js
@@ -9,9 +9,6 @@
fieldtype: "Select",
options: "Enabled Items only\nDisabled Items only\nAll Items",
default: "Enabled Items only",
- on_change: function (query_report) {
- query_report.trigger_refresh();
- },
},
],
};