From ccd7992e9949d821df605581e1b2b1e1e3089313 Mon Sep 17 00:00:00 2001
From: rohitwaghchaure <rohitw1991@gmail.com>
Date: Tue, 3 Dec 2024 15:08:38 +0530
Subject: [PATCH] chore: fix conflicts

---
 .../sales_invoice/test_sales_invoice.py       | 49 ++++---------------
 1 file changed, 9 insertions(+), 40 deletions(-)

diff --git a/erpnext/accounts/doctype/sales_invoice/test_sales_invoice.py b/erpnext/accounts/doctype/sales_invoice/test_sales_invoice.py
index 134298dc7f9..6e4c6002016 100644
--- a/erpnext/accounts/doctype/sales_invoice/test_sales_invoice.py
+++ b/erpnext/accounts/doctype/sales_invoice/test_sales_invoice.py
@@ -3842,37 +3842,6 @@ class TestSalesInvoice(FrappeTestCase):
 		self.assertTrue(jv)
 		self.assertEqual(jv[0], si.grand_total)
 
-
-<<<<<<< HEAD
-def check_gl_entries(doc, voucher_no, expected_gle, posting_date):
-	gl_entries = frappe.db.sql(
-		"""select account, debit, credit, posting_date
-		from `tabGL Entry`
-		where voucher_type='Sales Invoice' and voucher_no=%s and posting_date > %s
-		and is_cancelled = 0
-		order by posting_date asc, account asc""",
-		(voucher_no, posting_date),
-		as_dict=1,
-=======
-	def test_gl_voucher_subtype(self):
-		si = create_sales_invoice()
-		gl_entries = frappe.get_all(
-			"GL Entry",
-			filters={"voucher_type": "Sales Invoice", "voucher_no": si.name},
-			pluck="voucher_subtype",
-		)
-
-		self.assertTrue(all([x == "Sales Invoice" for x in gl_entries]))
-
-		si = create_sales_invoice(is_return=1, qty=-1)
-		gl_entries = frappe.get_all(
-			"GL Entry",
-			filters={"voucher_type": "Sales Invoice", "voucher_no": si.name},
-			pluck="voucher_subtype",
-		)
-
-		self.assertTrue(all([x == "Credit Note" for x in gl_entries]))
-
 	def test_total_billed_amount(self):
 		si = create_sales_invoice(do_not_submit=True)
 
@@ -3888,15 +3857,15 @@ def check_gl_entries(doc, voucher_no, expected_gle, posting_date):
 		self.assertEqual(doc.total_billed_amount, si.grand_total)
 
 
-def set_advance_flag(company, flag, default_account):
-	frappe.db.set_value(
-		"Company",
-		company,
-		{
-			"book_advance_payments_in_separate_party_account": flag,
-			"default_advance_received_account": default_account,
-		},
->>>>>>> 7de9c14a2c (fix: incorrect Gross Margin on project (#44461))
+def check_gl_entries(doc, voucher_no, expected_gle, posting_date):
+	gl_entries = frappe.db.sql(
+		"""select account, debit, credit, posting_date
+		from `tabGL Entry`
+		where voucher_type='Sales Invoice' and voucher_no=%s and posting_date > %s
+		and is_cancelled = 0
+		order by posting_date asc, account asc""",
+		(voucher_no, posting_date),
+		as_dict=1,
 	)
 
 	for i, gle in enumerate(gl_entries):