From af49f5a8affe9cdfa5bacecf37be200d2c19cade Mon Sep 17 00:00:00 2001 From: Mihir Kandoi Date: Wed, 19 Feb 2025 13:10:13 +0530 Subject: [PATCH] fix: patch path (cherry picked from commit dcec446e558ae83e93c8d036cb23f4460ec0891a) # Conflicts: # erpnext/patches.txt --- erpnext/patches.txt | 4 ++++ .../patches => patches/v15_0}/rename_sla_fields.py | 0 .../doctype/service_level_agreement/patches/__init__.py | 0 3 files changed, 4 insertions(+) rename erpnext/{support/doctype/service_level_agreement/patches => patches/v15_0}/rename_sla_fields.py (100%) delete mode 100644 erpnext/support/doctype/service_level_agreement/patches/__init__.py diff --git a/erpnext/patches.txt b/erpnext/patches.txt index 936bd74874f..2f7fbac904d 100644 --- a/erpnext/patches.txt +++ b/erpnext/patches.txt @@ -395,8 +395,12 @@ erpnext.patches.v14_0.disable_add_row_in_gross_profit <<<<<<< HEAD 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.v14_0.update_posting_datetime erpnext.support.doctype.service_level_agreement.patches.rename_sla_fields >>>>>>> baa0dd1235 (fix: rename some sla fields) +======= +erpnext.patches.v15_0.rename_sla_fields +>>>>>>> dcec446e55 (fix: patch path) diff --git a/erpnext/support/doctype/service_level_agreement/patches/rename_sla_fields.py b/erpnext/patches/v15_0/rename_sla_fields.py similarity index 100% rename from erpnext/support/doctype/service_level_agreement/patches/rename_sla_fields.py rename to erpnext/patches/v15_0/rename_sla_fields.py diff --git a/erpnext/support/doctype/service_level_agreement/patches/__init__.py b/erpnext/support/doctype/service_level_agreement/patches/__init__.py deleted file mode 100644 index e69de29bb2d..00000000000