From cc5c4a3f9abf6e7564fd52d37fb58895aa7fd1bd Mon Sep 17 00:00:00 2001 From: ruthra kumar Date: Tue, 8 Jul 2025 10:17:43 +0530 Subject: [PATCH] chore: resolve conflict --- .../payment_request/test_payment_request.py | 45 ++++++++----------- 1 file changed, 19 insertions(+), 26 deletions(-) diff --git a/erpnext/accounts/doctype/payment_request/test_payment_request.py b/erpnext/accounts/doctype/payment_request/test_payment_request.py index 807e5f5cba1..f38c58d6d32 100644 --- a/erpnext/accounts/doctype/payment_request/test_payment_request.py +++ b/erpnext/accounts/doctype/payment_request/test_payment_request.py @@ -630,34 +630,28 @@ class TestPaymentRequest(FrappeTestCase): pr = make_payment_request(dt="Sales Invoice", dn=si.name, mute_email=1) self.assertEqual(pr.grand_total, si.outstanding_amount) + def test_partial_paid_invoice_with_submitted_payment_entry(self): + pi = make_purchase_invoice(currency="INR", qty=1, rate=5000) + pi.save() + pi.submit() -def test_partial_paid_invoice_with_submitted_payment_entry(self): - pi = make_purchase_invoice(currency="INR", qty=1, rate=5000) - pi.save() - pi.submit() + pe = get_payment_entry("Purchase Invoice", pi.name, bank_account="_Test Bank - _TC") + pe.reference_no = "PURINV0001" + pe.reference_date = frappe.utils.nowdate() + pe.paid_amount = 2500 + pe.references[0].allocated_amount = 2500 + pe.save() + pe.submit() + pe.cancel() - pe = get_payment_entry("Purchase Invoice", pi.name, bank_account="_Test Bank - _TC") - pe.reference_no = "PURINV0001" - pe.reference_date = frappe.utils.nowdate() - pe.paid_amount = 2500 - pe.references[0].allocated_amount = 2500 - pe.save() - pe.submit() - pe.cancel() + pe = get_payment_entry("Purchase Invoice", pi.name, bank_account="_Test Bank - _TC") + pe.reference_no = "PURINV0002" + pe.reference_date = frappe.utils.nowdate() + pe.paid_amount = 2500 + pe.references[0].allocated_amount = 2500 + pe.save() + pe.submit() -<<<<<<< HEAD - pe = get_payment_entry("Purchase Invoice", pi.name, bank_account="_Test Bank - _TC") - pe.reference_no = "PURINV0002" - pe.reference_date = frappe.utils.nowdate() - pe.paid_amount = 2500 - pe.references[0].allocated_amount = 2500 - pe.save() - pe.submit() - - pi.load_from_db() - pr = make_payment_request(dt="Purchase Invoice", dn=pi.name, mute_email=1) - self.assertEqual(pr.grand_total, pi.outstanding_amount) -======= pi.load_from_db() pr = make_payment_request(dt="Purchase Invoice", dn=pi.name, mute_email=1) self.assertEqual(pr.grand_total, pi.outstanding_amount) @@ -691,4 +685,3 @@ def test_partial_paid_invoice_with_submitted_payment_entry(self): pr.load_from_db() self.assertEqual(pr.grand_total, pi.outstanding_amount) ->>>>>>> 8098229b55 (fix: update payment request outstanding on unreconciliation)