chore: resolve conflicts

erpnext/accounts/doctype/purchase_invoice/test_purchase_invoice.py

@@ -1893,8 +1893,6 @@ class TestPurchaseInvoice(FrappeTestCase, StockTestMixin):
 
 		self.assertEqual(pi.items[0].cost_center, "_Test Cost Center Buying - _TC")
 
-<<<<<<< HEAD
-=======
 	def test_debit_note_with_account_mismatch(self):
 		new_creditors = create_account(
 			parent_account="Accounts Payable - _TC",
@@ -1910,38 +1908,6 @@ class TestPurchaseInvoice(FrappeTestCase, StockTestMixin):
 
 		self.assertRaises(frappe.ValidationError, dr_note.save)
 
-	def test_debit_note_without_item(self):
-		pi = make_purchase_invoice(item_name="_Test Item", qty=10, do_not_submit=True)
-		pi.items[0].item_code = ""
-		pi.save()
-
-		self.assertFalse(pi.items[0].item_code)
-		pi.submit()
-
-		return_pi = make_purchase_invoice(
-			item_name="_Test Item",
-			is_return=1,
-			return_against=pi.name,
-			qty=-10,
-			do_not_save=True,
-		)
-		return_pi.items[0].item_code = ""
-		return_pi.save()
-		return_pi.submit()
-		self.assertEqual(return_pi.docstatus, 1)
-
-
-def set_advance_flag(company, flag, default_account):
-	frappe.db.set_value(
-		"Company",
-		company,
-		{
-			"book_advance_payments_in_separate_party_account": flag,
-			"default_advance_paid_account": default_account,
-		},
-	)
-
->>>>>>> bdca718103 (test: debit note account mismatch)
 
 def check_gl_entries(
 	doc,

erpnext/controllers/accounts_controller.py

@@ -321,17 +321,6 @@ class AccountsController(TransactionBase):
 				(self.doctype, self.name),
 			)
 
-<<<<<<< HEAD
-=======
-	def remove_serial_and_batch_bundle(self):
-		bundles = frappe.get_all(
-			"Serial and Batch Bundle",
-			filters={"voucher_type": self.doctype, "voucher_no": self.name, "docstatus": ("!=", 1)},
-		)
-
-		for bundle in bundles:
-			frappe.delete_doc("Serial and Batch Bundle", bundle.name)
-
 	def validate_return_against_account(self):
 		if (
 			self.doctype in ["Sales Invoice", "Purchase Invoice"] and self.is_return and self.return_against
@@ -346,7 +335,6 @@ class AccountsController(TransactionBase):
 					)
 				)
 
->>>>>>> 6f2fae1b61 (refactor: prevent '{debit/credit}_to' account mismatch)
 	def validate_deferred_income_expense_account(self):
 		field_map = {
 			"Sales Invoice": "deferred_revenue_account",