nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-26 00:14:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: more changes in the test

Browse Source
This commit is contained in:
Khushi Rawat
2025-05-08 15:13:13 +05:30
parent 3465c21090
commit 04e46ea787
3 changed files with 10 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/assets/doctype/asset/asset.py
View File

@@ -933,7 +933,7 @@ def get_asset_naming_series():
@frappe.whitelist() @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) asset_doc = frappe.get_doc("Asset", asset)
si = frappe.new_doc("Sales Invoice") si = frappe.new_doc("Sales Invoice")
si.company = company si.company = company

21
erpnext/assets/doctype/asset/test_asset.py
View File

@@ -243,7 +243,7 @@ class TestAsset(AssetSetup):
frappe.ValidationError, scrap_asset, asset.name, scrap_date=before_last_booked_depreciation_date 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() asset.load_from_db()
first_asset_depr_schedule.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) self.assertEqual(accumulated_depr_amount, 18000.0 + this_month_depr_amount)
def test_gle_made_by_asset_sale(self): def test_gle_made_by_asset_sale(self):
date = "2025-05-05" date = nowdate()
purchase_date = add_months(get_first_day(date), -2) purchase_date = add_months(get_first_day(date), -2)
asset = create_asset( asset = create_asset(
@@ -345,22 +345,17 @@ class TestAsset(AssetSetup):
self.assertEqual(second_asset_depr_schedule.status, "Active") self.assertEqual(second_asset_depr_schedule.status, "Active")
self.assertEqual(first_asset_depr_schedule.status, "Cancelled") self.assertEqual(first_asset_depr_schedule.status, "Cancelled")
second_asset_depr_schedule.depreciation_amount = 9006.17 asset.load_from_db()
second_asset_depr_schedule.asset_doc = asset accumulated_depr_amount = flt(
second_asset_depr_schedule.get_finance_book_row() asset.gross_purchase_amount - asset.finance_books[0].value_after_depreciation,
second_asset_depr_schedule.fetch_asset_details() asset.precision("gross_purchase_amount"),
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),
) )
pro_rata_amount = flt(pro_rata_amount, asset.precision("gross_purchase_amount")) pro_rata_amount = flt(accumulated_depr_amount - 18000)
expected_gle = ( expected_gle = (
( (
"_Test Accumulated Depreciations - _TC", "_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, 0.0,
), ),
("_Test Fixed Asset - _TC", 0.0, 100000.0), ("_Test Fixed Asset - _TC", 0.0, 100000.0),

3
erpnext/assets/doctype/asset_repair/asset_repair.py
View File

@@ -186,7 +186,6 @@ class AssetRepair(AccountsController):
self.asset_doc.flags.ignore_validate_update_after_submit = True self.asset_doc.flags.ignore_validate_update_after_submit = True
self.asset_doc.save() self.asset_doc.save()
self.asset_doc.db_update()
def get_total_value_of_stock_consumed(self): def get_total_value_of_stock_consumed(self):
return sum([flt(item.total_value) for item in self.get("stock_items")]) 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): def make_gl_entries(self, cancel=False):
if cancel: 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: if flt(self.total_repair_cost) > 0:
gl_entries = self.get_gl_entries() gl_entries = self.get_gl_entries()