mirror of
https://github.com/frappe/erpnext.git
synced 2026-05-24 23:49:19 +00:00
Merge branch 'develop' into se_alert_develop
This commit is contained in:
@@ -12,6 +12,7 @@ from frappe.utils import (
|
|||||||
get_first_day,
|
get_first_day,
|
||||||
get_last_day,
|
get_last_day,
|
||||||
getdate,
|
getdate,
|
||||||
|
is_last_day_of_the_month,
|
||||||
nowdate,
|
nowdate,
|
||||||
)
|
)
|
||||||
|
|
||||||
@@ -264,7 +265,7 @@ class TestAsset(AssetSetup):
|
|||||||
asset.gross_purchase_amount - asset.finance_books[0].value_after_depreciation,
|
asset.gross_purchase_amount - asset.finance_books[0].value_after_depreciation,
|
||||||
asset.precision("gross_purchase_amount"),
|
asset.precision("gross_purchase_amount"),
|
||||||
)
|
)
|
||||||
this_month_depr_amount = 9000.0 if get_last_day(date) == date else 0
|
this_month_depr_amount = 9000.0 if is_last_day_of_the_month(date) else 0
|
||||||
|
|
||||||
self.assertEquals(accumulated_depr_amount, 18000.0 + this_month_depr_amount)
|
self.assertEquals(accumulated_depr_amount, 18000.0 + this_month_depr_amount)
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user