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

fix(test): sales invoice test cases

Browse Source
This commit is contained in:
Khushi Rawat
2025-03-17 12:17:10 +05:30
parent 42ccce1687
commit 5d16936b9e
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
erpnext/accounts/doctype/sales_invoice/test_sales_invoice.py
View File

@@ -3013,7 +3013,7 @@ class TestSalesInvoice(ERPNextTestSuite):
) )
asset.load_from_db() asset.load_from_db()
expected_values = [["2020-12-31", 30000, 30000], ["2021-12-31", 30000, 60000]] expected_values = [["2020-12-31", 30000, 30000], ["2021-12-31", 30041.15, 60041.15]]
for i, schedule in enumerate(get_depr_schedule(asset.name, "Active")): for i, schedule in enumerate(get_depr_schedule(asset.name, "Active")):
self.assertEqual(getdate(expected_values[i][0]), schedule.schedule_date) self.assertEqual(getdate(expected_values[i][0]), schedule.schedule_date)
@@ -3038,10 +3038,10 @@ class TestSalesInvoice(ERPNextTestSuite):
expected_values = [ expected_values = [
["2020-06-30", 1366.12, 1366.12, True], ["2020-06-30", 1366.12, 1366.12, True],
["2021-06-30", 20000.0, 21366.12, True], ["2021-06-30", 20000.0, 21366.12, True],
["2022-06-30", 20000.0, 41366.12, False], ["2022-06-30", 20000.95, 41367.07, False],
["2023-06-30", 20000.0, 61366.12, False], ["2023-06-30", 20000.95, 61368.02, False],
["2024-06-30", 20000.0, 81366.12, False], ["2024-06-30", 20000.95, 81368.97, False],
["2025-06-06", 18633.88, 100000.0, False], ["2025-06-06", 18631.03, 100000.0, False],
] ]
for i, schedule in enumerate(get_depr_schedule(asset.name, "Active")): for i, schedule in enumerate(get_depr_schedule(asset.name, "Active")):

1
erpnext/assets/doctype/asset/depreciation.py
View File

@@ -527,6 +527,7 @@ def cancel_depreciation_entries(asset_doc, date):
def reset_depreciation_schedule(asset_doc, notes): def reset_depreciation_schedule(asset_doc, notes):
if asset_doc.calculate_depreciation: if asset_doc.calculate_depreciation:
reschedule_depreciation(asset_doc, notes) reschedule_depreciation(asset_doc, notes)
asset_doc.set_total_booked_depreciations()
def reverse_depreciation_entry_made_on_disposal(asset): def reverse_depreciation_entry_made_on_disposal(asset):

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

@@ -242,7 +242,6 @@ 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") self.ignore_linked_doctypes = ("GL Entry", "Stock Ledger Entry")
self.save()
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()