From fa44b0d745125b25802a0e52a4615f509eb84014 Mon Sep 17 00:00:00 2001 From: ruthra kumar Date: Mon, 12 Aug 2024 13:58:04 +0530 Subject: [PATCH] refactor: update patches.txt (cherry picked from commit 4dc0d3a003720f6bd1f6d87e5a3540d4a03a2fa9) # Conflicts: # erpnext/patches.txt --- erpnext/patches.txt | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/erpnext/patches.txt b/erpnext/patches.txt index 1f6363d56cb..b5266c56a54 100644 --- a/erpnext/patches.txt +++ b/erpnext/patches.txt @@ -357,6 +357,11 @@ erpnext.patches.v14_0.clear_reconciliation_values_from_singles erpnext.patches.v14_0.update_total_asset_cost_field erpnext.patches.v14_0.create_accounting_dimensions_in_reconciliation_tool erpnext.patches.v14_0.update_flag_for_return_invoices #2024-03-22 +<<<<<<< HEAD +======= +erpnext.patches.v15_0.create_accounting_dimensions_in_payment_request +erpnext.patches.v15_0.update_pos_return_ledger_entries +>>>>>>> 4dc0d3a003 (refactor: update patches.txt) # below migration patch should always run last erpnext.patches.v14_0.migrate_gl_to_payment_ledger erpnext.stock.doctype.delivery_note.patches.drop_unused_return_against_index # 2023-12-20