From 946aadb0c00368fb4def4b96f1c0f6ff00d13664 Mon Sep 17 00:00:00 2001 From: ruthra kumar Date: Mon, 14 Aug 2023 10:52:35 +0530 Subject: [PATCH] chore: resolve conflict in `test_sales_invoice.py` --- .../sales_invoice/test_sales_invoice.py | 27 ------------------- 1 file changed, 27 deletions(-) diff --git a/erpnext/accounts/doctype/sales_invoice/test_sales_invoice.py b/erpnext/accounts/doctype/sales_invoice/test_sales_invoice.py index 6f05cf36f93..c36a05ac099 100644 --- a/erpnext/accounts/doctype/sales_invoice/test_sales_invoice.py +++ b/erpnext/accounts/doctype/sales_invoice/test_sales_invoice.py @@ -3217,17 +3217,6 @@ class TestSalesInvoice(unittest.TestCase): def test_gain_loss_with_advance_entry(self): from erpnext.accounts.doctype.journal_entry.test_journal_entry import make_journal_entry -<<<<<<< HEAD - unlink_enabled = frappe.db.get_value( - "Accounts Settings", "Accounts Settings", "unlink_payment_on_cancel_of_invoice" - ) - - frappe.db.set_value( - "Accounts Settings", "Accounts Settings", "unlink_payment_on_cancel_of_invoice", 1 - ) - -======= ->>>>>>> 70dd9d0671 (chore(test): fix broken unit test) jv = make_journal_entry("_Test Receivable USD - _TC", "_Test Bank - _TC", -7000, save=False) jv.accounts[0].exchange_rate = 70 @@ -3261,26 +3250,11 @@ class TestSalesInvoice(unittest.TestCase): si.save() si.submit() expected_gle = [ -<<<<<<< HEAD - ["_Test Receivable USD - _TC", 7500.0, 500], - ["Exchange Gain/Loss - _TC", 500.0, 0.0], - ["Sales - _TC", 0.0, 7500.0], -======= ["_Test Receivable USD - _TC", 7500.0, 0.0, nowdate()], ["Sales - _TC", 0.0, 7500.0, nowdate()], ->>>>>>> 025091161e (refactor(test): assert ledger outstanding) ] check_gl_entries(self, si.name, expected_gle, nowdate()) -<<<<<<< HEAD -<<<<<<< HEAD - frappe.db.set_value( - "Accounts Settings", "Accounts Settings", "unlink_payment_on_cancel_of_invoice", unlink_enabled - ) - -======= ->>>>>>> 70dd9d0671 (chore(test): fix broken unit test) -======= si.reload() self.assertEqual(si.outstanding_amount, 0) journals = frappe.db.get_all( @@ -3299,7 +3273,6 @@ class TestSalesInvoice(unittest.TestCase): as_list=1, ) ->>>>>>> 025091161e (refactor(test): assert ledger outstanding) def test_batch_expiry_for_sales_invoice_return(self): from erpnext.controllers.sales_and_purchase_return import make_return_doc from erpnext.stock.doctype.item.test_item import make_item