From b0ac0973275a58628d0236071ec921eac4781c9e Mon Sep 17 00:00:00 2001
From: ruthra kumar <ruthra@erpnext.com>
Date: Tue, 10 Oct 2023 11:16:12 +0530
Subject: [PATCH] chore: resolve conflicts

---
 .../purchase_invoice/purchase_invoice.json    |  4 --
 .../purchase_invoice/test_purchase_invoice.py | 59 -------------------
 .../doctype/sales_invoice/sales_invoice.py    | 40 -------------
 3 files changed, 103 deletions(-)

diff --git a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
index 864f0b81890..1f3b17ee147 100644
--- a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
+++ b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
@@ -1584,11 +1584,7 @@
  "idx": 204,
  "is_submittable": 1,
  "links": [],
-<<<<<<< HEAD
  "modified": "2023-10-01 21:01:47.282533",
-=======
- "modified": "2023-09-21 12:22:04.545106",
->>>>>>> e922ec60eb (feat: allow on submit fields)
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Purchase Invoice",
diff --git a/erpnext/accounts/doctype/purchase_invoice/test_purchase_invoice.py b/erpnext/accounts/doctype/purchase_invoice/test_purchase_invoice.py
index 51208885044..47126d3846f 100644
--- a/erpnext/accounts/doctype/purchase_invoice/test_purchase_invoice.py
+++ b/erpnext/accounts/doctype/purchase_invoice/test_purchase_invoice.py
@@ -1710,65 +1710,6 @@ class TestPurchaseInvoice(unittest.TestCase, StockTestMixin):
 
 		self.assertTrue(return_pi.docstatus == 1)
 
-<<<<<<< HEAD
-=======
-	def test_advance_entries_as_asset(self):
-		from erpnext.accounts.doctype.payment_entry.test_payment_entry import create_payment_entry
-
-		account = create_account(
-			parent_account="Current Assets - _TC",
-			account_name="Advances Paid",
-			company="_Test Company",
-			account_type="Receivable",
-		)
-
-		set_advance_flag(company="_Test Company", flag=1, default_account=account)
-
-		pe = create_payment_entry(
-			company="_Test Company",
-			payment_type="Pay",
-			party_type="Supplier",
-			party="_Test Supplier",
-			paid_from="Cash - _TC",
-			paid_to="Creditors - _TC",
-			paid_amount=500,
-		)
-		pe.submit()
-
-		pi = make_purchase_invoice(
-			company="_Test Company",
-			do_not_save=True,
-			do_not_submit=True,
-			rate=1000,
-			price_list_rate=1000,
-			qty=1,
-		)
-		pi.base_grand_total = 1000
-		pi.grand_total = 1000
-		pi.set_advances()
-		for advance in pi.advances:
-			advance.allocated_amount = 500 if advance.reference_name == pe.name else 0
-		pi.save()
-		pi.submit()
-
-		self.assertEqual(pi.advances[0].allocated_amount, 500)
-
-		# Check GL Entry against payment doctype
-		expected_gle = [
-			["Advances Paid - _TC", 0.0, 500, nowdate()],
-			["Cash - _TC", 0.0, 500, nowdate()],
-			["Creditors - _TC", 500, 0.0, nowdate()],
-			["Creditors - _TC", 500, 0.0, nowdate()],
-		]
-
-		check_gl_entries(self, pe.name, expected_gle, nowdate(), voucher_type="Payment Entry")
-
-		pi.load_from_db()
-		self.assertEqual(pi.outstanding_amount, 500)
-
-		set_advance_flag(company="_Test Company", flag=0, default_account="")
-
->>>>>>> c66c438575 (test: reposted acc entries for pi)
 	def test_gl_entries_for_standalone_debit_note(self):
 		make_purchase_invoice(qty=5, rate=500, update_stock=True)
 
diff --git a/erpnext/accounts/doctype/sales_invoice/sales_invoice.py b/erpnext/accounts/doctype/sales_invoice/sales_invoice.py
index c26d3c0283b..03aca8ad588 100644
--- a/erpnext/accounts/doctype/sales_invoice/sales_invoice.py
+++ b/erpnext/accounts/doctype/sales_invoice/sales_invoice.py
@@ -551,46 +551,6 @@ class SalesInvoice(SellingController):
 			self.validate_for_repost()
 			self.db_set("repost_required", self.needs_repost)
 
-<<<<<<< HEAD
-<<<<<<< HEAD
-			# validate if deferred revenue is enabled for any item
-			# Don't allow to update the invoice if deferred revenue is enabled
-=======
-	def validate_deferred_accounting_before_repost(self):
-		# validate if deferred revenue is enabled for any item
-		# Don't allow to update the invoice if deferred revenue is enabled
-		if self.needs_repost:
->>>>>>> 68effd93bd (refactor: move reposting logic to common controller)
-			for item in self.get("items"):
-				if item.enable_deferred_revenue:
-					frappe.throw(
-						_(
-							"Deferred Revenue is enabled for item {0}. You cannot update the invoice after submission."
-						).format(item.item_code)
-					)
-<<<<<<< HEAD
-
-			self.db_set("repost_required", needs_repost)
-
-	def check_if_child_table_updated(
-		self, child_table, doc_before_update, fields_to_check, accounting_dimensions
-	):
-		# Check if any field affecting accounting entry is altered
-		for index, item in enumerate(self.get(child_table)):
-			for field in fields_to_check:
-				if doc_before_update.get(child_table)[index].get(field) != item.get(field):
-					return True
-
-			for dimension in accounting_dimensions:
-				if doc_before_update.get(child_table)[index].get(dimension) != item.get(dimension):
-					return True
-
-		return False
-=======
->>>>>>> 68effd93bd (refactor: move reposting logic to common controller)
-
-=======
->>>>>>> a856091ff4 (refactor: remove repeated validation for voucher)
 	def set_paid_amount(self):
 		paid_amount = 0.0
 		base_paid_amount = 0.0