From 2bfaf64fffed8e9e7eeb43c3f35175bc068c8fd1 Mon Sep 17 00:00:00 2001 From: Mihir Kandoi Date: Thu, 20 Mar 2025 15:55:33 +0530 Subject: [PATCH 1/2] fix: date added to wrong patch (cherry picked from commit dc45c3b39caacd4c37b9c0035b4178c78f364944) # Conflicts: # erpnext/patches.txt --- erpnext/patches.txt | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/erpnext/patches.txt b/erpnext/patches.txt index 835ee5b6133..da54fecd43e 100644 --- a/erpnext/patches.txt +++ b/erpnext/patches.txt @@ -395,9 +395,14 @@ execute:frappe.db.set_single_value("Accounts Settings", "exchange_gain_loss_post erpnext.patches.v14_0.disable_add_row_in_gross_profit erpnext.patches.v15_0.set_difference_amount_in_asset_value_adjustment erpnext.patches.v14_0.update_posting_datetime +<<<<<<< HEAD erpnext.stock.doctype.stock_ledger_entry.patches.ensure_sle_indexes erpnext.patches.v15_0.update_query_report erpnext.patches.v15_0.rename_field_from_rate_difference_to_amount_difference #2025-03-18 erpnext.patches.v15_0.recalculate_amount_difference_field +======= +erpnext.patches.v15_0.rename_field_from_rate_difference_to_amount_difference +erpnext.patches.v15_0.recalculate_amount_difference_field #2025-03-18 +>>>>>>> dc45c3b39c (fix: date added to wrong patch) erpnext.patches.v15_0.rename_sla_fields #2025-03-12 erpnext.patches.v15_0.set_purchase_receipt_row_item_to_capitalization_stock_item From b3c37332868dbcf143b4260bc56946dfbed5099e Mon Sep 17 00:00:00 2001 From: ruthra kumar Date: Tue, 25 Mar 2025 17:53:29 +0530 Subject: [PATCH 2/2] chore: resolve conflict --- erpnext/patches.txt | 5 ----- 1 file changed, 5 deletions(-) diff --git a/erpnext/patches.txt b/erpnext/patches.txt index da54fecd43e..d6d7cf18704 100644 --- a/erpnext/patches.txt +++ b/erpnext/patches.txt @@ -395,14 +395,9 @@ execute:frappe.db.set_single_value("Accounts Settings", "exchange_gain_loss_post erpnext.patches.v14_0.disable_add_row_in_gross_profit erpnext.patches.v15_0.set_difference_amount_in_asset_value_adjustment erpnext.patches.v14_0.update_posting_datetime -<<<<<<< HEAD erpnext.stock.doctype.stock_ledger_entry.patches.ensure_sle_indexes erpnext.patches.v15_0.update_query_report -erpnext.patches.v15_0.rename_field_from_rate_difference_to_amount_difference #2025-03-18 -erpnext.patches.v15_0.recalculate_amount_difference_field -======= erpnext.patches.v15_0.rename_field_from_rate_difference_to_amount_difference erpnext.patches.v15_0.recalculate_amount_difference_field #2025-03-18 ->>>>>>> dc45c3b39c (fix: date added to wrong patch) erpnext.patches.v15_0.rename_sla_fields #2025-03-12 erpnext.patches.v15_0.set_purchase_receipt_row_item_to_capitalization_stock_item