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

chore: resolve conflict

Browse Source
This commit is contained in:
ruthra kumar
2025-07-28 15:00:09 +05:30
parent d915c2b404
commit 56085fe6a9
1 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
erpnext/accounts/report/customer_ledger_summary/test_customer_ledger_summary.py
View File

@@ -152,7 +152,6 @@ class TestCustomerLedgerSummary(AccountsTestMixin, IntegrationTestCase):
with self.subTest(field=field):
self.assertEqual(report[0].get(field), expected_after_cr_and_payment.get(field))
<<<<<<< HEAD
def test_customer_ledger_ignore_cr_dr_filter(self):
si = create_sales_invoice()
@@ -235,7 +234,7 @@ class TestCustomerLedgerSummary(AccountsTestMixin, IntegrationTestCase):
)
self.assertEqual(len(data), 1)
self.assertEqual(expected, data[0])
=======
def test_journal_voucher_against_return_invoice(self):
filters = {"company": self.company, "from_date": today(), "to_date": today()}
@@ -389,4 +388,3 @@ class TestCustomerLedgerSummary(AccountsTestMixin, IntegrationTestCase):
f"Field {field} does not match expected value. "
f"Expected: {expected_value}, Got: {actual_value}",
)
>>>>>>> 01fcd98c84 (fix: Misclassification of Journal Voucher Entries in Customer Ledger Summary (#48041))