CalvinBackup/erpnext
1
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-03-25 06:02:09 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix: expense causing p&l test case to fail

Browse Source 
(cherry picked from commit 01888c98bc)
This commit is contained in:
Dany Robert
2024-04-06 06:13:42 +00:00
committed by Mergify
parent 62966ac550
commit acfee42735
1 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
erpnext/accounts/report/deferred_revenue_and_expense/test_deferred_revenue_and_expense.py
View File

@@ -280,7 +280,10 @@ class TestDeferredRevenueAndExpense(FrappeTestCase, AccountsTestMixin):
] ]
self.assertEqual(report.period_total, expected) self.assertEqual(report.period_total, expected)
@change_settings("Accounts Settings", {"book_deferred_entries_based_on": "Months"}) @change_settings(
"Accounts Settings",
{"book_deferred_entries_based_on": "Months", "book_deferred_entries_via_journal_entry": 0},
)
def test_zero_amount(self): def test_zero_amount(self):
self.create_item("_Test Office Desk", 0, self.warehouse, self.company) self.create_item("_Test Office Desk", 0, self.warehouse, self.company)
item = frappe.get_doc("Item", self.item) item = frappe.get_doc("Item", self.item)
@@ -295,7 +298,7 @@ class TestDeferredRevenueAndExpense(FrappeTestCase, AccountsTestMixin):
supplier=self.supplier, supplier=self.supplier,
is_return=False, is_return=False,
update_stock=False, update_stock=False,
posting_date=frappe.utils.datetime.date(2023, 12, 30), posting_date=frappe.utils.datetime.date(2021, 12, 30),
parent_cost_center=self.cost_center, parent_cost_center=self.cost_center,
cost_center=self.cost_center, cost_center=self.cost_center,
do_not_save=True, do_not_save=True,
@@ -306,8 +309,8 @@ class TestDeferredRevenueAndExpense(FrappeTestCase, AccountsTestMixin):
) )
pi.set_posting_time = True pi.set_posting_time = True
pi.items[0].enable_deferred_expense = 1 pi.items[0].enable_deferred_expense = 1
pi.items[0].service_start_date = "2023-12-30" pi.items[0].service_start_date = "2021-12-30"
pi.items[0].service_end_date = "2024-12-30" pi.items[0].service_end_date = "2022-12-30"
pi.items[0].deferred_expense_account = self.deferred_expense_account pi.items[0].deferred_expense_account = self.deferred_expense_account
pi.items[0].expense_account = self.expense_account pi.items[0].expense_account = self.expense_account
pi.save() pi.save()
@@ -316,8 +319,8 @@ class TestDeferredRevenueAndExpense(FrappeTestCase, AccountsTestMixin):
pda = frappe.get_doc( pda = frappe.get_doc(
doctype="Process Deferred Accounting", doctype="Process Deferred Accounting",
posting_date=nowdate(), posting_date=nowdate(),
start_date="2024-01-01", start_date="2022-01-01",
end_date="2024-01-31", end_date="2022-01-31",
type="Expense", type="Expense",
company=self.company, company=self.company,
) )
@@ -325,13 +328,13 @@ class TestDeferredRevenueAndExpense(FrappeTestCase, AccountsTestMixin):
pda.submit() pda.submit()
# execute report # execute report
fiscal_year = frappe.get_doc("Fiscal Year", get_fiscal_year(date="2024-01-31")) fiscal_year = frappe.get_doc("Fiscal Year", get_fiscal_year(date="2022-01-31"))
self.filters = frappe._dict( self.filters = frappe._dict(
{ {
"company": self.company, "company": self.company,
"filter_based_on": "Date Range", "filter_based_on": "Date Range",
"period_start_date": "2024-01-01", "period_start_date": "2022-01-01",
"period_end_date": "2024-01-31", "period_end_date": "2022-01-31",
"from_fiscal_year": fiscal_year.year, "from_fiscal_year": fiscal_year.year,
"to_fiscal_year": fiscal_year.year, "to_fiscal_year": fiscal_year.year,
"periodicity": "Monthly", "periodicity": "Monthly",