chore: resolve conflicts

(cherry picked from commit df3c821f98)

erpnext/accounts/doctype/accounts_settings/accounts_settings.json

@@ -636,7 +636,6 @@
    "label": "Use Legacy Controller For Period Closing Voucher"
   },
   {
-<<<<<<< HEAD
    "fieldname": "payment_entry_settings",
    "fieldtype": "Section Break",
    "label": "Payment Entry Settings"
@@ -652,7 +651,8 @@
    "fieldname": "show_party_balance",
    "fieldtype": "Check",
    "label": "Show Party Balance"
-=======
+  },
+  {
    "default": "3600",
    "depends_on": "eval: !doc.use_legacy_controller_for_pcv",
    "description": "Timeout (in seconds) for each background job enqueued by Process Period Closing Voucher",
@@ -660,14 +660,6 @@
    "fieldtype": "Int",
    "label": "PCV Job Timeout (seconds)"
   },
-  {
-   "description": "Users with this role will be notified if the asset depreciation gets failed",
-   "fieldname": "role_to_notify_on_depreciation_failure",
-   "fieldtype": "Link",
-   "label": "Role to Notify on Depreciation Failure",
-   "options": "Role"
->>>>>>> 13b6c4a165 (feat(accounts): add configurable job timeout for Process Period Closing Voucher)
-  },
   {
    "default": "30, 60, 90, 120",
    "fieldname": "default_ageing_range",
@@ -680,11 +672,7 @@
  "index_web_pages_for_search": 1,
  "issingle": 1,
  "links": [],
-<<<<<<< HEAD
- "modified": "2026-05-18 12:16:33.679345",
-=======
  "modified": "2026-06-24 12:59:41.868865",
->>>>>>> 3da7eefebb (refactor: patch, display depends on and json changes)
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Accounts Settings",

erpnext/accounts/doctype/accounts_settings/accounts_settings.py

@@ -59,12 +59,8 @@ class AccountsSettings(Document):
 		make_payment_via_journal_entry: DF.Check
 		merge_similar_account_heads: DF.Check
 		over_billing_allowance: DF.Currency
-<<<<<<< HEAD
 		post_change_gl_entries: DF.Check
-=======
 		pcv_job_timeout: DF.Int
-		preview_mode: DF.Check
->>>>>>> 3da7eefebb (refactor: patch, display depends on and json changes)
 		receivable_payable_fetch_method: DF.Literal["Buffered Cursor", "UnBuffered Cursor"]
 		receivable_payable_remarks_length: DF.Int
 		reconciliation_queue_size: DF.Int

erpnext/patches.txt

@@ -435,15 +435,6 @@ erpnext.patches.v16_0.update_order_qty_and_requested_qty_based_on_mr_and_po
 erpnext.patches.v16_0.depends_on_inv_dimensions
 erpnext.patches.v16_0.clear_procedures_from_receivable_report
 erpnext.patches.v16_0.migrate_address_contact_custom_fields
-<<<<<<< HEAD
 erpnext.patches.v15_0.set_main_item_code_in_material_request_plan_item
 erpnext.patches.v16_0.set_posting_datetime_for_sabb_and_drop_indexes
-=======
-erpnext.patches.v16_0.rename_secondary_item_type_field
-erpnext.patches.v16_0.submit_existing_product_bundles #1
-erpnext.patches.v16_0.migrate_subscription_generate_invoice_at
-erpnext.patches.v16_0.rename_subscription_billing_period_fields
-erpnext.patches.v16_0.drop_redundant_serial_no_index_from_sabb
-erpnext.patches.v16_0.set_default_close_opportunity_after_days
 execute:frappe.db.set_single_value("Accounts Settings", "pcv_job_timeout", 3600)
->>>>>>> 3da7eefebb (refactor: patch, display depends on and json changes)