From 20e2728037cd486136e2136870897670ca8b19a4 Mon Sep 17 00:00:00 2001 From: Shllokkk Date: Sun, 26 Jul 2026 19:21:01 +0530 Subject: [PATCH] chore: resolve patches.txt conflict for backport --- erpnext/patches.txt | 6 ------ 1 file changed, 6 deletions(-) diff --git a/erpnext/patches.txt b/erpnext/patches.txt index fb674bbc907..d012b859b7c 100644 --- a/erpnext/patches.txt +++ b/erpnext/patches.txt @@ -491,10 +491,4 @@ erpnext.patches.v15_0.backfill_sla_link_filters_on_docfield erpnext.patches.v16_0.crm_settings_handle_allowed_users_for_frappe_crm erpnext.patches.v16_0.backfill_pick_list_transferred_qty erpnext.patches.v16_0.access_control_for_project_users -<<<<<<< HEAD -======= -erpnext.patches.v16_0.enable_book_stock_expense_gl_entries -execute:frappe.db.set_single_value("Stock Settings", "use_inline_serial_batch_editor", 0) -erpnext.patches.v16_0.recompute_production_plan_reserved_qty erpnext.patches.v16_0.rename_ar_ap_ageing_filter ->>>>>>> f13cd00494 (fix: migrate stored AR/AP ageing filter to renamed field)