chore: resolve conflicts

erpnext/accounts/doctype/accounts_settings/accounts_settings.json

@@ -630,21 +630,12 @@
    "fieldname": "fetch_valuation_rate_for_internal_transaction",
    "fieldtype": "Check",
    "label": "Fetch Valuation Rate for Internal Transaction"
-<<<<<<< HEAD
-=======
-  },
-  {
-   "default": "0",
-   "fieldname": "use_legacy_budget_controller",
-   "fieldtype": "Check",
-   "label": "Use Legacy Budget Controller"
   },
   {
    "default": "1",
    "fieldname": "use_legacy_controller_for_pcv",
    "fieldtype": "Check",
    "label": "Use Legacy Controller For Period Closing Voucher"
->>>>>>> 4888461be2 (refactor: checkbox for pcv controller)
   }
  ],
  "icon": "icon-cog",
@@ -652,15 +643,7 @@
  "index_web_pages_for_search": 1,
  "issingle": 1,
  "links": [],
-<<<<<<< HEAD
-<<<<<<< HEAD
- "modified": "2025-07-18 13:56:47.192437",
-=======
- "modified": "2025-10-01 15:17:47.168354",
->>>>>>> 4888461be2 (refactor: checkbox for pcv controller)
-=======
  "modified": "2025-10-20 14:06:08.870427",
->>>>>>> fe39ce03bb (refactor: enable legacy controller by default for pcv)
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Accounts Settings",

erpnext/accounts/doctype/accounts_settings/accounts_settings.py

@@ -73,11 +73,7 @@ class AccountsSettings(Document):
 		submit_journal_entries: DF.Check
 		unlink_advance_payment_on_cancelation_of_order: DF.Check
 		unlink_payment_on_cancellation_of_invoice: DF.Check
-<<<<<<< HEAD
-=======
-		use_legacy_budget_controller: DF.Check
 		use_legacy_controller_for_pcv: DF.Check
->>>>>>> 4888461be2 (refactor: checkbox for pcv controller)
 	# end: auto-generated types
 
 	def validate(self):

erpnext/accounts/doctype/period_closing_voucher/test_period_closing_voucher.py

@@ -13,15 +13,11 @@ from erpnext.accounts.doctype.sales_invoice.test_sales_invoice import create_sal
 from erpnext.accounts.utils import get_fiscal_year
 
 
-<<<<<<< HEAD
 class TestPeriodClosingVoucher(unittest.TestCase):
-=======
-class TestPeriodClosingVoucher(IntegrationTestCase):
 	def setUp(self):
 		super().setUp()
 		frappe.db.set_single_value("Accounts Settings", "use_legacy_controller_for_pcv", 1)
 
->>>>>>> fe39ce03bb (refactor: enable legacy controller by default for pcv)
 	def test_closing_entry(self):
 		frappe.db.sql("delete from `tabGL Entry` where company='Test PCV Company'")
 		frappe.db.sql("delete from `tabPeriod Closing Voucher` where company='Test PCV Company'")

erpnext/accounts/doctype/process_period_closing_voucher/test_process_period_closing_voucher.py

@@ -2,19 +2,3 @@
 # See license.txt
 
 # import frappe
-from frappe.tests import IntegrationTestCase
-
-# On IntegrationTestCase, the doctype test records and all
-# link-field test record dependencies are recursively loaded
-# Use these module variables to add/remove to/from that list
-EXTRA_TEST_RECORD_DEPENDENCIES = []  # eg. ["User"]
-IGNORE_TEST_RECORD_DEPENDENCIES = []  # eg. ["User"]
-
-
-class IntegrationTestProcessPeriodClosingVoucher(IntegrationTestCase):
-	"""
-	Integration tests for ProcessPeriodClosingVoucher.
-	Use this class for testing interactions between multiple components.
-	"""
-
-	pass