From ed4c8461d380f25187a3896a2b44e9eef4dca32c Mon Sep 17 00:00:00 2001 From: ruthra kumar Date: Fri, 15 Mar 2024 20:16:28 +0530 Subject: [PATCH] chore: resolve conflict --- erpnext/accounts/doctype/payment_entry/test_payment_entry.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/erpnext/accounts/doctype/payment_entry/test_payment_entry.py b/erpnext/accounts/doctype/payment_entry/test_payment_entry.py index c0e425a912a..2b226e1b241 100644 --- a/erpnext/accounts/doctype/payment_entry/test_payment_entry.py +++ b/erpnext/accounts/doctype/payment_entry/test_payment_entry.py @@ -1475,7 +1475,6 @@ class TestPaymentEntry(FrappeTestCase): for field in ["account", "debit", "credit"]: self.assertEqual(self.expected_gle[row][field], gl_entries[row][field]) -<<<<<<< HEAD def test_outstanding_invoices_api(self): """ Test if `get_outstanding_reference_documents` fetches invoices in the right order. @@ -1514,7 +1513,7 @@ class TestPaymentEntry(FrappeTestCase): self.assertEqual(references[2].voucher_no, si2.name) self.assertEqual(references[1].payment_term, "Basic Amount Receivable") self.assertEqual(references[2].payment_term, "Tax Receivable") -======= + def test_reverse_payment_reconciliation(self): customer = create_customer(frappe.generate_hash(length=10), "INR") pe = create_payment_entry( @@ -1553,7 +1552,6 @@ class TestPaymentEntry(FrappeTestCase): pr.reconcile() self.assertEqual(len(pr.invoices), 0) self.assertEqual(len(pr.payments), 0) ->>>>>>> 6d9074d585 (test: reverse payment reconciliation) def test_advance_reverse_payment_reconciliation(self): from erpnext.accounts.doctype.account.test_account import create_account