Merge pull request #32118 from rohitwaghchaure/provision-to-manual-reposting
fix: option to start reposting from repost item valuation
diff --git a/erpnext/accounts/doctype/bank_statement_import/bank_statement_import.js b/erpnext/accounts/doctype/bank_statement_import/bank_statement_import.js
index a964965..f745620 100644
--- a/erpnext/accounts/doctype/bank_statement_import/bank_statement_import.js
+++ b/erpnext/accounts/doctype/bank_statement_import/bank_statement_import.js
@@ -141,7 +141,7 @@
},
show_import_status(frm) {
- let import_log = JSON.parse(frm.doc.import_log || "[]");
+ let import_log = JSON.parse(frm.doc.statement_import_log || "[]");
let successful_records = import_log.filter((log) => log.success);
let failed_records = import_log.filter((log) => !log.success);
if (successful_records.length === 0) return;
@@ -309,7 +309,7 @@
// method: 'frappe.core.doctype.data_import.data_import.get_preview_from_template',
show_import_preview(frm, preview_data) {
- let import_log = JSON.parse(frm.doc.import_log || "[]");
+ let import_log = JSON.parse(frm.doc.statement_import_log || "[]");
if (
frm.import_preview &&
@@ -439,7 +439,7 @@
},
show_import_log(frm) {
- let import_log = JSON.parse(frm.doc.import_log || "[]");
+ let import_log = JSON.parse(frm.doc.statement_import_log || "[]");
let logs = import_log;
frm.toggle_display("import_log", false);
frm.toggle_display("import_log_section", logs.length > 0);
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 7ffff02..eede3bd 100644
--- a/erpnext/accounts/doctype/bank_statement_import/bank_statement_import.json
+++ b/erpnext/accounts/doctype/bank_statement_import/bank_statement_import.json
@@ -24,7 +24,7 @@
"section_import_preview",
"import_preview",
"import_log_section",
- "import_log",
+ "statement_import_log",
"show_failed_logs",
"import_log_preview",
"reference_doctype",
@@ -91,12 +91,6 @@
"read_only": 1
},
{
- "fieldname": "import_log",
- "fieldtype": "Code",
- "label": "Import Log",
- "options": "JSON"
- },
- {
"fieldname": "import_log_section",
"fieldtype": "Section Break",
"label": "Import Log"
@@ -198,11 +192,17 @@
{
"fieldname": "column_break_4",
"fieldtype": "Column Break"
+ },
+ {
+ "fieldname": "statement_import_log",
+ "fieldtype": "Code",
+ "label": "Statement Import Log",
+ "options": "JSON"
}
],
"hide_toolbar": 1,
"links": [],
- "modified": "2021-05-12 14:17:37.777246",
+ "modified": "2022-09-07 11:11:40.293317",
"modified_by": "Administrator",
"module": "Accounts",
"name": "Bank Statement Import",
diff --git a/erpnext/public/js/utils.js b/erpnext/public/js/utils.js
index f2bea58..6d64625 100755
--- a/erpnext/public/js/utils.js
+++ b/erpnext/public/js/utils.js
@@ -226,7 +226,7 @@
if (!found) {
filters.splice(index, 0, {
"fieldname": dimension["fieldname"],
- "label": __(dimension["label"]),
+ "label": __(dimension["doctype"]),
"fieldtype": "MultiSelectList",
get_data: function(txt) {
return frappe.db.get_link_options(dimension["doctype"], txt);