nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-03-20 15:32:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: field position

Browse Source 
(cherry picked from commit 98ad01c736)

# Conflicts:
#	erpnext/accounts/doctype/bank_statement_import/bank_statement_import.json
This commit is contained in:
ljain112
2024-06-25 15:04:21 +05:30
committed by Mergify
parent 4eb251b59a
commit a04938d5ae
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
erpnext/accounts/doctype/bank_statement_import/bank_statement_import.json
View File

@@ -11,13 +11,13 @@
"bank_account", "bank_account",
"bank", "bank",
"column_break_4", "column_break_4",
"custom_delimiters",
"delimiter_options",
"google_sheets_url", "google_sheets_url",
"refresh_google_sheet", "refresh_google_sheet",
"html_5", "html_5",
"import_file", "import_file",
"download_template", "download_template",
"custom_delimiters",
"delimiter_options",
"status", "status",
"template_options", "template_options",
"import_warnings_section", "import_warnings_section",
@@ -212,6 +212,7 @@
"hide_toolbar": 1, "hide_toolbar": 1,
"links": [], "links": [],
<<<<<<< HEAD <<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD
"modified": "2022-09-07 11:11:40.293317", "modified": "2022-09-07 11:11:40.293317",
======= =======
@@ -220,6 +221,9 @@
======= =======
"modified": "2024-06-25 16:33:50.675848", "modified": "2024-06-25 16:33:50.675848",
>>>>>>> b202409428 (fix: remove deprecated field "statement_import_log") >>>>>>> b202409428 (fix: remove deprecated field "statement_import_log")
=======
"modified": "2024-06-25 17:32:07.658250",
>>>>>>> 98ad01c736 (fix: field position)
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Accounts", "module": "Accounts",
"name": "Bank Statement Import", "name": "Bank Statement Import",