fix: link to error log list

chore: change log for v13.13.0

.coderabbit.yml

@@ -1,12 +0,0 @@
-reviews:
-  auto_review:
-    ignore_title_keywords:
-      - "sync translations"
-      - "update POT file"
-      - "style: "
-  review_status: false
-  poem: false
-  collapse_walkthrough: true
-  sequence_diagrams: false
-  changed_files_summary: false
-  high_level_summary: false

.editorconfig

@@ -9,13 +9,6 @@ trim_trailing_whitespace = true
 charset = utf-8
 
 # python, js indentation settings
-[{*.py,*.js,*.vue,*.css,*.scss,*.html}]
+[{*.py,*.js}]
 indent_style = tab
 indent_size = 4
-max_line_length = 110
-
-# JSON files - mostly doctype schema files
-[{*.json}]
-insert_final_newline = false
-indent_style = space
-indent_size = 1

.eslintrc

@@ -2,32 +2,65 @@
 	"env": {
 		"browser": true,
 		"node": true,
-		"es2022": true
+		"es6": true
 	},
 	"parserOptions": {
+		"ecmaVersion": 9,
 		"sourceType": "module"
 	},
 	"extends": "eslint:recommended",
 	"rules": {
-		"indent": "off",
-		"brace-style": "off",
-		"no-mixed-spaces-and-tabs": "off",
-		"no-useless-escape": "off",
-		"space-unary-ops": ["error", { "words": true }],
-		"linebreak-style": "off",
-		"quotes": ["off"],
-		"semi": "off",
-		"camelcase": "off",
-		"no-unused-vars": "off",
-		"no-console": ["warn"],
-		"no-extra-boolean-cast": ["off"],
-		"no-control-regex": ["off"]
+		"indent": [
+			"error",
+			"tab",
+			{ "SwitchCase": 1 }
+		],
+		"brace-style": [
+			"error",
+			"1tbs"
+		],
+		"space-unary-ops": [
+			"error",
+			{ "words": true }
+		],
+		"linebreak-style": [
+			"error",
+			"unix"
+		],
+		"quotes": [
+			"off"
+		],
+		"semi": [
+			"warn",
+			"always"
+		],
+		"camelcase": [
+			"off"
+		],
+		"no-unused-vars": [
+			"warn"
+		],
+		"no-redeclare": [
+			"warn"
+		],
+		"no-console": [
+			"warn"
+		],
+		"no-extra-boolean-cast": [
+			"off"
+		],
+		"no-control-regex": [
+			"off"
+		],
+		"space-before-blocks": "warn",
+		"keyword-spacing": "warn",
+		"comma-spacing": "warn",
+		"key-spacing": "warn"
 	},
 	"root": true,
 	"globals": {
 		"frappe": true,
 		"Vue": true,
-		"SetVueGlobals": true,
 		"erpnext": true,
 		"hub": true,
 		"$": true,
@@ -64,10 +97,8 @@
 		"is_null": true,
 		"in_list": true,
 		"has_common": true,
-		"posthog": true,
 		"has_words": true,
 		"validate_email": true,
-		"open_web_template_values_editor": true,
 		"get_number_format": true,
 		"format_number": true,
 		"format_currency": true,
@@ -123,8 +154,8 @@
 		"before": true,
 		"beforeEach": true,
 		"onScan": true,
+		"html2canvas": true,
 		"extend_cscript": true,
-		"localforage": true,
-		"Plaid": true
+		"localforage": true
 	}
 }

.flake8

@@ -28,10 +28,6 @@ ignore =
     B007,
     B950,
     W191,
-    E124, # closing bracket, irritating while writing QB code
-    E131, # continuation line unaligned for hanging indent
-    E123, # closing bracket does not match indentation of opening bracket's line
-    E101, # ensured by use of black
 
 max-line-length = 200
 exclude=.github/helper/semgrep_rules

.git-blame-ignore-revs

@@ -8,46 +8,12 @@
 #
 # $ git config blame.ignoreRevsFile .git-blame-ignore-revs
 
-# Replace use of Class.extend with native JS class
-1fe891b287a1b3f225d29ee3d07e7b1824aba9e7
-
 # This commit just changes spaces to tabs for indentation in some files
 5f473611bd6ed57703716244a054d3fb5ba9cd23
 
-# Whitespace fix throughout codebase
-4551d7d6029b6f587f6c99d4f8df5519241c6a86
-b147b85e6ac19a9220cd1e2958a6ebd99373283a
+# Whitespace trimming throughout codebase
+9bb69e711a5da43aaf8c8ecb5601aeffd89dbe5a
+f0bcb753fb7ebbb64bb0d6906d431d002f0f7d8f
 
-# sort and cleanup imports
-915b34391c2066dfc83e60a5813c5a877cebe7ac
-
-# removing six compatibility layer
-8fe5feb6a4372bf5f2dfaf65fca41bbcc25c8ce7
-
-# bulk format python code with black
-494bd9ef78313436f0424b918f200dab8fc7c20b
-
-# bulk format python code with black
-baec607ff5905b1c67531096a9cf50ec7ff00a5d
-
-# bulk refactor with sourcery
-eb9ee3f79b94e594fc6dfa4f6514580e125eee8c
-
-# js formatting
-ec74a5e56617bbd76ac402451468fd4668af543d
-
-# ruff formatting
-a308792ee7fda18a681e9181f4fd00b36385bc23
-
-# noisy typing refactoring of get_item_details
-7b7211ac79c248a79ba8a999ff34e734d874c0ae
-d827ed21adc7b36047e247cbb0dc6388d048a7f9
-
-# `frappe.flags.in_test` => `frappe.in_test`
-7a482a69985c952de0e8193c9d4e086aee65ee6d
-
-# these commits actually changed something valuable
-# but they have a lot of whitespace changes that make blame noisy
-# PR: https://github.com/frappe/erpnext/pull/49816
-3ffd50c772735877b330d010c1058f623da8721d
-0e8f8677b8eb31e7834f72d1c6314d3c3f392ca6
+# imports cleanup
+4b2be2999f2203493b49bf74c5b440d49e38b5e3

.github/CONTRIBUTING.md

@@ -1,70 +1,36 @@
-### Introduction (For First-Time Contributors)
+### Introduction (first timers)
 
-Thank you for your interest in raising an issue with ERPNext. An issue can be either a bug report or a feature request.
+Thank you for your interest in raising an Issue with ERPNext. An Issue could mean a bug report or a request for a missing feature. By raising a bug report, you are contributing to the development of ERPNext and this is the first step of participating in the community. Bug reports are very helpful for developers as they quickly fix the issue before other users start facing it.
 
-By reporting bugs, you contribute directly to improving ERPNext. Bug reports help developers identify and fix issues quickly before they affect more users.
+Feature requests are also a great way to take the product forward. New ideas can come in any user scenario and the issue list also acts a roadmap of future features.
 
-Feature requests are also valuable. They help shape the future of the product by introducing new ideas and improvements based on real-world use cases.
+When you are raising an Issue, you should keep a few things in mind. Remember that the developer does not have access to your machine so you must give all the information you can while raising an Issue. If you are suggesting a feature, you should be very clear about what you want.
 
-When raising an issue, keep in mind that developers do not have access to your environment. Therefore, provide as much relevant information as possible.
-
-If you are suggesting a feature, clearly describe what you expect and how it should behave.
-
-> ⚠️ The issue tracker is not the right place for general questions or discussions.  
-> Please use the forum instead: https://discuss.frappe.io/c/erpnext/6
-
----
+The Issue list is not the right place to ask a question or start a general discussion. If you want to do that , then the right place is the forum [https://discuss.erpnext.com](https://discuss.erpnext.com).
 
 ### Reply and Closing Policy
 
-If your issue is unclear or does not meet the guidelines, it may be closed.
-
-If that happens, please provide the requested information and reopen the issue.
-
----
+If your issue is not clear or does not meet the guidelines, then it will be closed. If it is closed, please supply the information asked and re-open it.
 
 ### General Issue Guidelines
 
-1. **Search existing issues:**  
-   Before creating a new issue, check if it already exists. You can support existing issues with a 👍 or contribute additional details or mockups.
-
-2. **Report issues separately:**  
-   Do not combine multiple unrelated issues into a single report.
-
-3. **Be concise:**  
-   Avoid long explanations. Use bullet points and screenshots where possible.
-
----
+1. **Search existing Issues:** Before raising a Issue, search if it has been raised before. Maybe add a 👍 or give additional help by creating a mockup if it is not already created.
+1. **Report each issue separately:** Don't club multiple, unreleated issues in one note.
+1. **Brief:** Please don't include long explanations. Use screenshots and bullet points instead of descriptive paragraphs.
 
 ### Bug Report Guidelines
 
-1. **Steps to reproduce:**  
-   Clearly list the steps required to reproduce the issue. If the issue cannot be reproduced, it cannot be fixed.
-
-2. **Version number:**  
-   Include the ERPNext version. The issue may already be fixed in a newer release.
-
-3. **Clear title:**  
-   Use a descriptive title (e.g., "Unable to submit Purchase Order without Basic Rate" instead of "Cannot submit").
-
-4. **Screenshots:**  
-   Add screenshots or screen recordings (e.g., `.gif`) to illustrate the issue.
-
----
+1. **Steps to Reproduce:** The bug report must have a list of steps needed to reproduce a bug. If we cannot reproduce it, then we cannot solve it.
+1. **Version Number:** Please add the version number in your report. Often a bug is fixed in the latest version
+1. **Clear Title:** Add a clear subject to your bug report like "Unable to submit Purchase Order without Basic Rate" instead of just "Cannot Submit"
+1. **Screenshots:** Screenshots are a great way of communicating the issues. Try adding annotations or using LiceCAP to take a screencast in `gif`.
 
 ### Feature Request Guidelines
 
-1. **Clarity:**  
-   Clearly describe the expected behavior. Avoid vague statements.
+1. **Clarity:** Clearly specify how do you want the feature to behave. Don't just say "I would like multiple PDF formats", say that "Ability to add multiple print formats for customers with different languages".
+1. **Solution:** Try and identify how the feature should look like.
+1. **Mockups:** Mockups are a great way to explain your requirement.
 
-2. **Proposed solution:**  
-   Suggest how the feature should work.
+### What if my Issue is closed
 
-3. **Mockups:**  
-   Provide mockups or examples whenever possible.
-
----
-
-### What if my issue is closed?
-
-Don't worry. Review the feedback, provide the required information, and reopen the issue.
+Don't worry, take the feedback, supply the correct information and re-open it!

.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,47 @@
+---
+name: Bug report
+about: Report a bug encountered while using ERPNext
+labels: bug
+---
+
+<!--
+Welcome to ERPNext issue tracker! Before creating an issue, please heed the following:
+
+1. This tracker should only be used to report bugs and request features / enhancements to ERPNext
+    - For questions and general support, checkout the manual https://erpnext.com/docs/user/manual/en or use https://discuss.erpnext.com
+    - For documentation issues, refer to https://github.com/frappe/erpnext_com
+2. Use the search function before creating a new issue. Duplicates will be closed and directed to
+   the original discussion.
+3. When making a bug report, make sure you provide all required information. The easier it is for
+   maintainers to reproduce, the faster it'll be fixed.
+4. If you think you know what the reason for the bug is, share it with us. Maybe put in a PR 😉
+-->
+
+## Description of the issue
+
+## Context information (for bug reports)
+
+**Output of `bench version`**
+```
+(paste here)
+```
+
+## Steps to reproduce the issue
+
+1.
+2.
+3.
+
+### Observed result
+
+### Expected result
+
+### Stacktrace / full error message
+
+```
+(paste here)
+```
+
+## Additional information
+
+OS version / distribution, `ERPNext` install method, etc.

.github/ISSUE_TEMPLATE/bug_report.yaml

@@ -1,89 +0,0 @@
-name: Bug Report
-description: Report a bug encountered while using ERPNext
-labels: ["bug"]
-
-body:
-  - type: markdown
-    attributes:
-      value: |
-        Welcome to ERPNext issue tracker! Before creating an issue, please heed the following:
-
-        1. This tracker should only be used to report bugs and request features / enhancements to ERPNext
-            - For questions and general support, checkout the [user manual](https://docs.erpnext.com/) or use [forum](https://discuss.frappe.io/c/erpnext/6)
-            - For documentation issues, propose edit on [documentation site](https://docs.erpnext.com/) directly.
-        2. When making a bug report, make sure you provide all required information. The easier it is for
-           maintainers to reproduce, the faster it'll be fixed.
-        3. If you think you know what the reason for the bug is, share it with us. Maybe put in a PR 😉
-
-  - type: textarea
-    id: bug-info
-    attributes:
-      label: Information about bug
-      description: Also tell us, what did you expect to happen?
-      placeholder: Please provide as much information as possible.
-    validations:
-      required: true
-
-  - type: dropdown
-    id: module
-    attributes:
-      label: Module
-      description: Select affected module of ERPNext.
-      multiple: true
-      options:
-        - accounts
-        - stock
-        - buying
-        - selling
-        - ecommerce
-        - manufacturing
-        - HR
-        - projects
-        - support
-        - CRM
-        - assets
-        - integrations
-        - quality
-        - regional
-        - portal
-        - agriculture
-        - education
-        - non-profit
-        - other
-    validations:
-      required: true
-
-  - type: textarea
-    id: exact-version
-    attributes:
-      label: Version
-      description: Share exact version number of Frappe and ERPNext you are using.
-      placeholder: |
-        Frappe version -
-        ERPNext version -
-    validations:
-      required: true
-
-  - type: dropdown
-    id: install-method
-    attributes:
-      label: Installation method
-      options:
-        - docker
-        - easy-install
-        - manual install
-        - FrappeCloud
-    validations:
-      required: false
-
-  - type: textarea
-    id: logs
-    attributes:
-      label: Relevant log output / Stack trace / Full Error Message.
-      description: Please copy and paste any relevant log output. This will be automatically formatted.
-      render: shell
-
-  - type: markdown
-    attributes:
-      value: |
-        By submitting this issue, you agree to follow our [Code of Conduct](https://github.com/frappe/erpnext/blob/develop/CODE_OF_CONDUCT.md)

.github/ISSUE_TEMPLATE/config.yml

@@ -1,5 +1,5 @@
 blank_issues_enabled: false
 contact_links:
   - name: Community Forum
-    url: https://discuss.frappe.io/c/erpnext/6
+    url: https://discuss.erpnext.com/
     about: For general QnA, discussions and community help.

.github/ISSUE_TEMPLATE/feature_request.md

@@ -1,37 +1,22 @@
 ---
 name: Feature request
-about: Suggest an idea or enhancement for ERPNext
-title: ''
+about: Suggest an idea to improve ERPNext
 labels: feature-request
-assignees: ''
-
 ---
 
 <!--
 Welcome to ERPNext issue tracker! Before creating an issue, please heed the following:
 
 1. This tracker should only be used to report bugs and request features / enhancements to ERPNext
-    - For questions and general support, checkout the manual https://docs.erpnext.com or use https://discuss.frappe.io/c/erpnext/6
+    - For questions and general support, checkout the manual https://erpnext.com/docs/user/manual/en or use https://discuss.erpnext.com
+    - For documentation issues, refer to https://github.com/frappe/erpnext_com
 2. Use the search function before creating a new issue. Duplicates will be closed and directed to
    the original discussion.
-3. When making a feature request, make sure to be as verbose as possible. The better you convey your message, the greater the drive to make it happen.
-
-
-Please keep in mind that we get many requests and we can't possibly work on all of them, we prioritize development based on the goals of the product and organization. Feature requests are still welcome as it helps us in research when we do decide to work on the requested feature. 
-
-If you're in urgent need of a feature, please try the following channels to get paid developments done quickly:
-1. Certified ERPNext partners: https://erpnext.com/partners 
-2. Developer community on ERPNext forums: https://discuss.frappe.io/c/framework/5  
-3. Telegram group for ERPNext/Frappe development work: https://t.me/erpnext_opps 
-
+3. When making a feature request, make sure to be as verbose as possible. The better you convey your message, the     greater the drive to make it happen.
 -->
-## Before Submitting
-- [ ] I searched existing issues and confirmed this is not a duplicate
-- [ ] This is a feature request, not a bug or support question
-- [ ] For support: https://discuss.frappe.io/c/erpnext/6
 
 **Is your feature request related to a problem? Please describe.**
-A clear and concise description of what the problem is. Ex. As a [role], I have to [painful task] because [missing feature].
+A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
 
 **Describe the solution you'd like**
 A clear and concise description of what you want to happen.
@@ -39,17 +24,5 @@ A clear and concise description of what you want to happen.
 **Describe alternatives you've considered**
 A clear and concise description of any alternative solutions or features you've considered.
 
-**Impact**
-<!-- Check one: -->
-- [ ] Blocks critical workflow — no viable workaround
-- [ ] Significant friction — workaround exists but is painful
-- [ ] Nice to have — minor improvement
-
 **Additional context**
 Add any other context or screenshots about the feature request here.
-
-**Environment**
-- ERPNext Version: <!-- Find this in Help > About, e.g. v15.12.0 -->
-- Frappe Version: <!-- Find this in Help > About, e.g. v15.10.0 -->
-- Deployment: <!-- Frappe Cloud / Self-hosted / ERPNext Cloud -->
-

.github/ISSUE_TEMPLATE/question-about-using-erpnext.md

@@ -0,0 +1,17 @@
+---
+name: Question about using ERPNext
+about: This is not the appropriate channel
+labels: invalid
+---
+
+Please post on our forums:
+
+for questions about using `ERPNext`: https://discuss.erpnext.com
+
+for questions about using the `Frappe Framework`: ~~https://discuss.frappe.io~~ => [stackoverflow](https://stackoverflow.com/questions/tagged/frappe) tagged under `frappe`
+
+for questions about using `bench`, probably the best place to start is the [bench repo](https://github.com/frappe/bench)
+
+For documentation issues, use the [ERPNext Documentation](https://erpnext.com/docs/) or [Frappe Framework Documentation](https://frappe.io/docs/user/en) or the [developer cheetsheet](https://github.com/frappe/frappe/wiki/Developer-Cheatsheet)
+
+> **Posts that are not bug reports or feature requests will not be addressed on this issue tracker.**

.github/helper/.flake8_strict

@@ -66,8 +66,6 @@ ignore =
     F841,
     E713,
     E712,
-    B023,
-    B028
 
 
 max-line-length = 200

.github/helper/documentation.py

@@ -3,63 +3,52 @@ from urllib.parse import urlparse
 
 import requests
 
-WEBSITE_REPOS = [
+docs_repos = [
+	"frappe_docs",
+	"erpnext_documentation",
 	"erpnext_com",
 	"frappe_io",
 ]
 
-DOCUMENTATION_DOMAINS = [
-	"docs.erpnext.com",
-	"docs.frappe.io",
-	"frappeframework.com",
-]
 
+def uri_validator(x):
+	result = urlparse(x)
+	return all([result.scheme, result.netloc, result.path])
 
-def is_valid_url(url: str) -> bool:
-	parts = urlparse(url)
-	return all((parts.scheme, parts.netloc, parts.path))
-
-
-def is_documentation_link(word: str) -> bool:
-	if not word.startswith("http") or not is_valid_url(word):
-		return False
-
-	parsed_url = urlparse(word)
-	if parsed_url.netloc in DOCUMENTATION_DOMAINS:
-		return True
-
-	if parsed_url.netloc == "github.com":
-		parts = parsed_url.path.split("/")
-		if len(parts) == 5 and parts[1] == "frappe" and parts[2] in WEBSITE_REPOS:
-			return True
-
-	return False
-
-
-def contains_documentation_link(body: str) -> bool:
-	return any(is_documentation_link(word) for line in body.splitlines() for word in line.split())
-
-
-def check_pull_request(number: str) -> "tuple[int, str]":
-	response = requests.get(f"https://api.github.com/repos/frappe/erpnext/pulls/{number}")
-	if not response.ok:
-		return 1, "Pull Request Not Found! ⚠️"
-
-	payload = response.json()
-	title = (payload.get("title") or "").lower().strip()
-	head_sha = (payload.get("head") or {}).get("sha")
-	body = (payload.get("body") or "").lower()
-
-	if not title.startswith("feat") or not head_sha or "no-docs" in body or "backport" in body:
-		return 0, "Skipping documentation checks... 🏃"
-
-	if contains_documentation_link(body):
-		return 0, "Documentation Link Found. You're Awesome! 🎉"
-
-	return 1, "Documentation Link Not Found! ⚠️"
+def docs_link_exists(body):
+	for line in body.splitlines():
+		for word in line.split():
+			if word.startswith('http') and uri_validator(word):
+				parsed_url = urlparse(word)
+				if parsed_url.netloc == "github.com":
+					parts = parsed_url.path.split('/')
+					if len(parts) == 5 and parts[1] == "frappe" and parts[2] in docs_repos:
+						return True
+				elif parsed_url.netloc == "docs.erpnext.com":
+					return True
 
 
 if __name__ == "__main__":
-	exit_code, message = check_pull_request(sys.argv[1])
-	print(message)
-	sys.exit(exit_code)
+	pr = sys.argv[1]
+	response = requests.get("https://api.github.com/repos/frappe/erpnext/pulls/{}".format(pr))
+
+	if response.ok:
+		payload = response.json()
+		title = (payload.get("title") or "").lower().strip()
+		head_sha = (payload.get("head") or {}).get("sha")
+		body = (payload.get("body") or "").lower()
+
+		if (title.startswith("feat")
+			and head_sha
+			and "no-docs" not in body
+			and "backport" not in body
+		):
+			if docs_link_exists(body):
+				print("Documentation Link Found. You're Awesome! 🎉")
+
+			else:
+				print("Documentation Link Not Found! ⚠️")
+				sys.exit(1)
+
+		else:
+			print("Skipping documentation checks... 🏃")

.github/helper/install.sh

@@ -4,60 +4,30 @@ set -e
 
 cd ~ || exit
 
-sudo apt update
-sudo apt remove mysql-server mysql-client
-sudo apt install libcups2-dev redis-server mariadb-client libmariadb-dev
+sudo apt-get install redis-server libcups2-dev
 
 pip install frappe-bench
 
-githubbranch=${GITHUB_BASE_REF:-${GITHUB_REF##*/}}
-frappeuser=${FRAPPE_USER:-"frappe"}
-frappecommitish=${FRAPPE_BRANCH:-$githubbranch}
-
-mkdir frappe
-pushd frappe
-git init
-git remote add origin "https://github.com/${frappeuser}/frappe"
-git fetch origin "${frappecommitish}" --depth 1
-git checkout FETCH_HEAD
-popd
-
+git clone https://github.com/frappe/frappe --branch "${GITHUB_BASE_REF:-${GITHUB_REF##*/}}" --depth 1
 bench init --skip-assets --frappe-path ~/frappe --python "$(which python)" frappe-bench
 
 mkdir ~/frappe-bench/sites/test_site
+cp -r "${GITHUB_WORKSPACE}/.github/helper/site_config.json" ~/frappe-bench/sites/test_site/
 
-if [ "$DB" == "mariadb" ];then
-    cp -r "${GITHUB_WORKSPACE}/.github/helper/site_config_mariadb.json" ~/frappe-bench/sites/test_site/site_config.json
-else
-    cp -r "${GITHUB_WORKSPACE}/.github/helper/site_config_postgres.json" ~/frappe-bench/sites/test_site/site_config.json
-fi
+mysql --host 127.0.0.1 --port 3306 -u root -e "SET GLOBAL character_set_server = 'utf8mb4'"
+mysql --host 127.0.0.1 --port 3306 -u root -e "SET GLOBAL collation_server = 'utf8mb4_unicode_ci'"
 
+mysql --host 127.0.0.1 --port 3306 -u root -e "CREATE USER 'test_frappe'@'localhost' IDENTIFIED BY 'test_frappe'"
+mysql --host 127.0.0.1 --port 3306 -u root -e "CREATE DATABASE test_frappe"
+mysql --host 127.0.0.1 --port 3306 -u root -e "GRANT ALL PRIVILEGES ON \`test_frappe\`.* TO 'test_frappe'@'localhost'"
 
-if [ "$DB" == "mariadb" ];then
-    mariadb --host 127.0.0.1 --port 3306 -u root -proot -e "SET GLOBAL character_set_server = 'utf8mb4'"
-    mariadb --host 127.0.0.1 --port 3306 -u root -proot -e "SET GLOBAL collation_server = 'utf8mb4_unicode_ci'"
-
-    mariadb --host 127.0.0.1 --port 3306 -u root -proot -e "CREATE USER 'test_frappe'@'localhost' IDENTIFIED BY 'test_frappe'"
-    mariadb --host 127.0.0.1 --port 3306 -u root -proot -e "CREATE DATABASE test_frappe"
-    mariadb --host 127.0.0.1 --port 3306 -u root -proot -e "GRANT ALL PRIVILEGES ON \`test_frappe\`.* TO 'test_frappe'@'localhost'"
-
-    mariadb --host 127.0.0.1 --port 3306 -u root -proot -e "FLUSH PRIVILEGES"
-fi
-
-if [ "$DB" == "postgres" ];then
-    echo "travis" | psql -h 127.0.0.1 -p 5432 -c "CREATE DATABASE test_frappe" -U postgres;
-    echo "travis" | psql -h 127.0.0.1 -p 5432 -c "CREATE USER test_frappe WITH PASSWORD 'test_frappe'" -U postgres;
-fi
-
-
-install_whktml() {
-    wget -O /tmp/wkhtmltox.deb https://github.com/wkhtmltopdf/packaging/releases/download/0.12.6.1-2/wkhtmltox_0.12.6.1-2.jammy_amd64.deb
-    sudo apt install /tmp/wkhtmltox.deb
-
-}
-install_whktml &
-wkpid=$!
+mysql --host 127.0.0.1 --port 3306 -u root -e "UPDATE mysql.user SET Password=PASSWORD('travis') WHERE User='root'"
+mysql --host 127.0.0.1 --port 3306 -u root -e "FLUSH PRIVILEGES"
 
+wget -O /tmp/wkhtmltox.tar.xz https://github.com/frappe/wkhtmltopdf/raw/master/wkhtmltox-0.12.3_linux-generic-amd64.tar.xz
+tar -xf /tmp/wkhtmltox.tar.xz -C /tmp
+sudo mv /tmp/wkhtmltox/bin/wkhtmltopdf /usr/local/bin/wkhtmltopdf
+sudo chmod o+x /usr/local/bin/wkhtmltopdf
 
 cd ~/frappe-bench || exit
 
@@ -66,13 +36,6 @@ sed -i 's/schedule:/# schedule:/g' Procfile
 sed -i 's/socketio:/# socketio:/g' Procfile
 sed -i 's/redis_socketio:/# redis_socketio:/g' Procfile
 
-bench get-app payments --branch develop
 bench get-app erpnext "${GITHUB_WORKSPACE}"
-
-if [ "$TYPE" == "server" ]; then bench setup requirements --dev; fi
-
-wait $wkpid
-
-bench start &>> ~/frappe-bench/bench_start.log &
-CI=Yes bench build --app frappe &
+bench start &> bench_run_logs.txt &
 bench --site test_site reinstall --yes

.github/helper/semgrep_rules/README.md

@@ -0,0 +1,38 @@
+# Semgrep linting
+
+## What is semgrep?
+Semgrep or "semantic grep" is language agnostic static analysis tool. In simple terms semgrep is syntax-aware `grep`, so unlike regex it doesn't get confused by different ways of writing same thing or whitespaces or code split in multiple lines etc.
+
+Example:
+
+To check if a translate function is using f-string or not the regex would be `r"_\(\s*f[\"']"` while equivalent rule in semgrep would be `_(f"...")`. As semgrep knows grammer of language it takes care of unnecessary whitespace, type of quotation marks etc.
+
+You can read more such examples in `.github/helper/semgrep_rules` directory.
+
+# Why/when to use this?
+We want to maintain quality of contributions, at the same time remembering all the good practices can be pain to deal with while evaluating contributions. Using semgrep if you can translate "best practice" into a rule then it can automate the task for us.
+
+## Running locally
+
+Install semgrep using homebrew `brew install semgrep` or pip `pip install semgrep`.
+
+To run locally use following command:
+
+`semgrep --config=.github/helper/semgrep_rules [file/folder names]`
+
+## Testing
+semgrep allows testing the tests. Refer to this page: https://semgrep.dev/docs/writing-rules/testing-rules/
+
+When writing new rules you should write few positive and few negative cases as shown in the guide and current tests.
+
+To run current tests: `semgrep --test --test-ignore-todo .github/helper/semgrep_rules`
+
+
+## Reference
+
+If you are new to Semgrep read following pages to get started on writing/modifying rules:
+
+- https://semgrep.dev/docs/getting-started/
+- https://semgrep.dev/docs/writing-rules/rule-syntax
+- https://semgrep.dev/docs/writing-rules/pattern-examples/
+- https://semgrep.dev/docs/writing-rules/rule-ideas/#common-use-cases

.github/helper/semgrep_rules/frappe_correctness.py

@@ -0,0 +1,63 @@
+import frappe
+from frappe import _
+from frappe.model.document import Document
+
+
+# ruleid: frappe-modifying-but-not-comitting
+def on_submit(self):
+	if self.value_of_goods == 0:
+		frappe.throw(_('Value of goods cannot be 0'))
+	self.status = 'Submitted'
+
+
+# ok: frappe-modifying-but-not-comitting
+def on_submit(self):
+	if self.value_of_goods == 0:
+		frappe.throw(_('Value of goods cannot be 0'))
+	self.status = 'Submitted'
+	self.db_set('status', 'Submitted')
+
+# ok: frappe-modifying-but-not-comitting
+def on_submit(self):
+	if self.value_of_goods == 0:
+		frappe.throw(_('Value of goods cannot be 0'))
+	x = "y"
+	self.status = x
+	self.db_set('status', x)
+
+
+# ok: frappe-modifying-but-not-comitting
+def on_submit(self):
+	x = "y"
+	self.status = x
+	self.save()
+
+# ruleid: frappe-modifying-but-not-comitting-other-method
+class DoctypeClass(Document):
+	def on_submit(self):
+		self.good_method()
+		self.tainted_method()
+
+	def tainted_method(self):
+		self.status = "uptate"
+
+
+# ok: frappe-modifying-but-not-comitting-other-method
+class DoctypeClass(Document):
+	def on_submit(self):
+		self.good_method()
+		self.tainted_method()
+
+	def tainted_method(self):
+		self.status = "update"
+		self.db_set("status", "update")
+
+# ok: frappe-modifying-but-not-comitting-other-method
+class DoctypeClass(Document):
+	def on_submit(self):
+		self.good_method()
+		self.tainted_method()
+		self.save()
+
+	def tainted_method(self):
+		self.status = "uptate"

.github/helper/semgrep_rules/frappe_correctness.yml

@@ -0,0 +1,151 @@
+# This file specifies rules for correctness according to how frappe doctype data model works.
+
+rules:
+- id: frappe-modifying-but-not-comitting
+  patterns:
+    - pattern: |
+        def $METHOD(self, ...):
+          ...
+          self.$ATTR = ...
+    - pattern-not: |
+        def $METHOD(self, ...):
+          ...
+          self.$ATTR = ...
+          ...
+          self.db_set(..., self.$ATTR, ...)
+    - pattern-not: |
+        def $METHOD(self, ...):
+          ...
+          self.$ATTR = $SOME_VAR
+          ...
+          self.db_set(..., $SOME_VAR, ...)
+    - pattern-not: |
+        def $METHOD(self, ...):
+          ...
+          self.$ATTR = $SOME_VAR
+          ...
+          self.save()
+    - metavariable-regex:
+        metavariable: '$ATTR'
+        # this is negative look-ahead, add more attrs to ignore like (ignore|ignore_this_too|ignore_me)
+        regex: '^(?!ignore_linked_doctypes|status_updater)(.*)$'
+    - metavariable-regex:
+        metavariable: "$METHOD"
+        regex: "(on_submit|on_cancel)"
+  message: |
+    DocType modified in self.$METHOD. Please check if modification of self.$ATTR is commited to database.
+  languages: [python]
+  severity: ERROR
+
+- id: frappe-modifying-but-not-comitting-other-method
+  patterns:
+  - pattern: |
+      class $DOCTYPE(...):
+        def $METHOD(self, ...):
+          ...
+          self.$ANOTHER_METHOD()
+          ...
+
+        def $ANOTHER_METHOD(self, ...):
+          ...
+          self.$ATTR = ...
+  - pattern-not: |
+      class $DOCTYPE(...):
+        def $METHOD(self, ...):
+          ...
+          self.$ANOTHER_METHOD()
+          ...
+
+        def $ANOTHER_METHOD(self, ...):
+          ...
+          self.$ATTR = ...
+          ...
+          self.db_set(..., self.$ATTR, ...)
+  - pattern-not: |
+      class $DOCTYPE(...):
+        def $METHOD(self, ...):
+          ...
+          self.$ANOTHER_METHOD()
+          ...
+
+        def $ANOTHER_METHOD(self, ...):
+          ...
+          self.$ATTR = $SOME_VAR
+          ...
+          self.db_set(..., $SOME_VAR, ...)
+  - pattern-not: |
+      class $DOCTYPE(...):
+        def $METHOD(self, ...):
+          ...
+          self.$ANOTHER_METHOD()
+          ...
+          self.save()
+        def $ANOTHER_METHOD(self, ...):
+          ...
+          self.$ATTR = ...
+  - metavariable-regex:
+      metavariable: "$METHOD"
+      regex: "(on_submit|on_cancel)"
+  message: |
+    self.$ANOTHER_METHOD is called from self.$METHOD, check if changes to self.$ATTR are commited to database.
+  languages: [python]
+  severity: ERROR
+
+- id: frappe-print-function-in-doctypes
+  pattern: print(...)
+  message: |
+      Did you mean to leave this print statement in? Consider using msgprint or logger instead of print statement.
+  languages: [python]
+  severity: WARNING
+  paths:
+      include:
+        - "*/**/doctype/*"
+
+- id: frappe-modifying-child-tables-while-iterating
+  pattern-either:
+    - pattern: |
+        for $ROW in self.$TABLE:
+            ...
+            self.remove(...)
+    - pattern: |
+        for $ROW in self.$TABLE:
+            ...
+            self.append(...)
+  message: |
+      Child table being modified while iterating on it.
+  languages: [python]
+  severity: ERROR
+  paths:
+      include:
+        - "*/**/doctype/*"
+
+- id: frappe-same-key-assigned-twice
+  pattern-either:
+    - pattern: |
+        {..., $X: $A, ..., $X: $B, ...}
+    - pattern: |
+        dict(..., ($X, $A), ..., ($X, $B), ...)
+    - pattern: |
+        _dict(..., ($X, $A), ..., ($X, $B), ...)
+  message: |
+      key `$X` is uselessly assigned twice. This could be a potential bug.
+  languages: [python]
+  severity: ERROR
+
+
+- id: frappe-manual-commit
+  patterns:
+    - pattern: frappe.db.commit()
+    - pattern-not-inside: |
+        try:
+          ...
+        except ...:
+          ...
+  message: |
+    Manually commiting a transaction is highly discouraged. Read about the transaction model implemented by Frappe Framework before adding manual commits: https://frappeframework.com/docs/user/en/api/database#database-transaction-model If you think manual commit is required then add a comment explaining why and `// nosemgrep` on the same line.
+  paths:
+      exclude:
+        - "**/patches/**"
+        - "**/demo/**"
+  languages: [python]
+  severity: ERROR

.github/helper/semgrep_rules/report.py

@@ -0,0 +1,14 @@
+from frappe import _
+
+# ruleid: frappe-missing-translate-function-in-report-python
+{"label": "Field Label"}
+
+# ruleid: frappe-missing-translate-function-in-report-python
+dict(label="Field Label")
+
+
+# ok: frappe-missing-translate-function-in-report-python
+{"label": _("Field Label")}
+
+# ok: frappe-missing-translate-function-in-report-python
+dict(label=_("Field Label"))

.github/helper/semgrep_rules/report.yml

@@ -0,0 +1,34 @@
+rules:
+- id: frappe-missing-translate-function-in-report-python
+  paths:
+    include:
+    - "**/report"
+    exclude:
+    - "**/regional"
+  pattern-either:
+  - patterns:
+      - pattern: |
+          {..., "label": "...", ...}
+      - pattern-not: |
+          {..., "label": _("..."), ...}
+  - patterns:
+      - pattern: dict(..., label="...", ...)
+      - pattern-not: dict(..., label=_("..."), ...)
+  message: |
+      All user facing text must be wrapped in translate function. Please refer to translation documentation. https://frappeframework.com/docs/user/en/guides/basics/translations
+  languages: [python]
+  severity: ERROR
+
+- id: frappe-translated-values-in-business-logic
+  paths:
+    include:
+    - "**/report"
+  patterns:
+    - pattern-inside: |
+        {..., filters: [...], ...}
+    - pattern: |
+        {..., options: [..., __("..."), ...], ...}
+  message: |
+      Using translated values in options field will require you to translate the values while comparing in business logic. Instead of passing translated labels provide objects that contain both label and value. e.g. { label: __("Option value"), value: "Option value"}
+  languages: [javascript]
+  severity: ERROR

.github/helper/semgrep_rules/security.py

@@ -0,0 +1,6 @@
+def function_name(input):
+	# ruleid: frappe-codeinjection-eval
+	eval(input)
+
+# ok: frappe-codeinjection-eval
+eval("1 + 1")

.github/helper/semgrep_rules/security.yml

@@ -0,0 +1,10 @@
+rules:
+- id: frappe-codeinjection-eval
+  patterns:
+  - pattern-not: eval("...")
+  - pattern: eval(...)
+  message: |
+    Detected the use of eval(). eval() can be dangerous if used to evaluate
+    dynamic content. Avoid it or use safe_eval().
+  languages: [python]
+  severity: ERROR

.github/helper/semgrep_rules/translate.js

@@ -0,0 +1,44 @@
+// ruleid: frappe-translation-empty-string
+__("")
+// ruleid: frappe-translation-empty-string
+__('')
+
+// ok: frappe-translation-js-formatting
+__('Welcome {0}, get started with ERPNext in just a few clicks.', [full_name]);
+
+// ruleid: frappe-translation-js-formatting
+__(`Welcome ${full_name}, get started with ERPNext in just a few clicks.`);
+
+// ok: frappe-translation-js-formatting
+__('This is fine');
+
+
+// ok: frappe-translation-trailing-spaces
+__('This is fine');
+
+// ruleid: frappe-translation-trailing-spaces
+__(' this is not ok ');
+// ruleid: frappe-translation-trailing-spaces
+__('this is not ok ');
+// ruleid: frappe-translation-trailing-spaces
+__(' this is not ok');
+
+// ok: frappe-translation-js-splitting
+__('You have {0} subscribers in your mailing list.', [subscribers.length])
+
+// todoruleid: frappe-translation-js-splitting
+__('You have') + subscribers.length + __('subscribers in your mailing list.')
+
+// ruleid: frappe-translation-js-splitting
+__('You have' + 'subscribers in your mailing list.')
+
+// ruleid: frappe-translation-js-splitting
+__('You have {0} subscribers' +
+    'in your mailing list', [subscribers.length])
+
+// ok: frappe-translation-js-splitting
+__("Ctrl+Enter to add comment")
+
+// ruleid: frappe-translation-js-splitting
+__('You have {0} subscribers \
+    in your mailing list', [subscribers.length])

.github/helper/semgrep_rules/translate.py

@@ -0,0 +1,61 @@
+# Examples taken from https://frappeframework.com/docs/user/en/translations
+# This file is used for testing the tests.
+
+from frappe import _
+
+full_name = "Jon Doe"
+# ok: frappe-translation-python-formatting
+_('Welcome {0}, get started with ERPNext in just a few clicks.').format(full_name)
+
+# ruleid: frappe-translation-python-formatting
+_('Welcome %s, get started with ERPNext in just a few clicks.' % full_name)
+# ruleid: frappe-translation-python-formatting
+_('Welcome %(name)s, get started with ERPNext in just a few clicks.' % {'name': full_name})
+
+# ruleid: frappe-translation-python-formatting
+_('Welcome {0}, get started with ERPNext in just a few clicks.'.format(full_name))
+
+
+subscribers = ["Jon", "Doe"]
+# ok: frappe-translation-python-formatting
+_('You have {0} subscribers in your mailing list.').format(len(subscribers))
+
+# ruleid: frappe-translation-python-splitting
+_('You have') + len(subscribers) + _('subscribers in your mailing list.')
+
+# ruleid: frappe-translation-python-splitting
+_('You have {0} subscribers \
+    in your mailing list').format(len(subscribers))
+
+# ok: frappe-translation-python-splitting
+_('You have {0} subscribers') \
+    + 'in your mailing list'
+
+# ruleid: frappe-translation-trailing-spaces
+msg = _(" You have {0} pending invoice ")
+# ruleid: frappe-translation-trailing-spaces
+msg = _("You have {0} pending invoice ")
+# ruleid: frappe-translation-trailing-spaces
+msg = _(" You have {0} pending invoice")
+
+# ok: frappe-translation-trailing-spaces
+msg = ' ' + _("You have {0} pending invoices") + ' '
+
+# ruleid: frappe-translation-python-formatting
+_(f"can not format like this - {subscribers}")
+# ruleid: frappe-translation-python-splitting
+_(f"what" + f"this is also not cool")
+
+
+# ruleid: frappe-translation-empty-string
+_("")
+# ruleid: frappe-translation-empty-string
+_('')
+
+
+class Test:
+	# ok: frappe-translation-python-splitting
+	def __init__(
+			args
+			):
+		pass

.github/helper/semgrep_rules/translate.yml

@@ -0,0 +1,64 @@
+rules:
+- id: frappe-translation-empty-string
+  pattern-either:
+  - pattern: _("")
+  - pattern: __("")
+  message: |
+    Empty string is useless for translation.
+    Please refer: https://frappeframework.com/docs/user/en/translations
+  languages: [python, javascript, json]
+  severity: ERROR
+
+- id: frappe-translation-trailing-spaces
+  pattern-either:
+    - pattern: _("=~/(^[ \t]+|[ \t]+$)/")
+    - pattern: __("=~/(^[ \t]+|[ \t]+$)/")
+  message: |
+    Trailing or leading whitespace not allowed in translate strings.
+    Please refer: https://frappeframework.com/docs/user/en/translations
+  languages: [python, javascript, json]
+  severity: ERROR
+
+- id: frappe-translation-python-formatting
+  pattern-either:
+  - pattern: _("..." % ...)
+  - pattern: _("...".format(...))
+  - pattern: _(f"...")
+  message: |
+    Only positional formatters are allowed and formatting should not be done before translating.
+    Please refer: https://frappeframework.com/docs/user/en/translations
+  languages: [python]
+  severity: ERROR
+
+- id: frappe-translation-js-formatting
+  patterns:
+  - pattern: __(`...`)
+  - pattern-not: __("...")
+  message: |
+    Template strings are not allowed for text formatting.
+    Please refer: https://frappeframework.com/docs/user/en/translations
+  languages: [javascript, json]
+  severity: ERROR
+
+- id: frappe-translation-python-splitting
+  pattern-either:
+  - pattern: _(...) + _(...)
+  - pattern: _("..." + "...")
+  - pattern-regex: '[\s\.]_\([^\)]*\\\s*'    # lines broken by `\`
+  - pattern-regex: '[\s\.]_\(\s*\n'          # line breaks allowed by python for using ( )
+  message: |
+    Do not split strings inside translate function. Do not concatenate using translate functions.
+    Please refer: https://frappeframework.com/docs/user/en/translations
+  languages: [python]
+  severity: ERROR
+
+- id: frappe-translation-js-splitting
+  pattern-either:
+  - pattern-regex: '__\([^\)]*[\\]\s+'
+  - pattern: __('...' + '...', ...)
+  - pattern: __('...') + __('...')
+  message: |
+    Do not split strings inside translate function. Do not concatenate using translate functions.
+    Please refer: https://frappeframework.com/docs/user/en/translations
+  languages: [javascript, json]
+  severity: ERROR

.github/helper/semgrep_rules/ux.js

@@ -0,0 +1,9 @@
+
+// ok: frappe-missing-translate-function-js
+frappe.msgprint('{{ _("Both login and password required") }}');
+
+// ruleid: frappe-missing-translate-function-js
+frappe.msgprint('What');
+
+// ok: frappe-missing-translate-function-js
+frappe.throw('  {{ _("Both login and password required") }}.  ');

.github/helper/semgrep_rules/ux.py

@@ -0,0 +1,30 @@
+import frappe
+from frappe import _, msgprint, throw
+
+# ruleid: frappe-missing-translate-function-python
+throw("Error Occured")
+
+# ruleid: frappe-missing-translate-function-python
+frappe.throw("Error Occured")
+
+# ruleid: frappe-missing-translate-function-python
+frappe.msgprint("Useful message")
+
+# ruleid: frappe-missing-translate-function-python
+msgprint("Useful message")
+
+
+# ok: frappe-missing-translate-function-python
+translatedmessage = _("Hello")
+
+# ok: frappe-missing-translate-function-python
+throw(translatedmessage)
+
+# ok: frappe-missing-translate-function-python
+msgprint(translatedmessage)
+
+# ok: frappe-missing-translate-function-python
+msgprint(_("Helpful message"))
+
+# ok: frappe-missing-translate-function-python
+frappe.throw(_("Error occured"))

.github/helper/semgrep_rules/ux.yml

@@ -0,0 +1,30 @@
+rules:
+- id: frappe-missing-translate-function-python
+  pattern-either:
+  - patterns:
+      - pattern: frappe.msgprint("...", ...)
+      - pattern-not: frappe.msgprint(_("..."), ...)
+  - patterns:
+      - pattern: frappe.throw("...", ...)
+      - pattern-not: frappe.throw(_("..."), ...)
+  message: |
+      All user facing text must be wrapped in translate function. Please refer to translation documentation. https://frappeframework.com/docs/user/en/guides/basics/translations
+  languages: [python]
+  severity: ERROR
+
+- id: frappe-missing-translate-function-js
+  pattern-either:
+  - patterns:
+      - pattern: frappe.msgprint("...", ...)
+      - pattern-not: frappe.msgprint(__("..."), ...)
+      # ignore microtemplating e.g. msgprint("{{ _("server side translation") }}")
+      - pattern-not: frappe.msgprint("=~/\{\{.*\_.*\}\}/i", ...)
+  - patterns:
+      - pattern: frappe.throw("...", ...)
+      - pattern-not: frappe.throw(__("..."), ...)
+      # ignore microtemplating
+      - pattern-not: frappe.throw("=~/\{\{.*\_.*\}\}/i", ...)
+  message: |
+      All user facing text must be wrapped in translate function. Please refer to translation documentation. https://frappeframework.com/docs/user/en/guides/basics/translations
+  languages: [javascript]
+  severity: ERROR

.github/helper/site_config.json

@@ -0,0 +1,16 @@
+{
+ "db_host": "127.0.0.1",
+ "db_port": 3306,
+ "db_name": "test_frappe",
+ "db_password": "test_frappe",
+ "auto_email_id": "test@example.com",
+ "mail_server": "smtp.example.com",
+ "mail_login": "test@example.com",
+ "mail_password": "test",
+ "admin_password": "admin",
+ "root_login": "root",
+ "root_password": "travis",
+ "host_name": "http://test_site:8000",
+ "install_apps": ["erpnext"],
+ "throttle_user_limit": 100
+}

.github/helper/site_config_mariadb.json

@@ -1,17 +0,0 @@
-{
- "db_host": "127.0.0.1",
- "db_port": 3306,
- "db_name": "test_frappe",
- "db_password": "test_frappe",
- "auto_email_id": "test@example.com",
- "mail_server": "smtp.example.com",
- "mail_login": "test@example.com",
- "mail_password": "test",
- "admin_password": "admin",
- "use_mysqlclient": 1,
- "root_login": "root",
- "root_password": "root",
- "host_name": "http://test_site:8000",
- "install_apps": ["payments", "erpnext"],
- "throttle_user_limit": 100
-}

.github/helper/site_config_postgres.json

@@ -1,18 +0,0 @@
-{
- "db_host": "127.0.0.1",
- "db_port": 5432,
- "db_name": "test_frappe",
- "db_password": "test_frappe",
- "db_type": "postgres",
- "allow_tests": true,
- "auto_email_id": "test@example.com",
- "mail_server": "smtp.example.com",
- "mail_login": "test@example.com",
- "mail_password": "test",
- "admin_password": "admin",
- "root_login": "postgres",
- "root_password": "travis",
- "host_name": "http://test_site:8000",
- "install_apps": ["erpnext"],
- "throttle_user_limit": 100
-}

.github/helper/translation.py

@@ -2,9 +2,7 @@ import re
 import sys
 
 errors_encounter = 0
-pattern = re.compile(
-	r"_\(([\"']{,3})(?P<message>((?!\1).)*)\1(\s*,\s*context\s*=\s*([\"'])(?P<py_context>((?!\5).)*)\5)*(\s*,(\s*?.*?\n*?)*(,\s*([\"'])(?P<js_context>((?!\11).)*)\11)*)*\)"
-)
+pattern = re.compile(r"_\(([\"']{,3})(?P<message>((?!\1).)*)\1(\s*,\s*context\s*=\s*([\"'])(?P<py_context>((?!\5).)*)\5)*(\s*,(\s*?.*?\n*?)*(,\s*([\"'])(?P<js_context>((?!\11).)*)\11)*)*\)")
 words_pattern = re.compile(r"_{1,2}\([\"'`]{1,3}.*?[a-zA-Z]")
 start_pattern = re.compile(r"_{1,2}\([f\"'`]{1,3}")
 f_string_pattern = re.compile(r"_\(f[\"']")
@@ -12,14 +10,14 @@ starts_with_f_pattern = re.compile(r"_\(f")
 
 # skip first argument
 files = sys.argv[1:]
-files_to_scan = [_file for _file in files if _file.endswith((".py", ".js"))]
+files_to_scan = [_file for _file in files if _file.endswith(('.py', '.js'))]
 
 for _file in files_to_scan:
-	with open(_file) as f:
-		print(f"Checking: {_file}")
+	with open(_file, 'r') as f:
+		print(f'Checking: {_file}')
 		file_lines = f.readlines()
 		for line_number, line in enumerate(file_lines, 1):
-			if "frappe-lint: disable-translate" in line:
+			if 'frappe-lint: disable-translate' in line:
 				continue
 
 			start_matches = start_pattern.search(line)
@@ -30,9 +28,7 @@ for _file in files_to_scan:
 					has_f_string = f_string_pattern.search(line)
 					if has_f_string:
 						errors_encounter += 1
-						print(
-							f"\nF-strings are not supported for translations at line number {line_number}\n{line.strip()[:100]}"
-						)
+						print(f'\nF-strings are not supported for translations at line number {line_number}\n{line.strip()[:100]}')
 						continue
 					else:
 						continue
@@ -40,29 +36,25 @@ for _file in files_to_scan:
 				match = pattern.search(line)
 				error_found = False
 
-				if not match and line.endswith((",\n", "[\n")):
+				if not match and line.endswith((',\n', '[\n')):
 					# concat remaining text to validate multiline pattern
-					line = "".join(file_lines[line_number - 1 :])
-					line = line[start_matches.start() + 1 :]
+					line = "".join(file_lines[line_number - 1:])
+					line = line[start_matches.start() + 1:]
 					match = pattern.match(line)
 
 				if not match:
 					error_found = True
-					print(f"\nTranslation syntax error at line number {line_number}\n{line.strip()[:100]}")
+					print(f'\nTranslation syntax error at line number {line_number}\n{line.strip()[:100]}')
 
 				if not error_found and not words_pattern.search(line):
 					error_found = True
-					print(
-						f"\nTranslation is useless because it has no words at line number {line_number}\n{line.strip()[:100]}"
-					)
+					print(f'\nTranslation is useless because it has no words at line number {line_number}\n{line.strip()[:100]}')
 
 				if error_found:
 					errors_encounter += 1
 
 if errors_encounter > 0:
-	print(
-		'\nVisit "https://frappeframework.com/docs/user/en/translations" to learn about valid translation strings.'
-	)
+	print('\nVisit "https://frappeframework.com/docs/user/en/translations" to learn about valid translation strings.')
 	sys.exit(1)
 else:
-	print("\nGood To Go!")
+	print('\nGood To Go!')

.github/helper/update_pot_file.sh

@@ -1,40 +0,0 @@
-#!/bin/bash
-set -e
-cd ~ || exit
-
-echo "Setting Up Bench..."
-
-pip install frappe-bench
-bench -v init frappe-bench --skip-assets --skip-redis-config-generation --python "$(which python)"
-cd ./frappe-bench || exit
-
-echo "Get ERPNext..."
-bench get-app --skip-assets erpnext "${GITHUB_WORKSPACE}"
-
-echo "Generating POT file..."
-bench generate-pot-file --app erpnext
-
-cd ./apps/erpnext || exit
-
-echo "Configuring git user..."
-git config user.email "developers@erpnext.com"
-git config user.name "frappe-pr-bot"
-
-echo "Setting the correct git remote..."
-# Here, the git remote is a local file path by default. Let's change it to the upstream repo.
-git remote set-url upstream https://github.com/frappe/erpnext.git
-
-echo "Creating a new branch..."
-isodate=$(date -u +"%Y-%m-%d")
-branch_name="pot_${BASE_BRANCH}_${isodate}"
-git checkout -b "${branch_name}"
-
-echo "Commiting changes..."
-git add erpnext/locale/main.pot
-git commit -m "chore: update POT file"
-
-gh auth setup-git
-git push -u upstream "${branch_name}"
-
-echo "Creating a PR..."
-gh pr create --fill --base "${BASE_BRANCH}" --head "${branch_name}" --reviewer ${PR_REVIEWER} -R frappe/erpnext

.github/labeler.yml

@@ -1,55 +0,0 @@
-accounts:
-- erpnext/accounts/*
-- erpnext/controllers/accounts_controller.py
-- erpnext/controllers/taxes_and_totals.py
-
-stock:
-- erpnext/stock/*
-- erpnext/controllers/stock_controller.py
-- erpnext/controllers/item_variant.py
-
-assets:
-- erpnext/assets/*
-
-regional:
-- erpnext/regional/*
-
-selling:
-- erpnext/selling/*
-- erpnext/controllers/selling_controller.py
-
-buying:
-- erpnext/buying/*
-- erpnext/controllers/buying_controller.py
-
-support:
-- erpnext/support/*
-
-POS:
-- pos*
-
-ecommerce:
-- erpnext/e_commerce/*
-
-maintenance:
-- erpnext/maintenance/*
-
-manufacturing:
-- erpnext/manufacturing/*
-
-crm:
-- erpnext/crm/*
-
-HR:
-- erpnext/hr/*
-
-payroll:
-- erpnext/payroll*
-
-projects:
-- erpnext/projects/*
-
-# Any python files modifed but no test files modified
-needs-tests:
-- any: ['erpnext/**/*.py']
-  all: ['!erpnext/**/test*.py']

.github/release.yml

@@ -1,4 +0,0 @@
-changelog:
-  exclude:
-    labels:
-      - skip-release-notes

.github/stale.yml

@@ -1,35 +1,34 @@
 # Configuration for probot-stale - https://github.com/probot/stale
 
-# Label to use when marking as stale
-staleLabel: inactive
+# Number of days of inactivity before an Issue or Pull Request becomes stale
+daysUntilStale: 30
 
-# Limit the number of actions per hour, from 1-30. Default is 30
-limitPerRun: 10
-
-# Set to true to ignore issues in a project (defaults to false)
-exemptProjects: true
-
-# Set to true to ignore issues in a milestone (defaults to false)
-exemptMilestones: true
-
-# Skip the stale action for draft PRs
-exemptDraftPr: true
+# Number of days of inactivity before a stale Issue or Pull Request is closed.
+# Set to false to disable. If disabled, issues still need to be closed manually, but will remain marked as stale.
+daysUntilClose: 7
 
 # Issues or Pull Requests with these labels will never be considered stale. Set to `[]` to disable
 exemptLabels:
   - hotfix
-  - no-stale
 
-pulls:
-  daysUntilStale: 15
-  daysUntilClose: 3
-  exemptLabels:
-    - hotfix
-  markComment: >
-    This pull request has been automatically marked as inactive because it has
-    not had recent activity. It will be closed within 3 days if no further
-    activity occurs, but it only takes a comment to keep a contribution alive
-    :) Also, even if it is closed, you can always reopen the PR when you're
-    ready. Thank you for contributing.
+# Set to true to ignore issues in a project (defaults to false)
+exemptProjects: false
 
+# Set to true to ignore issues in a milestone (defaults to false)
+exemptMilestones: true
+
+# Label to use when marking as stale
+staleLabel: inactive
+
+# Comment to post when marking as stale. Set to `false` to disable
+markComment: >
+  This pull request has been automatically marked as stale because it has not had
+  recent activity. It will be closed within a week if no further activity occurs, but it
+  only takes a comment to keep a contribution alive :) Also, even if it is closed,
+  you can always reopen the PR when you're ready. Thank you for contributing.
+  
+# Limit the number of actions per hour, from 1-30. Default is 30
+limitPerRun: 30
+
+# Limit to only `issues` or `pulls`
 only: pulls

.github/try-on-f-cloud-button.svg

@@ -1,32 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="4 2 193 52">
-<g filter="url(#filter0_dd)">
-<rect x="4" y="2" width="193" height="52" rx="6" fill="#2490EF"/>
-<path d="M28 22.2891H32.8786V35.5H36.2088V22.2891H41.0874V19.5H28V22.2891Z" fill="white"/>
-<path d="M41.6982 35.5H45.0129V28.7109C45.0129 27.2344 46.0866 26.2188 47.5494 26.2188C48.0085 26.2188 48.6388 26.2969 48.95 26.3984V23.4453C48.6543 23.375 48.2419 23.3281 47.9074 23.3281C46.5691 23.3281 45.472 24.1094 45.0362 25.5938H44.9117V23.5H41.6982V35.5Z" fill="white"/>
-<path d="M52.8331 40C55.2996 40 56.6068 38.7344 57.2837 36.7969L61.9289 23.5156L58.4197 23.5L55.9221 32.3125H55.7976L53.3233 23.5H49.8374L54.1247 35.8437L53.9302 36.3516C53.4944 37.4766 52.6619 37.5312 51.4947 37.1719L50.7478 39.6562C51.2224 39.8594 51.9927 40 52.8331 40Z" fill="white"/>
-<path d="M73.6142 35.7344C77.2401 35.7344 79.4966 33.2422 79.4966 29.5469C79.4966 25.8281 77.2401 23.3438 73.6142 23.3438C69.9883 23.3438 67.7319 25.8281 67.7319 29.5469C67.7319 33.2422 69.9883 35.7344 73.6142 35.7344ZM73.6298 33.1562C71.9569 33.1562 71.101 31.6171 71.101 29.5233C71.101 27.4296 71.9569 25.8827 73.6298 25.8827C75.2715 25.8827 76.1274 27.4296 76.1274 29.5233C76.1274 31.6171 75.2715 33.1562 73.6298 33.1562Z" fill="white"/>
-<path d="M84.7253 28.5625C84.7331 27.0156 85.6512 26.1094 86.9895 26.1094C88.3201 26.1094 89.1215 26.9844 89.1137 28.4531V35.5H92.4284V27.8594C92.4284 25.0625 90.7945 23.3438 88.3046 23.3438C86.5306 23.3438 85.2466 24.2187 84.7097 25.6172H84.5697V23.5H81.4106V35.5H84.7253V28.5625Z" fill="white"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M102.429 19.5H113.429V22.3141H102.429V19.5ZM102.429 35.5V26.6794H112.699V29.4982H105.94V35.5H102.429Z" fill="white"/>
-<path d="M131.584 24.9625C131.09 21.5057 128.345 19.5 124.785 19.5C120.589 19.5 117.429 22.463 117.429 27.4924C117.429 32.5142 120.55 35.4848 124.785 35.4848C128.604 35.4848 131.137 33.0916 131.584 30.1211L128.651 30.1059C128.282 31.9293 126.745 32.9549 124.824 32.9549C122.22 32.9549 120.354 31.0632 120.354 27.4924C120.354 23.9824 122.204 22.0299 124.832 22.0299C126.784 22.0299 128.314 23.1011 128.651 24.9625H131.584Z" fill="white"/>
-<path d="M136.409 19.7124H133.571V35.2718H136.409V19.7124Z" fill="white"/>
-<path d="M144.031 35.5001C147.56 35.5001 149.803 33.0917 149.803 29.483C149.803 25.8667 147.56 23.4507 144.031 23.4507C140.502 23.4507 138.259 25.8667 138.259 29.483C138.259 33.0917 140.502 35.5001 144.031 35.5001ZM144.047 33.2969C142.094 33.2969 141.137 31.6103 141.137 29.4754C141.137 27.3406 142.094 25.6312 144.047 25.6312C145.968 25.6312 146.925 27.3406 146.925 29.4754C146.925 31.6103 145.968 33.2969 144.047 33.2969Z" fill="white"/>
-<path d="M159.338 30.3641C159.338 32.1419 158.028 33.0232 156.773 33.0232C155.409 33.0232 154.499 32.0887 154.499 30.6072V23.6025H151.66V31.0327C151.66 33.8361 153.307 35.4239 155.675 35.4239C157.479 35.4239 158.749 34.5046 159.298 33.1979H159.424V35.272H162.176V23.6025H159.338V30.3641Z" fill="white"/>
-<path d="M169.014 35.4769C171.084 35.4769 172.017 34.2841 172.464 33.4332H172.637V35.2718H175.429V19.7124H172.582V25.532H172.464C172.033 24.6887 171.147 23.4503 169.022 23.4503C166.238 23.4503 164.05 25.5624 164.05 29.4522C164.05 33.2965 166.175 35.4769 169.014 35.4769ZM169.806 33.2205C167.931 33.2205 166.943 31.6251 166.943 29.437C166.943 27.2642 167.916 25.7067 169.806 25.7067C171.633 25.7067 172.637 27.173 172.637 29.437C172.637 31.701 171.617 33.2205 169.806 33.2205Z" fill="white"/>
-</g>
-<defs>
-<filter id="filter0_dd" x="0" y="0" width="201" height="60" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
-<feFlood flood-opacity="0" result="BackgroundImageFix"/>
-<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
-<feOffset/>
-<feGaussianBlur stdDeviation="0.25"/>
-<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.5 0"/>
-<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow"/>
-<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
-<feOffset dy="2"/>
-<feGaussianBlur stdDeviation="2"/>
-<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.13 0"/>
-<feBlend mode="normal" in2="effect1_dropShadow" result="effect2_dropShadow"/>
-<feBlend mode="normal" in="SourceGraphic" in2="effect2_dropShadow" result="shape"/>
-</filter>
-</defs>
-</svg>

.github/workflows/backport.yml

@@ -5,16 +5,12 @@ on:
       - closed
       - labeled
 
-permissions:
-  contents: read
-
 jobs:
   main:
     runs-on: ubuntu-latest
-    timeout-minutes: 60
     steps:
       - name: Checkout Actions
-        uses: actions/checkout@v6
+        uses: actions/checkout@v2
         with:
           repository: "frappe/backport"
           path: ./actions
@@ -24,6 +20,6 @@ jobs:
       - name: Run backport
         uses: ./actions/backport
         with:
-          token: ${{secrets.RELEASE_TOKEN}}
+          token: ${{secrets.BACKPORT_BOT_TOKEN}}
           labelsToAdd: "backport"
           title: "{{originalTitle}}"

.github/workflows/docker-release.yml

@@ -2,10 +2,6 @@ name: Trigger Docker build on release
 on:
   release:
     types: [released]
-
-permissions:
-  contents: read
-
 jobs:
   curl:
     runs-on: ubuntu-latest
@@ -15,4 +11,4 @@ jobs:
     - name: curl
       run: |
         apk add curl bash
-        curl -X POST -H "Accept: application/vnd.github.v3+json" -H "Authorization: Bearer ${{ secrets.CI_PAT }}" https://api.github.com/repos/frappe/frappe_docker/actions/workflows/core-build-stable.yml/dispatches -d '{"ref":"main"}'
+        curl -s -X POST -H "Content-Type: application/json" -H "Accept: application/json" -H "Travis-API-Version: 3" -H "Authorization: token ${{ secrets.TRAVIS_CI_TOKEN }}" -d '{"request":{"branch":"master"}}' https://api.travis-ci.com/repo/frappe%2Ffrappe_docker/requests

.github/workflows/docs-checker.yml

@@ -3,22 +3,18 @@ on:
   pull_request:
     types: [ opened, synchronize, reopened, edited ]
 
-permissions:
-  contents: read
-
 jobs:
   build:
     runs-on: ubuntu-latest
-    timeout-minutes: 10
 
     steps:
       - name: 'Setup Environment'
-        uses: actions/setup-python@v6
+        uses: actions/setup-python@v2
         with:
-          python-version: '3.10'
+          python-version: 3.6
 
       - name: 'Clone repo'
-        uses: actions/checkout@v6
+        uses: actions/checkout@v2
 
       - name: Validate Docs
         env:

.github/workflows/generate-pot-file.yml

@@ -1,44 +0,0 @@
-# This workflow is agnostic to branches. Only maintain on develop branch.
-# To add/remove branches just modify the matrix.
-
-name: Regenerate POT file (translatable strings)
-on:
-  schedule:
-    # 9:30 UTC => 3 PM IST Sunday
-    - cron: "30 9 * * 0"
-  workflow_dispatch:
-
-jobs:
-  regenerate-pot-file:
-    name: Regenerate POT file
-    runs-on: ubuntu-latest
-    strategy:
-      fail-fast: false
-      matrix:
-        branch: ["develop", "version-16-hotfix"]
-    permissions:
-      contents: write
-
-    steps:
-        - name: Checkout
-          uses: actions/checkout@v6
-          with:
-            ref: ${{ matrix.branch }}
-
-        - name: Setup Python
-          uses: actions/setup-python@v6
-          with:
-            python-version: "3.14"
-
-        - name: Setup Node
-          uses: actions/setup-node@v6
-          with:
-            node-version: 24
-
-        - name: Run script to update POT file
-          run: |
-            bash ${GITHUB_WORKSPACE}/.github/helper/update_pot_file.sh
-          env:
-            GH_TOKEN: ${{ secrets.RELEASE_TOKEN }}
-            BASE_BRANCH: ${{ matrix.branch }}
-            PR_REVIEWER: barredterra # change to your GitHub username if you copied this file

.github/workflows/initiate_release.yml

@@ -1,36 +0,0 @@
-# This workflow is agnostic to branches. Only maintain on develop branch.
-# To add/remove versions just modify the matrix.
-
-name: Create weekly release pull requests
-
-permissions:
-  contents: read
-
-on:
-  schedule:
-    # 9:30 UTC => 3 PM IST Tuesday
-    - cron: "30 9 * * 2"
-  workflow_dispatch:
-
-jobs:
-  stable-release:
-    name: Release
-    runs-on: ubuntu-latest
-    strategy:
-      fail-fast: false
-      matrix:
-        version: ["15", "16"]
-
-    steps:
-      - uses: octokit/request-action@v2.x
-        with:
-          route: POST /repos/{owner}/{repo}/pulls
-          owner: frappe
-          repo: erpnext
-          title: |-
-            "chore: release v${{ matrix.version }}"
-          body: "Automated weekly release."
-          base: version-${{ matrix.version }}
-          head: version-${{ matrix.version }}-hotfix
-        env:
-          GITHUB_TOKEN: ${{ secrets.RELEASE_TOKEN }}

.github/workflows/label-base-on-title.yml

@@ -1,30 +0,0 @@
-name: "Auto-label PRs based on title"
-
-on:
-  pull_request_target:
-    types: [opened, reopened]
-
-jobs:
-  add-label-if-prefix-matches:
-    permissions:
-      contents: read
-      pull-requests: write
-    runs-on: ubuntu-latest
-    steps:
-      - name: Check PR title and add label if it matches prefixes
-        uses: actions/github-script@v7
-        continue-on-error: true
-        with:
-          script: |
-            const title = context.payload.pull_request.title.toLowerCase();
-            const prefixes = ['chore', 'ci', 'style', 'test', 'refactor'];
-            
-            // Check if the PR title starts with any of the prefixes
-            if (prefixes.some(prefix => title.startsWith(prefix))) {
-              await github.rest.issues.addLabels({
-                owner: context.repo.owner,
-                repo: context.repo.repo,
-                issue_number: context.payload.pull_request.number,
-                labels: ['skip-release-notes']
-              });
-            }

.github/workflows/labeller.yml

@@ -1,16 +0,0 @@
-name: "Pull Request Labeler"
-on:
-  pull_request_target:
-    types: [opened, reopened]
-
-permissions:
-  issues: write
-  pull-requests: write
-
-jobs:
-  triage:
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/labeler@v3
-      with:
-        repo-token: "${{ secrets.GITHUB_TOKEN }}"

.github/workflows/linters.yml

@@ -3,46 +3,25 @@ name: Linters
 on:
   pull_request: { }
 
-permissions:
-  contents: read
-
 jobs:
 
   linters:
     name: linters
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v6
-
-      - name: Set up Python 3.14
-        uses: actions/setup-python@v6
+      - uses: actions/checkout@v2
+      - uses: returntocorp/semgrep-action@v1
+        env:
+            SEMGREP_TIMEOUT: 120
         with:
-          python-version: '3.14'
-          cache: pip
+            config: >-
+              r/python.lang.correctness
+              .github/helper/semgrep_rules
+
+      - name: Set up Python 3.8
+        uses: actions/setup-python@v2
+        with:
+          python-version: 3.8
 
       - name: Install and Run Pre-commit
-        uses: pre-commit/action@v3.0.0
-
-  semgrep:
-    name: semgrep
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v6
-
-      - name: Set up Python 3.14
-        uses: actions/setup-python@v6
-        with:
-          python-version: '3.14'
-          cache: pip
-
-      - name: Download Semgrep rules
-        run: git clone --depth 1 https://github.com/frappe/semgrep-rules.git frappe-semgrep-rules
-
-      - name: Download semgrep
-        run: pip install semgrep
-
-      - name: Run Semgrep rules
-        run: semgrep ci --config ./frappe-semgrep-rules/rules --config r/python.lang.correctness
-
-      - name: Semgrep for Test Correctness
-        run: semgrep ci --include=**/test_*.py --config ./semgrep/test-correctness.yml
+        uses: pre-commit/action@v2.0.0

.github/workflows/lock.yml

@@ -1,21 +0,0 @@
-name: 'Lock threads'
-
-on:
-  schedule:
-    - cron: '0 0 * * *'
-  workflow_dispatch:
-
-permissions:
-  issues: write
-  pull-requests: write
-
-
-jobs:
-  lock:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: dessant/lock-threads@v5
-        with:
-          github-token: ${{ github.token }}
-          issue-inactive-days: 14
-          pr-inactive-days: 14

.github/workflows/patch.yml

@@ -4,78 +4,54 @@ on:
   pull_request:
     paths-ignore:
       - '**.js'
-      - '**.css'
       - '**.md'
-      - '**.html'
-      - '**.csv'
-      - 'crowdin.yml'
-      - '.coderabbit.yml'
-      - '.mergify.yml'
   workflow_dispatch:
 
-permissions:
-  contents: read
-
-concurrency:
-  group: patch-develop-${{ github.event_name }}-${{ github.event.number || github.event_name == 'workflow_dispatch' && github.run_id || '' }}
-  cancel-in-progress: true
 
 jobs:
   test:
-    runs-on: ubuntu-latest
-    timeout-minutes: 60
+    runs-on: ubuntu-18.04
 
     name: Patch Test
 
     services:
       mysql:
-        image: mariadb:11.8
+        image: mariadb:10.3
         env:
-          MARIADB_ROOT_PASSWORD: 'root'
+          MYSQL_ALLOW_EMPTY_PASSWORD: YES
         ports:
           - 3306:3306
-        options: --health-cmd="mariadb-admin ping" --health-interval=5s --health-timeout=2s --health-retries=3
+        options: --health-cmd="mysqladmin ping" --health-interval=5s --health-timeout=2s --health-retries=3
 
     steps:
       - name: Clone
-        uses: actions/checkout@v6
-
-      - name: Check for valid Python & Merge Conflicts
-        run: |
-          python -m compileall -fq "${GITHUB_WORKSPACE}"
-          if grep -lr --exclude-dir=node_modules "^<<<<<<< " "${GITHUB_WORKSPACE}"
-              then echo "Found merge conflicts"
-              exit 1
-          fi
+        uses: actions/checkout@v2
 
       - name: Setup Python
-        uses: actions/setup-python@v6
+        uses: actions/setup-python@v2
         with:
-          python-version: |
-            3.11
-            3.13
-            3.14
+          python-version: 3.6
 
       - name: Setup Node
-        uses: actions/setup-node@v6
+        uses: actions/setup-node@v2
         with:
-          node-version: 24
+          node-version: 12
           check-latest: true
 
       - name: Add to Hosts
         run: echo "127.0.0.1 test_site" | sudo tee -a /etc/hosts
 
       - name: Cache pip
-        uses: actions/cache@v4
+        uses: actions/cache@v2
         with:
           path: ~/.cache/pip
-          key: ${{ runner.os }}-pip-${{ hashFiles('**/*requirements.txt', '**/pyproject.toml') }}
+          key: ${{ runner.os }}-pip-${{ hashFiles('**/requirements.txt') }}
           restore-keys: |
             ${{ runner.os }}-pip-
             ${{ runner.os }}-
 
       - name: Cache node modules
-        uses: actions/cache@v4
+        uses: actions/cache@v2
         env:
           cache-name: cache-node-modules
         with:
@@ -88,9 +64,9 @@ jobs:
 
       - name: Get yarn cache directory path
         id: yarn-cache-dir-path
-        run: echo "dir=$(yarn cache dir)" >> $GITHUB_OUTPUT
+        run: echo "::set-output name=dir::$(yarn cache dir)"
 
-      - uses: actions/cache@v4
+      - uses: actions/cache@v2
         id: yarn-cache
         with:
           path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
@@ -99,72 +75,11 @@ jobs:
             ${{ runner.os }}-yarn-
 
       - name: Install
-        run: |
-          pip install frappe-bench
-          bash ${GITHUB_WORKSPACE}/.github/helper/install.sh
-        env:
-          DB: mariadb
-          TYPE: server
+        run: bash ${GITHUB_WORKSPACE}/.github/helper/install.sh
 
       - name: Run Patch Tests
         run: |
           cd ~/frappe-bench/
-          bench remove-app payments --force
-          jq 'del(.install_apps)' ~/frappe-bench/sites/test_site/site_config.json > tmp.json
-          mv tmp.json ~/frappe-bench/sites/test_site/site_config.json
-
-          wget https://frappe.io/files/erpnext-v14.sql.gz
-          bench --site test_site --force restore ~/frappe-bench/erpnext-v14.sql.gz
-
-          git -C "apps/frappe" remote set-url upstream https://github.com/frappe/frappe.git
-          git -C "apps/erpnext" remote set-url upstream https://github.com/frappe/erpnext.git
-
-
-          function update_to_version() {
-            version=$1
-
-            branch_name="version-$version-hotfix"
-            echo "Updating to v$version"
-
-            # Fetch and checkout branches
-            git -C "apps/frappe" fetch --depth 1 upstream $branch_name:$branch_name
-            git -C "apps/erpnext" fetch --depth 1 upstream $branch_name:$branch_name
-            git -C "apps/frappe" checkout -q -f $branch_name
-            git -C "apps/erpnext" checkout -q -f $branch_name
-
-            # Resetup env and install apps
-            pgrep honcho | xargs kill
-            rm -rf ~/frappe-bench/env
-            bench -v setup env --python python$2
-            bench pip install -e ./apps/erpnext
-            bench start &>> ~/frappe-bench/bench_start.log &
-
-            bench --site test_site migrate
-          }
-
-          update_to_version 15 3.13
-          update_to_version 16 3.14
-
-          echo "Updating to latest version"
-          git -C "apps/frappe" fetch --depth 1 upstream "${GITHUB_BASE_REF:-${GITHUB_REF##*/}}"
-          git -C "apps/frappe" checkout -q -f FETCH_HEAD
-          git -C "apps/erpnext" checkout -q -f "$GITHUB_SHA"
-
-          pgrep honcho | xargs kill
-          rm -rf ~/frappe-bench/env
-          bench -v setup env
-          bench pip install -e ./apps/erpnext
-          bench start &>> ~/frappe-bench/bench_start.log &
-
+          wget https://erpnext.com/files/v10-erpnext.sql.gz
+          bench --site test_site --force restore ~/frappe-bench/v10-erpnext.sql.gz
           bench --site test_site migrate
-
-      - name: Show bench output
-        if: ${{ always() }}
-        run: |
-          cd ~/frappe-bench
-          cat bench_start.log || true
-          cd logs
-          for f in ./*.log*; do
-            echo "Printing log: $f";
-            cat $f
-          done

.github/workflows/patch_faux.yml

@@ -1,28 +0,0 @@
-# Tests are skipped for these files but github doesn't allow "passing" hence this is required.
-
-name: Skipped Patch Test
-
-on:
-  pull_request:
-    paths:
-      - "**.js"
-      - "**.css"
-      - "**.md"
-      - "**.html"
-      - "**.csv"
-      - 'crowdin.yml'
-      - '.coderabbit.yml'
-      - '.mergify.yml'
-
-permissions:
-  contents: read
-
-jobs:
-  test:
-    runs-on: ubuntu-latest
-
-    name: Patch Test
-
-    steps:
-      - name: Pass skipped tests unconditionally
-        run: "echo Skipped"

.github/workflows/release.yml

@@ -1,35 +0,0 @@
-name: Generate Semantic Release
-on:
-  push:
-    branches:
-      - version-13
-
-permissions:
-  contents: read
-
-jobs:
-  release:
-    name: Release
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout Entire Repository
-        uses: actions/checkout@v6
-        with:
-          fetch-depth: 0
-          persist-credentials: false
-      - name: Setup Node.js
-        uses: actions/setup-node@v6
-        with:
-          node-version: 20
-      - name: Setup dependencies
-        run: |
-          npm install @semantic-release/git @semantic-release/exec --no-save
-      - name: Create Release
-        env:
-          GH_TOKEN: ${{ secrets.RELEASE_TOKEN }}
-          GITHUB_TOKEN: ${{ secrets.RELEASE_TOKEN }}
-          GIT_AUTHOR_NAME: "Frappe PR Bot"
-          GIT_AUTHOR_EMAIL: "developers@frappe.io"
-          GIT_COMMITTER_NAME: "Frappe PR Bot"
-          GIT_COMMITTER_EMAIL: "developers@frappe.io"
-        run: npx semantic-release

.github/workflows/release_notes.yml

@@ -1,42 +0,0 @@
-# This action:
-#
-# 1. Generates release notes using github API.
-# 2. Strips unnecessary info like chore/style etc from notes.
-# 3. Updates release info.
-
-# This action needs to be maintained on all branches that do releases.
-
-name: 'Release Notes'
-
-on:
-  workflow_dispatch:
-    inputs:
-      tag_name:
-        description: 'Tag of release like v13.0.0'
-        required: true
-        type: string
-  release:
-    types: [released]
-
-permissions:
-  contents: read
-
-jobs:
-  regen-notes:
-    name: 'Regenerate release notes'
-    runs-on: ubuntu-latest
-
-    steps:
-    - name: Update notes
-      run: |
-        NEW_NOTES=$(gh api --method POST -H "Accept: application/vnd.github+json"  /repos/frappe/erpnext/releases/generate-notes  -f tag_name=$RELEASE_TAG \
-          | jq -r '.body' \
-          | sed -E '/^\* (chore|ci|test|docs|style)/d' \
-          | sed -E 's/by @mergify //'
-        )
-        RELEASE_ID=$(gh api -H "Accept: application/vnd.github+json" /repos/frappe/erpnext/releases/tags/$RELEASE_TAG | jq -r '.id')
-        gh api --method PATCH -H "Accept: application/vnd.github+json" /repos/frappe/erpnext/releases/$RELEASE_ID -f body="$NEW_NOTES"
-
-      env:
-        GH_TOKEN: ${{ secrets.RELEASE_TOKEN }}
-        RELEASE_TAG: ${{ github.event.inputs.tag_name || github.event.release.tag_name }}

.github/workflows/run-individual-tests.yml

@@ -1,143 +0,0 @@
-name: Individual
-
-on:
-  workflow_dispatch:
-
-concurrency:
-  group: server-individual-tests-lightmode-develop
-  cancel-in-progress: true
-
-permissions:
-  contents: read
-
-jobs:
-  discover:
-    runs-on: ubuntu-latest
-    outputs:
-      matrix: ${{ steps.set-matrix.outputs.matrix }}
-    steps:
-    - name: Clone
-      uses: actions/checkout@v6
-    - id: set-matrix
-      run: |
-        # Use grep and find to get the list of test files
-        matrix=$(find . -path '*/test_*.py' | xargs grep -l 'def test_' | sort | awk '{
-            # Remove ./ prefix, file extension, and replace / with .
-            gsub(/^\.\//, "", $0)
-            gsub(/\.py$/, "", $0)
-            gsub(/\//, ".", $0)
-            # Add to array
-            tests[NR] = $0
-        }
-        END {
-            # Start JSON array
-            printf "{\n  \"include\": [\n"
-            # Loop through array and create JSON objects
-            for (i=1; i<=NR; i++) {
-                printf "    {\"test\": \"%s\"}", tests[i]
-                if (i < NR) printf ","
-                printf "\n"
-            }
-            # Close JSON array
-            printf "  ]\n}"
-        }')
-
-        # Output the matrix
-        echo "matrix=$(echo "$matrix" | jq -c)" >> $GITHUB_OUTPUT
-
-        # For debugging (optional)
-        echo "Generated matrix:"
-        echo "$matrix"
-  test:
-    needs: discover
-    runs-on: ubuntu-latest
-    timeout-minutes: 60
-    env:
-      NODE_ENV: "production"
-
-    strategy:
-      fail-fast: false
-      matrix: ${{fromJson(needs.discover.outputs.matrix)}}
-      max-parallel: 14
-
-    name: Test
-
-    services:
-      mysql:
-        image: mariadb:10.6
-        env:
-          MARIADB_ROOT_PASSWORD: 'root'
-        ports:
-          - 3306:3306
-        options: --health-cmd="mariadb-admin ping" --health-interval=5s --health-timeout=2s --health-retries=3
-
-    steps:
-      - name: Clone
-        uses: actions/checkout@v6
-
-      - name: Setup Python
-        uses: actions/setup-python@v6
-        with:
-          python-version: '3.14'
-
-      - name: Setup Node
-        uses: actions/setup-node@v6
-        with:
-          node-version: 24
-          check-latest: true
-
-      - name: Add to Hosts
-        run: echo "127.0.0.1 test_site" | sudo tee -a /etc/hosts
-
-      - name: Cache pip
-        uses: actions/cache@v4
-        with:
-          path: ~/.cache/pip
-          key: ${{ runner.os }}-pip-${{ hashFiles('**/*requirements.txt', '**/pyproject.toml') }}
-          restore-keys: |
-            ${{ runner.os }}-pip-
-            ${{ runner.os }}-
-
-      - name: Cache node modules
-        uses: actions/cache@v4
-        env:
-          cache-name: cache-node-modules
-        with:
-          path: ~/.npm
-          key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/package-lock.json') }}
-          restore-keys: |
-            ${{ runner.os }}-build-${{ env.cache-name }}-
-            ${{ runner.os }}-build-
-            ${{ runner.os }}-
-
-      - name: Get yarn cache directory path
-        id: yarn-cache-dir-path
-        run: echo "dir=$(yarn cache dir)" >> $GITHUB_OUTPUT
-
-      - uses: actions/cache@v4
-        id: yarn-cache
-        with:
-          path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
-          key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
-          restore-keys: |
-            ${{ runner.os }}-yarn-
-
-      - name: Install
-        run: bash ${GITHUB_WORKSPACE}/.github/helper/install.sh
-        env:
-          DB: mariadb
-          TYPE: server
-          FRAPPE_USER: ${{ github.event.inputs.user }}
-          FRAPPE_BRANCH: ${{ github.event.inputs.branch }}
-
-      - name: Run Tests
-        run: |
-          site_name=$(echo "${{matrix.test}}" | sed -e 's/.*\.\(test_.*$\)/\1/')
-          echo "$site_name"
-          mkdir ~/frappe-bench/sites/$site_name
-          cp -r "${GITHUB_WORKSPACE}/.github/helper/site_config_mariadb.json" ~/frappe-bench/sites/$site_name/site_config.json
-          cd ~/frappe-bench/
-          bench --site $site_name reinstall --yes
-          bench --site $site_name set-config allow_tests true
-          bench --site $site_name run-tests --module ${{ matrix.test }} --lightmode
-

.github/workflows/semantic-commits.yml

@@ -1,30 +0,0 @@
-name: Semantic Commits
-
-on:
-  pull_request: {}
-
-permissions:
-  contents: read
-
-concurrency:
-  group: commitcheck-erpnext-${{ github.event.number }}
-  cancel-in-progress: true
-
-jobs:
-  commitlint:
-    name: Check Commit Titles
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v6
-        with:
-          fetch-depth: 200
-
-      - uses: actions/setup-node@v6
-        with:
-          node-version: 18
-          check-latest: true
-
-      - name: Check commit titles
-        run: |
-          npm install @commitlint/cli @commitlint/config-conventional
-          npx commitlint --verbose --from ${{ github.event.pull_request.base.sha }} --to ${{ github.event.pull_request.head.sha }}

.github/workflows/server-tests-mariadb-faux.yml

@@ -1,31 +0,0 @@
-# Tests are skipped for these files but github doesn't allow "passing" hence this is required.
-
-name: Skipped Tests
-
-on:
-  pull_request:
-    paths:
-      - "**.js"
-      - "**.css"
-      - "**.svg"
-      - "**.md"
-      - "**.html"
-      - 'crowdin.yml'
-      - '.coderabbit.yml'
-      - '.mergify.yml'
-
-permissions:
-  contents: read
-
-jobs:
-  test:
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        container: [1, 2, 3, 4]
-
-    name: Python Unit Tests
-
-    steps:
-      - name: Pass skipped tests unconditionally
-        run: "echo Skipped"

.github/workflows/server-tests-mariadb.yml

@@ -1,166 +0,0 @@
-name: Server (Mariadb)
-
-on:
-  repository_dispatch:
-    types: [frappe-framework-change]
-  pull_request:
-    paths-ignore:
-      - '**.js'
-      - '**.css'
-      - '**.svg'
-      - '**.md'
-      - '**.html'
-      - 'crowdin.yml'
-      - '.coderabbit.yml'
-      - '.mergify.yml'
-  schedule:
-    # Run everday at midnight UTC / 5:30 IST
-    - cron: "0 0 * * *"
-  workflow_dispatch:
-    inputs:
-      user:
-        description: 'Frappe Framework repository user (add your username for forks)'
-        required: true
-        default: 'frappe'
-        type: string
-      branch:
-        description: 'Frappe Framework branch'
-        default: 'develop'
-        required: false
-        type: string
-
-permissions:
-  contents: read
-
-concurrency:
-  group: server-mariadb-develop-${{ github.event_name }}-${{ github.event.number || github.event_name == 'workflow_dispatch' && github.run_id || '' }}
-  cancel-in-progress: true
-
-jobs:
-  test:
-    runs-on: ubuntu-latest
-    timeout-minutes: 60
-    env:
-      TZ: 'Asia/Kolkata'
-      NODE_ENV: "production"
-      WITH_COVERAGE: ${{ github.event_name != 'pull_request' }}
-
-    strategy:
-      fail-fast: false
-
-      matrix:
-        container: [1, 2, 3, 4]
-
-    name: Python Unit Tests
-
-    services:
-      mysql:
-        image: mariadb:10.6
-        env:
-          TZ: 'Asia/Kolkata'
-          MARIADB_ROOT_PASSWORD: 'root'
-        ports:
-          - 3306:3306
-        options: --health-cmd="mariadb-admin ping" --health-interval=5s --health-timeout=2s --health-retries=3
-
-    steps:
-      - name: Clone
-        uses: actions/checkout@v6
-
-      - name: Setup Python
-        uses: actions/setup-python@v6
-        with:
-          python-version: '3.14'
-
-      - name: Check for valid Python & Merge Conflicts
-        run: |
-          python -m compileall -fq "${GITHUB_WORKSPACE}"
-          if grep -lr --exclude-dir=node_modules "^<<<<<<< " "${GITHUB_WORKSPACE}"
-              then echo "Found merge conflicts"
-              exit 1
-          fi
-
-      - name: Setup Node
-        uses: actions/setup-node@v6
-        with:
-          node-version: 24
-          check-latest: true
-
-      - name: Add to Hosts
-        run: echo "127.0.0.1 test_site" | sudo tee -a /etc/hosts
-
-      - name: Cache pip
-        uses: actions/cache@v4
-        with:
-          path: ~/.cache/pip
-          key: ${{ runner.os }}-pip-${{ hashFiles('**/*requirements.txt', '**/pyproject.toml') }}
-          restore-keys: |
-            ${{ runner.os }}-pip-
-            ${{ runner.os }}-
-
-      - name: Cache node modules
-        uses: actions/cache@v4
-        env:
-          cache-name: cache-node-modules
-        with:
-          path: ~/.npm
-          key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/package-lock.json') }}
-          restore-keys: |
-            ${{ runner.os }}-build-${{ env.cache-name }}-
-            ${{ runner.os }}-build-
-            ${{ runner.os }}-
-
-      - name: Get yarn cache directory path
-        id: yarn-cache-dir-path
-        run: echo "dir=$(yarn cache dir)" >> $GITHUB_OUTPUT
-
-      - uses: actions/cache@v4
-        id: yarn-cache
-        with:
-          path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
-          key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
-          restore-keys: |
-            ${{ runner.os }}-yarn-
-
-      - name: Install
-        run: bash ${GITHUB_WORKSPACE}/.github/helper/install.sh
-        env:
-          DB: mariadb
-          TYPE: server
-          FRAPPE_USER: ${{ github.event.inputs.user }}
-          FRAPPE_BRANCH: ${{ github.event.client_payload.sha || github.event.inputs.branch }}
-
-      - name: Run Tests
-        run: 'cd ~/frappe-bench/ && bench --site test_site run-parallel-tests --lightmode --app erpnext --total-builds ${{ strategy.job-total }} --build-number ${{ matrix.container }} --with-coverage'
-        env:
-          TYPE: server
-
-
-      - name: Show bench output
-        if: ${{ always() }}
-        run: cat ~/frappe-bench/bench_start.log || true
-
-      - name: Upload coverage data
-        uses: actions/upload-artifact@v4
-        with:
-          name: coverage-${{ matrix.container }}
-          path: /home/runner/frappe-bench/sites/coverage.xml
-
-  coverage:
-    name: Coverage Wrap Up
-    needs: test
-    runs-on: ubuntu-latest
-    steps:
-      - name: Clone
-        uses: actions/checkout@v6
-
-      - name: Download artifacts
-        uses: actions/download-artifact@v4
-
-      - name: Upload coverage data
-        uses: codecov/codecov-action@v4
-        with:
-          name: MariaDB
-          token: ${{ secrets.CODECOV_TOKEN }}
-          fail_ci_if_error: true
-          verbose: true

.github/workflows/server-tests-postgres.yml

@@ -1,118 +0,0 @@
-name: Server (Postgres)
-
-on:
-  pull_request:
-    paths-ignore:
-      - '**.js'
-      - '**.md'
-      - '**.html'
-      - 'crowdin.yml'
-      - '.coderabbit.yml'
-      - '.mergify.yml'
-    types: [opened, labelled, synchronize, reopened]
-
-concurrency:
-  group: server-postgres-develop-${{ github.event_name }}-${{ github.event.number || github.event_name == 'workflow_dispatch' && github.run_id || '' }}
-  cancel-in-progress: true
-
-permissions:
-  contents: read
-
-jobs:
-  test:
-    if: ${{ contains(github.event.pull_request.labels.*.name, 'postgres') }}
-    runs-on: ubuntu-latest
-    timeout-minutes: 60
-
-    strategy:
-      fail-fast: false
-      matrix:
-       container: [1]
-
-    name: Python Unit Tests
-
-    services:
-      postgres:
-        image: postgres:13.3
-        env:
-          POSTGRES_PASSWORD: travis
-        options: >-
-          --health-cmd pg_isready
-          --health-interval 10s
-          --health-timeout 5s
-          --health-retries 5
-        ports:
-          - 5432:5432
-
-    steps:
-
-      - name: Clone
-        uses: actions/checkout@v6
-
-      - name: Setup Python
-        uses: actions/setup-python@v6
-        with:
-          python-version: '3.14'
-
-      - name: Check for valid Python & Merge Conflicts
-        run: |
-          python -m compileall -fq "${GITHUB_WORKSPACE}"
-          if grep -lr --exclude-dir=node_modules "^<<<<<<< " "${GITHUB_WORKSPACE}"
-              then echo "Found merge conflicts"
-              exit 1
-          fi
-
-      - name: Setup Node
-        uses: actions/setup-node@v6
-        with:
-          node-version: 24
-          check-latest: true
-
-      - name: Add to Hosts
-        run: echo "127.0.0.1 test_site" | sudo tee -a /etc/hosts
-
-      - name: Cache pip
-        uses: actions/cache@v4
-        with:
-          path: ~/.cache/pip
-          key: ${{ runner.os }}-pip-${{ hashFiles('**/*requirements.txt', '**/pyproject.toml') }}
-          restore-keys: |
-            ${{ runner.os }}-pip-
-            ${{ runner.os }}-
-
-      - name: Cache node modules
-        uses: actions/cache@v4
-        env:
-          cache-name: cache-node-modules
-        with:
-          path: ~/.npm
-          key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/package-lock.json') }}
-          restore-keys: |
-            ${{ runner.os }}-build-${{ env.cache-name }}-
-            ${{ runner.os }}-build-
-            ${{ runner.os }}-
-
-      - name: Get yarn cache directory path
-        id: yarn-cache-dir-path
-        run: echo "dir=$(yarn cache dir)" >> $GITHUB_OUTPUT
-
-      - uses: actions/cache@v4
-        id: yarn-cache
-        with:
-          path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
-          key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
-          restore-keys: |
-            ${{ runner.os }}-yarn-
-
-      - name: Install
-        run: bash ${GITHUB_WORKSPACE}/.github/helper/install.sh
-        env:
-          DB: postgres
-          TYPE: server
-
-      - name: Run Tests
-        run: cd ~/frappe-bench/ && bench --site test_site run-parallel-tests --app erpnext --use-orchestrator
-        env:
-          TYPE: server
-          CI_BUILD_ID: ${{ github.run_id }}
-          ORCHESTRATOR_URL: http://test-orchestrator.frappe.io

.github/workflows/server-tests.yml

@@ -0,0 +1,126 @@
+name: Server
+
+on:
+  pull_request:
+    paths-ignore:
+      - '**.js'
+      - '**.md'
+  workflow_dispatch:
+  push:
+    branches: [ develop ]
+    paths-ignore:
+      - '**.js'
+      - '**.md'
+
+jobs:
+  test:
+    runs-on: ubuntu-18.04
+
+    strategy:
+      fail-fast: false
+
+      matrix:
+        container: [1, 2, 3]
+
+    name: Python Unit Tests
+
+    services:
+      mysql:
+        image: mariadb:10.3
+        env:
+          MYSQL_ALLOW_EMPTY_PASSWORD: YES
+        ports:
+          - 3306:3306
+        options: --health-cmd="mysqladmin ping" --health-interval=5s --health-timeout=2s --health-retries=3
+
+    steps:
+      - name: Clone
+        uses: actions/checkout@v2
+
+      - name: Setup Python
+        uses: actions/setup-python@v2
+        with:
+          python-version: 3.7
+
+      - name: Setup Node
+        uses: actions/setup-node@v2
+        with:
+          node-version: 12
+          check-latest: true
+
+      - name: Add to Hosts
+        run: echo "127.0.0.1 test_site" | sudo tee -a /etc/hosts
+
+      - name: Cache pip
+        uses: actions/cache@v2
+        with:
+          path: ~/.cache/pip
+          key: ${{ runner.os }}-pip-${{ hashFiles('**/requirements.txt') }}
+          restore-keys: |
+            ${{ runner.os }}-pip-
+            ${{ runner.os }}-
+
+      - name: Cache node modules
+        uses: actions/cache@v2
+        env:
+          cache-name: cache-node-modules
+        with:
+          path: ~/.npm
+          key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/package-lock.json') }}
+          restore-keys: |
+            ${{ runner.os }}-build-${{ env.cache-name }}-
+            ${{ runner.os }}-build-
+            ${{ runner.os }}-
+
+      - name: Get yarn cache directory path
+        id: yarn-cache-dir-path
+        run: echo "::set-output name=dir::$(yarn cache dir)"
+
+      - uses: actions/cache@v2
+        id: yarn-cache
+        with:
+          path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
+          key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
+          restore-keys: |
+            ${{ runner.os }}-yarn-
+
+      - name: Install
+        run: bash ${GITHUB_WORKSPACE}/.github/helper/install.sh
+
+      - name: Run Tests
+        run: cd ~/frappe-bench/ && bench --site test_site run-parallel-tests --app erpnext --use-orchestrator --with-coverage
+        env:
+          TYPE: server
+          CI_BUILD_ID: ${{ github.run_id }}
+          ORCHESTRATOR_URL: http://test-orchestrator.frappe.io
+
+      - name: Upload Coverage Data
+        run: |
+          cp ~/frappe-bench/sites/.coverage ${GITHUB_WORKSPACE}
+          cd ${GITHUB_WORKSPACE}
+          pip3 install coverage==5.5
+          pip3 install coveralls==3.0.1
+          coveralls
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          COVERALLS_FLAG_NAME: run-${{ matrix.container }}
+          COVERALLS_SERVICE_NAME: ${{ github.event_name == 'pull_request' && 'github' || 'github-actions' }}
+          COVERALLS_PARALLEL: true
+
+  coveralls:
+    name: Coverage Wrap Up
+    needs: test
+    container: python:3-slim
+    runs-on: ubuntu-18.04
+    steps:
+      - name: Clone
+        uses: actions/checkout@v2
+
+      - name: Coveralls Finished
+        run: |
+          cd ${GITHUB_WORKSPACE}
+          pip3 install coverage==5.5
+          pip3 install coveralls==3.0.1
+          coveralls --finish
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/translation_linter.yml

@@ -0,0 +1,22 @@
+name: Frappe Linter
+on:
+  pull_request:
+    branches:
+      - develop
+      - version-12-hotfix
+      - version-11-hotfix
+jobs:
+  check_translation:
+    name: Translation Syntax Check
+    runs-on: ubuntu-18.04
+    steps:
+    - uses: actions/checkout@v2
+    - name: Setup python3
+      uses: actions/setup-python@v1
+      with:
+        python-version: 3.6
+    - name: Validating Translation Syntax
+      run: |
+        git fetch origin $GITHUB_BASE_REF:$GITHUB_BASE_REF -q
+        files=$(git diff --name-only --diff-filter=d $GITHUB_BASE_REF)
+        python $GITHUB_WORKSPACE/.github/helper/translation.py $files

.github/workflows/ui-tests.yml

@@ -0,0 +1,112 @@
+name: UI
+
+on:
+  pull_request:
+    paths-ignore:
+      - '**.md'
+  workflow_dispatch:
+
+jobs:
+  test:
+    runs-on: ubuntu-18.04
+
+    strategy:
+      fail-fast: false
+
+    name: UI Tests (Cypress)
+
+    services:
+      mysql:
+        image: mariadb:10.3
+        env:
+          MYSQL_ALLOW_EMPTY_PASSWORD: YES
+        ports:
+          - 3306:3306
+        options: --health-cmd="mysqladmin ping" --health-interval=5s --health-timeout=2s --health-retries=3
+
+    steps:
+      - name: Clone
+        uses: actions/checkout@v2
+
+      - name: Setup Python
+        uses: actions/setup-python@v2
+        with:
+          python-version: 3.7
+
+      - uses: actions/setup-node@v2
+        with:
+          node-version: 14
+          check-latest: true
+
+      - name: Add to Hosts
+        run: |
+          echo "127.0.0.1 test_site" | sudo tee -a /etc/hosts
+
+      - name: Cache pip
+        uses: actions/cache@v2
+        with:
+          path: ~/.cache/pip
+          key: ${{ runner.os }}-pip-${{ hashFiles('**/requirements.txt') }}
+          restore-keys: |
+            ${{ runner.os }}-pip-
+            ${{ runner.os }}-
+
+      - name: Cache node modules
+        uses: actions/cache@v2
+        env:
+          cache-name: cache-node-modules
+        with:
+          path: ~/.npm
+          key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/package-lock.json') }}
+          restore-keys: |
+            ${{ runner.os }}-build-${{ env.cache-name }}-
+            ${{ runner.os }}-build-
+            ${{ runner.os }}-
+
+      - name: Get yarn cache directory path
+        id: yarn-cache-dir-path
+        run: echo "::set-output name=dir::$(yarn cache dir)"
+
+      - uses: actions/cache@v2
+        id: yarn-cache
+        with:
+          path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
+          key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
+          restore-keys: |
+            ${{ runner.os }}-yarn-
+
+      - name: Cache cypress binary
+        uses: actions/cache@v2
+        with:
+          path: ~/.cache
+          key: ${{ runner.os }}-cypress-
+          restore-keys: |
+            ${{ runner.os }}-cypress-
+            ${{ runner.os }}-
+
+      - name: Install
+        run: bash ${GITHUB_WORKSPACE}/.github/helper/install.sh
+        env:
+          DB: mariadb
+          TYPE: ui
+
+      - name: Site Setup
+        run: cd ~/frappe-bench/ && bench --site test_site execute erpnext.setup.utils.before_tests
+
+      - name: cypress pre-requisites
+        run: cd ~/frappe-bench/apps/frappe && yarn add cypress-file-upload@^5 @testing-library/cypress@^8 --no-lockfile
+
+
+      - name: Build Assets
+        run: cd ~/frappe-bench/ && bench build
+        env:
+          CI: Yes
+
+      - name: UI Tests
+        run: cd ~/frappe-bench/ && bench --site test_site run-ui-tests erpnext --headless
+        env:
+          CYPRESS_RECORD_KEY: 60a8e3bf-08f5-45b1-9269-2b207d7d30cd
+
+      - name: Show bench console if tests failed
+        if: ${{ failure() }}
+        run: cat ~/frappe-bench/bench_run_logs.txt

.gitignore

@@ -2,11 +2,11 @@
 *.py~
 .DS_Store
 conf.py
+locale
 latest_updates.json
 .wnf-lang-status
 *.egg-info
 dist/
-erpnext/public/dist
 erpnext/docs/current
 *.swp
 *.swo
@@ -14,12 +14,4 @@ __pycache__
 *~
 .idea/
 .vscode/
-.helix/
 node_modules/
-.backportrc.json
-# Aider AI Chat
-.aider*
-
-# Banking SPA
-erpnext/public/banking
-erpnext/www/banking.html

.mergify.yml

@@ -2,93 +2,57 @@ pull_request_rules:
   - name: Auto-close PRs on stable branch
     conditions:
       - and:
-          - and:
-              - author!=surajshetty3416
-              - author!=gavindsouza
-              - author!=rohitwaghchaure
-              - author!=nabinhait
-              - author!=ankush
-              - author!=deepeshgarg007
-              - author!=frappe-pr-bot
-              - author!=mergify[bot]
-          - or:
-              - base=version-13
-              - base=version-12
-              - base=version-14
-              - base=version-15
-              - base=version-16
+        - and:
+          - author!=surajshetty3416
+          - author!=gavindsouza
+          - author!=rohitwaghchaure
+          - author!=nabinhait
+        - or:
+          - base=version-13
+          - base=version-12
     actions:
       close:
       comment:
-        message: |
-          @{{author}}, thanks for the contribution, but we do not accept pull requests on a stable branch. Please raise PR on an appropriate hotfix branch.
-          https://github.com/frappe/erpnext/wiki/Pull-Request-Checklist#which-branch
-  - name: backport to develop
-    conditions:
-      - label="backport develop"
-    actions:
-      backport:
-        branches:
-          - develop
-        assignees:
-          - "{{ author }}"
-  - name: backport to version-14-hotfix
-    conditions:
-      - label="backport version-14-hotfix"
-    actions:
-      backport:
-        branches:
-          - version-14-hotfix
-        assignees:
-          - "{{ author }}"
-  - name: backport to version-15-hotfix
-    conditions:
-      - label="backport version-15-hotfix"
-    actions:
-      backport:
-        branches:
-          - version-15-hotfix
-        assignees:
-          - "{{ author }}"
-  - name: backport to version-16-hotfix
-    conditions:
-      - label="backport version-16-hotfix"
-    actions:
-      backport:
-        branches:
-          - version-16-hotfix
-        assignees:
-          - "{{ author }}"
-  - name: Automatic merge on CI success and review
-    conditions:
-      - status-success=linters
-      - status-success=Sider
-      - status-success=Semantic Pull Request
-      - status-success=Patch Test
-      - status-success=Python Unit Tests (1)
-      - status-success=Python Unit Tests (2)
-      - status-success=Python Unit Tests (3)
-      - label!=dont-merge
-      - label!=squash
-      - "#approved-reviews-by>=1"
-    actions:
-      merge:
-        method: merge
-  - name: Automatic squash on CI success and review
-    conditions:
-      - status-success=linters
-      - status-success=Sider
-      - status-success=Patch Test
-      - status-success=Python Unit Tests (1)
-      - status-success=Python Unit Tests (2)
-      - status-success=Python Unit Tests (3)
-      - label!=dont-merge
-      - label=squash
-      - "#approved-reviews-by>=1"
-    actions:
-      merge:
-        method: squash
-        commit_message_template: |
-          {{ title }} (#{{ number }})
+          message: |
+            @{{author}}, thanks for the contribution, but we do not accept pull requests on a stable branch. Please raise PR on an appropriate hotfix branch. 
+            https://github.com/frappe/erpnext/wiki/Pull-Request-Checklist#which-branch
 
-          {{ body }}
+  - name: backport to version-13-hotfix
+    conditions:
+      - label="backport version-13-hotfix"
+    actions:
+      backport:
+        branches:
+          - version-13-hotfix
+        assignees:
+          - "{{ author }}"
+
+  - name: backport to version-13-pre-release
+    conditions:
+      - label="backport version-13-pre-release"
+    actions:
+      backport:
+        branches:
+          - version-13-pre-release
+        assignees:
+          - "{{ author }}"
+
+  - name: backport to version-12-hotfix
+    conditions:
+      - label="backport version-12-hotfix"
+    actions:
+      backport:
+        branches:
+          - version-12-hotfix
+        assignees:
+          - "{{ author }}"
+
+  - name: backport to version-12-pre-release
+    conditions:
+      - label="backport version-12-pre-release"
+    actions:
+      backport:
+        branches:
+          - version-12-pre-release
+        assignees:
+          - "{{ author }}"

.pre-commit-config.yaml

@@ -1,11 +1,11 @@
 exclude: 'node_modules|.git'
-default_stages: [pre-commit]
+default_stages: [commit]
 fail_fast: false
 
 
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.3.0
+    rev: v4.0.1
     hooks:
       - id: trailing-whitespace
         files: "erpnext.*"
@@ -15,56 +15,22 @@ repos:
         args: ['--branch', 'develop']
       - id: check-merge-conflict
       - id: check-ast
-      - id: check-json
-      - id: check-toml
-      - id: check-yaml
-      - id: debug-statements
 
-  - repo: https://github.com/pre-commit/mirrors-prettier
-    rev: v2.7.1
+  - repo: https://gitlab.com/pycqa/flake8
+    rev: 3.9.2
     hooks:
-      - id: prettier
-        types_or: [javascript, vue, scss]
-        # Ignore any files that might contain jinja / bundles
-        exclude: |
-            (?x)^(
-                erpnext/public/dist/.*|
-                cypress/.*|
-                .*node_modules.*|
-                .*boilerplate.*|
-                erpnext/templates/includes/.*
-            )$
+      - id: flake8
+        additional_dependencies: [
+          'flake8-bugbear',
+        ]
+        args: ['--config', '.github/helper/.flake8_strict']
+        exclude: ".*setup.py$"
 
-  - repo: https://github.com/pre-commit/mirrors-eslint
-    rev: v8.44.0
+  - repo: https://github.com/timothycrosley/isort
+    rev: 5.9.1
     hooks:
-      - id: eslint
-        types_or: [javascript]
-        args: ['--quiet']
-        # Ignore any files that might contain jinja / bundles
-        exclude: |
-            (?x)^(
-                erpnext/public/dist/.*|
-                cypress/.*|
-                .*node_modules.*|
-                .*boilerplate.*|
-                erpnext/public/js/controllers/.*|
-                erpnext/templates/pages/order.js|
-                erpnext/templates/includes/.*
-            )$
-
-  - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.2.0
-    hooks:
-      - id: ruff
-        name: "Run ruff import sorter"
-        args: ["--select=I", "--fix"]
-
-      - id: ruff
-        name: "Run ruff linter"
-
-      - id: ruff-format
-        name: "Run ruff formatter"
+      - id: isort
+        exclude: ".*setup.py$"
 
 ci:
     autoupdate_schedule: weekly

.releaserc

@@ -1,24 +0,0 @@
-{
-	"branches": ["version-13"],
-	"plugins": [
-		"@semantic-release/commit-analyzer", {
-			"preset": "angular",
-			"releaseRules": [
-				{"breaking": true, "release": false}
-			]
-		},
-		"@semantic-release/release-notes-generator",
-		[
-			"@semantic-release/exec", {
-				"prepareCmd": 'sed -ir "s/[0-9]*\.[0-9]*\.[0-9]*/${nextRelease.version}/" erpnext/__init__.py'
-			}
-		],
-		[
-			"@semantic-release/git", {
-				"assets": ["erpnext/__init__.py"],
-				"message": "chore(release): Bumped to Version ${nextRelease.version}\n\n${nextRelease.notes}"
-			}
-		],
-		"@semantic-release/github"
-	]
-}

CODEOWNERS

@@ -3,21 +3,33 @@
 # These owners will be the default owners for everything in
 # the repo. Unless a later match takes precedence,
 
-erpnext/accounts/               @ruthra-kumar
-erpnext/assets/                 @khushi8112
-erpnext/regional                @ruthra-kumar
-erpnext/selling                 @ruthra-kumar
+erpnext/accounts/               @nextchamp-saqib @deepeshgarg007
+erpnext/assets/                 @nextchamp-saqib @deepeshgarg007
+erpnext/erpnext_integrations/   @nextchamp-saqib
+erpnext/loan_management/        @nextchamp-saqib @deepeshgarg007
+erpnext/regional                @nextchamp-saqib @deepeshgarg007
+erpnext/selling                 @nextchamp-saqib @deepeshgarg007
+erpnext/support/                @nextchamp-saqib @deepeshgarg007
+pos*                            @nextchamp-saqib
 
-erpnext/buying/                 @rohitwaghchaure @mihir-kandoi
-erpnext/maintenance/            @rohitwaghchaure @mihir-kandoi
-erpnext/manufacturing/          @rohitwaghchaure @mihir-kandoi
-erpnext/quality_management/     @rohitwaghchaure @mihir-kandoi
-erpnext/stock/                  @rohitwaghchaure @mihir-kandoi
-erpnext/subcontracting/         @mihir-kandoi
-erpnext/projects/               @nishkagosalia
+erpnext/buying/                 @marination @rohitwaghchaure @ankush
+erpnext/e_commerce/             @marination
+erpnext/maintenance/            @marination @rohitwaghchaure
+erpnext/manufacturing/          @marination @rohitwaghchaure @ankush
+erpnext/portal/                 @marination
+erpnext/quality_management/     @marination @rohitwaghchaure
+erpnext/shopping_cart/          @marination
+erpnext/stock/                  @marination @rohitwaghchaure @ankush
 
-erpnext/controllers/            @ruthra-kumar @rohitwaghchaure @mihir-kandoi
-erpnext/patches/                @ruthra-kumar @rohitwaghchaure @mihir-kandoi
+erpnext/crm/                    @ruchamahabal @pateljannat
+erpnext/education/              @ruchamahabal @pateljannat
+erpnext/healthcare/             @ruchamahabal @pateljannat @chillaranand
+erpnext/hr/                     @ruchamahabal @pateljannat
+erpnext/non_profit/             @ruchamahabal
+erpnext/payroll                 @ruchamahabal @pateljannat
+erpnext/projects/               @ruchamahabal @pateljannat
 
-.github/                        @ruthra-kumar @mihir-kandoi
-pyproject.toml                  @ruthra-kumar
+erpnext/controllers             @deepeshgarg007 @nextchamp-saqib @rohitwaghchaure @marination
+
+.github/                        @surajshetty3416 @ankush
+requirements.txt                @gavindsouza

README.md

@@ -1,177 +1,115 @@
-
 <div align="center">
-    <a href="https://frappe.io/erpnext">
-	<img src="./erpnext/public/images/v16/erpnext.svg" alt="ERPNext Logo" height="80px" width="80px"/>
-    </a>
+    <img src="https://raw.githubusercontent.com/frappe/erpnext/develop/erpnext/public/images/erpnext-logo.png" height="128">
     <h2>ERPNext</h2>
-    <div align="center">
-        <p>Powerful, Intuitive and Open-Source ERP</p>
-    </div>
+    <p align="center">
+        <p>ERP made simple</p>
+    </p>
 
-[![Learn on Frappe School](https://img.shields.io/badge/Frappe%20School-Learn%20ERPNext-blue?style=flat-square)](https://frappe.school)<br><br>
-[![CI](https://github.com/frappe/erpnext/actions/workflows/server-tests-mariadb.yml/badge.svg?event=schedule)](https://github.com/frappe/erpnext/actions/workflows/server-tests-mariadb.yml)
-[![docker pulls](https://img.shields.io/docker/pulls/frappe/erpnext.svg)](https://hub.docker.com/r/frappe/erpnext)
+[![CI](https://github.com/frappe/erpnext/actions/workflows/ci-tests.yml/badge.svg?branch=develop)](https://github.com/frappe/erpnext/actions/workflows/ci-tests.yml)
+[![Open Source Helpers](https://www.codetriage.com/frappe/erpnext/badges/users.svg)](https://www.codetriage.com/frappe/erpnext)
+[![Coverage Status](https://coveralls.io/repos/github/frappe/erpnext/badge.svg?branch=develop)](https://coveralls.io/github/frappe/erpnext?branch=develop)
+
+[https://erpnext.com](https://erpnext.com)
 
 </div>
 
-<div align="center">
-	<img src="./erpnext/public/images/v16/hero_image.png" alt="ERPNext Hero Image"/>
-</div>
+ERPNext as a monolith includes the following areas for managing businesses:
 
-<div align="center">
-	<a href="https://erpnext-demo.frappe.cloud/api/method/erpnext_demo.erpnext_demo.auth.login_demo">Live Demo</a>
-	-
-	<a href="https://frappe.io/erpnext">Website</a>
-	-
-	<a href="https://docs.frappe.io/erpnext/">Documentation</a>
-</div>
+1. [Accounting](https://erpnext.com/open-source-accounting)
+1. [Warehouse Management](https://erpnext.com/distribution/warehouse-management-system)
+1. [CRM](https://erpnext.com/open-source-crm)
+1. [Sales](https://erpnext.com/open-source-sales-purchase)
+1. [Purchase](https://erpnext.com/open-source-sales-purchase)
+1. [HRMS](https://erpnext.com/open-source-hrms)
+1. [Project Management](https://erpnext.com/open-source-projects)
+1. [Support](https://erpnext.com/open-source-help-desk-software)
+1. [Asset Management](https://erpnext.com/open-source-asset-management-software)
+1. [Quality Management](https://erpnext.com/docs/user/manual/en/quality-management)
+1. [Manufacturing](https://erpnext.com/open-source-manufacturing-erp-software)
+1. [Website Management](https://erpnext.com/open-source-website-builder-software)
+1. [Customize ERPNext](https://erpnext.com/docs/user/manual/en/customize-erpnext)
+1. [And More](https://erpnext.com/docs/user/manual/en/)
 
-## ERPNext
+ERPNext requires MariaDB.
 
-100% Open-Source ERP System to help you run your business.
+ERPNext is built on the [Frappe Framework](https://github.com/frappe/frappe), a full-stack web app framework built with Python & JavaScript.
 
-### Motivation
+- [User Guide](https://erpnext.com/docs/user)
+- [Discussion Forum](https://discuss.erpnext.com/)
 
-Running a business is a complex task - handling invoices, tracking stock, managing personnel, and other daily operations. In a market where software is sold separately to manage each of these tasks, ERPNext does all of the above and more, for free.
+---
 
-### Key Features
+### Containerized Installation
 
-- **Accounting**: All the tools you need to manage cash flow in one place, right from recording transactions to summarizing and analyzing financial reports.
-- **Order Management**: Track inventory levels, replenish stock, and manage sales orders, customers, suppliers, shipments, deliverables, and order fulfillment.
-- **Manufacturing**: Simplifies the production cycle, helps track material consumption, exhibits capacity planning, handles subcontracting, and more!
-- **Asset Management**: From purchase to disposal, IT infrastructure to equipment. Covers every branch of your organization, all in one centralized system.
-- **Projects**: Deliver both internal and external projects on time, budget and profitability. Track tasks, timesheets, and issues by project.
+Use docker to deploy ERPNext in production or for development of [Frappe](https://github.com/frappe/frappe) apps. See https://github.com/frappe/frappe_docker for more details.
 
-<details open>
-
-<summary>More</summary>
-	<img src="https://erpnext.com/files/v16_bom.png"/>
-	<img src="https://erpnext.com/files/v16_stock_summary.png"/>
-	<img src="https://erpnext.com/files/v16_job_card.png"/>
-	<img src="https://erpnext.com/files/v16_tasks.png"/>
-</details>
-
-### Under the Hood
-
-- [**Frappe Framework**](https://github.com/frappe/frappe): A full-stack web application framework written in Python and JavaScript. The framework provides a robust foundation for building web applications, including a database abstraction layer, user authentication, and a REST API.
-
-- [**Frappe UI**](https://github.com/frappe/frappe-ui): A Vue-based UI library, to provide a modern user interface. The Frappe UI library provides a variety of components that can be used to build single-page applications on top of the Frappe Framework.
-
-## Production Setup
-
-### Managed Hosting
-
-You can try [Frappe Cloud](https://frappecloud.com), a simple, user-friendly, and sophisticated [open-source](https://github.com/frappe/press) platform to host Frappe applications reliably and securely.
-
-It handles installation, setup, upgrades, monitoring, maintenance, and support of your Frappe deployments. It is a fully featured developer platform with an ability to manage and control multiple Frappe deployments.
-
-<div>
-	<a href="https://erpnext-demo.frappe.cloud/app/home" target="_blank" rel="noopener noreferrer">
-		<picture>
-			<source media="(prefers-color-scheme: dark)" srcset="https://frappe.io/files/try-on-fc-white.png">
-			<img src="https://frappe.io/files/try-on-fc-black.png" alt="Try on Frappe Cloud" height="28" />
-		</picture>
-	</a>
-</div>
-
-
-### Self-Hosted
-#### Docker
-
-See [Frappe Docker Documentation](https://github.com/frappe/frappe_docker) for full documentation & FAQ on Docker setup
-
-#### Prerequisites
-
-- [Docker](https://docs.docker.com/get-docker/)
-- [Docker Compose v2](https://docs.docker.com/compose/)
-- [git](https://docs.github.com/en/get-started/getting-started-with-git/set-up-git)
-
-> For Docker basics and best practices refer to Docker's [documentation](https://docs.docker.com)
-
-### Try on your environment
-
-> **⚠️ Disposable demo only**
->
-> **This setup is intended for quick evaluation. Expect to throw the environment away.** You will not be able to install custom apps to this setup. For production deployments, custom configurations, and detailed explanations, see the full documentation.
-
-First clone the repo:
-
-```sh
-git clone https://github.com/frappe/frappe_docker
-cd frappe_docker
-```
-
-Then run:
-
-```sh
-docker compose -f pwd.yml up -d
-```
-Wait for a couple of minutes for ERPNext site to be created or check the `create-site` container logs before opening browser on port `8080`. (username: `Administrator`, password: `admin`)
-
-See [Frappe Docker](https://github.com/frappe/frappe_docker/blob/main/docs/01-getting-started/03-arm64.md) for ARM based docker setup
-
-
-## Development Setup
-### Manual Install
+### Full Install
 
 The Easy Way: our install script for bench will install all dependencies (e.g. MariaDB). See https://github.com/frappe/bench for more details.
 
-New passwords will be created for the ERPNext "Administrator" user, the MariaDB root user, and the Frappe user (the script displays the passwords and saves them to ~/frappe_passwords.txt).
+New passwords will be created for the ERPNext "Administrator" user, the MariaDB root user, and the frappe user (the script displays the passwords and saves them to ~/frappe_passwords.txt).
 
+### Virtual Image
 
-### Local
+You can download a virtual image to run ERPNext in a virtual machine on your local system.
 
-To setup the repository locally follow the steps mentioned below:
+- [ERPNext Download](http://erpnext.com/download)
 
-1. Setup bench by following the [Installation Steps](https://frappeframework.com/docs/user/en/installation) and start the server
-   ```
-   bench start
-   ```
+System and user credentials are listed on the download page.
 
-2. In a separate terminal window, run the following commands:
-   ```
-   # Create a new site
-   bench new-site erpnext.localhost
-   ```
+---
 
-3. Get the ERPNext app and install it
-   ```
-   # Get the ERPNext app
-   bench get-app https://github.com/frappe/erpnext
+## License
 
-   # Install the app
-   bench --site erpnext.localhost install-app erpnext
-   ```
+GNU/General Public License (see [license.txt](license.txt))
 
-4. Open the URL `http://erpnext.localhost:8000/app` in your browser, you should see the app running
-
-## Learning and Community
-
-1. [Frappe School](https://school.frappe.io) - Learn Frappe Framework and ERPNext from the various courses by the maintainers or from the community.
-2. [Official documentation](https://docs.erpnext.com/) - Extensive documentation for ERPNext.
-3. [Discussion Forum](https://discuss.frappe.io/c/erpnext/6) - Engage with the community of ERPNext users and service providers.
-4. [Telegram Group](https://erpnext_public.t.me) - Get instant help from huge community of users.
+The ERPNext code is licensed as GNU General Public License (v3) and the Documentation is licensed as Creative Commons (CC-BY-SA-3.0) and the copyright is owned by Frappe Technologies Pvt Ltd (Frappe) and Contributors.
 
+---
 
 ## Contributing
 
 1. [Issue Guidelines](https://github.com/frappe/erpnext/wiki/Issue-Guidelines)
-2. [Report Security Vulnerabilities](https://erpnext.com/security)
-3. [Pull Request Requirements](https://github.com/frappe/erpnext/wiki/Contribution-Guidelines)
-4. [Translations](https://crowdin.com/project/frappe)
+1. [Report Security Vulnerabilities](https://erpnext.com/security)
+1. [Pull Request Requirements](https://github.com/frappe/erpnext/wiki/Contribution-Guidelines)
+1. [Translations](https://translate.erpnext.com)
+1. [Chart of Accounts](https://charts.erpnext.com)
 
+---
 
-## Logo and Trademark Policy
+## Logo and Trademark
 
-Please read our [Logo and Trademark Policy](TRADEMARK_POLICY.md).
+The brand name ERPNext and the logo are trademarks of Frappe Technologies Pvt. Ltd.
 
-<br />
-<br />
-<div align="center" style="padding-top: 0.75rem;">
-	<a href="https://frappe.io" target="_blank">
-		<picture>
-			<source media="(prefers-color-scheme: dark)" srcset="https://frappe.io/files/Frappe-white.png">
-			<img src="https://frappe.io/files/Frappe-black.png" alt="Frappe Technologies" height="28"/>
-		</picture>
-	</a>
-</div>
+### Introduction
+
+Frappe Technologies Pvt. Ltd. (Frappe) owns and oversees the trademarks for the ERPNext name and logos. We have developed this trademark usage policy with the following goals in mind:
+
+- We’d like to make it easy for anyone to use the ERPNext name or logo for community-oriented efforts that help spread and improve ERPNext.
+- We’d like to make it clear how ERPNext-related businesses and projects can (and cannot) use the ERPNext name and logo.
+- We’d like to make it hard for anyone to use the ERPNext name and logo to unfairly profit from, trick or confuse people who are looking for official ERPNext resources.
+
+### Frappe Trademark Usage Policy
+
+Permission from Frappe is required to use the ERPNext name or logo as part of any project, product, service, domain or company name.
+
+We will grant permission to use the ERPNext name and logo for projects that meet the following criteria:
+
+- The primary purpose of your project is to promote the spread and improvement of the ERPNext software.
+- Your project is non-commercial in nature (it can make money to cover its costs or contribute to non-profit entities, but it cannot be run as a for-profit project or business).
+Your project neither promotes nor is associated with entities that currently fail to comply with the GPL license under which ERPNext is distributed.
+- If your project meets these criteria, you will be permitted to use the ERPNext name and logo to promote your project in any way you see fit with one exception: Please do not use ERPNext as part of a domain name.
+
+Use of the ERPNext name and logo is additionally allowed in the following situations:
+
+All other ERPNext-related businesses or projects can use the ERPNext name and logo to refer to and explain their services, but they cannot use them as part of a product, project, service, domain, or company name and they cannot use them in any way that suggests an affiliation with or endorsement by ERPNext or Frappe Technologies or the ERPNext open source project. For example, a consulting company can describe its business as “123 Web Services, offering ERPNext consulting for small businesses,” but cannot call its business “The ERPNext Consulting Company.”
+
+Similarly, it’s OK to use the ERPNext logo as part of a page that describes your products or services, but it is not OK to use it as part of your company or product logo or branding itself. Under no circumstances is it permitted to use ERPNext as part of a top-level domain name.
+
+We do not allow the use of the trademark in advertising, including AdSense/AdWords.
+
+Please note that it is not the goal of this policy to limit commercial activity around ERPNext. We encourage ERPNext-based businesses, and we would love to see hundreds of them.
+
+When in doubt about your use of the ERPNext name or logo, please contact Frappe Technologies for clarification.
+
+(inspired by WordPress)

SECURITY.md

@@ -1,7 +1,7 @@
 # Security Policy
 
-The ERPNext team and community take security issues seriously. To report a security issue, please go through the information mentioned [here](https://frappe.io/security).
+The ERPNext team and community take security issues seriously. To report a security issue, fill out the form at [https://erpnext.com/security/report](https://erpnext.com/security/report).
 
-You can help us make ERPNext and all its users more secure by following the [Reporting guidelines](https://frappe.io/security).
+You can help us make ERPNext and all it's users more secure by following the [Reporting guidelines](https://erpnext.com/security).
 
-We appreciate your efforts to responsibly disclose your findings. We'll endeavor to respond quickly, and will keep you updated throughout the process.
+We appreciate your efforts to responsibly disclose your findings. We'll endeavor to respond quickly, and will keep you updated throughout the process.

TRADEMARK_POLICY.md

@@ -1,37 +0,0 @@
-## Logo and Trademark Policy
-
-The brand name ERPNext and the logo are trademarks of Frappe Technologies Pvt. Ltd.
-
-### Introduction
-
-Frappe Technologies Pvt. Ltd. (Frappe) owns and oversees the trademarks for the ERPNext name and logos. We have developed this trademark usage policy with the following goals in mind:
-
-- We’d like to make it easy for anyone to use the ERPNext name or logo for community-oriented efforts that help spread and improve ERPNext.
-- We’d like to make it clear how ERPNext-related businesses and projects can (and cannot) use the ERPNext name and logo.
-- We’d like to make it hard for anyone to use the ERPNext name and logo to unfairly profit from, trick or confuse people who are looking for official ERPNext resources.
-
-### Frappe Trademark Usage Policy
-
-Permission from Frappe is required to use the ERPNext name or logo as part of any project, product, service, domain or company name.
-
-We will grant permission to use the ERPNext name and logo for projects that meet the following criteria:
-
-- The primary purpose of your project is to promote the spread and improvement of the ERPNext software.
-- Your project is non-commercial in nature (it can make money to cover its costs or contribute to non-profit entities, but it cannot be run as a for-profit project or business).
-- Your project neither promotes nor is associated with entities that currently fail to comply with the GPL license under which ERPNext is distributed.
-
-If your project meets these criteria, you will be permitted to use the ERPNext name and logo to promote your project in any way you see fit with one exception: Please do not use ERPNext as part of a domain name.
-
-Use of the ERPNext name and logo is additionally allowed in the following situations:
-
-All other ERPNext-related businesses or projects can use the ERPNext name and logo to refer to and explain their services, but they cannot use them as part of a product, project, service, domain, or company name and they cannot use them in any way that suggests an affiliation with or endorsement by ERPNext or Frappe Technologies or the ERPNext open source project. For example, a consulting company can describe its business as “123 Web Services, offering ERPNext consulting for small businesses,” but cannot call its business “The ERPNext Consulting Company.”
-
-Similarly, it’s OK to use the ERPNext logo as part of a page that describes your products or services, but it is not OK to use it as part of your company or product logo or branding itself. Under no circumstances is it permitted to use ERPNext as part of a top-level domain name.
-
-We do not allow the use of the trademark in advertising, including AdSense/AdWords.
-
-Please note that it is not the goal of this policy to limit commercial activity around ERPNext. We encourage ERPNext-based businesses, and we would love to see hundreds of them.
-
-When in doubt about your use of the ERPNext name or logo, please contact Frappe Technologies for clarification.
-
-(inspired by WordPress)

babel_extractors.csv

@@ -1,5 +0,0 @@
-**/setup/setup_wizard/data/uom_data.json,erpnext.gettext.extractors.uom_data.extract
-**/setup/doctype/incoterm/incoterms.csv,erpnext.gettext.extractors.incoterms.extract
-**/setup/setup_wizard/data/*.txt,erpnext.gettext.extractors.lines_from_txt_file.extract
-**.tsx,frappe.gettext.extractors.html_template.extract
-**.ts,frappe.gettext.extractors.html_template.extract

banking/.env.production

@@ -1 +0,0 @@
-VITE_BASE_NAME="banking"

banking/.gitignore

@@ -1,24 +0,0 @@
-# Logs
-logs
-*.log
-npm-debug.log*
-yarn-debug.log*
-yarn-error.log*
-pnpm-debug.log*
-lerna-debug.log*
-
-node_modules
-dist
-dist-ssr
-*.local
-
-# Editor directories and files
-.vscode/*
-!.vscode/extensions.json
-.idea
-.DS_Store
-*.suo
-*.ntvs*
-*.njsproj
-*.sln
-*.sw?

banking/README.md

@@ -1,73 +0,0 @@
-# React + TypeScript + Vite
-
-This template provides a minimal setup to get React working in Vite with HMR and some ESLint rules.
-
-Currently, two official plugins are available:
-
-- [@vitejs/plugin-react](https://github.com/vitejs/vite-plugin-react/blob/main/packages/plugin-react) uses [Babel](https://babeljs.io/) (or [oxc](https://oxc.rs) when used in [rolldown-vite](https://vite.dev/guide/rolldown)) for Fast Refresh
-- [@vitejs/plugin-react-swc](https://github.com/vitejs/vite-plugin-react/blob/main/packages/plugin-react-swc) uses [SWC](https://swc.rs/) for Fast Refresh
-
-## React Compiler
-
-The React Compiler is not enabled on this template because of its impact on dev & build performances. To add it, see [this documentation](https://react.dev/learn/react-compiler/installation).
-
-## Expanding the ESLint configuration
-
-If you are developing a production application, we recommend updating the configuration to enable type-aware lint rules:
-
-```js
-export default defineConfig([
-  globalIgnores(['dist']),
-  {
-    files: ['**/*.{ts,tsx}'],
-    extends: [
-      // Other configs...
-
-      // Remove tseslint.configs.recommended and replace with this
-      tseslint.configs.recommendedTypeChecked,
-      // Alternatively, use this for stricter rules
-      tseslint.configs.strictTypeChecked,
-      // Optionally, add this for stylistic rules
-      tseslint.configs.stylisticTypeChecked,
-
-      // Other configs...
-    ],
-    languageOptions: {
-      parserOptions: {
-        project: ['./tsconfig.node.json', './tsconfig.app.json'],
-        tsconfigRootDir: import.meta.dirname,
-      },
-      // other options...
-    },
-  },
-])
-```
-
-You can also install [eslint-plugin-react-x](https://github.com/Rel1cx/eslint-react/tree/main/packages/plugins/eslint-plugin-react-x) and [eslint-plugin-react-dom](https://github.com/Rel1cx/eslint-react/tree/main/packages/plugins/eslint-plugin-react-dom) for React-specific lint rules:
-
-```js
-// eslint.config.js
-import reactX from 'eslint-plugin-react-x'
-import reactDom from 'eslint-plugin-react-dom'
-
-export default defineConfig([
-  globalIgnores(['dist']),
-  {
-    files: ['**/*.{ts,tsx}'],
-    extends: [
-      // Other configs...
-      // Enable lint rules for React
-      reactX.configs['recommended-typescript'],
-      // Enable lint rules for React DOM
-      reactDom.configs.recommended,
-    ],
-    languageOptions: {
-      parserOptions: {
-        project: ['./tsconfig.node.json', './tsconfig.app.json'],
-        tsconfigRootDir: import.meta.dirname,
-      },
-      // other options...
-    },
-  },
-])
-```

banking/eslint.config.js

@@ -1,24 +0,0 @@
-import js from "@eslint/js";
-import globals from "globals";
-import reactHooks from "eslint-plugin-react-hooks";
-import reactRefresh from "eslint-plugin-react-refresh";
-import tseslint from "typescript-eslint";
-import { defineConfig, globalIgnores } from "eslint/config";
-
-export default defineConfig([
-	globalIgnores(["dist"]),
-	{
-		files: ["**/*.{ts,tsx}"],
-		extends: [
-			js.configs.recommended,
-			tseslint.configs.recommended,
-			reactHooks.configs.flat.recommended,
-			reactRefresh.configs.vite,
-		],
-		languageOptions: {
-			ecmaVersion: 2020,
-			globals: globals.browser,
-		},
-		onlyExportComponents: false,
-	},
-]);

banking/index.html

@@ -1,50 +0,0 @@
-<!doctype html>
-<html lang="{{ lang }}" dir="{{layout_direction}}">
-
-<head>
-  <meta charset="UTF-8" />
-  <!-- Chrome, Firefox OS and Opera -->
-  <meta name="theme-color" content="#0089FF">
-  <!-- Windows Phone -->
-  <meta name="msapplication-navbutton-color" content="#0089FF">
-  <!-- iOS Safari -->
-  <meta name="apple-mobile-web-app-status-bar-style" content="#0089FF">
-  <meta content="text/html;charset=utf-8" http-equiv="Content-Type">
-  <meta content="utf-8" http-equiv="encoding">
-  <meta name="author" content="">
-  <meta name="viewport" content="width=device-width, initial-scale=1.0,
-        maximum-scale=1.0, minimum-scale=1.0, user-scalable=no, minimal-ui">
-  <meta name="apple-mobile-web-app-capable" content="yes">
-  <meta name="apple-mobile-web-app-status-bar-style" content="white">
-  <meta name="mobile-web-app-capable" content="yes">
-  <link rel="shortcut icon" href="{{ favicon or ' /assets/erpnext/images/erpnext-favicon.svg' }}" type="image/x-icon">
-  <link rel="icon" href="{{ favicon or ' /assets/erpnext/images/erpnext-favicon.svg' }}" type="image/x-icon">
-  <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-  <title>Banking | {{ app_name }}</title>
-</head>
-
-<body>
-  <div id="root"></div>
-  <script>window.csrf_token = '{{ frappe.session.csrf_token }}';
-    if (!window.frappe) window.frappe = {};
-
-    frappe.boot = JSON.parse({{ boot }});
-    frappe.boot.layout_direction = "{{ layout_direction }}";
-
-    frappe._translations_loaded = fetch(
-      `/api/method/frappe.translate.get_boot_translations?v=${frappe.boot.translations_version}&lang=${frappe.boot.lang}`,
-      {
-        credentials: "same-origin",
-        headers: {
-          "X-Frappe-CSRF-Token": frappe.csrf_token,
-          "Accept": "application/json"
-        }
-      }
-    ).then(r => r.json()).then(data => {
-      frappe._messages = data.message || {};
-    }).catch(() => { });
-  </script>
-  <script type="module" src="/src/main.tsx"></script>
-</body>
-
-</html>

banking/package.json

@@ -1,66 +0,0 @@
-{
-  "name": "banking",
-  "private": true,
-  "version": "0.0.0",
-  "type": "module",
-  "scripts": {
-    "dev": "vite",
-    "build": "vite build --base=/assets/erpnext/banking/ && yarn copy-html-entry",
-    "lint": "eslint .",
-    "preview": "vite preview",
-    "copy-html-entry": "cp ../erpnext/public/banking/index.html ../erpnext/www/banking.html"
-  },
-  "dependencies": {
-    "@dnd-kit/core": "^6.3.1",
-    "@dnd-kit/sortable": "^10.0.0",
-    "@dnd-kit/utilities": "^3.2.2",
-    "@tailwindcss/vite": "^4.3.0",
-    "@tanstack/react-table": "^8.21.3",
-    "@tanstack/react-virtual": "^3.13.24",
-    "@vitejs/plugin-react": "^6.0.1",
-    "chrono-node": "^2.9.1",
-    "class-variance-authority": "^0.7.1",
-    "clsx": "^2.1.1",
-    "cmdk": "^1.1.1",
-    "date-fns": "^4.1.0",
-    "dayjs": "^1.11.20",
-    "frappe-react-sdk": "^1.15.0",
-    "fuse.js": "^7.3.0",
-    "jotai": "^2.20.0",
-    "jotai-family": "^1.0.1",
-    "lodash.isplainobject": "^4.0.6",
-    "lucide-react": "^1.14.0",
-    "radix-ui": "^1.4.3",
-    "react": "^19.2.6",
-    "react-currency-input-field": "^4.0.5",
-    "react-day-picker": "9.14.0",
-    "react-dom": "^19.2.6",
-    "react-dropzone": "^15.0.0",
-    "react-hook-form": "^7.75.0",
-    "react-hotkeys-hook": "^5.3.2",
-    "react-markdown": "^10.1.0",
-    "react-router": "^7.15.0",
-    "react-router-dom": "^7.15.0",
-    "react-virtuoso": "^4.18.6",
-    "rehype-raw": "^7.0.0",
-    "remark-gfm": "^4.0.1",
-    "sonner": "^2.0.7",
-    "tailwind-merge": "^3.5.0",
-    "tailwindcss": "^4.3.0",
-    "tw-animate-css": "^1.4.0",
-    "usehooks-ts": "^3.1.1",
-    "vite": "^8.0.11"
-  },
-  "devDependencies": {
-    "@eslint/js": "^9.39.1",
-    "@types/node": "^25.3.0",
-    "@types/react": "^19.2.7",
-    "@types/react-dom": "^19.2.3",
-    "eslint": "^9.39.1",
-    "eslint-plugin-react-hooks": "^7.1.1",
-    "eslint-plugin-react-refresh": "^0.4.24",
-    "globals": "^16.5.0",
-    "typescript": "~5.9.3",
-    "typescript-eslint": "^8.48.0"
-  }
-}

banking/proxyOptions.ts

@@ -1,13 +0,0 @@
-const common_site_config = require('../../../sites/common_site_config.json');
-const { webserver_port } = common_site_config;
-
-export default {
-	'^/(app|api|assets|files|private)': {
-		target: `http://127.0.0.1:${webserver_port}`,
-		ws: true,
-		router: function(req) {
-			const site_name = req.headers.host.split(':')[0];
-			return `http://${site_name}:${webserver_port}`;
-		}
-	}
-};

banking/src/App.tsx

@@ -1,65 +0,0 @@
-import { useEffect } from 'react'
-import { BrowserRouter, Navigate, Route, Routes } from 'react-router-dom'
-import { FrappeProvider } from 'frappe-react-sdk'
-import { Toaster } from '@/components/ui/sonner'
-import BankReconciliation from '@/pages/BankReconciliation'
-import { TooltipProvider } from './components/ui/tooltip'
-import BankStatementImporter from '@/pages/BankStatementImporter'
-import { LucideProvider } from 'lucide-react'
-import { ThemeProvider } from './components/ui/theme-provider'
-import ViewBankStatementImportLog from './pages/ViewBankStatementImportLog'
-import BankStatementImporterContainer from './pages/BankStatementImporterContainer'
-
-function App() {
-	useEffect(() => {
-		// Check if user is logged in by checking the Cookie "user_id"
-		// In Frappe, unauthenticated users are "Guest"
-		const userId = document.cookie?.split('; ').find(row => row.startsWith('user_id='))?.split('=')[1]?.trim()
-		const isLoggedIn = userId !== 'Guest'
-
-		if (!isLoggedIn) {
-			if (import.meta.env.DEV) {
-				return
-			}
-			// Redirect to Frappe login page
-			window.location.href = '/login?redirect-to=/banking'
-			return
-		}
-	}, [])
-
-	return (
-		<LucideProvider
-			strokeWidth={1.5}
-		>
-			<TooltipProvider>
-				<FrappeProvider
-					swrConfig={{
-						errorRetryCount: 2
-					}}
-					socketPort={import.meta.env.VITE_SOCKET_PORT}
-					siteName={window.frappe?.boot?.sitename ?? import.meta.env.VITE_SITE_NAME}>
-					<ThemeProvider
-						defaultTheme={window.frappe?.boot?.desk_theme ?? "Automatic"}
-					>
-						{window.frappe?.boot?.user?.name && window.frappe?.boot?.user?.name !== 'Guest' &&
-							<BrowserRouter basename={import.meta.env.VITE_BASE_NAME ? `/${import.meta.env.VITE_BASE_NAME}` : ''}>
-
-								<Routes>
-									<Route index element={<BankReconciliation />} />
-									<Route path="/statement-importer" element={<BankStatementImporterContainer />}>
-										<Route index element={<BankStatementImporter />} />
-										<Route path=":id" element={<ViewBankStatementImportLog />} />
-									</Route>
-									<Route path="*" element={<Navigate to="/" />} />
-								</Routes>
-							</BrowserRouter>
-						}
-						<Toaster richColors />
-					</ThemeProvider>
-				</FrappeProvider>
-			</TooltipProvider>
-		</LucideProvider>
-	)
-}
-
-export default App

banking/src/components/common/AccountsDropdown.tsx

@@ -1,228 +0,0 @@
-import { Button } from "@/components/ui/button"
-import { Command, CommandEmpty, CommandGroup, CommandInput, CommandItem, CommandList } from "@/components/ui/command"
-import { Popover, PopoverContent, PopoverTrigger } from "@/components/ui/popover"
-import { useCurrentCompany } from "@/hooks/useCurrentCompany"
-import _ from "@/lib/translate"
-import { cn } from "@/lib/utils"
-import { useFrappeGetDocList } from "frappe-react-sdk"
-import Fuse from "fuse.js"
-import { ChevronDownIcon } from "lucide-react"
-import { useLayoutEffect, useMemo, useRef, useState } from "react"
-import { FormControl } from "../ui/form"
-
-
-export interface AccountsDropdownProps {
-    root_type?: ('Asset' | 'Liability' | 'Equity' | 'Income' | 'Expense')[],
-    report_type?: 'Balance Sheet' | 'Profit and Loss',
-    account_type?: string[],
-    value?: string,
-    onChange?: (value: string) => void,
-    readOnly?: boolean,
-    disabled?: boolean,
-    company?: string,
-    filterFunction?: (account: Account) => boolean,
-    // If true, the component will be wrapped in a FormControl component
-    useInForm?: boolean,
-    buttonClassName?: string,
-    size?: 'sm' | 'md' | 'lg',
-}
-/**
- * Component to select an account - supports fuzzy search
- * @param root_type - The root type of the account
- * @param report_type - The report type of the account
- * @param account_type - The type of the account
- * @param value - The value of the account field
- * @param onChange - The function to call when the value changes
- * @returns 
- */
-const AccountsDropdown = ({ root_type, report_type, account_type, value, onChange, readOnly, disabled, company, filterFunction, useInForm, buttonClassName, size = 'md' }: AccountsDropdownProps) => {
-
-    const { data } = useGetAccounts(root_type, report_type, account_type, company, filterFunction)
-
-    const groupedAccounts = useMemo(() => {
-        if (!data) return []
-
-        const grouped: Record<string, Account[]> = data.reduce((acc, account) => {
-            const parentAccount = account.parent_account
-            if (!parentAccount) return acc
-
-            if (!acc[parentAccount]) {
-                acc[parentAccount] = []
-            }
-
-            acc[parentAccount].push(account)
-            return acc
-        }, {} as Record<string, Account[]>)
-
-
-        return Object.entries(grouped).map(([parentAccount, accounts]) => ({
-            // Remove the last abbreviation from the parent account name like "Assets - TCC" should be "Assets", and "Assets - USD - TCC" should be "Assets - USD"
-            parentAccount: parentAccount.split(" - ").slice(0, -1).join(" - "),
-            accounts
-        }))
-
-    }, [data])
-
-    const searchIndex = useMemo(() => {
-
-        if (!data) {
-            return null
-        }
-
-        return new Fuse(data, {
-            keys: ['name'],
-            threshold: 0.5,
-            includeScore: true
-        })
-    }, [data])
-
-    const [search, setSearch] = useState("")
-
-    const recommendedAccounts = useMemo(() => {
-
-        if (!searchIndex || !search) {
-            return []
-        }
-
-        return searchIndex.search(search).map((result) => result.item)
-
-    }, [searchIndex, search])
-
-    const [open, setOpen] = useState(false)
-
-    const onOpenChange = (open: boolean) => {
-        if (readOnly) return
-        setOpen(open)
-        // setSearch("")
-    }
-
-    const onSelect = (value: string) => {
-        onChange?.(value)
-        setOpen(false)
-        setSearch(value)
-    }
-
-    const buttonRef = useRef<HTMLButtonElement>(null)
-
-    const [width, setWidth] = useState(320)
-
-    useLayoutEffect(() => {
-        if (buttonRef.current) {
-            setWidth(buttonRef.current.getBoundingClientRect().width)
-        }
-    }, [])
-
-    return (
-        <Popover open={open} onOpenChange={onOpenChange} modal={true}>
-            <PopoverTrigger asChild>
-                {useInForm ? <FormControl>
-                    <Button
-                        variant="subtle"
-                        type='button'
-                        size={size}
-                        role="combobox"
-                        ref={buttonRef}
-                        tabIndex={0}
-                        disabled={disabled || readOnly}
-                        aria-readonly={readOnly}
-                        aria-expanded={open}
-                        className={cn("w-full justify-between font-normal",
-                            readOnly ? "bg-surface-gray-1 pointer-events-none" : ""
-                            , buttonClassName)}>
-                        {value || _('Select Account')}
-
-                        <ChevronDownIcon className="ms-2 h-4 w-4 shrink-0 opacity-50" />
-                    </Button>
-                </FormControl>
-                    : <Button
-                        variant="subtle"
-                        size={size}
-                        type='button'
-                        role="combobox"
-                        ref={buttonRef}
-                        disabled={disabled}
-                        aria-expanded={open}
-                        className={cn("w-full justify-between font-normal",
-                            readOnly ? "bg-surface-gray-1" : ""
-                        )}>
-                        {value || _('Select Account')}
-
-                        <ChevronDownIcon className="ms-2 h-4 w-4 shrink-0 opacity-50" />
-                    </Button>}
-            </PopoverTrigger>
-            <PopoverContent className="p-0" style={{ minWidth: width }} align="start">
-                <Command shouldFilter={false} className="w-full">
-                    <CommandInput placeholder={_("Search account...")} onValueChange={setSearch} value={search} />
-                    <CommandList>
-                        <CommandEmpty>{_("No accounts found.")}</CommandEmpty>
-
-                        {recommendedAccounts.length > 0 && (
-                            <CommandGroup heading={_("Search Results")}>
-                                {recommendedAccounts.map((account) => (
-                                    <CommandItem key={account.name} onSelect={() => onSelect(account.name)}>{account.name}</CommandItem>
-                                ))}
-                            </CommandGroup>
-                        )}
-
-                        {!search && groupedAccounts.map((group) => (
-                            <CommandGroup key={group.parentAccount} heading={group.parentAccount}>
-                                {group.accounts.map((account) => (
-                                    <CommandItem key={account.name} onSelect={() => onSelect(account.name)}>{account.name}</CommandItem>
-                                ))}
-                            </CommandGroup>
-                        ))}
-
-                    </CommandList>
-                </Command>
-            </PopoverContent>
-
-        </Popover>
-    )
-}
-
-
-interface Account {
-    name: string
-    root_type: 'Asset' | 'Liability' | 'Equity' | 'Income' | 'Expense'
-    report_type: 'Balance Sheet' | 'Profit and Loss'
-    account_type: string
-    account_currency: string
-    parent_account: string
-}
-
-export const useGetAccounts = (root_type?: ('Asset' | 'Liability' | 'Equity' | 'Income' | 'Expense')[], report_type?: 'Balance Sheet' | 'Profit and Loss', account_type?: string[], company?: string,
-    filterFunction?: (account: Account) => boolean) => {
-
-    const currentCompany = useCurrentCompany()
-    const { data, isLoading, error, mutate } = useFrappeGetDocList<Account>("Account", {
-        fields: ["name", "root_type", "report_type", "account_type", "account_currency", "parent_account"],
-        filters: [["is_group", "=", 0], ["disabled", "=", 0], ["company", "=", company ?? currentCompany]],
-        limit: 1000,
-        orderBy: {
-            "field": "root_type",
-            // @ts-expect-error - we can pass in additional fields to orderBy
-            "order": "asc, account_number asc"
-        }
-    }, `accounts-${company ?? currentCompany}`, {
-        revalidateIfStale: false,
-        revalidateOnFocus: false,
-        revalidateOnReconnect: false,
-    })
-
-    const filteredData = useMemo(() => {
-
-        return data?.filter((account) => {
-            if (root_type && !root_type.includes(account.root_type)) return false
-            if (report_type && account.report_type !== report_type) return false
-            if (account_type && !account_type.includes(account.account_type)) return false
-
-            if (filterFunction) return filterFunction(account)
-            return true
-        }) ?? []
-
-    }, [data, root_type, report_type, account_type, filterFunction])
-
-    return { data: filteredData, isLoading, error, mutate }
-}
-
-export default AccountsDropdown

banking/src/components/common/BankLogo.tsx

@@ -1,26 +0,0 @@
-import { cn } from '@/lib/utils'
-import { SelectedBank } from '../features/BankReconciliation/bankRecAtoms'
-import { useTheme } from '../ui/theme-provider'
-import { Landmark } from 'lucide-react'
-import { H4 } from '../ui/typography'
-
-const BankLogo = ({ bank, className, imageClassName, iconSize = '18px', iconClassName }: { bank?: SelectedBank | null, className?: string, imageClassName?: string, iconSize?: string, iconClassName?: string }) => {
-
-    const { themeValue } = useTheme()
-    return (
-        <div className={cn('h-6 flex items-center gap-1', className)}> {bank?.logo ? <img
-            src={`/assets/erpnext/images/bank-logos/${themeValue === 'Dark' ? (bank.logoDark ?? bank.logo) : bank.logo}`}
-            alt={bank.bank || bank.name || ''}
-            className={cn("h-6 max-w-22 me-auto object-contain", imageClassName, {
-                'dark:invert dark:brightness-0': bank.darkModeInvert
-            }, bank.logoClassName)}
-        /> : <>
-            <Landmark size={iconSize} className={iconClassName} />
-            <H4 className={cn("text-xs -mb-0.5", {
-            })}>{bank?.bank ?? ''}</H4>
-        </>
-        }</div>
-    )
-}
-
-export default BankLogo

banking/src/components/common/FileUploadBanner.tsx

@@ -1,17 +0,0 @@
-import { CheckCircle } from 'lucide-react'
-import { Progress } from '../ui/progress'
-import _ from '@/lib/translate'
-
-const FileUploadBanner = ({
-    uploadProgress,
-}: { uploadProgress: number }) => {
-    return <div className="flex items-center justify-center flex-col gap-4">
-        <div className="flex flex-col items-center gap-4">
-            <CheckCircle size={48} className="text-ink-green-3" />
-            <span className="text-ink-gray-8 text-p-base">{_("The document has been created and reconciled. Uploading attachments...")}</span>
-            <Progress value={Math.round(uploadProgress * 100)} size="lg" />
-        </div>
-    </div>
-}
-
-export default FileUploadBanner

banking/src/components/common/LinkFieldCombobox.tsx

@@ -1,301 +0,0 @@
-import { useDocType } from "@/hooks/useDocType";
-import { getSystemDefault, slug } from "@/lib/frappe";
-import { Filter, useFrappeGetCall } from "frappe-react-sdk"
-import { useLayoutEffect, useMemo, useRef, useState } from "react";
-import { canCreateDocument } from "@/lib/permissions";
-import { useDebounceValue } from "usehooks-ts";
-import { Popover, PopoverContent, PopoverTrigger } from "../ui/popover";
-import { FormControl } from "../ui/form";
-import { ChevronDownIcon, ExternalLink } from "lucide-react";
-import { Button } from "../ui/button";
-import { cn } from "@/lib/utils";
-import { Command, CommandEmpty, CommandGroup, CommandInput, CommandItem, CommandList } from "../ui/command";
-import _ from "@/lib/translate";
-import ErrorBanner from "../ui/error-banner";
-import MarkdownRenderer from "../ui/markdown";
-
-export interface ResultItem {
-    value: string,
-    description: string,
-    label?: string
-}
-
-export interface LinkFieldComboboxProps {
-    /** DocType to be fetched */
-    doctype: string;
-    /** Filters to be applied. Default: none */
-    filters?: Filter[]
-    /** Number of records to paginate with. Default: Comes from System Settings or 10 */
-    limit?: number;
-    /** 
-   * API to call to fetch records.
-   * 
-   * Default: `frappe.desk.search.search_link`
-   * 
-   * If you want to use a custom API, you can pass the path to the API here.
-   * 
-   * The API should return a list of documents in the following format:
-   * [{value: string, description: string, label?: string}] - where the value is the ID of the document.
-   * 
-   * If the API sends a label, it will be used as the label in the dropdown.
-  */
-    searchAPIPath?: string;
-    /**
-    * Field you want to search against in the doctype.
-    * 
-    * Default: `name`
-    * 
-    * If you want to search against a different field, you can pass the fieldname here.
-    * 
-    * If you want to search against multiple fields, you can try using the `searchAPIPath` prop to call a custom API,
-    * or use a custom query in the `customQuery` prop.
-    */
-    searchfield?: string;
-    /** 
-     * Custom query to be used to fetch records.
-     * 
-     * If you want to use a custom query, you can pass the query here.
-     * 
-     * The query should be in the following format:
-     * {
-     *  query: string,
-     *  filters: {
-     *      fieldname: string,
-     *      operator: string,
-     *      value: string
-     *  }
-     * }
-     */
-    customQuery?: {
-        /** Path to function for the query. 
-         * 
-         * Refer: Item/Supplier query
-         */
-        query: string,
-        /** Filters are usually an object instead of an array in a custom query */
-        filters?: Record<string, string | number | boolean>,
-    },
-    /** 
-     * Used for certain queries where a reference doctype is needed.
-     * 
-     * For example when searching a supplier in a "Purchase Invoice", the reference_doctype is "Purchase Invoice"
-     */
-    reference_doctype?: string,
-    /** Placeholder for the dropdown. Default: `doctype` */
-    placeholder?: string;
-    /** 
-     * Should the field be read-only. 
-     */
-    readOnly?: boolean;
-    /** Should the field be disabled. Default: false */
-    disabled?: boolean;
-    /**
-    * Function to filter the options based on the input value/other criteria.
-    * 
-    * For example, you might want to limit the companies shown in the dropdown since they have been already added (like in Cost Codes)
-    */
-    filterFn?: (option: ResultItem, inputValue: string) => boolean,
-    value?: string,
-    onChange: (value: string) => void,
-    /** If true, the component will be wrapped in a FormControl component */
-    useInForm?: boolean,
-    /** Button Class name */
-    buttonClassName?: string,
-    size?: 'sm' | 'md' | 'lg',
-}
-const LinkFieldCombobox = ({
-    doctype,
-    reference_doctype,
-    filters = [],
-    value,
-    onChange,
-    readOnly,
-    disabled,
-    filterFn,
-    placeholder = `Select ${doctype}`,
-    customQuery,
-    searchfield,
-    searchAPIPath = "frappe.desk.search.search_link",
-    limit,
-    useInForm,
-    buttonClassName,
-    size = 'md'
-}: LinkFieldComboboxProps) => {
-
-    const pageLimit = useMemo(() => limit || getSystemDefault('link_field_results_limit') || 20, [limit])
-
-    /** Load the Doctype meta so that we can determine the search fields + the name of the title field */
-    const { data: meta } = useDocType(doctype)
-
-    const userCanCreate = useMemo(() => canCreateDocument(doctype), [doctype])
-
-    const [open, setOpen] = useState(false)
-
-    const [searchInput, setSearchInput] = useDebounceValue('', 400)
-
-    const { data: linkTitleData } = useFrappeGetCall('frappe.client.get_value', {
-        doctype,
-        filters: JSON.stringify({
-            name: value
-        }),
-        fieldname: meta?.title_field
-    }, (meta?.show_title_field_in_link ?? false) && (meta?.title_field) && value ? `link_title::${doctype}::${value}` : null, {
-        revalidateIfStale: false,
-        revalidateOnFocus: false,
-        revalidateOnReconnect: false,
-    })
-
-    const linkTitle = meta?.title_field && meta?.show_title_field_in_link ? (linkTitleData?.message?.[meta?.title_field] ?? value) : value
-
-    const buttonRef = useRef<HTMLButtonElement>(null)
-
-    const [width, setWidth] = useState(320)
-
-    useLayoutEffect(() => {
-        if (buttonRef.current) {
-            setWidth(buttonRef.current.getBoundingClientRect().width)
-        }
-    }, [])
-
-    const { data, error, isLoading } = useFrappeGetCall<{ message: ResultItem[] }>(searchAPIPath, {
-        doctype,
-        txt: searchInput,
-        page_length: pageLimit,
-        query: customQuery?.query,
-        searchfield,
-        filters: JSON.stringify(customQuery?.filters || filters || []),
-        reference_doctype,
-    }, () => {
-        if (!open) {
-            return null
-        } else {
-            let key = `${searchAPIPath}_${doctype}_${searchInput}`
-
-            if (pageLimit) {
-                key += `_${pageLimit}`
-            }
-
-            if (customQuery?.filters) {
-                key += `_${JSON.stringify(customQuery.filters)}`
-            } else if (filters) {
-                key += `_${JSON.stringify(filters)}`
-            }
-
-            if (customQuery && customQuery.query) {
-                key += `_${customQuery.query}`
-            }
-
-            if (reference_doctype) {
-                key += `_${reference_doctype}`
-            }
-
-            if (searchfield && searchfield !== 'name') {
-                key += `_${searchfield}`
-            }
-
-            return key
-
-        }
-    }, {
-        revalidateOnFocus: false,
-        revalidateIfStale: false,
-        shouldRetryOnError: false,
-        revalidateOnReconnect: false,
-    })
-
-    const onOpenChange = (open: boolean) => {
-        if (readOnly) return
-        setOpen(open)
-        setSearchInput("")
-    }
-
-    const onSelect = (value: string) => {
-        onChange?.(value)
-        setOpen(false)
-    }
-
-    const items = filterFn ? data?.message?.slice(0, 50).filter((item) => filterFn(item, searchInput)) : data?.message
-
-    const buttonProps = {
-        variant: "subtle",
-        type: 'button',
-        size: size,
-        role: "combobox",
-        "data-state": open ? "open" : "closed",
-        ref: buttonRef,
-        tabIndex: 0,
-        disabled: disabled || readOnly,
-        "aria-expanded": open,
-        "aria-readonly": readOnly,
-        className: cn("w-full justify-between font-normal group border border-transparent outline-none",
-            "data-[state=open]:bg-surface-white data-[state=open]:border-outline-gray-4 data-[state=open]:shadow-sm",
-            readOnly ? "bg-surface-gray-1" : "",
-            // Placeholder and value styling
-            linkTitle ? "text-ink-gray-7" : "text-ink-gray-4",
-            buttonClassName)
-    } as const
-
-    return (
-        <Popover open={open} onOpenChange={onOpenChange} modal={true}>
-            <PopoverTrigger asChild>
-                {useInForm ? <FormControl>
-                    <Button {...buttonProps}>
-                        {linkTitle || placeholder}
-
-                        <div className="flex items-center gap-1">
-                            {value && <a href={`/desk/${slug(doctype)}/${value}`} target="_blank" className="group-hover:block hidden">
-                                <ExternalLink className="size-4 shrink-0 opacity-50" />
-                            </a>}
-                            <ChevronDownIcon className="ms-2 size-4 shrink-0" />
-                        </div>
-                    </Button>
-                </FormControl>
-                    : <Button {...buttonProps}>
-                        {linkTitle || placeholder}
-                        <div className="flex items-center gap-1">
-                            {value && <a href={`/desk/${slug(doctype)}/${value}`} target="_blank" className="group-hover:block hidden">
-                                <ExternalLink className="size-4 shrink-0 opacity-50" />
-                            </a>}
-                            <ChevronDownIcon className="ms-2 size-4 shrink-0" />
-                        </div>
-                    </Button>}
-            </PopoverTrigger>
-            <PopoverContent className="p-0" style={{ minWidth: width }} align="start">
-                {error && <ErrorBanner error={error} />}
-                <Command shouldFilter={false} className="w-full">
-                    <CommandInput placeholder={placeholder} onValueChange={setSearchInput} />
-                    <CommandList>
-                        <CommandEmpty>{isLoading ? _("Loading...") : _("No results found.")}</CommandEmpty>
-                        <CommandGroup>
-                            {items?.map((result) => (
-                                <CommandItem key={result.value} onSelect={() => onSelect(result.value)} className="flex flex-col items-start gap-0.5">
-                                    <span className="font-medium">
-                                        {result.label || result.value}
-                                    </span>
-                                    {result.description && <span className="text-xs text-ink-gray-5">
-                                        <MarkdownRenderer content={result.description} />
-                                    </span>}
-                                </CommandItem>
-                            ))}
-                            {userCanCreate && <CommandItem asChild>
-                                <a href={`/desk/${slug(doctype)}/new-${slug(doctype)}-1`}
-                                    target="_blank"
-                                    className="hover:underline underline-offset-4 cursor-pointer flex justify-between items-center">
-                                    {_("Create New {0}", [doctype])}
-
-                                    <ExternalLink />
-                                </a>
-
-                            </CommandItem>}
-                        </CommandGroup>
-
-
-                    </CommandList>
-                </Command>
-            </PopoverContent>
-
-        </Popover>
-    )
-}
-
-export default LinkFieldCombobox

banking/src/components/common/PartyTypeDropdown.tsx

@@ -1,82 +0,0 @@
-import { Select, SelectValue, SelectTrigger, SelectContent, SelectItem } from '@/components/ui/select'
-import _ from '@/lib/translate'
-import { useFrappeGetDocList } from 'frappe-react-sdk'
-import { ComponentProps, useMemo } from 'react'
-import { FormControl } from '../ui/form'
-
-export type PartyTypeDropdownProps = {
-    value?: string,
-    onChange?: (value: string) => void,
-    readOnly?: boolean,
-    disabled?: boolean,
-    /** Set this to order the parties so that suggested types are shown first */
-    type?: 'Receivable' | 'Payable'
-    /** Set this to true if you want to hide other options by type. e.g. - if type is Receivable, Payable options like "Supplier" will be hidden */
-    hideOptionsByType?: boolean,
-    valueProps?: ComponentProps<typeof SelectValue>,
-    triggerProps?: ComponentProps<typeof SelectTrigger>,
-    // If true, the component will be wrapped in a FormControl component
-    useInForm?: boolean
-}
-
-const PartyTypeDropdown = ({ value, onChange, readOnly, disabled, type, hideOptionsByType, valueProps, triggerProps, useInForm }: PartyTypeDropdownProps) => {
-
-    const { data } = useFrappeGetDocList("Party Type", {
-        fields: ['name', 'account_type'],
-        orderBy: {
-            field: 'creation',
-            order: 'asc'
-        }
-    }, `party_types`, {
-        revalidateIfStale: false,
-        revalidateOnFocus: false,
-        revalidateOnReconnect: false,
-    })
-
-    const filteredData = useMemo(() => {
-
-        let options = data ?? [
-            { name: "Customer", account_type: "Receivable" },
-            { name: "Supplier", account_type: "Payable" },
-            { name: "Employee", account_type: "Payable" },
-            { name: "Shareholder", account_type: "Payable" },
-        ]
-
-        if (hideOptionsByType && type) {
-            options = options.filter((option) => option.account_type === type)
-        }
-
-        // Order by type if type is set
-        if (type) {
-            options = options.sort((a) => a.account_type === type ? -1 : 1)
-        }
-
-        return options
-    }, [data, type, hideOptionsByType])
-
-    const onSelect = (value: string) => {
-        if (!readOnly) {
-            onChange?.(value)
-        }
-    }
-
-    return (
-        <Select onValueChange={onSelect} value={value} disabled={disabled}>
-            {useInForm ? <FormControl>
-                <SelectTrigger tabIndex={0} aria-readonly={readOnly} disabled={disabled || readOnly} {...triggerProps}>
-                    <SelectValue placeholder={_("Type")} aria-readonly={readOnly} {...valueProps} />
-                </SelectTrigger>
-            </FormControl> : <SelectTrigger tabIndex={0} {...triggerProps}>
-                <SelectValue placeholder={_("Type")} aria-readonly={readOnly} {...valueProps} />
-            </SelectTrigger>
-            }
-            <SelectContent>
-                {filteredData.map((option) => (
-                    <SelectItem key={option.name} value={option.name}>{option.name}</SelectItem>
-                ))}
-            </SelectContent>
-        </Select>
-    )
-}
-
-export default PartyTypeDropdown

banking/src/components/features/ActionLog/ActionLog.tsx

@@ -1,475 +0,0 @@
-import { Button } from '@/components/ui/button'
-import { Dialog, DialogClose, DialogContent, DialogDescription, DialogFooter, DialogHeader, DialogTitle, DialogTrigger } from '@/components/ui/dialog'
-import { Tooltip, TooltipContent, TooltipTrigger } from '@/components/ui/tooltip'
-import _ from '@/lib/translate'
-import { useAtomValue, useSetAtom } from 'jotai'
-import { ArrowDownRight, ArrowRightLeftIcon, ArrowUpRight, CalendarIcon, CircleXIcon, GitCompareIcon, HistoryIcon, LandmarkIcon, Loader2Icon, ReceiptIcon, ReceiptTextIcon, UserIcon, WalletIcon } from 'lucide-react'
-import { useMemo, useState } from 'react'
-import { ActionLogItem, ActionLog as ActionLogType, bankRecActionLog, bankRecDateAtom, bankRecMatchFilters, SelectedBank, selectedBankAccountAtom } from '../BankReconciliation/bankRecAtoms'
-import { useHotkeys } from 'react-hotkeys-hook'
-import { useGetBankAccounts } from '../BankReconciliation/utils'
-import { getCompanyCurrency } from '@/lib/company'
-import { formatCurrency } from '@/lib/numbers'
-import dayjs from 'dayjs'
-import { cn } from '@/lib/utils'
-import { formatDate } from '@/lib/date'
-import { Separator } from '@/components/ui/separator'
-import { slug } from '@/lib/frappe'
-import { PaymentEntry } from '@/types/Accounts/PaymentEntry'
-import { JournalEntry } from '@/types/Accounts/JournalEntry'
-import { HoverCard, HoverCardContent, HoverCardTrigger } from '@/components/ui/hover-card'
-import { Table, TableCell, TableBody, TableHead, TableHeader, TableRow } from '@/components/ui/table'
-import { AlertDialog, AlertDialogCancel, AlertDialogContent, AlertDialogDescription, AlertDialogFooter, AlertDialogHeader, AlertDialogTitle, AlertDialogTrigger } from '@/components/ui/alert-dialog'
-import { useFrappePostCall, useSWRConfig } from 'frappe-react-sdk'
-import { toast } from 'sonner'
-import { getErrorMessage } from '@/lib/frappe'
-import ErrorBanner from '@/components/ui/error-banner'
-import SelectedTransactionDetails from '../BankReconciliation/SelectedTransactionDetails'
-import { Empty, EmptyDescription, EmptyHeader, EmptyMedia, EmptyTitle } from '@/components/ui/empty'
-import BankLogo from '@/components/common/BankLogo'
-
-const ActionLog = () => {
-
-    const [isOpen, setIsOpen] = useState(false)
-
-    useHotkeys('meta+z', () => {
-        setIsOpen(true)
-    }, {
-        enabled: true,
-        enableOnFormTags: false,
-        preventDefault: true
-    })
-
-    return (
-        <Dialog open={isOpen} onOpenChange={setIsOpen}>
-            <Tooltip>
-                <TooltipTrigger asChild>
-                    <DialogTrigger asChild>
-                        <Button variant={'outline'} isIconButton size='md'>
-                            <HistoryIcon />
-                        </Button>
-                    </DialogTrigger>
-                </TooltipTrigger>
-                <TooltipContent>
-                    {_("Reconciliation History")}
-                </TooltipContent>
-            </Tooltip>
-            <DialogContent className='min-w-[90vw]'>
-                <DialogHeader>
-                    <DialogTitle>{_("Reconciliation History")}</DialogTitle>
-                    <DialogDescription>{_("View all reconciliation actions taken in this session.")}</DialogDescription>
-                </DialogHeader>
-                <ActionLogDialogContent />
-                <DialogFooter>
-                    <DialogClose asChild>
-                        <Button variant={'outline'} size='md' onClick={() => setIsOpen(false)}>{_("Close")}</Button>
-                    </DialogClose>
-                </DialogFooter>
-            </DialogContent>
-        </Dialog>
-    )
-}
-
-const ActionLogDialogContent = () => {
-
-    const actionLog = useAtomValue(bankRecActionLog)
-
-    return <div className='flex flex-col gap-2'>
-        {actionLog.map((action) => (
-            <div key={action.timestamp} className='flex flex-col gap-1'>
-                <ActionGroupHeader action={action} />
-                <div>
-                    <div className='ms-2 border-s border-s-outline-gray-2 py-1'>
-                        <div className='ms-5'>
-                            {action.items.map((item, index) => (
-                                <Row
-                                    item={item}
-                                    key={item.bankTransaction.name}
-                                    index={index}
-                                    action={action}
-                                    isLast={index === action.items.length - 1} />
-                            ))}
-                        </div>
-                    </div>
-                </div>
-            </div>
-        ))}
-
-        {actionLog.length === 0 && <Empty>
-            <EmptyMedia>
-                <HistoryIcon />
-            </EmptyMedia>
-            <EmptyHeader>
-                <EmptyTitle>{_("No reconciliation actions found")}</EmptyTitle>
-                <EmptyDescription>{_("You have not performed any reconciliations in this session yet.")}</EmptyDescription>
-            </EmptyHeader>
-        </Empty>}
-    </div>
-}
-
-
-
-const ActionGroupHeader = ({ action }: { action: ActionLogType }) => {
-
-    const label = useMemo(() => {
-        switch (action.type) {
-            case 'match':
-                return _("Matched")
-            case 'payment':
-                if (action.isBulk) {
-                    return _("Bulk Payment")
-                }
-                return _("Payment")
-
-            case 'transfer':
-                if (action.isBulk) {
-                    return _("Bulk Transfer")
-                }
-                return _("Transfer")
-
-            case 'bank_entry':
-                if (action.isBulk) {
-                    return _("Bulk Bank Entry")
-                }
-                return _("Bank Entry")
-
-            default:
-                return _("Action")
-        }
-    }, [action])
-
-    return <div className='flex items-center gap-2 text-ink-gray-5'>
-        {action.type === 'match' && <GitCompareIcon className='w-4 h-4' />}
-        {action.type === 'payment' && <ReceiptIcon className='w-4 h-4' />}
-        {action.type === 'transfer' && <ArrowRightLeftIcon className='w-4 h-4' />}
-        {action.type === 'bank_entry' && <LandmarkIcon className='w-4 h-4' />}
-        <span className='flex items-center gap-2 text-sm'>
-            {label} - {dayjs(action.timestamp).fromNow()}
-        </span>
-    </div>
-}
-
-const Row = ({ item, index, isLast, action }: { item: ActionLogItem, index: number, isLast: boolean, action: ActionLogType }) => {
-
-    const isWithdrawal = item.bankTransaction.withdrawal && item.bankTransaction.withdrawal > 0
-
-    const { banks } = useGetBankAccounts()
-
-    const bank = useMemo(() => {
-        if (item.bankTransaction.bank_account) {
-            return banks?.find((bank) => bank.name === item.bankTransaction.bank_account)
-        }
-        return null
-    }, [item.bankTransaction.bank_account, banks])
-
-    const amount = item.bankTransaction.withdrawal ? item.bankTransaction.withdrawal : item.bankTransaction.deposit
-
-    const currency = item.bankTransaction.currency || getCompanyCurrency(item.bankTransaction.company ?? '')
-
-    return <div className='flex items-center gap-2 group'>
-        <div className={cn('p-3.5 group-hover:bg-surface-gray-1 border-s border-e border-t w-full', isLast ? 'rounded-b border-b' : '', index === 0 ? 'rounded-t' : '')}>
-            <div className='flex justify-between items-center'>
-                <div className='flex flex-col gap-2'>
-                    <p className='text-p-base'>{item.bankTransaction.description}</p>
-                    <div className='flex items-center gap-3'>
-                        <div className='flex gap-2 items-center'>
-                            <BankLogo bank={bank} className='h-4 mb-0' iconSize='16px' />
-                            <span className='text-sm text-ink-gray-5'>{item.bankTransaction.bank_account}</span>
-                        </div>
-                        <Separator orientation='vertical' />
-                        <div className='flex items-center gap-2 text-ink-gray-5 text-sm' title={_("Transaction Date")}>
-                            <CalendarIcon className='w-4 h-4' />
-                            <span className='text-sm'>{formatDate(item.bankTransaction.date, 'Do MMM YYYY')}</span>
-                        </div>
-                        <Separator orientation='vertical' />
-                        <div>
-                            <div className='flex items-center gap-1' title={isWithdrawal ? _("Spent") : _("Received")}>
-                                {isWithdrawal ? <ArrowUpRight className="w-5 h-5 text-ink-red-3" /> : <ArrowDownRight className="w-5 h-5 text-ink-green-3" />}
-                                <span className='text-sm text-ink-gray-5'>{formatCurrency(amount, currency)}</span>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-                <div className='flex justify-end items-center gap-2'>
-                    <div className='text-end flex flex-col gap-2'>
-                        <a
-                            href={`/desk/${slug(item.voucher.reference_doctype)}/${item.voucher.reference_name}`}
-                            target='_blank'
-                            className='underline underline-offset-4 text-base'>
-                            {["Payment Entry", "Journal Entry"].includes(item.voucher.reference_doctype) ? "" : _("{} :", [item.voucher.reference_doctype])} {item.voucher.reference_name}
-                        </a>
-                        {item.voucher.reference_doctype === "Payment Entry" && item.voucher.doc && <PaymentEntryDetails item={item} />}
-                        {item.voucher.reference_doctype === "Journal Entry" && <JournalEntryDetails item={item} bank={bank} />}
-                    </div>
-                </div>
-            </div>
-        </div>
-        <div className='w-10 h-10 flex items-center justify-center'>
-            <CancelActionLogItem item={item} type={action.type} timestamp={action.timestamp} bank={bank} />
-        </div>
-    </div>
-}
-
-const JournalEntryDetails = ({ item, bank }: { item: ActionLogItem, bank?: SelectedBank | null }) => {
-
-    return <div className='flex items-center gap-2 text-ink-gray-5 justify-end'>
-        <WalletIcon className='w-4 h-4' />
-        <JournalEntryAccountsTable item={item} bank={bank} />
-    </div>
-}
-
-const JournalEntryAccountsTable = ({ item, bank }: { item: ActionLogItem, bank?: SelectedBank | null }) => {
-
-    const accounts = useMemo(() => {
-
-        const allAccounts = (item.voucher.doc as JournalEntry).accounts
-
-        return allAccounts.filter((acc) => bank ? acc.account !== bank.account : true)
-
-    }, [item, bank])
-
-    return <>
-        {accounts.length === 1 ? <span className='text-sm'>{accounts[0].account}</span> :
-            <HoverCard>
-                <HoverCardTrigger>
-                    <span className='text-sm cursor-pointer hover:underline underline-offset-4'>{_("Split across {} accounts", [accounts.length.toString()])}</span>
-                </HoverCardTrigger>
-                <HoverCardContent className='w-full p-2' align='end'>
-                    <Table>
-                        <TableHeader>
-                            <TableRow>
-                                <TableHead>{_("Account")}</TableHead>
-                                <TableHead className='text-end'>{_("Debit")}</TableHead>
-                                <TableHead className='text-end'>{_("Credit")}</TableHead>
-                            </TableRow>
-                        </TableHeader>
-                        <TableBody>
-                            {accounts.map((account) => (
-                                <TableRow key={account.account}>
-                                    <TableCell>{account.account}</TableCell>
-                                    <TableCell className='text-end font-numeric'>{formatCurrency(account.debit ?? 0, account.account_currency ?? '')}</TableCell>
-                                    <TableCell className='text-end font-numeric'>{formatCurrency(account.credit ?? 0, account.account_currency ?? '')}</TableCell>
-                                </TableRow>
-                            ))}
-                        </TableBody>
-                    </Table>
-                </HoverCardContent>
-            </HoverCard>
-        }</>
-}
-
-const PaymentEntryDetails = ({ item, className }: { item: ActionLogItem, className?: string }) => {
-    if ((item.voucher.doc as PaymentEntry).payment_type === "Internal Transfer") {
-        return <TransferDetails item={item} className={className} />
-    }
-
-    const invoices = (item.voucher.doc as PaymentEntry).references ?? []
-
-    const currency = item.bankTransaction.withdrawal && item.bankTransaction.withdrawal > 0 ? (item.voucher.doc as PaymentEntry)?.paid_to_account_currency : (item.voucher.doc as PaymentEntry)?.paid_from_account_currency
-
-    return <div className='flex items-center gap-3'>
-        <div className={cn('flex items-center gap-2 text-ink-gray-5 text-sm', className)}>
-            <UserIcon className='w-4 h-4' />
-            <span className='text-sm'>{(item.voucher.doc as PaymentEntry).party_name}</span>
-        </div>
-        <Separator orientation='vertical' />
-        <HoverCard>
-            <HoverCardTrigger>
-                <div className={cn('flex items-center gap-2 text-ink-gray-5 text-sm', className)}>
-                    <ReceiptTextIcon className='w-4 h-4' />
-                    <span className='text-sm cursor-pointer hover:underline underline-offset-4'>{invoices.length === 0 ? _("No invoice linked") : invoices.length === 1 ? _("1 invoice") : _("{} invoices", [invoices.length.toString()])}</span>
-                </div>
-            </HoverCardTrigger>
-            <HoverCardContent className='w-full p-2' align='end'>
-                <div className='flex flex-col gap-2'>
-                    {invoices.map((invoice) => (
-                        <Table>
-                            <TableHeader>
-                                <TableRow>
-                                    <TableHead>{_("Document")}</TableHead>
-                                    <TableHead>{_("Invoice No")}</TableHead>
-                                    <TableHead>{_("Due Date")}</TableHead>
-                                    <TableHead className='text-end'>{_("Grand Total")}</TableHead>
-                                    <TableHead className='text-end'>{_("Allocated")}</TableHead>
-                                </TableRow>
-                            </TableHeader>
-                            <TableBody>
-                                <TableRow>
-                                    <TableCell><a href={`/desk/${slug(invoice.reference_doctype)}/${invoice.reference_name}`} target='_blank' className='underline underline-offset-4'>{invoice.reference_doctype}: {invoice.reference_name}</a></TableCell>
-                                    <TableCell>{invoice.bill_no ?? "-"}</TableCell>
-                                    <TableCell>{formatDate(invoice.due_date)}</TableCell>
-                                    <TableCell className='text-end font-numeric'>{formatCurrency(invoice.total_amount, currency ?? '')}</TableCell>
-                                    <TableCell className='text-end font-numeric'>{formatCurrency(invoice.allocated_amount, currency ?? '')}</TableCell>
-                                </TableRow>
-                            </TableBody>
-                        </Table>
-                    ))}
-                </div>
-            </HoverCardContent>
-        </HoverCard>
-
-    </div>
-}
-
-const TransferDetails = ({ item, className }: { item: ActionLogItem, className?: string }) => {
-
-    const { banks } = useGetBankAccounts()
-
-    const bank = useMemo(() => {
-
-        const isWithdrawal = item.bankTransaction.withdrawal && item.bankTransaction.withdrawal > 0
-
-        let transferAccount = ""
-
-        if (isWithdrawal) {
-            transferAccount = (item.voucher.doc as PaymentEntry).paid_to
-        } else {
-            transferAccount = (item.voucher.doc as PaymentEntry).paid_from
-        }
-
-        const transferBankAccount = banks?.find((bank) => bank.account === transferAccount)
-
-        return transferBankAccount
-
-    }, [banks, item])
-
-    return <div className={cn('flex items-center gap-2 text-ink-gray-5 text-sm', className)}>
-        <BankLogo bank={bank} className='h-5 mb-0' iconSize='16px' imageClassName='max-h-5' />
-        <span className='text-sm'>{bank?.account}</span>
-    </div>
-}
-
-const ACTION_TYPE_MAP = {
-    'bank_entry': _("Bank Entry"),
-    'payment': _("Payment"),
-    'transfer': _("Transfer"),
-    'match': _("Match"),
-}
-
-const CancelActionLogItem = ({ item, type, timestamp, bank }: { item: ActionLogItem, type: ActionLogType['type'], timestamp: number, bank?: SelectedBank | null }) => {
-
-    const [isOpen, setIsOpen] = useState(false)
-
-    const { call, loading, error } = useFrappePostCall('erpnext.accounts.doctype.bank_transaction.bank_transaction.unreconcile_transaction_entry')
-    const { mutate } = useSWRConfig()
-    const actionLog = useSetAtom(bankRecActionLog)
-    const dates = useAtomValue(bankRecDateAtom)
-    const matchFilters = useAtomValue(bankRecMatchFilters)
-    const selectedBank = useAtomValue(selectedBankAccountAtom)
-
-    const onUndo = () => {
-        call({
-            bank_transaction_id: item.bankTransaction.name,
-            voucher_type: item.voucher.reference_doctype,
-            voucher_id: item.voucher.reference_name,
-        }).then(() => {
-            toast.success(type === 'match' ? _("Unmatched") : _("Cancelled"))
-
-            if (selectedBank?.name === item.bankTransaction.bank_account) {
-                mutate(`bank-reconciliation-unreconciled-transactions-${selectedBank?.name}-${dates.fromDate}-${dates.toDate}`)
-                mutate(`bank-reconciliation-account-closing-balance-${selectedBank?.name}-${dates.toDate}`)
-                // Update the matching vouchers for the selected transaction
-                mutate(`bank-reconciliation-vouchers-${item.bankTransaction.name}-${dates.fromDate}-${dates.toDate}-${matchFilters.join(',')}`)
-            }
-
-            setTimeout(() => {
-                actionLog((prev) => {
-                    // Find the action and then remove the item from the action. If the action is empty, remove the action from the array
-                    const action = prev.find((action) => action.timestamp === timestamp)
-
-                    if (action) {
-                        action.items = action.items.filter((i) => i.bankTransaction.name !== item.bankTransaction.name)
-                    }
-                    // If the action is empty, remove the action from the array
-                    if (action && action.items.length === 0) {
-                        return prev.filter((a) => a.timestamp !== timestamp)
-                    } else {
-                        return prev.map((a) => a.timestamp === timestamp ? { ...a, items: action?.items ?? [] } : a)
-                    }
-                })
-            }, 100)
-
-            setIsOpen(false)
-
-        }).catch((error) => {
-            toast.error(_("There was an error while performing the action."), {
-                duration: 5000,
-                description: getErrorMessage(error),
-            })
-        })
-    }
-
-    return <AlertDialog open={isOpen} onOpenChange={setIsOpen}>
-        <Tooltip>
-            <TooltipTrigger asChild>
-                <AlertDialogTrigger asChild>
-                    <Button
-                        variant={'ghost'}
-                        isIconButton
-                        theme='red'
-                        title={_("Cancel")}
-                        className='hover:text-ink-red-3 hover:bg-destructive/5 text-ink-gray-5 hidden group-hover:inline-flex'>
-                        <CircleXIcon className='w-8 h-8' />
-                    </Button>
-                </AlertDialogTrigger>
-            </TooltipTrigger>
-            <TooltipContent>
-                {_("Cancel")}
-            </TooltipContent>
-        </Tooltip>
-        <AlertDialogContent className='min-w-3xl'>
-            <AlertDialogHeader>
-                <AlertDialogTitle>{type === 'match' ? _("Unmatch Transaction?") : _("Undo {}?", [item.voucher.reference_doctype])}</AlertDialogTitle>
-                <AlertDialogDescription>{type === 'match' ? _("Are you sure you want to unmatch the voucher from this transaction?") : _("Are you sure you want to cancel this {} {}?", [_(item.voucher.reference_doctype), item.voucher.reference_name])}</AlertDialogDescription>
-            </AlertDialogHeader>
-            {error && <ErrorBanner error={error} />}
-            <div className='flex flex-col gap-2'>
-                <SelectedTransactionDetails transaction={item.bankTransaction} />
-                <Table>
-                    <TableRow>
-                        <TableHead>{_("Action Type")}</TableHead>
-                        <TableCell>{ACTION_TYPE_MAP[type]}</TableCell>
-                    </TableRow>
-                    <TableRow>
-                        <TableHead>{_("Voucher Type")}</TableHead>
-                        <TableCell>{_(item.voucher.reference_doctype)}</TableCell>
-                    </TableRow>
-                    <TableRow>
-                        <TableHead>{_("Voucher Name")}</TableHead>
-                        <TableCell><a href={`/desk/${slug(item.voucher.reference_doctype)}/${item.voucher.reference_name}`} target='_blank' className='underline underline-offset-4'>{item.voucher.reference_name}</a></TableCell>
-                    </TableRow>
-                    <TableRow>
-                        <TableHead>{_("Posting Date")}</TableHead>
-                        <TableCell>{formatDate(item.voucher.posting_date, 'Do MMM YYYY')}</TableCell>
-                    </TableRow>
-                    {type === 'transfer' && item.voucher.doc && <TableRow>
-                        <TableHead>{_("Transfer Account")}</TableHead>
-                        <TableCell>
-                            <TransferDetails item={item} className='text-ink-gray-8' />
-                        </TableCell>
-                    </TableRow>}
-                    {type === 'payment' && item.voucher.doc && <TableRow>
-                        <TableHead>{_("Payment Details")}</TableHead>
-                        <TableCell>
-                            <PaymentEntryDetails item={item} className='text-ink-gray-8' />
-                        </TableCell>
-                    </TableRow>}
-                    {type === 'bank_entry' && item.voucher.doc && <TableRow>
-                        <TableHead>{_("Account")}</TableHead>
-                        <TableCell><JournalEntryAccountsTable item={item} bank={bank} /></TableCell>
-                    </TableRow>}
-                </Table>
-            </div>
-            <AlertDialogFooter>
-                <AlertDialogCancel disabled={loading}>
-                    {_("Close")}
-                </AlertDialogCancel>
-                <Button theme="red" size='md' disabled={loading} onClick={onUndo}>
-                    {loading ? <Loader2Icon className='w-4 h-4 animate-spin' /> : _(("Undo"))}
-                </Button>
-            </AlertDialogFooter>
-        </AlertDialogContent>
-    </AlertDialog>
-}
-
-export default ActionLog

banking/src/components/features/BankReconciliation/BankBalance.tsx

@@ -1,334 +0,0 @@
-import { useAtomValue, useSetAtom } from "jotai"
-import { bankRecClosingBalanceAtom, bankRecDateAtom, SelectedBank, selectedBankAccountAtom } from "./bankRecAtoms"
-import { FrappeConfig, FrappeContext, useFrappeGetDocCount, useFrappeGetDocList, useFrappePostCall, useSWRConfig } from "frappe-react-sdk"
-import { BankTransaction } from "@/types/Accounts/BankTransaction"
-import { Progress } from "@/components/ui/progress"
-import { useGetAccountClosingBalance, useGetAccountClosingBalanceAsPerStatement, useGetAccountOpeningBalance, useGetUnreconciledTransactions } from "./utils"
-import { flt, formatCurrency } from "@/lib/numbers"
-import { Skeleton } from "@/components/ui/skeleton"
-import { StatContainer, StatLabel, StatValue } from "@/components/ui/stats"
-import { Edit, Info, Trash2 } from "lucide-react"
-import { H4, Paragraph } from "@/components/ui/typography"
-import { HoverCard, HoverCardContent, HoverCardTrigger } from "@/components/ui/hover-card"
-import { getCompanyCurrency } from "@/lib/company"
-import _ from "@/lib/translate"
-import { Dialog, DialogClose, DialogContent, DialogDescription, DialogFooter, DialogHeader, DialogTitle, DialogTrigger } from "@/components/ui/dialog"
-import { Tooltip, TooltipContent, TooltipTrigger } from "@/components/ui/tooltip"
-import { formatDate } from "@/lib/date"
-import { Form } from "@/components/ui/form"
-import { CurrencyFormField } from "@/components/ui/form-elements"
-import { useForm } from "react-hook-form"
-import { Button } from "@/components/ui/button"
-import { useContext, useState } from "react"
-import { Separator } from "@/components/ui/separator"
-import { BankAccountBalance } from "@/types/Accounts/BankAccountBalance"
-import { Table, TableBody, TableCell, TableHead, TableHeader, TableRow } from "@/components/ui/table"
-import { toast } from "sonner"
-import ErrorBanner from "@/components/ui/error-banner"
-
-const BankBalance = () => {
-
-    const bankAccount = useAtomValue(selectedBankAccountAtom)
-
-    if (!bankAccount) {
-        return null
-    }
-    return (
-        <div className="flex justify-between">
-            <div className="w-[80%] flex flex-wrap justify-between gap-2 pe-8 border-e-border border-e">
-                <OpeningBalance />
-                <ClosingBalance />
-                <ClosingBalanceAsPerStatement />
-                <Difference />
-            </div>
-
-            <ReconcileProgress />
-        </div>
-    )
-}
-
-const OpeningBalance = () => {
-    const bankAccount = useAtomValue(selectedBankAccountAtom)
-    const { data, isLoading } = useGetAccountOpeningBalance()
-
-    return <StatContainer className="min-w-48">
-        <StatLabel>{_("Opening Balance")}</StatLabel>
-        {isLoading ? <Skeleton className="w-[150px] h-5 rounded-sm" /> : <StatValue className="font-numeric">{formatCurrency(flt(data?.message, 2), bankAccount?.account_currency ?? getCompanyCurrency(bankAccount?.company ?? ''))}</StatValue>}
-    </StatContainer>
-}
-
-const ClosingBalance = () => {
-    const bankAccount = useAtomValue(selectedBankAccountAtom)
-    const { data, isLoading } = useGetAccountClosingBalance()
-
-    return (
-        <StatContainer className="min-w-48">
-            <div className="flex items-start gap-1">
-                <StatLabel>
-                    {_("Closing Balance as per system")}
-                </StatLabel>
-                <HoverCard openDelay={100}>
-                    <HoverCardTrigger>
-                        <Info className="size-3.5 text-ink-gray-6 -mt-px" />
-                    </HoverCardTrigger>
-                    <HoverCardContent className="w-96" align="start" side="right">
-                        <H4 className="text-base">{_("Closing balance as per system")}</H4>
-                        <Paragraph className="mt-2 text-p-sm">
-                            {_("This is what the system expects the closing balance to be in your bank statement.")}
-                            <br />
-                            {_("It takes into account all the transactions that have been posted and subtracts the transactions that have not cleared yet.")}
-                            <br />
-                            {_("If your bank statement shows a different closing balance, it is because all transactions have not reconciled yet.")}
-                            <br /><br />
-                            For more information, click on the <strong>Bank Reconciliation Statement</strong> tab below.
-                        </Paragraph>
-                    </HoverCardContent>
-                </HoverCard>
-
-            </div>
-            {isLoading ? <Skeleton className="w-[150px] h-5 rounded-sm" /> : <StatValue className="font-numeric">{formatCurrency(flt(data?.message, 2), bankAccount?.account_currency ?? getCompanyCurrency(bankAccount?.company ?? ''))}</StatValue>}
-        </StatContainer>
-    )
-}
-
-const Difference = () => {
-    const bankAccount = useAtomValue(selectedBankAccountAtom)
-
-    const { data, isLoading } = useGetAccountClosingBalance()
-
-    const value = useAtomValue(bankRecClosingBalanceAtom(bankAccount?.name ?? ''))
-
-    const difference = flt(value.value - (data?.message ?? 0))
-
-    const isError = difference !== 0
-
-    return <StatContainer className="w-fit text-end sm:min-w-56">
-        <StatLabel className="text-end">{_("Difference")}</StatLabel>
-        {isLoading ? <Skeleton className="w-[150px] h-5 self-end rounded-sm" /> : <StatValue className={isError ? 'text-ink-red-3 font-numeric' : 'font-numeric'}>
-            {formatCurrency(difference,
-                bankAccount?.account_currency ?? getCompanyCurrency(bankAccount?.company ?? ''))
-            }</StatValue>}
-    </StatContainer>
-}
-
-const ReconcileProgress = () => {
-
-    const bankAccount = useAtomValue(selectedBankAccountAtom)
-
-    const dates = useAtomValue(bankRecDateAtom)
-
-    const { data: totalCount } = useFrappeGetDocCount<BankTransaction>('Bank Transaction', [
-        ["bank_account", "=", bankAccount?.name ?? ''],
-        ['docstatus', '=', 1],
-        ['date', '<=', dates?.toDate],
-        ['date', '>=', dates?.fromDate]
-    ], false, undefined, {
-        revalidateOnFocus: false
-    })
-
-    const { data: unreconciledTransactions, } = useGetUnreconciledTransactions()
-
-    const reconciledCount = (totalCount ?? 0) - (unreconciledTransactions?.message?.length ?? 0)
-
-    const progress = (totalCount ? reconciledCount / totalCount : 0) * 100
-
-    return <div className="w-[18%] flex flex-col gap-1 items-end">
-        <div className="w-full">
-            <Progress
-                value={progress}
-                max={100}
-                size="md"
-                label="Progress"
-                hint
-                hintText={`${reconciledCount} / ${totalCount} ${_("reconciled")}`} />
-        </div>
-    </div>
-}
-
-const ClosingBalanceAsPerStatement = () => {
-
-    const bankAccount = useAtomValue(selectedBankAccountAtom)
-    const dates = useAtomValue(bankRecDateAtom)
-    const setValue = useSetAtom(bankRecClosingBalanceAtom(bankAccount?.name ?? ''))
-
-    const { data, isLoading } = useGetAccountClosingBalanceAsPerStatement({
-        onSuccess: (data) => {
-            if (data?.message && data?.message?.balance) {
-                setValue({
-                    value: data?.message?.balance,
-                    stringValue: data?.message?.balance.toString()
-                })
-            }
-        }
-    })
-
-    const isDateSame = data?.message?.date === dates.toDate
-
-    const [isOpen, setIsOpen] = useState(false)
-
-
-    return <StatContainer className="min-w-48">
-        <StatLabel>{_("Closing Balance as per statement")}</StatLabel>
-        <div className="flex flex-col gap-2 items-start">
-            <Dialog open={isOpen} onOpenChange={setIsOpen}>
-                <DialogTrigger>
-                    <Tooltip>
-                        <TooltipTrigger asChild>
-                            <div className="flex items-center gap-4 underline cursor-pointer underline-offset-6" role="button">
-                                {isLoading ? <Skeleton className="w-[150px] h-5 rounded-sm" /> : <StatValue className="font-numeric">{formatCurrency(flt(data?.message?.balance, 2), bankAccount?.account_currency ?? getCompanyCurrency(bankAccount?.company ?? ''))}</StatValue>}
-                                <Edit className="w-4 h-4" />
-                            </div>
-                        </TooltipTrigger>
-                        <TooltipContent>
-                            {_("Click to set the closing balance as per statement")}
-                        </TooltipContent>
-                    </Tooltip>
-                </DialogTrigger>
-                <DialogContent className="min-w-xl">
-                    <ClosingBalanceForm
-                        defaultBalance={data?.message?.balance ?? 0}
-                        date={dates.toDate}
-                        bankAccount={bankAccount}
-                        onClose={() => setIsOpen(false)}
-                    />
-
-
-                </DialogContent>
-            </Dialog>
-            {!isDateSame && data?.message.date && <span className="text-xs font-medium text-ink-red-3">{_("As of {0}", [formatDate(data?.message?.date ?? '', 'Do MMM YYYY')])}</span>}
-        </div>
-    </StatContainer>
-
-}
-
-const ClosingBalanceForm = ({ defaultBalance, date, bankAccount, onClose }: { defaultBalance: number, date: string, bankAccount: SelectedBank | null, onClose: VoidFunction }) => {
-
-    const { mutate } = useSWRConfig()
-
-    const form = useForm<{ balance: number }>({
-        defaultValues: {
-            balance: defaultBalance
-        }
-    })
-
-    const setValue = useSetAtom(bankRecClosingBalanceAtom(bankAccount?.name ?? ''))
-
-    const { call, loading, error } = useFrappePostCall("erpnext.accounts.doctype.bank_account.bank_account.set_closing_balance_as_per_statement")
-
-    const onSubmit = (data: { balance: number }) => {
-        if (data.balance) {
-            call({
-                bank_account: bankAccount?.name ?? '',
-                date: date,
-                balance: data.balance
-            })
-                .then(() => {
-                    // Mutate the closing balance as per statement
-                    mutate(`bank-reconciliation-account-closing-balance-as-per-statement-${bankAccount?.name}-${date}`)
-                    setValue({
-                        value: data.balance,
-                        stringValue: data.balance.toString()
-                    })
-                    toast.success(_("Closing balance set."))
-                    onClose()
-
-
-                })
-        } else {
-            toast.error(_("Closing balance is required."))
-        }
-    }
-
-    const currency = bankAccount?.account_currency ?? getCompanyCurrency(bankAccount?.company ?? '')
-
-
-    return <Form {...form}>
-        <form onSubmit={form.handleSubmit(onSubmit)}>
-            <DialogHeader>
-                <DialogTitle>{_("Set closing balance as per bank statement")}</DialogTitle>
-                <DialogDescription>
-                    {_("Enter the closing balance you see in your bank statement for {0} as of the {1}", [bankAccount?.account_name ?? bankAccount?.name ?? '', formatDate(date, 'Do MMM YYYY')])}
-                </DialogDescription>
-            </DialogHeader>
-            {error && <ErrorBanner error={error} />}
-            <div className="py-4">
-                <CurrencyFormField
-                    name="balance"
-                    label={_("Closing balance on bank statement as of {0}", [formatDate(date, 'Do MMM YYYY')])}
-                    isRequired
-                    currency={currency}
-                />
-            </div>
-
-            <DialogFooter>
-                <DialogClose asChild>
-                    <Button variant={'outline'} size='md' disabled={loading}>{_("Cancel")}</Button>
-                </DialogClose>
-                <Button type='submit' size='md' disabled={loading}>{_("Save")}</Button>
-            </DialogFooter>
-
-            <ClosingBalancesList bankAccount={bankAccount} date={date} />
-        </form>
-    </Form>
-}
-
-const ClosingBalancesList = ({ bankAccount, date }: { bankAccount: SelectedBank | null, date: string }) => {
-
-    const { data, mutate } = useFrappeGetDocList<BankAccountBalance>("Bank Account Balance", {
-        filters: [["bank_account", "=", bankAccount?.name ?? ''], ["date", "<=", date]],
-        orderBy: {
-            field: "date",
-            order: "desc"
-        },
-        fields: ["date", "balance", "name"],
-        limit: 10
-    })
-
-    const { db } = useContext(FrappeContext) as FrappeConfig
-
-    const onDelete = (name: string) => {
-        toast.promise(db.deleteDoc("Bank Account Balance", name).then(() => {
-            mutate()
-        }), {
-            loading: _("Deleting closing balance..."),
-            success: _("Closing balance deleted."),
-            error: _("Failed to delete closing balance.")
-        })
-    }
-
-    if (data?.length === 0) {
-        return null
-    }
-
-    return <div>
-        <Separator className="my-8" />
-        <p className="text-sm text-center">{_("Balances as per bank statement before {0}", [formatDate(date, 'Do MMM YYYY')])}</p>
-        <Table>
-            <TableHeader>
-                <TableRow>
-                    <TableHead>{_("Date")}</TableHead>
-                    <TableHead className="text-end">{_("Balance")}</TableHead>
-                    <TableHead></TableHead>
-                </TableRow>
-            </TableHeader>
-            <TableBody>
-                {data?.map((item) => (
-                    <TableRow key={item.name}>
-                        <TableCell>{formatDate(item.date, 'Do MMM YYYY')}</TableCell>
-                        <TableCell className="text-end">{formatCurrency(flt(item.balance, 2), bankAccount?.account_currency ?? getCompanyCurrency(bankAccount?.company ?? ''))}</TableCell>
-                        <TableCell className="text-end">
-                            <Button
-                                title={_("Delete")}
-                                type='button' isIconButton variant='ghost' onClick={() => onDelete(item.name)}>
-                                <Trash2 />
-                            </Button>
-                        </TableCell>
-                    </TableRow>
-                ))}
-            </TableBody>
-        </Table>
-    </div>
-
-}
-
-export default BankBalance

banking/src/components/features/BankReconciliation/BankClearanceSummary.tsx

@@ -1,355 +0,0 @@
-import { useAtomValue } from "jotai"
-import { MissingFiltersBanner } from "./MissingFiltersBanner"
-import { bankRecDateAtom, SelectedBank, selectedBankAccountAtom } from "./bankRecAtoms"
-import { useCurrentCompany } from "@/hooks/useCurrentCompany"
-import { Paragraph } from "@/components/ui/typography"
-import type { ColumnDef } from "@tanstack/react-table"
-import { useCallback, useMemo, useState } from "react"
-import { useFrappeGetCall, useFrappePostCall, useSWRConfig } from "frappe-react-sdk"
-import { QueryReportReturnType } from "@/types/custom/Reports"
-import { formatDate } from "@/lib/date"
-import { ListView, type ListViewColumnMeta } from "@/components/ui/list-view"
-import { Table, TableCell, TableHead, TableHeader, TableRow } from "@/components/ui/table"
-import { formatCurrency } from "@/lib/numbers"
-import { getCompanyCurrency } from "@/lib/company"
-import { slug } from "@/lib/frappe"
-import { CheckCircle2, ReceiptTextIcon, XCircle } from "lucide-react"
-import ErrorBanner from "@/components/ui/error-banner"
-import { Badge } from "@/components/ui/badge"
-import _ from "@/lib/translate"
-import { useCopyToClipboard } from "usehooks-ts"
-import { Tooltip, TooltipContent, TooltipTrigger } from "@/components/ui/tooltip"
-import { toast } from "sonner"
-import { Button } from "@/components/ui/button"
-import { Dialog, DialogClose, DialogContent, DialogDescription, DialogFooter, DialogHeader, DialogTitle, DialogTrigger } from "@/components/ui/dialog"
-import { Form } from "@/components/ui/form"
-import { useForm } from "react-hook-form"
-import { DateField } from "@/components/ui/form-elements"
-import { Empty, EmptyMedia, EmptyHeader, EmptyTitle, EmptyDescription } from "@/components/ui/empty"
-
-const BankClearanceSummary = () => {
-    const bankAccount = useAtomValue(selectedBankAccountAtom)
-    const dates = useAtomValue(bankRecDateAtom)
-
-    if (!bankAccount) {
-        return <MissingFiltersBanner text={_("Please select a bank account to view the bank clearance summary.")} />
-    }
-
-    if (!dates) {
-        return <MissingFiltersBanner text={_("Please select dates to view the bank clearance summary.")} />
-    }
-
-    return <BankClearanceSummaryView />
-}
-interface BankClearanceSummaryEntry {
-    payment_document_type: string
-    payment_entry: string
-    posting_date: string,
-    cheque_no?: string,
-    amount: number,
-    against: string,
-    clearance_date: string,
-}
-
-const BankClearanceSummaryView = () => {
-
-    const companyID = useCurrentCompany()
-    const bankAccount = useAtomValue(selectedBankAccountAtom)
-    const dates = useAtomValue(bankRecDateAtom)
-
-    const filters = useMemo(() => {
-        return JSON.stringify({
-            account: bankAccount?.account,
-            from_date: dates.fromDate,
-            to_date: dates.toDate
-        })
-    }, [bankAccount, dates])
-
-    const { data, error, mutate } = useFrappeGetCall<{ message: QueryReportReturnType<BankClearanceSummaryEntry> }>('frappe.desk.query_report.run', {
-        report_name: 'Bank Clearance Summary',
-        filters,
-        ignore_prepared_report: 1,
-        are_default_filters: false,
-    }, `Report-Bank Clearance Summary-${filters}`, { keepPreviousData: true, revalidateOnFocus: false }, 'POST')
-
-    const formattedFromDate = formatDate(dates.fromDate)
-    const formattedToDate = formatDate(dates.toDate)
-
-    const [, copyToClipboard] = useCopyToClipboard()
-
-    const onCopy = useCallback(
-        (text: string) => {
-            copyToClipboard(text).then(() => {
-                toast.success(_("Copied to clipboard"))
-            })
-        },
-        [copyToClipboard, _],
-    )
-
-    const accountCurrency = useMemo(
-        () => bankAccount?.account_currency ?? getCompanyCurrency(companyID),
-        [bankAccount?.account_currency, companyID],
-    )
-
-    const clearanceColumns = useMemo<ColumnDef<BankClearanceSummaryEntry, unknown>[]>(
-        () => [
-            {
-                accessorKey: "payment_document_type",
-                header: _("Document Type"),
-                size: 140,
-                cell: ({ row }) => _(row.original.payment_document_type),
-            },
-            {
-                id: "payment_entry",
-                header: _("Payment Document"),
-                size: 160,
-                meta: {
-                    getTooltipText: (r) => {
-                        const x = r as BankClearanceSummaryEntry
-                        return [x.payment_document_type, x.payment_entry].filter(Boolean).join(" · ") || undefined
-                    },
-                } satisfies ListViewColumnMeta,
-                cell: ({ row }) => (
-                    <a
-                        target="_blank"
-                        rel="noreferrer"
-                        className="text-ink-gray-8 block min-w-0 w-full underline underline-offset-4"
-                        href={`/desk/${slug(row.original.payment_document_type)}/${row.original.payment_entry}`}
-                    >
-                        {row.original.payment_entry}
-                    </a>
-                ),
-            },
-            {
-                accessorKey: "posting_date",
-                header: _("Posting Date"),
-                size: 118,
-                meta: { tabularNums: true } satisfies ListViewColumnMeta,
-                cell: ({ row }) => formatDate(row.original.posting_date),
-            },
-            {
-                accessorKey: "cheque_no",
-                header: _("Cheque/Reference Number"),
-                size: 160,
-                cell: ({ row }) => {
-                    const ref = row.original.cheque_no ?? ""
-                    return (
-                        <Tooltip delayDuration={500}>
-                            <TooltipTrigger asChild>
-                                <button
-                                    type="button"
-                                    className="text-ink-gray-8 hover:underline min-w-0 w-full cursor-pointer truncate text-start underline-offset-4"
-                                    onClick={() => onCopy(ref)}
-                                >
-                                    {ref}
-                                </button>
-                            </TooltipTrigger>
-                            <TooltipContent>
-                                {ref}
-                            </TooltipContent>
-                        </Tooltip>
-
-                    )
-                },
-            },
-            {
-                accessorKey: "clearance_date",
-                header: _("Clearance Date"),
-                size: 118,
-                meta: { tabularNums: true } satisfies ListViewColumnMeta,
-                cell: ({ row }) => formatDate(row.original.clearance_date),
-            },
-            {
-                accessorKey: "against",
-                header: _("Against Account"),
-                size: 250,
-            },
-            {
-                accessorKey: "amount",
-                header: _("Amount"),
-                size: 150,
-                meta: { align: "right" } satisfies ListViewColumnMeta,
-                cell: ({ row }) => <span className="font-numeric">{formatCurrency(row.original.amount, accountCurrency)}</span>,
-            },
-            {
-                id: "status",
-                header: _("Status"),
-                size: 200,
-                meta: { truncate: false, truncateTooltip: false } satisfies ListViewColumnMeta,
-                cell: ({ row }) => {
-                    const r = row.original
-                    return r.clearance_date ? (
-                        <Badge theme="green">
-                            <CheckCircle2 />
-                            {_("Cleared")}
-                        </Badge>
-                    ) : (
-                        <div className="flex min-w-0 flex-wrap items-center gap-2">
-                            <Badge theme="red">
-                                <XCircle />
-                                {_("Not Cleared")}
-                            </Badge>
-                            <SetClearanceDateButton
-                                voucher={r}
-                                bankAccount={bankAccount}
-                                companyID={companyID}
-                                mutate={mutate}
-                            />
-                        </div>
-                    )
-                },
-            },
-        ],
-        [_, accountCurrency, bankAccount, companyID, mutate, onCopy],
-    )
-
-    return <div className="space-y-4 py-2">
-
-        <div>
-            <Paragraph className="text-sm">
-                <span dangerouslySetInnerHTML={{
-                    __html: _("Below is a list of all accounting entries posted against the bank account {0} between {1} and {2}.", [`<strong>${bankAccount?.account}</strong>`, `<strong>${formattedFromDate}</strong>`, `<strong>${formattedToDate}</strong>`])
-                }} />
-            </Paragraph>
-        </div>
-
-        {error && <ErrorBanner error={error} />}
-
-        {data && data.message.result.length > 0 ? (
-            <ListView
-                data={data.message.result}
-                columns={clearanceColumns}
-                getRowId={(row) => `${row.payment_entry}-${row.posting_date}`}
-                maxHeight="calc(100vh - 200px)"
-                scrollAreaClassName="min-h-[calc(100vh-200px)]"
-                emptyState={_("No rows to display.")}
-            />
-        ) : null}
-
-        {data && data.message.result.length == 0 &&
-            <Empty>
-                <EmptyMedia>
-                    <ReceiptTextIcon />
-                </EmptyMedia>
-                <EmptyHeader>
-                    <EmptyTitle>{_("No entries found")}</EmptyTitle>
-                    <EmptyDescription>{_("There are no accounting entries in the system for the selected account and dates.")}</EmptyDescription>
-                </EmptyHeader>
-            </Empty>
-        }
-
-
-    </div>
-}
-
-const SetClearanceDateButton = ({ voucher, bankAccount, companyID, mutate }: { voucher: BankClearanceSummaryEntry, bankAccount: SelectedBank | null, companyID: string, mutate: VoidFunction }) => {
-
-    const [open, setOpen] = useState(false)
-
-    const onClose = () => {
-        setOpen(false)
-        mutate()
-    }
-
-    return <Dialog open={open} onOpenChange={setOpen}>
-        <DialogTrigger disabled={!bankAccount}>
-            <Tooltip delayDuration={500}>
-                <TooltipTrigger>
-                    <Button variant='link' size="sm" className="px-0" theme="red">{_("Force Clear")}</Button>
-                </TooltipTrigger>
-                <TooltipContent align='start'>
-                    {_("Set the clearance date for this voucher without reconciling with a bank transaction.")}
-                </TooltipContent>
-            </Tooltip>
-        </DialogTrigger>
-        <DialogContent className="min-w-2xl">
-            {bankAccount && <ForceClearVoucherForm voucher={voucher} bankAccount={bankAccount} companyID={companyID} onClose={onClose} />}
-        </DialogContent>
-    </Dialog>
-}
-
-const ForceClearVoucherForm = ({ voucher, bankAccount, companyID, onClose }: { voucher: BankClearanceSummaryEntry, bankAccount: SelectedBank, companyID: string, onClose: () => void }) => {
-
-    const { mutate } = useSWRConfig()
-
-    const dates = useAtomValue(bankRecDateAtom)
-    const form = useForm<{ clearance_date: string }>({
-        defaultValues: {
-            clearance_date: voucher.posting_date,
-        }
-    })
-
-    const { call, loading, error } = useFrappePostCall('erpnext.accounts.doctype.bank_reconciliation_tool.bank_reconciliation_tool.update_clearance_date')
-
-    const onSubmit = (data: { clearance_date: string }) => {
-        call({
-            payment_document: voucher.payment_document_type,
-            payment_entry: voucher.payment_entry,
-            account: bankAccount.account,
-            clearance_date: data.clearance_date,
-        })
-            .then(() => {
-                toast.success(_("Clearance date updated"))
-                onClose()
-                mutate(`bank-reconciliation-account-closing-balance-${bankAccount?.name}-${dates.toDate}`)
-            })
-    }
-
-    return <Form {...form}>
-        <form onSubmit={form.handleSubmit(onSubmit)}>
-
-            <div className='flex flex-col gap-4'>
-
-                <DialogHeader>
-                    <DialogTitle>{_("Force Clear Voucher")}</DialogTitle>
-                    <DialogDescription>
-                        {_("Set the clearance date for this voucher without reconciling with a bank transaction.")}
-                    </DialogDescription>
-                </DialogHeader>
-                {error && <ErrorBanner error={error} />}
-                <div>
-                    <Table>
-                        <TableHeader>
-                            <TableRow>
-                                <TableHead>{_("Payment Document")}</TableHead>
-                                <TableCell><a target="_blank" className="underline underline-offset-4"
-                                    href={`/desk/${slug(voucher.payment_document_type)}/${voucher.payment_entry}`}>{_(voucher.payment_document_type)} : {voucher.payment_entry}</a></TableCell>
-                            </TableRow>
-                            <TableRow>
-                                <TableHead>{_("Posting Date")}</TableHead>
-                                <TableCell>{formatDate(voucher.posting_date)}</TableCell>
-                            </TableRow>
-                            <TableRow>
-                                <TableHead>{_("Cheque/Reference Number")}</TableHead>
-                                <TableCell title={voucher.cheque_no}>{voucher.cheque_no?.slice(0, 40)}{voucher.cheque_no?.length && voucher.cheque_no?.length > 40 ? "..." : ""}</TableCell>
-                            </TableRow>
-                            <TableRow>
-                                <TableHead>{_("Amount")}</TableHead>
-                                <TableCell className="text-end">{formatCurrency(voucher.amount, bankAccount?.account_currency ?? getCompanyCurrency(companyID))}</TableCell>
-                            </TableRow>
-                            <TableRow>
-                                <TableHead>{_("Against Account")}</TableHead>
-                                <TableCell><a target="_blank" className="underline underline-offset-4" href={`/desk/account/${voucher.against}`}>{voucher.against}</a></TableCell>
-                            </TableRow>
-                        </TableHeader>
-                    </Table>
-                </div>
-                <DateField
-                    name='clearance_date'
-                    label={_("Clearance Date")}
-                    isRequired
-                    inputProps={{ autoFocus: true }}
-                />
-
-                <DialogFooter>
-                    <DialogClose asChild>
-                        <Button variant={'outline'} disabled={loading} size='md'>{_("Cancel")}</Button>
-                    </DialogClose>
-                    <Button type='submit' disabled={loading} size='md'>{_("Submit")}</Button>
-                </DialogFooter>
-            </div>
-        </form>
-    </Form>
-}
-
-export default BankClearanceSummary

banking/src/components/features/BankReconciliation/BankEntryModal.tsx

@@ -1,831 +0,0 @@
-import { useAtom, useAtomValue, useSetAtom } from "jotai"
-import { bankRecRecordJournalEntryModalAtom, bankRecSelectedTransactionAtom, bankRecUnreconcileModalAtom, selectedBankAccountAtom } from "./bankRecAtoms"
-import { Dialog, DialogContent, DialogTitle, DialogDescription, DialogHeader, DialogFooter, DialogClose } from "@/components/ui/dialog"
-import _ from "@/lib/translate"
-import { UnreconciledTransaction, useGetRuleForTransaction, useRefreshUnreconciledTransactions, useUpdateActionLog } from "./utils"
-import { useFieldArray, useForm, useFormContext, useWatch } from "react-hook-form"
-import { JournalEntry } from "@/types/Accounts/JournalEntry"
-import { getCompanyCostCenter, getCompanyCurrency } from "@/lib/company"
-import { FrappeConfig, FrappeContext, useFrappePostCall } from "frappe-react-sdk"
-import { toast } from "sonner"
-import ErrorBanner from "@/components/ui/error-banner"
-import { Button } from "@/components/ui/button"
-import SelectedTransactionDetails from "./SelectedTransactionDetails"
-import { AccountFormField, CurrencyFormField, DataField, DateField, LinkFormField, PartyTypeFormField, SmallTextField } from "@/components/ui/form-elements"
-import { Form } from "@/components/ui/form"
-import { useCallback, useContext, useMemo, useRef, useState } from "react"
-import { Table, TableBody, TableCell, TableHead, TableHeader, TableRow } from "@/components/ui/table"
-import { Checkbox } from "@/components/ui/checkbox"
-import { ArrowDownRight, ArrowUpRight, Plus, Trash2 } from "lucide-react"
-import { flt, formatCurrency } from "@/lib/numbers"
-import { cn } from "@/lib/utils"
-import { Tooltip, TooltipContent, TooltipTrigger } from "@/components/ui/tooltip"
-import SelectedTransactionsTable from "./SelectedTransactionsTable"
-import { JournalEntryAccount } from "@/types/Accounts/JournalEntryAccount"
-import { BankTransaction } from "@/types/Accounts/BankTransaction"
-import FileUploadBanner from "@/components/common/FileUploadBanner"
-import { Label } from "@/components/ui/label"
-import { FileDropzone } from "@/components/ui/file-dropzone"
-import { useGetAccounts } from "@/components/common/AccountsDropdown"
-import { useHotkeys } from "react-hotkeys-hook"
-
-const BankEntryModal = () => {
-
-    const [isOpen, setIsOpen] = useAtom(bankRecRecordJournalEntryModalAtom)
-
-    return (
-        <Dialog open={isOpen} onOpenChange={setIsOpen}>
-            <DialogContent className='min-w-[95vw]'>
-                <DialogHeader>
-                    <DialogTitle>{_("Bank Entry")}</DialogTitle>
-                    <DialogDescription>
-                        {_("Record a journal entry for expenses, income or split transactions.")}
-                    </DialogDescription>
-                </DialogHeader>
-                <RecordBankEntryModalContent />
-            </DialogContent>
-        </Dialog>
-    )
-}
-
-const RecordBankEntryModalContent = () => {
-
-    const selectedBankAccount = useAtomValue(selectedBankAccountAtom)
-
-    const selectedTransaction = useAtomValue(bankRecSelectedTransactionAtom(selectedBankAccount?.name ?? ''))
-
-    if (!selectedTransaction || !selectedBankAccount || selectedTransaction.length === 0) {
-        return <div className='p-4'>
-            <span className='text-center'>{_("No transaction selected")}</span>
-        </div>
-    }
-
-    if (selectedTransaction.length === 1) {
-        return <BankEntryForm
-            selectedTransaction={selectedTransaction[0]} />
-    }
-
-    return <BulkBankEntryForm
-        selectedTransactions={selectedTransaction}
-    />
-
-}
-
-const BulkBankEntryForm = ({ selectedTransactions }: { selectedTransactions: UnreconciledTransaction[] }) => {
-
-    const form = useForm<{
-        account: string
-    }>({
-        defaultValues: {
-            account: ''
-        }
-    })
-
-    const { call, loading, error } = useFrappePostCall<{ message: { transaction: BankTransaction, journal_entry: JournalEntry }[] }>('erpnext.accounts.doctype.bank_reconciliation_tool.bank_reconciliation_tool.create_bulk_bank_entry_and_reconcile')
-
-    const onReconcile = useRefreshUnreconciledTransactions()
-    const addToActionLog = useUpdateActionLog()
-
-    const setIsOpen = useSetAtom(bankRecRecordJournalEntryModalAtom)
-
-    const onSubmit = (data: { account: string }) => {
-
-        call({
-            bank_transactions: selectedTransactions.map(transaction => transaction.name),
-            account: data.account
-        }).then(({ message }) => {
-
-            addToActionLog({
-                type: 'bank_entry',
-                timestamp: (new Date()).getTime(),
-                isBulk: true,
-                items: message.map((item) => ({
-                    bankTransaction: item.transaction,
-                    voucher: {
-                        reference_doctype: "Journal Entry",
-                        reference_name: item.journal_entry.name,
-                        doc: item.journal_entry,
-                        posting_date: item.journal_entry.posting_date,
-                    }
-                })),
-                bulkCommonData: {
-                    account: data.account,
-                }
-            })
-
-            toast.success(_("Bank Entries Created"), {
-                duration: 4000,
-            })
-
-            // Set this to the last selected transaction
-            onReconcile(selectedTransactions[selectedTransactions.length - 1])
-            setIsOpen(false)
-        })
-    }
-
-    return <Form {...form}>
-        <form onSubmit={form.handleSubmit(onSubmit)}>
-            <div className="flex flex-col gap-4">
-                {error && <ErrorBanner error={error} />}
-                <SelectedTransactionsTable />
-
-                <div className="grid grid-cols-3 gap-4">
-                    <AccountFormField
-                        name='account'
-                        filterFunction={(acc) => {
-                            // Do not allow payable and receivable accounts
-                            return acc.account_type !== 'Payable' && acc.account_type !== 'Receivable'
-                        }}
-                        label={_('Account')}
-                        isRequired
-                    />
-                </div>
-
-                <DialogFooter>
-                    <DialogClose asChild>
-                        <Button size='md' variant={'outline'} disabled={loading}>{_("Cancel")}</Button>
-                    </DialogClose>
-                    <Button size='md' type='submit' disabled={loading}>{_("Submit")}</Button>
-                </DialogFooter>
-            </div>
-        </form>
-    </Form>
-}
-
-
-interface BankEntryFormData extends Pick<JournalEntry, 'voucher_type' | 'cheque_date' | 'posting_date' | 'cheque_no' | 'user_remark'> {
-    entries: JournalEntry['accounts']
-}
-
-
-const BankEntryForm = ({ selectedTransaction }: { selectedTransaction: UnreconciledTransaction }) => {
-
-    const selectedBankAccount = useAtomValue(selectedBankAccountAtom)
-
-    const { data: rule } = useGetRuleForTransaction(selectedTransaction)
-
-    const setIsOpen = useSetAtom(bankRecRecordJournalEntryModalAtom)
-
-    const onClose = () => {
-        setIsOpen(false)
-    }
-
-    const isWithdrawal = (selectedTransaction.withdrawal && selectedTransaction.withdrawal > 0) ? true : false
-
-    const defaultAccounts = useMemo(() => {
-
-        const isWithdrawal = (selectedTransaction.withdrawal && selectedTransaction.withdrawal > 0) ? true : false
-
-        const accounts: Partial<JournalEntryAccount>[] = [
-            {
-                account: selectedBankAccount?.account ?? '',
-                bank_account: selectedTransaction.bank_account,
-                // Bank is debited if it's a deposit
-                debit: isWithdrawal ? 0 : selectedTransaction.unallocated_amount,
-                credit: isWithdrawal ? selectedTransaction.unallocated_amount : 0,
-                party_type: '',
-                party: '',
-                cost_center: ''
-            }]
-
-        // If there is no rule, we can just add the entries for the bank account transaction and the other side will be the reverse
-        if (!rule) {
-            accounts.push(
-                {
-                    account: '',
-                    // Amounts will be the reverse of the bank account transaction
-                    debit: isWithdrawal ? selectedTransaction.unallocated_amount : 0,
-                    credit: isWithdrawal ? 0 : selectedTransaction.unallocated_amount,
-                    cost_center: getCompanyCostCenter(selectedTransaction.company ?? '') ?? '',
-                }
-            )
-        } else {
-            // Rule exists, so we need to check the type of rule
-            if (!rule.bank_entry_type || rule.bank_entry_type === "Single Account") {
-                // Only a single account needs to be added
-                accounts.push({
-                    account: rule.account ?? '',
-                    // Amounts will be the reverse of the bank account transaction
-                    debit: isWithdrawal ? selectedTransaction.unallocated_amount : 0,
-                    credit: isWithdrawal ? 0 : selectedTransaction.unallocated_amount,
-                    cost_center: getCompanyCostCenter(selectedTransaction.company ?? '') ?? '',
-                })
-            } else {
-                // For multiple accounts, we need to loop over and add entries for each
-                // The last row will just be the remaining amount
-                let hasTotallyEmptyRowEarlier = false;
-
-                let totalDebits = isWithdrawal ? 0 : selectedTransaction.unallocated_amount ?? 0
-                let totalCredits = isWithdrawal ? selectedTransaction.unallocated_amount ?? 0 : 0
-
-                for (let i = 0; i < (rule.accounts?.length ?? 0); i++) {
-
-                    const acc = rule.accounts?.[i]
-                    // If it's the last row, add the difference amount
-                    if (i === (rule.accounts?.length ?? 0) - 1 && !hasTotallyEmptyRowEarlier) {
-
-                        const differenceAmount = flt(totalDebits - totalCredits, 2)
-                        accounts.push({
-                            account: acc?.account ?? '',
-                            debit: differenceAmount > 0 ? 0 : Math.abs(differenceAmount),
-                            credit: differenceAmount > 0 ? Math.abs(differenceAmount) : 0,
-                            cost_center: getCompanyCostCenter(selectedTransaction.company ?? '') ?? '',
-                            user_remark: acc?.user_remark ?? '',
-                        })
-                    } else {
-
-                        /**
-                         * The debit and credit amounts can also be expressions - like "transaction_amount * 0.5"
-                         * So we need to compute the value of the expression
-                         * We can use the eval function to do this. But we need to expose certain variables to the expression.
-                         * One of them is transaction_amount which is the unallocated amount of the selected transaction
-                         * @param expression - The expression to compute
-                         * @returns The computed value
-                         */
-                        const computeExpression = (expression: string) => {
-
-                            const script = `
-                                const transaction_amount = ${selectedTransaction.unallocated_amount ?? 0}
-                                ${expression};
-                            `
-
-                            let value = 0;
-
-                            try {
-                                value = window.eval(script);
-                            } catch (error: unknown) {
-                                console.error(error);
-                                value = 0;
-                            }
-
-                            return value;
-                        }
-                        if (!acc?.debit && !acc?.credit) {
-                            hasTotallyEmptyRowEarlier = true;
-                        }
-
-                        const computedDebit = acc?.debit ? flt(computeExpression(acc.debit), 2) : 0
-                        const computedCredit = acc?.credit ? flt(computeExpression(acc.credit), 2) : 0
-
-                        totalDebits = flt(totalDebits + computedDebit, 2)
-                        totalCredits = flt(totalCredits + computedCredit, 2)
-                        accounts.push({
-                            account: acc?.account ?? '',
-                            debit: computedDebit,
-                            credit: computedCredit,
-                            cost_center: getCompanyCostCenter(selectedTransaction.company ?? '') ?? '',
-                            user_remark: acc?.user_remark ?? '',
-                        })
-                    }
-                }
-            }
-        }
-
-        return accounts
-
-    }, [rule, selectedTransaction, selectedBankAccount])
-
-    const form = useForm<BankEntryFormData>({
-        defaultValues: {
-            voucher_type: selectedBankAccount?.is_credit_card ? 'Credit Card Entry' : 'Bank Entry',
-            cheque_date: selectedTransaction.date,
-            posting_date: selectedTransaction.date,
-            cheque_no: (selectedTransaction.reference_number || selectedTransaction.description || '').slice(0, 140),
-            user_remark: selectedTransaction.description,
-            entries: defaultAccounts,
-        }
-    })
-
-    const onReconcile = useRefreshUnreconciledTransactions()
-
-    const { call: createBankEntry, loading, error, isCompleted } = useFrappePostCall<{ message: { transaction: BankTransaction, journal_entry: JournalEntry } }>('erpnext.accounts.doctype.bank_reconciliation_tool.bank_reconciliation_tool.create_bank_entry_and_reconcile')
-
-    const setBankRecUnreconcileModalAtom = useSetAtom(bankRecUnreconcileModalAtom)
-    const addToActionLog = useUpdateActionLog()
-
-    const { file: frappeFile } = useContext(FrappeContext) as FrappeConfig
-
-    const [isUploading, setIsUploading] = useState(false)
-    const [uploadProgress, setUploadProgress] = useState(0)
-
-    const [files, setFiles] = useState<File[]>([])
-
-    const onSubmit = (data: BankEntryFormData) => {
-
-        createBankEntry({
-            bank_transaction_name: selectedTransaction.name,
-            ...data
-        }).then(async ({ message }) => {
-
-            addToActionLog({
-                type: 'bank_entry',
-                isBulk: false,
-                timestamp: (new Date()).getTime(),
-                items: [
-                    {
-                        bankTransaction: message.transaction,
-                        voucher: {
-                            reference_doctype: "Journal Entry",
-                            reference_name: message.journal_entry.name,
-                            reference_no: message.journal_entry.cheque_no,
-                            reference_date: message.journal_entry.cheque_date,
-                            posting_date: message.journal_entry.posting_date,
-                            doc: message.journal_entry,
-                        }
-                    }
-                ]
-            })
-            toast.success(_("Bank Entry Created"), {
-                duration: 4000,
-                closeButton: true,
-                action: {
-                    label: _("Undo"),
-                    onClick: () => setBankRecUnreconcileModalAtom(selectedTransaction.name)
-                },
-                actionButtonStyle: {
-                    backgroundColor: "rgb(0, 138, 46)"
-                }
-            })
-
-            if (files.length > 0) {
-                setIsUploading(true)
-
-                const uploadPromises = files.map(f => {
-                    return frappeFile.uploadFile(f, {
-                        isPrivate: true,
-                        doctype: "Journal Entry",
-                        docname: message.journal_entry.name,
-                    }, (_bytesUploaded, _totalBytes, progress) => {
-
-                        setUploadProgress((currentProgress) => {
-                            //If there are multiple files, we need to add the progress to the current progress
-                            return currentProgress + ((progress?.progress ?? 0) / files.length)
-                        })
-
-                    })
-                })
-
-                return Promise.all(uploadPromises).then(() => {
-                    setUploadProgress(0)
-                    setIsUploading(false)
-                }).catch((error) => {
-                    console.error(error)
-                    toast.error(_("Error uploading attachments"), {
-                        duration: 4000,
-                    })
-                    setIsUploading(false)
-                })
-            } else {
-                return Promise.resolve()
-            }
-
-        }).then(() => {
-            onReconcile(selectedTransaction)
-            onClose()
-        })
-    }
-
-
-    useHotkeys('meta+s', () => {
-        form.handleSubmit(onSubmit)()
-    }, {
-        enabled: true,
-        preventDefault: true,
-        enableOnFormTags: true
-    })
-
-    if (isUploading && isCompleted) {
-        return <FileUploadBanner uploadProgress={uploadProgress} />
-    }
-
-    return <Form {...form}>
-        <form onSubmit={form.handleSubmit(onSubmit)}>
-            <div className='flex flex-col gap-4'>
-                {error && <ErrorBanner error={error} />}
-                <div className='grid grid-cols-2 gap-4'>
-                    <SelectedTransactionDetails transaction={selectedTransaction} />
-
-                    <div className='flex flex-col gap-4'>
-                        <div className='grid grid-cols-2 gap-4'>
-                            <DateField
-                                name='posting_date'
-                                label={_("Posting Date")}
-                                isRequired
-                                inputProps={{ autoFocus: false }}
-                            />
-                            <DateField
-                                name='cheque_date'
-                                label={_("Reference Date")}
-                                isRequired
-                                inputProps={{ autoFocus: false }}
-                                rules={{
-                                    required: _("Reference Date is required"),
-                                }}
-                            />
-                        </div>
-                        <DataField name='cheque_no' label={_("Reference")} isRequired inputProps={{ autoFocus: false }}
-                            rules={{
-                                required: _("Reference is required"),
-                            }} />
-                    </div>
-                </div>
-
-                <div>
-                    <Entries company={selectedTransaction.company ?? ''} isWithdrawal={isWithdrawal} currency={selectedTransaction.currency ?? getCompanyCurrency(selectedTransaction.company ?? '')} />
-                </div>
-                <div className='flex flex-col gap-2'>
-                    <div className='grid grid-cols-2 gap-4'>
-                        <SmallTextField
-                            name='user_remark'
-                            label={_("Remarks")}
-                        />
-                        <div
-                            data-slot="form-item"
-                            className="flex flex-col gap-2"
-                        >
-                            <Label>{_("Attachments")}</Label>
-                            <FileDropzone files={files} setFiles={setFiles} />
-                        </div>
-                    </div>
-                </div>
-
-                <DialogFooter>
-                    <DialogClose asChild>
-                        <Button size='md' variant={'outline'} disabled={loading}>{_("Cancel")}</Button>
-                    </DialogClose>
-                    <Button size='md' type='submit' disabled={loading}>{_("Submit")}</Button>
-                </DialogFooter>
-            </div>
-        </form>
-    </Form>
-
-}
-
-const Entries = ({ company, isWithdrawal, currency }: { company: string, isWithdrawal: boolean, currency: string }) => {
-
-    const { getValues, setValue, control } = useFormContext<BankEntryFormData>()
-
-    const { call } = useContext(FrappeContext) as FrappeConfig
-
-    const partyMapRef = useRef<Record<string, string>>({})
-
-    const onPartyChange = (value: string, index: number) => {
-        // Get the account for the party type
-        if (value) {
-            if (partyMapRef.current[value]) {
-                setValue(`entries.${index}.account`, partyMapRef.current[value])
-            } else {
-                call.get('erpnext.accounts.party.get_party_account', {
-                    party: value,
-                    party_type: getValues(`entries.${index}.party_type`),
-                    company: company
-                }).then((result: { message: string }) => {
-                    setValue(`entries.${index}.account`, result.message)
-                    partyMapRef.current[value] = result.message
-                })
-            }
-        } else {
-            setValue(`entries.${index}.account`, '')
-        }
-    }
-
-    const { data: accounts } = useGetAccounts()
-
-    const onAccountChange = (value: string, index: number) => {
-        // If it's an income or expense account, get the default cost center
-        if (value) {
-            const account = accounts?.find((acc) => acc.name === value)
-            if (account && account.report_type === "Profit and Loss") {
-                // Set the default company cost center
-                setValue(`entries.${index}.cost_center`, getCompanyCostCenter(company) ?? '')
-                return
-            }
-        }
-
-        setValue(`entries.${index}.cost_center`, '')
-    }
-
-    const { fields, append, remove } = useFieldArray({
-        control: control,
-        name: 'entries'
-    })
-
-    const onAdd = useCallback(() => {
-        const existingEntries = getValues('entries')
-        const totalDebits = existingEntries.reduce((acc, curr) => flt(acc + (curr.debit ?? 0), 2), 0)
-        const totalCredits = existingEntries.reduce((acc, curr) => flt(acc + (curr.credit ?? 0), 2), 0)
-
-        const remainingAmount = flt(totalDebits - totalCredits, 2)
-
-        // Remaining amount is credit if it's positive - since some debit is pending to be cleared.
-        const debitAmount = remainingAmount > 0 ? 0 : Math.abs(remainingAmount)
-        const creditAmount = remainingAmount > 0 ? Math.abs(remainingAmount) : 0
-
-        append({
-            party_type: '',
-            party: '',
-            account: '',
-            debit: debitAmount,
-            credit: creditAmount,
-            cost_center: getCompanyCostCenter(company) ?? ''
-        } as JournalEntryAccount, {
-            focusName: `entries.${existingEntries.length}.account`
-        })
-    }, [company, append, getValues])
-
-    const [selectedRows, setSelectedRows] = useState<number[]>([])
-
-    const onSelectRow = useCallback((index: number) => {
-        setSelectedRows(prev => {
-            if (prev.includes(index)) {
-                return prev.filter(i => i !== index)
-            }
-            return [...prev, index]
-        })
-    }, [])
-
-    const onSelectAll = useCallback(() => {
-        setSelectedRows(prev => {
-            if (prev.length === fields.length) {
-                return []
-            }
-            return [...fields.map((_, index) => index)]
-        })
-    }, [fields])
-
-    const onRemove = useCallback(() => {
-        remove(selectedRows)
-        setSelectedRows([])
-    }, [remove, selectedRows])
-
-    /**
-     * When add difference is clicked, check if the last row has nothing filled in.
-     * If last row is empty (no debit or credit), then set that row's amount. Else, add a new row with the difference amount.
-     */
-    const onAddDifferenceClicked = () => {
-
-        const existingEntries = getValues('entries')
-        const totalDebits = existingEntries.reduce((acc, curr) => flt(acc + (curr.debit ?? 0), 2), 0)
-        const totalCredits = existingEntries.reduce((acc, curr) => flt(acc + (curr.credit ?? 0), 2), 0)
-
-        const lastIndex = existingEntries.length - 1
-
-        const isLastRowEmpty = (existingEntries[lastIndex]?.debit === 0 || existingEntries[lastIndex]?.debit === undefined) && (existingEntries[lastIndex]?.credit === 0 || existingEntries[lastIndex]?.credit === undefined)
-
-        const remainingAmount = flt(totalDebits - totalCredits, 2)
-
-        // Remaining amount is credit if it's positive - since some debit is pending to be cleared.
-        const debitAmount = remainingAmount > 0 ? 0 : Math.abs(remainingAmount)
-        const creditAmount = remainingAmount > 0 ? Math.abs(remainingAmount) : 0
-
-        if (isLastRowEmpty) {
-            setValue(`entries.${lastIndex}.debit`, debitAmount)
-            setValue(`entries.${lastIndex}.credit`, creditAmount)
-        } else {
-            append({
-                party_type: '',
-                party: '',
-                account: '',
-                debit: debitAmount,
-                credit: creditAmount,
-                cost_center: getCompanyCostCenter(company) ?? ''
-            } as JournalEntryAccount, {
-                focusName: `entries.${existingEntries.length}.account`
-            })
-        }
-    }
-
-
-
-    return <div className="flex flex-col gap-2">
-        <Table>
-            <TableHeader>
-                <TableRow>
-                    <TableHead><Checkbox
-                        disabled={fields.length === 0}
-                        // Make this accessible to screen readers
-                        aria-label={_("Select all")}
-                        checked={selectedRows.length > 0 && selectedRows.length === fields.length}
-                        onCheckedChange={onSelectAll} /></TableHead>
-                    <TableHead>{_("Party")}</TableHead>
-                    <TableHead>{_("Account")}</TableHead>
-                    <TableHead>{_("Cost Center")}</TableHead>
-                    <TableHead>{_("Remarks")}</TableHead>
-                    <TableHead className="text-end">{_("Debit")}</TableHead>
-                    <TableHead className="text-end">{_("Credit")}</TableHead>
-                </TableRow>
-            </TableHeader>
-            <TableBody>
-                {fields.map((field, index) => (
-                    <TableRow key={field.id} className={index === 0 ? 'bg-surface-gray-1 cursor-not-allowed' : ''} title={index === 0 ? _("This is the bank account entry. You cannot edit it.") : ''}>
-                        <TableCell>
-                            <Checkbox
-                                checked={selectedRows.includes(index)}
-                                onCheckedChange={() => onSelectRow(index)}
-                                // Make this accessible to screen readers
-                                aria-label={_("Select row {0}", [String(index + 1)])}
-                                disabled={index === 0}
-                            />
-                        </TableCell>
-
-                        <TableCell className="align-top">
-                            <div className="flex">
-                                <PartyTypeFormField
-                                    name={`entries.${index}.party_type`}
-                                    label={_("Party Type")}
-                                    isRequired
-                                    readOnly={index === 0}
-                                    hideLabel
-                                    inputProps={{
-                                        type: isWithdrawal ? 'Payable' : 'Receivable',
-                                        triggerProps: {
-                                            className: 'rounded-e-none',
-                                            tabIndex: -1
-                                        },
-                                        readOnly: index === 0,
-                                    }} />
-                                <PartyField index={index} onChange={onPartyChange} readOnly={index === 0} />
-                            </div>
-
-                        </TableCell>
-                        <TableCell className="align-top">
-                            <AccountFormField
-                                name={`entries.${index}.account`}
-                                label={_("Account")}
-                                rules={{
-                                    required: _("Account is required"),
-                                    onChange: (event) => {
-                                        onAccountChange(event.target.value, index)
-                                    }
-                                }}
-                                buttonClassName="min-w-64"
-                                readOnly={index === 0}
-                                isRequired
-                                hideLabel
-                            />
-                        </TableCell>
-                        <TableCell className="align-top">
-                            <LinkFormField
-                                doctype="Cost Center"
-                                name={`entries.${index}.cost_center`}
-                                label={_("Cost Center")}
-                                filters={[["company", "=", company], ["is_group", "=", 0], ["disabled", "=", 0]]}
-                                buttonClassName="min-w-48"
-                                readOnly={index === 0}
-                                hideLabel
-                            />
-                        </TableCell>
-                        <TableCell className="align-top">
-                            <DataField
-                                name={`entries.${index}.user_remark`}
-                                label={_("Remarks")}
-                                readOnly={index === 0}
-                                inputProps={{
-                                    placeholder: _("e.g. Bank Charges"),
-                                    className: 'min-w-64',
-                                    readOnly: index === 0
-                                }}
-                                hideLabel
-                            />
-                        </TableCell>
-                        <TableCell className={cn("text-end align-top")}>
-                            <CurrencyFormField
-                                name={`entries.${index}.debit`}
-                                label={_("Debit")}
-                                isRequired
-                                hideLabel
-                                readOnly={index === 0}
-                                style={index === 0 ? !isWithdrawal ? {
-                                    color: "var(--color-ink-gray-8)",
-                                } : {} : {}}
-                                currency={currency}
-                                leftSlot={index === 0 && !isWithdrawal ? <Tooltip>
-                                    <TooltipTrigger asChild><ArrowDownRight className="text-ink-green-3" /></TooltipTrigger>
-                                    <TooltipContent>{_("Bank account debit for deposit")}</TooltipContent>
-                                </Tooltip> : undefined}
-                            />
-                        </TableCell>
-                        <TableCell className={cn("text-end align-top")}>
-                            <CurrencyFormField
-                                name={`entries.${index}.credit`}
-                                style={index === 0 && isWithdrawal ? {
-                                    color: "var(--color-ink-gray-8)",
-                                } : {}}
-                                label={_("Credit")}
-                                isRequired
-                                hideLabel
-                                readOnly={index === 0}
-                                currency={currency}
-                                leftSlot={index === 0 && isWithdrawal ? <Tooltip>
-                                    <TooltipTrigger asChild><ArrowUpRight className="text-ink-red-3" /></TooltipTrigger>
-                                    <TooltipContent>{_("Bank account credit for withdrawal")}</TooltipContent>
-                                </Tooltip> : undefined}
-                            />
-                        </TableCell>
-                    </TableRow>
-                ))}
-            </TableBody>
-        </Table>
-        <div className="flex justify-between gap-2">
-            <div className="flex gap-2 justify-end">
-                <div>
-                    <Button size='sm' type='button' variant={'outline'} onClick={onAdd}><Plus /> {_("Add Row")}</Button>
-                </div>
-                {selectedRows.length > 0 && <div>
-                    <Button size='sm' type='button' theme="red" onClick={onRemove}><Trash2 /> {_("Remove")}</Button>
-                </div>}
-            </div>
-            <Summary currency={currency} addRow={onAddDifferenceClicked} />
-        </div>
-    </div>
-
-}
-
-const PartyField = ({ index, onChange, readOnly }: { index: number, onChange: (value: string, index: number) => void, readOnly: boolean }) => {
-
-    const { control } = useFormContext<BankEntryFormData>()
-
-    const party_type = useWatch({
-        control,
-        name: `entries.${index}.party_type`
-    })
-
-    if (!party_type) {
-        return <DataField
-            name={`entries.${index}.party`}
-            label={_("Party")}
-            isRequired
-            inputProps={{
-                disabled: true,
-                className: 'rounded-s-none border-s-0 min-w-64'
-            }}
-            hideLabel
-        />
-    }
-
-    return <LinkFormField
-        name={`entries.${index}.party`}
-        label={_("Party")}
-        rules={{
-            onChange: (event) => {
-                onChange(event.target.value, index)
-            },
-        }}
-        hideLabel
-        readOnly={readOnly}
-        buttonClassName="rounded-s-none border-s-0 min-w-64"
-        doctype={party_type}
-
-    />
-}
-
-const Summary = ({ currency, addRow }: { currency: string, addRow: () => void }) => {
-
-    const { control } = useFormContext<BankEntryFormData>()
-
-    const entries = useWatch({ control, name: 'entries' })
-
-    const { total, totalCredits, totalDebits } = useMemo(() => {
-        // Do a total debits - total credits
-        const totalDebits = entries.reduce((acc, curr) => flt(acc + (curr.debit ?? 0), 2), 0)
-        const totalCredits = entries.reduce((acc, curr) => flt(acc + (curr.credit ?? 0), 2), 0)
-        return { total: flt(totalDebits - totalCredits, 2), totalDebits, totalCredits }
-    }, [entries])
-
-    const onAddRow = useCallback(() => {
-        addRow()
-    }, [addRow])
-
-    const TextComponent = ({ className, children }: { className?: string, children: React.ReactNode }) => {
-        return <span className={cn("w-32 text-end font-medium text-sm font-numeric", className)}>{children}</span>
-    }
-
-    return <div className="flex flex-col gap-2 items-end">
-        <div className="flex gap-2 justify-between">
-            <TextComponent>{_("Total Debit")}</TextComponent>
-            <TextComponent>{formatCurrency(totalDebits, currency)}</TextComponent>
-        </div>
-        <div className="flex gap-2 justify-between">
-            <TextComponent>{_("Total Credit")}</TextComponent>
-            <TextComponent>{formatCurrency(totalCredits, currency)}</TextComponent>
-        </div>
-        {total !== 0 && <div className="flex gap-2 justify-between">
-            <TextComponent>{_("Difference")}</TextComponent>
-            <Tooltip>
-                <TooltipTrigger asChild>
-                    <Button type='button' variant='link' className="p-0 text-ink-red-3 underline h-fit" role='button' onClick={onAddRow}>
-                        <TextComponent className='text-ink-red-3'>{formatCurrency(total, currency)}</TextComponent>
-                    </Button>
-                </TooltipTrigger>
-                <TooltipContent>
-                    {_("Add a row with the difference amount")}
-                </TooltipContent>
-            </Tooltip>
-        </div>}
-
-    </div>
-
-}
-
-
-export default BankEntryModal

banking/src/components/features/BankReconciliation/BankPicker.tsx

@@ -1,134 +0,0 @@
-import { useAtom } from "jotai"
-import { SelectedBank, selectedBankAccountAtom } from "./bankRecAtoms"
-import { useCallback } from "react"
-import { useGetBankAccounts, useGetUnreconciledTransactions } from "./utils"
-import { cn } from "@/lib/utils"
-import { getTimeago } from "@/lib/date"
-import ErrorBanner from "@/components/ui/error-banner"
-import _ from "@/lib/translate"
-import { Badge } from "@/components/ui/badge"
-import { useTheme } from "@/components/ui/theme-provider"
-import BankLogo from "@/components/common/BankLogo"
-import { Empty, EmptyContent, EmptyDescription, EmptyHeader, EmptyMedia, EmptyTitle } from "@/components/ui/empty"
-import { LandmarkIcon } from "lucide-react"
-import { Button } from "@/components/ui/button"
-import { useCurrentCompany } from "@/hooks/useCurrentCompany"
-
-const BankPicker = ({ className }: { className?: string }) => {
-
-    const [selectedBank, setSelectedBank] = useAtom(selectedBankAccountAtom)
-
-    const onLoadingSuccess = useCallback((data?: SelectedBank[]) => {
-        // If the bank is already selected, then don't set it again
-        if (selectedBank) {
-            // Check if selected bank is in the data
-            if (data?.some((bank: SelectedBank) => bank.name === selectedBank.name)) {
-                return
-            }
-        }
-        if (!data) return
-        if (data.length === 1) {
-            setSelectedBank(data[0])
-        } else if (data.length > 1) {
-            const defaultBank = data.find((bank: SelectedBank) => bank.is_default)
-            if (defaultBank) {
-                setSelectedBank(defaultBank)
-            } else {
-                // Select the first available bank account
-                setSelectedBank(data[0])
-            }
-        }
-    }, [setSelectedBank, selectedBank])
-
-    const selectedCompany = useCurrentCompany()
-
-    const { banks, isLoading, error } = useGetBankAccounts(onLoadingSuccess)
-
-    const { themeValue } = useTheme()
-
-    if (isLoading) {
-        return null
-    }
-
-    if (error) {
-        return <ErrorBanner error={error} />
-    }
-
-    if (banks?.length === 0) {
-        return <Empty>
-            <EmptyMedia>
-                <LandmarkIcon />
-            </EmptyMedia>
-            <EmptyHeader>
-                <EmptyTitle>{_("No bank accounts found")}</EmptyTitle>
-                <EmptyDescription>{_("You have not added any bank accounts to your company.")}</EmptyDescription>
-            </EmptyHeader>
-            <EmptyContent>
-                <Button asChild>
-                    <a href={`/desk/bank-account?company=${encodeURIComponent(selectedCompany)}&is_company_account=1`}>
-                        {_("Configure Bank Accounts")}
-                    </a>
-                </Button>
-            </EmptyContent>
-        </Empty>
-    }
-    return (
-        <div
-            className={cn("flex gap-3 items-stretch w-full overflow-x-auto pe-4",
-                banks?.length > 4 ? 'pb-2' : '', className,
-            )}
-            style={{
-                scrollbarWidth: 'thin',
-                scrollbarColor: themeValue === 'Dark' ? 'var(--surface-gray-2) var(--surface-gray-1)' : 'rgb(209 213 219) rgb(243 244 246)',
-            }}
-        >
-            {
-                banks?.map((bank) => (
-                    <BankPickerItem key={bank.name} bank={bank} />
-                ))
-            }
-        </div>
-    )
-}
-
-const BankPickerItem = ({ bank }: { bank: SelectedBank }) => {
-
-    const [selectedBank, setSelectedBank] = useAtom(selectedBankAccountAtom)
-
-    const isSelected = selectedBank?.name === bank.name
-
-    const { mutate } = useGetUnreconciledTransactions()
-
-    const onSelect = () => {
-        setSelectedBank(bank)
-        mutate()
-    }
-
-    return <div
-        role="button"
-        title={`Select ${bank.account_name}`}
-        onClick={onSelect}
-        className={cn('rounded-md border border-outline-gray-1 max-w-60 min-w-60 p-2 overflow-hidden cursor-pointer',
-            isSelected ? 'border-outline-gray-5 bg-surface-gray-1' : 'hover:bg-surface-gray-1'
-        )}
-    >
-
-
-        <BankLogo bank={bank} className="mb-2" />
-
-        <div className="flex flex-col gap-1">
-            <div className="flex gap-2 items-center">
-                <span className={cn("text-sm font-medium line-clamp-1 text-ink-gray-8")}>{bank.account_name}</span>
-                {bank.account_type && <Badge variant='subtle' size='sm' theme='gray'>
-                    {bank.account_type?.slice(0, 24)}
-                </Badge>}
-            </div>
-
-            <span title={_("GL Account")} className={cn("text-ellipsis line-clamp-1 text-sm text-ink-gray-6")}>{bank.account}</span>
-            {bank.last_integration_date && <span className="text-xs text-ink-gray-5">{_("Last Synced Transaction")}: {getTimeago(bank.last_integration_date)}</span>}
-        </div>
-
-    </div >
-}
-
-export default BankPicker

banking/src/components/features/BankReconciliation/BankRecDateFilter.tsx

@@ -1,275 +0,0 @@
-import { useAtom } from 'jotai'
-import { bankRecDateAtom } from './bankRecAtoms'
-import { useMemo, useState } from 'react'
-import { AVAILABLE_TIME_PERIODS, formatDate, getDatesForTimePeriod, TimePeriod } from '@/lib/date'
-import { Button } from '@/components/ui/button'
-import { Popover, PopoverContent, PopoverTrigger } from '@/components/ui/popover'
-import { ChevronDownIcon, ChevronLeftIcon, ChevronRight } from 'lucide-react'
-import { Command, CommandEmpty, CommandInput, CommandItem, CommandList } from '@/components/ui/command'
-import { parse } from "chrono-node"
-import { Calendar } from '@/components/ui/calendar'
-import useFiscalYear from '@/hooks/useFiscalYear'
-import dayjs from 'dayjs'
-import _ from '@/lib/translate'
-import { useDirection } from '@/components/ui/direction'
-
-const BankRecDateFilter = () => {
-
-    const [bankRecDate, setBankRecDate] = useAtom(bankRecDateAtom)
-
-    const { data: fiscalYear } = useFiscalYear()
-
-    const timePeriodOptions = useMemo(() => {
-        const standardOptions = AVAILABLE_TIME_PERIODS.map((period) => {
-            const dates = getDatesForTimePeriod(period)
-            return {
-                label: period,
-                fromDate: dates.fromDate,
-                toDate: dates.toDate,
-                format: dates.format,
-                translatedLabel: dates.translatedLabel
-            }
-        })
-
-        if (fiscalYear?.message) {
-            // For a fiscal year, we need to replace "Last Year", "This Year", and add options for quarters
-            const fiscalYearStart = fiscalYear.message.year_start_date
-            const fiscalYearEnd = fiscalYear.message.year_end_date
-
-            const q1 = {
-                label: `Q1: ${fiscalYear.message.name}`,
-                translatedLabel: `${_("Q1")}: ${fiscalYear.message.name}`,
-                fromDate: fiscalYearStart,
-                toDate: dayjs(fiscalYearStart).add(3, 'month').format('YYYY-MM-DD'),
-                format: 'MMM YYYY'
-            }
-
-            const q2 = {
-                label: `Q2: ${fiscalYear.message.name}`,
-                translatedLabel: `${_("Q2")}: ${fiscalYear.message.name}`,
-                fromDate: dayjs(fiscalYearStart).add(3, 'month').format('YYYY-MM-DD'),
-                toDate: dayjs(fiscalYearStart).add(6, 'month').format('YYYY-MM-DD'),
-                format: 'MMM YYYY'
-            }
-
-            const q3 = {
-                label: `Q3: ${fiscalYear.message.name}`,
-                translatedLabel: `${_("Q3")}: ${fiscalYear.message.name}`,
-                fromDate: dayjs(fiscalYearStart).add(6, 'month').format('YYYY-MM-DD'),
-                toDate: dayjs(fiscalYearStart).add(9, 'month').format('YYYY-MM-DD'),
-                format: 'MMM YYYY'
-            }
-
-            const q4 = {
-                label: `Q4: ${fiscalYear.message.name}`,
-                translatedLabel: `${_("Q4")}: ${fiscalYear.message.name}`,
-                fromDate: dayjs(fiscalYearStart).add(9, 'month').format('YYYY-MM-DD'),
-                toDate: fiscalYearEnd,
-                format: 'MMM YYYY'
-            }
-
-            const thisYear = {
-                label: `This Fiscal Year`,
-                translatedLabel: `${_("This Fiscal Year")}`,
-                fromDate: fiscalYearStart,
-                toDate: fiscalYearEnd,
-                format: 'MMM YYYY'
-            }
-
-            const lastYear = {
-                label: `Last Fiscal Year`,
-                translatedLabel: `${_("Last Fiscal Year")}`,
-                fromDate: dayjs(fiscalYearStart).subtract(1, 'year').format('YYYY-MM-DD'),
-                toDate: dayjs(fiscalYearEnd).subtract(1, 'year').format('YYYY-MM-DD'),
-                format: 'MMM YYYY'
-            }
-            // Sort the options so that we get "This Month", "Last Month", quarters, fiscal year, then the rest of the standard options
-
-            const topRankedItems = standardOptions.filter((option) => {
-                return option.label === "This Month" || option.label === "Last Month"
-            })
-
-            const bottomRankedItems = standardOptions.filter((option) => {
-                return option.label !== "This Month" && option.label !== "Last Month"
-            })
-
-            return [...topRankedItems, q1, q2, q3, q4, thisYear, lastYear, ...bottomRankedItems]
-        }
-
-        return standardOptions
-    }, [fiscalYear])
-
-    const [open, setOpen] = useState(false)
-    const [value, setValue] = useState("")
-
-    const timePeriod: TimePeriod | string = useMemo(() => {
-        if (bankRecDate.fromDate && bankRecDate.toDate) {
-            // Check if the from and to dates match any predefined time period
-            for (const period of timePeriodOptions) {
-                if (period.fromDate === bankRecDate.fromDate && period.toDate === bankRecDate.toDate) {
-                    return period.label;
-                }
-            }
-            return "Date Range";
-        } else {
-            return "Date Range";
-        }
-    }, [bankRecDate.fromDate, bankRecDate.toDate, timePeriodOptions]);
-
-    const handleTimePeriodChange = (fromDate: string, toDate: string) => {
-        setBankRecDate({ fromDate, toDate })
-        setOpen(false)
-    }
-
-    const dateObj = useMemo(() => {
-        return {
-            from: new Date(bankRecDate.fromDate),
-            to: new Date(bankRecDate.toDate)
-        }
-    }, [bankRecDate.fromDate, bankRecDate.toDate])
-
-    const direction = useDirection()
-
-
-
-    return <div className='flex items-center'>
-        <Popover open={open} onOpenChange={setOpen}>
-            <PopoverTrigger asChild>
-                <Button
-                    variant={'outline'}
-                    aria-expanded={open}
-                    size='md'
-                    className='rounded-e-none border-e-0'
-                    role="combobox">
-                    {timePeriodOptions.find((period) => period.label === timePeriod)?.translatedLabel ?? _(timePeriod)}
-
-                    <ChevronDownIcon />
-                </Button>
-            </PopoverTrigger>
-
-            <PopoverContent className="w-84 p-1" align='start'>
-                <Command>
-
-                    <CommandInput placeholder="e.g. Last 3 weeks" onValueChange={setValue} value={value} />
-                    <CommandList className='max-h-fit'>
-                        <CommandEmpty className='text-start p-2 hover:bg-surface-gray-1'>
-                            <EmptyState onSelect={handleTimePeriodChange} value={value} />
-                        </CommandEmpty>
-                        {timePeriodOptions.map((period) => (
-                            <CommandItem key={period.label} className='flex justify-between' onSelect={() => handleTimePeriodChange(period.fromDate, period.toDate)}>
-                                <span>
-                                    {period.translatedLabel ?? _(period.label)}
-                                </span>
-                                <span className='text-xs text-ink-gray-5 flex items-center gap-1 text-end whitespace-nowrap'>
-                                    {formatDate(period.fromDate, period.format)} {direction === 'ltr' ? <ChevronRight className='text-[12px] text-ink-gray-5/70' /> : <ChevronLeftIcon className='text-[12px] text-ink-gray-5/70' />} {formatDate(period.toDate, period.format)}
-                                </span>
-                            </CommandItem>
-                        ))}
-                    </CommandList>
-                </Command>
-
-            </PopoverContent>
-        </Popover>
-
-        <Popover>
-            <PopoverTrigger asChild>
-                <Button variant={'outline'} className='rounded-s-none' size='md'>
-                    {formatDate(bankRecDate.fromDate)} - {formatDate(bankRecDate.toDate)}
-                </Button>
-            </PopoverTrigger>
-            <PopoverContent className='w-auto overflow-hidden p-0' align='end'>
-                <Calendar
-                    mode='range'
-                    captionLayout='dropdown'
-                    selected={{
-                        from: dateObj.from,
-                        to: dateObj.to
-                    }}
-                    numberOfMonths={2}
-                    defaultMonth={dateObj.from}
-                    onSelect={(date) => {
-                        if (date) {
-                            setBankRecDate({ fromDate: formatDate(date.from, 'YYYY-MM-DD'), toDate: formatDate(date.to, 'YYYY-MM-DD') })
-                        }
-                    }}
-                />
-            </PopoverContent>
-        </Popover>
-    </div>
-}
-
-const referentialKeywords = ["last", "this", "next", "previous"]
-const EmptyState = ({ onSelect, value }: { onSelect: (fromDate: string, toDate: string) => void, value: string }) => {
-
-    const dates = useMemo(() => {
-        if (value) {
-            // Try parsing the value
-            const parsedDate = parse(value, undefined, { forwardDate: false })
-
-            if (parsedDate && parsedDate.length > 0) {
-                const startDate = parsedDate[0].start.date()
-                const endDate = parsedDate[0].end?.date()
-
-                if (!endDate) {
-                    const today = new Date()
-                    // If today is greater than the start date, use today as the end date
-                    if (startDate.getTime() > today.getTime()) {
-                        return { fromDate: today, toDate: startDate }
-                    } else {
-                        // Check if the user only wants a specific month like "May 2025"
-                        // If the "known values" just has month and year, then we need to get the first day of the month and the last day of the month
-                        // @ts-expect-error - "Known Values" is available in the start "ParsingComponents"
-                        if (parsedDate[0].start.knownValues?.month && !parsedDate[0].start.knownValues?.day) {
-                            return {
-                                fromDate: startDate,
-                                toDate: dayjs(startDate).endOf('month').toDate()
-                            }
-                            // @ts-expect-error - "Known Values" is available in the start "ParsingComponents"
-                        } else if (parsedDate[0].start.knownValues?.month && parsedDate[0].start.knownValues?.day && !referentialKeywords.some(keyword => value.toLowerCase().includes(keyword))) {
-                            // If month and day is known, then we should not assume that the user wants to get everything until today
-                            return {
-                                fromDate: startDate,
-                                toDate: startDate,
-                            }
-                        }
-
-                        return {
-                            fromDate: startDate,
-                            toDate: today
-                        }
-                    }
-                } else {
-                    return { fromDate: startDate, toDate: endDate }
-                }
-            }
-
-        }
-    }, [value])
-
-    const onClick = (fromDate: Date, toDate: Date) => {
-        onSelect(formatDate(fromDate, 'YYYY-MM-DD'), formatDate(toDate, 'YYYY-MM-DD'))
-    }
-
-    const isEqual = dates?.fromDate && dates?.toDate && dayjs(dates.fromDate).isSame(dates.toDate, 'date')
-
-    return <div>
-        {dates ?
-            <div className='flex gap-2 items-center justify-between cursor-pointer' onClick={() => onClick(dates.fromDate, dates.toDate)}>
-                <span className='text-sm text-ink-gray-5 max-w-[30%]'>
-                    {value}
-                </span>
-                {isEqual ? <span className='text-xs text-ink-gray-5 text-balance flex items-center gap-1'>
-                    {formatDate(dates.fromDate, 'Do MMM YYYY')}
-                </span> :
-                    <span className='text-xs text-ink-gray-5 flex items-center gap-1'>
-                        {formatDate(dates.fromDate, 'Do MMM YY')} <ChevronRight size='16' className='text-ink-gray-5' /> {formatDate(dates.toDate, 'Do MMM YY')}
-                    </span>}
-            </div> :
-            <span className='text-sm text-ink-gray-5'>
-                No results found
-            </span>
-        }
-    </div>
-}
-
-export default BankRecDateFilter

banking/src/components/features/BankReconciliation/BankReconciliationStatement.tsx

@@ -1,315 +0,0 @@
-import { useAtomValue } from "jotai"
-import { MissingFiltersBanner } from "./MissingFiltersBanner"
-import { bankRecDateAtom, selectedBankAccountAtom } from "./bankRecAtoms"
-import { useCurrentCompany } from "@/hooks/useCurrentCompany"
-import { Paragraph } from "@/components/ui/typography"
-import { useCallback, useMemo } from "react"
-import type { ColumnDef } from "@tanstack/react-table"
-import { useFrappeGetCall } from "frappe-react-sdk"
-import { QueryReportReturnType } from "@/types/custom/Reports"
-import { formatDate } from "@/lib/date"
-import { ListView, type ListViewColumnMeta } from "@/components/ui/list-view"
-import { formatCurrency } from "@/lib/numbers"
-import { getCompanyCurrency } from "@/lib/company"
-import { slug } from "@/lib/frappe"
-import { ScrollTextIcon } from "lucide-react"
-import ErrorBanner from "@/components/ui/error-banner"
-import { StatContainer, StatLabel, StatValue } from "@/components/ui/stats"
-import _ from "@/lib/translate"
-import { toast } from "sonner"
-import { useCopyToClipboard } from "usehooks-ts"
-import { Empty, EmptyDescription, EmptyHeader, EmptyMedia, EmptyTitle } from "@/components/ui/empty"
-
-const BankReconciliationStatement = () => {
-    const bankAccount = useAtomValue(selectedBankAccountAtom)
-    const dates = useAtomValue(bankRecDateAtom)
-
-    if (!bankAccount) {
-        return <MissingFiltersBanner text={_("Please select a bank account to view the bank reconciliation statement.")} />
-    }
-
-    if (!dates) {
-        return <MissingFiltersBanner text={_("Please select dates to view the bank reconciliation statement.")} />
-    }
-
-    return <BankReconciliationStatementView />
-}
-interface BankClearanceSummaryEntry {
-    payment_document: string
-    payment_entry: string
-    posting_date: string,
-    reference_no: string,
-    credit: number,
-    debit: number,
-    against_account: string,
-    ref_date: string,
-    account_currency: string,
-    clearance_date: string
-}
-
-const BankReconciliationStatementView = () => {
-
-    const companyID = useCurrentCompany()
-    const bankAccount = useAtomValue(selectedBankAccountAtom)
-    const dates = useAtomValue(bankRecDateAtom)
-
-    const filters = useMemo(() => {
-        return JSON.stringify({
-            account: bankAccount?.account,
-            report_date: dates.toDate,
-            company: companyID
-        })
-    }, [bankAccount, dates, companyID])
-
-    const { data, error } = useFrappeGetCall<{ message: QueryReportReturnType }>('frappe.desk.query_report.run', {
-        report_name: 'Bank Reconciliation Statement',
-        filters,
-        ignore_prepared_report: 1,
-        are_default_filters: false,
-    }, `Report-Bank Reconciliation Statement-${filters}`, { keepPreviousData: true, revalidateOnFocus: false }, 'POST')
-
-    const [, copyToClipboard] = useCopyToClipboard()
-
-    const onCopy = useCallback(
-        (text: string) => {
-            copyToClipboard(text).then(() => {
-                toast.success(_("Copied to clipboard"))
-            })
-        },
-        [copyToClipboard, _],
-    )
-
-    const statementColumns = useMemo<ColumnDef<BankClearanceSummaryEntry, unknown>[]>(
-        () => [
-            {
-                accessorKey: "posting_date",
-                header: _("Posting Date"),
-                size: 118,
-                meta: { tabularNums: true } satisfies ListViewColumnMeta,
-                cell: ({ row }) => formatDate(row.original.posting_date),
-            },
-            {
-                accessorKey: "payment_document",
-                header: _("Document Type"),
-                size: 140,
-                cell: ({ row }) => _(row.original.payment_document),
-            },
-            {
-                id: "payment_entry",
-                header: _("Payment Document"),
-                size: 300,
-                meta: {
-                    getTooltipText: (r) => {
-                        const x = r as BankClearanceSummaryEntry
-                        const parts = [x.payment_document, x.payment_entry].filter(Boolean)
-                        return parts.length ? parts.join(" · ") : undefined
-                    },
-                } satisfies ListViewColumnMeta,
-                cell: ({ row }) => {
-                    const { payment_document, payment_entry } = row.original
-                    return payment_document ? (
-                        <a
-                            target="_blank"
-                            rel="noreferrer"
-                            className="text-ink-gray-8 block min-w-0 w-full underline underline-offset-4"
-                            href={`/desk/${slug(payment_document)}/${payment_entry}`}
-                        >
-                            {payment_entry}
-                        </a>
-                    ) : (
-                        payment_entry
-                    )
-                },
-            },
-            {
-                accessorKey: "debit",
-                header: _("Debit"),
-                size: 112,
-                meta: { align: "right" } satisfies ListViewColumnMeta,
-                cell: ({ row }) => <span className="font-numeric">{formatCurrency(row.original.debit, row.original.account_currency)}</span>,
-            },
-            {
-                accessorKey: "credit",
-                header: _("Credit"),
-                size: 112,
-                meta: { align: "right" } satisfies ListViewColumnMeta,
-                cell: ({ row }) => <span className="font-numeric">{formatCurrency(row.original.credit, row.original.account_currency)}</span>,
-            },
-            {
-                accessorKey: "against_account",
-                header: _("Against Account"),
-                meta: { gridWidth: "minmax(0,1.25fr)" } satisfies ListViewColumnMeta,
-                cell: ({ row }) => (
-                    <a
-                        target="_blank"
-                        rel="noreferrer"
-                        className="text-ink-gray-8 block min-w-0 w-full underline underline-offset-4"
-                        href={`/desk/account/${row.original.against_account}`}
-                    >
-                        {row.original.against_account}
-                    </a>
-                ),
-            },
-            {
-                accessorKey: "reference_no",
-                header: _("Reference #"),
-                cell: ({ row }) => {
-                    const ref = row.original.reference_no
-                    return (
-                        <button
-                            type="button"
-                            className="text-ink-gray-8 hover:underline min-w-0 w-full cursor-pointer truncate text-start underline-offset-4"
-                            onClick={() => onCopy(ref)}
-                        >
-                            {ref}
-                        </button>
-                    )
-                },
-            },
-            {
-                accessorKey: "ref_date",
-                header: _("Reference Date"),
-                size: 118,
-                meta: { tabularNums: true } satisfies ListViewColumnMeta,
-                cell: ({ row }) => formatDate(row.original.ref_date),
-            },
-            {
-                accessorKey: "clearance_date",
-                header: _("Clearance Date"),
-                size: 118,
-                meta: { tabularNums: true } satisfies ListViewColumnMeta,
-                cell: ({ row }) => formatDate(row.original.clearance_date),
-            },
-        ],
-        [_, onCopy],
-    )
-
-    const statementRows = useMemo(() => {
-        if (!data?.message.result) return []
-        return data.message.result.filter((row: BankClearanceSummaryEntry) => Boolean(row.payment_entry))
-    }, [data])
-
-    return <div className="space-y-4 py-2">
-
-        <div>
-            <Paragraph className="text-sm">
-                <span dangerouslySetInnerHTML={{
-                    __html: _("Below is a list of all entries posted against the bank account {0} which have not been cleared till {1}.", [`<strong>${bankAccount?.account}</strong>`, `<strong>${formatDate(dates.toDate)}</strong>`])
-                }} />
-            </Paragraph>
-        </div>
-
-        {error && <ErrorBanner error={error} />}
-
-        {data && <SummarySection data={data} />}
-
-        {data && data.message.result.length > 0 && (
-            <div className="space-y-2">
-                <p className="text-ink-gray-5 text-sm">{_("Bank Reconciliation Statement")}</p>
-                <ListView
-                    data={statementRows}
-                    columns={statementColumns}
-                    getRowId={(row) => row.payment_entry}
-                    maxHeight="min(70vh, 640px)"
-                    emptyState={_("No entries with a payment document in this list.")}
-                />
-            </div>
-        )}
-
-        {data && data.message.result.length === 0 &&
-            <Empty>
-                <EmptyMedia>
-                    <ScrollTextIcon />
-                </EmptyMedia>
-                <EmptyHeader>
-                    <EmptyTitle>{_("No entries found")}</EmptyTitle>
-                    <EmptyDescription>{_("There are no accounting entries in the system for the selected account and dates.")}</EmptyDescription>
-                </EmptyHeader>
-            </Empty>
-        }
-
-
-    </div>
-}
-
-const SummarySection = ({ data }: { data: { message: QueryReportReturnType } }) => {
-
-    const company = useCurrentCompany()
-    const bankAccount = useAtomValue(selectedBankAccountAtom)
-
-    const { bankStatementBalanceAsPerGL, outstandingChecksDebit, outstandingChecksCredit, incorrectlyClearedEntriesDebit, incorrectlyClearedEntriesCredit, calculatedBankStatementBalance } = useMemo(() => {
-
-        // Loop over the results and find the corresponding rows
-
-        let bankStatementBalanceAsPerGL = 0
-
-        let outstandingChecksDebit = 0
-        let outstandingChecksCredit = 0
-
-        let incorrectlyClearedEntriesDebit = 0
-        let incorrectlyClearedEntriesCredit = 0
-
-        let calculatedBankStatementBalance = 0
-
-        // eslint-disable-next-line @typescript-eslint/no-explicit-any
-        data?.message.result.forEach((r: any) => {
-            if (r.payment_entry === 'Bank Statement balance as per General Ledger') {
-                bankStatementBalanceAsPerGL = r.debit - r.credit
-            }
-
-            if (r.payment_entry === 'Outstanding Checks and Deposits to clear') {
-                outstandingChecksDebit = r.debit
-                outstandingChecksCredit = r.credit
-            }
-
-            if (r.payment_entry === 'Checks and Deposits incorrectly cleared') {
-                incorrectlyClearedEntriesDebit = r.debit
-                incorrectlyClearedEntriesCredit = r.credit
-            }
-
-            if (r.payment_entry === 'Calculated Bank Statement balance') {
-                calculatedBankStatementBalance = r.debit - r.credit
-            }
-        })
-
-        return {
-            bankStatementBalanceAsPerGL,
-            outstandingChecksDebit,
-            outstandingChecksCredit,
-            incorrectlyClearedEntriesDebit,
-            incorrectlyClearedEntriesCredit,
-            calculatedBankStatementBalance
-        }
-
-    }, [data])
-
-    const currency = bankAccount?.account_currency ?? getCompanyCurrency(company)
-
-    return <div className="flex gap-4 items-start justify-between">
-        <StatContainer>
-            <StatLabel>{_("Bank Statement Balance as per General Ledger")}</StatLabel>
-            <StatValue className="font-numeric">{formatCurrency(bankStatementBalanceAsPerGL, currency)}</StatValue>
-        </StatContainer>
-
-        <StatContainer>
-            <StatLabel>{_("Outstanding Checks and Deposits to clear")}</StatLabel>
-            <StatValue className="font-numeric">{formatCurrency(outstandingChecksDebit - outstandingChecksCredit, currency)}</StatValue>
-        </StatContainer>
-
-        {(incorrectlyClearedEntriesDebit > 0 || incorrectlyClearedEntriesCredit > 0) && <StatContainer>
-            <StatLabel className="text-ink-red-3">{_("Checks and Deposits incorrectly cleared")}</StatLabel>
-            <StatValue className="text-ink-red-3 font-numeric">{formatCurrency(incorrectlyClearedEntriesDebit - incorrectlyClearedEntriesCredit)}</StatValue>
-            {/* <div className="" divider={<StackDivider height='20px' />}>
-                {incorrectlyClearedEntriesDebit !== 0 && <StatHelpText>Debit: {formatCurrency(incorrectlyClearedEntriesDebit)}</StatHelpText>}
-                {incorrectlyClearedEntriesCredit !== 0 && <StatHelpText>Credit: {formatCurrency(incorrectlyClearedEntriesCredit)}</StatHelpText>}
-            </div> */}
-        </StatContainer>}
-        <StatContainer>
-            <StatLabel>{_("Calculated Bank Statement Balance")}</StatLabel>
-            <StatValue className="font-numeric">{formatCurrency(calculatedBankStatementBalance)}</StatValue>
-        </StatContainer>
-
-    </div>
-}
-
-export default BankReconciliationStatement

banking/src/components/features/BankReconciliation/BankTransactionList.tsx

@@ -1,422 +0,0 @@
-import { useAtomValue, useSetAtom } from "jotai"
-import { MissingFiltersBanner } from "./MissingFiltersBanner"
-import { bankRecDateAtom, bankRecUnreconcileModalAtom, selectedBankAccountAtom } from "./bankRecAtoms"
-import { Paragraph } from "@/components/ui/typography"
-import { formatDate } from "@/lib/date"
-import { ListView, type ListViewColumnMeta } from "@/components/ui/list-view"
-import { formatCurrency, getCurrencyFormatInfo } from "@/lib/numbers"
-import { getCompanyCurrency } from "@/lib/company"
-import { ArrowDownRight, ArrowUpRight, CheckCircle2, ChevronDown, DollarSign, ExternalLink, ImportIcon, ListIcon, Search, Undo2, XCircle } from "lucide-react"
-import ErrorBanner from "@/components/ui/error-banner"
-import { Badge } from "@/components/ui/badge"
-import { useGetBankTransactions } from "./utils"
-import { BankTransaction } from "@/types/Accounts/BankTransaction"
-import { Button } from "@/components/ui/button"
-import _ from "@/lib/translate"
-import { Input } from "@/components/ui/input"
-import CurrencyInput from "react-currency-input-field"
-import { DropdownMenu, DropdownMenuContent, DropdownMenuItem, DropdownMenuTrigger } from "@/components/ui/dropdown-menu"
-import { getCurrencySymbol } from "@/lib/currency"
-import { useDebounceValue } from "usehooks-ts"
-import type { ColumnDef } from "@tanstack/react-table"
-import { useCallback, useMemo, useState } from "react"
-import { Link } from "react-router"
-import { Empty, EmptyTitle, EmptyHeader, EmptyMedia, EmptyDescription, EmptyContent } from "@/components/ui/empty"
-import { InputGroup, InputGroupAddon } from "@/components/ui/input-group"
-
-const BankTransactions = () => {
-    const selectedBank = useAtomValue(selectedBankAccountAtom)
-    const dates = useAtomValue(bankRecDateAtom)
-
-    if (!selectedBank || !dates) {
-        return <MissingFiltersBanner text={_("Please select a bank and set the date range")} />
-    }
-
-    return <>
-        <BankTransactionListView />
-    </>
-}
-
-const BankTransactionListView = () => {
-
-    const { data, error } = useGetBankTransactions()
-
-    const bankAccount = useAtomValue(selectedBankAccountAtom)
-    const dates = useAtomValue(bankRecDateAtom)
-
-    const formattedFromDate = formatDate(dates.fromDate)
-    const formattedToDate = formatDate(dates.toDate)
-
-    const setBankRecUnreconcileModalAtom = useSetAtom(bankRecUnreconcileModalAtom)
-
-    const onUndo = useCallback(
-        (transaction: BankTransaction) => {
-            setBankRecUnreconcileModalAtom(transaction.name)
-        },
-        [setBankRecUnreconcileModalAtom],
-    )
-
-    const accountCurrency = useMemo(
-        () => bankAccount?.account_currency ?? getCompanyCurrency(bankAccount?.company ?? ""),
-        [bankAccount?.account_currency, bankAccount?.company],
-    )
-
-    const transactionColumns = useMemo<ColumnDef<BankTransaction, unknown>[]>(
-        () => [
-            {
-                accessorKey: "date",
-                header: _("Date"),
-                size: 112,
-                meta: { tabularNums: true } satisfies ListViewColumnMeta,
-                cell: ({ row }) => formatDate(row.original.date),
-            },
-            {
-                accessorKey: "description",
-                header: _("Description"),
-                size: 250,
-                // meta: { gridWidth: "minmax(0,2fr)" } satisfies ListViewColumnMeta,
-                cell: ({ row }) => row.original.description,
-            },
-            {
-                accessorKey: "reference_number",
-                header: _("Reference #"),
-                size: 128,
-                cell: ({ row }) => row.original.reference_number,
-            },
-            {
-                accessorKey: "withdrawal",
-                header: _("Withdrawal"),
-                size: 120,
-                meta: { align: "right" } satisfies ListViewColumnMeta,
-                cell: ({ row }) => <span className="font-numeric">{formatCurrency(row.original.withdrawal, accountCurrency)}</span>,
-            },
-            {
-                accessorKey: "deposit",
-                header: _("Deposit"),
-                size: 120,
-                meta: { align: "right" } satisfies ListViewColumnMeta,
-                cell: ({ row }) => <span className="font-numeric">{formatCurrency(row.original.deposit, accountCurrency)}</span>,
-            },
-            {
-                accessorKey: "unallocated_amount",
-                header: _("Unallocated"),
-                size: 120,
-                meta: { align: "right" } satisfies ListViewColumnMeta,
-                cell: ({ row }) => <span className="font-numeric">{formatCurrency(row.original.unallocated_amount, accountCurrency)}</span>,
-            },
-            {
-                accessorKey: "transaction_type",
-                header: _("Type"),
-                size: 112,
-                cell: ({ row }) =>
-                    row.original.transaction_type ? <Badge>{row.original.transaction_type}</Badge> : null,
-            },
-            {
-                id: "status",
-                header: _("Status"),
-                size: 168,
-                meta: { truncate: false, truncateTooltip: false } satisfies ListViewColumnMeta,
-                cell: ({ row }) => {
-                    const tx = row.original
-                    if (!tx.allocated_amount || (tx.allocated_amount && tx.allocated_amount === 0)) {
-                        return (
-                            <Badge theme="red">
-                                <XCircle />
-                                {_("Not Reconciled")}
-                            </Badge>
-                        )
-                    }
-                    if (tx.allocated_amount && tx.allocated_amount > 0 && tx.unallocated_amount !== 0) {
-                        return (
-                            <Badge theme="orange">
-                                <CheckCircle2 />
-                                {_("Partially Reconciled")}
-                            </Badge>
-                        )
-                    }
-                    return (
-                        <Badge theme="green">
-                            <CheckCircle2 />
-                            {_("Reconciled")}
-                        </Badge>
-                    )
-                },
-            },
-            {
-                id: "actions",
-                header: _("Actions"),
-                size: 200,
-                enableResizing: false,
-                meta: { truncate: false, truncateTooltip: false } satisfies ListViewColumnMeta,
-                cell: ({ row }) => (
-                    <div className="flex gap-2 ps-0.5 items-center">
-                        <Button variant="ghost" asChild size='sm'>
-                            <a
-                                href={`/desk/bank-transaction/${row.original.name}`}
-                                target="_blank"
-
-                                rel="noreferrer"
-                            // className="text-ink-gray-8 underline underline-offset-4 inline-flex gap-2"
-                            >
-                                {_("View")} <ExternalLink className="w-4 h-4" />
-                            </a>
-                        </Button>
-                        {row.original.allocated_amount && row.original.allocated_amount > 0 ? (
-                            <Button
-                                variant="ghost"
-                                onClick={() => onUndo(row.original)}
-                                size="sm"
-                                theme='red'
-                            >
-                                <Undo2 />
-                                {_("Undo")}
-                            </Button>
-                        ) : null}
-                    </div>
-                ),
-            },
-        ],
-        [_, accountCurrency, onUndo],
-    )
-
-    const [search, setSearch] = useDebounceValue('', 250)
-    const [amountFilter, setAmountFilter] = useState<{ value: number, stringValue?: string | number }>({ value: 0, stringValue: '0.00' })
-    const [typeFilter, setTypeFilter] = useState('All')
-    const [status, setStatus] = useState<'Reconciled' | 'Unreconciled' | 'All' | 'Partially Reconciled'>('All')
-
-    const onSearchChange = (e: React.ChangeEvent<HTMLInputElement>) => {
-        setSearch(e.target.value)
-    }
-
-    const filteredResults = useMemo(() => {
-        if (!data) {
-            return []
-        }
-
-        return data.message.filter((transaction) => {
-
-            if (search && !transaction.description?.toLowerCase().includes(search.toLowerCase())) {
-                return false
-            }
-
-            if (typeFilter !== 'All') {
-                if (typeFilter === 'Debits' && transaction.deposit && transaction.deposit > 0) {
-                    return false
-                }
-                if (typeFilter === 'Credits' && transaction.withdrawal && transaction.withdrawal > 0) {
-                    return false
-                }
-            }
-
-            if (status !== 'All') {
-                if (status === 'Reconciled' && transaction.status !== 'Reconciled') {
-                    return false
-                }
-                if (status === 'Unreconciled') {
-                    if (transaction.status === 'Reconciled') {
-                        return false
-                    }
-                    // Filter out partially reconciled transactions
-                    if (transaction.allocated_amount && transaction.allocated_amount > 0 && transaction.unallocated_amount !== 0) {
-                        return false
-                    }
-                }
-                if (status === 'Partially Reconciled') {
-
-                    if (transaction.status === 'Reconciled') {
-                        return false
-                    }
-                    if ((transaction.allocated_amount ?? 0) === 0) {
-                        return false
-                    }
-                }
-
-            }
-
-            if (amountFilter.value > 0 && transaction.withdrawal !== amountFilter.value && transaction.deposit !== amountFilter.value) {
-                return false
-            }
-
-            return true
-        })
-
-
-    }, [data, search, amountFilter, typeFilter, status])
-
-    return <div className="space-y-2 py-2">
-
-        <div className="flex gap-2 justify-between items-center">
-            <Paragraph className="text-sm">
-                <span dangerouslySetInnerHTML={{
-                    __html: _("Below is a list of all bank transactions imported in the system for the bank account {0} between {1} and {2}.", [`<strong>${bankAccount?.account_name}</strong>`, `<strong>${formattedFromDate}</strong>`, `<strong>${formattedToDate}</strong>`])
-                }} />
-            </Paragraph>
-
-            <Button size='md' variant='subtle' asChild>
-                <Link to="/statement-importer">
-                    <ImportIcon />
-                    {_("Import Bank Statement")}
-                </Link>
-            </Button>
-        </div>
-
-        {error && <ErrorBanner error={error} />}
-
-        <Filters
-            onSearchChange={onSearchChange}
-            search={search}
-            results={filteredResults}
-            setAmountFilter={setAmountFilter}
-            amountFilter={amountFilter}
-            onTypeFilterChange={setTypeFilter}
-            typeFilter={typeFilter}
-            status={status}
-            setStatus={setStatus}
-        />
-
-        <ListView
-            data={filteredResults}
-            columns={transactionColumns}
-            getRowId={(row) => row.name}
-            maxHeight="calc(100vh - 200px)"
-            scrollAreaClassName="min-h-[calc(100vh-200px)]"
-            emptyState={<Empty>
-                <EmptyMedia>
-                    <ListIcon />
-                </EmptyMedia>
-                <EmptyHeader>
-                    <EmptyTitle>{_("No bank transactions found")}</EmptyTitle>
-                    <EmptyDescription>{_("There are no transactions in the system for the selected bank account and dates that match the filters.")}</EmptyDescription>
-                </EmptyHeader>
-                {data && data.message.length === 0 ? <EmptyContent>
-                    <Button type='button' asChild variant='outline'>
-                        <Link to="/statement-importer">
-                            {_("Import Bank Statement")}
-                        </Link>
-                    </Button>
-                </EmptyContent> : null}
-            </Empty>}
-        />
-    </div>
-}
-
-interface FilterProps {
-    onSearchChange: (e: React.ChangeEvent<HTMLInputElement>) => void
-    search: string
-    results: BankTransaction[]
-    setAmountFilter: (value: { value: number, stringValue?: string | number }) => void
-    amountFilter: { value: number, stringValue?: string | number }
-    onTypeFilterChange: (type: string) => void
-    typeFilter: string
-    status: 'Reconciled' | 'Unreconciled' | 'All' | 'Partially Reconciled'
-    setStatus: (status: 'Reconciled' | 'Unreconciled' | 'All' | 'Partially Reconciled') => void
-}
-
-
-const Filters = ({
-    onSearchChange,
-    search,
-    results,
-    setAmountFilter,
-    amountFilter,
-    onTypeFilterChange,
-    typeFilter,
-    status,
-    setStatus,
-
-}: FilterProps) => {
-    const bankAccount = useAtomValue(selectedBankAccountAtom)
-
-    const currency = bankAccount?.account_currency ?? getCompanyCurrency(bankAccount?.company ?? '')
-    const currencySymbol = getCurrencySymbol(currency)
-    const formatInfo = getCurrencyFormatInfo(currency)
-    const groupSeparator = formatInfo.group_sep || ","
-    const decimalSeparator = formatInfo.decimal_str || "."
-
-    return <div className="flex py-2 w-full gap-2">
-        <InputGroup variant='outline'>
-            <label className="sr-only">{_("Search transactions")}</label>
-            <InputGroupAddon>
-                <Search className="w-4 h-4 text-ink-gray-5" />
-            </InputGroupAddon>
-            <Input
-                placeholder={_("Search")} type='search' onChange={onSearchChange} variant='outline' defaultValue={search}
-                className="border-none px-0 shadow-none focus-visible:ring-0 focus-visible:ring-offset-0" />
-            <InputGroupAddon align='inline-end'>
-                <span className="text-sm text-ink-gray-5 text-nowrap whitespace-nowrap">{results?.length} {_(results?.length === 1 ? "result" : "results")}</span>
-            </InputGroupAddon>
-        </InputGroup>
-
-        <div className="w-[25%]">
-            <label className="sr-only">{_("Filter by amount")}</label>
-            <CurrencyInput
-                groupSeparator={groupSeparator}
-                decimalSeparator={decimalSeparator}
-                placeholder={`${currencySymbol}0${decimalSeparator}00`}
-                decimalsLimit={2}
-                value={amountFilter.stringValue}
-                maxLength={12}
-                decimalScale={2}
-                prefix={currencySymbol}
-                onValueChange={(v, _n, values) => {
-                    // If the input ends with a decimal or a decimal with trailing zeroes, store the string since we need the user to be able to type the decimals.
-                    // When the user eventually types the decimals or blurs out, the value is formatted anyway.
-                    // Otherwise store the float value
-                    // Check if the value ends with a decimal or a decimal with trailing zeroes
-                    const isDecimal = v?.endsWith(decimalSeparator) || v?.endsWith(decimalSeparator + '0')
-                    const newValue = isDecimal ? v : values?.float ?? ''
-                    setAmountFilter({
-                        value: Number(newValue),
-                        stringValue: newValue
-                    })
-                }}
-                // @ts-expect-error - CurrencyInputProps doesn't have a variant prop but Input does
-                variant={"outline"}
-                customInput={Input}
-            />
-        </div>
-        <div className="w-[25%]">
-            <DropdownMenu>
-                <DropdownMenuTrigger asChild>
-                    <Button variant="outline" size='md' className="min-w-32 w-full text-start justify-between">
-                        <div className="flex gap-2 items-center">
-                            {typeFilter === 'All' ? <DollarSign className="w-4 h-4 text-ink-gray-5" /> : typeFilter === 'Debits' ? <ArrowUpRight className="w-4 h-4 text-ink-red-3" /> : <ArrowDownRight className="w-4 h-4 text-ink-green-3" />}
-                            {_(typeFilter)}
-                        </div>
-                        <ChevronDown className="w-4 h-4" />
-                    </Button>
-                </DropdownMenuTrigger>
-                <DropdownMenuContent>
-                    <DropdownMenuItem onClick={() => onTypeFilterChange('All')}><DollarSign /> {_("All")}</DropdownMenuItem>
-                    <DropdownMenuItem onClick={() => onTypeFilterChange('Debits')}><ArrowUpRight className="text-ink-red-3" /> {_("Debits")}</DropdownMenuItem>
-                    <DropdownMenuItem onClick={() => onTypeFilterChange('Credits')}><ArrowDownRight className="text-ink-green-3" /> {_("Credits")}</DropdownMenuItem>
-                </DropdownMenuContent>
-            </DropdownMenu>
-        </div>
-        <div className="w-[25%]">
-            <DropdownMenu>
-                <DropdownMenuTrigger asChild>
-                    <Button variant="outline" size='md' className="min-w-32 w-full text-start justify-between">
-                        <div className="flex gap-2 items-center">
-                            {status === 'All' ? <ListIcon className="w-4 h-4 text-ink-gray-5" /> :
-                                status === 'Reconciled' ? <CheckCircle2 className="w-4 h-4 text-ink-green-3" /> :
-                                    status === 'Unreconciled' ? <XCircle className="w-4 h-4 text-ink-red-3" /> :
-                                        <CheckCircle2 className="w-4 h-4 text-yellow-500" />}
-                            {_(status)}
-                        </div>
-
-                        <ChevronDown className="w-4 h-4" />
-                    </Button>
-                </DropdownMenuTrigger>
-                <DropdownMenuContent>
-                    <DropdownMenuItem onClick={() => setStatus('All')}>{<ListIcon className="w-4 h-4 text-ink-gray-5" />} {_("All")}</DropdownMenuItem>
-                    <DropdownMenuItem onClick={() => setStatus('Reconciled')}>{<CheckCircle2 className="w-4 h-4 text-ink-green-3" />} {_("Reconciled")}</DropdownMenuItem>
-                    <DropdownMenuItem onClick={() => setStatus('Unreconciled')}>{<XCircle className="w-4 h-4 text-ink-red-3" />} {_("Unreconciled")}</DropdownMenuItem>
-                    <DropdownMenuItem onClick={() => setStatus('Partially Reconciled')}>{<CheckCircle2 className="w-4 h-4 text-yellow-500" />} {_("Partially Reconciled")}</DropdownMenuItem>
-                </DropdownMenuContent>
-            </DropdownMenu>
-        </div>
-    </div>
-}
-
-export default BankTransactions

banking/src/components/features/BankReconciliation/BankTransactionUnreconcileModal.tsx

@@ -1,125 +0,0 @@
-import { AlertDialog, AlertDialogOverlay, AlertDialogContent, AlertDialogHeader, AlertDialogTitle, AlertDialogDescription, AlertDialogFooter, AlertDialogCancel, AlertDialogAction } from "@/components/ui/alert-dialog"
-import { useAtom, useAtomValue } from "jotai"
-import { bankRecDateAtom, bankRecUnreconcileModalAtom, selectedBankAccountAtom } from "./bankRecAtoms"
-import { useMemo } from "react"
-import { useFrappeGetDoc, useFrappePostCall, useSWRConfig } from "frappe-react-sdk"
-import { BankTransaction } from "@/types/Accounts/BankTransaction"
-import { toast } from "sonner"
-import ErrorBanner from "@/components/ui/error-banner"
-import { Table, TableBody, TableCell, TableHead, TableHeader, TableRow } from "@/components/ui/table"
-import { formatCurrency } from "@/lib/numbers"
-import { Badge } from "@/components/ui/badge"
-import { slug } from "@/lib/frappe"
-import SelectedTransactionDetails from "./SelectedTransactionDetails"
-import _ from "@/lib/translate"
-
-const BankTransactionUnreconcileModal = () => {
-
-    const [unreconcileModal, setBankRecUnreconcileModal] = useAtom(bankRecUnreconcileModalAtom)
-
-    const onOpenChange = (v: boolean) => {
-        if (!v) {
-            setBankRecUnreconcileModal('')
-        }
-    }
-
-    return <AlertDialog open={!!unreconcileModal} onOpenChange={onOpenChange}>
-        <AlertDialogOverlay />
-        <AlertDialogContent className="min-w-2xl">
-            <AlertDialogHeader>
-                <AlertDialogTitle>{_("Undo Transaction Reconciliation")}</AlertDialogTitle>
-                <AlertDialogDescription>
-                    {_("Are you sure you want to unreconcile this transaction?")}
-                </AlertDialogDescription>
-            </AlertDialogHeader>
-            <BankTransactionUnreconcileModalContent />
-        </AlertDialogContent>
-    </AlertDialog>
-
-
-}
-
-const BankTransactionUnreconcileModalContent = () => {
-    const bankAccount = useAtomValue(selectedBankAccountAtom)
-    const dates = useAtomValue(bankRecDateAtom)
-
-    const { mutate } = useSWRConfig()
-
-    const [unreconcileModal, setBankRecUnreconcileModal] = useAtom(bankRecUnreconcileModalAtom)
-
-    const { data: transaction, error } = useFrappeGetDoc<BankTransaction>('Bank Transaction', unreconcileModal)
-
-    const { call, loading, error: unreconcileError } = useFrappePostCall('erpnext.accounts.doctype.bank_transaction.bank_transaction.unreconcile_transaction')
-
-    const onUnreconcile = (event: React.MouseEvent<HTMLButtonElement>) => {
-        call({
-            transaction_name: unreconcileModal
-        }).then(() => {
-            // Mutate the transactions list, unreconciled transactions list and account closing balance
-            mutate(`bank-reconciliation-bank-transactions-${bankAccount?.name}-${dates.fromDate}-${dates.toDate}`)
-            mutate(`bank-reconciliation-unreconciled-transactions-${bankAccount?.name}-${dates.fromDate}-${dates.toDate}`)
-            mutate(`bank-reconciliation-account-closing-balance-${bankAccount?.name}-${dates.toDate}`)
-            toast.success(_("Transaction Unreconciled"))
-            setBankRecUnreconcileModal('')
-        })
-
-        event.preventDefault()
-    }
-
-    const vouchersWhichWillBeCancelled = useMemo(() => {
-        return transaction?.payment_entries?.filter((payment) => payment.reconciliation_type === 'Voucher Created')
-    }, [transaction])
-
-    return <div>
-        <div className="flex flex-col gap-3">
-            {error && <ErrorBanner error={error} />}
-            {unreconcileError && <ErrorBanner error={unreconcileError} />}
-            {transaction && <SelectedTransactionDetails transaction={transaction} />}
-            <span className="font-medium text-sm">{_("This transaction has been reconciled with the following document(s):")}</span>
-            <Table>
-                <TableHeader>
-                    <TableRow>
-                        <TableHead>{_("Document")}</TableHead>
-                        <TableHead>{_("Amount")}</TableHead>
-                        <TableHead>{_("Reconciliation Type")}</TableHead>
-                    </TableRow>
-                </TableHeader>
-                <TableBody>
-                    {transaction?.payment_entries?.map((voucher) => {
-                        return <TableRow key={voucher.name}>
-                            <TableCell>
-                                <a className="underline underline-offset-4"
-                                    target="_blank"
-                                    rel="noopener noreferrer"
-                                    href={`/desk/${slug(voucher.payment_document as string)}/${voucher.payment_entry}`}
-                                >
-                                    {`${_(voucher.payment_document)}: ${voucher.payment_entry}`}
-                                </a>
-                            </TableCell>
-                            <TableCell>{formatCurrency(voucher.allocated_amount)}</TableCell>
-                            <TableCell>{voucher.reconciliation_type === 'Voucher Created' ?
-                                <Badge theme="green">{_(voucher.reconciliation_type)}</Badge> :
-                                <Badge theme="blue">{_(voucher.reconciliation_type ?? "Matched")}</Badge>}</TableCell>
-                        </TableRow>
-                    })}
-                </TableBody>
-            </Table>
-            <div className="py-4">
-                {vouchersWhichWillBeCancelled && vouchersWhichWillBeCancelled?.length > 0 && <span>The following documents will be <strong>cancelled</strong>:</span>}
-                {vouchersWhichWillBeCancelled && vouchersWhichWillBeCancelled?.length > 0 && <ol className="ms-6 list-disc [&>li]:mt-2">
-                    {vouchersWhichWillBeCancelled?.map((voucher) => {
-                        return <li key={voucher.name}>{_(voucher.payment_document)}: {voucher.payment_entry}</li>
-                    })}
-                </ol>}
-            </div>
-        </div>
-        <AlertDialogFooter>
-            <AlertDialogCancel disabled={loading}>{_("Cancel")}</AlertDialogCancel>
-            <AlertDialogAction onClick={onUnreconcile} theme="red" disabled={loading}>
-                {_("Unreconcile")}
-            </AlertDialogAction>
-        </AlertDialogFooter>
-    </div>
-}
-
-export default BankTransactionUnreconcileModal

banking/src/components/features/BankReconciliation/CompanySelector.tsx

@@ -1,92 +0,0 @@
-import { Button } from "@/components/ui/button"
-import { selectedCompanyAtom, useCurrentCompany } from "@/hooks/useCurrentCompany"
-import { useSetAtom } from "jotai"
-import { Building2, Check, ChevronDown } from "lucide-react"
-import { useState } from "react"
-import {
-    Command,
-    CommandEmpty,
-    CommandGroup,
-    CommandInput,
-    CommandItem,
-    CommandList,
-} from "@/components/ui/command"
-import {
-    Popover,
-    PopoverContent,
-    PopoverTrigger,
-} from "@/components/ui/popover"
-import { cn } from "@/lib/utils"
-import _ from "@/lib/translate"
-import { selectedBankAccountAtom } from "./bankRecAtoms"
-
-const CompanySelector = ({ onChange }: { onChange?: (company: string) => void }) => {
-    const [open, setOpen] = useState(false)
-    const [searchQuery, setSearchQuery] = useState("")
-
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    const options = window.frappe?.boot?.docs?.filter((doc: Record<string, any>) => doc.doctype === ":Company").map((company: Record<string, any>) => company.name) || []
-
-    const setSelectedCompany = useSetAtom(selectedCompanyAtom)
-    const setSelectedBankAccount = useSetAtom(selectedBankAccountAtom)
-    const selectedCompany = useCurrentCompany()
-
-    const handleSelectCompany = (company: string) => {
-        setSelectedCompany(company)
-        setSearchQuery("")
-        setOpen(false)
-        // Only reset bank account if the company is changed
-        if (selectedCompany !== company) {
-            setSelectedBankAccount(null)
-            onChange?.(company)
-        }
-    }
-
-    return (<Popover open={open} onOpenChange={setOpen}>
-        <PopoverTrigger asChild>
-            <Button
-                variant="outline"
-                type='button'
-                role="combobox"
-                size='md'
-                aria-expanded={open}
-                className="justify-between"
-            >
-                <div className="flex items-center gap-2">
-                    <Building2 />
-                    {selectedCompany}
-                </div>
-                <ChevronDown className="text-ink-gray-4" />
-            </Button>
-        </PopoverTrigger>
-        <PopoverContent className="min-w-56 w-fit p-0">
-            <Command value={selectedCompany}>
-                {options.length > 5 && <CommandInput placeholder={_("Search company...")} className="h-9" />}
-                <CommandList>
-                    <CommandEmpty>{_("No company found.")}</CommandEmpty>
-                    <CommandGroup>
-                        {options.map((option: string) => (
-                            <CommandItem
-                                key={option}
-                                value={option}
-                                onSelect={(currentValue) => {
-                                    handleSelectCompany(currentValue)
-                                }}
-                            >
-                                {option}
-                                <Check
-                                    className={cn(
-                                        "ms-auto",
-                                        searchQuery === option ? "opacity-100" : "opacity-0"
-                                    )}
-                                />
-                            </CommandItem>
-                        ))}
-                    </CommandGroup>
-                </CommandList>
-            </Command>
-        </PopoverContent>
-    </Popover>)
-}
-
-export default CompanySelector

banking/src/components/features/BankReconciliation/IncorrectlyClearedEntries.tsx

@@ -1,229 +0,0 @@
-import { useAtomValue } from "jotai"
-import { MissingFiltersBanner } from "./MissingFiltersBanner"
-import { bankRecDateAtom, selectedBankAccountAtom } from "./bankRecAtoms"
-import { useCurrentCompany } from "@/hooks/useCurrentCompany"
-import { Paragraph } from "@/components/ui/typography"
-import type { ColumnDef } from "@tanstack/react-table"
-import { useCallback, useMemo } from "react"
-import { useFrappeGetCall, useFrappePostCall } from "frappe-react-sdk"
-import { QueryReportReturnType } from "@/types/custom/Reports"
-import { formatDate } from "@/lib/date"
-import { ListView, type ListViewColumnMeta } from "@/components/ui/list-view"
-import { formatCurrency } from "@/lib/numbers"
-import { getCompanyCurrency } from "@/lib/company"
-import { getErrorMessage, slug } from "@/lib/frappe"
-import { Button } from "@/components/ui/button"
-import { toast } from "sonner"
-import { PartyPopper } from "lucide-react"
-import ErrorBanner from "@/components/ui/error-banner"
-import _ from "@/lib/translate"
-import { Empty, EmptyTitle, EmptyDescription, EmptyMedia, EmptyHeader } from "@/components/ui/empty"
-
-const IncorrectlyClearedEntries = () => {
-    const companyID = useCurrentCompany()
-    const bankAccount = useAtomValue(selectedBankAccountAtom)
-    const dates = useAtomValue(bankRecDateAtom)
-
-    if (!companyID || !bankAccount || !dates) {
-        const missingFields = []
-        if (!companyID) {
-            missingFields.push('Company')
-        }
-        if (!bankAccount) {
-            missingFields.push('Bank Account')
-        }
-        if (!dates) {
-            missingFields.push('Dates')
-        }
-        return <MissingFiltersBanner text={`Please select ${missingFields.join(', ')} to view the incorrectly cleared entries.`} />
-    }
-
-    return <IncorrectlyClearedEntriesView />
-}
-
-interface IncorrectlyClearedEntry {
-    payment_document: string
-    payment_entry: string
-    debit: number
-    credit: number
-    posting_date: string,
-    clearance_date: string,
-}
-
-const IncorrectlyClearedEntriesView = () => {
-
-    const companyID = useCurrentCompany()
-    const bankAccount = useAtomValue(selectedBankAccountAtom)
-    const dates = useAtomValue(bankRecDateAtom)
-
-    const filters = useMemo(() => {
-        return JSON.stringify({
-            company: companyID,
-            account: bankAccount?.account,
-            report_date: dates.toDate
-        })
-    }, [companyID, bankAccount, dates])
-
-    const { data, error, mutate } = useFrappeGetCall<{ message: QueryReportReturnType<IncorrectlyClearedEntry> }>('frappe.desk.query_report.run', {
-        report_name: 'Cheques and Deposits Incorrectly cleared',
-        filters,
-        ignore_prepared_report: 1,
-        are_default_filters: false,
-    }, `Report-Cheques and Deposits Incorrectly cleared-${filters}`, { keepPreviousData: true, revalidateOnFocus: false }, 'POST')
-
-    const formattedToDate = formatDate(dates.toDate)
-
-    const { call: clearClearingDate } = useFrappePostCall('erpnext.accounts.doctype.bank_reconciliation_tool.bank_reconciliation_tool.clear_clearing_date')
-
-    const onClearClick = useCallback(
-        (voucher_type: string, voucher_name: string) => {
-            clearClearingDate({ voucher_type, voucher_name })
-                .then(() => {
-                    toast.success(_("Cleared"), {
-                        duration: 1000,
-                    })
-                    mutate()
-                })
-                .catch((e) => {
-                    toast.error(_("There was an error while performing the action."), {
-                        description: getErrorMessage(e),
-                        duration: 5000,
-                    })
-                })
-        },
-        [clearClearingDate, mutate, _],
-    )
-
-    const accountCurrency = useMemo(
-        () => bankAccount?.account_currency ?? getCompanyCurrency(companyID),
-        [bankAccount?.account_currency, companyID],
-    )
-
-    const incorrectlyClearedColumns = useMemo<ColumnDef<IncorrectlyClearedEntry, unknown>[]>(
-        () => [
-            {
-                accessorKey: "payment_document",
-                header: _("Document Type"),
-                size: 128,
-                cell: ({ row }) => _(row.original.payment_document),
-            },
-            {
-                id: "payment_entry",
-                header: _("Payment Document"),
-                size: 160,
-                meta: {
-                    getTooltipText: (r) => {
-                        const x = r as IncorrectlyClearedEntry
-                        return [x.payment_document, x.payment_entry].filter(Boolean).join(" · ") || undefined
-                    },
-                } satisfies ListViewColumnMeta,
-                cell: ({ row }) => (
-                    <a
-                        target="_blank"
-                        rel="noreferrer"
-                        className="text-ink-gray-8 block min-w-0 w-full underline underline-offset-4"
-                        href={`/desk/${slug(row.original.payment_document)}/${row.original.payment_entry}`}
-                    >
-                        {row.original.payment_entry}
-                    </a>
-                ),
-            },
-            {
-                accessorKey: "debit",
-                header: _("Debit"),
-                size: 120,
-                meta: { align: "right" } satisfies ListViewColumnMeta,
-                cell: ({ row }) => formatCurrency(row.original.debit, accountCurrency),
-            },
-            {
-                accessorKey: "credit",
-                header: _("Credit"),
-                size: 120,
-                meta: { align: "right" } satisfies ListViewColumnMeta,
-                cell: ({ row }) => formatCurrency(row.original.credit, accountCurrency),
-            },
-            {
-                accessorKey: "posting_date",
-                header: _("Posting Date"),
-                size: 118,
-                meta: { tabularNums: true } satisfies ListViewColumnMeta,
-                cell: ({ row }) => formatDate(row.original.posting_date),
-            },
-            {
-                accessorKey: "clearance_date",
-                header: _("Clearance Date"),
-                size: 118,
-                meta: { tabularNums: true } satisfies ListViewColumnMeta,
-                cell: ({ row }) => formatDate(row.original.clearance_date),
-            },
-            {
-                id: "actions",
-                header: _("Actions"),
-                size: 180,
-                enableResizing: false,
-                meta: { truncate: false, truncateTooltip: false } satisfies ListViewColumnMeta,
-                cell: ({ row }) => (
-                    <Button
-                        variant="link"
-                        size="sm"
-                        className="text-ink-red-3 px-0"
-                        onClick={() => onClearClick(row.original.payment_document, row.original.payment_entry)}
-                    >
-                        {_("Reset Clearing Date")}
-                    </Button>
-                ),
-            },
-        ],
-        [_, accountCurrency, onClearClick],
-    )
-
-    return <div className="space-y-4 py-2">
-
-        <div>
-            <Paragraph className="text-sm">
-                <span dangerouslySetInnerHTML={{
-                    __html: _("This report shows all entries in the system where the <strong>clearance date is before the posting date</strong> which is incorrect.")
-                }} />
-                <br />
-                {data && data.message.result.length > 0 && <span>
-                    <span dangerouslySetInnerHTML={{
-                        __html: _("Entries below have a posting date after {0} but the clearance date is before {1}.", [`<strong>${formattedToDate}</strong>`, `<strong>${formattedToDate}</strong>`])
-                    }} />
-                    <br />
-                    {_("You can reset the clearing dates of these entries here.")}
-                </span>}
-            </Paragraph>
-        </div>
-
-        {error && <ErrorBanner error={error} />}
-
-        {data && data.message.result.length > 0 && (
-            <div className="space-y-2">
-                <p className="text-ink-gray-5 text-sm">{_("Incorrectly cleared entries as per the report.")}</p>
-                <ListView
-                    data={data.message.result}
-                    columns={incorrectlyClearedColumns}
-                    getRowId={(row) => `${row.payment_entry}-${row.posting_date}`}
-                    maxHeight="min(70vh, 640px)"
-                    emptyState={_("No rows to display.")}
-                />
-            </div>
-        )}
-
-        {data && data.message.result.length === 0 &&
-            <Empty>
-                <EmptyMedia>
-                    <PartyPopper />
-                </EmptyMedia>
-                <EmptyHeader>
-                    <EmptyTitle>{_("It's all good!")}</EmptyTitle>
-                    <EmptyDescription>{_("There are no entries in the system where the clearance date is before the posting date.")}</EmptyDescription>
-                </EmptyHeader>
-            </Empty>
-        }
-
-
-    </div>
-}
-
-export default IncorrectlyClearedEntries

banking/src/components/features/BankReconciliation/MatchAndReconcile.tsx

@@ -1,949 +0,0 @@
-import { useAtom, useAtomValue, useSetAtom } from "jotai"
-import { bankRecAmountFilter, bankRecDateAtom, bankRecRecordJournalEntryModalAtom, bankRecRecordPaymentModalAtom, bankRecSelectedTransactionAtom, bankRecTransactionTypeFilter, bankRecTransferModalAtom, selectedBankAccountAtom } from "./bankRecAtoms"
-import { H4 } from "@/components/ui/typography"
-import { useMemo, useRef } from "react"
-import { getCompanyCurrency } from "@/lib/company"
-import ErrorBanner from "@/components/ui/error-banner"
-import { Separator } from "@/components/ui/separator"
-import Fuse from 'fuse.js'
-import { getSearchResults, LinkedPayment, UnreconciledTransaction, useGetRuleForTransaction, useGetUnreconciledTransactions, useGetVouchersForTransaction, useIsTransactionWithdrawal, useReconcileTransaction, useTransactionSearch } from "./utils"
-import { Input } from "@/components/ui/input"
-import { AlertCircleIcon, ArrowDownRight, ArrowRightIcon, ArrowRightLeft, ArrowUpRight, BadgeCheck, ChevronDown, DollarSign, Landmark, LandmarkIcon, ListIcon, Loader2, Receipt, ReceiptIcon, Search, User, XCircle, ZapIcon } from "lucide-react"
-import { cn } from "@/lib/utils"
-import { DropdownMenu, DropdownMenuTrigger, DropdownMenuContent, DropdownMenuItem } from "@/components/ui/dropdown-menu"
-import { Button } from "@/components/ui/button"
-import CurrencyInput from 'react-currency-input-field'
-import { getCurrencySymbol } from "@/lib/currency"
-import { Virtuoso } from 'react-virtuoso'
-import { formatDate } from "@/lib/date"
-import { Badge } from "@/components/ui/badge"
-import { formatCurrency, getCurrencyFormatInfo } from "@/lib/numbers"
-import { Tooltip, TooltipTrigger, TooltipContent, TooltipProvider } from "@/components/ui/tooltip"
-import { Skeleton } from "@/components/ui/skeleton"
-import { slug } from "@/lib/frappe"
-import _ from "@/lib/translate"
-import TransferModal from "./TransferModal"
-import BankEntryModal from "./BankEntryModal"
-import RecordPaymentModal from "./RecordPaymentModal"
-import { Card, CardAction, CardContent, CardHeader, CardTitle } from "@/components/ui/card"
-import SelectedTransactionsTable from "./SelectedTransactionsTable"
-import MatchFilters from "./MatchFilters"
-import { useHotkeys } from "react-hotkeys-hook"
-import { KeyboardMetaKeyIcon } from "@/components/ui/keyboard-keys"
-import { Kbd, KbdGroup } from "@/components/ui/kbd"
-import { useFrappeGetCall } from "frappe-react-sdk"
-import { Empty, EmptyContent, EmptyDescription, EmptyHeader, EmptyMedia, EmptyTitle } from "@/components/ui/empty"
-import { Link } from "react-router"
-import { Alert, AlertDescription, AlertTitle } from "@/components/ui/alert"
-import { InputGroup, InputGroupAddon, InputGroupText } from "@/components/ui/input-group"
-
-const MatchAndReconcile = ({ contentHeight }: { contentHeight: number }) => {
-    const selectedBank = useAtomValue(selectedBankAccountAtom)
-
-    if (!selectedBank) {
-        return <Empty>
-            <EmptyMedia>
-                <LandmarkIcon />
-            </EmptyMedia>
-            <EmptyHeader>
-                <EmptyTitle>{_("Select a bank account to reconcile")}</EmptyTitle>
-            </EmptyHeader>
-        </Empty>
-    }
-
-    return <>
-        <div className={`flex items-start space-x-2`} >
-            <div className="flex-1">
-                <H4 className="text-sm font-medium">{_("Unreconciled Transactions")}</H4>
-                <UnreconciledTransactions contentHeight={contentHeight} />
-            </div>
-            <Separator orientation="vertical" style={{ minHeight: `${contentHeight}px` }} />
-            <div className="flex-1 px-1">
-                <H4 className="text-sm font-medium">{_("Match or Create")}</H4>
-                <VouchersSection contentHeight={contentHeight} />
-            </div>
-        </div>
-        <TransferModal />
-        <BankEntryModal />
-        <RecordPaymentModal />
-    </>
-}
-
-
-const UnreconciledTransactions = ({ contentHeight }: { contentHeight: number }) => {
-    const bankAccount = useAtomValue(selectedBankAccountAtom)
-
-    const currency = bankAccount?.account_currency ?? getCompanyCurrency(bankAccount?.company ?? '')
-    const currencySymbol = getCurrencySymbol(currency)
-    const formatInfo = getCurrencyFormatInfo(currency)
-    const groupSeparator = formatInfo.group_sep || ","
-    const decimalSeparator = formatInfo.decimal_str || "."
-
-    const inputRef = useRef<HTMLInputElement>(null)
-
-    const { data: unreconciledTransactions, isLoading, error } = useGetUnreconciledTransactions()
-
-    const [typeFilter, setTypeFilter] = useAtom(bankRecTransactionTypeFilter)
-    const [amountFilter, setAmountFilter] = useAtom(bankRecAmountFilter)
-
-    const [search, setSearch] = useTransactionSearch()
-
-    const searchIndex = useMemo(() => {
-
-        if (!unreconciledTransactions) {
-            return null
-        }
-
-        return new Fuse(unreconciledTransactions.message, {
-            keys: ['description', 'reference_number'],
-            threshold: 0.5,
-            includeScore: true
-        })
-    }, [unreconciledTransactions])
-
-    const results = useMemo(() => {
-
-        return getSearchResults(searchIndex, search, typeFilter, amountFilter.value, unreconciledTransactions?.message)
-
-    }, [searchIndex, search, typeFilter, amountFilter.value, unreconciledTransactions?.message])
-
-    const setSelectedTransaction = useSetAtom(bankRecSelectedTransactionAtom(bankAccount?.name || ''))
-
-    const onFilterChange = () => {
-        setSelectedTransaction([])
-    }
-
-    const onSearchChange = (e: React.ChangeEvent<HTMLInputElement>) => {
-        setSearch(e.target.value)
-        onFilterChange()
-    }
-
-    const onTypeFilterChange = (type: string) => {
-        setTypeFilter(type)
-        onFilterChange()
-    }
-
-    const onClearFilters = () => {
-        setSearch('')
-        if (inputRef.current) {
-            inputRef.current.value = ''
-        }
-        setTypeFilter('All')
-        setAmountFilter({ value: 0, stringValue: '' })
-        onFilterChange()
-    }
-
-    const hasFilters = search !== '' || typeFilter !== 'All' || amountFilter.value !== 0
-
-    if (isLoading) {
-        return <UnreconciledTransactionsLoadingState />
-    }
-
-    return <div className="space-y-1">
-        <div className="flex py-2 w-full gap-2">
-
-            <InputGroup variant='outline'>
-                <label className="sr-only">{_("Search transactions")}</label>
-                <InputGroupAddon>
-                    <Search className="w-4 h-4 text-ink-gray-5" />
-                </InputGroupAddon>
-                <Input
-                    placeholder={_("Search")}
-                    // type='search'
-                    variant='outline'
-                    onChange={onSearchChange}
-                    defaultValue={search}
-                    ref={inputRef}
-                />
-                <InputGroupAddon align='inline-end'>
-                    <InputGroupText>{results?.length} {_(results?.length === 1 ? "result" : "results")}</InputGroupText>
-                </InputGroupAddon>
-            </InputGroup>
-            <div>
-                <label className="sr-only">{_("Filter by amount")}</label>
-                <CurrencyInput
-                    groupSeparator={groupSeparator}
-                    decimalSeparator={decimalSeparator}
-                    placeholder={`${currencySymbol}0${decimalSeparator}00`}
-                    decimalsLimit={2}
-                    value={amountFilter.stringValue}
-                    maxLength={12}
-                    decimalScale={2}
-                    prefix={currencySymbol}
-                    onValueChange={(v, _n, values) => {
-                        // If the input ends with a decimal or a decimal with trailing zeroes, store the string since we need the user to be able to type the decimals.
-                        // When the user eventually types the decimals or blurs out, the value is formatted anyway.
-                        // Otherwise store the float value
-                        // Check if the value ends with a decimal or a decimal with trailing zeroes
-                        const isDecimal = v?.endsWith(decimalSeparator) || v?.endsWith(decimalSeparator + '0')
-                        const newValue = isDecimal ? v : values?.float ?? ''
-                        const nextAmountFilter = {
-                            value: Number(newValue),
-                            stringValue: newValue
-                        }
-                        const hasAmountFilterChanged = amountFilter.value !== nextAmountFilter.value || amountFilter.stringValue !== nextAmountFilter.stringValue
-
-                        setAmountFilter(nextAmountFilter)
-
-                        // `onValueChange` also fires on blur; avoid clearing selected transaction unless filter value actually changed.
-                        if (hasAmountFilterChanged) {
-                            onFilterChange()
-                        }
-                    }}
-                    // @ts-expect-error - CurrencyInputProps doesn't have a variant prop but Input does
-                    variant={"outline"}
-                    customInput={Input}
-                />
-            </div>
-            <div>
-                <DropdownMenu>
-                    <DropdownMenuTrigger asChild>
-                        <Button variant="outline" size='md' className="min-w-32 text-start">
-                            {typeFilter === 'All' ? <DollarSign className="text-ink-gray-5" /> : typeFilter === 'Debits' ? <ArrowUpRight className="text-ink-red-3" /> : <ArrowDownRight className="text-ink-green-3" />}
-                            {_(typeFilter)}
-                            <ChevronDown className="text-ink-gray-5" />
-                        </Button>
-                    </DropdownMenuTrigger>
-                    <DropdownMenuContent>
-                        <DropdownMenuItem onClick={() => onTypeFilterChange('All')}><DollarSign /> {_("All")}</DropdownMenuItem>
-                        <DropdownMenuItem onClick={() => onTypeFilterChange('Debits')}><ArrowUpRight className="text-ink-red-3" /> {_("Debits")}</DropdownMenuItem>
-                        <DropdownMenuItem onClick={() => onTypeFilterChange('Credits')}><ArrowDownRight className="text-ink-green-3" /> {_("Credits")}</DropdownMenuItem>
-                    </DropdownMenuContent>
-                </DropdownMenu>
-            </div>
-        </div>
-
-        {error && <ErrorBanner error={error} />}
-
-        <OlderUnreconciledTransactionsBanner />
-
-        {results.length === 0 && <NoTransactionsFoundBanner
-            onClearFilters={hasFilters ? onClearFilters : undefined}
-            text={hasFilters ? _("No transactions found for the given filters.") : _("No unreconciled transactions found")}
-            description={hasFilters ? _("Try adjusting your search or filter criteria.") : _("Import your bank statement to get started.")} />}
-
-        <Virtuoso
-            data={results}
-            itemContent={(_index, transaction) => (
-                <UnreconciledTransactionItem transaction={transaction} />
-            )}
-            style={{ minHeight: Math.max(contentHeight - 80, 400) }}
-            totalCount={results?.length}
-        />
-
-    </div>
-}
-
-const NoTransactionsFoundBanner = ({ text, description, onClearFilters }: { text: string, description?: string, onClearFilters?: () => void }) => {
-
-    return <Empty>
-        <EmptyMedia>
-            <ListIcon />
-        </EmptyMedia>
-        <EmptyHeader>
-            <EmptyTitle>{text}</EmptyTitle>
-            {description && <EmptyDescription>{description}</EmptyDescription>}
-        </EmptyHeader>
-        <EmptyContent>
-            {onClearFilters ? <Button type='button' size='sm' variant='subtle' onClick={onClearFilters}>Clear Filters</Button> :
-                <Button type='button' asChild size='sm' variant='subtle'>
-                    <Link to="/statement-importer">
-                        {_("Import Bank Statement")}
-                    </Link>
-                </Button>}
-        </EmptyContent>
-    </Empty>
-}
-
-const UnreconciledTransactionsLoadingState = () => {
-
-    return <div className="flex flex-col gap-2 py-2">
-        <div className="flex items-center gap-2 pb-2">
-            <Skeleton className="h-9.5 w-full" />
-            <Skeleton className="h-9.5 min-w-36" />
-            <Skeleton className="h-9.5 min-w-32" />
-        </div>
-        {Array.from({ length: 6 }).map((_, index) => (
-            <Skeleton key={index} className="h-16 w-full" />
-        ))}
-    </div>
-}
-
-const UnreconciledTransactionItem = ({ transaction }: { transaction: UnreconciledTransaction }) => {
-
-    const selectedBank = useAtomValue(selectedBankAccountAtom)
-
-    const [selectedTransaction, setSelectedTransaction] = useAtom(bankRecSelectedTransactionAtom(selectedBank?.name || ''))
-
-    const { amount, isWithdrawal } = useIsTransactionWithdrawal(transaction)
-
-    const isSelected = selectedTransaction?.some((t) => t.name === transaction.name)
-
-    const currency = transaction.currency ?? selectedBank?.account_currency ?? getCompanyCurrency(selectedBank?.company ?? '')
-
-    const handleSelectTransaction = (event: React.MouseEvent<HTMLDivElement>) => {
-        // If the user is pressing the shift key, add/remove the transaction from the selected transactions
-        if (event.shiftKey) {
-            setSelectedTransaction(isSelected ? selectedTransaction.filter((t) => t.name !== transaction.name) : [...selectedTransaction, transaction])
-        } else {
-            setSelectedTransaction([transaction])
-        }
-    }
-
-    return <div className="py-1">
-        <div className={cn("border outline rounded-md p-2 mx-0.5 cursor-pointer transition-[color,box-shadow, bg] hover:bg-surface-gray-1",
-            isSelected ? "bg-surface-gray-1 border-outline-gray-5 outline-outline-gray-5" : "border-outline-gray-2 outline-none"
-        )}
-            role='button'
-            tabIndex={0}
-            onClick={handleSelectTransaction}>
-            <div className="flex justify-between items-start w-full">
-                <div className="space-y-1 overflow-hidden whitespace-pre-wrap">
-                    <div className="flex items-center gap-1">
-                        <span className="font-medium text-sm">{formatDate(transaction.date)}</span>
-                        {transaction.transaction_type &&
-                            <Badge theme="blue">{transaction.transaction_type}</Badge>}
-                        {transaction.reference_number && <Badge
-                            title={transaction.reference_number}
-                            className="max-w-[300px] text-ellipsis"
-                        >
-                            {_("Ref")}: {transaction.reference_number}</Badge>}
-
-                        {transaction.matched_transaction_rule && <Badge
-                            theme="violet"
-                            title={_("Matched by rule")}>
-                            <ZapIcon className="w-4 h-4" /> {transaction.matched_transaction_rule}</Badge>}
-                    </div>
-                    <span className="text-sm wrap-anywhere" title={transaction.description}>{transaction.description}</span>
-                </div>
-                <div className="gap-1 flex flex-col items-end min-w-36 h-full text-end">
-                    {isWithdrawal ? <ArrowUpRight className="size-5 text-ink-red-3" /> : <ArrowDownRight className="size-5 text-ink-green-3" />}
-                    {amount && amount > 0 && <span className="font-semibold font-numeric text-base">{formatCurrency(amount, currency)}</span>}
-                    {amount !== transaction.unallocated_amount && <span className="text-xs leading-normal text-ink-gray-5">{formatCurrency(transaction.unallocated_amount, currency)} {_("Unallocated")}</span>}
-                </div>
-            </div>
-        </div>
-    </div>
-}
-
-
-const VouchersSection = ({ contentHeight }: { contentHeight: number }) => {
-
-    const selectedBank = useAtomValue(selectedBankAccountAtom)
-    const selectedTransactions = useAtomValue(bankRecSelectedTransactionAtom(selectedBank?.name || ''))
-
-
-    if (selectedTransactions.length === 0) {
-        return <Empty>
-            <EmptyMedia>
-                <ReceiptIcon />
-            </EmptyMedia>
-            <EmptyHeader>
-                <EmptyTitle>{_("Select a transaction to match and reconcile with vouchers")}</EmptyTitle>
-            </EmptyHeader>
-        </Empty>
-    }
-
-    if (selectedTransactions.length > 1) {
-        return <OptionsForMultipleTransactions transactions={selectedTransactions} />
-    }
-
-    return <div style={{ minHeight: contentHeight }} className="mt-2">
-        <OptionsForSingleTransaction transaction={selectedTransactions[0]} contentHeight={contentHeight} />
-    </div>
-}
-
-const useKeyboardShortcuts = () => {
-    const setTransferModalOpen = useSetAtom(bankRecTransferModalAtom)
-    const setRecordPaymentModalOpen = useSetAtom(bankRecRecordPaymentModalAtom)
-    const setRecordJournalEntryModalOpen = useSetAtom(bankRecRecordJournalEntryModalAtom)
-
-    useHotkeys('meta+p', () => {
-        // 
-        setRecordPaymentModalOpen(true)
-    }, {
-        enabled: true,
-        enableOnFormTags: false,
-        preventDefault: true
-    })
-
-    useHotkeys('meta+b', () => {
-        // 
-        setRecordJournalEntryModalOpen(true)
-    }, {
-        enabled: true,
-        enableOnFormTags: false,
-        preventDefault: true
-    })
-
-    useHotkeys('meta+i', () => {
-        // 
-        setTransferModalOpen(true)
-    }, {
-        enabled: true,
-        enableOnFormTags: false,
-        preventDefault: true
-    })
-
-    return {
-        setTransferModalOpen,
-        setRecordPaymentModalOpen,
-        setRecordJournalEntryModalOpen
-    }
-}
-
-const OptionsForMultipleTransactions = ({ transactions }: { transactions: UnreconciledTransaction[] }) => {
-
-    const { setTransferModalOpen, setRecordPaymentModalOpen, setRecordJournalEntryModalOpen } = useKeyboardShortcuts()
-
-    return <div className="flex flex-col py-4">
-        <Card className="gap-2">
-            <CardHeader>
-                <CardTitle>
-                    <div className="flex items-center justify-between">
-                        <span className="text-md font-medium">{transactions.length} {_(transactions.length === 1 ? _("transaction selected") : _("transactions selected"))}</span>
-                        <span className="text-md font-medium font-numeric">
-                            {formatCurrency(transactions.reduce((acc, transaction) => acc + (transaction.unallocated_amount ?? 0), 0), transactions[0].currency ?? '')}
-                        </span>
-                    </div>
-                </CardTitle>
-            </CardHeader>
-            <CardContent>
-                <SelectedTransactionsTable />
-
-                <CardAction className="mt-4 justify-self-center">
-                    <div className="flex gap-3 justify-center">
-                        <TooltipProvider>
-                            <div className="flex gap-4 justify-center">
-                                <Tooltip>
-                                    <TooltipTrigger asChild>
-                                        <Button
-                                            size='md'
-                                            aria-label={_("Record a bank journal entry for expenses, income or split transactions")}
-                                            onClick={() => setRecordJournalEntryModalOpen(true)}>
-                                            <Landmark /> {_("Bank Entry")}
-                                        </Button>
-                                    </TooltipTrigger>
-                                    <TooltipContent>
-                                        {_("Record a journal entry for expenses, income or split transactions")}
-                                        <KbdGroup className="ms-2">
-                                            <Kbd><KeyboardMetaKeyIcon /></Kbd>
-                                            <Kbd>B</Kbd>
-                                        </KbdGroup>
-                                    </TooltipContent>
-                                </Tooltip>
-                                <Tooltip>
-                                    <TooltipTrigger asChild>
-                                        <Button
-                                            variant='outline'
-                                            size='md'
-                                            aria-label={_("Record a payment entry against a customer or supplier")}
-                                            onClick={() => setRecordPaymentModalOpen(true)}>
-                                            <Receipt /> {_("Record Payment")}
-                                        </Button>
-                                    </TooltipTrigger>
-                                    <TooltipContent>
-                                        {_("Record a payment entry against a customer or supplier")}
-                                        <KbdGroup className="ms-2">
-                                            <Kbd><KeyboardMetaKeyIcon /></Kbd>
-                                            <Kbd>P</Kbd>
-                                        </KbdGroup>
-                                    </TooltipContent>
-                                </Tooltip>
-
-                                <Tooltip>
-                                    <TooltipTrigger asChild>
-                                        <Button
-                                            variant='outline'
-                                            size='md'
-                                            aria-label={_("Record an internal transfer to another bank/credit card/cash account")}
-                                            onClick={() => setTransferModalOpen(true)}>
-                                            <ArrowRightLeft /> {_("Transfer")}
-                                        </Button>
-                                    </TooltipTrigger>
-                                    <TooltipContent>
-                                        {_("Record an internal transfer to another bank/credit card/cash account")}
-                                        <KbdGroup className="ms-2">
-                                            <Kbd><KeyboardMetaKeyIcon /></Kbd>
-                                            <Kbd>I</Kbd>
-                                        </KbdGroup>
-                                    </TooltipContent>
-                                </Tooltip>
-
-                            </div>
-                        </TooltipProvider>
-                    </div>
-                </CardAction>
-            </CardContent>
-        </Card>
-
-    </div>
-}
-
-
-const OptionsForSingleTransaction = ({ transaction, contentHeight }: { transaction: UnreconciledTransaction, contentHeight: number }) => {
-
-    const { setTransferModalOpen, setRecordPaymentModalOpen, setRecordJournalEntryModalOpen } = useKeyboardShortcuts()
-
-    return <div className="flex flex-col gap-3">
-        <TooltipProvider>
-            <div className="flex items-center justify-between pt-2">
-                <div className="flex gap-4 justify-center">
-                    <Tooltip>
-                        <TooltipTrigger asChild>
-                            <Button
-                                variant='outline'
-                                size='md'
-                                aria-label={_("Record a payment entry against a customer or supplier")}
-                                onClick={() => setRecordPaymentModalOpen(true)}>
-                                <Receipt /> {_("Record Payment")}
-                            </Button>
-                        </TooltipTrigger>
-                        <TooltipContent>
-                            {_("Record a payment entry against a customer or supplier")}
-                            <KbdGroup className="ms-2">
-                                <Kbd><KeyboardMetaKeyIcon /></Kbd>
-                                <Kbd>P</Kbd>
-                            </KbdGroup>
-                        </TooltipContent>
-                    </Tooltip>
-                    <Tooltip>
-                        <TooltipTrigger asChild>
-                            <Button
-                                variant='outline'
-                                size='md'
-                                aria-label={_("Record a bank journal entry for expenses, income or split transactions")}
-                                onClick={() => setRecordJournalEntryModalOpen(true)}>
-                                <Landmark /> {_("Bank Entry")}
-                            </Button>
-                        </TooltipTrigger>
-                        <TooltipContent>
-                            {_("Record a journal entry for expenses, income or split transactions")}
-                            <KbdGroup className="ms-2">
-                                <Kbd><KeyboardMetaKeyIcon /></Kbd>
-                                <Kbd>B</Kbd>
-                            </KbdGroup>
-                        </TooltipContent>
-                    </Tooltip>
-                    <Tooltip >
-                        <TooltipTrigger asChild>
-                            <Button
-                                variant='outline'
-                                size='md'
-                                aria-label={_("Record an internal transfer to another bank/credit card/cash account")}
-                                onClick={() => setTransferModalOpen(true)}>
-                                <ArrowRightLeft /> {_("Transfer")}
-                            </Button>
-                        </TooltipTrigger>
-                        <TooltipContent>
-                            {_("Record an internal transfer to another bank/credit card/cash account")}
-                            <KbdGroup className="ms-2">
-                                <Kbd><KeyboardMetaKeyIcon /></Kbd>
-                                <Kbd>I</Kbd>
-                            </KbdGroup>
-                        </TooltipContent>
-                    </Tooltip>
-                </div>
-                <MatchFilters />
-            </div>
-        </TooltipProvider>
-        {transaction.matched_transaction_rule && <RuleAction transaction={transaction} />}
-        <VouchersForTransaction transaction={transaction} contentHeight={contentHeight} />
-    </div>
-}
-
-const RuleAction = ({ transaction }: { transaction: UnreconciledTransaction }) => {
-
-    const { data: rule } = useGetRuleForTransaction(transaction)
-    const setTransferModalOpen = useSetAtom(bankRecTransferModalAtom)
-    const setRecordPaymentModalOpen = useSetAtom(bankRecRecordPaymentModalAtom)
-    const setRecordJournalEntryModalOpen = useSetAtom(bankRecRecordJournalEntryModalAtom)
-
-    if (!rule) {
-        return null
-    }
-
-    const getActionIcon = () => {
-        switch (rule.classify_as) {
-            case "Bank Entry":
-                return <Landmark />
-            case "Payment Entry":
-                return <Receipt className="w-6 h-6" />
-            case "Transfer":
-                return <ArrowRightLeft />
-            default:
-                return <ZapIcon />
-        }
-    }
-
-    const getActionStyles = () => {
-        switch (rule.classify_as) {
-            case "Bank Entry":
-                return {
-                    border: "border-outline-blue-3",
-                    bg: "bg-surface-blue-1/50",
-                    text: "text-ink-blue-4",
-                    theme: "blue",
-                }
-            case "Payment Entry":
-                return {
-                    border: "border-outline-green-3",
-                    bg: "bg-surface-green-1/50",
-                    text: "text-ink-green-4",
-                    theme: "green",
-                }
-            case "Transfer":
-                return {
-                    border: "border-outline-violet-3",
-                    bg: "bg-surface-violet-2/50",
-                    text: "text-ink-violet-4",
-                    theme: "violet",
-                }
-            default:
-                return {
-                    border: "border-outline-amber-3",
-                    bg: "bg-surface-amber-1/50",
-                    text: "text-ink-amber-4",
-                    theme: "orange",
-                }
-        }
-    }
-
-    const handleActionClick = () => {
-        switch (rule.classify_as) {
-            case "Bank Entry":
-                setRecordJournalEntryModalOpen(true)
-                break
-            case "Payment Entry":
-                setRecordPaymentModalOpen(true)
-                break
-            case "Transfer":
-                setTransferModalOpen(true)
-                break
-        }
-    }
-
-    const getActionDescription = () => {
-        switch (rule.classify_as) {
-            case "Bank Entry":
-                return _("Create a journal entry for expenses, income or split transactions")
-            case "Payment Entry":
-                return _("Record a payment entry against a customer or supplier")
-            case "Transfer":
-                return _("Record an internal transfer to another bank/credit card/cash account")
-            default:
-                return _("Create a new entry based on the rule")
-        }
-    }
-
-    useHotkeys('meta+r', () => {
-        // 
-        handleActionClick()
-    }, {
-        enabled: true,
-        enableOnFormTags: false,
-        preventDefault: true
-    })
-
-    const styles = getActionStyles()
-
-    return (
-        <Card className={`border ${styles.border} ${styles.bg} shadow-sm hover:shadow-md transition-all duration-200`}>
-            <CardHeader className="pb-0">
-                <CardTitle className="flex justify-between items-center gap-3">
-                    <div className="flex items-center gap-3">
-                        <div className={`px-2.5 rounded-lg ${styles.bg} ${styles.text}`}>
-                            {getActionIcon()}
-                        </div>
-                        <div className="flex flex-col gap-0.5">
-                            <span className="font-semibold text-lg">{rule.rule_name}</span>
-                            <span className="text-sm text-ink-gray-5 font-normal">
-                                {rule.rule_description || _("Rule matched based on transaction description and other criteria.")}
-                            </span>
-                        </div>
-                    </div>
-                    <div className="flex items-center gap-0.5">
-                        <Badge size='lg'
-                            theme={rule.classify_as === "Bank Entry" ? "blue" : rule.classify_as === "Payment Entry" ? "green" : rule.classify_as === "Transfer" ? "violet" : "orange"}>
-                            {rule.classify_as}
-                        </Badge>
-                    </div>
-                </CardTitle>
-            </CardHeader>
-            <CardContent className="pt-0 space-y-3">
-                <div className="flex items-center justify-between p-2 bg-surface-white rounded-lg border border-outline-gray-1">
-                    <div className="flex items-center gap-2">
-                        <BadgeCheck className="w-4 h-4 text-ink-green-3" />
-                        <span className="text-sm font-medium text-ink-gray-8">{_("Recommended Action")}</span>
-                    </div>
-                    <Badge variant="ghost" theme={styles.theme as "blue" | "green" | "violet" | "orange"}>
-                        {_("Priority")} {rule.priority}
-                    </Badge>
-                </div>
-
-                <div className="space-y-2">
-
-                    {rule.account && (
-                        <div className="flex items-center gap-2">
-                            <span className="text-sm font-medium text-ink-gray-8">{_("Account")}:</span>
-                            <span className="text-sm">{rule.account}</span>
-                        </div>
-                    )}
-
-                    {rule.party_type && rule.party && (
-                        <div className="flex items-center gap-2">
-                            <span className="text-sm font-medium text-ink-gray-8">{_("Party")}:</span>
-                            <span className="text-sm">{rule.party} ({_(rule.party_type)})</span>
-                        </div>
-                    )}
-                </div>
-
-                <div className="pt-1">
-                    <Button
-                        onClick={handleActionClick}
-                        className={`w-full`}
-                        theme={styles.theme as "blue" | "green" | "violet"}
-                        size="md"
-                    >
-                        {getActionIcon()}
-                        <span>{_("Create")} {rule.classify_as}</span>
-                    </Button>
-                    <p className="text-sm text-ink-gray-5 mt-2 text-center leading-relaxed">
-                        {getActionDescription()}
-                    </p>
-                </div>
-            </CardContent>
-        </Card>
-    )
-}
-
-const VouchersForTransaction = ({ transaction, contentHeight }: { transaction: UnreconciledTransaction, contentHeight: number }) => {
-
-    const { data: vouchers, isLoading, error } = useGetVouchersForTransaction(transaction)
-
-    if (error) {
-        return <ErrorBanner error={error} />
-    }
-
-    if (isLoading) {
-        return <div className="flex flex-col gap-2">
-            <div className="flex items-center gap-2 text-sm text-ink-gray-5">
-                <Separator className="flex-1" />
-                <span>or</span>
-                <Separator className="flex-1" />
-            </div>
-            <Skeleton className="h-16 w-full" />
-            <Skeleton className="h-16 w-full" />
-            <Skeleton className="h-16 w-full" />
-            <Skeleton className="h-16 w-full" />
-            <Skeleton className="h-16 w-full" />
-            <Skeleton className="h-16 w-full" />
-        </div>
-    }
-
-    return <div className="relative space-y-2">
-        <div className="flex items-center gap-2 text-sm text-ink-gray-5">
-            <Separator className="flex-1" />
-            <span>or</span>
-            <Separator className="flex-1" />
-        </div>
-        {vouchers?.message.length === 0 && <Empty className="my-4">
-            <EmptyMedia>
-                <ReceiptIcon />
-            </EmptyMedia>
-            <EmptyHeader>
-
-                <EmptyTitle>{_("No vouchers found for this transaction")}</EmptyTitle>
-            </EmptyHeader>
-        </Empty>}
-        <Virtuoso
-            data={vouchers?.message}
-            itemContent={(index, voucher) => (
-                <VoucherItem voucher={voucher} index={index} />
-            )}
-            style={{ height: contentHeight }}
-            totalCount={vouchers?.message.length}
-        />
-    </div >
-}
-
-const VoucherItem = ({ voucher, index }: { voucher: LinkedPayment, index: number }) => {
-
-    const selectedBank = useAtomValue(selectedBankAccountAtom)
-    const selectedTransaction = useAtomValue(bankRecSelectedTransactionAtom(selectedBank?.name || ''))
-
-    const { amountMatches, postingDateMatches, referenceDateMatches, referenceMatchesFull, referenceMatchesPartial, isSuggested } = useMemo(() => {
-
-        const transaction = selectedTransaction?.[0]
-
-        // We need to check if the following details match:
-        // Amount
-        // Date
-        // Reference/Description: Full or partial
-        // Whether this is suggested or not - depends on the above scores
-
-        const amountMatches = voucher.paid_amount === transaction?.unallocated_amount
-        const postingDateMatches = voucher.posting_date === transaction?.date
-        const referenceDateMatches = voucher.reference_date === transaction?.date
-        const referenceMatchesFull = voucher.reference_no === transaction?.reference_number || voucher.reference_no === transaction?.description
-
-        const referenceMatchesPartial = transaction?.reference_number?.includes(voucher.reference_no) || transaction?.description?.includes(voucher.reference_no)
-
-
-        const isSuggested = amountMatches && (postingDateMatches || referenceDateMatches || referenceMatchesPartial) && index === 0
-
-        return { isSelected: false, amountMatches, postingDateMatches, referenceDateMatches, referenceMatchesFull, referenceMatchesPartial, isSuggested: isSuggested }
-
-    }, [voucher, selectedTransaction, index])
-
-    const { reconcileTransaction, loading } = useReconcileTransaction()
-
-    const onClick = () => {
-        if (!selectedTransaction) {
-            return
-        }
-        reconcileTransaction(selectedTransaction[0], voucher)
-    }
-
-    return <div className="py-1 px-1">
-        <div
-            className={cn("border outline overflow-hidden relative rounded-md p-2",
-                isSuggested ? "border-outline-green-4 bg-surface-green-1/40 outline-outline-green-4" : "border-outline-gray-2 outline-transparent"
-            )}
-        >
-
-            <div className="flex justify-between items-end gap-2">
-                <div className="flex flex-col gap-2">
-                    <div className="flex items-center gap-2">
-                        <Badge size='md'>{_(voucher.doctype)}</Badge>
-                        <a target="_blank"
-                            href={`/desk/${slug(voucher.doctype)}/${voucher.name}`}
-                            className="underline underline-offset-2 text-base"
-                        >{voucher.name}</a>
-                    </div>
-                    {voucher.party && voucher.party_type && <div className="flex items-center gap-1.5 text-base">
-                        <User size='18px' />
-                        <span>{_(voucher.party_type)}</span>
-                        <a target="_blank"
-                            href={`/desk/${slug(voucher.party_type)}/${voucher.party}`}
-                            className="underline underline-offset-2"
-                        >{voucher.party}</a>
-                    </div>}
-                    <TooltipProvider>
-                        <div className="flex items-start gap-8 py-0.5">
-                            <div className="flex flex-col gap-1 min-w-24">
-                                <div className="text-xs text-ink-gray-6">{_("Amount")}</div>
-                                <div className="text-base font-medium flex items-center gap-1">{formatCurrency(voucher.paid_amount, voucher.currency)} {amountMatches ? <MatchBadge matchType="full" label={_("Amount matches the selected transaction")} /> : <MatchBadge matchType="none" label={_("Amount does not match the selected transaction")} />}</div>
-                            </div>
-
-                            <div className="flex flex-col gap-1 min-w-24">
-                                <div className="text-xs text-ink-gray-6">{_("Posted On")}</div>
-                                <div className="text-base font-medium flex items-center gap-1">{formatDate(voucher.posting_date)} {postingDateMatches ? <MatchBadge matchType="full" label={_("Posting date matches the selected transaction")} /> : <MatchBadge matchType="none" label={_("Posting date does not match the selected transaction")} />}</div>
-                            </div>
-
-                            {voucher.reference_date && <div className="flex flex-col gap-1 min-w-24">
-                                <div className="text-xs text-ink-gray-6">{_("Reference Date")}</div>
-                                <div className="text-base font-medium flex items-center gap-1">{formatDate(voucher.reference_date)} {referenceDateMatches ? <MatchBadge matchType="full" label={_("Reference date matches the selected transaction")} /> : <MatchBadge matchType="none" label={_("Reference date does not match the selected transaction")} />}</div>
-                            </div>}
-
-                        </div>
-                        {voucher.reference_no && <div className="flex items-start gap-1">
-                            <span className="text-p-base">
-                                {voucher.reference_no}
-                                &nbsp;&nbsp;
-                                <Tooltip>
-                                    <TooltipTrigger>
-                                        <Badge theme={referenceMatchesFull ? "green" : referenceMatchesPartial ? "orange" : "red"} variant={referenceMatchesFull || referenceMatchesPartial ? "subtle" : "outline"}>
-                                            {referenceMatchesFull ? `${_("Complete Match")}` : referenceMatchesPartial ? `${_("Partial Match")}` : `${_("No Match")}`}</Badge>
-                                    </TooltipTrigger>
-                                    <TooltipContent side="top">
-                                        {referenceMatchesFull ? `${_("Reference matches the selected transaction")}` : referenceMatchesPartial ? `${_("Reference matches the selected transaction partially")}` : `${_("Reference does not match the selected transaction")}`}
-                                    </TooltipContent>
-                                </Tooltip>
-                            </span>
-                        </div>}
-                    </TooltipProvider>
-                </div>
-                <div>
-                    <Button
-                        variant={isSuggested || amountMatches ? "solid" : "outline"}
-                        theme={isSuggested || amountMatches ? "green" : "gray"}
-                        onClick={onClick} disabled={loading}>{loading ? <><Loader2 className="w-4 h-4 animate-spin" /> {_("Reconciling")}...</> : `${_("Reconcile")}`}</Button>
-                </div>
-            </div>
-
-            {isSuggested && <div className="absolute top-1.5 end-2 flex items-center gap-1 justify-center">
-                <Badge theme="green" variant="subtle" size='md'>{_("Suggested")}</Badge>
-            </div>}
-
-        </div>
-    </div>
-}
-
-
-const MatchBadge = ({ matchType, label }: { matchType: 'full' | 'partial' | 'none', label: string }) => {
-    return <Tooltip>
-        <TooltipTrigger>
-            {matchType === 'full' ? <BadgeCheck className="text-ink-white fill-surface-green-5 size-4" /> : matchType === 'partial' ?
-                <Badge theme="orange" variant="subtle">{_("Partial Match")}</Badge> :
-                <XCircle className="text-ink-red-4 size-4" />}
-        </TooltipTrigger>
-        <TooltipContent>
-            {label}
-        </TooltipContent>
-    </Tooltip>
-}
-
-const OlderUnreconciledTransactionsBanner = () => {
-
-    // A banner to show when there are unreconciled transactions for the given bank account before the current selected date
-    const [dates, setDates] = useAtom(bankRecDateAtom)
-    const selectedBank = useAtomValue(selectedBankAccountAtom)
-
-    const { data } = useFrappeGetCall<{
-        message: {
-            count: number,
-            oldest_date: string
-        }
-    }>("erpnext.accounts.doctype.bank_reconciliation_tool.bank_reconciliation_tool.get_older_unreconciled_transactions", {
-        bank_account: selectedBank?.name,
-        from_date: dates.fromDate,
-    }, undefined, {
-        revalidateOnFocus: false,
-    })
-
-    if (data && data.message.count > 0) {
-
-        return <Alert theme='gray' variant='subtle'>
-            <AlertCircleIcon />
-            <div className="flex justify-between items-center gap-1.5">
-                <div>
-                    <AlertTitle> {data.message.count > 1 ? (
-                        <span>{_("There are {0} unreconciled transactions before {1}.", [data.message.count.toString(), formatDate(dates.fromDate)])}</span>
-                    ) : (
-                        <span>{_("There is one unreconciled transaction before {0}.", [formatDate(dates.fromDate)])}</span>
-                    )}</AlertTitle>
-                    <AlertDescription className="flex justify-between text-balance">
-                        {_("The opening balance might not match your bank statement. Would you like to reconcile them?")}
-                    </AlertDescription>
-                </div>
-                <div>
-                    <Button
-                        size='sm'
-                        type='button'
-                        theme='gray'
-                        variant='outline'
-                        onClick={() => setDates({ fromDate: data.message.oldest_date, toDate: dates.toDate })}>
-                        <span>{data.message.count > 1 ? _("View older transactions") : _("View older transaction")}</span>
-                        <ArrowRightIcon />
-                    </Button>
-                </div>
-            </div>
-        </Alert>
-    }
-
-    return null
-
-}
-
-export default MatchAndReconcile

banking/src/components/features/BankReconciliation/MatchFilters.tsx

@@ -1,93 +0,0 @@
-import { Button } from '@/components/ui/button'
-import { Popover, PopoverContent, PopoverTrigger } from '@/components/ui/popover'
-import { Tooltip, TooltipContent, TooltipTrigger } from '@/components/ui/tooltip'
-import _ from '@/lib/translate'
-import { FilterIcon } from 'lucide-react'
-import { bankRecMatchFilters } from './bankRecAtoms'
-import { useAtom } from 'jotai'
-import { Switch } from '@/components/ui/switch'
-import { Label } from '@/components/ui/label'
-import { Separator } from '@/components/ui/separator'
-import { useFrappeGetCall } from 'frappe-react-sdk'
-import { scrub } from '@/lib/frappe'
-import { useMemo } from 'react'
-
-const MatchFilters = () => {
-    return (
-        <Popover>
-            <Tooltip>
-                <PopoverTrigger asChild>
-                    <TooltipTrigger asChild>
-                        <Button size='md' isIconButton variant='outline' aria-label={_("Configure match filters for vouchers")}>
-                            <FilterIcon />
-                        </Button>
-                    </TooltipTrigger>
-                </PopoverTrigger>
-                <TooltipContent>
-                    {_("Configure match filters for vouchers")}
-                </TooltipContent>
-            </Tooltip>
-            <PopoverContent>
-                <div className="flex flex-col gap-4">
-                    <ToggleSwitch label={_("Show Only Exact Amount")} id="exact_match" />
-                    <Separator />
-                    <MatchFiltersContent />
-                    <ToggleSwitch label={_("Bank Transaction")} id="bank_transaction" />
-                </div>
-            </PopoverContent>
-        </Popover>
-    )
-}
-
-const MatchFiltersContent = () => {
-
-    const { data } = useFrappeGetCall<{ message: string[] }>("erpnext.accounts.doctype.bank_transaction.bank_transaction.get_doctypes_for_bank_reconciliation", undefined,
-        "bank_rec_doctypes", {
-        revalidateOnFocus: false,
-        revalidateIfStale: false,
-        revalidateOnReconnect: false,
-    }
-    )
-
-    const doctypes = useMemo(() => {
-        const STANDARD_DOCTYPES = ["Payment Entry", "Journal Entry", "Purchase Invoice", "Sales Invoice"]
-        if (data) {
-            return data.message.map(doctype => ({
-                label: doctype,
-                id: scrub(doctype),
-            }))
-
-        } else {
-            return STANDARD_DOCTYPES.map(doctype => ({
-                label: doctype,
-                id: scrub(doctype),
-            }))
-        }
-    }, [data])
-
-    return (
-        <div className="flex flex-col gap-4">
-            {doctypes.map((doctype) => (
-                <ToggleSwitch key={doctype.id} label={doctype.label} id={doctype.id} />
-            ))}
-        </div>
-    )
-}
-
-const ToggleSwitch = ({ label, id }: { label: string, id: string }) => {
-
-    const [matchFilters, setMatchFilters] = useAtom(bankRecMatchFilters)
-
-    return <div className="flex items-center space-x-2">
-        <Switch id={id} checked={matchFilters.includes(id)} onCheckedChange={(checked) => {
-            if (checked) {
-                setMatchFilters([...matchFilters, id])
-            } else {
-                setMatchFilters(matchFilters.filter(filter => filter !== id))
-            }
-        }} />
-        <Label htmlFor={id}>{label}</Label>
-    </div>
-}
-
-export default MatchFilters

banking/src/components/features/BankReconciliation/MissingFiltersBanner.tsx

@@ -1,10 +0,0 @@
-import { Paragraph } from "@/components/ui/typography"
-import { cn } from "@/lib/utils"
-import { ReactNode } from "react"
-
-
-export const MissingFiltersBanner = ({ text, className }: { text: ReactNode, className?: string }) => {
-    return <div className={cn("min-h-[50vh] flex items-center justify-center", className)}>
-        <Paragraph>{text}</Paragraph>
-    </div>
-}

banking/src/components/features/BankReconciliation/Rules/CreateNewRule.tsx

@@ -1,89 +0,0 @@
-import { Button } from "@/components/ui/button"
-import ErrorBanner from "@/components/ui/error-banner"
-import { Form } from "@/components/ui/form"
-import { useCurrentCompany } from "@/hooks/useCurrentCompany"
-import _ from "@/lib/translate"
-import { BankTransactionRule } from "@/types/Accounts/BankTransactionRule"
-import { useFrappeCreateDoc } from "frappe-react-sdk"
-import { toast } from "sonner"
-import { RuleForm } from "./RuleForm"
-import { useForm } from "react-hook-form"
-import { SettingsPanelHeader, SettingsPanelDescription, SettingsPanelTitle, SettingsPanelContent } from "@/components/ui/settings-dialog"
-import { useHotkeys } from "react-hotkeys-hook"
-
-type Props = {
-    onCreate: VoidFunction
-}
-
-const CreateNewRule = ({ onCreate }: Props) => {
-
-    const currentCompany = useCurrentCompany()
-
-    const form = useForm<BankTransactionRule>({
-        defaultValues: {
-            rule_name: "",
-            company: currentCompany,
-            rule_description: "",
-            transaction_type: "Any",
-            classify_as: 'Bank Entry',
-            bank_entry_type: "Single Account",
-            description_rules: [{
-                check: "Contains",
-            }]
-        }
-    })
-
-    const { createDoc, loading, error } = useFrappeCreateDoc<BankTransactionRule>()
-
-    const onSubmit = (data: BankTransactionRule) => {
-        createDoc("Bank Transaction Rule", data)
-            .then(() => {
-                toast.success(_("Rule created successfully"))
-                onCreate()
-            })
-    }
-
-
-    useHotkeys('meta+s', () => {
-        form.handleSubmit(onSubmit)()
-    }, {
-        enabled: true,
-        preventDefault: true,
-        enableOnFormTags: true
-    })
-
-    return (
-        <>
-            <SettingsPanelHeader
-                actions={
-                    <div className="flex items-center gap-2">
-                        <Button variant='outline' size='md' type='button' onClick={() => onCreate()}>{_("Cancel")}</Button>
-                        <Button type='submit' form='rule-form' size='md' disabled={loading}>
-                            {_("Save")}
-                        </Button>
-                    </div>
-                }
-            >
-                <SettingsPanelTitle>
-                    {_("New Rule")}
-                </SettingsPanelTitle>
-                <SettingsPanelDescription>
-                    {_("Create a new rule to automatically classify transactions.")}
-                </SettingsPanelDescription>
-            </SettingsPanelHeader>
-            <SettingsPanelContent className="px-0">
-                <Form {...form}>
-                    <form id='rule-form' onSubmit={form.handleSubmit(onSubmit)} className="flex flex-col justify-between h-full overflow-y-auto px-2">
-                        <div className="flex flex-col gap-4">
-                            {error && <ErrorBanner error={error} />}
-                            <RuleForm />
-                        </div>
-                    </form>
-                </Form>
-            </SettingsPanelContent>
-        </>
-
-    )
-}
-
-export default CreateNewRule

banking/src/components/features/BankReconciliation/Rules/EditRule.tsx

@@ -1,101 +0,0 @@
-import { Button } from "@/components/ui/button"
-import ErrorBanner from "@/components/ui/error-banner"
-import { Form } from "@/components/ui/form"
-import _ from "@/lib/translate"
-import { BankTransactionRule } from "@/types/Accounts/BankTransactionRule"
-import { FrappeError, useFrappeGetDoc, useFrappeUpdateDoc } from "frappe-react-sdk"
-import { toast } from "sonner"
-import { RuleForm } from "./RuleForm"
-import { useForm } from "react-hook-form"
-import { Skeleton } from "@/components/ui/skeleton"
-import { SettingsPanelContent, SettingsPanelDescription, SettingsPanelHeader, SettingsPanelTitle } from "@/components/ui/settings-dialog"
-import { useHotkeys } from "react-hotkeys-hook"
-
-type Props = {
-    onClose: VoidFunction,
-    ruleID: string
-}
-
-const EditRule = ({ onClose, ruleID }: Props) => {
-
-    const { data: rule, isValidating, error, mutate } = useFrappeGetDoc<BankTransactionRule>("Bank Transaction Rule", ruleID, undefined, {
-        revalidateOnMount: true
-    })
-
-    const { updateDoc, loading, error: updateError } = useFrappeUpdateDoc<BankTransactionRule>()
-
-    const onSubmit = (data: BankTransactionRule) => {
-        updateDoc("Bank Transaction Rule", ruleID, data)
-            .then(() => {
-                toast.success(_("Rule updated."))
-                mutate()
-                onClose()
-            })
-    }
-
-    return <>
-        <SettingsPanelHeader
-            actions={
-                <div className="flex items-center gap-2">
-                    <Button variant='outline' size='md' type='button' onClick={() => onClose()}>{_("Cancel")}</Button>
-                    <Button type='submit' form='rule-form' size='md' disabled={isValidating || loading}>
-                        {_("Save")}
-                    </Button>
-                </div>
-            }
-        >
-            <SettingsPanelTitle>
-                {rule?.rule_name}
-            </SettingsPanelTitle>
-            <SettingsPanelDescription className="sr-only">
-                {_("Edit this rule")}
-            </SettingsPanelDescription>
-        </SettingsPanelHeader>
-        <SettingsPanelContent className="px-0">
-            {isValidating && <div className="px-4 flex flex-col gap-4 h-full">
-                <Skeleton className="h-10 w-full" />
-                <Skeleton className="h-10 w-full" />
-                <Skeleton className="h-10 w-full" />
-                <Skeleton className="h-10 w-full" />
-                <Skeleton className="h-10 w-full" />
-            </div>}
-
-            {error && <div className="px-4 flex flex-col gap-4 h-full">
-                <ErrorBanner error={error} />
-            </div>}
-            {rule && <EditRuleForm rule={rule} onSubmit={onSubmit} error={updateError} />}
-        </SettingsPanelContent>
-    </>
-
-
-}
-
-const EditRuleForm = ({ rule, onSubmit, error }: { rule: BankTransactionRule, onSubmit: (data: BankTransactionRule) => void, error?: FrappeError | null }) => {
-
-    const form = useForm<BankTransactionRule>({
-        defaultValues: {
-            ...rule,
-        }
-    })
-
-    useHotkeys('meta+s', () => {
-        form.handleSubmit(onSubmit)()
-    }, {
-        enabled: true,
-        preventDefault: true,
-        enableOnFormTags: true
-    })
-
-    return (
-        <Form {...form}>
-            <form id='rule-form' onSubmit={form.handleSubmit(onSubmit)} className="flex flex-col justify-between h-full overflow-y-auto px-2">
-                <div className="flex flex-col gap-4">
-                    {error && <ErrorBanner error={error} />}
-                    <RuleForm isEdit />
-                </div>
-            </form>
-        </Form>
-    )
-}
-
-export default EditRule

banking/src/components/features/BankReconciliation/Rules/RuleForm.tsx

@@ -1,799 +0,0 @@
-import { Button } from "@/components/ui/button"
-import { Checkbox } from "@/components/ui/checkbox"
-import { Dialog, DialogTitle, DialogContent, DialogHeader, DialogDescription } from "@/components/ui/dialog"
-import { FormField, FormItem, FormLabel, FormControl } from "@/components/ui/form"
-import { AccountFormField, CurrencyFormField, DataField, LinkFormField, PartyTypeFormField, SelectFormField, SmallTextField } from "@/components/ui/form-elements"
-import { Label } from "@/components/ui/label"
-import { RadioGroup, RadioGroupItem } from "@/components/ui/radio-group"
-import { SelectItem } from "@/components/ui/select"
-import { Separator } from "@/components/ui/separator"
-import { Table, TableBody, TableCell, TableHead, TableHeader, TableRow } from "@/components/ui/table"
-import { Tooltip, TooltipContent, TooltipTrigger } from "@/components/ui/tooltip"
-import { H4, Paragraph } from "@/components/ui/typography"
-import { today } from "@/lib/date"
-import _ from "@/lib/translate"
-import { cn } from "@/lib/utils"
-import { BankTransactionRule } from "@/types/Accounts/BankTransactionRule"
-import { BankTransactionRuleAccounts } from "@/types/Accounts/BankTransactionRuleAccounts"
-import { FrappeConfig, FrappeContext } from "frappe-react-sdk"
-import { ArrowDownRight, ArrowDownUp, ArrowRightLeftIcon, ArrowUpRight, LandmarkIcon, Plus, PlusCircleIcon, ReceiptIcon, Settings, Trash2 } from "lucide-react"
-import { ChangeEvent, useCallback, useContext, useMemo, useRef, useState } from "react"
-import { useFieldArray, useFormContext, useWatch } from "react-hook-form"
-
-export const RuleForm = ({ isEdit = false }: { isEdit?: boolean }) => {
-
-    return <div className="flex flex-col gap-4">
-        <DataField
-            name='rule_name'
-            label={_("Rule Name")}
-            disabled={isEdit}
-            isRequired
-            inputProps={{
-                maxLength: 140,
-                disabled: isEdit,
-                placeholder: _("Bank Charges, Salary, etc."),
-                autoFocus: true,
-                className: "dark:disabled:bg-surface-gray-2"
-            }}
-            rules={{
-                required: _("Rule name is required")
-            }}
-        />
-
-        <CompanySelector />
-
-        <SmallTextField
-            name='rule_description'
-            label={_("Rule Description")}
-            inputProps={{
-                placeholder: _("Any debit transaction with the keyword 'Bank Fee'.")
-            }}
-        />
-
-        <TransactionTypeSelector />
-
-        <div className="grid grid-cols-2 gap-2 pt-1">
-            <CurrencyFormField
-                name='min_amount'
-                label={_("Minimum Amount")}
-            />
-
-            <CurrencyFormField
-                name='max_amount'
-                label={_("Maximum Amount")}
-            />
-        </div>
-
-        <DescriptionRules />
-
-        <Separator />
-
-        <RuleAction />
-    </div>
-}
-
-const CompanySelector = () => {
-
-    const { setValue } = useFormContext<BankTransactionRule>()
-
-    return <LinkFormField
-        name='company'
-        label={_("Company")}
-        doctype="Company"
-        isRequired
-        rules={{
-            required: _("Company is required"),
-            onChange: () => {
-                setValue('account', '')
-            }
-        }}
-    />
-
-}
-
-/** Component to render a radio group as a toggle group with options for All, Withdrawal, Deposit */
-const TransactionTypeSelector = () => {
-
-    const { control } = useFormContext<BankTransactionRule>()
-
-    return (
-        <FormField
-            control={control}
-            name='transaction_type'
-            render={({ field }) => (
-                <FormItem className="space-y-1">
-                    <FormLabel className="text-sm font-medium">
-                        {_("Transaction Type")}<span className="text-ink-red-3">*</span>
-                    </FormLabel>
-                    <FormControl>
-                        <RadioGroup
-                            onValueChange={field.onChange}
-                            value={field.value}
-                            className="grid grid-cols-3 gap-2 w-full"
-                        >
-                            <FormItem className="flex items-center">
-                                <FormControl>
-                                    <RadioGroupItem
-                                        value="Any"
-                                        className="peer sr-only hidden"
-                                    />
-                                </FormControl>
-                                <FormLabel
-                                    className={cn(
-                                        "w-full flex items-center justify-center gap-2 px-4 py-2 text-sm font-medium rounded-md border cursor-pointer transition-all hover:bg-surface-gray-1 hover:text-ink-gray-8",
-                                        "peer-data-[state=checked]:bg-surface-gray-7 peer-data-[state=checked]:text-ink-white peer-data-[state=checked]:border-outline-gray-5 peer-data-[state=checked]:hover:bg-surface-gray-7 peer-data-[state=checked]:hover:text-ink-white"
-                                    )}
-                                >
-                                    <ArrowDownUp className="w-5 h-5" />
-                                    {_("All")}
-                                </FormLabel>
-                            </FormItem>
-                            <FormItem className="flex items-center">
-                                <FormControl>
-                                    <RadioGroupItem
-                                        value="Withdrawal"
-                                        className="peer sr-only hidden"
-                                    />
-                                </FormControl>
-                                <FormLabel
-                                    className={cn(
-                                        "w-full flex items-center justify-center gap-2 px-4 py-2 text-sm font-medium rounded-md border cursor-pointer transition-all hover:bg-surface-gray-1 hover:text-ink-gray-8",
-                                        "peer-data-[state=checked]:bg-surface-red-5 peer-data-[state=checked]:text-white peer-data-[state=checked]:border-bg-surface-red-5 peer-data-[state=checked]:hover:bg-surface-red-5 peer-data-[state=checked]:hover:text-white"
-                                    )}
-                                >
-                                    <ArrowUpRight className="w-5 h-5 peer-data-[state=checked]:text-ink-red-3" />
-                                    {_("Withdrawal")}
-                                </FormLabel>
-                            </FormItem>
-                            <FormItem className="flex items-center">
-                                <FormControl>
-                                    <RadioGroupItem
-                                        value="Deposit"
-                                        className="peer sr-only hidden"
-                                    />
-                                </FormControl>
-                                <FormLabel
-                                    className={cn(
-                                        "w-full flex items-center justify-center gap-2 px-4 py-2 text-sm font-medium rounded-md border cursor-pointer transition-all hover:bg-surface-gray-1 hover:text-ink-gray-8",
-                                        "peer-data-[state=checked]:bg-surface-green-5 peer-data-[state=checked]:text-white peer-data-[state=checked]:border-surface-green-5 peer-data-[state=checked]:hover:bg-surface-green-5 peer-data-[state=checked]:hover:text-white"
-                                    )}
-                                >
-                                    <ArrowDownRight className="w-5 h-5 peer-data-[state=checked]:text-white" />
-                                    {_("Deposit")}
-                                </FormLabel>
-                            </FormItem>
-                        </RadioGroup>
-                    </FormControl>
-                </FormItem>
-            )}
-        />
-    )
-}
-
-const DescriptionRules = () => {
-
-    const { control } = useFormContext<BankTransactionRule>()
-
-    const { fields, append, remove } = useFieldArray({
-        control,
-        name: "description_rules"
-    })
-
-    const addRow = () => {
-        // @ts-expect-error - we don't need all fields here
-        append({ check: "Contains" })
-    }
-
-    return (
-        <div className="flex flex-col gap-2 pt-1">
-            <span className="text-sm font-medium">{_("Rules to match against the transaction description")} <span className="text-ink-red-3">*</span></span>
-            {fields.map((field, index) => (
-                <div key={field.id} className="flex w-full items-center gap-2">
-                    <div className="min-w-36">
-                        <SelectFormField
-                            label={_("Type of check")}
-                            hideLabel
-                            name={`description_rules.${index}.check`}
-                            rules={{
-                                required: _("This is required")
-                            }}>
-                            <SelectItem value="Contains">{_("Contains")}</SelectItem>
-                            <SelectItem value="Starts With">{_("Starts with")}</SelectItem>
-                            <SelectItem value="Ends With">{_("Ends with")}</SelectItem>
-                            <SelectItem value="Regex">{_("Regex")}</SelectItem>
-                        </SelectFormField>
-                    </div>
-                    <div className="w-full">
-                        <DataField
-                            name={`description_rules.${index}.value`}
-                            label={_("Value")}
-                            hideLabel
-                            inputProps={{
-                                placeholder: _("Bank Fee, Salary, etc."),
-                            }}
-                        />
-                    </div>
-                    <div>
-                        <Button variant="ghost" theme='red' type='button' isIconButton onClick={() => remove(index)} disabled={fields.length === 1}>
-                            <Trash2 />
-                        </Button>
-                    </div>
-                </div>
-            ))}
-
-            <div>
-                <Button variant="outline" type='button' onClick={addRow}>
-                    <PlusCircleIcon />
-                    {_("Add Rule")}
-                </Button>
-            </div>
-
-        </div>
-    )
-}
-
-const RuleAction = () => {
-
-    const { control } = useFormContext<BankTransactionRule>()
-
-    const classify_as = useWatch({ control, name: "classify_as" })
-    const party_type = useWatch({ control, name: "party_type" })
-    const bank_entry_type = useWatch({ control, name: "bank_entry_type" })
-
-    const accountType = useMemo(() => {
-        if (classify_as === "Payment Entry") {
-            return party_type === "Supplier" ? ["Payable"] : ["Receivable"]
-        }
-
-        if (classify_as === "Transfer") {
-            return ["Bank", "Cash", "Temporary"]
-        }
-
-        return undefined
-
-    }, [classify_as, party_type])
-
-    return (
-        <div className="flex flex-col gap-4">
-            <H4 className="text-base text-ink-gray-7">{_("If rule matches, then:")}</H4>
-
-            <SelectFormField
-                name='classify_as'
-                isRequired
-                label={_("Suggest creating a")}
-                formDescription={_("This will just suggest creating a new entry, and will not automatically create it.")}
-                rules={{
-                    required: _("This is required")
-                }}
-            >
-                <SelectItem value="Bank Entry"><LandmarkIcon /> {_("Bank Entry")}</SelectItem>
-                <SelectItem value="Payment Entry"><ReceiptIcon /> {_("Payment Entry")}</SelectItem>
-                <SelectItem value="Transfer"><ArrowRightLeftIcon /> {_("Transfer")}</SelectItem>
-            </SelectFormField>
-
-            {classify_as === "Bank Entry" && (<SelectFormField
-                name='bank_entry_type'
-                isRequired
-                label={_("Create Bank Entry against")}
-                rules={{
-                    required: _("This is required")
-                }}
-            >
-                <SelectItem value="Single Account">{_("Single Account")}</SelectItem>
-                <SelectItem value="Multiple Accounts">{_("Multiple Accounts (Journal Template)")}</SelectItem>
-            </SelectFormField>)}
-
-
-            {classify_as === "Payment Entry" && (
-                <div className='grid grid-cols-4 gap-4'>
-                    <div className="col-span-1">
-                        <PartyTypeFormField
-                            name='party_type'
-                            label={_("Party Type")}
-                            isRequired
-                            inputProps={{
-                                triggerProps: {
-                                    className: 'w-full'
-                                },
-                            }}
-                            rules={{
-                                required: "Party Type is required"
-                            }}
-                        />
-                    </div>
-                    <div className="col-span-3">
-                        <PartyField />
-                    </div>
-                </div>
-            )}
-
-            {(((bank_entry_type === "Single Account" || !bank_entry_type) && classify_as === "Bank Entry") || classify_as !== "Bank Entry") && (<AccountFormField
-                name='account'
-                label={_("Account")}
-                isRequired
-                rules={{
-                    required: _("Account is required")
-                }}
-                account_type={accountType}
-            />)}
-
-            {bank_entry_type === "Multiple Accounts" && classify_as === "Bank Entry" && <MultipleAccountsSelection />}
-        </div>
-    )
-}
-
-const PartyField = () => {
-
-    const { control, setValue } = useFormContext<BankTransactionRule>()
-
-    const party_type = useWatch({
-        control,
-        name: `party_type`
-    })
-
-    const { call } = useContext(FrappeContext) as FrappeConfig
-
-    const company = useWatch({ control, name: 'company' })
-
-    const onChange = (event: ChangeEvent<HTMLInputElement>) => {
-        // Fetch the party and account
-        if (event.target.value) {
-            call.get('erpnext.accounts.doctype.payment_entry.payment_entry.get_party_details', {
-                company: company,
-                party_type: party_type,
-                party: event.target.value,
-                date: today()
-            }).then((res) => {
-                setValue('account', res.message.party_account)
-            })
-        } else {
-            // Clear the account
-            setValue('account', '')
-        }
-
-    }
-
-    if (!party_type) {
-        return <DataField
-            name={`party`}
-            label={_("Party")}
-            isRequired
-            inputProps={{
-                disabled: true,
-            }}
-        />
-    }
-
-    return <LinkFormField
-        name={`party`}
-        label={_("Party")}
-        rules={{
-            onChange
-        }}
-        doctype={party_type}
-
-    />
-}
-
-const MultipleAccountsSelection = () => {
-
-
-    const { control } = useFormContext<BankTransactionRule>()
-
-    const accounts = useWatch({
-        control,
-        name: 'accounts'
-    }) ?? []
-
-    const [isConfigureAccountsModalOpen, setIsConfigureAccountsModalOpen] = useState(false)
-
-
-
-    return <div className="flex flex-col gap-2">
-        <div className="flex justify-between gap-2">
-            <Label>{_("Journal Template Accounts")}<span className="text-ink-red-3">*</span></Label>
-            <Button variant="outline" type="button" onClick={() => setIsConfigureAccountsModalOpen(true)}><Settings /> {_("Configure Accounts")}</Button>
-        </div>
-
-
-        <Table>
-            <TableHeader>
-                <TableRow>
-                    <TableHead>{_("Account")}</TableHead>
-                    <TableHead className="text-end">{_("Debit")}</TableHead>
-                    <TableHead className="text-end">{_("Credit")}</TableHead>
-                </TableRow>
-            </TableHeader>
-            <TableBody>
-                {accounts.length === 0 && (
-                    <TableRow>
-                        <TableCell colSpan={3} className="text-center">
-                            <div className="py-2 flex flex-col gap-2 items-center">
-                                <span>{_("No accounts configured")}</span>
-                                <Button variant="subtle" type="button" onClick={() => setIsConfigureAccountsModalOpen(true)}>{_("Configure Accounts")}</Button>
-                            </div>
-                        </TableCell>
-                    </TableRow>
-                )}
-                {accounts.map((account, index) => (
-                    <TableRow key={index}>
-                        <TableCell>{account.account}</TableCell>
-                        {index === accounts.length - 1 ? <TableCell className="text-end bg-surface-gray-1" colSpan={2}>
-                            <Tooltip>
-                                <TooltipTrigger asChild>
-                                    <span className="text-ink-gray-5">{_("This is auto computed to balance the journal entry.")}</span>
-                                </TooltipTrigger>
-                                <TooltipContent>
-                                    {_("Based on the above entries, the balance amount (debit or credit) will be set for the last row to balance the journal entry.")}
-                                </TooltipContent>
-                            </Tooltip>
-                        </TableCell> : <>
-                            <TableCell className="font-numeric text-end"><AmountFormulaRenderer value={account.debit} /></TableCell>
-                            <TableCell className="font-numeric text-end"><AmountFormulaRenderer value={account.credit} /></TableCell>
-                        </>}
-                    </TableRow>
-                ))}
-            </TableBody>
-        </Table>
-
-        <ConfigureAccountsModal open={isConfigureAccountsModalOpen} onClose={() => setIsConfigureAccountsModalOpen(false)} />
-    </div>
-}
-
-const AmountFormulaRenderer = ({ value }: { value?: string }) => {
-
-    // If it's a string and cannot be a number, then show it as a formula
-
-    if (isNaN(Number(value))) {
-
-        let calculatedValue = "";
-
-        try {
-            calculatedValue = window.eval(`const transaction_amount = 200; ${value}`);
-        } catch (error: unknown) {
-            console.error(error);
-            calculatedValue = "Error";
-        }
-
-        const isComputationValid = !isNaN(Number(calculatedValue)) && calculatedValue !== undefined && calculatedValue !== null;
-
-        return <Tooltip>
-            <TooltipTrigger asChild>
-                <span className={cn("font-numeric text-end tabular-nums underline underline-offset-4", isComputationValid ? "" : "text-ink-red-3")}>{value}</span>
-            </TooltipTrigger>
-            <TooltipContent className={isComputationValid ? "" : "bg-surface-red-5"} arrowClassName={isComputationValid ? "" : "bg-surface-red-5 fill-surface-red-5"}>
-                <p className="text-sm">
-                    {isComputationValid ? _("This is a formula based value.") : _("This is not a valid formula. Check the variable used in the formula.")}
-                    <br /><br />
-                    {_("Example: If the transaction amount is 200, then this will be calculated as {} = {}", [value ?? "", calculatedValue])}
-                </p>
-            </TooltipContent>
-        </Tooltip>
-    }
-
-    return <span className="font-numeric text-end tabular-nums">{value}</span>
-}
-
-const ConfigureAccountsModal = ({ open, onClose }: { open: boolean, onClose: () => void }) => {
-
-
-    return <Dialog
-        open={open}
-        onOpenChange={onClose}
-    >
-        <DialogContent className='min-w-[95vw]'>
-            <ConfigureAccountsModalContent />
-        </DialogContent>
-    </Dialog>
-}
-
-const ConfigureAccountsModalContent = () => {
-
-    const { control, getValues, setValue } = useFormContext<BankTransactionRule>()
-
-    const { call } = useContext(FrappeContext) as FrappeConfig
-
-    // const costCenterMapRef = useRef<Record<string, string>>({})
-
-    const partyMapRef = useRef<Record<string, string>>({})
-
-    const onPartyChange = (value: string, index: number) => {
-        // Get the account for the party type
-        if (value) {
-            if (partyMapRef.current[value]) {
-                setValue(`accounts.${index}.account`, partyMapRef.current[value])
-            } else {
-                call.get('erpnext.accounts.party.get_party_account', {
-                    party: value,
-                    party_type: getValues(`accounts.${index}.party_type`),
-                    company: company
-                }).then((result: { message: string }) => {
-                    setValue(`accounts.${index}.account`, result.message)
-                    partyMapRef.current[value] = result.message
-                })
-            }
-        } else {
-            setValue(`accounts.${index}.account`, '')
-        }
-    }
-
-    const transaction_type = useWatch({
-        name: 'transaction_type',
-        control,
-    })
-
-    const { fields, append, remove } = useFieldArray({
-        control,
-        name: 'accounts'
-    })
-
-
-    const [selectedRows, setSelectedRows] = useState<number[]>([])
-
-    const onSelectRow = useCallback((index: number) => {
-        setSelectedRows(prev => {
-            if (prev.includes(index)) {
-                return prev.filter(i => i !== index)
-            }
-            return [...prev, index]
-        })
-    }, [])
-
-    const onSelectAll = useCallback(() => {
-        setSelectedRows(prev => {
-            if (prev.length === fields.length) {
-                return []
-            }
-            return [...fields.map((_, index) => index)]
-        })
-    }, [fields])
-
-    const onAdd = () => {
-        append({
-            party_type: '',
-            party: '',
-            account: '',
-            debit: '',
-            credit: '',
-            user_remark: ''
-        } as BankTransactionRuleAccounts, {
-            focusName: `accounts.${fields.length}.account`
-        })
-    }
-
-    const onRemove = useCallback(() => {
-        remove(selectedRows)
-        setSelectedRows([])
-    }, [remove, selectedRows])
-
-    const isWithdrawal = transaction_type === 'Withdrawal'
-
-    const company = useWatch({
-        name: 'company',
-        control,
-    })
-
-    return <>
-        <DialogHeader>
-            <DialogTitle>{_("Configure Accounts for Bank Entry")}</DialogTitle>
-            <DialogDescription>{_("Add all accounts that you want to split the transaction into.")}</DialogDescription>
-        </DialogHeader>
-        <div className="flex flex-col gap-2">
-            <Table>
-                <TableHeader>
-                    <TableRow>
-                        <TableHead><Checkbox
-                            disabled={fields.length === 0}
-                            // Make this accessible to screen readers
-                            aria-label={_("Select all")}
-                            checked={selectedRows.length > 0 && selectedRows.length === fields.length}
-                            onCheckedChange={onSelectAll} /></TableHead>
-                        <TableHead>{_("Party")}</TableHead>
-                        <TableHead>{_("Account")} <span className="text-ink-red-3">*</span></TableHead>
-                        {/* <TableHead>{_("Cost Center")}</TableHead> */}
-                        <TableHead>{_("Remarks")}</TableHead>
-                        <TableHead className="text-end">{_("Debit")}</TableHead>
-                        <TableHead className="text-end">{_("Credit")}</TableHead>
-                    </TableRow>
-                </TableHeader>
-                <TableBody>
-                    <TableRow className="bg-surface-gray-1 cursor-not-allowed" title={_("This is the row for the bank account. It will be auto populated based on the bank transaction.")}>
-                        <TableCell>
-                            <Checkbox disabled />
-                        </TableCell>
-                        <TableCell className="align-top">
-                        </TableCell>
-                        <TableCell className="align-top text-ink-gray-5">
-                            <span className="px-2">
-                                Bank GL Account
-                            </span>
-                        </TableCell>
-                        <TableCell className="align-top">
-                        </TableCell>
-
-                        <TableCell className={"align-top text-end"}>
-                            <span className="text-ink-gray-5 text-sm">
-                                {transaction_type === "Withdrawal" || transaction_type === "Any" ? _("Will be auto-populated") : ""}
-                            </span>
-                        </TableCell>
-                        <TableCell className={"text-end align-top"}>
-                            <span className="text-ink-gray-5 text-sm">
-                                {transaction_type === "Deposit" || transaction_type === "Any" ? _("Will be auto-populated") : ""}
-                            </span>
-                        </TableCell>
-                    </TableRow>
-                    {fields.map((field, index) => (
-                        <TableRow key={field.id}>
-                            <TableCell>
-                                <Checkbox
-                                    checked={selectedRows.includes(index)}
-                                    onCheckedChange={() => onSelectRow(index)}
-                                    // Make this accessible to screen readers
-                                    aria-label={_("Select row {0}", [String(index + 1)])}
-                                />
-                            </TableCell>
-
-                            <TableCell className="align-top">
-                                <div className="flex">
-                                    <PartyTypeFormField
-                                        name={`accounts.${index}.party_type`}
-                                        label={_("Party Type")}
-                                        isRequired
-                                        hideLabel
-                                        inputProps={{
-                                            type: isWithdrawal ? 'Payable' : 'Receivable',
-                                            triggerProps: {
-                                                className: 'rounded-e-none',
-                                                tabIndex: -1
-                                            },
-                                        }} />
-                                    <PartyRowField index={index} onChange={onPartyChange} />
-                                </div>
-
-                            </TableCell>
-                            <TableCell className="align-top">
-                                <AccountFormField
-                                    name={`accounts.${index}.account`}
-                                    label={_("Account")}
-                                    rules={{
-                                        required: _("Account is required"),
-                                        // onChange: (event) => {
-                                        //     onAccountChange(event.target.value, index)
-                                        // }
-                                    }}
-                                    buttonClassName="min-w-64"
-                                    isRequired
-                                    hideLabel
-                                />
-                            </TableCell>
-                            {/* <TableCell className="align-top">
-                                <LinkFormField
-                                    doctype="Cost Center"
-                                    name={`accounts.${index}.cost_center`}
-                                    label={_("Cost Center")}
-                                    filters={[["company", "=", company], ["is_group", "=", 0], ["disabled", "=", 0]]}
-                                    buttonClassName="min-w-48"
-                                    readOnly={index === 0}
-                                    hideLabel
-                                />
-                            </TableCell> */}
-                            <TableCell className="align-top">
-                                <DataField
-                                    name={`accounts.${index}.user_remark`}
-                                    label={_("Remarks")}
-                                    inputProps={{
-                                        placeholder: _("e.g. Bank Charges"),
-                                        className: 'min-w-64',
-                                    }}
-                                    hideLabel
-                                />
-                            </TableCell>
-                            <TableCell
-                                className={cn("text-end align-top", index === fields.length - 1 ? "cursor-not-allowed" : "")}
-                                title={index === fields.length - 1 ? _("This is the last row. It will be auto populated based on the bank transaction.") : ""}>
-                                <DataField
-                                    name={`accounts.${index}.debit`}
-                                    label={_("Debit")}
-                                    disabled={index === fields.length - 1}
-                                    inputProps={{
-                                        className: 'text-end',
-                                        placeholder: _("0.00"),
-                                        disabled: index === fields.length - 1
-                                    }}
-                                    hideLabel
-                                />
-                            </TableCell>
-                            <TableCell
-                                className={cn("text-end align-top", index === fields.length - 1 ? "cursor-not-allowed" : "")}
-                                title={index === fields.length - 1 ? _("This is the last row. It will be auto populated based on the bank transaction.") : ""}>
-                                <DataField
-                                    name={`accounts.${index}.credit`}
-                                    label={_("Credit")}
-                                    disabled={index === fields.length - 1}
-                                    inputProps={{
-                                        className: 'text-end',
-                                        placeholder: _("0.00"),
-                                        disabled: index === fields.length - 1
-                                    }}
-                                    hideLabel
-                                />
-                            </TableCell>
-                        </TableRow>
-                    ))}
-                </TableBody>
-            </Table>
-            <div className="flex justify-between gap-2">
-                <div className="flex gap-2 justify-end">
-                    <div>
-                        <Button size='sm' type='button' variant={'outline'} onClick={onAdd}><Plus /> {_("Add Row")}</Button>
-                    </div>
-                    {selectedRows.length > 0 && <div>
-                        <Button size='sm' type='button' theme="red" onClick={onRemove}><Trash2 /> {_("Remove")}</Button>
-                    </div>}
-                </div>
-            </div>
-            <div className="py-4">
-                <Separator />
-            </div>
-
-            <div className="flex flex-col gap-2">
-                <H4 className="text-base text-ink-gray-7">{_("Help")}</H4>
-
-                <Paragraph className="text-p-sm">{(_("You can set up the rule to split the transaction across multiple accounts."))}
-                    <br />{_("You can also add credit or debit values to pre-fill - these support both static values (like 200) or formulas (like transaction_amount * 0.25).")}
-                    <br />
-                    <br />
-                    <span className="font-medium">{_("Example")}:</span>
-                    <br />
-                    <span className="font-numeric text-sm">
-                        transaction_amount * 0.25
-                    </span>
-                    <br />
-                    <span>
-                        {_("In this case, the amount will be calculated as 25% of the transaction amount. If the transaction amount is 200, then this will be calculated as 200 * 0.25 = 50.")}
-                    </span>
-                </Paragraph>
-            </div>
-
-
-        </div>
-    </>
-}
-
-
-const PartyRowField = ({ index, onChange }: { index: number, onChange: (value: string, index: number) => void }) => {
-
-    const { control } = useFormContext<BankTransactionRule>()
-
-    const party_type = useWatch({
-        control,
-        name: `accounts.${index}.party_type`
-    })
-
-    if (!party_type) {
-        return <DataField
-            name={`accounts.${index}.party`}
-            label={_("Party")}
-            isRequired
-            inputProps={{
-                disabled: true,
-                className: 'rounded-s-none border-s-0 min-w-64'
-            }}
-            hideLabel
-        />
-    }
-
-    return <LinkFormField
-        name={`accounts.${index}.party`}
-        label={_("Party")}
-        rules={{
-            onChange: (event) => {
-                onChange(event.target.value, index)
-            },
-        }}
-        hideLabel
-        buttonClassName="rounded-s-none border-s-0 min-w-64"
-        doctype={party_type}
-
-    />
-}

banking/src/components/features/BankReconciliation/SelectedTransactionDetails.tsx

@@ -1,73 +0,0 @@
-import { useMemo } from 'react'
-import { ArrowDownRight, ArrowUpRight, Calendar } from 'lucide-react'
-import { formatCurrency } from '@/lib/numbers'
-import { formatDate } from '@/lib/date'
-import { UnreconciledTransaction, useGetBankAccounts } from './utils'
-import { getCompanyCurrency } from '@/lib/company'
-import { Card, CardContent } from '@/components/ui/card'
-import { cn } from '@/lib/utils'
-import _ from '@/lib/translate'
-import BankLogo from '@/components/common/BankLogo'
-
-type Props = {
-    transaction: UnreconciledTransaction,
-    showAccount?: boolean,
-    account?: string
-}
-
-const SelectedTransactionDetails = ({ transaction, showAccount = false, account }: Props) => {
-
-    const isWithdrawal = transaction.withdrawal && transaction.withdrawal > 0
-
-    const { banks } = useGetBankAccounts()
-
-    const bank = useMemo(() => {
-        if (transaction.bank_account) {
-            return banks?.find((bank) => bank.name === transaction.bank_account)
-        }
-        return null
-    }, [transaction.bank_account, banks])
-
-    const amount = transaction.withdrawal ? transaction.withdrawal : transaction.deposit
-
-    const currency = transaction.currency || getCompanyCurrency(transaction.company ?? '')
-
-    return (
-        <Card className='py-4'>
-            <CardContent className='px-4'>
-                <div className='flex flex-col gap-2'>
-                    <div className='flex justify-between'>
-                        <div className='flex flex-col gap-2'>
-                            <div className='flex flex-col gap-1'>
-                                <BankLogo bank={bank} iconSize='30px' imageClassName='h-10 max-w-20' />
-                                <span className='font-medium text-sm'>{transaction.bank_account}</span>
-                            </div>
-                            <div className='flex items-center gap-1'>
-                                <Calendar size='16px' />
-                                <span className='text-sm'>{formatDate(transaction.date, 'Do MMM YYYY')}</span>
-                            </div>
-                        </div>
-                        <div className='flex flex-col gap-1'>
-                            <div className={cn('flex items-center gap-1 text-end px-0 justify-end py-1 rounded-sm',
-                                isWithdrawal ? 'text-ink-red-3' : 'text-ink-green-3'
-                            )}>
-                                {isWithdrawal ? <ArrowUpRight className="w-5 h-5 text-ink-red-3" /> : <ArrowDownRight className="w-5 h-5 text-ink-green-3" />}
-                                <span className='text-sm font-semibold uppercase'>{isWithdrawal ? _('Spent') : _('Received')}</span>
-                            </div>
-                            <span className='font-semibold font-numeric text-lg text-end pe-0.5'>{formatCurrency(amount, currency)}</span>
-                            {transaction.unallocated_amount && transaction.unallocated_amount !== amount ? <span className='text-ink-gray-5'>{_("Unallocated")}: {formatCurrency(transaction.unallocated_amount)}</span> : null}
-                        </div>
-                    </div>
-                    <div className='flex flex-col gap-1'>
-                        <span className='text-sm'>{transaction.description}</span>
-                        {transaction.reference_number ? <span className='text-sm text-ink-gray-5'>{_("Ref")}: {transaction.reference_number}</span> : null}
-                        {showAccount && account ? <span className='text-sm text-ink-gray-5'>{_("GL Account")}: {account}</span> : null}
-                    </div>
-
-                </div>
-            </CardContent >
-        </Card >
-    )
-}
-
-export default SelectedTransactionDetails

banking/src/components/features/BankReconciliation/SelectedTransactionsTable.tsx

@@ -1,47 +0,0 @@
-import { Table, TableBody, TableCell, TableHead, TableHeader, TableRow } from '@/components/ui/table'
-import _ from '@/lib/translate'
-import { useAtomValue } from 'jotai'
-import { bankRecSelectedTransactionAtom, selectedBankAccountAtom } from './bankRecAtoms'
-import { formatDate } from '@/lib/date'
-import { formatCurrency } from '@/lib/numbers'
-import { ArrowDownRight, ArrowUpRight } from 'lucide-react'
-
-const SelectedTransactionsTable = () => {
-
-    const selectedBankAccount = useAtomValue(selectedBankAccountAtom)
-
-    const transactions = useAtomValue(bankRecSelectedTransactionAtom(selectedBankAccount?.name ?? ''))
-    return (
-        <Table>
-            <TableHeader>
-                <TableRow>
-                    <TableHead>
-                        {_("Date")}
-                    </TableHead>
-                    <TableHead>
-                        {_("Description")}
-                    </TableHead>
-                    <TableHead className="text-end">
-                        {_("Amount")}
-                    </TableHead>
-                </TableRow>
-            </TableHeader>
-            <TableBody>
-                {transactions.map((transaction) => (
-                    <TableRow key={transaction.name}>
-                        <TableCell>{formatDate(transaction.date)}</TableCell>
-                        <TableCell className="max-w-96 text-ellipsis overflow-hidden" title={transaction.description}>{transaction.description}</TableCell>
-                        <TableCell className="text-end flex items-center justify-end gap-1">
-                            {transaction.withdrawal && transaction.withdrawal > 0 ? <ArrowUpRight className="w-4 h-4 text-ink-red-3" /> : <ArrowDownRight className="w-4 h-4 text-ink-green-3" />}
-                            <span className="font-numeric font-medium">
-                                {formatCurrency(transaction.unallocated_amount, transaction.currency ?? '')}
-                            </span>
-                        </TableCell>
-                    </TableRow>
-                ))}
-            </TableBody>
-        </Table>
-    )
-}
-
-export default SelectedTransactionsTable

banking/src/components/features/BankReconciliation/TransferModal.tsx

@@ -1,555 +0,0 @@
-import { useAtom, useAtomValue, useSetAtom } from 'jotai'
-import { bankRecSelectedTransactionAtom, bankRecTransferModalAtom, bankRecUnreconcileModalAtom, SelectedBank, selectedBankAccountAtom } from './bankRecAtoms'
-import { Dialog, DialogContent, DialogHeader, DialogFooter, DialogClose, DialogTitle, DialogDescription } from '@/components/ui/dialog'
-import _ from '@/lib/translate'
-import { UnreconciledTransaction, useGetBankAccounts, useGetRuleForTransaction, useRefreshUnreconciledTransactions, useUpdateActionLog } from './utils'
-import { Button } from '@/components/ui/button'
-import SelectedTransactionDetails from './SelectedTransactionDetails'
-import { PaymentEntry } from '@/types/Accounts/PaymentEntry'
-import { useForm, useFormContext, useWatch } from 'react-hook-form'
-import { FrappeConfig, FrappeContext, useFrappeGetCall, useFrappePostCall } from 'frappe-react-sdk'
-import { toast } from 'sonner'
-import ErrorBanner from '@/components/ui/error-banner'
-import { H4 } from '@/components/ui/typography'
-import { cn } from '@/lib/utils'
-import { ArrowRight, Banknote, BadgeCheck, Calendar, ArrowUpRight, ArrowDownRight, CheckIcon, CheckCircle, ArrowLeft } from 'lucide-react'
-import { Separator } from '@/components/ui/separator'
-import { Form } from '@/components/ui/form'
-import { AccountFormField, DataField, DateField, SmallTextField } from '@/components/ui/form-elements'
-import SelectedTransactionsTable from './SelectedTransactionsTable'
-import { useCurrentCompany } from '@/hooks/useCurrentCompany'
-import { formatDate } from '@/lib/date'
-import { useContext, useMemo, useState } from 'react'
-import { formatCurrency } from '@/lib/numbers'
-import { Label } from '@/components/ui/label'
-import { FileDropzone } from '@/components/ui/file-dropzone'
-import FileUploadBanner from '@/components/common/FileUploadBanner'
-import { BankTransaction } from '@/types/Accounts/BankTransaction'
-import { useHotkeys } from 'react-hotkeys-hook'
-import { useDirection } from '@/components/ui/direction'
-import BankLogo from '@/components/common/BankLogo'
-
-const TransferModal = () => {
-
-    const [isOpen, setIsOpen] = useAtom(bankRecTransferModalAtom)
-
-    return (
-        <Dialog open={isOpen} onOpenChange={setIsOpen}>
-            <DialogContent className='min-w-7xl'>
-                <DialogHeader>
-                    <DialogTitle>{_("Transfer")}</DialogTitle>
-                    <DialogDescription>
-                        {_("Record an internal transfer to another bank/credit card/cash account.")}
-                    </DialogDescription>
-                </DialogHeader>
-                <TransferModalContent />
-            </DialogContent>
-        </Dialog>
-    )
-}
-
-const TransferModalContent = () => {
-
-    const selectedBankAccount = useAtomValue(selectedBankAccountAtom)
-
-    const selectedTransaction = useAtomValue(bankRecSelectedTransactionAtom(selectedBankAccount?.name ?? ''))
-
-    if (!selectedTransaction || !selectedBankAccount || selectedTransaction.length === 0) {
-        return <div className='p-4'>
-            <span className='text-center'>{_("No transaction selected")}</span>
-        </div>
-    }
-
-    if (selectedTransaction.length === 1) {
-        return <InternalTransferForm
-            selectedBankAccount={selectedBankAccount}
-            selectedTransaction={selectedTransaction[0]} />
-    }
-
-    return <BulkInternalTransferForm transactions={selectedTransaction} />
-
-}
-
-const BulkInternalTransferForm = ({ transactions }: { transactions: UnreconciledTransaction[] }) => {
-
-    const form = useForm<{
-        bank_account: string
-    }>()
-
-    const setIsOpen = useSetAtom(bankRecTransferModalAtom)
-
-    const { call: createPaymentEntry, loading, error } = useFrappePostCall<{ message: { transaction: BankTransaction, payment_entry: PaymentEntry }[] }>('erpnext.accounts.doctype.bank_reconciliation_tool.bank_reconciliation_tool.create_bulk_internal_transfer')
-
-    const onReconcile = useRefreshUnreconciledTransactions()
-    const addToActionLog = useUpdateActionLog()
-
-    const onSubmit = (data: { bank_account: string }) => {
-
-        createPaymentEntry({
-            bank_transaction_names: transactions.map((transaction) => transaction.name),
-            bank_account: data.bank_account
-        }).then(({ message }) => {
-            addToActionLog({
-                type: 'transfer',
-                timestamp: (new Date()).getTime(),
-                isBulk: true,
-                items: message.map((item) => ({
-                    bankTransaction: item.transaction,
-                    voucher: {
-                        reference_doctype: "Payment Entry",
-                        reference_name: item.payment_entry.name,
-                        posting_date: item.payment_entry.posting_date,
-                        doc: item.payment_entry,
-                    }
-                })),
-                bulkCommonData: {
-                    bank_account: data.bank_account,
-                }
-            })
-            toast.success(_("Transfer Recorded"), {
-                duration: 4000,
-                closeButton: true,
-            })
-            onReconcile(transactions[transactions.length - 1])
-            setIsOpen(false)
-        })
-
-    }
-
-    const onAccountChange = (account: string) => {
-        form.setValue('bank_account', account)
-    }
-
-    const selectedAccount = useWatch({ control: form.control, name: 'bank_account' })
-
-    const currentCompany = useCurrentCompany()
-
-    const company = transactions && transactions.length > 0 ? transactions[0].company : (currentCompany ?? '')
-
-    console.log("This is here", transactions)
-
-    return <Form {...form}>
-        <form onSubmit={form.handleSubmit(onSubmit)}>
-            <div className='flex flex-col gap-4'>
-
-                {error && <ErrorBanner error={error} />}
-
-                <SelectedTransactionsTable />
-
-                <BankOrCashPicker company={company} bankAccount={transactions[0]?.bank_account ?? ''} onAccountChange={onAccountChange} selectedAccount={selectedAccount} />
-
-                <DialogFooter>
-                    <DialogClose asChild>
-                        <Button size='md' variant={'outline'} disabled={loading}>{_("Cancel")}</Button>
-                    </DialogClose>
-                    <Button size='md' type='submit' disabled={loading}>{_("Transfer")}</Button>
-                </DialogFooter>
-            </div>
-        </form>
-
-    </Form>
-}
-
-interface InternalTransferFormFields extends PaymentEntry {
-    mirror_transaction_name?: string
-}
-
-const InternalTransferForm = ({ selectedBankAccount, selectedTransaction }: { selectedBankAccount: SelectedBank, selectedTransaction: UnreconciledTransaction }) => {
-
-
-    const setIsOpen = useSetAtom(bankRecTransferModalAtom)
-
-    const onClose = () => {
-        setIsOpen(false)
-    }
-
-    const { data: rule } = useGetRuleForTransaction(selectedTransaction)
-
-    const isWithdrawal = (selectedTransaction.withdrawal && selectedTransaction.withdrawal > 0) ? true : false
-
-    const form = useForm<InternalTransferFormFields>({
-        defaultValues: {
-            payment_type: 'Internal Transfer',
-            company: selectedTransaction?.company,
-            // If the transaction is a withdrawal, set the paid from to the selected bank account
-            paid_from: isWithdrawal ? selectedBankAccount.account : (rule?.account ?? ''),
-            // If the transaction is a deposit, set the paid to to the selected bank account
-            paid_to: !isWithdrawal ? selectedBankAccount.account : (rule?.account ?? ''),
-            // Set the amount to the amount of the selected transaction
-            paid_amount: selectedTransaction.unallocated_amount,
-            received_amount: selectedTransaction.unallocated_amount,
-            reference_date: selectedTransaction.date,
-            posting_date: selectedTransaction.date,
-            reference_no: (selectedTransaction.reference_number || selectedTransaction.description || '').slice(0, 140),
-        }
-    })
-
-    const onReconcile = useRefreshUnreconciledTransactions()
-
-    const { call: createPaymentEntry, loading, error, isCompleted } = useFrappePostCall<{ message: { transaction: BankTransaction, payment_entry: PaymentEntry } }>('erpnext.accounts.doctype.bank_reconciliation_tool.bank_reconciliation_tool.create_internal_transfer')
-
-    const setBankRecUnreconcileModalAtom = useSetAtom(bankRecUnreconcileModalAtom)
-    const addToActionLog = useUpdateActionLog()
-
-    const { file: frappeFile } = useContext(FrappeContext) as FrappeConfig
-
-    const [isUploading, setIsUploading] = useState(false)
-    const [uploadProgress, setUploadProgress] = useState(0)
-
-    const [files, setFiles] = useState<File[]>([])
-
-    const onSubmit = (data: InternalTransferFormFields) => {
-
-        createPaymentEntry({
-            bank_transaction_name: selectedTransaction.name,
-            ...data,
-            custom_remarks: data.remarks ? true : false,
-            // Pass this to reconcile both at the same time
-            mirror_transaction_name: data.mirror_transaction_name
-        }).then(async ({ message }) => {
-            addToActionLog({
-                type: 'transfer',
-                timestamp: (new Date()).getTime(),
-                isBulk: false,
-                items: [
-                    {
-                        bankTransaction: message.transaction,
-                        voucher: {
-                            reference_doctype: "Payment Entry",
-                            reference_name: message.payment_entry.name,
-                            reference_no: message.payment_entry.reference_no,
-                            reference_date: message.payment_entry.reference_date,
-                            posting_date: message.payment_entry.posting_date,
-                            doc: message.payment_entry,
-                        }
-                    }
-                ]
-            })
-            toast.success(_("Transfer Recorded"), {
-                duration: 4000,
-                closeButton: true,
-                action: {
-                    label: _("Undo"),
-                    onClick: () => setBankRecUnreconcileModalAtom(selectedTransaction.name)
-                },
-                actionButtonStyle: {
-                    backgroundColor: "rgb(0, 138, 46)"
-                }
-            })
-
-            if (files.length > 0) {
-                setIsUploading(true)
-
-                const uploadPromises = files.map(f => {
-                    return frappeFile.uploadFile(f, {
-                        isPrivate: true,
-                        doctype: "Payment Entry",
-                        docname: message.payment_entry.name,
-                    }, (_bytesUploaded, _totalBytes, progress) => {
-
-                        setUploadProgress((currentProgress) => {
-                            //If there are multiple files, we need to add the progress to the current progress
-                            return currentProgress + ((progress?.progress ?? 0) / files.length)
-                        })
-
-                    })
-                })
-
-                return Promise.all(uploadPromises).then(() => {
-                    setUploadProgress(0)
-                    setIsUploading(false)
-                })
-            } else {
-                return Promise.resolve()
-            }
-        }).then(() => {
-            setUploadProgress(0)
-            setIsUploading(false)
-            onReconcile(selectedTransaction)
-            onClose()
-        })
-    }
-
-
-    useHotkeys('meta+s', () => {
-        form.handleSubmit(onSubmit)()
-    }, {
-        enabled: true,
-        preventDefault: true,
-        enableOnFormTags: true
-    })
-
-    const onAccountChange = (account: string, is_mirror: boolean = false) => {
-        //If the transaction is a withdrawal, set the paid to to the selected account - since this is the account where the money is deposited into
-        if (selectedTransaction.withdrawal && selectedTransaction.withdrawal > 0) {
-            form.setValue('paid_to', account)
-        } else {
-            form.setValue('paid_from', account)
-        }
-
-        if (!is_mirror) {
-            // Reset the mirror transaction name
-            form.setValue('mirror_transaction_name', '')
-        }
-    }
-
-    const selectedAccount = useWatch({ control: form.control, name: (selectedTransaction.deposit && selectedTransaction.deposit > 0) ? 'paid_from' : 'paid_to' })
-
-    const direction = useDirection()
-
-    if (isUploading && isCompleted) {
-        return <FileUploadBanner uploadProgress={uploadProgress} />
-    }
-
-    return <Form {...form}>
-        <form onSubmit={form.handleSubmit(onSubmit)}>
-            <div className='flex flex-col gap-4'>
-                {error && <ErrorBanner error={error} />}
-                <div className='grid grid-cols-2 gap-4'>
-                    <SelectedTransactionDetails transaction={selectedTransaction} />
-
-                    <div className='flex flex-col gap-4'>
-                        <div className='grid grid-cols-2 gap-4'>
-                            <DateField
-                                name='posting_date'
-                                label={_("Posting Date")}
-                                isRequired
-                                inputProps={{ autoFocus: false }}
-                            />
-                            <DateField
-                                name='reference_date'
-                                label={_("Reference Date")}
-                                isRequired
-                                inputProps={{ autoFocus: false }}
-                            />
-                        </div>
-                        <DataField name='reference_no' label={_("Reference")} isRequired inputProps={{ autoFocus: false }} />
-                    </div>
-                </div>
-
-                <div className='flex flex-col gap-2'>
-                    <H4 className='text-base'>{isWithdrawal ? _('Transferred to') : _('Transferred from')}</H4>
-                    <RecommendedTransferAccount transaction={selectedTransaction} onAccountChange={onAccountChange} />
-                    <BankOrCashPicker company={selectedTransaction.company ?? ''} bankAccount={selectedTransaction.bank_account ?? ''} onAccountChange={onAccountChange} selectedAccount={selectedAccount} />
-                </div>
-                <div className='flex flex-col gap-2 py-2'>
-                    <div className='flex items-end justify-between gap-4'>
-                        <div className='flex-1'>
-                            <AccountFormField
-                                name="paid_from"
-                                label={_("Paid From")}
-                                account_type={['Bank', 'Cash']}
-                                readOnly={isWithdrawal}
-                                filterFunction={(account) => account.name !== selectedBankAccount.account}
-                                isRequired
-                            />
-                        </div>
-
-                        <div className='pb-2'>
-                            {direction === 'ltr' ? <ArrowRight /> : <ArrowLeft />}
-                        </div>
-                        <div className='flex-1'>
-                            <AccountFormField
-                                name="paid_to"
-                                label={_("Paid To")}
-                                account_type={['Bank', 'Cash']}
-                                isRequired
-                                readOnly={!isWithdrawal}
-                                filterFunction={(account) => account.name !== selectedBankAccount.account}
-                            />
-                        </div>
-                    </div>
-                </div>
-                <Separator />
-                <div className='flex flex-col gap-2'>
-                    <div className='grid grid-cols-2 gap-4'>
-
-
-                        <SmallTextField
-                            name='remarks'
-                            label={_("Custom Remarks")}
-                            formDescription={_("This will be auto-populated if not set.")}
-                        />
-                        <div
-                            data-slot="form-item"
-                            className="flex flex-col gap-2"
-                        >
-                            <Label>{_("Attachments")}</Label>
-                            <FileDropzone files={files} setFiles={setFiles} />
-                        </div>
-                    </div>
-                </div>
-                <DialogFooter>
-                    <DialogClose asChild>
-                        <Button size='md' variant={'outline'} disabled={loading}>{_("Cancel")}</Button>
-                    </DialogClose>
-                    <Button size='md' type='submit' disabled={loading}>{_("Transfer")}</Button>
-                </DialogFooter>
-            </div>
-        </form>
-    </Form>
-}
-
-
-const BankOrCashPicker = ({ bankAccount, onAccountChange, selectedAccount, company }: { selectedAccount: string, bankAccount: string, onAccountChange: (account: string) => void, company: string }) => {
-
-    const { banks } = useGetBankAccounts(undefined, (bank) => bank.name !== bankAccount)
-
-    return <div className='grid grid-cols-4 gap-4'>
-        {banks.map((bank) => (
-            <div
-                className={cn('border p-2 rounded-md flex items-center gap-2 cursor-pointer outline-[0.5px] transition-all duration-200 hover:bg-surface-gray-1 dark:hover:bg-surface-gray-3',
-                    selectedAccount === bank.account ? 'border-outline-gray-5 outline-outline-gray-5 bg-surface-gray-1 dark:bg-surface-gray-3' : 'border-outline-gray-2 outline-outline-gray-2'
-                )}
-                role='button'
-                key={bank.account}
-                onClick={() => onAccountChange(bank.account ?? '')}
-            >
-                <BankLogo bank={bank} iconSize='24px' imageClassName='w-12 h-12' />
-                <div className='flex flex-col gap-1'>
-                    <span className='font-semibold text-sm'>{bank.account_name} {bank.bank_account_no && <span className='text-xs text-ink-gray-5'>({bank.bank_account_no})</span>}</span>
-                    <span className='text-xs text-ink-gray-5'>{bank.account}</span>
-                </div>
-            </div>
-        ))}
-        <CashPicker company={company ?? ''} selectedAccount={selectedAccount} setSelectedAccount={onAccountChange} />
-    </div>
-
-}
-
-const CashPicker = ({ company, selectedAccount, setSelectedAccount }: { company: string, selectedAccount: string, setSelectedAccount: (account: string) => void }) => {
-
-    const { data } = useFrappeGetCall('frappe.client.get_value', {
-        doctype: 'Company',
-        filters: company,
-        fieldname: 'default_cash_account'
-    }, undefined, {
-        revalidateOnFocus: false,
-        revalidateIfStale: false,
-    })
-
-    const account = data?.message?.default_cash_account
-
-    if (account) {
-        return <div className={cn('border p-2 rounded-md flex items-center gap-2 cursor-pointer outline-[0.5px] transition-all duration-200 hover:bg-surface-gray-1 dark:hover:bg-surface-gray-3',
-            selectedAccount === account ? 'border-outline-gray-5 outline-outline-gray-5 bg-surface-gray-1 dark:bg-surface-gray-3' : 'border-outline-gray-2 outline-outline-gray-2'
-        )}
-            role='button'
-            onClick={() => setSelectedAccount(account ?? '')}
-        >
-            <div className='flex items-center justify-center h-10 w-10'>
-                <Banknote size='24px' />
-            </div>
-            <div className='flex flex-col gap-1'>
-                <span className='font-semibold text-sm'>Cash</span>
-                <span className='text-xs text-ink-gray-5'>{data?.message?.default_cash_account}</span>
-            </div>
-        </div>
-    }
-
-    return null
-}
-
-
-const RecommendedTransferAccount = ({ transaction, onAccountChange }: { transaction: UnreconciledTransaction, onAccountChange: (account: string, is_mirror: boolean) => void }) => {
-
-    const { setValue, watch } = useFormContext<InternalTransferFormFields>()
-
-    const mirrorTransactionName = watch('mirror_transaction_name')
-    const paid_from = watch('paid_from')
-    const paid_to = watch('paid_to')
-
-    const { data } = useFrappeGetCall('erpnext.accounts.doctype.bank_reconciliation_tool.bank_reconciliation_tool.search_for_transfer_transaction', {
-        transaction_id: transaction.name
-    }, undefined, {
-        revalidateOnFocus: false,
-        revalidateIfStale: false,
-    })
-
-    // Get bank accounts to find the logo
-    const { banks } = useGetBankAccounts()
-
-    const bank = useMemo(() => {
-        if (data?.message?.bank_account && banks) {
-            return banks.find(bank => bank.name === data.message.bank_account)
-        }
-        return null
-    }, [data?.message?.bank_account, banks])
-
-    const selectTransaction = () => {
-        if (data?.message) {
-            setValue('mirror_transaction_name', data.message.name)
-            onAccountChange(data.message.account, true)
-        }
-    }
-
-    if (data?.message) {
-
-        const isWithdrawal = data.message.withdrawal && data.message.withdrawal > 0
-
-        const amount = isWithdrawal ? data.message.withdrawal : data.message.deposit
-        const currency = data.message.currency
-
-        const isAccountSelected = isWithdrawal ? paid_from === data.message.account : paid_to === data.message.account
-
-        const isSuggested = mirrorTransactionName === data?.message?.name && isAccountSelected
-
-        return (<div className='pb-2'>
-            <div className={cn("flex justify-between items-start gap-3 p-3 border rounded-lg shadow-sm",
-                isSuggested ? "border-outline-green-4 bg-surface-green-1" : "border-outline-violet-2 bg-surface-violet-2/50")}>
-                <div>
-                    <div className='flex flex-col gap-3'>
-                        <div className={cn("flex items-center gap-2 shrink-0",
-                            isSuggested ? "text-ink-green-4" : "text-ink-violet-4"
-                        )}>
-                            <BadgeCheck className="w-4 h-4" />
-                            <span className="text-sm font-medium">{_("Suggested Transfer to {0}", [data.message.account])}</span>
-                        </div>
-                        <div className='flex flex-col gap-1'>
-                            <span className='text-p-sm'>{_("The system found a mirror transaction ({0}) in another account with the same amount and date.", [data.message.name])}</span>
-                            <span className='text-p-sm'>{_("Accepting the suggestion will reconcile both transactions.")}</span>
-                        </div>
-
-                        <div className='flex flex-col gap-1.5'>
-                            <div className='flex items-center gap-1'>
-                                <Calendar size='16px' />
-                                <span className='text-sm'>{formatDate(data.message.date, 'Do MMM YYYY')}</span>
-                            </div>
-                            <span className='text-sm line-clamp-1' title={data.message.description}>{data.message.description}</span>
-                        </div>
-                    </div>
-                </div>
-                <div className='flex flex-col items-end justify-between gap-2 h-full w-[30%]'>
-                    <div className="flex items-center gap-2">
-                        <BankLogo bank={bank} iconSize='24px' imageClassName='h-8 max-w-24' iconClassName={cn(isSuggested ? "text-ink-green-3" : "text-purple-600")} />
-                    </div>
-                    <div className='flex gap-1'>
-                        <div className={cn('flex items-center gap-1 text-end px-0 justify-end py-1 rounded-sm',
-                            isWithdrawal ? 'text-ink-red-3' : 'text-ink-green-3'
-                        )}>
-                            {isWithdrawal ? <ArrowUpRight className="w-5 h-5 text-ink-red-3" /> : <ArrowDownRight className="w-5 h-5 text-ink-green-3" />}
-                            <span className='text-sm font-semibold uppercase'>{isWithdrawal ? _('Transferred Out') : _('Received')}</span>
-                        </div>
-                    </div>
-                    <span className='font-semibold font-numeric text-lg text-end pe-0.5'>{formatCurrency(amount, currency)}</span>
-                    <div className='pt-1'>
-                        <Button
-                            onClick={selectTransaction}
-                            theme={isSuggested ? "green" : "violet"}
-                            size="md"
-                            type='button'
-                        >
-                            {isSuggested ? <CheckCircle /> : <CheckIcon />}
-                            {isSuggested ? _("Accepted") : _("Use Suggestion")}
-                        </Button>
-                    </div>
-                </div>
-            </div>
-        </div>
-        )
-    }
-
-    return null
-}
-
-export default TransferModal