From 9f687eee4e868ccab24702c4c47eb62696b155bf Mon Sep 17 00:00:00 2001 From: ruthra kumar Date: Fri, 16 Aug 2024 14:32:53 +0530 Subject: [PATCH] chore: update patches.txt (cherry picked from commit 1721175a207fde5e06d3f8646a766e4eb3b325b5) # Conflicts: # erpnext/patches.txt --- erpnext/patches.txt | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/erpnext/patches.txt b/erpnext/patches.txt index 3e17a07c5c1..92e7eb91418 100644 --- a/erpnext/patches.txt +++ b/erpnext/patches.txt @@ -357,7 +357,12 @@ 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.v14_0.update_pos_return_ledger_entries +======= +erpnext.patches.v15_0.create_accounting_dimensions_in_payment_request +erpnext.patches.v14_0.update_pos_return_ledger_entries #2024-08-16 +>>>>>>> 1721175a20 (chore: 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