nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-08-13 22:51:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: resolve patches.txt conflict for backport

Browse Source
This commit is contained in:
Shllokkk
2026-07-26 19:21:01 +05:30
parent 2e5fc38179
commit 20e2728037
1 changed files with 0 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
erpnext/patches.txt
View File

@@ -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)