From 3adcbe188e8b959472bf56d4d47fbe48fa19b650 Mon Sep 17 00:00:00 2001 From: s-aga-r Date: Mon, 16 Oct 2023 00:41:37 +0530 Subject: [PATCH] chore: `conflicts` --- .../stock/doctype/purchase_receipt/test_purchase_receipt.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/erpnext/stock/doctype/purchase_receipt/test_purchase_receipt.py b/erpnext/stock/doctype/purchase_receipt/test_purchase_receipt.py index 02d155668e61..3d593574c3d0 100644 --- a/erpnext/stock/doctype/purchase_receipt/test_purchase_receipt.py +++ b/erpnext/stock/doctype/purchase_receipt/test_purchase_receipt.py @@ -2093,7 +2093,6 @@ def test_purchase_return_status_with_debit_note(self): return_pr.reload() self.assertEqual(return_pr.status, "Completed") -<<<<<<< HEAD def test_valuation_rate_in_return_purchase_receipt_for_moving_average(self): from erpnext.stock.doctype.stock_entry.test_stock_entry import make_stock_entry from erpnext.stock.stock_ledger import get_previous_sle @@ -2147,7 +2146,7 @@ def test_valuation_rate_in_return_purchase_receipt_for_moving_average(self): # Test - 2: Valuation Rate should be equal to Previous SLE Valuation Rate self.assertEqual(flt(sle.valuation_rate, 2), flt(previous_sle_valuation_rate, 2)) -======= + def test_purchase_return_with_zero_rate(self): company = "_Test Company with perpetual inventory" @@ -2205,7 +2204,6 @@ def test_purchase_return_with_zero_rate(self): self.assertEqual(abs(entry.debit + entry.credit), abs(sl_entries[0].stock_value_difference)) self.assertIsNotNone(get_gl_entries(pr_return.doctype, pr_return.name)) ->>>>>>> 253d4782c6 (test: add test case for PR return with zero rate) def prepare_data_for_internal_transfer():