From 0ab0b4f716acee6837e7c62f875a99c2d11881ef Mon Sep 17 00:00:00 2001 From: ruthra kumar Date: Wed, 27 Nov 2024 20:29:36 +0530 Subject: [PATCH] chore: resolve conflict --- .../accounts/doctype/payment_request/test_payment_request.py | 4 ---- 1 file changed, 4 deletions(-) diff --git a/erpnext/accounts/doctype/payment_request/test_payment_request.py b/erpnext/accounts/doctype/payment_request/test_payment_request.py index cd5a1a26575..4442dbdd7ea 100644 --- a/erpnext/accounts/doctype/payment_request/test_payment_request.py +++ b/erpnext/accounts/doctype/payment_request/test_payment_request.py @@ -525,9 +525,6 @@ class TestPaymentRequest(FrappeTestCase): self.assertEqual(pr.grand_total, 1000) so.load_from_db() -<<<<<<< HEAD -======= - self.assertEqual(so.advance_payment_status, "Requested") def test_partial_paid_invoice_with_payment_request(self): si = create_sales_invoice(currency="INR", qty=1, rate=5000) @@ -546,4 +543,3 @@ class TestPaymentRequest(FrappeTestCase): pr = make_payment_request(dt="Sales Invoice", dn=si.name, mute_email=1) self.assertEqual(pr.grand_total, si.outstanding_amount) ->>>>>>> bbe3bc95d0 (test: add unit test to validate outstanding amount in payment request)