nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-04-13 11:55:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(test): updated test for journal entry

Browse Source
This commit is contained in:
Khushi Rawat
2025-03-21 18:18:40 +05:30
parent 99e8c984ad
commit 6fa316177b
2 changed files with 24 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
erpnext/accounts/doctype/journal_entry/journal_entry.py
View File

@@ -141,7 +141,7 @@ class JournalEntry(AccountsController):
self.validate_credit_debit_note()
self.validate_empty_accounts_table()
self.validate_inter_company_accounts()
self.validate_depr_entry_voucher_type()
self.validate_depr_account_and_depr_entry_voucher_type()
self.validate_company_in_accounting_dimension()
self.validate_advance_accounts()
@@ -268,12 +268,16 @@ class JournalEntry(AccountsController):
):
frappe.throw(_("Total Credit/ Debit Amount should be same as linked Journal Entry"))
def validate_depr_entry_voucher_type(self):
if (
any(d.account_type == "Depreciation" for d in self.get("accounts"))
and self.voucher_type != "Depreciation Entry"
):
frappe.throw(_("Journal Entry type should be set as Depreciation Entry for asset depreciation"))
def validate_depr_account_and_depr_entry_voucher_type(self):
for d in self.get("accounts"):
if d.account_type == "Depreciation":
if self.voucher_type != "Depreciation Entry":
frappe.throw(
_("Journal Entry type should be set as Depreciation Entry for asset depreciation")
)
if frappe.get_cached_value("Account", d.account, "root_type") != "Expense":
frappe.throw(_("Account {0} should be of type Expense").format(d.account))
def validate_stock_accounts(self):
stock_accounts = get_stock_accounts(self.company, accounts=self.accounts)

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

@@ -1306,8 +1306,6 @@ class TestDepreciationBasics(AssetSetup):
self.assertFalse(entry["debit"])
def test_depr_entry_posting_when_depr_expense_account_is_an_income_account(self):
"""Tests if the Depreciation Expense Account gets credited and the Accumulated Depreciation Account gets debited when the former's an Income Account."""
depr_expense_account = frappe.get_doc("Account", "_Test Depreciations - _TC")
depr_expense_account.root_type = "Income"
depr_expense_account.parent_account = "Income - _TC"
@@ -1324,26 +1322,20 @@ class TestDepreciationBasics(AssetSetup):
submit=1,
)
post_depreciation_entries(date="2021-06-01")
asset.load_from_db()
jv = make_journal_entry(
"_Test Depreciations - _TC",
"_Test Accumulated Depreciations - _TC",
100,
posting_date="2020-01-15",
save=False,
)
for d in jv.accounts:
d.reference_type = "Asset"
d.reference_name = asset.name
jv.voucher_type = "Depreciation Entry"
je = frappe.get_doc("Journal Entry", get_depr_schedule(asset.name, "Active")[0].journal_entry)
accounting_entries = [
{"account": entry.account, "debit": entry.debit, "credit": entry.credit} for entry in je.accounts
]
for entry in accounting_entries:
if entry["account"] == "_Test Depreciations - _TC":
self.assertTrue(entry["credit"])
self.assertFalse(entry["debit"])
else:
self.assertTrue(entry["debit"])
self.assertFalse(entry["credit"])
# resetting
depr_expense_account.root_type = "Expense"
depr_expense_account.parent_account = "Expenses - _TC"
depr_expense_account.save()
with self.assertRaises(frappe.ValidationError):
jv.insert()
def test_clear_depr_schedule(self):
"""Tests if clear_depr_schedule() works as expected."""