From 2f0b97d91b6027126978642090f0e30686181ee6 Mon Sep 17 00:00:00 2001
From: ljain112 <ljain112@gmail.com>
Date: Tue, 25 Jun 2024 14:27:04 +0530
Subject: [PATCH] fix: remove deprecated field "statement_import_log"

(cherry picked from commit b20240942831d1118d00ca8762ebd4e0ff18f684)

# Conflicts:
#	erpnext/accounts/doctype/bank_statement_import/bank_statement_import.json
---
 .../bank_statement_import/bank_statement_import.json  | 11 ++++-------
 .../bank_statement_import/bank_statement_import.py    |  1 -
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/erpnext/accounts/doctype/bank_statement_import/bank_statement_import.json b/erpnext/accounts/doctype/bank_statement_import/bank_statement_import.json
index fac19fd2d28..4d9721f771d 100644
--- a/erpnext/accounts/doctype/bank_statement_import/bank_statement_import.json
+++ b/erpnext/accounts/doctype/bank_statement_import/bank_statement_import.json
@@ -26,7 +26,6 @@
   "section_import_preview",
   "import_preview",
   "import_log_section",
-  "statement_import_log",
   "show_failed_logs",
   "import_log_preview",
   "reference_doctype",
@@ -195,12 +194,6 @@
    "fieldname": "column_break_4",
    "fieldtype": "Column Break"
   },
-  {
-   "fieldname": "statement_import_log",
-   "fieldtype": "Code",
-   "label": "Statement Import Log",
-   "options": "JSON"
-  },
   {
    "default": "0",
    "fieldname": "custom_delimiters",
@@ -218,11 +211,15 @@
  ],
  "hide_toolbar": 1,
  "links": [],
+<<<<<<< HEAD
 <<<<<<< HEAD
  "modified": "2022-09-07 11:11:40.293317",
 =======
  "modified": "2024-06-25 15:34:35.214946",
 >>>>>>> 13fb560401 (fix: custom delimiters)
+=======
+ "modified": "2024-06-25 16:33:50.675848",
+>>>>>>> b202409428 (fix: remove deprecated field "statement_import_log")
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Bank Statement Import",
diff --git a/erpnext/accounts/doctype/bank_statement_import/bank_statement_import.py b/erpnext/accounts/doctype/bank_statement_import/bank_statement_import.py
index 9b0989f5b23..0311f8b1bcb 100644
--- a/erpnext/accounts/doctype/bank_statement_import/bank_statement_import.py
+++ b/erpnext/accounts/doctype/bank_statement_import/bank_statement_import.py
@@ -39,7 +39,6 @@ class BankStatementImport(DataImport):
 		mute_emails: DF.Check
 		reference_doctype: DF.Link
 		show_failed_logs: DF.Check
-		statement_import_log: DF.Code | None
 		status: DF.Literal["Pending", "Success", "Partial Success", "Error"]
 		submit_after_import: DF.Check
 		template_options: DF.Code | None