From 04e46ea787bf4de77720c1d223c58c0fb30753d1 Mon Sep 17 00:00:00 2001 From: Khushi Rawat <142375893+khushi8112@users.noreply.github.com> Date: Thu, 8 May 2025 15:13:13 +0530 Subject: [PATCH] fix: more changes in the test --- erpnext/assets/doctype/asset/asset.py | 2 +- erpnext/assets/doctype/asset/test_asset.py | 21 +++++++------------ .../doctype/asset_repair/asset_repair.py | 3 +-- 3 files changed, 10 insertions(+), 16 deletions(-) diff --git a/erpnext/assets/doctype/asset/asset.py b/erpnext/assets/doctype/asset/asset.py index f118b3bf52a..9f57e4165fb 100644 --- a/erpnext/assets/doctype/asset/asset.py +++ b/erpnext/assets/doctype/asset/asset.py @@ -933,7 +933,7 @@ def get_asset_naming_series(): @frappe.whitelist() -def make_sales_invoice(asset, item_code, company, serial_no=None): +def make_sales_invoice(asset, item_code, company, serial_no=None, posting_date=None): asset_doc = frappe.get_doc("Asset", asset) si = frappe.new_doc("Sales Invoice") si.company = company diff --git a/erpnext/assets/doctype/asset/test_asset.py b/erpnext/assets/doctype/asset/test_asset.py index 738573ea08e..9e2207367ba 100644 --- a/erpnext/assets/doctype/asset/test_asset.py +++ b/erpnext/assets/doctype/asset/test_asset.py @@ -243,7 +243,7 @@ class TestAsset(AssetSetup): frappe.ValidationError, scrap_asset, asset.name, scrap_date=before_last_booked_depreciation_date ) - scrap_asset(asset.name) + scrap_asset(asset.name, date) asset.load_from_db() first_asset_depr_schedule.load_from_db() @@ -312,7 +312,7 @@ class TestAsset(AssetSetup): self.assertEqual(accumulated_depr_amount, 18000.0 + this_month_depr_amount) def test_gle_made_by_asset_sale(self): - date = "2025-05-05" + date = nowdate() purchase_date = add_months(get_first_day(date), -2) asset = create_asset( @@ -345,22 +345,17 @@ class TestAsset(AssetSetup): self.assertEqual(second_asset_depr_schedule.status, "Active") self.assertEqual(first_asset_depr_schedule.status, "Cancelled") - second_asset_depr_schedule.depreciation_amount = 9006.17 - second_asset_depr_schedule.asset_doc = asset - second_asset_depr_schedule.get_finance_book_row() - second_asset_depr_schedule.fetch_asset_details() - - pro_rata_amount, _, _ = second_asset_depr_schedule._get_pro_rata_amt( - add_days(get_last_day(add_months(purchase_date, 1)), 1), - date, - original_schedule_date=get_last_day(date), + asset.load_from_db() + accumulated_depr_amount = flt( + asset.gross_purchase_amount - asset.finance_books[0].value_after_depreciation, + asset.precision("gross_purchase_amount"), ) - pro_rata_amount = flt(pro_rata_amount, asset.precision("gross_purchase_amount")) + pro_rata_amount = flt(accumulated_depr_amount - 18000) expected_gle = ( ( "_Test Accumulated Depreciations - _TC", - flt(18000.0 + pro_rata_amount, asset.precision("gross_purchase_amount")), + flt(accumulated_depr_amount, asset.precision("gross_purchase_amount")), 0.0, ), ("_Test Fixed Asset - _TC", 0.0, 100000.0), diff --git a/erpnext/assets/doctype/asset_repair/asset_repair.py b/erpnext/assets/doctype/asset_repair/asset_repair.py index 1d7d1791784..8a4349233e5 100644 --- a/erpnext/assets/doctype/asset_repair/asset_repair.py +++ b/erpnext/assets/doctype/asset_repair/asset_repair.py @@ -186,7 +186,6 @@ class AssetRepair(AccountsController): self.asset_doc.flags.ignore_validate_update_after_submit = True self.asset_doc.save() - self.asset_doc.db_update() def get_total_value_of_stock_consumed(self): return sum([flt(item.total_value) for item in self.get("stock_items")]) @@ -242,7 +241,7 @@ class AssetRepair(AccountsController): def make_gl_entries(self, cancel=False): if cancel: - self.ignore_linked_doctypes = ("GL Entry", "Stock Ledger Entry") # nosemgrep + self.ignore_linked_doctypes = ("GL Entry", "Stock Ledger Entry") if flt(self.total_repair_cost) > 0: gl_entries = self.get_gl_entries()