fix: black

fix: forced delete linked desktop_icons
2026-07-20 11:22:28 +00:00 · 2023-02-17 07:13:00 +00:00 · 2023-02-17 12:17:36 +05:30
654 changed files with 34475 additions and 45814 deletions
--- a/.github/helper/install.sh
+++ b/.github/helper/install.sh
@@ -8,9 +8,8 @@ sudo apt update && sudo apt install redis-server libcups2-dev

 pip install frappe-bench

-githubbranch=${GITHUB_BASE_REF:-${GITHUB_REF##*/}}
 frappeuser=${FRAPPE_USER:-"frappe"}
-frappebranch=${FRAPPE_BRANCH:-$githubbranch}
+frappebranch=${FRAPPE_BRANCH:-${GITHUB_BASE_REF:-${GITHUB_REF##*/}}}

 git clone "https://github.com/${frappeuser}/frappe" --branch "${frappebranch}" --depth 1
 bench init --skip-assets --frappe-path ~/frappe --python "$(which python)" frappe-bench
@@ -61,7 +60,7 @@ 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 ${githubbranch%"-hotfix"}
+bench get-app payments
 bench get-app erpnext "${GITHUB_WORKSPACE}"

 if [ "$TYPE" == "server" ]; then bench setup requirements --dev; fi
--- a/.github/workflows/server-tests-mariadb.yml
+++ b/.github/workflows/server-tests-mariadb.yml
@@ -7,6 +7,7 @@ on:
      - '**.css'
      - '**.md'
      - '**.html'
+      - '**.csv'
  push:
    branches: [ develop ]
    paths-ignore:
--- a/24
+++ b/24
@@ -3,13 +3,13 @@
 # These owners will be the default owners for everything in
 # the repo. Unless a later match takes precedence,

-erpnext/accounts/               @deepeshgarg007 @ruthra-kumar
+erpnext/accounts/               @nextchamp-saqib @deepeshgarg007 @ruthra-kumar
 erpnext/assets/                 @anandbaburajan @deepeshgarg007
-erpnext/loan_management/        @deepeshgarg007
-erpnext/regional                @deepeshgarg007 @ruthra-kumar
-erpnext/selling                 @deepeshgarg007 @ruthra-kumar
-erpnext/support/                @deepeshgarg007
-pos*                            
+erpnext/loan_management/        @nextchamp-saqib @deepeshgarg007
+erpnext/regional                @nextchamp-saqib @deepeshgarg007 @ruthra-kumar
+erpnext/selling                 @nextchamp-saqib @deepeshgarg007 @ruthra-kumar
+erpnext/support/                @nextchamp-saqib @deepeshgarg007
+pos*                            @nextchamp-saqib

 erpnext/buying/                 @rohitwaghchaure @s-aga-r
 erpnext/maintenance/            @rohitwaghchaure @s-aga-r
@@ -18,8 +18,12 @@ erpnext/quality_management/     @rohitwaghchaure @s-aga-r
 erpnext/stock/                  @rohitwaghchaure @s-aga-r
 erpnext/subcontracting          @rohitwaghchaure @s-aga-r

-erpnext/controllers/            @deepeshgarg007 @rohitwaghchaure
-erpnext/patches/                @deepeshgarg007 
+erpnext/crm/                    @NagariaHussain
+erpnext/education/              @rutwikhdev
+erpnext/projects/               @ruchamahabal

-.github/                        @deepeshgarg007
-pyproject.toml                  @phot0n
+erpnext/controllers/            @deepeshgarg007 @nextchamp-saqib @rohitwaghchaure
+erpnext/patches/                @deepeshgarg007 @nextchamp-saqib
+
+.github/                        @ankush
+pyproject.toml                  @ankush
--- a/README.md
+++ b/README.md
@@ -65,7 +65,7 @@ New passwords will be created for the ERPNext "Administrator" user, the MariaDB
 1. [Frappe School](https://frappe.school) - 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.erpnext.com/) - Engage with community of ERPNext users and service providers.
-4. [Telegram Group](https://erpnext_public.t.me) - Get instant help from huge community of users.
+4. [Telegram Group](https://t.me/erpnexthelp) - Get instant help from huge community of users.


 ## Contributing
--- a/erpnext/init.py
+++ b/erpnext/init.py
@@ -1,9 +1,8 @@
-import functools
 import inspect

 import frappe

-__version__ = "15.0.0-dev"
+__version__ = "14.0.0-dev"


 def get_default_company(user=None):
@@ -121,14 +120,12 @@ def get_region(company=None):

 	You can also set global company flag in `frappe.flags.company`
 	"""
-
-	if not company:
-		company = frappe.local.flags.company
-
-	if company:
-		return frappe.get_cached_value("Company", company, "country")
-
-	return frappe.flags.country or frappe.get_system_settings("country")
+	if company or frappe.flags.company:
+		return frappe.get_cached_value("Company", company or frappe.flags.company, "country")
+	elif frappe.flags.country:
+		return frappe.flags.country
+	else:
+		return frappe.get_system_settings("country")


 def allow_regional(fn):
@@ -139,7 +136,6 @@ def allow_regional(fn):
 	def myfunction():
 	  pass"""

-	@functools.wraps(fn)
 	def caller(*args, **kwargs):
 		overrides = frappe.get_hooks("regional_overrides", {}).get(get_region())
 		function_path = f"{inspect.getmodule(fn).__name__}.{fn.__name__}"
--- a/erpnext/accounts/doctype/account/account.json
+++ b/erpnext/accounts/doctype/account/account.json
@@ -18,6 +18,7 @@
  "root_type",
  "report_type",
  "account_currency",
+  "inter_company_account",
  "column_break1",
  "parent_account",
  "account_type",
@@ -33,11 +34,15 @@
  {
   "fieldname": "properties",
   "fieldtype": "Section Break",
-   "oldfieldtype": "Section Break"
+   "oldfieldtype": "Section Break",
+   "show_days": 1,
+   "show_seconds": 1
  },
  {
   "fieldname": "column_break0",
   "fieldtype": "Column Break",
+   "show_days": 1,
+   "show_seconds": 1,
   "width": "50%"
  },
  {
@@ -48,7 +53,9 @@
   "no_copy": 1,
   "oldfieldname": "account_name",
   "oldfieldtype": "Data",
-   "reqd": 1
+   "reqd": 1,
+   "show_days": 1,
+   "show_seconds": 1
  },
  {
   "fieldname": "account_number",
@@ -56,13 +63,17 @@
   "in_list_view": 1,
   "in_standard_filter": 1,
   "label": "Account Number",
-   "read_only": 1
+   "read_only": 1,
+   "show_days": 1,
+   "show_seconds": 1
  },
  {
   "default": "0",
   "fieldname": "is_group",
   "fieldtype": "Check",
-   "label": "Is Group"
+   "label": "Is Group",
+   "show_days": 1,
+   "show_seconds": 1
  },
  {
   "fieldname": "company",
@@ -74,7 +85,9 @@
   "options": "Company",
   "read_only": 1,
   "remember_last_selected_value": 1,
-   "reqd": 1
+   "reqd": 1,
+   "show_days": 1,
+   "show_seconds": 1
  },
  {
   "fieldname": "root_type",
@@ -82,7 +95,9 @@
   "in_standard_filter": 1,
   "label": "Root Type",
   "options": "\nAsset\nLiability\nIncome\nExpense\nEquity",
-   "read_only": 1
+   "read_only": 1,
+   "show_days": 1,
+   "show_seconds": 1
  },
  {
   "fieldname": "report_type",
@@ -90,18 +105,32 @@
   "in_standard_filter": 1,
   "label": "Report Type",
   "options": "\nBalance Sheet\nProfit and Loss",
-   "read_only": 1
+   "read_only": 1,
+   "show_days": 1,
+   "show_seconds": 1
  },
  {
   "depends_on": "eval:doc.is_group==0",
   "fieldname": "account_currency",
   "fieldtype": "Link",
   "label": "Currency",
-   "options": "Currency"
+   "options": "Currency",
+   "show_days": 1,
+   "show_seconds": 1
+  },
+  {
+   "default": "0",
+   "fieldname": "inter_company_account",
+   "fieldtype": "Check",
+   "label": "Inter Company Account",
+   "show_days": 1,
+   "show_seconds": 1
  },
  {
   "fieldname": "column_break1",
   "fieldtype": "Column Break",
+   "show_days": 1,
+   "show_seconds": 1,
   "width": "50%"
  },
  {
@@ -113,7 +142,9 @@
   "oldfieldtype": "Link",
   "options": "Account",
   "reqd": 1,
-   "search_index": 1
+   "search_index": 1,
+   "show_days": 1,
+   "show_seconds": 1
  },
  {
   "description": "Setting Account Type helps in selecting this Account in transactions.",
@@ -123,7 +154,9 @@
   "label": "Account Type",
   "oldfieldname": "account_type",
   "oldfieldtype": "Select",
-   "options": "\nAccumulated Depreciation\nAsset Received But Not Billed\nBank\nCash\nChargeable\nCapital Work in Progress\nCost of Goods Sold\nDepreciation\nEquity\nExpense Account\nExpenses Included In Asset Valuation\nExpenses Included In Valuation\nFixed Asset\nIncome Account\nPayable\nReceivable\nRound Off\nStock\nStock Adjustment\nStock Received But Not Billed\nService Received But Not Billed\nTax\nTemporary"
+   "options": "\nAccumulated Depreciation\nAsset Received But Not Billed\nBank\nCash\nChargeable\nCapital Work in Progress\nCost of Goods Sold\nDepreciation\nEquity\nExpense Account\nExpenses Included In Asset Valuation\nExpenses Included In Valuation\nFixed Asset\nIncome Account\nPayable\nReceivable\nRound Off\nStock\nStock Adjustment\nStock Received But Not Billed\nService Received But Not Billed\nTax\nTemporary",
+   "show_days": 1,
+   "show_seconds": 1
  },
  {
   "description": "Rate at which this tax is applied",
@@ -131,7 +164,9 @@
   "fieldtype": "Float",
   "label": "Rate",
   "oldfieldname": "tax_rate",
-   "oldfieldtype": "Currency"
+   "oldfieldtype": "Currency",
+   "show_days": 1,
+   "show_seconds": 1
  },
  {
   "description": "If the account is frozen, entries are allowed to restricted users.",
@@ -140,13 +175,17 @@
   "label": "Frozen",
   "oldfieldname": "freeze_account",
   "oldfieldtype": "Select",
-   "options": "No\nYes"
+   "options": "No\nYes",
+   "show_days": 1,
+   "show_seconds": 1
  },
  {
   "fieldname": "balance_must_be",
   "fieldtype": "Select",
   "label": "Balance must be",
-   "options": "\nDebit\nCredit"
+   "options": "\nDebit\nCredit",
+   "show_days": 1,
+   "show_seconds": 1
  },
  {
   "fieldname": "lft",
@@ -155,7 +194,9 @@
   "label": "Lft",
   "print_hide": 1,
   "read_only": 1,
-   "search_index": 1
+   "search_index": 1,
+   "show_days": 1,
+   "show_seconds": 1
  },
  {
   "fieldname": "rgt",
@@ -164,7 +205,9 @@
   "label": "Rgt",
   "print_hide": 1,
   "read_only": 1,
-   "search_index": 1
+   "search_index": 1,
+   "show_days": 1,
+   "show_seconds": 1
  },
  {
   "fieldname": "old_parent",
@@ -172,27 +215,33 @@
   "hidden": 1,
   "label": "Old Parent",
   "print_hide": 1,
-   "read_only": 1
+   "read_only": 1,
+   "show_days": 1,
+   "show_seconds": 1
  },
  {
   "default": "0",
   "depends_on": "eval:(doc.report_type == 'Profit and Loss' && !doc.is_group)",
   "fieldname": "include_in_gross",
   "fieldtype": "Check",
-   "label": "Include in gross"
+   "label": "Include in gross",
+   "show_days": 1,
+   "show_seconds": 1
  },
  {
   "default": "0",
   "fieldname": "disabled",
   "fieldtype": "Check",
-   "label": "Disable"
+   "label": "Disable",
+   "show_days": 1,
+   "show_seconds": 1
  }
 ],
 "icon": "fa fa-money",
 "idx": 1,
 "is_tree": 1,
 "links": [],
- "modified": "2023-04-11 16:08:46.983677",
+ "modified": "2020-06-11 15:15:54.338622",
 "modified_by": "Administrator",
 "module": "Accounts",
 "name": "Account",
@@ -252,6 +301,5 @@
 "show_name_in_global_search": 1,
 "sort_field": "modified",
 "sort_order": "ASC",
- "states": [],
 "track_changes": 1
 }
--- a/erpnext/accounts/doctype/account/account.py
+++ b/erpnext/accounts/doctype/account/account.py
@@ -204,11 +204,8 @@ class Account(NestedSet):
 				)

 	def validate_account_currency(self):
-		self.currency_explicitly_specified = True
-
 		if not self.account_currency:
 			self.account_currency = frappe.get_cached_value("Company", self.company, "default_currency")
-			self.currency_explicitly_specified = False

 		gl_currency = frappe.db.get_value("GL Entry", {"account": self.name}, "account_currency")

@@ -254,10 +251,8 @@ class Account(NestedSet):
 					{
 						"company": company,
 						# parent account's currency should be passed down to child account's curreny
-						# if currency explicitly specified by user, child will inherit. else, default currency will be used.
-						"account_currency": self.account_currency
-						if self.currency_explicitly_specified
-						else erpnext.get_company_currency(company),
+						# if it is None, it picks it up from default company currency, which might be unintended
+						"account_currency": erpnext.get_company_currency(company),
 						"parent_account": parent_acc_name_map[company],
 					}
 				)
@@ -399,13 +394,7 @@ def update_account_number(name, account_name, account_number=None, from_descenda

 	if ancestors and not allow_independent_account_creation:
 		for ancestor in ancestors:
-			old_name = frappe.db.get_value(
-				"Account",
-				{"account_number": old_acc_number, "account_name": old_acc_name, "company": ancestor},
-				"name",
-			)
-
-			if old_name:
+			if frappe.db.get_value("Account", {"account_name": old_acc_name, "company": ancestor}, "name"):
 				# same account in parent company exists
 				allow_child_account_creation = _("Allow Account Creation Against Child Company")

--- a/erpnext/accounts/doctype/account/chart_of_accounts/chart_of_accounts.py
+++ b/erpnext/accounts/doctype/account/chart_of_accounts/chart_of_accounts.py
@@ -29,7 +29,6 @@ def create_charts(
 					"root_type",
 					"is_group",
 					"tax_rate",
-					"account_currency",
 				]:

 					account_number = cstr(child.get("account_number")).strip()
@@ -96,17 +95,7 @@ def identify_is_group(child):
 		is_group = child.get("is_group")
 	elif len(
 		set(child.keys())
-		- set(
-			[
-				"account_name",
-				"account_type",
-				"root_type",
-				"is_group",
-				"tax_rate",
-				"account_number",
-				"account_currency",
-			]
-		)
+		- set(["account_name", "account_type", "root_type", "is_group", "tax_rate", "account_number"])
 	):
 		is_group = 1
 	else:
@@ -196,7 +185,6 @@ def get_account_tree_from_existing_company(existing_company):
 			"root_type",
 			"tax_rate",
 			"account_number",
-			"account_currency",
 		],
 		order_by="lft, rgt",
 	)
@@ -279,7 +267,6 @@ def build_tree_from_json(chart_template, chart_data=None, from_coa_importer=Fals
 				"root_type",
 				"is_group",
 				"tax_rate",
-				"account_currency",
 			]:
 				continue

--- a/erpnext/accounts/doctype/account/chart_of_accounts/verified/pt_pt_chart_template.json
+++ b/erpnext/accounts/doctype/account/chart_of_accounts/verified/pt_pt_chart_template.json
--- a/erpnext/accounts/doctype/account/test_account.py
+++ b/erpnext/accounts/doctype/account/test_account.py
@@ -5,13 +5,10 @@
 import unittest

 import frappe
-from frappe.test_runner import make_test_records

 from erpnext.accounts.doctype.account.account import merge_account, update_account_number
 from erpnext.stock import get_company_default_inventory_account, get_warehouse_account

-test_dependencies = ["Company"]
-

 class TestAccount(unittest.TestCase):
 	def test_rename_account(self):
@@ -191,58 +188,6 @@ class TestAccount(unittest.TestCase):
 		frappe.delete_doc("Account", "1234 - Test Rename Sync Account - _TC4")
 		frappe.delete_doc("Account", "1234 - Test Rename Sync Account - _TC5")

-	def test_account_currency_sync(self):
-		"""
-		In a parent->child company setup, child should inherit parent account currency if explicitly specified.
-		"""
-
-		make_test_records("Company")
-
-		frappe.local.flags.pop("ignore_root_company_validation", None)
-
-		def create_bank_account():
-			acc = frappe.new_doc("Account")
-			acc.account_name = "_Test Bank JPY"
-
-			acc.parent_account = "Temporary Accounts - _TC6"
-			acc.company = "_Test Company 6"
-			return acc
-
-		acc = create_bank_account()
-		# Explicitly set currency
-		acc.account_currency = "JPY"
-		acc.insert()
-		self.assertTrue(
-			frappe.db.exists(
-				{
-					"doctype": "Account",
-					"account_name": "_Test Bank JPY",
-					"account_currency": "JPY",
-					"company": "_Test Company 7",
-				}
-			)
-		)
-
-		frappe.delete_doc("Account", "_Test Bank JPY - _TC6")
-		frappe.delete_doc("Account", "_Test Bank JPY - _TC7")
-
-		acc = create_bank_account()
-		# default currency is used
-		acc.insert()
-		self.assertTrue(
-			frappe.db.exists(
-				{
-					"doctype": "Account",
-					"account_name": "_Test Bank JPY",
-					"account_currency": "USD",
-					"company": "_Test Company 7",
-				}
-			)
-		)
-
-		frappe.delete_doc("Account", "_Test Bank JPY - _TC6")
-		frappe.delete_doc("Account", "_Test Bank JPY - _TC7")
-
 	def test_child_company_account_rename_sync(self):
 		frappe.local.flags.pop("ignore_root_company_validation", None)

@@ -352,7 +297,7 @@ def _make_test_records(verbose=None):
 		# fixed asset depreciation
 		["_Test Fixed Asset", "Current Assets", 0, "Fixed Asset", None],
 		["_Test Accumulated Depreciations", "Current Assets", 0, "Accumulated Depreciation", None],
-		["_Test Depreciations", "Expenses", 0, "Depreciation", None],
+		["_Test Depreciations", "Expenses", 0, None, None],
 		["_Test Gain/Loss on Asset Disposal", "Expenses", 0, None, None],
 		# Receivable / Payable Account
 		["_Test Receivable", "Current Assets", 0, "Receivable", None],
--- a/erpnext/accounts/doctype/account_closing_balance/account_closing_balance.js
+++ b/erpnext/accounts/doctype/account_closing_balance/account_closing_balance.js
@@ -1,8 +0,0 @@
-// Copyright (c) 2023, Frappe Technologies Pvt. Ltd. and contributors
-// For license information, please see license.txt
-
-// frappe.ui.form.on("Account Closing Balance", {
-// 	refresh(frm) {
-
-// 	},
-// });
--- a/erpnext/accounts/doctype/account_closing_balance/account_closing_balance.json
+++ b/erpnext/accounts/doctype/account_closing_balance/account_closing_balance.json
@@ -1,164 +0,0 @@
-{
- "actions": [],
- "creation": "2023-02-21 15:20:59.586811",
- "default_view": "List",
- "doctype": "DocType",
- "document_type": "Document",
- "engine": "InnoDB",
- "field_order": [
-  "closing_date",
-  "account",
-  "cost_center",
-  "debit",
-  "credit",
-  "account_currency",
-  "debit_in_account_currency",
-  "credit_in_account_currency",
-  "project",
-  "company",
-  "finance_book",
-  "period_closing_voucher",
-  "is_period_closing_voucher_entry"
- ],
- "fields": [
-  {
-   "fieldname": "closing_date",
-   "fieldtype": "Date",
-   "in_filter": 1,
-   "in_list_view": 1,
-   "label": "Closing Date",
-   "oldfieldname": "posting_date",
-   "oldfieldtype": "Date",
-   "search_index": 1
-  },
-  {
-   "fieldname": "account",
-   "fieldtype": "Link",
-   "in_filter": 1,
-   "in_list_view": 1,
-   "in_standard_filter": 1,
-   "label": "Account",
-   "oldfieldname": "account",
-   "oldfieldtype": "Link",
-   "options": "Account",
-   "search_index": 1
-  },
-  {
-   "fieldname": "cost_center",
-   "fieldtype": "Link",
-   "in_filter": 1,
-   "in_list_view": 1,
-   "label": "Cost Center",
-   "oldfieldname": "cost_center",
-   "oldfieldtype": "Link",
-   "options": "Cost Center"
-  },
-  {
-   "fieldname": "debit",
-   "fieldtype": "Currency",
-   "label": "Debit Amount",
-   "oldfieldname": "debit",
-   "oldfieldtype": "Currency",
-   "options": "Company:company:default_currency"
-  },
-  {
-   "fieldname": "credit",
-   "fieldtype": "Currency",
-   "label": "Credit Amount",
-   "oldfieldname": "credit",
-   "oldfieldtype": "Currency",
-   "options": "Company:company:default_currency"
-  },
-  {
-   "fieldname": "account_currency",
-   "fieldtype": "Link",
-   "label": "Account Currency",
-   "options": "Currency"
-  },
-  {
-   "fieldname": "debit_in_account_currency",
-   "fieldtype": "Currency",
-   "label": "Debit Amount in Account Currency",
-   "options": "account_currency"
-  },
-  {
-   "fieldname": "credit_in_account_currency",
-   "fieldtype": "Currency",
-   "label": "Credit Amount in Account Currency",
-   "options": "account_currency"
-  },
-  {
-   "fieldname": "project",
-   "fieldtype": "Link",
-   "label": "Project",
-   "options": "Project"
-  },
-  {
-   "fieldname": "company",
-   "fieldtype": "Link",
-   "in_filter": 1,
-   "in_list_view": 1,
-   "in_standard_filter": 1,
-   "label": "Company",
-   "oldfieldname": "company",
-   "oldfieldtype": "Link",
-   "options": "Company",
-   "search_index": 1
-  },
-  {
-   "fieldname": "finance_book",
-   "fieldtype": "Link",
-   "label": "Finance Book",
-   "options": "Finance Book"
-  },
-  {
-   "fieldname": "period_closing_voucher",
-   "fieldtype": "Link",
-   "in_standard_filter": 1,
-   "label": "Period Closing Voucher",
-   "options": "Period Closing Voucher",
-   "search_index": 1
-  },
-  {
-   "default": "0",
-   "fieldname": "is_period_closing_voucher_entry",
-   "fieldtype": "Check",
-   "label": "Is Period Closing Voucher Entry"
-  }
- ],
- "icon": "fa fa-list",
- "in_create": 1,
- "links": [],
- "modified": "2023-03-06 08:56:36.393237",
- "modified_by": "Administrator",
- "module": "Accounts",
- "name": "Account Closing Balance",
- "owner": "Administrator",
- "permissions": [
-  {
-   "email": 1,
-   "export": 1,
-   "print": 1,
-   "read": 1,
-   "report": 1,
-   "role": "Accounts User"
-  },
-  {
-   "email": 1,
-   "export": 1,
-   "print": 1,
-   "read": 1,
-   "report": 1,
-   "role": "Accounts Manager"
-  },
-  {
-   "export": 1,
-   "read": 1,
-   "report": 1,
-   "role": "Auditor"
-  }
- ],
- "sort_field": "modified",
- "sort_order": "DESC",
- "states": []
-}
--- a/erpnext/accounts/doctype/account_closing_balance/account_closing_balance.py
+++ b/erpnext/accounts/doctype/account_closing_balance/account_closing_balance.py
@@ -1,128 +0,0 @@
-# Copyright (c) 2023, Frappe Technologies Pvt. Ltd. and contributors
-# For license information, please see license.txt
-
-import frappe
-from frappe.model.document import Document
-from frappe.utils import cint, cstr
-
-from erpnext.accounts.doctype.accounting_dimension.accounting_dimension import (
-	get_accounting_dimensions,
-)
-
-
-class AccountClosingBalance(Document):
-	pass
-
-
-def make_closing_entries(closing_entries, voucher_name):
-	accounting_dimensions = get_accounting_dimensions()
-	company = closing_entries[0].get("company")
-	closing_date = closing_entries[0].get("closing_date")
-
-	previous_closing_entries = get_previous_closing_entries(
-		company, closing_date, accounting_dimensions
-	)
-	combined_entries = closing_entries + previous_closing_entries
-
-	merged_entries = aggregate_with_last_account_closing_balance(
-		combined_entries, accounting_dimensions
-	)
-
-	for key, value in merged_entries.items():
-		cle = frappe.new_doc("Account Closing Balance")
-		cle.update(value)
-		cle.update(value["dimensions"])
-		cle.update(
-			{
-				"period_closing_voucher": voucher_name,
-				"closing_date": closing_date,
-			}
-		)
-		cle.flags.ignore_permissions = True
-		cle.submit()
-
-
-def aggregate_with_last_account_closing_balance(entries, accounting_dimensions):
-	merged_entries = {}
-	for entry in entries:
-		key, key_values = generate_key(entry, accounting_dimensions)
-		merged_entries.setdefault(
-			key,
-			{
-				"debit": 0,
-				"credit": 0,
-				"debit_in_account_currency": 0,
-				"credit_in_account_currency": 0,
-			},
-		)
-
-		merged_entries[key]["dimensions"] = key_values
-		merged_entries[key]["debit"] += entry.get("debit")
-		merged_entries[key]["credit"] += entry.get("credit")
-		merged_entries[key]["debit_in_account_currency"] += entry.get("debit_in_account_currency")
-		merged_entries[key]["credit_in_account_currency"] += entry.get("credit_in_account_currency")
-
-	return merged_entries
-
-
-def generate_key(entry, accounting_dimensions):
-	key = [
-		cstr(entry.get("account")),
-		cstr(entry.get("account_currency")),
-		cstr(entry.get("cost_center")),
-		cstr(entry.get("project")),
-		cstr(entry.get("finance_book")),
-		cint(entry.get("is_period_closing_voucher_entry")),
-	]
-
-	key_values = {
-		"company": cstr(entry.get("company")),
-		"account": cstr(entry.get("account")),
-		"account_currency": cstr(entry.get("account_currency")),
-		"cost_center": cstr(entry.get("cost_center")),
-		"project": cstr(entry.get("project")),
-		"finance_book": cstr(entry.get("finance_book")),
-		"is_period_closing_voucher_entry": cint(entry.get("is_period_closing_voucher_entry")),
-	}
-	for dimension in accounting_dimensions:
-		key.append(cstr(entry.get(dimension)))
-		key_values[dimension] = cstr(entry.get(dimension))
-
-	return tuple(key), key_values
-
-
-def get_previous_closing_entries(company, closing_date, accounting_dimensions):
-	entries = []
-	last_period_closing_voucher = frappe.db.get_all(
-		"Period Closing Voucher",
-		filters={"docstatus": 1, "company": company, "posting_date": ("<", closing_date)},
-		fields=["name"],
-		order_by="posting_date desc",
-		limit=1,
-	)
-
-	if last_period_closing_voucher:
-		account_closing_balance = frappe.qb.DocType("Account Closing Balance")
-		query = frappe.qb.from_(account_closing_balance).select(
-			account_closing_balance.company,
-			account_closing_balance.account,
-			account_closing_balance.account_currency,
-			account_closing_balance.debit,
-			account_closing_balance.credit,
-			account_closing_balance.debit_in_account_currency,
-			account_closing_balance.credit_in_account_currency,
-			account_closing_balance.cost_center,
-			account_closing_balance.project,
-			account_closing_balance.finance_book,
-			account_closing_balance.is_period_closing_voucher_entry,
-		)
-
-		for dimension in accounting_dimensions:
-			query = query.select(account_closing_balance[dimension])
-
-		query = query.where(
-			account_closing_balance.period_closing_voucher == last_period_closing_voucher[0].name
-		)
-		entries = query.run(as_dict=1)
-
-	return entries
--- a/erpnext/accounts/doctype/account_closing_balance/test_account_closing_balance.py
+++ b/erpnext/accounts/doctype/account_closing_balance/test_account_closing_balance.py
@@ -1,9 +0,0 @@
-# Copyright (c) 2023, Frappe Technologies Pvt. Ltd. and Contributors
-# See license.txt
-
-# import frappe
-from frappe.tests.utils import FrappeTestCase
-
-
-class TestAccountClosingBalance(FrappeTestCase):
-	pass
--- a/erpnext/accounts/doctype/accounting_dimension/accounting_dimension.py
+++ b/erpnext/accounts/doctype/accounting_dimension/accounting_dimension.py
@@ -50,15 +50,13 @@ class AccountingDimension(Document):
 		if frappe.flags.in_test:
 			make_dimension_in_accounting_doctypes(doc=self)
 		else:
-			frappe.enqueue(
-				make_dimension_in_accounting_doctypes, doc=self, queue="long", enqueue_after_commit=True
-			)
+			frappe.enqueue(make_dimension_in_accounting_doctypes, doc=self, queue="long")

 	def on_trash(self):
 		if frappe.flags.in_test:
 			delete_accounting_dimension(doc=self)
 		else:
-			frappe.enqueue(delete_accounting_dimension, doc=self, queue="long", enqueue_after_commit=True)
+			frappe.enqueue(delete_accounting_dimension, doc=self, queue="long")

 	def set_fieldname_and_label(self):
 		if not self.label:
--- a/erpnext/accounts/doctype/accounts_settings/accounts_settings.json
+++ b/erpnext/accounts/doctype/accounts_settings/accounts_settings.json
@@ -19,8 +19,8 @@
  "column_break_17",
  "enable_common_party_accounting",
  "allow_multi_currency_invoices_against_single_party_account",
-  "journals_section",
-  "merge_similar_account_heads",
+  "report_setting_section",
+  "use_custom_cash_flow",
  "deferred_accounting_settings_section",
  "book_deferred_entries_based_on",
  "column_break_18",
@@ -31,16 +31,12 @@
  "determine_address_tax_category_from",
  "column_break_19",
  "add_taxes_from_item_tax_template",
-  "book_tax_discount_loss",
  "print_settings",
  "show_inclusive_tax_in_print",
-  "show_taxes_as_table_in_print",
  "column_break_12",
  "show_payment_schedule_in_print",
  "currency_exchange_section",
  "allow_stale",
-  "section_break_jpd0",
-  "auto_reconcile_payments",
  "stale_days",
  "invoicing_settings_tab",
  "accounts_transactions_settings_section",
@@ -60,6 +56,7 @@
  "acc_frozen_upto",
  "column_break_25",
  "frozen_accounts_modifier",
+  "report_settings_sb",
  "tab_break_dpet",
  "show_balance_in_coa"
 ],
@@ -172,9 +169,20 @@
   "fieldtype": "Int",
   "label": "Stale Days"
  },
+  {
+   "fieldname": "report_settings_sb",
+   "fieldtype": "Section Break",
+   "label": "Report Settings"
+  },
+  {
+   "default": "0",
+   "description": "Only select this if you have set up the Cash Flow Mapper documents",
+   "fieldname": "use_custom_cash_flow",
+   "fieldtype": "Check",
+   "label": "Enable Custom Cash Flow Format"
+  },
  {
   "default": "0",
-   "description": "Payment Terms from orders will be fetched into the invoices as is",
   "fieldname": "automatically_fetch_payment_terms",
   "fieldtype": "Check",
   "label": "Automatically Fetch Payment Terms from Order"
@@ -330,6 +338,11 @@
   "fieldtype": "Tab Break",
   "label": "POS"
  },
+  {
+   "fieldname": "report_setting_section",
+   "fieldtype": "Section Break",
+   "label": "Report Setting"
+  },
  {
   "default": "0",
   "description": "Enabling this will allow creation of multi-currency invoices against single party account in company currency",
@@ -347,42 +360,6 @@
   "fieldname": "show_balance_in_coa",
   "fieldtype": "Check",
   "label": "Show Balances in Chart Of Accounts"
-  },
-  {
-   "default": "0",
-   "description": "Split Early Payment Discount Loss into Income and Tax Loss",
-   "fieldname": "book_tax_discount_loss",
-   "fieldtype": "Check",
-   "label": "Book Tax Loss on Early Payment Discount"
-  },
-  {
-   "fieldname": "journals_section",
-   "fieldtype": "Section Break",
-   "label": "Journals"
-  },
-  {
-   "default": "0",
-   "description": "Rows with Same Account heads will be merged on Ledger",
-   "fieldname": "merge_similar_account_heads",
-   "fieldtype": "Check",
-   "label": "Merge Similar Account Heads"
-  },
-  {
-   "fieldname": "section_break_jpd0",
-   "fieldtype": "Section Break",
-   "label": "Payment Reconciliations"
-  },
-  {
-   "default": "0",
-   "fieldname": "auto_reconcile_payments",
-   "fieldtype": "Check",
-   "label": "Auto Reconcile Payments"
-  },
-  {
-   "default": "0",
-   "fieldname": "show_taxes_as_table_in_print",
-   "fieldtype": "Check",
-   "label": "Show Taxes as Table in Print"
  }
 ],
 "icon": "icon-cog",
@@ -390,7 +367,7 @@
 "index_web_pages_for_search": 1,
 "issingle": 1,
 "links": [],
- "modified": "2023-06-13 18:47:46.430291",
+ "modified": "2023-01-02 12:07:42.434214",
 "modified_by": "Administrator",
 "module": "Accounts",
 "name": "Accounts Settings",
--- a/erpnext/accounts/doctype/bank/bank.js
+++ b/erpnext/accounts/doctype/bank/bank.js
@@ -118,10 +118,6 @@ erpnext.integrations.refreshPlaidLink = class refreshPlaidLink {
 	}

 	plaid_success(token, response) {
-		frappe.xcall('erpnext.erpnext_integrations.doctype.plaid_settings.plaid_settings.update_bank_account_ids', {
-			response: response,
-		}).then(() => {
-			frappe.show_alert({ message: __('Plaid Link Updated'), indicator: 'green' });
-		});
+		frappe.show_alert({ message: __('Plaid Link Updated'), indicator: 'green' });
 	}
 };
--- a/erpnext/accounts/doctype/bank_clearance/bank_clearance.js
+++ b/erpnext/accounts/doctype/bank_clearance/bank_clearance.js
@@ -41,7 +41,7 @@ frappe.ui.form.on("Bank Clearance", {
 			frm.trigger("get_payment_entries")
 		);

-		frm.change_custom_button_type(__('Get Payment Entries'), null, 'primary');
+		frm.change_custom_button_type('Get Payment Entries', null, 'primary');
 	},

 	update_clearance_date: function(frm) {
@@ -53,8 +53,8 @@ frappe.ui.form.on("Bank Clearance", {
 				frm.refresh_fields();

 				if (!frm.doc.payment_entries.length) {
-					frm.change_custom_button_type(__('Get Payment Entries'), null, 'primary');
-					frm.change_custom_button_type(__('Update Clearance Date'), null, 'default');
+					frm.change_custom_button_type('Get Payment Entries', null, 'primary');
+					frm.change_custom_button_type('Update Clearance Date', null, 'default');
 				}
 			}
 		});
@@ -72,8 +72,8 @@ frappe.ui.form.on("Bank Clearance", {
 						frm.trigger("update_clearance_date")
 					);

-					frm.change_custom_button_type(__('Get Payment Entries'), null, 'default');
-					frm.change_custom_button_type(__('Update Clearance Date'), null, 'primary');
+					frm.change_custom_button_type('Get Payment Entries', null, 'default');
+					frm.change_custom_button_type('Update Clearance Date', null, 'primary');
 				}
 			}
 		});
--- a/erpnext/accounts/doctype/bank_clearance/bank_clearance.py
+++ b/erpnext/accounts/doctype/bank_clearance/bank_clearance.py
@@ -56,7 +56,7 @@ class BankClearance(Document):
 			select
 				"Payment Entry" as payment_document, name as payment_entry,
 				reference_no as cheque_number, reference_date as cheque_date,
-				if(paid_from=%(account)s, paid_amount + total_taxes_and_charges, 0) as credit,
+				if(paid_from=%(account)s, paid_amount, 0) as credit,
 				if(paid_from=%(account)s, 0, received_amount) as debit,
 				posting_date, ifnull(party,if(paid_from=%(account)s,paid_to,paid_from)) as against_account, clearance_date,
 				if(paid_to=%(account)s, paid_to_account_currency, paid_from_account_currency) as account_currency
@@ -81,7 +81,7 @@ class BankClearance(Document):

 		loan_disbursement = frappe.qb.DocType("Loan Disbursement")

-		query = (
+		loan_disbursements = (
 			frappe.qb.from_(loan_disbursement)
 			.select(
 				ConstantColumn("Loan Disbursement").as_("payment_document"),
@@ -90,22 +90,17 @@ class BankClearance(Document):
 				ConstantColumn(0).as_("debit"),
 				loan_disbursement.reference_number.as_("cheque_number"),
 				loan_disbursement.reference_date.as_("cheque_date"),
-				loan_disbursement.clearance_date.as_("clearance_date"),
 				loan_disbursement.disbursement_date.as_("posting_date"),
 				loan_disbursement.applicant.as_("against_account"),
 			)
 			.where(loan_disbursement.docstatus == 1)
 			.where(loan_disbursement.disbursement_date >= self.from_date)
 			.where(loan_disbursement.disbursement_date <= self.to_date)
+			.where(loan_disbursement.clearance_date.isnull())
 			.where(loan_disbursement.disbursement_account.isin([self.bank_account, self.account]))
 			.orderby(loan_disbursement.disbursement_date)
 			.orderby(loan_disbursement.name, order=frappe.qb.desc)
-		)
-
-		if not self.include_reconciled_entries:
-			query = query.where(loan_disbursement.clearance_date.isnull())
-
-		loan_disbursements = query.run(as_dict=1)
+		).run(as_dict=1)

 		loan_repayment = frappe.qb.DocType("Loan Repayment")

@@ -118,19 +113,16 @@ class BankClearance(Document):
 				ConstantColumn(0).as_("credit"),
 				loan_repayment.reference_number.as_("cheque_number"),
 				loan_repayment.reference_date.as_("cheque_date"),
-				loan_repayment.clearance_date.as_("clearance_date"),
 				loan_repayment.applicant.as_("against_account"),
 				loan_repayment.posting_date,
 			)
 			.where(loan_repayment.docstatus == 1)
+			.where(loan_repayment.clearance_date.isnull())
 			.where(loan_repayment.posting_date >= self.from_date)
 			.where(loan_repayment.posting_date <= self.to_date)
 			.where(loan_repayment.payment_account.isin([self.bank_account, self.account]))
 		)

-		if not self.include_reconciled_entries:
-			query = query.where(loan_repayment.clearance_date.isnull())
-
 		if frappe.db.has_column("Loan Repayment", "repay_from_salary"):
 			query = query.where((loan_repayment.repay_from_salary == 0))

--- a/erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.js
+++ b/erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.js
@@ -18,10 +18,6 @@ frappe.ui.form.on("Bank Reconciliation Tool", {
 	},

 	onload: function (frm) {
-		// Set default filter dates
-		today = frappe.datetime.get_today()
-		frm.doc.bank_statement_from_date = frappe.datetime.add_months(today, -1);
-		frm.doc.bank_statement_to_date = today;
 		frm.trigger('bank_account');
 	},

@@ -36,7 +32,6 @@ frappe.ui.form.on("Bank Reconciliation Tool", {
 	},

 	refresh: function (frm) {
-		frm.disable_save();
 		frappe.require("bank-reconciliation-tool.bundle.js", () =>
 			frm.trigger("make_reconciliation_tool")
 		);
@@ -77,12 +72,10 @@ frappe.ui.form.on("Bank Reconciliation Tool", {
 				},
 			})
 		});
+	},

-		frm.add_custom_button(__('Get Unreconciled Entries'), function() {
-			frm.trigger("make_reconciliation_tool");
-		});
-		frm.change_custom_button_type(__('Get Unreconciled Entries'), null, 'primary');
-
+	after_save: function (frm) {
+		frm.trigger("make_reconciliation_tool");
 	},

 	bank_account: function (frm) {
@@ -96,7 +89,7 @@ frappe.ui.form.on("Bank Reconciliation Tool", {
 					r.account,
 					"account_currency",
 					(r) => {
-						frm.doc.account_currency = r.account_currency;
+						frm.currency = r.account_currency;
 						frm.trigger("render_chart");
 					}
 				);
@@ -162,19 +155,19 @@ frappe.ui.form.on("Bank Reconciliation Tool", {
 		}
 	},

-	render_chart(frm) {
+	render_chart: frappe.utils.debounce((frm) => {
 		frm.cards_manager = new erpnext.accounts.bank_reconciliation.NumberCardManager(
 			{
 				$reconciliation_tool_cards: frm.get_field(
 					"reconciliation_tool_cards"
 				).$wrapper,
 				bank_statement_closing_balance:
-				frm.doc.bank_statement_closing_balance,
+					frm.doc.bank_statement_closing_balance,
 				cleared_balance: frm.cleared_balance,
-				currency: frm.doc.account_currency,
+				currency: frm.currency,
 			}
 		);
-	},
+	}, 500),

 	render(frm) {
 		if (frm.doc.bank_account) {
--- a/erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.json
+++ b/erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.json
@@ -14,7 +14,6 @@
  "to_reference_date",
  "filter_by_reference_date",
  "column_break_2",
-  "account_currency",
  "account_opening_balance",
  "bank_statement_closing_balance",
  "section_break_1",
@@ -60,7 +59,7 @@
   "fieldname": "account_opening_balance",
   "fieldtype": "Currency",
   "label": "Account Opening Balance",
-   "options": "account_currency",
+   "options": "Currency",
   "read_only": 1
  },
  {
@@ -68,7 +67,7 @@
   "fieldname": "bank_statement_closing_balance",
   "fieldtype": "Currency",
   "label": "Closing Balance",
-   "options": "account_currency"
+   "options": "Currency"
  },
  {
   "fieldname": "section_break_1",
@@ -105,20 +104,13 @@
   "fieldname": "filter_by_reference_date",
   "fieldtype": "Check",
   "label": "Filter by Reference Date"
-  },
-  {
-   "fieldname": "account_currency",
-   "fieldtype": "Link",
-   "hidden": 1,
-   "label": "Account Currency",
-   "options": "Currency"
  }
 ],
 "hide_toolbar": 1,
 "index_web_pages_for_search": 1,
 "issingle": 1,
 "links": [],
- "modified": "2023-03-07 11:02:24.535714",
+ "modified": "2023-01-13 13:00:02.022919",
 "modified_by": "Administrator",
 "module": "Accounts",
 "name": "Bank Reconciliation Tool",
--- a/erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py
+++ b/erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py
@@ -10,7 +10,7 @@ from frappe.model.document import Document
 from frappe.query_builder.custom import ConstantColumn
 from frappe.utils import cint, flt

-from erpnext.accounts.doctype.bank_transaction.bank_transaction import get_total_allocated_amount
+from erpnext.accounts.doctype.bank_transaction.bank_transaction import get_paid_amount
 from erpnext.accounts.report.bank_reconciliation_statement.bank_reconciliation_statement import (
 	get_amounts_not_reflected_in_system,
 	get_entries,
@@ -28,7 +28,7 @@ def get_bank_transactions(bank_account, from_date=None, to_date=None):
 	filters = []
 	filters.append(["bank_account", "=", bank_account])
 	filters.append(["docstatus", "=", 1])
-	filters.append(["unallocated_amount", ">", 0.0])
+	filters.append(["unallocated_amount", ">", 0])
 	if to_date:
 		filters.append(["date", "<=", to_date])
 	if from_date:
@@ -58,7 +58,7 @@ def get_bank_transactions(bank_account, from_date=None, to_date=None):
@frappe.whitelist()
 def get_account_balance(bank_account, till_date):
 	# returns account balance till the specified date
-	account = frappe.db.get_value("Bank Account", bank_account, "account")
+	account = frappe.get_cached_value("Bank Account", bank_account, "account")
 	filters = frappe._dict(
 		{"account": account, "report_date": till_date, "include_pos_transactions": 1}
 	)
@@ -66,7 +66,7 @@ def get_account_balance(bank_account, till_date):

 	balance_as_per_system = get_balance_on(filters["account"], filters["report_date"])

-	total_debit, total_credit = 0.0, 0.0
+	total_debit, total_credit = 0, 0
 	for d in data:
 		total_debit += flt(d.debit)
 		total_credit += flt(d.credit)
@@ -131,8 +131,10 @@ def create_journal_entry_bts(
 		fieldname=["name", "deposit", "withdrawal", "bank_account"],
 		as_dict=True,
 	)[0]
-	company_account = frappe.get_value("Bank Account", bank_transaction.bank_account, "account")
-	account_type = frappe.db.get_value("Account", second_account, "account_type")
+	company_account = frappe.get_cached_value(
+		"Bank Account", bank_transaction.bank_account, "account"
+	)
+	account_type = frappe.get_cached_value("Account", second_account, "account_type")
 	if account_type in ["Receivable", "Payable"]:
 		if not (party_type and party):
 			frappe.throw(
@@ -145,8 +147,10 @@ def create_journal_entry_bts(
 	accounts.append(
 		{
 			"account": second_account,
-			"credit_in_account_currency": bank_transaction.deposit,
-			"debit_in_account_currency": bank_transaction.withdrawal,
+			"credit_in_account_currency": bank_transaction.deposit if bank_transaction.deposit > 0 else 0,
+			"debit_in_account_currency": bank_transaction.withdrawal
+			if bank_transaction.withdrawal > 0
+			else 0,
 			"party_type": party_type,
 			"party": party,
 		}
@@ -156,12 +160,14 @@ def create_journal_entry_bts(
 		{
 			"account": company_account,
 			"bank_account": bank_transaction.bank_account,
-			"credit_in_account_currency": bank_transaction.withdrawal,
-			"debit_in_account_currency": bank_transaction.deposit,
+			"credit_in_account_currency": bank_transaction.withdrawal
+			if bank_transaction.withdrawal > 0
+			else 0,
+			"debit_in_account_currency": bank_transaction.deposit if bank_transaction.deposit > 0 else 0,
 		}
 	)

-	company = frappe.get_value("Account", company_account, "company")
+	company = frappe.get_cached_value("Account", company_account, "company")

 	journal_entry_dict = {
 		"voucher_type": entry_type,
@@ -181,22 +187,16 @@ def create_journal_entry_bts(
 	journal_entry.insert()
 	journal_entry.submit()

-	if bank_transaction.deposit > 0.0:
+	if bank_transaction.deposit > 0:
 		paid_amount = bank_transaction.deposit
 	else:
 		paid_amount = bank_transaction.withdrawal

 	vouchers = json.dumps(
-		[
-			{
-				"payment_doctype": "Journal Entry",
-				"payment_name": journal_entry.name,
-				"amount": paid_amount,
-			}
-		]
+		[{"payment_doctype": "Journal Entry", "payment_name": journal_entry.name, "amount": paid_amount}]
 	)

-	return reconcile_vouchers(bank_transaction_name, vouchers)
+	return reconcile_vouchers(bank_transaction.name, vouchers)


@frappe.whitelist()
@@ -220,10 +220,12 @@ def create_payment_entry_bts(
 		as_dict=True,
 	)[0]
 	paid_amount = bank_transaction.unallocated_amount
-	payment_type = "Receive" if bank_transaction.deposit > 0.0 else "Pay"
+	payment_type = "Receive" if bank_transaction.deposit > 0 else "Pay"

-	company_account = frappe.get_value("Bank Account", bank_transaction.bank_account, "account")
-	company = frappe.get_value("Account", company_account, "company")
+	company_account = frappe.get_cached_value(
+		"Bank Account", bank_transaction.bank_account, "account"
+	)
+	company = frappe.get_cached_value("Account", company_account, "company")
 	payment_entry_dict = {
 		"company": company,
 		"payment_type": payment_type,
@@ -259,15 +261,9 @@ def create_payment_entry_bts(

 	payment_entry.submit()
 	vouchers = json.dumps(
-		[
-			{
-				"payment_doctype": "Payment Entry",
-				"payment_name": payment_entry.name,
-				"amount": paid_amount,
-			}
-		]
+		[{"payment_doctype": "Payment Entry", "payment_name": payment_entry.name, "amount": paid_amount}]
 	)
-	return reconcile_vouchers(bank_transaction_name, vouchers)
+	return reconcile_vouchers(bank_transaction.name, vouchers)


@frappe.whitelist()
@@ -349,7 +345,59 @@ def reconcile_vouchers(bank_transaction_name, vouchers):
 	# updated clear date of all the vouchers based on the bank transaction
 	vouchers = json.loads(vouchers)
 	transaction = frappe.get_doc("Bank Transaction", bank_transaction_name)
-	transaction.add_payment_entries(vouchers)
+	company_account = frappe.get_cached_value("Bank Account", transaction.bank_account, "account")
+
+	if transaction.unallocated_amount == 0:
+		frappe.throw(_("This bank transaction is already fully reconciled"))
+	total_amount = 0
+	for voucher in vouchers:
+		voucher["payment_entry"] = frappe.get_doc(voucher["payment_doctype"], voucher["payment_name"])
+		total_amount += get_paid_amount(
+			frappe._dict(
+				{
+					"payment_document": voucher["payment_doctype"],
+					"payment_entry": voucher["payment_name"],
+				}
+			),
+			transaction.currency,
+			company_account,
+		)
+
+	if total_amount > transaction.unallocated_amount:
+		frappe.throw(
+			_(
+				"The sum total of amounts of all selected vouchers should be less than the unallocated amount of the bank transaction"
+			)
+		)
+	account = frappe.get_cached_value("Bank Account", transaction.bank_account, "account")
+
+	for voucher in vouchers:
+		gl_entry = frappe.db.get_value(
+			"GL Entry",
+			dict(
+				account=account, voucher_type=voucher["payment_doctype"], voucher_no=voucher["payment_name"]
+			),
+			["credit_in_account_currency as credit", "debit_in_account_currency as debit"],
+			as_dict=1,
+		)
+		gl_amount, transaction_amount = (
+			(gl_entry.credit, transaction.deposit)
+			if gl_entry.credit > 0
+			else (gl_entry.debit, transaction.withdrawal)
+		)
+		allocated_amount = gl_amount if gl_amount >= transaction_amount else transaction_amount
+
+		transaction.append(
+			"payment_entries",
+			{
+				"payment_document": voucher["payment_entry"].doctype,
+				"payment_entry": voucher["payment_entry"].name,
+				"allocated_amount": allocated_amount,
+			},
+		)
+
+	transaction.save()
+	transaction.update_allocations()
 	return frappe.get_doc("Bank Transaction", bank_transaction_name)


@@ -368,9 +416,9 @@ def get_linked_payments(
 	bank_account = frappe.db.get_values(
 		"Bank Account", transaction.bank_account, ["account", "company"], as_dict=True
 	)[0]
-	(gl_account, company) = (bank_account.account, bank_account.company)
+	(account, company) = (bank_account.account, bank_account.company)
 	matching = check_matching(
-		gl_account,
+		account,
 		company,
 		transaction,
 		document_types,
@@ -380,27 +428,7 @@ def get_linked_payments(
 		from_reference_date,
 		to_reference_date,
 	)
-	return subtract_allocations(gl_account, matching)
-
-
-def subtract_allocations(gl_account, vouchers):
-	"Look up & subtract any existing Bank Transaction allocations"
-	copied = []
-	for voucher in vouchers:
-		rows = get_total_allocated_amount(voucher[1], voucher[2])
-		amount = None
-		for row in rows:
-			if row["gl_account"] == gl_account:
-				amount = row["total"]
-				break
-
-		if amount:
-			l = list(voucher)
-			l[3] -= amount
-			copied.append(tuple(l))
-		else:
-			copied.append(voucher)
-	return copied
+	return matching


 def check_matching(
@@ -414,7 +442,6 @@ def check_matching(
 	from_reference_date,
 	to_reference_date,
 ):
-	exact_match = True if "exact_match" in document_types else False
 	# combine all types of vouchers
 	subquery = get_queries(
 		bank_account,
@@ -426,11 +453,10 @@ def check_matching(
 		filter_by_reference_date,
 		from_reference_date,
 		to_reference_date,
-		exact_match,
 	)
 	filters = {
 		"amount": transaction.unallocated_amount,
-		"payment_type": "Receive" if transaction.deposit > 0.0 else "Pay",
+		"payment_type": "Receive" if transaction.deposit > 0 else "Pay",
 		"reference_no": transaction.reference_number,
 		"party_type": transaction.party_type,
 		"party": transaction.party,
@@ -439,9 +465,7 @@ def check_matching(

 	matching_vouchers = []

-	matching_vouchers.extend(
-		get_loan_vouchers(bank_account, transaction, document_types, filters, exact_match)
-	)
+	matching_vouchers.extend(get_loan_vouchers(bank_account, transaction, document_types, filters))

 	for query in subquery:
 		matching_vouchers.extend(
@@ -463,10 +487,10 @@ def get_queries(
 	filter_by_reference_date,
 	from_reference_date,
 	to_reference_date,
-	exact_match,
 ):
 	# get queries to get matching vouchers
-	account_from_to = "paid_to" if transaction.deposit > 0.0 else "paid_from"
+	amount_condition = "=" if "exact_match" in document_types else "<="
+	account_from_to = "paid_to" if transaction.deposit > 0 else "paid_from"
 	queries = []

 	# get matching queries from all the apps
@@ -477,7 +501,7 @@ def get_queries(
 				company,
 				transaction,
 				document_types,
-				exact_match,
+				amount_condition,
 				account_from_to,
 				from_date,
 				to_date,
@@ -496,7 +520,7 @@ def get_matching_queries(
 	company,
 	transaction,
 	document_types,
-	exact_match,
+	amount_condition,
 	account_from_to,
 	from_date,
 	to_date,
@@ -506,8 +530,8 @@ def get_matching_queries(
 ):
 	queries = []
 	if "payment_entry" in document_types:
-		query = get_pe_matching_query(
-			exact_match,
+		pe_amount_matching = get_pe_matching_query(
+			amount_condition,
 			account_from_to,
 			transaction,
 			from_date,
@@ -516,11 +540,11 @@ def get_matching_queries(
 			from_reference_date,
 			to_reference_date,
 		)
-		queries.append(query)
+		queries.extend([pe_amount_matching])

 	if "journal_entry" in document_types:
-		query = get_je_matching_query(
-			exact_match,
+		je_amount_matching = get_je_matching_query(
+			amount_condition,
 			transaction,
 			from_date,
 			to_date,
@@ -528,70 +552,34 @@ def get_matching_queries(
 			from_reference_date,
 			to_reference_date,
 		)
-		queries.append(query)
+		queries.extend([je_amount_matching])

-	if transaction.deposit > 0.0 and "sales_invoice" in document_types:
-		query = get_si_matching_query(exact_match)
-		queries.append(query)
+	if transaction.deposit > 0 and "sales_invoice" in document_types:
+		si_amount_matching = get_si_matching_query(amount_condition)
+		queries.extend([si_amount_matching])

-	if transaction.withdrawal > 0.0:
+	if transaction.withdrawal > 0:
 		if "purchase_invoice" in document_types:
-			query = get_pi_matching_query(exact_match)
-			queries.append(query)
-
-	if "bank_transaction" in document_types:
-		query = get_bt_matching_query(exact_match, transaction)
-		queries.append(query)
+			pi_amount_matching = get_pi_matching_query(amount_condition)
+			queries.extend([pi_amount_matching])

 	return queries


-def get_loan_vouchers(bank_account, transaction, document_types, filters, exact_match):
+def get_loan_vouchers(bank_account, transaction, document_types, filters):
 	vouchers = []
+	amount_condition = True if "exact_match" in document_types else False

-	if transaction.withdrawal > 0.0 and "loan_disbursement" in document_types:
-		vouchers.extend(get_ld_matching_query(bank_account, exact_match, filters))
+	if transaction.withdrawal > 0 and "loan_disbursement" in document_types:
+		vouchers.extend(get_ld_matching_query(bank_account, amount_condition, filters))

-	if transaction.deposit > 0.0 and "loan_repayment" in document_types:
-		vouchers.extend(get_lr_matching_query(bank_account, exact_match, filters))
+	if transaction.deposit > 0 and "loan_repayment" in document_types:
+		vouchers.extend(get_lr_matching_query(bank_account, amount_condition, filters))

 	return vouchers


-def get_bt_matching_query(exact_match, transaction):
-	# get matching bank transaction query
-	# find bank transactions in the same bank account with opposite sign
-	# same bank account must have same company and currency
-	field = "deposit" if transaction.withdrawal > 0.0 else "withdrawal"
-
-	return f"""
-
-		SELECT
-			(CASE WHEN reference_number = %(reference_no)s THEN 1 ELSE 0 END
-			+ CASE WHEN {field} = %(amount)s THEN 1 ELSE 0 END
-			+ CASE WHEN ( party_type = %(party_type)s AND party = %(party)s ) THEN 1 ELSE 0 END
-			+ CASE WHEN unallocated_amount = %(amount)s THEN 1 ELSE 0 END
-			+ 1) AS rank,
-			'Bank Transaction' AS doctype,
-			name,
-			unallocated_amount AS paid_amount,
-			reference_number AS reference_no,
-			date AS reference_date,
-			party,
-			party_type,
-			date AS posting_date,
-			currency
-		FROM
-			`tabBank Transaction`
-		WHERE
-			status != 'Reconciled'
-			AND name != '{transaction.name}'
-			AND bank_account = '{transaction.bank_account}'
-			AND {field} {'= %(amount)s' if exact_match else '> 0.0'}
-	"""
-
-
-def get_ld_matching_query(bank_account, exact_match, filters):
+def get_ld_matching_query(bank_account, amount_condition, filters):
 	loan_disbursement = frappe.qb.DocType("Loan Disbursement")
 	matching_reference = loan_disbursement.reference_number == filters.get("reference_number")
 	matching_party = loan_disbursement.applicant_type == filters.get(
@@ -619,17 +607,17 @@ def get_ld_matching_query(bank_account, exact_match, filters):
 		.where(loan_disbursement.disbursement_account == bank_account)
 	)

-	if exact_match:
+	if amount_condition:
 		query.where(loan_disbursement.disbursed_amount == filters.get("amount"))
 	else:
-		query.where(loan_disbursement.disbursed_amount > 0.0)
+		query.where(loan_disbursement.disbursed_amount <= filters.get("amount"))

 	vouchers = query.run(as_list=True)

 	return vouchers


-def get_lr_matching_query(bank_account, exact_match, filters):
+def get_lr_matching_query(bank_account, amount_condition, filters):
 	loan_repayment = frappe.qb.DocType("Loan Repayment")
 	matching_reference = loan_repayment.reference_number == filters.get("reference_number")
 	matching_party = loan_repayment.applicant_type == filters.get(
@@ -660,10 +648,10 @@ def get_lr_matching_query(bank_account, exact_match, filters):
 	if frappe.db.has_column("Loan Repayment", "repay_from_salary"):
 		query = query.where((loan_repayment.repay_from_salary == 0))

-	if exact_match:
+	if amount_condition:
 		query.where(loan_repayment.amount_paid == filters.get("amount"))
 	else:
-		query.where(loan_repayment.amount_paid > 0.0)
+		query.where(loan_repayment.amount_paid <= filters.get("amount"))

 	vouchers = query.run()

@@ -671,7 +659,7 @@ def get_lr_matching_query(bank_account, exact_match, filters):


 def get_pe_matching_query(
-	exact_match,
+	amount_condition,
 	account_from_to,
 	transaction,
 	from_date,
@@ -681,7 +669,7 @@ def get_pe_matching_query(
 	to_reference_date,
 ):
 	# get matching payment entries query
-	if transaction.deposit > 0.0:
+	if transaction.deposit > 0:
 		currency_field = "paid_to_account_currency as currency"
 	else:
 		currency_field = "paid_from_account_currency as currency"
@@ -696,8 +684,7 @@ def get_pe_matching_query(
 	return f"""
 		SELECT
 			(CASE WHEN reference_no=%(reference_no)s THEN 1 ELSE 0 END
-			+ CASE WHEN (party_type = %(party_type)s AND party = %(party)s ) THEN 1 ELSE 0 END
-			+ CASE WHEN paid_amount = %(amount)s THEN 1 ELSE 0 END
+			+ CASE WHEN (party_type = %(party_type)s AND party = %(party)s ) THEN 1 ELSE 0  END
 			+ 1 ) AS rank,
 			'Payment Entry' as doctype,
 			name,
@@ -711,19 +698,20 @@ def get_pe_matching_query(
 		FROM
 			`tabPayment Entry`
 		WHERE
-			docstatus = 1
+			paid_amount {amount_condition} %(amount)s
+			AND docstatus = 1
 			AND payment_type IN (%(payment_type)s, 'Internal Transfer')
 			AND ifnull(clearance_date, '') = ""
 			AND {account_from_to} = %(bank_account)s
-			AND paid_amount {'= %(amount)s' if exact_match else '> 0.0'}
 			{filter_by_date}
 			{filter_by_reference_no}
 		order by{order_by}
+
 	"""


 def get_je_matching_query(
-	exact_match,
+	amount_condition,
 	transaction,
 	from_date,
 	to_date,
@@ -735,7 +723,7 @@ def get_je_matching_query(
 	# We have mapping at the bank level
 	# So one bank could have both types of bank accounts like asset and liability
 	# So cr_or_dr should be judged only on basis of withdrawal and deposit and not account type
-	cr_or_dr = "credit" if transaction.withdrawal > 0.0 else "debit"
+	cr_or_dr = "credit" if transaction.withdrawal > 0 else "debit"
 	filter_by_date = f"AND je.posting_date between '{from_date}' and '{to_date}'"
 	order_by = " je.posting_date"
 	filter_by_reference_no = ""
@@ -747,29 +735,26 @@ def get_je_matching_query(
 	return f"""
 		SELECT
 			(CASE WHEN je.cheque_no=%(reference_no)s THEN 1 ELSE 0 END
-			+ CASE WHEN jea.{cr_or_dr}_in_account_currency = %(amount)s THEN 1 ELSE 0 END
 			+ 1) AS rank ,
-			'Journal Entry' AS doctype,
+			'Journal Entry' as doctype,
 			je.name,
-			jea.{cr_or_dr}_in_account_currency AS paid_amount,
-			je.cheque_no AS reference_no,
-			je.cheque_date AS reference_date,
-			je.pay_to_recd_from AS party,
+			jea.{cr_or_dr}_in_account_currency as paid_amount,
+			je.cheque_no as reference_no,
+			je.cheque_date as reference_date,
+			je.pay_to_recd_from as party,
 			jea.party_type,
 			je.posting_date,
-			jea.account_currency AS currency
+			jea.account_currency as currency
 		FROM
-			`tabJournal Entry Account` AS jea
+			`tabJournal Entry Account` as jea
 		JOIN
-			`tabJournal Entry` AS je
+			`tabJournal Entry` as je
 		ON
 			jea.parent = je.name
 		WHERE
-			je.docstatus = 1
-			AND je.voucher_type NOT IN ('Opening Entry')
-			AND (je.clearance_date IS NULL OR je.clearance_date='0000-00-00')
+			(je.clearance_date is null or je.clearance_date='0000-00-00')
 			AND jea.account = %(bank_account)s
-			AND jea.{cr_or_dr}_in_account_currency {'= %(amount)s' if exact_match else '> 0.0'}
+			AND jea.{cr_or_dr}_in_account_currency {amount_condition} %(amount)s
 			AND je.docstatus = 1
 			{filter_by_date}
 			{filter_by_reference_no}
@@ -777,12 +762,11 @@ def get_je_matching_query(
 	"""


-def get_si_matching_query(exact_match):
-	# get matching sales invoice query
+def get_si_matching_query(amount_condition):
+	# get matchin sales invoice query
 	return f"""
 		SELECT
-			( CASE WHEN si.customer = %(party)s  THEN 1 ELSE 0 END
-			+ CASE WHEN sip.amount = %(amount)s THEN 1 ELSE 0 END
+			( CASE WHEN si.customer = %(party)s  THEN 1 ELSE 0  END
 			+ 1 ) AS rank,
 			'Sales Invoice' as doctype,
 			si.name,
@@ -800,20 +784,18 @@ def get_si_matching_query(exact_match):
 			`tabSales Invoice` as si
 		ON
 			sip.parent = si.name
-		WHERE
-			si.docstatus = 1
-			AND (sip.clearance_date is null or sip.clearance_date='0000-00-00')
+		WHERE (sip.clearance_date is null or sip.clearance_date='0000-00-00')
 			AND sip.account = %(bank_account)s
-			AND sip.amount {'= %(amount)s' if exact_match else '> 0.0'}
+			AND sip.amount {amount_condition} %(amount)s
+			AND si.docstatus = 1
 	"""


-def get_pi_matching_query(exact_match):
-	# get matching purchase invoice query when they are also used as payment entries (is_paid)
+def get_pi_matching_query(amount_condition):
+	# get matching purchase invoice query
 	return f"""
 		SELECT
 			( CASE WHEN supplier = %(party)s THEN 1 ELSE 0 END
-			+ CASE WHEN paid_amount = %(amount)s THEN 1 ELSE 0 END
 			+ 1 ) AS rank,
 			'Purchase Invoice' as doctype,
 			name,
@@ -827,9 +809,9 @@ def get_pi_matching_query(exact_match):
 		FROM
 			`tabPurchase Invoice`
 		WHERE
-			docstatus = 1
+			paid_amount {amount_condition} %(amount)s
+			AND docstatus = 1
 			AND is_paid = 1
 			AND ifnull(clearance_date, '') = ""
-			AND cash_bank_account = %(bank_account)s
-			AND paid_amount {'= %(amount)s' if exact_match else '> 0.0'}
+			AND cash_bank_account  = %(bank_account)s
 	"""
--- a/erpnext/accounts/doctype/bank_statement_import/bank_statement_import.py
+++ b/erpnext/accounts/doctype/bank_statement_import/bank_statement_import.py
@@ -53,20 +53,19 @@ class BankStatementImport(DataImport):
 		if "Bank Account" not in json.dumps(preview["columns"]):
 			frappe.throw(_("Please add the Bank Account column"))

-		from frappe.utils.background_jobs import is_job_enqueued
+		from frappe.utils.background_jobs import is_job_queued
 		from frappe.utils.scheduler import is_scheduler_inactive

 		if is_scheduler_inactive() and not frappe.flags.in_test:
 			frappe.throw(_("Scheduler is inactive. Cannot import data."), title=_("Scheduler Inactive"))

-		job_id = f"bank_statement_import::{self.name}"
-		if not is_job_enqueued(job_id):
+		if not is_job_queued(self.name):
 			enqueue(
 				start_import,
 				queue="default",
 				timeout=6000,
 				event="data_import",
-				job_id=job_id,
+				job_name=self.name,
 				data_import=self.name,
 				bank_account=self.bank_account,
 				import_file_path=self.import_file,
--- a/erpnext/accounts/doctype/bank_transaction/bank_transaction.js
+++ b/erpnext/accounts/doctype/bank_transaction/bank_transaction.js
@@ -12,13 +12,8 @@ frappe.ui.form.on("Bank Transaction", {
 			};
 		});
 	},
-	refresh(frm) {
-		frm.add_custom_button(__('Unreconcile Transaction'), () => {
-			frm.call('remove_payment_entries')
-			.then( () => frm.refresh() );
-		});
-	},
-	bank_account: function (frm) {
+
+	bank_account: function(frm) {
 		set_bank_statement_filter(frm);
 	},

@@ -39,7 +34,6 @@ frappe.ui.form.on("Bank Transaction", {
 			"Journal Entry",
 			"Sales Invoice",
 			"Purchase Invoice",
-			"Bank Transaction",
 		];
 	}
 });
@@ -55,7 +49,7 @@ const update_clearance_date = (frm, cdt, cdn) => {
 		frappe
 			.xcall(
 				"erpnext.accounts.doctype.bank_transaction.bank_transaction.unclear_reference_payment",
-				{ doctype: cdt, docname: cdn, bt_name: frm.doc.name }
+				{ doctype: cdt, docname: cdn }
 			)
 			.then((e) => {
 				if (e == "success") {
--- a/erpnext/accounts/doctype/bank_transaction/bank_transaction.json
+++ b/erpnext/accounts/doctype/bank_transaction/bank_transaction.json
@@ -20,11 +20,9 @@
  "currency",
  "section_break_10",
  "description",
-  "reference_number",
-  "column_break_10",
-  "transaction_id",
-  "transaction_type",
  "section_break_14",
+  "reference_number",
+  "transaction_id",
  "payment_entries",
  "section_break_18",
  "allocated_amount",
@@ -192,21 +190,11 @@
   "label": "Withdrawal",
   "oldfieldname": "credit",
   "options": "currency"
-  },
-  {
-   "fieldname": "column_break_10",
-   "fieldtype": "Column Break"
-  },
-  {
-   "fieldname": "transaction_type",
-   "fieldtype": "Data",
-   "label": "Transaction Type",
-   "length": 50
  }
 ],
 "is_submittable": 1,
 "links": [],
- "modified": "2022-05-29 18:36:50.475964",
+ "modified": "2022-03-21 19:05:04.208222",
 "modified_by": "Administrator",
 "module": "Accounts",
 "name": "Bank Transaction",
@@ -260,4 +248,4 @@
 "states": [],
 "title_field": "bank_account",
 "track_changes": 1
-}
+}
--- a/erpnext/accounts/doctype/bank_transaction/bank_transaction.py
+++ b/erpnext/accounts/doctype/bank_transaction/bank_transaction.py
@@ -1,6 +1,9 @@
 # Copyright (c) 2019, Frappe Technologies Pvt. Ltd. and contributors
 # For license information, please see license.txt

+
+from functools import reduce
+
 import frappe
 from frappe.utils import flt

@@ -15,135 +18,72 @@ class BankTransaction(StatusUpdater):
 		self.clear_linked_payment_entries()
 		self.set_status()

-	_saving_flag = False
-
-	# nosemgrep: frappe-semgrep-rules.rules.frappe-modifying-but-not-comitting
 	def on_update_after_submit(self):
-		"Run on save(). Avoid recursion caused by multiple saves"
-		if not self._saving_flag:
-			self._saving_flag = True
-			self.clear_linked_payment_entries()
-			self.update_allocations()
-			self._saving_flag = False
+		self.update_allocations()
+		self.clear_linked_payment_entries()
+		self.set_status(update=True)

 	def on_cancel(self):
 		self.clear_linked_payment_entries(for_cancel=True)
 		self.set_status(update=True)

 	def update_allocations(self):
-		"The doctype does not allow modifications after submission, so write to the db direct"
 		if self.payment_entries:
-			allocated_amount = sum(p.allocated_amount for p in self.payment_entries)
+			allocated_amount = reduce(
+				lambda x, y: flt(x) + flt(y), [x.allocated_amount for x in self.payment_entries]
+			)
 		else:
-			allocated_amount = 0.0
+			allocated_amount = 0

-		amount = abs(flt(self.withdrawal) - flt(self.deposit))
-		self.db_set("allocated_amount", flt(allocated_amount))
-		self.db_set("unallocated_amount", amount - flt(allocated_amount))
-		self.reload()
-		self.set_status(update=True)
+		if allocated_amount:
+			frappe.db.set_value(self.doctype, self.name, "allocated_amount", flt(allocated_amount))
+			frappe.db.set_value(
+				self.doctype,
+				self.name,
+				"unallocated_amount",
+				abs(flt(self.withdrawal) - flt(self.deposit)) - flt(allocated_amount),
+			)

-	def add_payment_entries(self, vouchers):
-		"Add the vouchers with zero allocation. Save() will perform the allocations and clearance"
-		if 0.0 >= self.unallocated_amount:
-			frappe.throw(frappe._("Bank Transaction {0} is already fully reconciled").format(self.name))
+		else:
+			frappe.db.set_value(self.doctype, self.name, "allocated_amount", 0)
+			frappe.db.set_value(
+				self.doctype, self.name, "unallocated_amount", abs(flt(self.withdrawal) - flt(self.deposit))
+			)

-		added = False
-		for voucher in vouchers:
-			# Can't add same voucher twice
-			found = False
-			for pe in self.payment_entries:
-				if (
-					pe.payment_document == voucher["payment_doctype"]
-					and pe.payment_entry == voucher["payment_name"]
-				):
-					found = True
-
-			if not found:
-				pe = {
-					"payment_document": voucher["payment_doctype"],
-					"payment_entry": voucher["payment_name"],
-					"allocated_amount": 0.0,  # Temporary
-				}
-				child = self.append("payment_entries", pe)
-				added = True
-
-		# runs on_update_after_submit
-		if added:
-			self.save()
-
-	def allocate_payment_entries(self):
-		"""Refactored from bank reconciliation tool.
-		Non-zero allocations must be amended/cleared manually
-		Get the bank transaction amount (b) and remove as we allocate
-		For each payment_entry if allocated_amount == 0:
-		- get the amount already allocated against all transactions (t), need latest date
-		- get the voucher amount (from gl) (v)
-		- allocate (a = v - t)
-		    - a = 0: should already be cleared, so clear & remove payment_entry
-		    - 0 < a <= u: allocate a & clear
-		    - 0 < a, a > u: allocate u
-		    - 0 > a: Error: already over-allocated
-		- clear means: set the latest transaction date as clearance date
-		"""
-		gl_bank_account = frappe.db.get_value("Bank Account", self.bank_account, "account")
-		remaining_amount = self.unallocated_amount
-		for payment_entry in self.payment_entries:
-			if payment_entry.allocated_amount == 0.0:
-				unallocated_amount, should_clear, latest_transaction = get_clearance_details(
-					self, payment_entry
-				)
-
-				if 0.0 == unallocated_amount:
-					if should_clear:
-						latest_transaction.clear_linked_payment_entry(payment_entry)
-					self.db_delete_payment_entry(payment_entry)
-
-				elif remaining_amount <= 0.0:
-					self.db_delete_payment_entry(payment_entry)
-
-				elif 0.0 < unallocated_amount and unallocated_amount <= remaining_amount:
-					payment_entry.db_set("allocated_amount", unallocated_amount)
-					remaining_amount -= unallocated_amount
-					if should_clear:
-						latest_transaction.clear_linked_payment_entry(payment_entry)
-
-				elif 0.0 < unallocated_amount and unallocated_amount > remaining_amount:
-					payment_entry.db_set("allocated_amount", remaining_amount)
-					remaining_amount = 0.0
-
-				elif 0.0 > unallocated_amount:
-					self.db_delete_payment_entry(payment_entry)
-					frappe.throw(frappe._("Voucher {0} is over-allocated by {1}").format(unallocated_amount))
+		amount = self.deposit or self.withdrawal
+		if amount == self.allocated_amount:
+			frappe.db.set_value(self.doctype, self.name, "status", "Reconciled")

 		self.reload()

-	def db_delete_payment_entry(self, payment_entry):
-		frappe.db.delete("Bank Transaction Payments", {"name": payment_entry.name})
-
-	@frappe.whitelist()
-	def remove_payment_entries(self):
-		for payment_entry in self.payment_entries:
-			self.remove_payment_entry(payment_entry)
-		# runs on_update_after_submit
-		self.save()
-
-	def remove_payment_entry(self, payment_entry):
-		"Clear payment entry and clearance"
-		self.clear_linked_payment_entry(payment_entry, for_cancel=True)
-		self.remove(payment_entry)
-
 	def clear_linked_payment_entries(self, for_cancel=False):
-		if for_cancel:
-			for payment_entry in self.payment_entries:
-				self.clear_linked_payment_entry(payment_entry, for_cancel)
-		else:
-			self.allocate_payment_entries()
+		for payment_entry in self.payment_entries:
+			if payment_entry.payment_document == "Sales Invoice":
+				self.clear_sales_invoice(payment_entry, for_cancel=for_cancel)
+			elif payment_entry.payment_document in get_doctypes_for_bank_reconciliation():
+				self.clear_simple_entry(payment_entry, for_cancel=for_cancel)

-	def clear_linked_payment_entry(self, payment_entry, for_cancel=False):
-		clearance_date = None if for_cancel else self.date
-		set_voucher_clearance(
-			payment_entry.payment_document, payment_entry.payment_entry, clearance_date, self
+	def clear_simple_entry(self, payment_entry, for_cancel=False):
+		if payment_entry.payment_document == "Payment Entry":
+			if (
+				frappe.db.get_value("Payment Entry", payment_entry.payment_entry, "payment_type")
+				== "Internal Transfer"
+			):
+				if len(get_reconciled_bank_transactions(payment_entry)) < 2:
+					return
+
+		clearance_date = self.date if not for_cancel else None
+		frappe.db.set_value(
+			payment_entry.payment_document, payment_entry.payment_entry, "clearance_date", clearance_date
+		)
+
+	def clear_sales_invoice(self, payment_entry, for_cancel=False):
+		clearance_date = self.date if not for_cancel else None
+		frappe.db.set_value(
+			"Sales Invoice Payment",
+			dict(parenttype=payment_entry.payment_document, parent=payment_entry.payment_entry),
+			"clearance_date",
+			clearance_date,
 		)


@@ -153,114 +93,38 @@ def get_doctypes_for_bank_reconciliation():
 	return frappe.get_hooks("bank_reconciliation_doctypes")


-def get_clearance_details(transaction, payment_entry):
-	"""
-	There should only be one bank gle for a voucher.
-	Could be none for a Bank Transaction.
-	But if a JE, could affect two banks.
-	Should only clear the voucher if all bank gles are allocated.
-	"""
-	gl_bank_account = frappe.db.get_value("Bank Account", transaction.bank_account, "account")
-	gles = get_related_bank_gl_entries(payment_entry.payment_document, payment_entry.payment_entry)
-	bt_allocations = get_total_allocated_amount(
-		payment_entry.payment_document, payment_entry.payment_entry
+def get_reconciled_bank_transactions(payment_entry):
+	reconciled_bank_transactions = frappe.get_all(
+		"Bank Transaction Payments",
+		filters={"payment_entry": payment_entry.payment_entry},
+		fields=["parent"],
 	)

-	unallocated_amount = min(
-		transaction.unallocated_amount,
-		get_paid_amount(payment_entry, transaction.currency, gl_bank_account),
-	)
-	unmatched_gles = len(gles)
-	latest_transaction = transaction
-	for gle in gles:
-		if gle["gl_account"] == gl_bank_account:
-			if gle["amount"] <= 0.0:
-				frappe.throw(
-					frappe._("Voucher {0} value is broken: {1}").format(
-						payment_entry.payment_entry, gle["amount"]
-					)
-				)
-
-			unmatched_gles -= 1
-			unallocated_amount = gle["amount"]
-			for a in bt_allocations:
-				if a["gl_account"] == gle["gl_account"]:
-					unallocated_amount = gle["amount"] - a["total"]
-					if frappe.utils.getdate(transaction.date) < a["latest_date"]:
-						latest_transaction = frappe.get_doc("Bank Transaction", a["latest_name"])
-		else:
-			# Must be a Journal Entry affecting more than one bank
-			for a in bt_allocations:
-				if a["gl_account"] == gle["gl_account"] and a["total"] == gle["amount"]:
-					unmatched_gles -= 1
-
-	return unallocated_amount, unmatched_gles == 0, latest_transaction
+	return reconciled_bank_transactions


-def get_related_bank_gl_entries(doctype, docname):
-	# nosemgrep: frappe-semgrep-rules.rules.frappe-using-db-sql
-	result = frappe.db.sql(
+def get_total_allocated_amount(payment_entry):
+	return frappe.db.sql(
 		"""
 		SELECT
-			ABS(gle.credit_in_account_currency - gle.debit_in_account_currency) AS amount,
-			gle.account AS gl_account
+			SUM(btp.allocated_amount) as allocated_amount,
+			bt.name
 		FROM
-			`tabGL Entry` gle
+			`tabBank Transaction Payments` as btp
 		LEFT JOIN
-			`tabAccount` ac ON ac.name=gle.account
+			`tabBank Transaction` bt ON bt.name=btp.parent
 		WHERE
-			ac.account_type = 'Bank'
-			AND gle.voucher_type = %(doctype)s
-			AND gle.voucher_no = %(docname)s
-			AND is_cancelled = 0
-		""",
-		dict(doctype=doctype, docname=docname),
+			btp.payment_document = %s
+		AND
+			btp.payment_entry = %s
+		AND
+			bt.docstatus = 1""",
+		(payment_entry.payment_document, payment_entry.payment_entry),
 		as_dict=True,
 	)
-	return result


-def get_total_allocated_amount(doctype, docname):
-	"""
-	Gets the sum of allocations for a voucher on each bank GL account
-	along with the latest bank transaction name & date
-	NOTE: query may also include just saved vouchers/payments but with zero allocated_amount
-	"""
-	# nosemgrep: frappe-semgrep-rules.rules.frappe-using-db-sql
-	result = frappe.db.sql(
-		"""
-		SELECT total, latest_name, latest_date, gl_account FROM (
-			SELECT
-				ROW_NUMBER() OVER w AS rownum,
-				SUM(btp.allocated_amount) OVER(PARTITION BY ba.account) AS total,
-				FIRST_VALUE(bt.name) OVER w AS latest_name,
-				FIRST_VALUE(bt.date) OVER w AS latest_date,
-				ba.account AS gl_account
-			FROM
-				`tabBank Transaction Payments` btp
-			LEFT JOIN `tabBank Transaction` bt ON bt.name=btp.parent
-			LEFT JOIN `tabBank Account` ba ON ba.name=bt.bank_account
-			WHERE
-				btp.payment_document = %(doctype)s
-				AND btp.payment_entry = %(docname)s
-				AND bt.docstatus = 1
-			WINDOW w AS (PARTITION BY ba.account ORDER BY bt.date desc)
-		) temp
-		WHERE
-			rownum = 1
-		""",
-		dict(doctype=doctype, docname=docname),
-		as_dict=True,
-	)
-	for row in result:
-		# Why is this *sometimes* a byte string?
-		if isinstance(row["latest_name"], bytes):
-			row["latest_name"] = row["latest_name"].decode()
-		row["latest_date"] = frappe.utils.getdate(row["latest_date"])
-	return result
-
-
-def get_paid_amount(payment_entry, currency, gl_bank_account):
+def get_paid_amount(payment_entry, currency, bank_account):
 	if payment_entry.payment_document in ["Payment Entry", "Sales Invoice", "Purchase Invoice"]:

 		paid_amount_field = "paid_amount"
@@ -281,13 +145,10 @@ def get_paid_amount(payment_entry, currency, gl_bank_account):
 		)

 	elif payment_entry.payment_document == "Journal Entry":
-		return abs(
-			frappe.db.get_value(
-				"Journal Entry Account",
-				{"parent": payment_entry.payment_entry, "account": gl_bank_account},
-				"sum(debit_in_account_currency-credit_in_account_currency)",
-			)
-			or 0
+		return frappe.db.get_value(
+			"Journal Entry Account",
+			{"parent": payment_entry.payment_entry, "account": bank_account},
+			"sum(credit_in_account_currency)",
 		)

 	elif payment_entry.payment_document == "Expense Claim":
@@ -305,12 +166,6 @@ def get_paid_amount(payment_entry, currency, gl_bank_account):
 			payment_entry.payment_document, payment_entry.payment_entry, "amount_paid"
 		)

-	elif payment_entry.payment_document == "Bank Transaction":
-		dep, wth = frappe.db.get_value(
-			"Bank Transaction", payment_entry.payment_entry, ("deposit", "withdrawal")
-		)
-		return abs(flt(wth) - flt(dep))
-
 	else:
 		frappe.throw(
 			"Please reconcile {0}: {1} manually".format(
@@ -319,55 +174,18 @@ def get_paid_amount(payment_entry, currency, gl_bank_account):
 		)


-def set_voucher_clearance(doctype, docname, clearance_date, self):
-	if doctype in [
-		"Payment Entry",
-		"Journal Entry",
-		"Purchase Invoice",
-		"Expense Claim",
-		"Loan Repayment",
-		"Loan Disbursement",
-	]:
-		if (
-			doctype == "Payment Entry"
-			and frappe.db.get_value("Payment Entry", docname, "payment_type") == "Internal Transfer"
-			and len(get_reconciled_bank_transactions(doctype, docname)) < 2
-		):
-			return
-		frappe.db.set_value(doctype, docname, "clearance_date", clearance_date)
-
-	elif doctype == "Sales Invoice":
-		frappe.db.set_value(
-			"Sales Invoice Payment",
-			dict(parenttype=doctype, parent=docname),
-			"clearance_date",
-			clearance_date,
-		)
-
-	elif doctype == "Bank Transaction":
-		# For when a second bank transaction has fixed another, e.g. refund
-		bt = frappe.get_doc(doctype, docname)
-		if clearance_date:
-			vouchers = [{"payment_doctype": "Bank Transaction", "payment_name": self.name}]
-			bt.add_payment_entries(vouchers)
-		else:
-			for pe in bt.payment_entries:
-				if pe.payment_document == self.doctype and pe.payment_entry == self.name:
-					bt.remove(pe)
-					bt.save()
-					break
-
-
-def get_reconciled_bank_transactions(doctype, docname):
-	return frappe.get_all(
-		"Bank Transaction Payments",
-		filters={"payment_document": doctype, "payment_entry": docname},
-		pluck="parent",
-	)
-
-
@frappe.whitelist()
-def unclear_reference_payment(doctype, docname, bt_name):
-	bt = frappe.get_doc("Bank Transaction", bt_name)
-	set_voucher_clearance(doctype, docname, None, bt)
-	return docname
+def unclear_reference_payment(doctype, docname):
+	if frappe.db.exists(doctype, docname):
+		doc = frappe.get_doc(doctype, docname)
+		if doctype == "Sales Invoice":
+			frappe.db.set_value(
+				"Sales Invoice Payment",
+				dict(parenttype=doc.payment_document, parent=doc.payment_entry),
+				"clearance_date",
+				None,
+			)
+		else:
+			frappe.db.set_value(doc.payment_document, doc.payment_entry, "clearance_date", None)
+
+		return doc.payment_entry
--- a/erpnext/accounts/doctype/budget/budget.py
+++ b/erpnext/accounts/doctype/budget/budget.py
@@ -125,27 +125,14 @@ def validate_expense_against_budget(args, expense_amount=0):
 	if not args.account:
 		return

-	default_dimensions = [
-		{
-			"fieldname": "project",
-			"document_type": "Project",
-		},
-		{
-			"fieldname": "cost_center",
-			"document_type": "Cost Center",
-		},
-	]
-
-	for dimension in default_dimensions + get_accounting_dimensions(as_list=False):
-		budget_against = dimension.get("fieldname")
-
+	for budget_against in ["project", "cost_center"] + get_accounting_dimensions():
 		if (
 			args.get(budget_against)
 			and args.account
 			and frappe.db.get_value("Account", {"name": args.account, "root_type": "Expense"})
 		):

-			doctype = dimension.get("document_type")
+			doctype = frappe.unscrub(budget_against)

 			if frappe.get_cached_value("DocType", doctype, "is_tree"):
 				lft, rgt = frappe.db.get_value(doctype, args.get(budget_against), ["lft", "rgt"])
--- a/erpnext/accounts/doctype/account_closing_balance/init.py
+++ b/erpnext/accounts/doctype/account_closing_balance/init.py
--- a/erpnext/accounts/doctype/cash_flow_mapper/cash_flow_mapper.js
+++ b/erpnext/accounts/doctype/cash_flow_mapper/cash_flow_mapper.js
@@ -0,0 +1,6 @@
+// Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and contributors
+// For license information, please see license.txt
+
+frappe.ui.form.on('Cash Flow Mapper', {
+
+});
--- a/erpnext/accounts/doctype/cash_flow_mapper/cash_flow_mapper.json
+++ b/erpnext/accounts/doctype/cash_flow_mapper/cash_flow_mapper.json
@@ -0,0 +1,275 @@
+{
+ "allow_copy": 0, 
+ "allow_guest_to_view": 0, 
+ "allow_import": 0, 
+ "allow_rename": 1, 
+ "autoname": "field:section_name", 
+ "beta": 0, 
+ "creation": "2018-02-08 10:00:14.066519", 
+ "custom": 0, 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "document_type": "", 
+ "editable_grid": 1, 
+ "engine": "InnoDB", 
+ "fields": [
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "section_name", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Section Name", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "section_header", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Section Header", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "description": "e.g Adjustments for:", 
+   "fieldname": "section_leader", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Section Leader", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "section_subtotal", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Section Subtotal", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "section_footer", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Section Footer", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "accounts", 
+   "fieldtype": "Table", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Accounts", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Cash Flow Mapping Template Details", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "position", 
+   "fieldtype": "Int", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Position", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }
+ ], 
+ "has_web_view": 0, 
+ "hide_heading": 0, 
+ "hide_toolbar": 0, 
+ "idx": 0, 
+ "image_view": 0, 
+ "in_create": 0, 
+ "is_submittable": 0, 
+ "issingle": 0, 
+ "istable": 0, 
+ "max_attachments": 0, 
+ "modified": "2018-02-15 18:28:55.034933", 
+ "modified_by": "Administrator", 
+ "module": "Accounts", 
+ "name": "Cash Flow Mapper", 
+ "name_case": "", 
+ "owner": "Administrator", 
+ "permissions": [
+  {
+   "amend": 0, 
+   "apply_user_permissions": 0, 
+   "cancel": 0, 
+   "create": 0, 
+   "delete": 0, 
+   "email": 1, 
+   "export": 1, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "System Manager", 
+   "set_user_permissions": 0, 
+   "share": 1, 
+   "submit": 0, 
+   "write": 1
+  }
+ ], 
+ "quick_entry": 0, 
+ "read_only": 0, 
+ "read_only_onload": 0, 
+ "show_name_in_global_search": 0, 
+ "sort_field": "name", 
+ "sort_order": "DESC", 
+ "track_changes": 1, 
+ "track_seen": 0
+}
--- a/erpnext/accounts/doctype/cash_flow_mapper/cash_flow_mapper.py
+++ b/erpnext/accounts/doctype/cash_flow_mapper/cash_flow_mapper.py
@@ -0,0 +1,9 @@
+# Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and contributors
+# For license information, please see license.txt
+
+
+from frappe.model.document import Document
+
+
+class CashFlowMapper(Document):
+	pass
--- a/erpnext/accounts/doctype/cash_flow_mapper/default_cash_flow_mapper.py
+++ b/erpnext/accounts/doctype/cash_flow_mapper/default_cash_flow_mapper.py
@@ -0,0 +1,25 @@
+DEFAULT_MAPPERS = [
+	{
+		"doctype": "Cash Flow Mapper",
+		"section_footer": "Net cash generated by operating activities",
+		"section_header": "Cash flows from operating activities",
+		"section_leader": "Adjustments for",
+		"section_name": "Operating Activities",
+		"position": 0,
+		"section_subtotal": "Cash generated from operations",
+	},
+	{
+		"doctype": "Cash Flow Mapper",
+		"position": 1,
+		"section_footer": "Net cash used in investing activities",
+		"section_header": "Cash flows from investing activities",
+		"section_name": "Investing Activities",
+	},
+	{
+		"doctype": "Cash Flow Mapper",
+		"position": 2,
+		"section_footer": "Net cash used in financing activites",
+		"section_header": "Cash flows from financing activities",
+		"section_name": "Financing Activities",
+	},
+]
--- a/erpnext/accounts/doctype/cash_flow_mapper/test_cash_flow_mapper.py
+++ b/erpnext/accounts/doctype/cash_flow_mapper/test_cash_flow_mapper.py
@@ -0,0 +1,8 @@
+# Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and Contributors
+# See license.txt
+
+import unittest
+
+
+class TestCashFlowMapper(unittest.TestCase):
+	pass
--- a/erpnext/accounts/doctype/process_payment_reconciliation/init.py
+++ b/erpnext/accounts/doctype/process_payment_reconciliation/init.py
--- a/erpnext/accounts/doctype/cash_flow_mapping/cash_flow_mapping.js
+++ b/erpnext/accounts/doctype/cash_flow_mapping/cash_flow_mapping.js
@@ -0,0 +1,43 @@
+// Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and contributors
+// For license information, please see license.txt
+
+frappe.ui.form.on('Cash Flow Mapping', {
+	refresh: function(frm) {
+		frm.events.disable_unchecked_fields(frm);
+	},
+	reset_check_fields: function(frm) {
+		frm.fields.filter(field => field.df.fieldtype === 'Check')
+			.map(field => frm.set_df_property(field.df.fieldname, 'read_only', 0));
+	},
+	has_checked_field(frm) {
+		const val = frm.fields.filter(field => field.value === 1);
+		return val.length ? 1 : 0;
+	},
+	_disable_unchecked_fields: function(frm) {
+		// get value of clicked field
+		frm.fields.filter(field => field.value === 0)
+			.map(field => frm.set_df_property(field.df.fieldname, 'read_only', 1));
+	},
+	disable_unchecked_fields: function(frm) {
+		frm.events.reset_check_fields(frm);
+		const checked = frm.events.has_checked_field(frm);
+		if (checked) {
+			frm.events._disable_unchecked_fields(frm);
+		}
+	},
+	is_working_capital: function(frm) {
+		frm.events.disable_unchecked_fields(frm);
+	},
+	is_finance_cost: function(frm) {
+		frm.events.disable_unchecked_fields(frm);
+	},
+	is_income_tax_liability: function(frm) {
+		frm.events.disable_unchecked_fields(frm);
+	},
+	is_income_tax_expense: function(frm) {
+		frm.events.disable_unchecked_fields(frm);
+	},
+	is_finance_cost_adjustment: function(frm) {
+		frm.events.disable_unchecked_fields(frm);
+	}
+});
--- a/erpnext/accounts/doctype/cash_flow_mapping/cash_flow_mapping.json
+++ b/erpnext/accounts/doctype/cash_flow_mapping/cash_flow_mapping.json
@@ -0,0 +1,359 @@
+{
+ "allow_copy": 0, 
+ "allow_guest_to_view": 0, 
+ "allow_import": 0, 
+ "allow_rename": 1, 
+ "autoname": "field:mapping_name", 
+ "beta": 0, 
+ "creation": "2018-02-08 09:28:44.678364", 
+ "custom": 0, 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "document_type": "", 
+ "editable_grid": 1, 
+ "engine": "InnoDB", 
+ "fields": [
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "mapping_name", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Name", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "label", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Label", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "accounts", 
+   "fieldtype": "Table", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Accounts", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Cash Flow Mapping Accounts", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "sb_1", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Select Maximum Of 1", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "default": "0", 
+   "fieldname": "is_finance_cost", 
+   "fieldtype": "Check", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Is Finance Cost", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "default": "0", 
+   "fieldname": "is_working_capital", 
+   "fieldtype": "Check", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Is Working Capital", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "default": "0", 
+   "fieldname": "is_finance_cost_adjustment", 
+   "fieldtype": "Check", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Is Finance Cost Adjustment", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "default": "0", 
+   "fieldname": "is_income_tax_liability", 
+   "fieldtype": "Check", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Is Income Tax Liability", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "default": "0", 
+   "fieldname": "is_income_tax_expense", 
+   "fieldtype": "Check", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Is Income Tax Expense", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }
+ ], 
+ "has_web_view": 0, 
+ "hide_heading": 0, 
+ "hide_toolbar": 0, 
+ "idx": 0, 
+ "image_view": 0, 
+ "in_create": 0, 
+ "is_submittable": 0, 
+ "issingle": 0, 
+ "istable": 0, 
+ "max_attachments": 0, 
+ "modified": "2018-02-15 08:25:18.693533", 
+ "modified_by": "Administrator", 
+ "module": "Accounts", 
+ "name": "Cash Flow Mapping", 
+ "name_case": "", 
+ "owner": "Administrator", 
+ "permissions": [
+  {
+   "amend": 0, 
+   "apply_user_permissions": 0, 
+   "cancel": 0, 
+   "create": 1, 
+   "delete": 1, 
+   "email": 1, 
+   "export": 1, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "System Manager", 
+   "set_user_permissions": 0, 
+   "share": 1, 
+   "submit": 0, 
+   "write": 1
+  }, 
+  {
+   "amend": 0, 
+   "apply_user_permissions": 0, 
+   "cancel": 0, 
+   "create": 1, 
+   "delete": 1, 
+   "email": 1, 
+   "export": 1, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "Administrator", 
+   "set_user_permissions": 0, 
+   "share": 1, 
+   "submit": 0, 
+   "write": 1
+  }
+ ], 
+ "quick_entry": 0, 
+ "read_only": 0, 
+ "read_only_onload": 0, 
+ "show_name_in_global_search": 0, 
+ "sort_field": "name", 
+ "sort_order": "DESC", 
+ "track_changes": 1, 
+ "track_seen": 0
+}
--- a/erpnext/accounts/doctype/cash_flow_mapping/cash_flow_mapping.py
+++ b/erpnext/accounts/doctype/cash_flow_mapping/cash_flow_mapping.py
@@ -0,0 +1,22 @@
+# Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and contributors
+# For license information, please see license.txt
+
+
+import frappe
+from frappe import _
+from frappe.model.document import Document
+
+
+class CashFlowMapping(Document):
+	def validate(self):
+		self.validate_checked_options()
+
+	def validate_checked_options(self):
+		checked_fields = [
+			d for d in self.meta.fields if d.fieldtype == "Check" and self.get(d.fieldname) == 1
+		]
+		if len(checked_fields) > 1:
+			frappe.throw(
+				_("You can only select a maximum of one option from the list of check boxes."),
+				title=_("Error"),
+			)
--- a/erpnext/accounts/doctype/cash_flow_mapping/test_cash_flow_mapping.py
+++ b/erpnext/accounts/doctype/cash_flow_mapping/test_cash_flow_mapping.py
@@ -0,0 +1,28 @@
+# Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and Contributors
+# See license.txt
+
+import unittest
+
+import frappe
+
+
+class TestCashFlowMapping(unittest.TestCase):
+	def setUp(self):
+		if frappe.db.exists("Cash Flow Mapping", "Test Mapping"):
+			frappe.delete_doc("Cash Flow Mappping", "Test Mapping")
+
+	def tearDown(self):
+		frappe.delete_doc("Cash Flow Mapping", "Test Mapping")
+
+	def test_multiple_selections_not_allowed(self):
+		doc = frappe.new_doc("Cash Flow Mapping")
+		doc.mapping_name = "Test Mapping"
+		doc.label = "Test label"
+		doc.append("accounts", {"account": "Accounts Receivable - _TC"})
+		doc.is_working_capital = 1
+		doc.is_finance_cost = 1
+
+		self.assertRaises(frappe.ValidationError, doc.insert)
+
+		doc.is_finance_cost = 0
+		doc.insert()
--- a/erpnext/accounts/doctype/process_payment_reconciliation_log/init.py
+++ b/erpnext/accounts/doctype/process_payment_reconciliation_log/init.py
--- a/erpnext/accounts/doctype/cash_flow_mapping_accounts/cash_flow_mapping_accounts.json
+++ b/erpnext/accounts/doctype/cash_flow_mapping_accounts/cash_flow_mapping_accounts.json
@@ -0,0 +1,73 @@
+{
+ "allow_copy": 0, 
+ "allow_guest_to_view": 0, 
+ "allow_import": 0, 
+ "allow_rename": 0, 
+ "autoname": "field:account", 
+ "beta": 0, 
+ "creation": "2018-02-08 09:25:34.353995", 
+ "custom": 0, 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "document_type": "", 
+ "editable_grid": 1, 
+ "engine": "InnoDB", 
+ "fields": [
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "account", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "account", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Account", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }
+ ], 
+ "has_web_view": 0, 
+ "hide_heading": 0, 
+ "hide_toolbar": 0, 
+ "idx": 0, 
+ "image_view": 0, 
+ "in_create": 0, 
+ "is_submittable": 0, 
+ "issingle": 0, 
+ "istable": 1, 
+ "max_attachments": 0, 
+ "modified": "2018-02-08 09:25:34.353995", 
+ "modified_by": "Administrator", 
+ "module": "Accounts", 
+ "name": "Cash Flow Mapping Accounts", 
+ "name_case": "", 
+ "owner": "Administrator", 
+ "permissions": [], 
+ "quick_entry": 1, 
+ "read_only": 0, 
+ "read_only_onload": 0, 
+ "show_name_in_global_search": 0, 
+ "sort_field": "modified", 
+ "sort_order": "DESC", 
+ "track_changes": 1, 
+ "track_seen": 0
+}
--- a/erpnext/accounts/doctype/cash_flow_mapping_accounts/cash_flow_mapping_accounts.py
+++ b/erpnext/accounts/doctype/cash_flow_mapping_accounts/cash_flow_mapping_accounts.py
@@ -0,0 +1,9 @@
+# Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and contributors
+# For license information, please see license.txt
+
+
+from frappe.model.document import Document
+
+
+class CashFlowMappingAccounts(Document):
+	pass
--- a/erpnext/accounts/doctype/process_payment_reconciliation_log_allocations/init.py
+++ b/erpnext/accounts/doctype/process_payment_reconciliation_log_allocations/init.py
--- a/erpnext/accounts/doctype/cash_flow_mapping_template/cash_flow_mapping_template.js
+++ b/erpnext/accounts/doctype/cash_flow_mapping_template/cash_flow_mapping_template.js
@@ -0,0 +1,6 @@
+// Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and contributors
+// For license information, please see license.txt
+
+frappe.ui.form.on('Cash Flow Mapping Template', {
+
+});
--- a/erpnext/accounts/doctype/cash_flow_mapping_template/cash_flow_mapping_template.json
+++ b/erpnext/accounts/doctype/cash_flow_mapping_template/cash_flow_mapping_template.json
@@ -0,0 +1,123 @@
+{
+ "allow_copy": 0, 
+ "allow_guest_to_view": 0, 
+ "allow_import": 0, 
+ "allow_rename": 0, 
+ "beta": 0, 
+ "creation": "2018-02-08 10:20:18.316801", 
+ "custom": 0, 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "document_type": "", 
+ "editable_grid": 1, 
+ "engine": "InnoDB", 
+ "fields": [
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "template_name", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Template Name", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "mapping", 
+   "fieldtype": "Table", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Cash Flow Mapping", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Cash Flow Mapping Template Details", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }
+ ], 
+ "has_web_view": 0, 
+ "hide_heading": 0, 
+ "hide_toolbar": 0, 
+ "idx": 0, 
+ "image_view": 0, 
+ "in_create": 0, 
+ "is_submittable": 0, 
+ "issingle": 0, 
+ "istable": 0, 
+ "max_attachments": 0, 
+ "modified": "2018-02-08 10:20:18.316801", 
+ "modified_by": "Administrator", 
+ "module": "Accounts", 
+ "name": "Cash Flow Mapping Template", 
+ "name_case": "", 
+ "owner": "Administrator", 
+ "permissions": [
+  {
+   "amend": 0, 
+   "apply_user_permissions": 0, 
+   "cancel": 0, 
+   "create": 1, 
+   "delete": 1, 
+   "email": 1, 
+   "export": 1, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "System Manager", 
+   "set_user_permissions": 0, 
+   "share": 1, 
+   "submit": 0, 
+   "write": 1
+  }
+ ], 
+ "quick_entry": 1, 
+ "read_only": 0, 
+ "read_only_onload": 0, 
+ "show_name_in_global_search": 0, 
+ "sort_field": "modified", 
+ "sort_order": "DESC", 
+ "track_changes": 1, 
+ "track_seen": 0
+}
--- a/erpnext/accounts/doctype/cash_flow_mapping_template/cash_flow_mapping_template.py
+++ b/erpnext/accounts/doctype/cash_flow_mapping_template/cash_flow_mapping_template.py
@@ -0,0 +1,9 @@
+# Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and contributors
+# For license information, please see license.txt
+
+
+from frappe.model.document import Document
+
+
+class CashFlowMappingTemplate(Document):
+	pass
--- a/erpnext/accounts/doctype/cash_flow_mapping_template/test_cash_flow_mapping_template.py
+++ b/erpnext/accounts/doctype/cash_flow_mapping_template/test_cash_flow_mapping_template.py
@@ -0,0 +1,8 @@
+# Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and Contributors
+# See license.txt
+
+import unittest
+
+
+class TestCashFlowMappingTemplate(unittest.TestCase):
+	pass
--- a/erpnext/accounts/doctype/cash_flow_mapping_template_details/init.py
+++ b/erpnext/accounts/doctype/cash_flow_mapping_template_details/init.py
--- a/erpnext/accounts/doctype/cash_flow_mapping_template_details/cash_flow_mapping_template_details.js
+++ b/erpnext/accounts/doctype/cash_flow_mapping_template_details/cash_flow_mapping_template_details.js
@@ -0,0 +1,6 @@
+// Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and contributors
+// For license information, please see license.txt
+
+frappe.ui.form.on('Cash Flow Mapping Template Details', {
+
+});
--- a/erpnext/accounts/doctype/cash_flow_mapping_template_details/cash_flow_mapping_template_details.json
+++ b/erpnext/accounts/doctype/cash_flow_mapping_template_details/cash_flow_mapping_template_details.json
@@ -0,0 +1,34 @@
+{
+ "actions": [],
+ "creation": "2018-02-08 10:18:48.513608",
+ "doctype": "DocType",
+ "editable_grid": 1,
+ "engine": "InnoDB",
+ "field_order": [
+  "mapping"
+ ],
+ "fields": [
+  {
+   "fieldname": "mapping",
+   "fieldtype": "Link",
+   "in_list_view": 1,
+   "label": "Mapping",
+   "options": "Cash Flow Mapping",
+   "reqd": 1,
+   "unique": 1
+  }
+ ],
+ "istable": 1,
+ "links": [],
+ "modified": "2022-02-21 03:34:57.902332",
+ "modified_by": "Administrator",
+ "module": "Accounts",
+ "name": "Cash Flow Mapping Template Details",
+ "owner": "Administrator",
+ "permissions": [],
+ "quick_entry": 1,
+ "sort_field": "modified",
+ "sort_order": "DESC",
+ "states": [],
+ "track_changes": 1
+}
--- a/erpnext/accounts/doctype/cash_flow_mapping_template_details/cash_flow_mapping_template_details.py
+++ b/erpnext/accounts/doctype/cash_flow_mapping_template_details/cash_flow_mapping_template_details.py
@@ -0,0 +1,9 @@
+# Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and contributors
+# For license information, please see license.txt
+
+
+from frappe.model.document import Document
+
+
+class CashFlowMappingTemplateDetails(Document):
+	pass
--- a/erpnext/accounts/doctype/cash_flow_mapping_template_details/test_cash_flow_mapping_template_details.py
+++ b/erpnext/accounts/doctype/cash_flow_mapping_template_details/test_cash_flow_mapping_template_details.py
@@ -0,0 +1,8 @@
+# Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and Contributors
+# See license.txt
+
+import unittest
+
+
+class TestCashFlowMappingTemplateDetails(unittest.TestCase):
+	pass
--- a/erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.py
+++ b/erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.py
@@ -36,7 +36,7 @@ def validate_columns(data):

 	no_of_columns = max([len(d) for d in data])

-	if no_of_columns > 8:
+	if no_of_columns > 7:
 		frappe.throw(
 			_("More columns found than expected. Please compare the uploaded file with standard template"),
 			title=(_("Wrong Template")),
@@ -233,7 +233,6 @@ def build_forest(data):
 			is_group,
 			account_type,
 			root_type,
-			account_currency,
 		) = i

 		if not account_name:
@@ -254,8 +253,6 @@ def build_forest(data):
 			charts_map[account_name]["account_type"] = account_type
 		if root_type:
 			charts_map[account_name]["root_type"] = root_type
-		if account_currency:
-			charts_map[account_name]["account_currency"] = account_currency
 		path = return_parent(data, account_name)[::-1]
 		paths.append(path)  # List of path is created
 		line_no += 1
@@ -318,21 +315,20 @@ def get_template(template_type):
 		"Is Group",
 		"Account Type",
 		"Root Type",
-		"Account Currency",
 	]
 	writer = UnicodeWriter()
 	writer.writerow(fields)

 	if template_type == "Blank Template":
 		for root_type in get_root_types():
-			writer.writerow(["", "", "", "", 1, "", root_type])
+			writer.writerow(["", "", "", 1, "", root_type])

 		for account in get_mandatory_group_accounts():
-			writer.writerow(["", "", "", "", 1, account, "Asset"])
+			writer.writerow(["", "", "", 1, account, "Asset"])

 		for account_type in get_mandatory_account_types():
 			writer.writerow(
-				["", "", "", "", 0, account_type.get("account_type"), account_type.get("root_type")]
+				["", "", "", 0, account_type.get("account_type"), account_type.get("root_type")]
 			)
 	else:
 		writer = get_sample_template(writer)
--- a/erpnext/accounts/doctype/dunning/dunning.json
+++ b/erpnext/accounts/doctype/dunning/dunning.json
@@ -245,7 +245,6 @@
   "fieldname": "contact_mobile",
   "fieldtype": "Small Text",
   "label": "Mobile No",
-   "options": "Phone",
   "read_only": 1
  },
  {
@@ -316,11 +315,10 @@
 ],
 "is_submittable": 1,
 "links": [],
- "modified": "2023-06-03 16:24:01.677026",
+ "modified": "2020-08-03 18:55:43.683053",
 "modified_by": "Administrator",
 "module": "Accounts",
 "name": "Dunning",
- "naming_rule": "By \"Naming Series\" field",
 "owner": "Administrator",
 "permissions": [
  {
@@ -367,7 +365,6 @@
 ],
 "sort_field": "modified",
 "sort_order": "ASC",
- "states": [],
 "title_field": "customer_name",
 "track_changes": 1
 }
--- a/erpnext/accounts/doctype/exchange_rate_revaluation/exchange_rate_revaluation.js
+++ b/erpnext/accounts/doctype/exchange_rate_revaluation/exchange_rate_revaluation.js
@@ -35,21 +35,6 @@ frappe.ui.form.on('Exchange Rate Revaluation', {
 		}
 	},

-	validate_rounding_loss: function(frm) {
-		allowance = frm.doc.rounding_loss_allowance;
-		if (!(allowance > 0 && allowance < 1)) {
-			frappe.throw(__("Rounding Loss Allowance should be between 0 and 1"));
-		}
-	},
-
-	rounding_loss_allowance: function(frm) {
-		frm.events.validate_rounding_loss(frm);
-	},
-
-	validate: function(frm) {
-		frm.events.validate_rounding_loss(frm);
-	},
-
 	get_entries: function(frm, account) {
 		frappe.call({
 			method: "get_accounts_data",
@@ -141,8 +126,7 @@ var get_account_details = function(frm, cdt, cdn) {
 			company: frm.doc.company,
 			posting_date: frm.doc.posting_date,
 			party_type: row.party_type,
-			party: row.party,
-			rounding_loss_allowance: frm.doc.rounding_loss_allowance
+			party: row.party
 		},
 		callback: function(r){
 			$.extend(row, r.message);
--- a/erpnext/accounts/doctype/exchange_rate_revaluation/exchange_rate_revaluation.json
+++ b/erpnext/accounts/doctype/exchange_rate_revaluation/exchange_rate_revaluation.json
@@ -8,7 +8,6 @@
 "engine": "InnoDB",
 "field_order": [
  "posting_date",
-  "rounding_loss_allowance",
  "column_break_2",
  "company",
  "section_break_4",
@@ -97,18 +96,11 @@
  {
   "fieldname": "column_break_10",
   "fieldtype": "Column Break"
-  },
-  {
-   "default": "0.05",
-   "description": "Only values between 0 and 1 are allowed. \nEx: If allowance is set at 0.07, accounts that have balance of 0.07 in either of the currencies will be considered as zero balance account",
-   "fieldname": "rounding_loss_allowance",
-   "fieldtype": "Float",
-   "label": "Rounding Loss Allowance"
  }
 ],
 "is_submittable": 1,
 "links": [],
- "modified": "2023-06-12 21:02:09.818208",
+ "modified": "2022-12-29 19:38:24.416529",
 "modified_by": "Administrator",
 "module": "Accounts",
 "name": "Exchange Rate Revaluation",
--- a/erpnext/accounts/doctype/exchange_rate_revaluation/exchange_rate_revaluation.py
+++ b/erpnext/accounts/doctype/exchange_rate_revaluation/exchange_rate_revaluation.py
@@ -12,19 +12,13 @@ from frappe.utils import flt, get_link_to_form

 import erpnext
 from erpnext.accounts.doctype.journal_entry.journal_entry import get_balance_on
-from erpnext.accounts.utils import get_currency_precision
 from erpnext.setup.utils import get_exchange_rate


 class ExchangeRateRevaluation(Document):
 	def validate(self):
-		self.validate_rounding_loss_allowance()
 		self.set_total_gain_loss()

-	def validate_rounding_loss_allowance(self):
-		if not (self.rounding_loss_allowance > 0 and self.rounding_loss_allowance < 1):
-			frappe.throw(_("Rounding Loss Allowance should be between 0 and 1"))
-
 	def set_total_gain_loss(self):
 		total_gain_loss = 0

@@ -97,12 +91,7 @@ class ExchangeRateRevaluation(Document):
 	def get_accounts_data(self):
 		self.validate_mandatory()
 		account_details = self.get_account_balance_from_gle(
-			company=self.company,
-			posting_date=self.posting_date,
-			account=None,
-			party_type=None,
-			party=None,
-			rounding_loss_allowance=self.rounding_loss_allowance,
+			company=self.company, posting_date=self.posting_date, account=None, party_type=None, party=None
 		)
 		accounts_with_new_balance = self.calculate_new_account_balance(
 			self.company, self.posting_date, account_details
@@ -114,9 +103,7 @@ class ExchangeRateRevaluation(Document):
 		return accounts_with_new_balance

 	@staticmethod
-	def get_account_balance_from_gle(
-		company, posting_date, account, party_type, party, rounding_loss_allowance
-	):
+	def get_account_balance_from_gle(company, posting_date, account, party_type, party):
 		account_details = []

 		if company and posting_date:
@@ -183,23 +170,6 @@ class ExchangeRateRevaluation(Document):
 					.run(as_dict=True)
 				)

-				# round off balance based on currency precision
-				# and consider debit-credit difference allowance
-				currency_precision = get_currency_precision()
-				rounding_loss_allowance = rounding_loss_allowance or 0.05
-				for acc in account_details:
-					acc.balance_in_account_currency = flt(acc.balance_in_account_currency, currency_precision)
-					if abs(acc.balance_in_account_currency) <= rounding_loss_allowance:
-						acc.balance_in_account_currency = 0
-
-					acc.balance = flt(acc.balance, currency_precision)
-					if abs(acc.balance) <= rounding_loss_allowance:
-						acc.balance = 0
-
-					acc.zero_balance = (
-						True if (acc.balance == 0 or acc.balance_in_account_currency == 0) else False
-					)
-
 		return account_details

 	@staticmethod
@@ -241,7 +211,8 @@ class ExchangeRateRevaluation(Document):
 			# Handle Accounts with '0' balance in Account/Base Currency
 			for d in [x for x in account_details if x.zero_balance]:

-				if d.balance != 0:
+				# TODO: Set new balance in Base/Account currency
+				if d.balance > 0:
 					current_exchange_rate = new_exchange_rate = 0

 					new_balance_in_account_currency = 0  # this will be '0'
@@ -428,9 +399,6 @@ class ExchangeRateRevaluation(Document):

 		journal_entry_accounts = []
 		for d in accounts:
-			if not flt(d.get("balance_in_account_currency"), d.precision("balance_in_account_currency")):
-				continue
-
 			dr_or_cr = (
 				"debit_in_account_currency"
 				if d.get("balance_in_account_currency") > 0
@@ -480,13 +448,7 @@ class ExchangeRateRevaluation(Document):
 				}
 			)

-		journal_entry.set("accounts", journal_entry_accounts)
-		journal_entry.set_amounts_in_company_currency()
-		journal_entry.set_total_debit_credit()
-
-		self.gain_loss_unbooked += journal_entry.difference - self.gain_loss_unbooked
-		journal_entry.append(
-			"accounts",
+		journal_entry_accounts.append(
 			{
 				"account": unrealized_exchange_gain_loss_account,
 				"balance": get_balance_on(unrealized_exchange_gain_loss_account),
@@ -498,9 +460,10 @@ class ExchangeRateRevaluation(Document):
 				"exchange_rate": 1,
 				"reference_type": "Exchange Rate Revaluation",
 				"reference_name": self.name,
-			},
+			}
 		)

+		journal_entry.set("accounts", journal_entry_accounts)
 		journal_entry.set_amounts_in_company_currency()
 		journal_entry.set_total_debit_credit()
 		journal_entry.save()
@@ -520,8 +483,6 @@ def calculate_exchange_rate_using_last_gle(company, account, party_type, party):
 		conditions.append(gl.company == company)
 		conditions.append(gl.account == account)
 		conditions.append(gl.is_cancelled == 0)
-		conditions.append((gl.debit > 0) | (gl.credit > 0))
-		conditions.append((gl.debit_in_account_currency > 0) | (gl.credit_in_account_currency > 0))
 		if party_type:
 			conditions.append(gl.party_type == party_type)
 		if party:
@@ -551,9 +512,7 @@ def calculate_exchange_rate_using_last_gle(company, account, party_type, party):


@frappe.whitelist()
-def get_account_details(
-	company, posting_date, account, party_type=None, party=None, rounding_loss_allowance=None
-):
+def get_account_details(company, posting_date, account, party_type=None, party=None):
 	if not (company and posting_date):
 		frappe.throw(_("Company and Posting Date is mandatory"))

@@ -571,12 +530,7 @@ def get_account_details(
 		"account_currency": account_currency,
 	}
 	account_balance = ExchangeRateRevaluation.get_account_balance_from_gle(
-		company=company,
-		posting_date=posting_date,
-		account=account,
-		party_type=party_type,
-		party=party,
-		rounding_loss_allowance=rounding_loss_allowance,
+		company=company, posting_date=posting_date, account=account, party_type=party_type, party=party
 	)

 	if account_balance and (
--- a/erpnext/accounts/doctype/fiscal_year/fiscal_year.py
+++ b/erpnext/accounts/doctype/fiscal_year/fiscal_year.py
@@ -12,7 +12,7 @@ from frappe.utils import add_days, add_years, cstr, getdate
 class FiscalYear(Document):
 	@frappe.whitelist()
 	def set_as_default(self):
-		frappe.db.set_single_value("Global Defaults", "current_fiscal_year", self.name)
+		frappe.db.set_value("Global Defaults", None, "current_fiscal_year", self.name)
 		global_defaults = frappe.get_doc("Global Defaults")
 		global_defaults.check_permission("write")
 		global_defaults.on_update()
--- a/erpnext/accounts/doctype/journal_entry/journal_entry.js
+++ b/erpnext/accounts/doctype/journal_entry/journal_entry.js
@@ -8,7 +8,7 @@ frappe.provide("erpnext.journal_entry");
 frappe.ui.form.on("Journal Entry", {
 	setup: function(frm) {
 		frm.add_fetch("bank_account", "account", "account");
-		frm.ignore_doctypes_on_cancel_all = ['Sales Invoice', 'Purchase Invoice', 'Journal Entry', "Repost Payment Ledger", 'Asset Depreciation Schedule'];
+		frm.ignore_doctypes_on_cancel_all = ['Sales Invoice', 'Purchase Invoice', 'Journal Entry'];
 	},

 	refresh: function(frm) {
--- a/erpnext/accounts/doctype/journal_entry/journal_entry.json
+++ b/erpnext/accounts/doctype/journal_entry/journal_entry.json
@@ -137,8 +137,7 @@
   "fieldname": "finance_book",
   "fieldtype": "Link",
   "label": "Finance Book",
-   "options": "Finance Book",
-   "read_only": 1
+   "options": "Finance Book"
  },
  {
   "fieldname": "2_add_edit_gl_entries",
@@ -539,7 +538,7 @@
 "idx": 176,
 "is_submittable": 1,
 "links": [],
- "modified": "2023-03-01 14:58:59.286591",
+ "modified": "2023-01-17 12:53:53.280620",
 "modified_by": "Administrator",
 "module": "Accounts",
 "name": "Journal Entry",
--- a/erpnext/accounts/doctype/journal_entry/journal_entry.py
+++ b/erpnext/accounts/doctype/journal_entry/journal_entry.py
@@ -51,7 +51,7 @@ class JournalEntry(AccountsController):
 		self.validate_multi_currency()
 		self.set_amounts_in_company_currency()
 		self.validate_debit_credit_amount()
-		self.set_total_debit_credit()
+
 		# Do not validate while importing via data import
 		if not frappe.flags.in_import:
 			self.validate_total_debit_and_credit()
@@ -69,7 +69,6 @@ class JournalEntry(AccountsController):
 		self.validate_empty_accounts_table()
 		self.set_account_and_party_balance()
 		self.validate_inter_company_accounts()
-		self.validate_depr_entry_voucher_type()

 		if self.docstatus == 0:
 			self.apply_tax_withholding()
@@ -90,13 +89,7 @@ class JournalEntry(AccountsController):
 		from erpnext.accounts.utils import unlink_ref_doc_from_payment_entries

 		unlink_ref_doc_from_payment_entries(self)
-		self.ignore_linked_doctypes = (
-			"GL Entry",
-			"Stock Ledger Entry",
-			"Payment Ledger Entry",
-			"Repost Payment Ledger",
-			"Repost Payment Ledger Items",
-		)
+		self.ignore_linked_doctypes = ("GL Entry", "Stock Ledger Entry", "Payment Ledger Entry")
 		self.make_gl_entries(1)
 		self.update_advance_paid()
 		self.unlink_advance_entry_reference()
@@ -131,13 +124,6 @@ class JournalEntry(AccountsController):
 				if self.total_credit != doc.total_debit or self.total_debit != doc.total_credit:
 					frappe.throw(_("Total Credit/ Debit Amount should be same as linked Journal Entry"))

-	def validate_depr_entry_voucher_type(self):
-		if (
-			any(d.account_type == "Depreciation" for d in self.get("accounts"))
-			and self.voucher_type != "Depreciation Entry"
-		):
-			frappe.throw(_("Journal Entry type should be set as Depreciation Entry for asset depreciation"))
-
 	def validate_stock_accounts(self):
 		stock_accounts = get_stock_accounts(self.company, self.doctype, self.name)
 		for account in stock_accounts:
@@ -241,32 +227,32 @@ class JournalEntry(AccountsController):
 			self.remove(d)

 	def update_asset_value(self):
-		if self.flags.planned_depr_entry or self.voucher_type != "Depreciation Entry":
+		if self.voucher_type != "Depreciation Entry":
 			return

+		processed_assets = []
+
 		for d in self.get("accounts"):
 			if (
-				d.reference_type == "Asset"
-				and d.reference_name
-				and d.account_type == "Depreciation"
-				and d.debit
+				d.reference_type == "Asset" and d.reference_name and d.reference_name not in processed_assets
 			):
-				asset = frappe.get_doc("Asset", d.reference_name)
+				processed_assets.append(d.reference_name)
+
+				asset = frappe.db.get_value(
+					"Asset", d.reference_name, ["calculate_depreciation", "value_after_depreciation"], as_dict=1
+				)

 				if asset.calculate_depreciation:
-					fb_idx = 1
-					if self.finance_book:
-						for fb_row in asset.get("finance_books"):
-							if fb_row.finance_book == self.finance_book:
-								fb_idx = fb_row.idx
-								break
-					fb_row = asset.get("finance_books")[fb_idx - 1]
-					fb_row.value_after_depreciation -= d.debit
-					fb_row.db_update()
-				else:
-					asset.db_set("value_after_depreciation", asset.value_after_depreciation - d.debit)
+					continue

-				asset.set_status()
+				depr_value = d.debit or d.credit
+
+				frappe.db.set_value(
+					"Asset",
+					d.reference_name,
+					"value_after_depreciation",
+					asset.value_after_depreciation - depr_value,
+				)

 	def update_inter_company_jv(self):
 		if (
@@ -329,47 +315,45 @@ class JournalEntry(AccountsController):
 		if self.voucher_type != "Depreciation Entry":
 			return

+		processed_assets = []
+
 		for d in self.get("accounts"):
 			if (
-				d.reference_type == "Asset"
-				and d.reference_name
-				and d.account_type == "Depreciation"
-				and d.debit
+				d.reference_type == "Asset" and d.reference_name and d.reference_name not in processed_assets
 			):
+				processed_assets.append(d.reference_name)
+
 				asset = frappe.get_doc("Asset", d.reference_name)

 				if asset.calculate_depreciation:
 					je_found = False

-					for fb_row in asset.get("finance_books"):
+					for row in asset.get("finance_books"):
 						if je_found:
 							break

-						depr_schedule = get_depr_schedule(asset.name, "Active", fb_row.finance_book)
+						depr_schedule = get_depr_schedule(asset.name, "Active", row.finance_book)

 						for s in depr_schedule or []:
 							if s.journal_entry == self.name:
 								s.db_set("journal_entry", None)

-								fb_row.value_after_depreciation += d.debit
-								fb_row.db_update()
+								row.value_after_depreciation += s.depreciation_amount
+								row.db_update()
+
+								asset.set_status()

 								je_found = True
 								break
-					if not je_found:
-						fb_idx = 1
-						if self.finance_book:
-							for fb_row in asset.get("finance_books"):
-								if fb_row.finance_book == self.finance_book:
-									fb_idx = fb_row.idx
-									break
-
-						fb_row = asset.get("finance_books")[fb_idx - 1]
-						fb_row.value_after_depreciation += d.debit
-						fb_row.db_update()
 				else:
-					asset.db_set("value_after_depreciation", asset.value_after_depreciation + d.debit)
-				asset.set_status()
+					depr_value = d.debit or d.credit
+
+					frappe.db.set_value(
+						"Asset",
+						d.reference_name,
+						"value_after_depreciation",
+						asset.value_after_depreciation + depr_value,
+					)

 	def unlink_inter_company_jv(self):
 		if (
@@ -684,6 +668,7 @@ class JournalEntry(AccountsController):
 					frappe.throw(_("Row {0}: Both Debit and Credit values cannot be zero").format(d.idx))

 	def validate_total_debit_and_credit(self):
+		self.set_total_debit_credit()
 		if not (self.voucher_type == "Exchange Gain Or Loss" and self.multi_currency):
 			if self.difference:
 				frappe.throw(
@@ -903,8 +888,6 @@ class JournalEntry(AccountsController):
 	def make_gl_entries(self, cancel=0, adv_adj=0):
 		from erpnext.accounts.general_ledger import make_gl_entries

-		merge_entries = frappe.db.get_single_value("Accounts Settings", "merge_similar_account_heads")
-
 		gl_map = self.build_gl_map()
 		if self.voucher_type in ("Deferred Revenue", "Deferred Expense"):
 			update_outstanding = "No"
@@ -912,13 +895,7 @@ class JournalEntry(AccountsController):
 			update_outstanding = "Yes"

 		if gl_map:
-			make_gl_entries(
-				gl_map,
-				cancel=cancel,
-				adv_adj=adv_adj,
-				merge_entries=merge_entries,
-				update_outstanding=update_outstanding,
-			)
+			make_gl_entries(gl_map, cancel=cancel, adv_adj=adv_adj, update_outstanding=update_outstanding)

 	@frappe.whitelist()
 	def get_balance(self, difference_account=None):
@@ -952,7 +929,6 @@ class JournalEntry(AccountsController):
 					blank_row.debit_in_account_currency = abs(diff)
 					blank_row.debit = abs(diff)

-			self.set_total_debit_credit()
 			self.validate_total_debit_and_credit()

 	@frappe.whitelist()
--- a/erpnext/accounts/doctype/journal_entry/test_journal_entry.py
+++ b/erpnext/accounts/doctype/journal_entry/test_journal_entry.py
@@ -105,8 +105,8 @@ class TestJournalEntry(unittest.TestCase):

 		elif test_voucher.doctype in ["Sales Order", "Purchase Order"]:
 			# if test_voucher is a Sales Order/Purchase Order, test error on cancellation of test_voucher
-			frappe.db.set_single_value(
-				"Accounts Settings", "unlink_advance_payment_on_cancelation_of_order", 0
+			frappe.db.set_value(
+				"Accounts Settings", "Accounts Settings", "unlink_advance_payment_on_cancelation_of_order", 0
 			)
 			submitted_voucher = frappe.get_doc(test_voucher.doctype, test_voucher.name)
 			self.assertRaises(frappe.LinkExistsError, submitted_voucher.cancel)
@@ -287,6 +287,10 @@ class TestJournalEntry(unittest.TestCase):
 		jv.submit()

 	def test_inter_company_jv(self):
+		frappe.db.set_value("Account", "Sales Expenses - _TC", "inter_company_account", 1)
+		frappe.db.set_value("Account", "Buildings - _TC", "inter_company_account", 1)
+		frappe.db.set_value("Account", "Sales Expenses - _TC1", "inter_company_account", 1)
+		frappe.db.set_value("Account", "Buildings - _TC1", "inter_company_account", 1)
 		jv = make_journal_entry(
 			"Sales Expenses - _TC",
 			"Buildings - _TC",
--- a/erpnext/accounts/doctype/journal_entry_template/journal_entry_template.js
+++ b/erpnext/accounts/doctype/journal_entry_template/journal_entry_template.js
@@ -2,21 +2,6 @@
 // For license information, please see license.txt

 frappe.ui.form.on("Journal Entry Template", {
-	onload: function(frm) {
-		if(frm.is_new()) {
-			frappe.call({
-				type: "GET",
-				method: "erpnext.accounts.doctype.journal_entry_template.journal_entry_template.get_naming_series",
-				callback: function(r){
-					if(r.message) {
-						frm.set_df_property("naming_series", "options", r.message.split("\n"));
-						frm.set_value("naming_series", r.message.split("\n")[0]);
-						frm.refresh_field("naming_series");
-					}
-				}
-			});
-		}
-	},
 	refresh: function(frm) {
 		frappe.model.set_default_values(frm.doc);

@@ -34,6 +19,18 @@ frappe.ui.form.on("Journal Entry Template", {

 			return { filters: filters };
 		});
+
+		frappe.call({
+			type: "GET",
+			method: "erpnext.accounts.doctype.journal_entry_template.journal_entry_template.get_naming_series",
+			callback: function(r){
+				if(r.message){
+					frm.set_df_property("naming_series", "options", r.message.split("\n"));
+					frm.set_value("naming_series", r.message.split("\n")[0]);
+					frm.refresh_field("naming_series");
+				}
+			}
+		});
 	},
 	voucher_type: function(frm) {
 		var add_accounts = function(doc, r) {
--- a/erpnext/accounts/doctype/ledger_merge/ledger_merge.py
+++ b/erpnext/accounts/doctype/ledger_merge/ledger_merge.py
@@ -4,7 +4,7 @@
 import frappe
 from frappe import _
 from frappe.model.document import Document
-from frappe.utils.background_jobs import is_job_enqueued
+from frappe.utils.background_jobs import is_job_queued

 from erpnext.accounts.doctype.account.account import merge_account

@@ -17,14 +17,13 @@ class LedgerMerge(Document):
 		if is_scheduler_inactive() and not frappe.flags.in_test:
 			frappe.throw(_("Scheduler is inactive. Cannot merge accounts."), title=_("Scheduler Inactive"))

-		job_id = f"ledger_merge::{self.name}"
-		if not is_job_enqueued(job_id):
+		if not is_job_queued(self.name):
 			enqueue(
 				start_merge,
 				queue="default",
 				timeout=6000,
 				event="ledger_merge",
-				job_id=job_id,
+				job_name=self.name,
 				docname=self.name,
 				now=frappe.conf.developer_mode or frappe.flags.in_test,
 			)
--- a/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py
+++ b/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py
@@ -6,7 +6,7 @@ import frappe
 from frappe import _, scrub
 from frappe.model.document import Document
 from frappe.utils import flt, nowdate
-from frappe.utils.background_jobs import enqueue, is_job_enqueued
+from frappe.utils.background_jobs import enqueue, is_job_queued

 from erpnext.accounts.doctype.accounting_dimension.accounting_dimension import (
 	get_accounting_dimensions,
@@ -212,15 +212,13 @@ class OpeningInvoiceCreationTool(Document):
 			if is_scheduler_inactive() and not frappe.flags.in_test:
 				frappe.throw(_("Scheduler is inactive. Cannot import data."), title=_("Scheduler Inactive"))

-			job_id = f"opening_invoice::{self.name}"
-
-			if not is_job_enqueued(job_id):
+			if not is_job_queued(self.name):
 				enqueue(
 					start_import,
 					queue="default",
 					timeout=6000,
 					event="opening_invoice_creation",
-					job_id=job_id,
+					job_name=self.name,
 					invoices=invoices,
 					now=frappe.conf.developer_mode or frappe.flags.in_test,
 				)
--- a/erpnext/accounts/doctype/payment_entry/payment_entry.js
+++ b/erpnext/accounts/doctype/payment_entry/payment_entry.js
@@ -7,7 +7,7 @@ cur_frm.cscript.tax_table = "Advance Taxes and Charges";

 frappe.ui.form.on('Payment Entry', {
 	onload: function(frm) {
-		frm.ignore_doctypes_on_cancel_all = ['Sales Invoice', 'Purchase Invoice', "Repost Payment Ledger"];
+		frm.ignore_doctypes_on_cancel_all = ['Sales Invoice', 'Purchase Invoice'];

 		if(frm.doc.__islocal) {
 			if (!frm.doc.paid_from) frm.set_value("paid_from_account_currency", null);
@@ -217,6 +217,7 @@ frappe.ui.form.on('Payment Entry', {
 		frm.toggle_display("set_exchange_gain_loss",
 			frm.doc.paid_amount && frm.doc.received_amount && frm.doc.difference_amount);

+		frm.refresh_fields();
 	},

 	set_dynamic_labels: function(frm) {
@@ -244,6 +245,8 @@ frappe.ui.form.on('Payment Entry', {
 		frm.set_currency_labels(["total_amount", "outstanding_amount", "allocated_amount"],
 			party_account_currency, "references");

+		frm.set_currency_labels(["amount"], company_currency, "deductions");
+
 		cur_frm.set_df_property("source_exchange_rate", "description",
 			("1 " + frm.doc.paid_from_account_currency + " = [?] " + company_currency));

@@ -904,7 +907,7 @@ frappe.ui.form.on('Payment Entry', {
 			function(d) { return flt(d.amount) }));

 		frm.set_value("difference_amount", difference_amount - total_deductions +
-			flt(frm.doc.base_total_taxes_and_charges));
+			frm.doc.base_total_taxes_and_charges);

 		frm.events.hide_unhide_fields(frm);
 	},
@@ -970,49 +973,30 @@ frappe.ui.form.on('Payment Entry', {
 				},
 				callback: function(r, rt) {
 					if(r.message) {
-						const write_off_row = $.map(frm.doc["deductions"] || [], function(t) {
+						var write_off_row = $.map(frm.doc["deductions"] || [], function(t) {
 							return t.account==r.message[account] ? t : null; });

-						const difference_amount = flt(frm.doc.difference_amount,
+						var row = [];
+
+						var difference_amount = flt(frm.doc.difference_amount,
 							precision("difference_amount"));

-						const add_deductions = (details) => {
-							let row = null;
-							if (!write_off_row.length && difference_amount) {
-								row = frm.add_child("deductions");
-								row.account = details[account];
-								row.cost_center = details["cost_center"];
-							} else {
-								row = write_off_row[0];
-							}
-
-							if (row) {
-								row.amount = flt(row.amount) + difference_amount;
-							} else {
-								frappe.msgprint(__("No gain or loss in the exchange rate"))
-							}
-							refresh_field("deductions");
-						};
-
-						if (!r.message[account]) {
-							frappe.prompt({
-								label: __("Please Specify Account"),
-								fieldname: account,
-								fieldtype: "Link",
-								options: "Account",
-								get_query: () => ({
-									filters: {
-										company: frm.doc.company,
-									}
-								})
-							}, (values) => {
-								const details = Object.assign({}, r.message, values);
-								add_deductions(details);
-							}, __(frappe.unscrub(account)));
+						if (!write_off_row.length && difference_amount) {
+							row = frm.add_child("deductions");
+							row.account = r.message[account];
+							row.cost_center = r.message["cost_center"];
 						} else {
-							add_deductions(r.message);
+							row = write_off_row[0];
 						}

+						if (row) {
+							row.amount = flt(row.amount) + difference_amount;
+						} else {
+							frappe.msgprint(__("No gain or loss in the exchange rate"))
+						}
+
+						refresh_field("deductions");
+
 						frm.events.set_unallocated_amount(frm);
 					}
 				}
--- a/erpnext/accounts/doctype/payment_entry/payment_entry.py
+++ b/erpnext/accounts/doctype/payment_entry/payment_entry.py
@@ -60,7 +60,6 @@ class PaymentEntry(AccountsController):
 	def validate(self):
 		self.setup_party_account_field()
 		self.set_missing_values()
-		self.set_missing_ref_details()
 		self.validate_payment_type()
 		self.validate_party_details()
 		self.set_exchange_rate()
@@ -93,13 +92,7 @@ class PaymentEntry(AccountsController):
 		self.set_status()

 	def on_cancel(self):
-		self.ignore_linked_doctypes = (
-			"GL Entry",
-			"Stock Ledger Entry",
-			"Payment Ledger Entry",
-			"Repost Payment Ledger",
-			"Repost Payment Ledger Items",
-		)
+		self.ignore_linked_doctypes = ("GL Entry", "Stock Ledger Entry", "Payment Ledger Entry")
 		self.make_gl_entries(cancel=1)
 		self.update_outstanding_amounts()
 		self.update_advance_paid()
@@ -148,57 +141,19 @@ class PaymentEntry(AccountsController):
 			)

 	def validate_allocated_amount(self):
-		if self.payment_type == "Internal Transfer":
-			return
-
-		latest_references = get_outstanding_reference_documents(
-			{
-				"posting_date": self.posting_date,
-				"company": self.company,
-				"party_type": self.party_type,
-				"payment_type": self.payment_type,
-				"party": self.party,
-				"party_account": self.paid_from if self.payment_type == "Receive" else self.paid_to,
-			}
-		)
-
-		# Group latest_references by (voucher_type, voucher_no)
-		latest_lookup = {}
-		for d in latest_references:
-			d = frappe._dict(d)
-			latest_lookup.update({(d.voucher_type, d.voucher_no): d})
-
-		for d in self.get("references").copy():
-			latest = latest_lookup.get((d.reference_doctype, d.reference_name))
-
-			# The reference has already been fully paid
-			if not latest:
-				frappe.throw(
-					_("{0} {1} has already been fully paid.").format(d.reference_doctype, d.reference_name)
-				)
-			# The reference has already been partly paid
-			elif (
-				latest.outstanding_amount < latest.invoice_amount
-				and d.outstanding_amount != latest.outstanding_amount
-			):
-				frappe.throw(
-					_(
-						"{0} {1} has already been partly paid. Please use the 'Get Outstanding Invoice' button to get the latest outstanding amount."
-					).format(d.reference_doctype, d.reference_name)
-				)
-
-			d.outstanding_amount = latest.outstanding_amount
-
-			fail_message = _("Row #{0}: Allocated Amount cannot be greater than outstanding amount.")
-
+		for d in self.get("references"):
 			if (flt(d.allocated_amount)) > 0:
 				if flt(d.allocated_amount) > flt(d.outstanding_amount):
-					frappe.throw(fail_message.format(d.idx))
+					frappe.throw(
+						_("Row #{0}: Allocated Amount cannot be greater than outstanding amount.").format(d.idx)
+					)

 			# Check for negative outstanding invoices as well
 			if flt(d.allocated_amount) < 0:
 				if flt(d.allocated_amount) < flt(d.outstanding_amount):
-					frappe.throw(fail_message.format(d.idx))
+					frappe.throw(
+						_("Row #{0}: Allocated Amount cannot be greater than outstanding amount.").format(d.idx)
+					)

 	def delink_advance_entry_references(self):
 		for reference in self.references:
@@ -258,16 +213,11 @@ class PaymentEntry(AccountsController):
 			else self.paid_to_account_currency
 		)

-	def set_missing_ref_details(
-		self, force: bool = False, update_ref_details_only_for: list | None = None
-	) -> None:
+		self.set_missing_ref_details()
+
+	def set_missing_ref_details(self, force=False):
 		for d in self.get("references"):
 			if d.allocated_amount:
-				if update_ref_details_only_for and (
-					not (d.reference_doctype, d.reference_name) in update_ref_details_only_for
-				):
-					continue
-
 				ref_details = get_reference_details(
 					d.reference_doctype, d.reference_name, self.party_account_currency
 				)
@@ -411,7 +361,7 @@ class PaymentEntry(AccountsController):
 		for k, v in no_oustanding_refs.items():
 			frappe.msgprint(
 				_(
-					"{} - {} now has {} as it had no outstanding amount left before submitting the Payment Entry."
+					"{} - {} now have {} as they had no outstanding amount left before submitting the Payment Entry."
 				).format(
 					_(k),
 					frappe.bold(", ".join(d.reference_name for d in v)),
@@ -460,7 +410,7 @@ class PaymentEntry(AccountsController):

 		for ref in self.get("references"):
 			if ref.payment_term and ref.reference_name:
-				key = (ref.payment_term, ref.reference_name, ref.reference_doctype)
+				key = (ref.payment_term, ref.reference_name)
 				invoice_payment_amount_map.setdefault(key, 0.0)
 				invoice_payment_amount_map[key] += ref.allocated_amount

@@ -468,37 +418,20 @@ class PaymentEntry(AccountsController):
 					payment_schedule = frappe.get_all(
 						"Payment Schedule",
 						filters={"parent": ref.reference_name},
-						fields=[
-							"paid_amount",
-							"payment_amount",
-							"payment_term",
-							"discount",
-							"outstanding",
-							"discount_type",
-						],
+						fields=["paid_amount", "payment_amount", "payment_term", "discount", "outstanding"],
 					)
 					for term in payment_schedule:
-						invoice_key = (term.payment_term, ref.reference_name, ref.reference_doctype)
+						invoice_key = (term.payment_term, ref.reference_name)
 						invoice_paid_amount_map.setdefault(invoice_key, {})
 						invoice_paid_amount_map[invoice_key]["outstanding"] = term.outstanding
-						if not (term.discount_type and term.discount):
-							continue
-
-						if term.discount_type == "Percentage":
-							invoice_paid_amount_map[invoice_key]["discounted_amt"] = ref.total_amount * (
-								term.discount / 100
-							)
-						else:
-							invoice_paid_amount_map[invoice_key]["discounted_amt"] = term.discount
+						invoice_paid_amount_map[invoice_key]["discounted_amt"] = ref.total_amount * (
+							term.discount / 100
+						)

 		for idx, (key, allocated_amount) in enumerate(invoice_payment_amount_map.items(), 1):
 			if not invoice_paid_amount_map.get(key):
 				frappe.throw(_("Payment term {0} not used in {1}").format(key[0], key[1]))

-			allocated_amount = self.get_allocated_amount_in_transaction_currency(
-				allocated_amount, key[2], key[1]
-			)
-
 			outstanding = flt(invoice_paid_amount_map.get(key, {}).get("outstanding"))
 			discounted_amt = flt(invoice_paid_amount_map.get(key, {}).get("discounted_amt"))

@@ -533,33 +466,6 @@ class PaymentEntry(AccountsController):
 						(allocated_amount - discounted_amt, discounted_amt, allocated_amount, key[1], key[0]),
 					)

-	def get_allocated_amount_in_transaction_currency(
-		self, allocated_amount, reference_doctype, reference_docname
-	):
-		"""
-		Payment Entry could be in base currency while reference's payment schedule
-		is always in transaction currency.
-		E.g.
-		* SI with base=INR and currency=USD
-		* SI with payment schedule in USD
-		* PE in INR (accounting done in base currency)
-		"""
-		ref_currency, ref_exchange_rate = frappe.db.get_value(
-			reference_doctype, reference_docname, ["currency", "conversion_rate"]
-		)
-		is_single_currency = self.paid_from_account_currency == self.paid_to_account_currency
-		# PE in different currency
-		reference_is_multi_currency = self.paid_from_account_currency != ref_currency
-
-		if not (is_single_currency and reference_is_multi_currency):
-			return allocated_amount
-
-		allocated_amount = flt(
-			allocated_amount / ref_exchange_rate, self.precision("total_allocated_amount")
-		)
-
-		return allocated_amount
-
 	def set_status(self):
 		if self.docstatus == 2:
 			self.status = "Cancelled"
@@ -692,28 +598,6 @@ class PaymentEntry(AccountsController):
 				self.precision("base_received_amount"),
 			)

-	def calculate_base_allocated_amount_for_reference(self, d) -> float:
-		base_allocated_amount = 0
-		if d.reference_doctype in frappe.get_hooks("advance_payment_doctypes"):
-			# When referencing Sales/Purchase Order, use the source/target exchange rate depending on payment type.
-			# This is so there are no Exchange Gain/Loss generated for such doctypes
-
-			exchange_rate = 1
-			if self.payment_type == "Receive":
-				exchange_rate = self.source_exchange_rate
-			elif self.payment_type == "Pay":
-				exchange_rate = self.target_exchange_rate
-
-			base_allocated_amount += flt(
-				flt(d.allocated_amount) * flt(exchange_rate), self.precision("base_paid_amount")
-			)
-		else:
-			base_allocated_amount += flt(
-				flt(d.allocated_amount) * flt(d.exchange_rate), self.precision("base_paid_amount")
-			)
-
-		return base_allocated_amount
-
 	def set_total_allocated_amount(self):
 		if self.payment_type == "Internal Transfer":
 			return
@@ -722,7 +606,9 @@ class PaymentEntry(AccountsController):
 		for d in self.get("references"):
 			if d.allocated_amount:
 				total_allocated_amount += flt(d.allocated_amount)
-				base_total_allocated_amount += self.calculate_base_allocated_amount_for_reference(d)
+				base_total_allocated_amount += flt(
+					flt(d.allocated_amount) * flt(d.exchange_rate), self.precision("base_paid_amount")
+				)

 		self.total_allocated_amount = abs(total_allocated_amount)
 		self.base_total_allocated_amount = abs(base_total_allocated_amount)
@@ -939,7 +825,9 @@ class PaymentEntry(AccountsController):
 					}
 				)

-				allocated_amount_in_company_currency = self.calculate_base_allocated_amount_for_reference(d)
+				allocated_amount_in_company_currency = flt(
+					flt(d.allocated_amount) * flt(d.exchange_rate), self.precision("paid_amount")
+				)

 				gle.update(
 					{
@@ -1487,7 +1375,7 @@ def get_orders_to_be_billed(
 	if voucher_type:
 		doc = frappe.get_doc({"doctype": voucher_type})
 		condition = ""
-		if doc and hasattr(doc, "cost_center") and doc.cost_center:
+		if doc and hasattr(doc, "cost_center"):
 			condition = " and cost_center='%s'" % cost_center

 	orders = []
@@ -1533,15 +1421,9 @@ def get_orders_to_be_billed(

 	order_list = []
 	for d in orders:
-		if (
-			filters
-			and filters.get("outstanding_amt_greater_than")
-			and filters.get("outstanding_amt_less_than")
-			and not (
-				flt(filters.get("outstanding_amt_greater_than"))
-				<= flt(d.outstanding_amount)
-				<= flt(filters.get("outstanding_amt_less_than"))
-			)
+		if not (
+			flt(d.outstanding_amount) >= flt(filters.get("outstanding_amt_greater_than"))
+			and flt(d.outstanding_amount) <= flt(filters.get("outstanding_amt_less_than"))
 		):
 			continue

@@ -1662,7 +1544,17 @@ def get_account_details(account, date, cost_center=None):
@frappe.whitelist()
 def get_company_defaults(company):
 	fields = ["write_off_account", "exchange_gain_loss_account", "cost_center"]
-	return frappe.get_cached_value("Company", company, fields, as_dict=1)
+	ret = frappe.get_cached_value("Company", company, fields, as_dict=1)
+
+	for fieldname in fields:
+		if not ret[fieldname]:
+			frappe.throw(
+				_("Please set default {0} in Company {1}").format(
+					frappe.get_meta("Company").get_label(fieldname), company
+				)
+			)
+
+	return ret


 def get_outstanding_on_journal_entry(name):
@@ -1744,21 +1636,11 @@ def get_reference_details(reference_doctype, reference_name, party_account_curre

@frappe.whitelist()
 def get_payment_entry(
-	dt,
-	dn,
-	party_amount=None,
-	bank_account=None,
-	bank_amount=None,
-	party_type=None,
-	payment_type=None,
-	reference_date=None,
+	dt, dn, party_amount=None, bank_account=None, bank_amount=None, party_type=None, payment_type=None
 ):
 	reference_doc = None
 	doc = frappe.get_doc(dt, dn)
-	over_billing_allowance = frappe.db.get_single_value("Accounts Settings", "over_billing_allowance")
-	if dt in ("Sales Order", "Purchase Order") and flt(doc.per_billed, 2) >= (
-		100.0 + over_billing_allowance
-	):
+	if dt in ("Sales Order", "Purchase Order") and flt(doc.per_billed, 2) >= 99.99:
 		frappe.throw(_("Can only make payment against unbilled {0}").format(dt))

 	if not party_type:
@@ -1777,20 +1659,12 @@ def get_payment_entry(
 	# bank or cash
 	bank = get_bank_cash_account(doc, bank_account)

-	# if default bank or cash account is not set in company master and party has default company bank account, fetch it
-	if party_type in ["Customer", "Supplier"] and not bank:
-		party_bank_account = get_party_bank_account(party_type, doc.get(scrub(party_type)))
-		if party_bank_account:
-			account = frappe.db.get_value("Bank Account", party_bank_account, "account")
-			bank = get_bank_cash_account(doc, account)
-
 	paid_amount, received_amount = set_paid_amount_and_received_amount(
 		dt, party_account_currency, bank, outstanding_amount, payment_type, bank_amount, doc
 	)

-	reference_date = getdate(reference_date)
-	paid_amount, received_amount, discount_amount, valid_discounts = apply_early_payment_discount(
-		paid_amount, received_amount, doc, party_account_currency, reference_date
+	paid_amount, received_amount, discount_amount = apply_early_payment_discount(
+		paid_amount, received_amount, doc
 	)

 	pe = frappe.new_doc("Payment Entry")
@@ -1798,7 +1672,6 @@ def get_payment_entry(
 	pe.company = doc.company
 	pe.cost_center = doc.get("cost_center")
 	pe.posting_date = nowdate()
-	pe.reference_date = reference_date
 	pe.mode_of_payment = doc.get("mode_of_payment")
 	pe.party_type = party_type
 	pe.party = doc.get(scrub(party_type))
@@ -1832,19 +1705,14 @@ def get_payment_entry(
 	if doc.doctype == "Purchase Invoice" and doc.invoice_is_blocked():
 		frappe.msgprint(_("{0} is on hold till {1}").format(doc.name, doc.release_date))
 	else:
-		if doc.doctype in (
-			"Sales Invoice",
-			"Purchase Invoice",
-			"Purchase Order",
-			"Sales Order",
-		) and frappe.get_cached_value(
+		if doc.doctype in ("Sales Invoice", "Purchase Invoice") and frappe.get_cached_value(
 			"Payment Terms Template",
 			doc.payment_terms_template,
 			"allocate_payment_based_on_payment_terms",
 		):

 			for reference in get_reference_as_per_payment_terms(
-				doc.payment_schedule, dt, dn, doc, grand_total, outstanding_amount, party_account_currency
+				doc.payment_schedule, dt, dn, doc, grand_total, outstanding_amount
 			):
 				pe.append("references", reference)
 		else:
@@ -1889,24 +1757,22 @@ def get_payment_entry(

 	pe.setup_party_account_field()
 	pe.set_missing_values()
-	pe.set_missing_ref_details()

 	update_accounting_dimensions(pe, doc)

 	if party_account and bank:
 		pe.set_exchange_rate(ref_doc=reference_doc)
 		pe.set_amounts()
-
 		if discount_amount:
-			base_total_discount_loss = 0
-			if frappe.db.get_single_value("Accounts Settings", "book_tax_discount_loss"):
-				base_total_discount_loss = split_early_payment_discount_loss(pe, doc, valid_discounts)
-
-			set_pending_discount_loss(
-				pe, doc, discount_amount, base_total_discount_loss, party_account_currency
+			pe.set_gain_or_loss(
+				account_details={
+					"account": frappe.get_cached_value("Company", pe.company, "default_discount_account"),
+					"cost_center": pe.cost_center
+					or frappe.get_cached_value("Company", pe.company, "cost_center"),
+					"amount": discount_amount * (-1 if payment_type == "Pay" else 1),
+				}
 			)
-
-		pe.set_difference_amount()
+			pe.set_difference_amount()

 	return pe

@@ -2000,53 +1866,37 @@ def set_paid_amount_and_received_amount(
 	paid_amount = received_amount = 0
 	if party_account_currency == bank.account_currency:
 		paid_amount = received_amount = abs(outstanding_amount)
-	else:
-		company_currency = frappe.get_cached_value("Company", doc.get("company"), "default_currency")
-		if payment_type == "Receive":
-			paid_amount = abs(outstanding_amount)
-			if bank_amount:
-				received_amount = bank_amount
-			else:
-				if company_currency != bank.account_currency:
-					received_amount = paid_amount / doc.get("conversion_rate", 1)
-				else:
-					received_amount = paid_amount * doc.get("conversion_rate", 1)
+	elif payment_type == "Receive":
+		paid_amount = abs(outstanding_amount)
+		if bank_amount:
+			received_amount = bank_amount
 		else:
-			received_amount = abs(outstanding_amount)
-			if bank_amount:
-				paid_amount = bank_amount
-			else:
-				if company_currency != bank.account_currency:
-					paid_amount = received_amount / doc.get("conversion_rate", 1)
-				else:
-					# if party account currency and bank currency is different then populate paid amount as well
-					paid_amount = received_amount * doc.get("conversion_rate", 1)
+			received_amount = paid_amount * doc.get("conversion_rate", 1)
+	else:
+		received_amount = abs(outstanding_amount)
+		if bank_amount:
+			paid_amount = bank_amount
+		else:
+			# if party account currency and bank currency is different then populate paid amount as well
+			paid_amount = received_amount * doc.get("conversion_rate", 1)

 	return paid_amount, received_amount


-def apply_early_payment_discount(
-	paid_amount, received_amount, doc, party_account_currency, reference_date
-):
+def apply_early_payment_discount(paid_amount, received_amount, doc):
 	total_discount = 0
-	valid_discounts = []
 	eligible_for_payments = ["Sales Order", "Sales Invoice", "Purchase Order", "Purchase Invoice"]
 	has_payment_schedule = hasattr(doc, "payment_schedule") and doc.payment_schedule
-	is_multi_currency = party_account_currency != doc.company_currency

 	if doc.doctype in eligible_for_payments and has_payment_schedule:
 		for term in doc.payment_schedule:
-			if not term.discounted_amount and term.discount and reference_date <= term.discount_date:
-
+			if not term.discounted_amount and term.discount and getdate(nowdate()) <= term.discount_date:
 				if term.discount_type == "Percentage":
-					grand_total = doc.get("grand_total") if is_multi_currency else doc.get("base_grand_total")
-					discount_amount = flt(grand_total) * (term.discount / 100)
+					discount_amount = flt(doc.get("grand_total")) * (term.discount / 100)
 				else:
 					discount_amount = term.discount

-				# if accounting is done in the same currency, paid_amount = received_amount
-				conversion_rate = doc.get("conversion_rate", 1) if is_multi_currency else 1
-				discount_amount_in_foreign_currency = discount_amount * conversion_rate
+				discount_amount_in_foreign_currency = discount_amount * doc.get("conversion_rate", 1)

 				if doc.doctype == "Sales Invoice":
 					paid_amount -= discount_amount
@@ -2055,151 +1905,23 @@ def apply_early_payment_discount(
 					received_amount -= discount_amount
 					paid_amount -= discount_amount_in_foreign_currency

-				valid_discounts.append({"type": term.discount_type, "discount": term.discount})
 				total_discount += discount_amount

 		if total_discount:
-			currency = doc.get("currency") if is_multi_currency else doc.company_currency
-			money = frappe.utils.fmt_money(total_discount, currency=currency)
+			money = frappe.utils.fmt_money(total_discount, currency=doc.get("currency"))
 			frappe.msgprint(_("Discount of {} applied as per Payment Term").format(money), alert=1)

-	return paid_amount, received_amount, total_discount, valid_discounts
-
-
-def set_pending_discount_loss(
-	pe, doc, discount_amount, base_total_discount_loss, party_account_currency
-):
-	# If multi-currency, get base discount amount to adjust with base currency deductions/losses
-	if party_account_currency != doc.company_currency:
-		discount_amount = discount_amount * doc.get("conversion_rate", 1)
-
-	# Avoid considering miniscule losses
-	discount_amount = flt(discount_amount - base_total_discount_loss, doc.precision("grand_total"))
-
-	# Set base discount amount (discount loss/pending rounding loss) in deductions
-	if discount_amount > 0.0:
-		positive_negative = -1 if pe.payment_type == "Pay" else 1
-
-		# If tax loss booking is enabled, pending loss will be rounding loss.
-		# Otherwise it will be the total discount loss.
-		book_tax_loss = frappe.db.get_single_value("Accounts Settings", "book_tax_discount_loss")
-		account_type = "round_off_account" if book_tax_loss else "default_discount_account"
-
-		pe.set_gain_or_loss(
-			account_details={
-				"account": frappe.get_cached_value("Company", pe.company, account_type),
-				"cost_center": pe.cost_center or frappe.get_cached_value("Company", pe.company, "cost_center"),
-				"amount": discount_amount * positive_negative,
-			}
-		)
-
-
-def split_early_payment_discount_loss(pe, doc, valid_discounts) -> float:
-	"""Split early payment discount into Income Loss & Tax Loss."""
-	total_discount_percent = get_total_discount_percent(doc, valid_discounts)
-
-	if not total_discount_percent:
-		return 0.0
-
-	base_loss_on_income = add_income_discount_loss(pe, doc, total_discount_percent)
-	base_loss_on_taxes = add_tax_discount_loss(pe, doc, total_discount_percent)
-
-	# Round off total loss rather than individual losses to reduce rounding error
-	return flt(base_loss_on_income + base_loss_on_taxes, doc.precision("grand_total"))
-
-
-def get_total_discount_percent(doc, valid_discounts) -> float:
-	"""Get total percentage and amount discount applied as a percentage."""
-	total_discount_percent = (
-		sum(
-			discount.get("discount") for discount in valid_discounts if discount.get("type") == "Percentage"
-		)
-		or 0.0
-	)
-
-	# Operate in percentages only as it makes the income & tax split easier
-	total_discount_amount = (
-		sum(discount.get("discount") for discount in valid_discounts if discount.get("type") == "Amount")
-		or 0.0
-	)
-
-	if total_discount_amount:
-		discount_percentage = (total_discount_amount / doc.get("grand_total")) * 100
-		total_discount_percent += discount_percentage
-		return total_discount_percent
-
-	return total_discount_percent
-
-
-def add_income_discount_loss(pe, doc, total_discount_percent) -> float:
-	"""Add loss on income discount in base currency."""
-	precision = doc.precision("total")
-	base_loss_on_income = doc.get("base_total") * (total_discount_percent / 100)
-
-	pe.append(
-		"deductions",
-		{
-			"account": frappe.get_cached_value("Company", pe.company, "default_discount_account"),
-			"cost_center": pe.cost_center or frappe.get_cached_value("Company", pe.company, "cost_center"),
-			"amount": flt(base_loss_on_income, precision),
-		},
-	)
-
-	return base_loss_on_income  # Return loss without rounding
-
-
-def add_tax_discount_loss(pe, doc, total_discount_percentage) -> float:
-	"""Add loss on tax discount in base currency."""
-	tax_discount_loss = {}
-	base_total_tax_loss = 0
-	precision = doc.precision("tax_amount_after_discount_amount", "taxes")
-
-	# The same account head could be used more than once
-	for tax in doc.get("taxes", []):
-		base_tax_loss = tax.get("base_tax_amount_after_discount_amount") * (
-			total_discount_percentage / 100
-		)
-
-		account = tax.get("account_head")
-		if not tax_discount_loss.get(account):
-			tax_discount_loss[account] = base_tax_loss
-		else:
-			tax_discount_loss[account] += base_tax_loss
-
-	for account, loss in tax_discount_loss.items():
-		base_total_tax_loss += loss
-		if loss == 0.0:
-			continue
-
-		pe.append(
-			"deductions",
-			{
-				"account": account,
-				"cost_center": pe.cost_center or frappe.get_cached_value("Company", pe.company, "cost_center"),
-				"amount": flt(loss, precision),
-			},
-		)
-
-	return base_total_tax_loss  # Return loss without rounding
+	return paid_amount, received_amount, total_discount


 def get_reference_as_per_payment_terms(
-	payment_schedule, dt, dn, doc, grand_total, outstanding_amount, party_account_currency
+	payment_schedule, dt, dn, doc, grand_total, outstanding_amount
 ):
 	references = []
-	is_multi_currency_acc = (doc.currency != doc.company_currency) and (
-		party_account_currency != doc.company_currency
-	)
-
 	for payment_term in payment_schedule:
 		payment_term_outstanding = flt(
 			payment_term.payment_amount - payment_term.paid_amount, payment_term.precision("payment_amount")
 		)
-		if not is_multi_currency_acc:
-			# If accounting is done in company currency for multi-currency transaction
-			payment_term_outstanding = flt(
-				payment_term_outstanding * doc.get("conversion_rate"), payment_term.precision("payment_amount")
-			)

 		if payment_term_outstanding:
 			references.append(
--- a/erpnext/accounts/doctype/payment_entry/test_payment_entry.py
+++ b/erpnext/accounts/doctype/payment_entry/test_payment_entry.py
@@ -5,7 +5,7 @@ import unittest

 import frappe
 from frappe import qb
-from frappe.tests.utils import FrappeTestCase, change_settings
+from frappe.tests.utils import FrappeTestCase
 from frappe.utils import flt, nowdate

 from erpnext.accounts.doctype.payment_entry.payment_entry import (
@@ -51,38 +51,6 @@ class TestPaymentEntry(FrappeTestCase):
 		so_advance_paid = frappe.db.get_value("Sales Order", so.name, "advance_paid")
 		self.assertEqual(so_advance_paid, 0)

-	def test_payment_against_sales_order_usd_to_inr(self):
-		so = make_sales_order(
-			customer="_Test Customer USD", currency="USD", qty=1, rate=100, do_not_submit=True
-		)
-		so.conversion_rate = 50
-		so.submit()
-		pe = get_payment_entry("Sales Order", so.name)
-		pe.source_exchange_rate = 55
-		pe.received_amount = 5500
-		pe.insert()
-		pe.submit()
-
-		# there should be no difference amount
-		pe.reload()
-		self.assertEqual(pe.difference_amount, 0)
-		self.assertEqual(pe.deductions, [])
-
-		expected_gle = dict(
-			(d[0], d)
-			for d in [["_Test Receivable USD - _TC", 0, 5500, so.name], ["Cash - _TC", 5500.0, 0, None]]
-		)
-
-		self.validate_gl_entries(pe.name, expected_gle)
-
-		so_advance_paid = frappe.db.get_value("Sales Order", so.name, "advance_paid")
-		self.assertEqual(so_advance_paid, 100)
-
-		pe.cancel()
-
-		so_advance_paid = frappe.db.get_value("Sales Order", so.name, "advance_paid")
-		self.assertEqual(so_advance_paid, 0)
-
 	def test_payment_entry_for_blocked_supplier_invoice(self):
 		supplier = frappe.get_doc("Supplier", "_Test Supplier")
 		supplier.on_hold = 1
@@ -288,25 +256,10 @@ class TestPaymentEntry(FrappeTestCase):
 			},
 		)
 		si.save()
+
 		si.submit()

-		frappe.db.set_single_value("Accounts Settings", "book_tax_discount_loss", 1)
-		pe_with_tax_loss = get_payment_entry("Sales Invoice", si.name, bank_account="_Test Cash - _TC")
-
-		self.assertEqual(pe_with_tax_loss.references[0].payment_term, "30 Credit Days with 10% Discount")
-		self.assertEqual(pe_with_tax_loss.references[0].allocated_amount, 236.0)
-		self.assertEqual(pe_with_tax_loss.paid_amount, 212.4)
-		self.assertEqual(pe_with_tax_loss.deductions[0].amount, 20.0)  # Loss on Income
-		self.assertEqual(pe_with_tax_loss.deductions[1].amount, 3.6)  # Loss on Tax
-		self.assertEqual(pe_with_tax_loss.deductions[1].account, "_Test Account Service Tax - _TC")
-
-		frappe.db.set_single_value("Accounts Settings", "book_tax_discount_loss", 0)
 		pe = get_payment_entry("Sales Invoice", si.name, bank_account="_Test Cash - _TC")
-
-		self.assertEqual(pe.references[0].allocated_amount, 236.0)
-		self.assertEqual(pe.paid_amount, 212.4)
-		self.assertEqual(pe.deductions[0].amount, 23.6)
-
 		pe.submit()
 		si.load_from_db()

@@ -316,190 +269,6 @@ class TestPaymentEntry(FrappeTestCase):
 		self.assertEqual(si.payment_schedule[0].outstanding, 0)
 		self.assertEqual(si.payment_schedule[0].discounted_amount, 23.6)

-	def test_payment_entry_against_payment_terms_with_discount_amount(self):
-		si = create_sales_invoice(do_not_save=1, qty=1, rate=200)
-
-		si.payment_terms_template = "Test Discount Amount Template"
-		create_payment_terms_template_with_discount(
-			name="30 Credit Days with Rs.50 Discount",
-			discount_type="Amount",
-			discount=50,
-			template_name="Test Discount Amount Template",
-		)
-		frappe.db.set_value("Company", si.company, "default_discount_account", "Write Off - _TC")
-
-		si.append(
-			"taxes",
-			{
-				"charge_type": "On Net Total",
-				"account_head": "_Test Account Service Tax - _TC",
-				"cost_center": "_Test Cost Center - _TC",
-				"description": "Service Tax",
-				"rate": 18,
-			},
-		)
-		si.save()
-		si.submit()
-
-		# Set reference date past discount cut off date
-		pe_1 = get_payment_entry(
-			"Sales Invoice",
-			si.name,
-			bank_account="_Test Cash - _TC",
-			reference_date=frappe.utils.add_days(si.posting_date, 2),
-		)
-		self.assertEqual(pe_1.paid_amount, 236.0)  # discount not applied
-
-		# Test if tax loss is booked on enabling configuration
-		frappe.db.set_single_value("Accounts Settings", "book_tax_discount_loss", 1)
-		pe_with_tax_loss = get_payment_entry("Sales Invoice", si.name, bank_account="_Test Cash - _TC")
-		self.assertEqual(pe_with_tax_loss.deductions[0].amount, 42.37)  # Loss on Income
-		self.assertEqual(pe_with_tax_loss.deductions[1].amount, 7.63)  # Loss on Tax
-		self.assertEqual(pe_with_tax_loss.deductions[1].account, "_Test Account Service Tax - _TC")
-
-		frappe.db.set_single_value("Accounts Settings", "book_tax_discount_loss", 0)
-		pe = get_payment_entry("Sales Invoice", si.name, bank_account="_Test Cash - _TC")
-		self.assertEqual(pe.references[0].allocated_amount, 236.0)
-		self.assertEqual(pe.paid_amount, 186)
-		self.assertEqual(pe.deductions[0].amount, 50.0)
-
-		pe.submit()
-		si.load_from_db()
-
-		self.assertEqual(si.payment_schedule[0].payment_amount, 236.0)
-		self.assertEqual(si.payment_schedule[0].paid_amount, 186)
-		self.assertEqual(si.payment_schedule[0].outstanding, 0)
-		self.assertEqual(si.payment_schedule[0].discounted_amount, 50)
-
-	@change_settings(
-		"Accounts Settings",
-		{
-			"allow_multi_currency_invoices_against_single_party_account": 1,
-			"book_tax_discount_loss": 1,
-		},
-	)
-	def test_payment_entry_multicurrency_si_with_base_currency_accounting_early_payment_discount(
-		self,
-	):
-		"""
-		1. Multi-currency SI with single currency accounting (company currency)
-		2. PE with early payment discount
-		3. Test if Paid Amount is calculated in company currency
-		4. Test if deductions are calculated in company currency
-
-		SI is in USD to document agreed amounts that are in USD, but the accounting is in base currency.
-		"""
-		si = create_sales_invoice(
-			customer="_Test Customer",
-			currency="USD",
-			conversion_rate=50,
-			do_not_save=1,
-		)
-		create_payment_terms_template_with_discount()
-		si.payment_terms_template = "Test Discount Template"
-
-		frappe.db.set_value("Company", si.company, "default_discount_account", "Write Off - _TC")
-		si.save()
-		si.submit()
-
-		pe = get_payment_entry(
-			"Sales Invoice",
-			si.name,
-			bank_account="_Test Bank - _TC",
-		)
-		pe.reference_no = si.name
-		pe.reference_date = nowdate()
-
-		# Early payment discount loss on income
-		self.assertEqual(pe.paid_amount, 4500.0)  # Amount in company currency
-		self.assertEqual(pe.received_amount, 4500.0)
-		self.assertEqual(pe.deductions[0].amount, 500.0)
-		self.assertEqual(pe.deductions[0].account, "Write Off - _TC")
-		self.assertEqual(pe.difference_amount, 0.0)
-
-		pe.insert()
-		pe.submit()
-
-		expected_gle = dict(
-			(d[0], d)
-			for d in [
-				["Debtors - _TC", 0, 5000, si.name],
-				["_Test Bank - _TC", 4500, 0, None],
-				["Write Off - _TC", 500.0, 0, None],
-			]
-		)
-
-		self.validate_gl_entries(pe.name, expected_gle)
-
-		outstanding_amount = flt(frappe.db.get_value("Sales Invoice", si.name, "outstanding_amount"))
-		self.assertEqual(outstanding_amount, 0)
-
-	def test_payment_entry_multicurrency_accounting_si_with_early_payment_discount(self):
-		"""
-		1. Multi-currency SI with multi-currency accounting
-		2. PE with early payment discount and also exchange loss
-		3. Test if Paid Amount is calculated in transaction currency
-		4. Test if deductions are calculated in base/company currency
-		5. Test if exchange loss is reflected in difference
-		"""
-		si = create_sales_invoice(
-			customer="_Test Customer USD",
-			debit_to="_Test Receivable USD - _TC",
-			currency="USD",
-			conversion_rate=50,
-			do_not_save=1,
-		)
-		create_payment_terms_template_with_discount()
-		si.payment_terms_template = "Test Discount Template"
-
-		frappe.db.set_value("Company", si.company, "default_discount_account", "Write Off - _TC")
-		si.save()
-		si.submit()
-
-		pe = get_payment_entry(
-			"Sales Invoice", si.name, bank_account="_Test Bank - _TC", bank_amount=4700
-		)
-		pe.reference_no = si.name
-		pe.reference_date = nowdate()
-
-		# Early payment discount loss on income
-		self.assertEqual(pe.paid_amount, 90.0)
-		self.assertEqual(pe.received_amount, 4200.0)  # 5000 - 500 (discount) - 300 (exchange loss)
-		self.assertEqual(pe.deductions[0].amount, 500.0)
-		self.assertEqual(pe.deductions[0].account, "Write Off - _TC")
-
-		# Exchange loss
-		self.assertEqual(pe.difference_amount, 300.0)
-
-		pe.append(
-			"deductions",
-			{
-				"account": "_Test Exchange Gain/Loss - _TC",
-				"cost_center": "_Test Cost Center - _TC",
-				"amount": 300.0,
-			},
-		)
-
-		pe.insert()
-		pe.submit()
-
-		self.assertEqual(pe.difference_amount, 0.0)
-
-		expected_gle = dict(
-			(d[0], d)
-			for d in [
-				["_Test Receivable USD - _TC", 0, 5000, si.name],
-				["_Test Bank - _TC", 4200, 0, None],
-				["Write Off - _TC", 500.0, 0, None],
-				["_Test Exchange Gain/Loss - _TC", 300.0, 0, None],
-			]
-		)
-
-		self.validate_gl_entries(pe.name, expected_gle)
-
-		outstanding_amount = flt(frappe.db.get_value("Sales Invoice", si.name, "outstanding_amount"))
-		self.assertEqual(outstanding_amount, 0)
-
 	def test_payment_against_purchase_invoice_to_check_status(self):
 		pi = make_purchase_invoice(
 			supplier="_Test Supplier USD",
@@ -1013,30 +782,6 @@ class TestPaymentEntry(FrappeTestCase):
 		employee = make_employee("test_payment_entry@salary.com", company="_Test Company")
 		create_payment_entry(party_type="Employee", party=employee, save=True)

-	def test_duplicate_payment_entry_allocate_amount(self):
-		si = create_sales_invoice()
-
-		pe_draft = get_payment_entry("Sales Invoice", si.name)
-		pe_draft.insert()
-
-		pe = get_payment_entry("Sales Invoice", si.name)
-		pe.submit()
-
-		self.assertRaises(frappe.ValidationError, pe_draft.submit)
-
-	def test_duplicate_payment_entry_partial_allocate_amount(self):
-		si = create_sales_invoice()
-
-		pe_draft = get_payment_entry("Sales Invoice", si.name)
-		pe_draft.insert()
-
-		pe = get_payment_entry("Sales Invoice", si.name)
-		pe.received_amount = si.total / 2
-		pe.references[0].allocated_amount = si.total / 2
-		pe.submit()
-
-		self.assertRaises(frappe.ValidationError, pe_draft.submit)
-

 def create_payment_entry(**args):
 	payment_entry = frappe.new_doc("Payment Entry")
@@ -1094,27 +839,24 @@ def create_payment_terms_template():
 		).insert()


-def create_payment_terms_template_with_discount(
-	name=None, discount_type=None, discount=None, template_name=None
-):
-	create_payment_term(name or "30 Credit Days with 10% Discount")
-	template_name = template_name or "Test Discount Template"
+def create_payment_terms_template_with_discount():

-	if not frappe.db.exists("Payment Terms Template", template_name):
-		frappe.get_doc(
+	create_payment_term("30 Credit Days with 10% Discount")
+
+	if not frappe.db.exists("Payment Terms Template", "Test Discount Template"):
+		payment_term_template = frappe.get_doc(
 			{
 				"doctype": "Payment Terms Template",
-				"template_name": template_name,
+				"template_name": "Test Discount Template",
 				"allocate_payment_based_on_payment_terms": 1,
 				"terms": [
 					{
 						"doctype": "Payment Terms Template Detail",
-						"payment_term": name or "30 Credit Days with 10% Discount",
+						"payment_term": "30 Credit Days with 10% Discount",
 						"invoice_portion": 100,
 						"credit_days_based_on": "Day(s) after invoice date",
 						"credit_days": 2,
-						"discount_type": discount_type or "Percentage",
-						"discount": discount or 10,
+						"discount": 10,
 						"discount_validity_based_on": "Day(s) after invoice date",
 						"discount_validity": 1,
 					}
--- a/erpnext/accounts/doctype/payment_entry_deduction/payment_entry_deduction.json
+++ b/erpnext/accounts/doctype/payment_entry_deduction/payment_entry_deduction.json
@@ -3,7 +3,6 @@
 "creation": "2016-06-15 15:56:30.815503",
 "doctype": "DocType",
 "editable_grid": 1,
- "engine": "InnoDB",
 "field_order": [
  "account",
  "cost_center",
@@ -18,7 +17,9 @@
   "in_list_view": 1,
   "label": "Account",
   "options": "Account",
-   "reqd": 1
+   "reqd": 1,
+   "show_days": 1,
+   "show_seconds": 1
  },
  {
   "fieldname": "cost_center",
@@ -27,30 +28,37 @@
   "label": "Cost Center",
   "options": "Cost Center",
   "print_hide": 1,
-   "reqd": 1
+   "reqd": 1,
+   "show_days": 1,
+   "show_seconds": 1
  },
  {
   "fieldname": "amount",
   "fieldtype": "Currency",
   "in_list_view": 1,
-   "label": "Amount (Company Currency)",
-   "options": "Company:company:default_currency",
-   "reqd": 1
+   "label": "Amount",
+   "reqd": 1,
+   "show_days": 1,
+   "show_seconds": 1
  },
  {
   "fieldname": "column_break_2",
-   "fieldtype": "Column Break"
+   "fieldtype": "Column Break",
+   "show_days": 1,
+   "show_seconds": 1
  },
  {
   "fieldname": "description",
   "fieldtype": "Small Text",
-   "label": "Description"
+   "label": "Description",
+   "show_days": 1,
+   "show_seconds": 1
  }
 ],
 "index_web_pages_for_search": 1,
 "istable": 1,
 "links": [],
- "modified": "2023-03-06 07:11:57.739619",
+ "modified": "2020-09-12 20:38:08.110674",
 "modified_by": "Administrator",
 "module": "Accounts",
 "name": "Payment Entry Deduction",
@@ -58,6 +66,5 @@
 "permissions": [],
 "quick_entry": 1,
 "sort_field": "modified",
- "sort_order": "DESC",
- "states": []
+ "sort_order": "DESC"
 }
--- a/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js
+++ b/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js
@@ -65,49 +65,23 @@ erpnext.accounts.PaymentReconciliationController = class PaymentReconciliationCo
 			this.frm.add_custom_button(__('Get Unreconciled Entries'), () =>
 				this.frm.trigger("get_unreconciled_entries")
 			);
-			this.frm.change_custom_button_type(__('Get Unreconciled Entries'), null, 'primary');
+			this.frm.change_custom_button_type('Get Unreconciled Entries', null, 'primary');
 		}
 		if (this.frm.doc.invoices.length && this.frm.doc.payments.length) {
 			this.frm.add_custom_button(__('Allocate'), () =>
 				this.frm.trigger("allocate")
 			);
-			this.frm.change_custom_button_type(__('Allocate'), null, 'primary');
-			this.frm.change_custom_button_type(__('Get Unreconciled Entries'), null, 'default');
+			this.frm.change_custom_button_type('Allocate', null, 'primary');
+			this.frm.change_custom_button_type('Get Unreconciled Entries', null, 'default');
 		}
 		if (this.frm.doc.allocation.length) {
 			this.frm.add_custom_button(__('Reconcile'), () =>
 				this.frm.trigger("reconcile")
 			);
-			this.frm.change_custom_button_type(__('Reconcile'), null, 'primary');
-			this.frm.change_custom_button_type(__('Get Unreconciled Entries'), null, 'default');
-			this.frm.change_custom_button_type(__('Allocate'), null, 'default');
+			this.frm.change_custom_button_type('Reconcile', null, 'primary');
+			this.frm.change_custom_button_type('Get Unreconciled Entries', null, 'default');
+			this.frm.change_custom_button_type('Allocate', null, 'default');
 		}
-
-		// check for any running reconciliation jobs
-		if (this.frm.doc.receivable_payable_account) {
-			frappe.db.get_single_value("Accounts Settings", "auto_reconcile_payments").then((enabled) => {
- 				if(enabled) {
-					this.frm.call({
-						'method': "erpnext.accounts.doctype.process_payment_reconciliation.process_payment_reconciliation.is_any_doc_running",
-						"args": {
-							for_filter: {
-								company: this.frm.doc.company,
-								party_type: this.frm.doc.party_type,
-								party: this.frm.doc.party,
-								receivable_payable_account: this.frm.doc.receivable_payable_account
-							}
-						}
-					}).then(r => {
-						if (r.message) {
-							let doc_link = frappe.utils.get_form_link("Process Payment Reconciliation", r.message, true);
-							let msg = __("Payment Reconciliation Job: {0} is running for this party. Can't reconcile now.", [doc_link]);
-							this.frm.dashboard.add_comment(msg, "yellow");
-						}
-					});
-				}
-			});
-		}
-
 	}

 	company() {
@@ -298,32 +272,4 @@ erpnext.accounts.PaymentReconciliationController = class PaymentReconciliationCo
 	}
 };

-frappe.ui.form.on('Payment Reconciliation Allocation', {
-	allocated_amount: function(frm, cdt, cdn) {
-		let row = locals[cdt][cdn];
-		// filter invoice
-		let invoice = frm.doc.invoices.filter((x) => (x.invoice_number == row.invoice_number));
-		// filter payment
-		let payment = frm.doc.payments.filter((x) => (x.reference_name == row.reference_name));
-
-		frm.call({
-			doc: frm.doc,
-			method: 'calculate_difference_on_allocation_change',
-			args: {
-				payment_entry: payment,
-				invoice: invoice,
-				allocated_amount: row.allocated_amount
-			},
-			callback: (r) => {
-				if (r.message) {
-					row.difference_amount = r.message;
-					frm.refresh();
-				}
-			}
-		});
-	}
-});
-
-
-
 extend_cscript(cur_frm.cscript, new erpnext.accounts.PaymentReconciliationController({frm: cur_frm}));
--- a/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py
+++ b/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py
@@ -6,12 +6,10 @@ import frappe
 from frappe import _, msgprint, qb
 from frappe.model.document import Document
 from frappe.query_builder.custom import ConstantColumn
-from frappe.utils import flt, get_link_to_form, getdate, nowdate, today
+from frappe.query_builder.functions import IfNull
+from frappe.utils import flt, getdate, nowdate, today

 import erpnext
-from erpnext.accounts.doctype.process_payment_reconciliation.process_payment_reconciliation import (
-	is_any_doc_running,
-)
 from erpnext.accounts.utils import (
 	QueryPaymentLedger,
 	get_outstanding_invoices,
@@ -126,29 +124,12 @@ class PaymentReconciliation(Document):

 		return list(journal_entries)

-	def get_return_invoices(self):
-		voucher_type = "Sales Invoice" if self.party_type == "Customer" else "Purchase Invoice"
-		doc = qb.DocType(voucher_type)
-		self.return_invoices = (
-			qb.from_(doc)
-			.select(
-				ConstantColumn(voucher_type).as_("voucher_type"),
-				doc.name.as_("voucher_no"),
-				doc.return_against,
-			)
-			.where(
-				(doc.docstatus == 1)
-				& (doc[frappe.scrub(self.party_type)] == self.party)
-				& (doc.is_return == 1)
-			)
-			.run(as_dict=True)
-		)
-
 	def get_dr_or_cr_notes(self):

 		self.build_qb_filter_conditions(get_return_invoices=True)

 		ple = qb.DocType("Payment Ledger Entry")
+		voucher_type = "Sales Invoice" if self.party_type == "Customer" else "Purchase Invoice"

 		if erpnext.get_party_account_type(self.party_type) == "Receivable":
 			self.common_filter_conditions.append(ple.account_type == "Receivable")
@@ -156,10 +137,19 @@ class PaymentReconciliation(Document):
 			self.common_filter_conditions.append(ple.account_type == "Payable")
 		self.common_filter_conditions.append(ple.account == self.receivable_payable_account)

-		self.get_return_invoices()
-		return_invoices = [
-			x for x in self.return_invoices if x.return_against == None or x.return_against == ""
-		]
+		# get return invoices
+		doc = qb.DocType(voucher_type)
+		return_invoices = (
+			qb.from_(doc)
+			.select(ConstantColumn(voucher_type).as_("voucher_type"), doc.name.as_("voucher_no"))
+			.where(
+				(doc.docstatus == 1)
+				& (doc[frappe.scrub(self.party_type)] == self.party)
+				& (doc.is_return == 1)
+				& (IfNull(doc.return_against, "") == "")
+			)
+			.run(as_dict=True)
+		)

 		outstanding_dr_or_cr = []
 		if return_invoices:
@@ -211,15 +201,6 @@ class PaymentReconciliation(Document):
 			accounting_dimensions=self.accounting_dimension_filter_conditions,
 		)

-		cr_dr_notes = (
-			[x.voucher_no for x in self.return_invoices]
-			if self.party_type in ["Customer", "Supplier"]
-			else []
-		)
-		# Filter out cr/dr notes from outstanding invoices list
-		# Happens when non-standalone cr/dr notes are linked with another invoice through journal entry
-		non_reconciled_invoices = [x for x in non_reconciled_invoices if x.voucher_no not in cr_dr_notes]
-
 		if self.invoice_limit:
 			non_reconciled_invoices = non_reconciled_invoices[: self.invoice_limit]

@@ -240,27 +221,15 @@ class PaymentReconciliation(Document):

 	def get_difference_amount(self, payment_entry, invoice, allocated_amount):
 		difference_amount = 0
-		if frappe.get_cached_value(
-			"Account", self.receivable_payable_account, "account_currency"
-		) != frappe.get_cached_value("Company", self.company, "default_currency"):
-			if invoice.get("exchange_rate") and payment_entry.get("exchange_rate", 1) != invoice.get(
-				"exchange_rate", 1
-			):
-				allocated_amount_in_ref_rate = payment_entry.get("exchange_rate", 1) * allocated_amount
-				allocated_amount_in_inv_rate = invoice.get("exchange_rate", 1) * allocated_amount
-				difference_amount = allocated_amount_in_ref_rate - allocated_amount_in_inv_rate
+		if invoice.get("exchange_rate") and payment_entry.get("exchange_rate", 1) != invoice.get(
+			"exchange_rate", 1
+		):
+			allocated_amount_in_ref_rate = payment_entry.get("exchange_rate", 1) * allocated_amount
+			allocated_amount_in_inv_rate = invoice.get("exchange_rate", 1) * allocated_amount
+			difference_amount = allocated_amount_in_ref_rate - allocated_amount_in_inv_rate

 		return difference_amount

-	@frappe.whitelist()
-	def calculate_difference_on_allocation_change(self, payment_entry, invoice, allocated_amount):
-		invoice_exchange_map = self.get_invoice_exchange_map(invoice, payment_entry)
-		invoice[0]["exchange_rate"] = invoice_exchange_map.get(invoice[0].get("invoice_number"))
-		new_difference_amount = self.get_difference_amount(
-			payment_entry[0], invoice[0], allocated_amount
-		)
-		return new_difference_amount
-
 	@frappe.whitelist()
 	def allocate_entries(self, args):
 		self.validate_entries()
@@ -323,7 +292,9 @@ class PaymentReconciliation(Document):
 			}
 		)

-	def reconcile_allocations(self, skip_ref_details_update_for_pe=False):
+	@frappe.whitelist()
+	def reconcile(self):
+		self.validate_allocation()
 		dr_or_cr = (
 			"credit_in_account_currency"
 			if erpnext.get_party_account_type(self.party_type) == "Receivable"
@@ -347,35 +318,12 @@ class PaymentReconciliation(Document):
 					self.make_difference_entry(payment_details)

 		if entry_list:
-			reconcile_against_document(entry_list, skip_ref_details_update_for_pe)
+			reconcile_against_document(entry_list)

 		if dr_or_cr_notes:
 			reconcile_dr_cr_note(dr_or_cr_notes, self.company)

-	@frappe.whitelist()
-	def reconcile(self):
-		if frappe.db.get_single_value("Accounts Settings", "auto_reconcile_payments"):
-			running_doc = is_any_doc_running(
-				dict(
-					company=self.company,
-					party_type=self.party_type,
-					party=self.party,
-					receivable_payable_account=self.receivable_payable_account,
-				)
-			)
-
-			if running_doc:
-				frappe.throw(
-					_("A Reconciliation Job {0} is running for the same filters. Cannot reconcile now").format(
-						get_link_to_form("Auto Reconcile", running_doc)
-					)
-				)
-				return
-
-		self.validate_allocation()
-		self.reconcile_allocations()
 		msgprint(_("Successfully Reconciled"))
-
 		self.get_unreconciled_entries()

 	def make_difference_entry(self, row):
@@ -420,7 +368,6 @@ class PaymentReconciliation(Document):
 				"exchange_rate": 1,
 				"cost_center": erpnext.get_default_cost_center(self.company),
 				reverse_dr_or_cr + "_in_account_currency": flt(row.difference_amount),
-				reverse_dr_or_cr: flt(row.difference_amount),
 			}
 		)

--- a/erpnext/accounts/doctype/payment_reconciliation/test_payment_reconciliation.py
+++ b/erpnext/accounts/doctype/payment_reconciliation/test_payment_reconciliation.py
@@ -5,7 +5,7 @@ import unittest

 import frappe
 from frappe import qb
-from frappe.tests.utils import FrappeTestCase, change_settings
+from frappe.tests.utils import FrappeTestCase
 from frappe.utils import add_days, flt, nowdate

 from erpnext import get_default_cost_center
@@ -349,11 +349,6 @@ class TestPaymentReconciliation(FrappeTestCase):
 		invoices = [x.as_dict() for x in pr.get("invoices")]
 		payments = [x.as_dict() for x in pr.get("payments")]
 		pr.allocate_entries(frappe._dict({"invoices": invoices, "payments": payments}))
-
-		# Difference amount should not be calculated for base currency accounts
-		for row in pr.allocation:
-			self.assertEqual(flt(row.get("difference_amount")), 0.0)
-
 		pr.reconcile()

 		si.reload()
@@ -395,11 +390,6 @@ class TestPaymentReconciliation(FrappeTestCase):
 		invoices = [x.as_dict() for x in pr.get("invoices")]
 		payments = [x.as_dict() for x in pr.get("payments")]
 		pr.allocate_entries(frappe._dict({"invoices": invoices, "payments": payments}))
-
-		# Difference amount should not be calculated for base currency accounts
-		for row in pr.allocation:
-			self.assertEqual(flt(row.get("difference_amount")), 0.0)
-
 		pr.reconcile()

 		# check PR tool output
@@ -424,11 +414,6 @@ class TestPaymentReconciliation(FrappeTestCase):
 		invoices = [x.as_dict() for x in pr.get("invoices")]
 		payments = [x.as_dict() for x in pr.get("payments")]
 		pr.allocate_entries(frappe._dict({"invoices": invoices, "payments": payments}))
-
-		# Difference amount should not be calculated for base currency accounts
-		for row in pr.allocation:
-			self.assertEqual(flt(row.get("difference_amount")), 0.0)
-
 		pr.reconcile()

 		# assert outstanding
@@ -465,11 +450,6 @@ class TestPaymentReconciliation(FrappeTestCase):
 		invoices = [x.as_dict() for x in pr.get("invoices")]
 		payments = [x.as_dict() for x in pr.get("payments")]
 		pr.allocate_entries(frappe._dict({"invoices": invoices, "payments": payments}))
-
-		# Difference amount should not be calculated for base currency accounts
-		for row in pr.allocation:
-			self.assertEqual(flt(row.get("difference_amount")), 0.0)
-
 		pr.reconcile()

 		self.assertEqual(pr.get("invoices"), [])
@@ -844,52 +824,6 @@ class TestPaymentReconciliation(FrappeTestCase):
 		payment_vouchers = [x.get("reference_name") for x in pr.get("payments")]
 		self.assertCountEqual(payment_vouchers, [je2.name, pe2.name])

-	@change_settings(
-		"Accounts Settings",
-		{
-			"allow_multi_currency_invoices_against_single_party_account": 1,
-		},
-	)
-	def test_no_difference_amount_for_base_currency_accounts(self):
-		# Make Sale Invoice
-		si = self.create_sales_invoice(
-			qty=1, rate=1, posting_date=nowdate(), do_not_save=True, do_not_submit=True
-		)
-		si.customer = self.customer
-		si.currency = "EUR"
-		si.conversion_rate = 85
-		si.debit_to = self.debit_to
-		si.save().submit()
-
-		# Make payment using Payment Entry
-		pe1 = create_payment_entry(
-			company=self.company,
-			payment_type="Receive",
-			party_type="Customer",
-			party=self.customer,
-			paid_from=self.debit_to,
-			paid_to=self.bank,
-			paid_amount=100,
-		)
-
-		pe1.save()
-		pe1.submit()
-
-		pr = self.create_payment_reconciliation()
-		pr.party = self.customer
-		pr.receivable_payable_account = self.debit_to
-		pr.get_unreconciled_entries()
-
-		self.assertEqual(len(pr.invoices), 1)
-		self.assertEqual(len(pr.payments), 1)
-
-		invoices = [x.as_dict() for x in pr.invoices]
-		payments = [pr.payments[0].as_dict()]
-		pr.allocate_entries(frappe._dict({"invoices": invoices, "payments": payments}))
-
-		self.assertEqual(pr.allocation[0].allocated_amount, 85)
-		self.assertEqual(pr.allocation[0].difference_amount, 0)
-

 def make_customer(customer_name, currency=None):
 	if not frappe.db.exists("Customer", customer_name):
--- a/erpnext/accounts/doctype/payment_request/payment_request.py
+++ b/erpnext/accounts/doctype/payment_request/payment_request.py
@@ -495,28 +495,26 @@ def get_amount(ref_doc, payment_account=None):
 	"""get amount based on doctype"""
 	dt = ref_doc.doctype
 	if dt in ["Sales Order", "Purchase Order"]:
-		grand_total = flt(ref_doc.rounded_total) or flt(ref_doc.grand_total)
+		grand_total = flt(ref_doc.grand_total) - flt(ref_doc.advance_paid)
+
 	elif dt in ["Sales Invoice", "Purchase Invoice"]:
-		if not ref_doc.get("is_pos"):
-			if ref_doc.party_account_currency == ref_doc.currency:
-				grand_total = flt(ref_doc.outstanding_amount)
-			else:
-				grand_total = flt(ref_doc.outstanding_amount) / ref_doc.conversion_rate
-		elif dt == "Sales Invoice":
-			for pay in ref_doc.payments:
-				if pay.type == "Phone" and pay.account == payment_account:
-					grand_total = pay.amount
-					break
+		if ref_doc.party_account_currency == ref_doc.currency:
+			grand_total = flt(ref_doc.outstanding_amount)
+		else:
+			grand_total = flt(ref_doc.outstanding_amount) / ref_doc.conversion_rate
+
 	elif dt == "POS Invoice":
 		for pay in ref_doc.payments:
 			if pay.type == "Phone" and pay.account == payment_account:
 				grand_total = pay.amount
 				break
+
 	elif dt == "Fees":
 		grand_total = ref_doc.outstanding_amount

 	if grand_total > 0:
 		return grand_total
+
 	else:
 		frappe.throw(_("Payment Entry is already created"))

--- a/erpnext/accounts/doctype/payment_request/test_payment_request.py
+++ b/erpnext/accounts/doctype/payment_request/test_payment_request.py
@@ -6,7 +6,6 @@ import unittest
 import frappe

 from erpnext.accounts.doctype.payment_request.payment_request import make_payment_request
-from erpnext.accounts.doctype.purchase_invoice.test_purchase_invoice import make_purchase_invoice
 from erpnext.accounts.doctype.sales_invoice.test_sales_invoice import create_sales_invoice
 from erpnext.selling.doctype.sales_order.test_sales_order import make_sales_order
 from erpnext.setup.utils import get_exchange_rate
@@ -46,10 +45,7 @@ class TestPaymentRequest(unittest.TestCase):
 				frappe.get_doc(method).insert(ignore_permissions=True)

 	def test_payment_request_linkings(self):
-		so_inr = make_sales_order(currency="INR", do_not_save=True)
-		so_inr.disable_rounded_total = 1
-		so_inr.save()
-
+		so_inr = make_sales_order(currency="INR")
 		pr = make_payment_request(
 			dt="Sales Order",
 			dn=so_inr.name,
@@ -75,29 +71,6 @@ class TestPaymentRequest(unittest.TestCase):
 		self.assertEqual(pr.reference_name, si_usd.name)
 		self.assertEqual(pr.currency, "USD")

-	def test_payment_entry_against_purchase_invoice(self):
-		si_usd = make_purchase_invoice(
-			customer="_Test Supplier USD",
-			debit_to="_Test Payable USD - _TC",
-			currency="USD",
-			conversion_rate=50,
-		)
-
-		pr = make_payment_request(
-			dt="Purchase Invoice",
-			dn=si_usd.name,
-			recipient_id="user@example.com",
-			mute_email=1,
-			payment_gateway_account="_Test Gateway - USD",
-			submit_doc=1,
-			return_doc=1,
-		)
-
-		pe = pr.create_payment_entry()
-		pr.load_from_db()
-
-		self.assertEqual(pr.status, "Paid")
-
 	def test_payment_entry(self):
 		frappe.db.set_value(
 			"Company", "_Test Company", "exchange_gain_loss_account", "_Test Exchange Gain/Loss - _TC"
--- a/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py
+++ b/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py
@@ -4,13 +4,12 @@

 import frappe
 from frappe import _
-from frappe.query_builder.functions import Sum
-from frappe.utils import add_days, flt
+from frappe.utils import flt

 from erpnext.accounts.doctype.accounting_dimension.accounting_dimension import (
 	get_accounting_dimensions,
 )
-from erpnext.accounts.utils import get_account_currency, get_fiscal_year, validate_fiscal_year
+from erpnext.accounts.utils import get_account_currency
 from erpnext.controllers.accounts_controller import AccountsController


@@ -21,17 +20,9 @@ class PeriodClosingVoucher(AccountsController):

 	def on_submit(self):
 		self.db_set("gle_processing_status", "In Progress")
-		get_opening_entries = False
-
-		if not frappe.db.exists(
-			"Period Closing Voucher", {"company": self.company, "docstatus": 1, "name": ("!=", self.name)}
-		):
-			get_opening_entries = True
-
-		self.make_gl_entries(get_opening_entries=get_opening_entries)
+		self.make_gl_entries()

 	def on_cancel(self):
-		self.validate_future_closing_vouchers()
 		self.db_set("gle_processing_status", "In Progress")
 		self.ignore_linked_doctypes = ("GL Entry", "Stock Ledger Entry")
 		gle_count = frappe.db.count(
@@ -44,7 +35,6 @@ class PeriodClosingVoucher(AccountsController):
 				voucher_type="Period Closing Voucher",
 				voucher_no=self.name,
 				queue="long",
-				enqueue_after_commit=True,
 			)
 			frappe.msgprint(
 				_("The GL Entries will be cancelled in the background, it can take a few minutes."), alert=True
@@ -52,25 +42,6 @@ class PeriodClosingVoucher(AccountsController):
 		else:
 			make_reverse_gl_entries(voucher_type="Period Closing Voucher", voucher_no=self.name)

-		self.delete_closing_entries()
-
-	def validate_future_closing_vouchers(self):
-		if frappe.db.exists(
-			"Period Closing Voucher",
-			{"posting_date": (">", self.posting_date), "docstatus": 1, "company": self.company},
-		):
-			frappe.throw(
-				_(
-					"You can not cancel this Period Closing Voucher, please cancel the future Period Closing Vouchers first"
-				)
-			)
-
-	def delete_closing_entries(self):
-		closing_balance = frappe.qb.DocType("Account Closing Balance")
-		frappe.qb.from_(closing_balance).delete().where(
-			closing_balance.period_closing_voucher == self.name
-		).run()
-
 	def validate_account_head(self):
 		closing_account_type = frappe.get_cached_value("Account", self.closing_account_head, "root_type")

@@ -85,6 +56,8 @@ class PeriodClosingVoucher(AccountsController):
 			frappe.throw(_("Currency of the Closing Account must be {0}").format(company_currency))

 	def validate_posting_date(self):
+		from erpnext.accounts.utils import get_fiscal_year, validate_fiscal_year
+
 		validate_fiscal_year(
 			self.posting_date, self.fiscal_year, self.company, label=_("Posting Date"), doc=self
 		)
@@ -93,8 +66,6 @@ class PeriodClosingVoucher(AccountsController):
 			self.posting_date, self.fiscal_year, company=self.company
 		)[1]

-		self.check_if_previous_year_closed()
-
 		pce = frappe.db.sql(
 			"""select name from `tabPeriod Closing Voucher`
 			where posting_date > %s and fiscal_year = %s and docstatus = 1 and company = %s""",
@@ -107,64 +78,28 @@ class PeriodClosingVoucher(AccountsController):
 				)
 			)

-	def check_if_previous_year_closed(self):
-		last_year_closing = add_days(self.year_start_date, -1)
-
-		previous_fiscal_year = get_fiscal_year(last_year_closing, company=self.company, boolean=True)
-
-		if previous_fiscal_year and not frappe.db.exists(
-			"GL Entry", {"posting_date": ("<=", last_year_closing), "company": self.company}
-		):
-			return
-
-		if previous_fiscal_year and not frappe.db.exists(
-			"Period Closing Voucher",
-			{"posting_date": ("<=", last_year_closing), "docstatus": 1, "company": self.company},
-		):
-			frappe.throw(_("Previous Year is not closed, please close it first"))
-
-	def make_gl_entries(self, get_opening_entries=False):
+	def make_gl_entries(self):
 		gl_entries = self.get_gl_entries()
-		closing_entries = self.get_grouped_gl_entries(get_opening_entries=get_opening_entries)
 		if gl_entries:
 			if len(gl_entries) > 5000:
-				frappe.enqueue(
-					process_gl_entries,
-					gl_entries=gl_entries,
-					closing_entries=closing_entries,
-					voucher_name=self.name,
-					queue="long",
-				)
+				frappe.enqueue(process_gl_entries, gl_entries=gl_entries, queue="long")
 				frappe.msgprint(
 					_("The GL Entries will be processed in the background, it can take a few minutes."),
 					alert=True,
 				)
 			else:
-				process_gl_entries(gl_entries, closing_entries, voucher_name=self.name)
-
-	def get_grouped_gl_entries(self, get_opening_entries=False):
-		closing_entries = []
-		for acc in self.get_balances_based_on_dimensions(
-			group_by_account=True, for_aggregation=True, get_opening_entries=get_opening_entries
-		):
-			closing_entries.append(self.get_closing_entries(acc))
-
-		return closing_entries
+				process_gl_entries(gl_entries)

 	def get_gl_entries(self):
 		gl_entries = []

 		# pl account
-		for acc in self.get_balances_based_on_dimensions(
-			group_by_account=True, report_type="Profit and Loss"
-		):
+		for acc in self.get_pl_balances_based_on_dimensions(group_by_account=True):
 			if flt(acc.bal_in_company_currency):
 				gl_entries.append(self.get_gle_for_pl_account(acc))

 		# closing liability account
-		for acc in self.get_balances_based_on_dimensions(
-			group_by_account=False, report_type="Profit and Loss"
-		):
+		for acc in self.get_pl_balances_based_on_dimensions(group_by_account=False):
 			if flt(acc.bal_in_company_currency):
 				gl_entries.append(self.get_gle_for_closing_account(acc))

@@ -173,8 +108,6 @@ class PeriodClosingVoucher(AccountsController):
 	def get_gle_for_pl_account(self, acc):
 		gl_entry = self.get_gl_dict(
 			{
-				"company": self.company,
-				"closing_date": self.posting_date,
 				"account": acc.account,
 				"cost_center": acc.cost_center,
 				"finance_book": acc.finance_book,
@@ -187,7 +120,6 @@ class PeriodClosingVoucher(AccountsController):
 				if flt(acc.bal_in_account_currency) > 0
 				else 0,
 				"credit": abs(flt(acc.bal_in_company_currency)) if flt(acc.bal_in_company_currency) > 0 else 0,
-				"is_period_closing_voucher_entry": 1,
 			},
 			item=acc,
 		)
@@ -197,8 +129,6 @@ class PeriodClosingVoucher(AccountsController):
 	def get_gle_for_closing_account(self, acc):
 		gl_entry = self.get_gl_dict(
 			{
-				"company": self.company,
-				"closing_date": self.posting_date,
 				"account": self.closing_account_head,
 				"cost_center": acc.cost_center,
 				"finance_book": acc.finance_book,
@@ -211,36 +141,12 @@ class PeriodClosingVoucher(AccountsController):
 				if flt(acc.bal_in_account_currency) < 0
 				else 0,
 				"credit": abs(flt(acc.bal_in_company_currency)) if flt(acc.bal_in_company_currency) < 0 else 0,
-				"is_period_closing_voucher_entry": 1,
 			},
 			item=acc,
 		)
 		self.update_default_dimensions(gl_entry, acc)
 		return gl_entry

-	def get_closing_entries(self, acc):
-		closing_entry = self.get_gl_dict(
-			{
-				"company": self.company,
-				"closing_date": self.posting_date,
-				"period_closing_voucher": self.name,
-				"account": acc.account,
-				"cost_center": acc.cost_center,
-				"finance_book": acc.finance_book,
-				"account_currency": acc.account_currency,
-				"debit_in_account_currency": flt(acc.debit_in_account_currency),
-				"debit": flt(acc.debit),
-				"credit_in_account_currency": flt(acc.credit_in_account_currency),
-				"credit": flt(acc.credit),
-			},
-			item=acc,
-		)
-
-		for dimension in self.accounting_dimensions:
-			closing_entry.update({dimension: acc.get(dimension)})
-
-		return closing_entry
-
 	def update_default_dimensions(self, gl_entry, acc):
 		if not self.accounting_dimensions:
 			self.accounting_dimensions = get_accounting_dimensions()
@@ -248,88 +154,47 @@ class PeriodClosingVoucher(AccountsController):
 		for dimension in self.accounting_dimensions:
 			gl_entry.update({dimension: acc.get(dimension)})

-	def get_balances_based_on_dimensions(
-		self, group_by_account=False, report_type=None, for_aggregation=False, get_opening_entries=False
-	):
+	def get_pl_balances_based_on_dimensions(self, group_by_account=False):
 		"""Get balance for dimension-wise pl accounts"""

-		qb_dimension_fields = ["cost_center", "finance_book", "project"]
+		dimension_fields = ["t1.cost_center", "t1.finance_book"]

 		self.accounting_dimensions = get_accounting_dimensions()
 		for dimension in self.accounting_dimensions:
-			qb_dimension_fields.append(dimension)
+			dimension_fields.append("t1.{0}".format(dimension))

 		if group_by_account:
-			qb_dimension_fields.append("account")
+			dimension_fields.append("t1.account")

-		account_filters = {
-			"company": self.company,
-			"is_group": 0,
-		}
-
-		if report_type:
-			account_filters.update({"report_type": report_type})
-
-		accounts = frappe.get_all("Account", filters=account_filters, pluck="name")
-
-		gl_entry = frappe.qb.DocType("GL Entry")
-		query = frappe.qb.from_(gl_entry).select(gl_entry.account, gl_entry.account_currency)
-
-		if not for_aggregation:
-			query = query.select(
-				(Sum(gl_entry.debit_in_account_currency) - Sum(gl_entry.credit_in_account_currency)).as_(
-					"bal_in_account_currency"
-				),
-				(Sum(gl_entry.debit) - Sum(gl_entry.credit)).as_("bal_in_company_currency"),
-			)
-		else:
-			query = query.select(
-				(Sum(gl_entry.debit_in_account_currency)).as_("debit_in_account_currency"),
-				(Sum(gl_entry.credit_in_account_currency)).as_("credit_in_account_currency"),
-				(Sum(gl_entry.debit)).as_("debit"),
-				(Sum(gl_entry.credit)).as_("credit"),
-			)
-
-		for dimension in qb_dimension_fields:
-			query = query.select(gl_entry[dimension])
-
-		query = query.where(
-			(gl_entry.company == self.company)
-			& (gl_entry.is_cancelled == 0)
-			& (gl_entry.account.isin(accounts))
+		return frappe.db.sql(
+			"""
+			select
+				t2.account_currency,
+				{dimension_fields},
+				sum(t1.debit_in_account_currency) - sum(t1.credit_in_account_currency) as bal_in_account_currency,
+				sum(t1.debit) - sum(t1.credit) as bal_in_company_currency
+			from `tabGL Entry` t1, `tabAccount` t2
+			where
+				t1.is_cancelled = 0
+				and t1.account = t2.name
+				and t2.report_type = 'Profit and Loss'
+				and t2.docstatus < 2
+				and t2.company = %s
+				and t1.posting_date between %s and %s
+			group by {dimension_fields}
+		""".format(
+				dimension_fields=", ".join(dimension_fields)
+			),
+			(self.company, self.get("year_start_date"), self.posting_date),
+			as_dict=1,
 		)

-		if get_opening_entries:
-			query = query.where(
-				gl_entry.posting_date.between(self.get("year_start_date"), self.posting_date)
-				| gl_entry.is_opening
-				== "Yes"
-			)
-		else:
-			query = query.where(
-				gl_entry.posting_date.between(self.get("year_start_date"), self.posting_date)
-				& gl_entry.is_opening
-				== "No"
-			)

-		if for_aggregation:
-			query = query.where(gl_entry.voucher_type != "Period Closing Voucher")
-
-		for dimension in qb_dimension_fields:
-			query = query.groupby(gl_entry[dimension])
-
-		return query.run(as_dict=1)
-
-
-def process_gl_entries(gl_entries, closing_entries, voucher_name=None):
-	from erpnext.accounts.doctype.account_closing_balance.account_closing_balance import (
-		make_closing_entries,
-	)
+def process_gl_entries(gl_entries):
 	from erpnext.accounts.general_ledger import make_gl_entries

 	try:
 		make_gl_entries(gl_entries, merge_entries=False)
-		make_closing_entries(gl_entries + closing_entries, voucher_name=voucher_name)
 		frappe.db.set_value(
 			"Period Closing Voucher", gl_entries[0].get("voucher_no"), "gle_processing_status", "Completed"
 		)
--- a/erpnext/accounts/doctype/period_closing_voucher/test_period_closing_voucher.py
+++ b/erpnext/accounts/doctype/period_closing_voucher/test_period_closing_voucher.py
@@ -16,17 +16,16 @@ from erpnext.accounts.utils import get_fiscal_year, now
 class TestPeriodClosingVoucher(unittest.TestCase):
 	def test_closing_entry(self):
 		frappe.db.sql("delete from `tabGL Entry` where company='Test PCV Company'")
-		frappe.db.sql("delete from `tabPeriod Closing Voucher` where company='Test PCV Company'")

 		company = create_company()
 		cost_center = create_cost_center("Test Cost Center 1")

 		jv1 = make_journal_entry(
-			posting_date="2021-03-15",
 			amount=400,
 			account1="Cash - TPC",
 			account2="Sales - TPC",
 			cost_center=cost_center,
+			posting_date=now(),
 			save=False,
 		)
 		jv1.company = company
@@ -34,18 +33,18 @@ class TestPeriodClosingVoucher(unittest.TestCase):
 		jv1.submit()

 		jv2 = make_journal_entry(
-			posting_date="2021-03-15",
 			amount=600,
 			account1="Cost of Goods Sold - TPC",
 			account2="Cash - TPC",
 			cost_center=cost_center,
+			posting_date=now(),
 			save=False,
 		)
 		jv2.company = company
 		jv2.save()
 		jv2.submit()

-		pcv = self.make_period_closing_voucher(posting_date="2021-03-31")
+		pcv = self.make_period_closing_voucher()
 		surplus_account = pcv.closing_account_head

 		expected_gle = (
@@ -66,7 +65,6 @@ class TestPeriodClosingVoucher(unittest.TestCase):

 	def test_cost_center_wise_posting(self):
 		frappe.db.sql("delete from `tabGL Entry` where company='Test PCV Company'")
-		frappe.db.sql("delete from `tabPeriod Closing Voucher` where company='Test PCV Company'")

 		company = create_company()
 		surplus_account = create_account()
@@ -83,7 +81,6 @@ class TestPeriodClosingVoucher(unittest.TestCase):
 			debit_to="Debtors - TPC",
 			currency="USD",
 			customer="_Test Customer USD",
-			posting_date="2021-03-15",
 		)
 		create_sales_invoice(
 			company=company,
@@ -94,10 +91,9 @@ class TestPeriodClosingVoucher(unittest.TestCase):
 			debit_to="Debtors - TPC",
 			currency="USD",
 			customer="_Test Customer USD",
-			posting_date="2021-03-15",
 		)

-		pcv = self.make_period_closing_voucher(posting_date="2021-03-31", submit=False)
+		pcv = self.make_period_closing_voucher(submit=False)
 		pcv.save()
 		pcv.submit()
 		surplus_account = pcv.closing_account_head
@@ -132,13 +128,12 @@ class TestPeriodClosingVoucher(unittest.TestCase):

 	def test_period_closing_with_finance_book_entries(self):
 		frappe.db.sql("delete from `tabGL Entry` where company='Test PCV Company'")
-		frappe.db.sql("delete from `tabPeriod Closing Voucher` where company='Test PCV Company'")

 		company = create_company()
 		surplus_account = create_account()
 		cost_center = create_cost_center("Test Cost Center 1")

-		create_sales_invoice(
+		si = create_sales_invoice(
 			company=company,
 			income_account="Sales - TPC",
 			expense_account="Cost of Goods Sold - TPC",
@@ -147,7 +142,6 @@ class TestPeriodClosingVoucher(unittest.TestCase):
 			debit_to="Debtors - TPC",
 			currency="USD",
 			customer="_Test Customer USD",
-			posting_date="2021-03-15",
 		)

 		jv = make_journal_entry(
@@ -155,14 +149,14 @@ class TestPeriodClosingVoucher(unittest.TestCase):
 			account2="Sales - TPC",
 			amount=400,
 			cost_center=cost_center,
-			posting_date="2021-03-15",
+			posting_date=now(),
 		)
 		jv.company = company
 		jv.finance_book = create_finance_book().name
 		jv.save()
 		jv.submit()

-		pcv = self.make_period_closing_voucher(posting_date="2021-03-31")
+		pcv = self.make_period_closing_voucher()
 		surplus_account = pcv.closing_account_head

 		expected_gle = (
@@ -183,148 +177,14 @@ class TestPeriodClosingVoucher(unittest.TestCase):

 		self.assertSequenceEqual(pcv_gle, expected_gle)

-	def test_gl_entries_restrictions(self):
-		frappe.db.sql("delete from `tabGL Entry` where company='Test PCV Company'")
-		frappe.db.sql("delete from `tabPeriod Closing Voucher` where company='Test PCV Company'")
-
-		company = create_company()
-		cost_center = create_cost_center("Test Cost Center 1")
-
-		self.make_period_closing_voucher(posting_date="2021-03-31")
-
-		jv1 = make_journal_entry(
-			posting_date="2021-03-15",
-			amount=400,
-			account1="Cash - TPC",
-			account2="Sales - TPC",
-			cost_center=cost_center,
-			save=False,
-		)
-		jv1.company = company
-		jv1.save()
-
-		self.assertRaises(frappe.ValidationError, jv1.submit)
-
-	def test_closing_balance_with_dimensions_and_test_reposting_entry(self):
-		frappe.db.sql("delete from `tabGL Entry` where company='Test PCV Company'")
-		frappe.db.sql("delete from `tabPeriod Closing Voucher` where company='Test PCV Company'")
-		frappe.db.sql("delete from `tabAccount Closing Balance` where company='Test PCV Company'")
-
-		company = create_company()
-		cost_center1 = create_cost_center("Test Cost Center 1")
-		cost_center2 = create_cost_center("Test Cost Center 2")
-
-		jv1 = make_journal_entry(
-			posting_date="2021-03-15",
-			amount=400,
-			account1="Cash - TPC",
-			account2="Sales - TPC",
-			cost_center=cost_center1,
-			save=False,
-		)
-		jv1.company = company
-		jv1.save()
-		jv1.submit()
-
-		jv2 = make_journal_entry(
-			posting_date="2021-03-15",
-			amount=200,
-			account1="Cash - TPC",
-			account2="Sales - TPC",
-			cost_center=cost_center2,
-			save=False,
-		)
-		jv2.company = company
-		jv2.save()
-		jv2.submit()
-
-		pcv1 = self.make_period_closing_voucher(posting_date="2021-03-31")
-
-		closing_balance = frappe.db.get_value(
-			"Account Closing Balance",
-			{
-				"account": "Sales - TPC",
-				"cost_center": cost_center1,
-				"period_closing_voucher": pcv1.name,
-				"is_period_closing_voucher_entry": 0,
-			},
-			["credit", "credit_in_account_currency"],
-			as_dict=1,
-		)
-
-		self.assertEqual(closing_balance.credit, 400)
-		self.assertEqual(closing_balance.credit_in_account_currency, 400)
-
-		jv3 = make_journal_entry(
-			posting_date="2022-03-15",
-			amount=300,
-			account1="Cash - TPC",
-			account2="Sales - TPC",
-			cost_center=cost_center2,
-			save=False,
-		)
-
-		jv3.company = company
-		jv3.save()
-		jv3.submit()
-
-		pcv2 = self.make_period_closing_voucher(posting_date="2022-03-31")
-
-		cc1_closing_balance = frappe.db.get_value(
-			"Account Closing Balance",
-			{
-				"account": "Sales - TPC",
-				"cost_center": cost_center1,
-				"period_closing_voucher": pcv2.name,
-				"is_period_closing_voucher_entry": 0,
-			},
-			["credit", "credit_in_account_currency"],
-			as_dict=1,
-		)
-
-		cc2_closing_balance = frappe.db.get_value(
-			"Account Closing Balance",
-			{
-				"account": "Sales - TPC",
-				"cost_center": cost_center2,
-				"period_closing_voucher": pcv2.name,
-				"is_period_closing_voucher_entry": 0,
-			},
-			["credit", "credit_in_account_currency"],
-			as_dict=1,
-		)
-
-		self.assertEqual(cc1_closing_balance.credit, 400)
-		self.assertEqual(cc1_closing_balance.credit_in_account_currency, 400)
-		self.assertEqual(cc2_closing_balance.credit, 500)
-		self.assertEqual(cc2_closing_balance.credit_in_account_currency, 500)
-
-		warehouse = frappe.db.get_value("Warehouse", {"company": company}, "name")
-
-		repost_doc = frappe.get_doc(
-			{
-				"doctype": "Repost Item Valuation",
-				"company": company,
-				"posting_date": "2020-03-15",
-				"based_on": "Item and Warehouse",
-				"item_code": "Test Item 1",
-				"warehouse": warehouse,
-			}
-		)
-
-		self.assertRaises(frappe.ValidationError, repost_doc.save)
-
-		repost_doc.posting_date = today()
-		repost_doc.save()
-
-	def make_period_closing_voucher(self, posting_date=None, submit=True):
+	def make_period_closing_voucher(self, submit=True):
 		surplus_account = create_account()
 		cost_center = create_cost_center("Test Cost Center 1")
 		pcv = frappe.get_doc(
 			{
 				"doctype": "Period Closing Voucher",
-				"transaction_date": posting_date or today(),
-				"posting_date": posting_date or today(),
+				"transaction_date": today(),
+				"posting_date": today(),
 				"company": "Test PCV Company",
 				"fiscal_year": get_fiscal_year(today(), company="Test PCV Company")[0],
 				"cost_center": cost_center,
--- a/erpnext/accounts/doctype/pos_closing_entry/pos_closing_entry.py
+++ b/erpnext/accounts/doctype/pos_closing_entry/pos_closing_entry.py
@@ -21,24 +21,8 @@ class POSClosingEntry(StatusUpdater):
 		if frappe.db.get_value("POS Opening Entry", self.pos_opening_entry, "status") != "Open":
 			frappe.throw(_("Selected POS Opening Entry should be open."), title=_("Invalid Opening Entry"))

-		self.validate_duplicate_pos_invoices()
 		self.validate_pos_invoices()

-	def validate_duplicate_pos_invoices(self):
-		pos_occurences = {}
-		for idx, inv in enumerate(self.pos_transactions, 1):
-			pos_occurences.setdefault(inv.pos_invoice, []).append(idx)
-
-		error_list = []
-		for key, value in pos_occurences.items():
-			if len(value) > 1:
-				error_list.append(
-					_("{} is added multiple times on rows: {}".format(frappe.bold(key), frappe.bold(value)))
-				)
-
-		if error_list:
-			frappe.throw(error_list, title=_("Duplicate POS Invoices found"), as_list=True)
-
 	def validate_pos_invoices(self):
 		invalid_rows = []
 		for d in self.pos_transactions:
--- a/erpnext/accounts/doctype/pos_invoice/pos_invoice.js
+++ b/erpnext/accounts/doctype/pos_invoice/pos_invoice.js
@@ -112,8 +112,7 @@ erpnext.selling.POSInvoiceController = class POSInvoiceController extends erpnex
 				party_type: "Customer",
 				account: this.frm.doc.debit_to,
 				price_list: this.frm.doc.selling_price_list,
-				pos_profile: pos_profile,
-				company_address: this.frm.doc.company_address
+				pos_profile: pos_profile
 			}, () => {
 				this.apply_pricing_rule();
 			});
--- a/erpnext/accounts/doctype/pos_invoice/pos_invoice.json
+++ b/erpnext/accounts/doctype/pos_invoice/pos_invoice.json
@@ -442,7 +442,6 @@
   "fieldtype": "Data",
   "hidden": 1,
   "label": "Mobile No",
-   "options": "Phone",
   "read_only": 1
  },
  {
@@ -1555,10 +1554,11 @@
 "icon": "fa fa-file-text",
 "is_submittable": 1,
 "links": [],
- "modified": "2023-06-03 16:23:41.083409",
+ "modified": "2022-09-30 03:49:50.455199",
 "modified_by": "Administrator",
 "module": "Accounts",
 "name": "POS Invoice",
+ "name_case": "Title Case",
 "naming_rule": "By \"Naming Series\" field",
 "owner": "Administrator",
 "permissions": [
--- a/erpnext/accounts/doctype/pos_invoice/pos_invoice.py
+++ b/erpnext/accounts/doctype/pos_invoice/pos_invoice.py
@@ -3,8 +3,7 @@


 import frappe
-from frappe import _, bold
-from frappe.query_builder.functions import IfNull, Sum
+from frappe import _
 from frappe.utils import cint, flt, get_link_to_form, getdate, nowdate

 from erpnext.accounts.doctype.loyalty_program.loyalty_program import validate_loyalty_points
@@ -16,7 +15,12 @@ from erpnext.accounts.doctype.sales_invoice.sales_invoice import (
 	update_multi_mode_option,
 )
 from erpnext.accounts.party import get_due_date, get_party_account
-from erpnext.stock.doctype.serial_no.serial_no import get_serial_nos
+from erpnext.stock.doctype.batch.batch import get_batch_qty, get_pos_reserved_batch_qty
+from erpnext.stock.doctype.serial_no.serial_no import (
+	get_delivered_serial_nos,
+	get_pos_reserved_serial_nos,
+	get_serial_nos,
+)


 class POSInvoice(SalesInvoice):
@@ -66,7 +70,6 @@ class POSInvoice(SalesInvoice):
 			self.apply_loyalty_points()
 		self.check_phone_payments()
 		self.set_status(update=True)
-		self.submit_serial_batch_bundle()

 		if self.coupon_code:
 			from erpnext.accounts.doctype.pricing_rule.utils import update_coupon_code_count
@@ -108,29 +111,6 @@ class POSInvoice(SalesInvoice):

 			update_coupon_code_count(self.coupon_code, "cancelled")

-		self.delink_serial_and_batch_bundle()
-
-	def delink_serial_and_batch_bundle(self):
-		for row in self.items:
-			if row.serial_and_batch_bundle:
-				if not self.consolidated_invoice:
-					frappe.db.set_value(
-						"Serial and Batch Bundle",
-						row.serial_and_batch_bundle,
-						{"is_cancelled": 1, "voucher_no": ""},
-					)
-
-				row.db_set("serial_and_batch_bundle", None)
-
-	def submit_serial_batch_bundle(self):
-		for item in self.items:
-			if item.serial_and_batch_bundle:
-				doc = frappe.get_doc("Serial and Batch Bundle", item.serial_and_batch_bundle)
-
-				if doc.docstatus == 0:
-					doc.flags.ignore_voucher_validation = True
-					doc.submit()
-
 	def check_phone_payments(self):
 		for pay in self.payments:
 			if pay.type == "Phone" and pay.amount >= 0:
@@ -148,6 +128,88 @@ class POSInvoice(SalesInvoice):
 				if paid_amt and pay.amount != paid_amt:
 					return frappe.throw(_("Payment related to {0} is not completed").format(pay.mode_of_payment))

+	def validate_pos_reserved_serial_nos(self, item):
+		serial_nos = get_serial_nos(item.serial_no)
+		filters = {"item_code": item.item_code, "warehouse": item.warehouse}
+		if item.batch_no:
+			filters["batch_no"] = item.batch_no
+
+		reserved_serial_nos = get_pos_reserved_serial_nos(filters)
+		invalid_serial_nos = [s for s in serial_nos if s in reserved_serial_nos]
+
+		bold_invalid_serial_nos = frappe.bold(", ".join(invalid_serial_nos))
+		if len(invalid_serial_nos) == 1:
+			frappe.throw(
+				_(
+					"Row #{}: Serial No. {} has already been transacted into another POS Invoice. Please select valid serial no."
+				).format(item.idx, bold_invalid_serial_nos),
+				title=_("Item Unavailable"),
+			)
+		elif invalid_serial_nos:
+			frappe.throw(
+				_(
+					"Row #{}: Serial Nos. {} have already been transacted into another POS Invoice. Please select valid serial no."
+				).format(item.idx, bold_invalid_serial_nos),
+				title=_("Item Unavailable"),
+			)
+
+	def validate_pos_reserved_batch_qty(self, item):
+		filters = {"item_code": item.item_code, "warehouse": item.warehouse, "batch_no": item.batch_no}
+
+		available_batch_qty = get_batch_qty(item.batch_no, item.warehouse, item.item_code)
+		reserved_batch_qty = get_pos_reserved_batch_qty(filters)
+
+		bold_item_name = frappe.bold(item.item_name)
+		bold_extra_batch_qty_needed = frappe.bold(
+			abs(available_batch_qty - reserved_batch_qty - item.qty)
+		)
+		bold_invalid_batch_no = frappe.bold(item.batch_no)
+
+		if (available_batch_qty - reserved_batch_qty) == 0:
+			frappe.throw(
+				_(
+					"Row #{}: Batch No. {} of item {} has no stock available. Please select valid batch no."
+				).format(item.idx, bold_invalid_batch_no, bold_item_name),
+				title=_("Item Unavailable"),
+			)
+		elif (available_batch_qty - reserved_batch_qty - item.qty) < 0:
+			frappe.throw(
+				_(
+					"Row #{}: Batch No. {} of item {} has less than required stock available, {} more required"
+				).format(
+					item.idx, bold_invalid_batch_no, bold_item_name, bold_extra_batch_qty_needed
+				),
+				title=_("Item Unavailable"),
+			)
+
+	def validate_delivered_serial_nos(self, item):
+		delivered_serial_nos = get_delivered_serial_nos(item.serial_no)
+
+		if delivered_serial_nos:
+			bold_delivered_serial_nos = frappe.bold(", ".join(delivered_serial_nos))
+			frappe.throw(
+				_(
+					"Row #{}: Serial No. {} has already been transacted into another Sales Invoice. Please select valid serial no."
+				).format(item.idx, bold_delivered_serial_nos),
+				title=_("Item Unavailable"),
+			)
+
+	def validate_invalid_serial_nos(self, item):
+		serial_nos = get_serial_nos(item.serial_no)
+		error_msg = []
+		invalid_serials, msg = "", ""
+		for serial_no in serial_nos:
+			if not frappe.db.exists("Serial No", serial_no):
+				invalid_serials = invalid_serials + (", " if invalid_serials else "") + serial_no
+		msg = _("Row #{}: Following Serial numbers for item {} are <b>Invalid</b>: {}").format(
+			item.idx, frappe.bold(item.get("item_code")), frappe.bold(invalid_serials)
+		)
+		if invalid_serials:
+			error_msg.append(msg)
+
+		if error_msg:
+			frappe.throw(error_msg, title=_("Invalid Item"), as_list=True)
+
 	def validate_stock_availablility(self):
 		if self.is_return:
 			return
@@ -160,7 +222,13 @@ class POSInvoice(SalesInvoice):
 		from erpnext.stock.stock_ledger import is_negative_stock_allowed

 		for d in self.get("items"):
-			if not d.serial_and_batch_bundle:
+			if d.serial_no:
+				self.validate_pos_reserved_serial_nos(d)
+				self.validate_delivered_serial_nos(d)
+				self.validate_invalid_serial_nos(d)
+			elif d.batch_no:
+				self.validate_pos_reserved_batch_qty(d)
+			else:
 				if is_negative_stock_allowed(item_code=d.item_code):
 					return

@@ -178,7 +246,7 @@ class POSInvoice(SalesInvoice):
 						),
 						title=_("Item Unavailable"),
 					)
-				elif is_stock_item and flt(available_stock) < flt(d.stock_qty):
+				elif is_stock_item and flt(available_stock) < flt(d.qty):
 					frappe.throw(
 						_(
 							"Row #{}: Stock quantity not enough for Item Code: {} under warehouse {}. Available quantity {}."
@@ -189,15 +257,36 @@ class POSInvoice(SalesInvoice):
 	def validate_serialised_or_batched_item(self):
 		error_msg = []
 		for d in self.get("items"):
-			error_msg = ""
-			if d.get("has_serial_no") and not d.serial_and_batch_bundle:
-				error_msg = f"Row #{d.idx}: Please select Serial No. for item {bold(d.item_code)}"
+			serialized = d.get("has_serial_no")
+			batched = d.get("has_batch_no")
+			no_serial_selected = not d.get("serial_no")
+			no_batch_selected = not d.get("batch_no")

-			elif d.get("has_batch_no") and not d.serial_and_batch_bundle:
-				error_msg = f"Row #{d.idx}: Please select Batch No. for item {bold(d.item_code)}"
+			msg = ""
+			item_code = frappe.bold(d.item_code)
+			serial_nos = get_serial_nos(d.serial_no)
+			if serialized and batched and (no_batch_selected or no_serial_selected):
+				msg = _(
+					"Row #{}: Please select a serial no and batch against item: {} or remove it to complete transaction."
+				).format(d.idx, item_code)
+			elif serialized and no_serial_selected:
+				msg = _(
+					"Row #{}: No serial number selected against item: {}. Please select one or remove it to complete transaction."
+				).format(d.idx, item_code)
+			elif batched and no_batch_selected:
+				msg = _(
+					"Row #{}: No batch selected against item: {}. Please select a batch or remove it to complete transaction."
+				).format(d.idx, item_code)
+			elif serialized and not no_serial_selected and len(serial_nos) != d.qty:
+				msg = _("Row #{}: You must select {} serial numbers for item {}.").format(
+					d.idx, frappe.bold(cint(d.qty)), item_code
+				)
+
+			if msg:
+				error_msg.append(msg)

 		if error_msg:
-			frappe.throw(error_msg, title=_("Serial / Batch Bundle Missing"), as_list=True)
+			frappe.throw(error_msg, title=_("Invalid Item"), as_list=True)

 	def validate_return_items_qty(self):
 		if not self.get("is_return"):
@@ -585,22 +674,18 @@ def get_bin_qty(item_code, warehouse):


 def get_pos_reserved_qty(item_code, warehouse):
-	p_inv = frappe.qb.DocType("POS Invoice")
-	p_item = frappe.qb.DocType("POS Invoice Item")
-
-	reserved_qty = (
-		frappe.qb.from_(p_inv)
-		.from_(p_item)
-		.select(Sum(p_item.qty).as_("qty"))
-		.where(
-			(p_inv.name == p_item.parent)
-			& (IfNull(p_inv.consolidated_invoice, "") == "")
-			& (p_inv.is_return == 0)
-			& (p_item.docstatus == 1)
-			& (p_item.item_code == item_code)
-			& (p_item.warehouse == warehouse)
-		)
-	).run(as_dict=True)
+	reserved_qty = frappe.db.sql(
+		"""select sum(p_item.stock_qty) as qty
+		from `tabPOS Invoice` p, `tabPOS Invoice Item` p_item
+		where p.name = p_item.parent
+		and ifnull(p.consolidated_invoice, '') = ''
+		and p_item.docstatus = 1
+		and p_item.item_code = %s
+		and p_item.warehouse = %s
+		""",
+		(item_code, warehouse),
+		as_dict=1,
+	)

 	return reserved_qty[0].qty or 0 if reserved_qty else 0

--- a/erpnext/accounts/doctype/pos_invoice/test_pos_invoice.py
+++ b/erpnext/accounts/doctype/pos_invoice/test_pos_invoice.py
@@ -5,18 +5,12 @@ import copy
 import unittest

 import frappe
-from frappe import _

 from erpnext.accounts.doctype.pos_invoice.pos_invoice import make_sales_return
 from erpnext.accounts.doctype.pos_profile.test_pos_profile import make_pos_profile
 from erpnext.accounts.doctype.sales_invoice.test_sales_invoice import create_sales_invoice
 from erpnext.stock.doctype.item.test_item import make_item
 from erpnext.stock.doctype.purchase_receipt.test_purchase_receipt import make_purchase_receipt
-from erpnext.stock.doctype.serial_and_batch_bundle.test_serial_and_batch_bundle import (
-	get_batch_from_bundle,
-	get_serial_nos_from_bundle,
-	make_serial_batch_bundle,
-)
 from erpnext.stock.doctype.stock_entry.stock_entry_utils import make_stock_entry


@@ -31,7 +25,7 @@ class TestPOSInvoice(unittest.TestCase):
 			frappe.set_user("Administrator")

 		if frappe.db.get_single_value("Selling Settings", "validate_selling_price"):
-			frappe.db.set_single_value("Selling Settings", "validate_selling_price", 0)
+			frappe.db.set_value("Selling Settings", None, "validate_selling_price", 0)

 	def test_timestamp_change(self):
 		w = create_pos_invoice(do_not_save=1)
@@ -255,7 +249,7 @@ class TestPOSInvoice(unittest.TestCase):
 			expense_account="Cost of Goods Sold - _TC",
 		)

-		serial_nos = get_serial_nos_from_bundle(se.get("items")[0].serial_and_batch_bundle)
+		serial_nos = get_serial_nos(se.get("items")[0].serial_no)

 		pos = create_pos_invoice(
 			company="_Test Company",
@@ -266,11 +260,11 @@ class TestPOSInvoice(unittest.TestCase):
 			expense_account="Cost of Goods Sold - _TC",
 			cost_center="Main - _TC",
 			item=se.get("items")[0].item_code,
-			serial_no=[serial_nos[0]],
 			rate=1000,
 			do_not_save=1,
 		)

+		pos.get("items")[0].serial_no = serial_nos[0]
 		pos.append(
 			"payments", {"mode_of_payment": "Cash", "account": "Cash - _TC", "amount": 1000, "default": 1}
 		)
@@ -282,9 +276,7 @@ class TestPOSInvoice(unittest.TestCase):

 		pos_return.insert()
 		pos_return.submit()
-		self.assertEqual(
-			get_serial_nos_from_bundle(pos_return.get("items")[0].serial_and_batch_bundle)[0], serial_nos[0]
-		)
+		self.assertEqual(pos_return.get("items")[0].serial_no, serial_nos[0])

 	def test_partial_pos_returns(self):
 		from erpnext.stock.doctype.serial_no.serial_no import get_serial_nos
@@ -297,7 +289,7 @@ class TestPOSInvoice(unittest.TestCase):
 			expense_account="Cost of Goods Sold - _TC",
 		)

-		serial_nos = get_serial_nos_from_bundle(se.get("items")[0].serial_and_batch_bundle)
+		serial_nos = get_serial_nos(se.get("items")[0].serial_no)

 		pos = create_pos_invoice(
 			company="_Test Company",
@@ -308,12 +300,12 @@ class TestPOSInvoice(unittest.TestCase):
 			expense_account="Cost of Goods Sold - _TC",
 			cost_center="Main - _TC",
 			item=se.get("items")[0].item_code,
-			serial_no=serial_nos,
 			qty=2,
 			rate=1000,
 			do_not_save=1,
 		)

+		pos.get("items")[0].serial_no = serial_nos[0] + "\n" + serial_nos[1]
 		pos.append(
 			"payments", {"mode_of_payment": "Cash", "account": "Cash - _TC", "amount": 1000, "default": 1}
 		)
@@ -325,27 +317,14 @@ class TestPOSInvoice(unittest.TestCase):

 		# partial return 1
 		pos_return1.get("items")[0].qty = -1
-
-		bundle_id = frappe.get_doc(
-			"Serial and Batch Bundle", pos_return1.get("items")[0].serial_and_batch_bundle
-		)
-
-		bundle_id.remove(bundle_id.entries[1])
-		bundle_id.save()
-
-		bundle_id.load_from_db()
-
-		serial_no = bundle_id.entries[0].serial_no
-		self.assertEqual(serial_no, serial_nos[0])
-
+		pos_return1.get("items")[0].serial_no = serial_nos[0]
 		pos_return1.insert()
 		pos_return1.submit()

 		# partial return 2
 		pos_return2 = make_sales_return(pos.name)
 		self.assertEqual(pos_return2.get("items")[0].qty, -1)
-		serial_no = get_serial_nos_from_bundle(pos_return2.get("items")[0].serial_and_batch_bundle)[0]
-		self.assertEqual(serial_no, serial_nos[1])
+		self.assertEqual(pos_return2.get("items")[0].serial_no, serial_nos[1])

 	def test_pos_change_amount(self):
 		pos = create_pos_invoice(
@@ -389,7 +368,7 @@ class TestPOSInvoice(unittest.TestCase):
 			expense_account="Cost of Goods Sold - _TC",
 		)

-		serial_nos = get_serial_nos_from_bundle(se.get("items")[0].serial_and_batch_bundle)
+		serial_nos = get_serial_nos(se.get("items")[0].serial_no)

 		pos = create_pos_invoice(
 			company="_Test Company",
@@ -401,10 +380,10 @@ class TestPOSInvoice(unittest.TestCase):
 			cost_center="Main - _TC",
 			item=se.get("items")[0].item_code,
 			rate=1000,
-			serial_no=[serial_nos[0]],
 			do_not_save=1,
 		)

+		pos.get("items")[0].serial_no = serial_nos[0]
 		pos.append(
 			"payments", {"mode_of_payment": "Bank Draft", "account": "_Test Bank - _TC", "amount": 1000}
 		)
@@ -422,10 +401,10 @@ class TestPOSInvoice(unittest.TestCase):
 			cost_center="Main - _TC",
 			item=se.get("items")[0].item_code,
 			rate=1000,
-			serial_no=[serial_nos[0]],
 			do_not_save=1,
 		)

+		pos2.get("items")[0].serial_no = serial_nos[0]
 		pos2.append(
 			"payments", {"mode_of_payment": "Bank Draft", "account": "_Test Bank - _TC", "amount": 1000}
 		)
@@ -444,7 +423,7 @@ class TestPOSInvoice(unittest.TestCase):
 			expense_account="Cost of Goods Sold - _TC",
 		)

-		serial_nos = get_serial_nos_from_bundle(se.get("items")[0].serial_and_batch_bundle)
+		serial_nos = get_serial_nos(se.get("items")[0].serial_no)

 		si = create_sales_invoice(
 			company="_Test Company",
@@ -456,11 +435,11 @@ class TestPOSInvoice(unittest.TestCase):
 			cost_center="Main - _TC",
 			item=se.get("items")[0].item_code,
 			rate=1000,
-			update_stock=1,
-			serial_no=[serial_nos[0]],
 			do_not_save=1,
 		)

+		si.get("items")[0].serial_no = serial_nos[0]
+		si.update_stock = 1
 		si.insert()
 		si.submit()

@@ -474,10 +453,10 @@ class TestPOSInvoice(unittest.TestCase):
 			cost_center="Main - _TC",
 			item=se.get("items")[0].item_code,
 			rate=1000,
-			serial_no=[serial_nos[0]],
 			do_not_save=1,
 		)

+		pos2.get("items")[0].serial_no = serial_nos[0]
 		pos2.append(
 			"payments", {"mode_of_payment": "Bank Draft", "account": "_Test Bank - _TC", "amount": 1000}
 		)
@@ -494,7 +473,7 @@ class TestPOSInvoice(unittest.TestCase):
 			cost_center="Main - _TC",
 			expense_account="Cost of Goods Sold - _TC",
 		)
-		serial_nos = get_serial_nos_from_bundle(se.get("items")[0].serial_and_batch_bundle)[0] + "wrong"
+		serial_nos = se.get("items")[0].serial_no + "wrong"

 		pos = create_pos_invoice(
 			company="_Test Company",
@@ -507,13 +486,14 @@ class TestPOSInvoice(unittest.TestCase):
 			item=se.get("items")[0].item_code,
 			rate=1000,
 			qty=2,
-			serial_nos=[serial_nos],
 			do_not_save=1,
 		)

 		pos.get("items")[0].has_serial_no = 1
+		pos.get("items")[0].serial_no = serial_nos
+		pos.insert()

-		self.assertRaises(frappe.ValidationError, pos.insert)
+		self.assertRaises(frappe.ValidationError, pos.submit)

 	def test_value_error_on_serial_no_validation(self):
 		from erpnext.stock.doctype.stock_entry.test_stock_entry import make_serialized_item
@@ -524,7 +504,7 @@ class TestPOSInvoice(unittest.TestCase):
 			cost_center="Main - _TC",
 			expense_account="Cost of Goods Sold - _TC",
 		)
-		serial_nos = get_serial_nos_from_bundle(se.get("items")[0].serial_and_batch_bundle)
+		serial_nos = se.get("items")[0].serial_no

 		# make a pos invoice
 		pos = create_pos_invoice(
@@ -537,11 +517,11 @@ class TestPOSInvoice(unittest.TestCase):
 			cost_center="Main - _TC",
 			item=se.get("items")[0].item_code,
 			rate=1000,
-			serial_no=[serial_nos[0]],
 			qty=1,
 			do_not_save=1,
 		)
 		pos.get("items")[0].has_serial_no = 1
+		pos.get("items")[0].serial_no = serial_nos.split("\n")[0]
 		pos.set("payments", [])
 		pos.append(
 			"payments", {"mode_of_payment": "Cash", "account": "Cash - _TC", "amount": 1000, "default": 1}
@@ -567,12 +547,12 @@ class TestPOSInvoice(unittest.TestCase):
 			cost_center="Main - _TC",
 			item=se.get("items")[0].item_code,
 			rate=1000,
-			serial_no=[serial_nos[0]],
 			qty=1,
 			do_not_save=1,
 		)

 		pos2.get("items")[0].has_serial_no = 1
+		pos2.get("items")[0].serial_no = serial_nos.split("\n")[0]
 		# Value error should not be triggered on validation
 		pos2.save()

@@ -722,7 +702,7 @@ class TestPOSInvoice(unittest.TestCase):
 		)

 		if not frappe.db.get_single_value("Selling Settings", "validate_selling_price"):
-			frappe.db.set_single_value("Selling Settings", "validate_selling_price", 1)
+			frappe.db.set_value("Selling Settings", "Selling Settings", "validate_selling_price", 1)

 		item = "Test Selling Price Validation"
 		make_item(item, {"is_stock_item": 1})
@@ -768,16 +748,16 @@ class TestPOSInvoice(unittest.TestCase):
 		self.assertEqual(rounded_total, 400)

 	def test_pos_batch_item_qty_validation(self):
-		from erpnext.stock.doctype.serial_and_batch_bundle.serial_and_batch_bundle import (
-			BatchNegativeStockError,
-		)
 		from erpnext.stock.doctype.stock_reconciliation.test_stock_reconciliation import (
 			create_batch_item_with_batch,
 		)
-		from erpnext.stock.serial_batch_bundle import SerialBatchCreation

 		create_batch_item_with_batch("_BATCH ITEM", "TestBatch 01")
 		item = frappe.get_doc("Item", "_BATCH ITEM")
+		batch = frappe.get_doc("Batch", "TestBatch 01")
+		batch.submit()
+		item.batch_no = "TestBatch 01"
+		item.save()

 		se = make_stock_entry(
 			target="_Test Warehouse - _TC",
@@ -787,28 +767,16 @@ class TestPOSInvoice(unittest.TestCase):
 			batch_no="TestBatch 01",
 		)

-		pos_inv1 = create_pos_invoice(
-			item=item.name, rate=300, qty=1, do_not_submit=1, batch_no="TestBatch 01"
-		)
+		pos_inv1 = create_pos_invoice(item=item.name, rate=300, qty=1, do_not_submit=1)
+		pos_inv1.items[0].batch_no = "TestBatch 01"
 		pos_inv1.save()
 		pos_inv1.submit()

 		pos_inv2 = create_pos_invoice(item=item.name, rate=300, qty=2, do_not_submit=1)
+		pos_inv2.items[0].batch_no = "TestBatch 01"
+		pos_inv2.save()

-		sn_doc = SerialBatchCreation(
-			{
-				"item_code": item.name,
-				"warehouse": pos_inv2.items[0].warehouse,
-				"voucher_type": "Delivery Note",
-				"qty": 2,
-				"avg_rate": 300,
-				"batches": frappe._dict({"TestBatch 01": 2}),
-				"type_of_transaction": "Outward",
-				"company": pos_inv2.company,
-			}
-		)
-
-		self.assertRaises(BatchNegativeStockError, sn_doc.make_serial_and_batch_bundle)
+		self.assertRaises(frappe.ValidationError, pos_inv2.submit)

 		# teardown
 		pos_inv1.reload()
@@ -817,6 +785,9 @@ class TestPOSInvoice(unittest.TestCase):
 		pos_inv2.reload()
 		pos_inv2.delete()
 		se.cancel()
+		batch.reload()
+		batch.cancel()
+		batch.delete()

 	def test_ignore_pricing_rule(self):
 		from erpnext.accounts.doctype.pricing_rule.test_pricing_rule import make_pricing_rule
@@ -867,18 +838,18 @@ class TestPOSInvoice(unittest.TestCase):
 		frappe.db.savepoint("before_test_delivered_serial_no_case")
 		try:
 			se = make_serialized_item()
-			serial_no = get_serial_nos_from_bundle(se.get("items")[0].serial_and_batch_bundle)[0]
+			serial_no = get_serial_nos(se.get("items")[0].serial_no)[0]

-			dn = create_delivery_note(item_code="_Test Serialized Item With Series", serial_no=[serial_no])
-			delivered_serial_no = get_serial_nos_from_bundle(dn.get("items")[0].serial_and_batch_bundle)[0]
+			dn = create_delivery_note(item_code="_Test Serialized Item With Series", serial_no=serial_no)

-			self.assertEqual(serial_no, delivered_serial_no)
+			delivery_document_no = frappe.db.get_value("Serial No", serial_no, "delivery_document_no")
+			self.assertEquals(delivery_document_no, dn.name)

 			init_user_and_profile()

 			pos_inv = create_pos_invoice(
 				item_code="_Test Serialized Item With Series",
-				serial_no=[serial_no],
+				serial_no=serial_no,
 				qty=1,
 				rate=100,
 				do_not_submit=True,
@@ -890,6 +861,42 @@ class TestPOSInvoice(unittest.TestCase):
 			frappe.db.rollback(save_point="before_test_delivered_serial_no_case")
 			frappe.set_user("Administrator")

+	def test_returned_serial_no_case(self):
+		from erpnext.accounts.doctype.pos_invoice_merge_log.test_pos_invoice_merge_log import (
+			init_user_and_profile,
+		)
+		from erpnext.stock.doctype.serial_no.serial_no import get_pos_reserved_serial_nos
+		from erpnext.stock.doctype.serial_no.test_serial_no import get_serial_nos
+		from erpnext.stock.doctype.stock_entry.test_stock_entry import make_serialized_item
+
+		frappe.db.savepoint("before_test_returned_serial_no_case")
+		try:
+			se = make_serialized_item()
+			serial_no = get_serial_nos(se.get("items")[0].serial_no)[0]
+
+			init_user_and_profile()
+
+			pos_inv = create_pos_invoice(
+				item_code="_Test Serialized Item With Series",
+				serial_no=serial_no,
+				qty=1,
+				rate=100,
+			)
+
+			pos_return = make_sales_return(pos_inv.name)
+			pos_return.flags.ignore_validate = True
+			pos_return.insert()
+			pos_return.submit()
+
+			pos_reserved_serial_nos = get_pos_reserved_serial_nos(
+				{"item_code": "_Test Serialized Item With Series", "warehouse": "_Test Warehouse - _TC"}
+			)
+			self.assertTrue(serial_no not in pos_reserved_serial_nos)
+
+		finally:
+			frappe.db.rollback(save_point="before_test_returned_serial_no_case")
+			frappe.set_user("Administrator")
+

 def create_pos_invoice(**args):
 	args = frappe._dict(args)
@@ -919,40 +926,6 @@ def create_pos_invoice(**args):

 	pos_inv.set_missing_values()

-	bundle_id = None
-	if args.get("batch_no") or args.get("serial_no"):
-		type_of_transaction = args.type_of_transaction or "Outward"
-
-		if pos_inv.is_return:
-			type_of_transaction = "Inward"
-
-		qty = args.get("qty") or 1
-		qty *= -1 if type_of_transaction == "Outward" else 1
-		batches = {}
-		if args.get("batch_no"):
-			batches = frappe._dict({args.batch_no: qty})
-
-		bundle_id = make_serial_batch_bundle(
-			frappe._dict(
-				{
-					"item_code": args.item or args.item_code or "_Test Item",
-					"warehouse": args.warehouse or "_Test Warehouse - _TC",
-					"qty": qty,
-					"batches": batches,
-					"voucher_type": "Delivery Note",
-					"serial_nos": args.serial_no,
-					"posting_date": pos_inv.posting_date,
-					"posting_time": pos_inv.posting_time,
-					"type_of_transaction": type_of_transaction,
-					"do_not_submit": True,
-				}
-			)
-		).name
-
-		if not bundle_id:
-			msg = f"Serial No {args.serial_no} not available for Item {args.item}"
-			frappe.throw(_(msg))
-
 	pos_inv.append(
 		"items",
 		{
@@ -963,7 +936,8 @@ def create_pos_invoice(**args):
 			"income_account": args.income_account or "Sales - _TC",
 			"expense_account": args.expense_account or "Cost of Goods Sold - _TC",
 			"cost_center": args.cost_center or "_Test Cost Center - _TC",
-			"serial_and_batch_bundle": bundle_id,
+			"serial_no": args.serial_no,
+			"batch_no": args.batch_no,
 		},
 	)

--- a/erpnext/accounts/doctype/pos_invoice_item/pos_invoice_item.json
+++ b/erpnext/accounts/doctype/pos_invoice_item/pos_invoice_item.json
@@ -79,7 +79,6 @@
  "warehouse",
  "target_warehouse",
  "quality_inspection",
-  "serial_and_batch_bundle",
  "batch_no",
  "col_break5",
  "allow_zero_valuation_rate",
@@ -629,11 +628,10 @@
  {
   "fieldname": "batch_no",
   "fieldtype": "Link",
-   "hidden": 1,
+   "in_list_view": 1,
   "label": "Batch No",
   "options": "Batch",
-   "print_hide": 1,
-   "read_only": 1
+   "print_hide": 1
  },
  {
   "fieldname": "col_break5",
@@ -650,12 +648,10 @@
  {
   "fieldname": "serial_no",
   "fieldtype": "Small Text",
-   "hidden": 1,
   "in_list_view": 1,
   "label": "Serial No",
   "oldfieldname": "serial_no",
-   "oldfieldtype": "Small Text",
-   "read_only": 1
+   "oldfieldtype": "Small Text"
  },
  {
   "fieldname": "item_tax_rate",
@@ -821,19 +817,11 @@
   "fieldtype": "Check",
   "label": "Has Item Scanned",
   "read_only": 1
-  },
-  {
-   "fieldname": "serial_and_batch_bundle",
-   "fieldtype": "Link",
-   "label": "Serial and Batch Bundle",
-   "no_copy": 1,
-   "options": "Serial and Batch Bundle",
-   "print_hide": 1
  }
 ],
 "istable": 1,
 "links": [],
- "modified": "2023-03-12 13:36:40.160468",
+ "modified": "2022-11-02 12:52:39.125295",
 "modified_by": "Administrator",
 "module": "Accounts",
 "name": "POS Invoice Item",
--- a/erpnext/accounts/doctype/pos_invoice_merge_log/pos_invoice_merge_log.py
+++ b/erpnext/accounts/doctype/pos_invoice_merge_log/pos_invoice_merge_log.py
@@ -9,7 +9,7 @@ from frappe import _
 from frappe.model.document import Document
 from frappe.model.mapper import map_child_doc, map_doc
 from frappe.utils import cint, flt, get_time, getdate, nowdate, nowtime
-from frappe.utils.background_jobs import enqueue, is_job_enqueued
+from frappe.utils.background_jobs import enqueue, is_job_queued
 from frappe.utils.scheduler import is_scheduler_inactive


@@ -17,22 +17,6 @@ class POSInvoiceMergeLog(Document):
 	def validate(self):
 		self.validate_customer()
 		self.validate_pos_invoice_status()
-		self.validate_duplicate_pos_invoices()
-
-	def validate_duplicate_pos_invoices(self):
-		pos_occurences = {}
-		for idx, inv in enumerate(self.pos_invoices, 1):
-			pos_occurences.setdefault(inv.pos_invoice, []).append(idx)
-
-		error_list = []
-		for key, value in pos_occurences.items():
-			if len(value) > 1:
-				error_list.append(
-					_("{} is added multiple times on rows: {}".format(frappe.bold(key), frappe.bold(value)))
-				)
-
-		if error_list:
-			frappe.throw(error_list, title=_("Duplicate POS Invoices found"), as_list=True)

 	def validate_customer(self):
 		if self.merge_invoices_based_on == "Customer Group":
@@ -184,8 +168,6 @@ class POSInvoiceMergeLog(Document):
 					item.base_amount = item.base_net_amount
 					item.price_list_rate = 0
 					si_item = map_child_doc(item, invoice, {"doctype": "Sales Invoice Item"})
-					if item.serial_and_batch_bundle:
-						si_item.serial_and_batch_bundle = item.serial_and_batch_bundle
 					items.append(si_item)

 			for tax in doc.get("taxes"):
@@ -387,7 +369,7 @@ def split_invoices(invoices):
 	]
 	for pos_invoice in pos_return_docs:
 		for item in pos_invoice.items:
-			if not item.serial_no and not item.serial_and_batch_bundle:
+			if not item.serial_no:
 				continue

 			return_against_is_added = any(
@@ -443,8 +425,6 @@ def create_merge_logs(invoice_by_customer, closing_entry=None):

 		if closing_entry:
 			closing_entry.set_status(update=True, status="Failed")
-			if type(error_message) == list:
-				error_message = frappe.json.dumps(error_message)
 			closing_entry.db_set("error_message", error_message)
 		raise

@@ -485,15 +465,15 @@ def enqueue_job(job, **kwargs):

 	closing_entry = kwargs.get("closing_entry") or {}

-	job_id = "pos_invoice_merge::" + str(closing_entry.get("name"))
-	if not is_job_enqueued(job_id):
+	job_name = closing_entry.get("name")
+	if not is_job_queued(job_name):
 		enqueue(
 			job,
 			**kwargs,
 			queue="long",
 			timeout=10000,
 			event="processing_merge_logs",
-			job_id=job_id,
+			job_name=job_name,
 			now=frappe.conf.developer_mode or frappe.flags.in_test
 		)

--- a/erpnext/accounts/doctype/pos_invoice_merge_log/test_pos_invoice_merge_log.py
+++ b/erpnext/accounts/doctype/pos_invoice_merge_log/test_pos_invoice_merge_log.py
@@ -13,9 +13,6 @@ from erpnext.accounts.doctype.pos_invoice.test_pos_invoice import create_pos_inv
 from erpnext.accounts.doctype.pos_invoice_merge_log.pos_invoice_merge_log import (
 	consolidate_pos_invoices,
 )
-from erpnext.stock.doctype.serial_and_batch_bundle.test_serial_and_batch_bundle import (
-	get_serial_nos_from_bundle,
-)
 from erpnext.stock.doctype.stock_entry.stock_entry_utils import make_stock_entry


@@ -413,13 +410,13 @@ class TestPOSInvoiceMergeLog(unittest.TestCase):

 		try:
 			se = make_serialized_item()
-			serial_no = get_serial_nos_from_bundle(se.get("items")[0].serial_and_batch_bundle)[0]
+			serial_no = get_serial_nos(se.get("items")[0].serial_no)[0]

 			init_user_and_profile()

 			pos_inv = create_pos_invoice(
 				item_code="_Test Serialized Item With Series",
-				serial_no=[serial_no],
+				serial_no=serial_no,
 				qty=1,
 				rate=100,
 				do_not_submit=1,
@@ -433,7 +430,7 @@ class TestPOSInvoiceMergeLog(unittest.TestCase):

 			pos_inv2 = create_pos_invoice(
 				item_code="_Test Serialized Item With Series",
-				serial_no=[serial_no],
+				serial_no=serial_no,
 				qty=1,
 				rate=100,
 				do_not_submit=1,
--- a/erpnext/accounts/doctype/pricing_rule/pricing_rule.json
+++ b/erpnext/accounts/doctype/pricing_rule/pricing_rule.json
@@ -469,7 +469,7 @@
   "options": "UOM"
  },
  {
-   "description": "If rate is zero then item will be treated as \"Free Item\"",
+   "description": "If rate is zero them item will be treated as \"Free Item\"",
   "fieldname": "free_item_rate",
   "fieldtype": "Currency",
   "label": "Free Item Rate"
@@ -670,4 +670,4 @@
 "sort_order": "DESC",
 "states": [],
 "title_field": "title"
-}
+}
--- a/erpnext/accounts/doctype/pricing_rule/pricing_rule.py
+++ b/erpnext/accounts/doctype/pricing_rule/pricing_rule.py
@@ -237,6 +237,10 @@ def apply_pricing_rule(args, doc=None):
 	item_list = args.get("items")
 	args.pop("items")

+	set_serial_nos_based_on_fifo = frappe.db.get_single_value(
+		"Stock Settings", "automatically_set_serial_nos_based_on_fifo"
+	)
+
 	item_code_list = tuple(item.get("item_code") for item in item_list)
 	query_items = frappe.get_all(
 		"Item",
@@ -254,9 +258,28 @@ def apply_pricing_rule(args, doc=None):
 		data = get_pricing_rule_for_item(args_copy, doc=doc)
 		out.append(data)

+		if (
+			serialized_items.get(item.get("item_code"))
+			and not item.get("serial_no")
+			and set_serial_nos_based_on_fifo
+			and not args.get("is_return")
+		):
+			out[0].update(get_serial_no_for_item(args_copy))
+
 	return out


+def get_serial_no_for_item(args):
+	from erpnext.stock.get_item_details import get_serial_no
+
+	item_details = frappe._dict(
+		{"doctype": args.doctype, "name": args.name, "serial_no": args.serial_no}
+	)
+	if args.get("parenttype") in ("Sales Invoice", "Delivery Note") and flt(args.stock_qty) > 0:
+		item_details.serial_no = get_serial_no(args)
+	return item_details
+
+
 def update_pricing_rule_uom(pricing_rule, args):
 	child_doc = {"Item Code": "items", "Item Group": "item_groups", "Brand": "brands"}.get(
 		pricing_rule.apply_on
--- a/erpnext/accounts/doctype/process_payment_reconciliation/process_payment_reconciliation.js
+++ b/erpnext/accounts/doctype/process_payment_reconciliation/process_payment_reconciliation.js
@@ -1,130 +0,0 @@
-// Copyright (c) 2023, Frappe Technologies Pvt. Ltd. and contributors
-// For license information, please see license.txt
-
-frappe.ui.form.on("Process Payment Reconciliation", {
-	onload: function(frm) {
-		// set queries
-		frm.set_query("party_type", function() {
-			return {
-				"filters": {
-					"name": ["in", Object.keys(frappe.boot.party_account_types)],
-				}
-			}
-		});
-		frm.set_query('receivable_payable_account',  function(doc) {
-			return {
-				filters: {
-					"company": doc.company,
-					"is_group": 0,
-					"account_type": frappe.boot.party_account_types[doc.party_type]
-				}
-			};
-		});
-		frm.set_query('cost_center', function(doc) {
-			return {
-				filters: {
-					"company": doc.company,
-					"is_group": 0,
-				}
-			};
-		});
-		frm.set_query('bank_cash_account', function(doc) {
-			return {
-				filters:[
-					['Account', 'company', '=', doc.company],
-					['Account', 'is_group', '=', 0],
-					['Account', 'account_type', 'in', ['Bank', 'Cash']]
-				]
-			};
-		});
-
-	},
-	refresh: function(frm) {
-		if (frm.doc.docstatus==1 && ['Queued', 'Paused'].find(x => x == frm.doc.status)) {
-			let execute_btn = __("Start / Resume")
-
-			frm.add_custom_button(execute_btn, () => {
-				frm.call({
-					method: 'erpnext.accounts.doctype.process_payment_reconciliation.process_payment_reconciliation.trigger_job_for_doc',
-					args: {
-						docname: frm.doc.name
-					}
-				}).then(r => {
-					if(!r.exc) {
-						frappe.show_alert(__("Job Started"));
-						frm.reload_doc();
-					}
-				});
-			});
-		}
-		if (frm.doc.docstatus==1 && ['Completed', 'Running', 'Paused', 'Partially Reconciled'].find(x => x == frm.doc.status)) {
-			frm.call({
-				'method': "erpnext.accounts.doctype.process_payment_reconciliation.process_payment_reconciliation.get_reconciled_count",
-				args: {
-					"docname": frm.docname,
-				}
-			}).then(r => {
-				if (r.message) {
-					let progress = 0;
-					let description = "";
-
-					if (r.message.processed) {
-						progress = (r.message.processed/r.message.total) * 100;
-						description = r.message.processed + "/" + r.message.total +  " processed";
-					} else if (r.message.total == 0 && frm.doc.status == "Completed") {
-						progress = 100;
-					}
-
-
-					frm.dashboard.add_progress('Reconciliation Progress', progress, description);
-				}
-			})
-		}
-		if (frm.doc.docstatus==1 && frm.doc.status == 'Running') {
-			let execute_btn = __("Pause")
-
-			frm.add_custom_button(execute_btn, () => {
-				frm.call({
-					'method': "erpnext.accounts.doctype.process_payment_reconciliation.process_payment_reconciliation.pause_job_for_doc",
-					args: {
-						"docname": frm.docname,
-					}
-				}).then(r => {
-					if (!r.exc) {
-						frappe.show_alert(__("Job Paused"));
-						frm.reload_doc()
-					}
-				});
-
-			});
-		}
-	},
-	company(frm) {
-		frm.set_value('party', '');
-		frm.set_value('receivable_payable_account', '');
-	},
-	party_type(frm) {
-		frm.set_value('party', '');
-	},
-
-	party(frm) {
-		frm.set_value('receivable_payable_account', '');
-		if (!frm.doc.receivable_payable_account && frm.doc.party_type && frm.doc.party) {
-			return frappe.call({
-				method: "erpnext.accounts.party.get_party_account",
-				args: {
-					company: frm.doc.company,
-					party_type: frm.doc.party_type,
-					party: frm.doc.party
-				},
-				callback: (r) => {
-					if (!r.exc && r.message) {
-						frm.set_value("receivable_payable_account", r.message);
-					}
-					frm.refresh();
-
-				}
-			});
-		}
-	}
-});
--- a/erpnext/accounts/doctype/process_payment_reconciliation/process_payment_reconciliation.json
+++ b/erpnext/accounts/doctype/process_payment_reconciliation/process_payment_reconciliation.json
@@ -1,173 +0,0 @@
-{
- "actions": [],
- "autoname": "format:ACC-PPR-{#####}",
- "beta": 1,
- "creation": "2023-03-30 21:28:39.793927",
- "default_view": "List",
- "doctype": "DocType",
- "editable_grid": 1,
- "engine": "InnoDB",
- "field_order": [
-  "company",
-  "party_type",
-  "column_break_io6c",
-  "party",
-  "receivable_payable_account",
-  "filter_section",
-  "from_invoice_date",
-  "to_invoice_date",
-  "column_break_kegk",
-  "from_payment_date",
-  "to_payment_date",
-  "column_break_uj04",
-  "cost_center",
-  "bank_cash_account",
-  "section_break_2n02",
-  "status",
-  "error_log",
-  "section_break_a8yx",
-  "amended_from"
- ],
- "fields": [
-  {
-   "allow_on_submit": 1,
-   "fieldname": "status",
-   "fieldtype": "Select",
-   "label": "Status",
-   "options": "\nQueued\nRunning\nPaused\nCompleted\nPartially Reconciled\nFailed\nCancelled",
-   "read_only": 1
-  },
-  {
-   "fieldname": "company",
-   "fieldtype": "Link",
-   "in_list_view": 1,
-   "label": "Company",
-   "options": "Company",
-   "reqd": 1
-  },
-  {
-   "fieldname": "party_type",
-   "fieldtype": "Link",
-   "in_list_view": 1,
-   "label": "Party Type",
-   "options": "DocType",
-   "reqd": 1
-  },
-  {
-   "fieldname": "column_break_io6c",
-   "fieldtype": "Column Break"
-  },
-  {
-   "fieldname": "party",
-   "fieldtype": "Dynamic Link",
-   "in_list_view": 1,
-   "label": "Party",
-   "options": "party_type",
-   "reqd": 1
-  },
-  {
-   "fieldname": "receivable_payable_account",
-   "fieldtype": "Link",
-   "in_list_view": 1,
-   "label": "Receivable/Payable Account",
-   "options": "Account",
-   "reqd": 1
-  },
-  {
-   "fieldname": "filter_section",
-   "fieldtype": "Section Break",
-   "label": "Filters"
-  },
-  {
-   "fieldname": "from_invoice_date",
-   "fieldtype": "Date",
-   "label": "From Invoice Date"
-  },
-  {
-   "fieldname": "to_invoice_date",
-   "fieldtype": "Date",
-   "label": "To Invoice Date"
-  },
-  {
-   "fieldname": "column_break_kegk",
-   "fieldtype": "Column Break"
-  },
-  {
-   "fieldname": "from_payment_date",
-   "fieldtype": "Date",
-   "label": "From Payment Date"
-  },
-  {
-   "fieldname": "to_payment_date",
-   "fieldtype": "Date",
-   "label": "To Payment Date"
-  },
-  {
-   "fieldname": "column_break_uj04",
-   "fieldtype": "Column Break"
-  },
-  {
-   "fieldname": "cost_center",
-   "fieldtype": "Link",
-   "label": "Cost Center",
-   "options": "Cost Center"
-  },
-  {
-   "fieldname": "bank_cash_account",
-   "fieldtype": "Link",
-   "label": "Bank/Cash Account",
-   "options": "Account"
-  },
-  {
-   "fieldname": "section_break_2n02",
-   "fieldtype": "Section Break",
-   "label": "Status"
-  },
-  {
-   "depends_on": "eval:doc.error_log",
-   "fieldname": "error_log",
-   "fieldtype": "Long Text",
-   "label": "Error Log"
-  },
-  {
-   "fieldname": "amended_from",
-   "fieldtype": "Link",
-   "label": "Amended From",
-   "no_copy": 1,
-   "options": "Process Payment Reconciliation",
-   "print_hide": 1,
-   "read_only": 1
-  },
-  {
-   "fieldname": "section_break_a8yx",
-   "fieldtype": "Section Break"
-  }
- ],
- "index_web_pages_for_search": 1,
- "is_submittable": 1,
- "links": [],
- "modified": "2023-04-21 17:19:30.912953",
- "modified_by": "Administrator",
- "module": "Accounts",
- "name": "Process Payment Reconciliation",
- "naming_rule": "Expression",
- "owner": "Administrator",
- "permissions": [
-  {
-   "create": 1,
-   "delete": 1,
-   "email": 1,
-   "export": 1,
-   "print": 1,
-   "read": 1,
-   "report": 1,
-   "role": "System Manager",
-   "share": 1,
-   "write": 1
-  }
- ],
- "sort_field": "modified",
- "sort_order": "DESC",
- "states": [],
- "title_field": "company"
-}
--- a/erpnext/accounts/doctype/process_payment_reconciliation/process_payment_reconciliation.py
+++ b/erpnext/accounts/doctype/process_payment_reconciliation/process_payment_reconciliation.py
@@ -1,503 +0,0 @@
-# Copyright (c) 2023, Frappe Technologies Pvt. Ltd. and contributors
-# For license information, please see license.txt
-
-import frappe
-from frappe import _, qb
-from frappe.model.document import Document
-from frappe.utils import get_link_to_form
-from frappe.utils.scheduler import is_scheduler_inactive
-
-
-class ProcessPaymentReconciliation(Document):
-	def validate(self):
-		self.validate_receivable_payable_account()
-		self.validate_bank_cash_account()
-
-	def validate_receivable_payable_account(self):
-		if self.receivable_payable_account:
-			if self.company != frappe.db.get_value("Account", self.receivable_payable_account, "company"):
-				frappe.throw(
-					_("Receivable/Payable Account: {0} doesn't belong to company {1}").format(
-						frappe.bold(self.receivable_payable_account), frappe.bold(self.company)
-					)
-				)
-
-	def validate_bank_cash_account(self):
-		if self.bank_cash_account:
-			if self.company != frappe.db.get_value("Account", self.bank_cash_account, "company"):
-				frappe.throw(
-					_("Bank/Cash Account {0} doesn't belong to company {1}").format(
-						frappe.bold(self.bank_cash_account), frappe.bold(self.company)
-					)
-				)
-
-	def before_save(self):
-		self.status = ""
-		self.error_log = ""
-
-	def on_submit(self):
-		self.db_set("status", "Queued")
-		self.db_set("error_log", None)
-
-	def on_cancel(self):
-		self.db_set("status", "Cancelled")
-		log = frappe.db.get_value(
-			"Process Payment Reconciliation Log", filters={"process_pr": self.name}
-		)
-		if log:
-			frappe.db.set_value("Process Payment Reconciliation Log", log, "status", "Cancelled")
-
-
-@frappe.whitelist()
-def get_reconciled_count(docname: str | None = None) -> float:
-	current_status = {}
-	if docname:
-		reconcile_log = frappe.db.get_value(
-			"Process Payment Reconciliation Log", filters={"process_pr": docname}, fieldname="name"
-		)
-		if reconcile_log:
-			res = frappe.get_all(
-				"Process Payment Reconciliation Log",
-				filters={"name": reconcile_log},
-				fields=["reconciled_entries", "total_allocations"],
-				as_list=1,
-			)
-			current_status["processed"], current_status["total"] = res[0]
-
-	return current_status
-
-
-def get_pr_instance(doc: str):
-	process_payment_reconciliation = frappe.get_doc("Process Payment Reconciliation", doc)
-
-	pr = frappe.get_doc("Payment Reconciliation")
-	fields = [
-		"company",
-		"party_type",
-		"party",
-		"receivable_payable_account",
-		"from_invoice_date",
-		"to_invoice_date",
-		"from_payment_date",
-		"to_payment_date",
-	]
-	d = {}
-	for field in fields:
-		d[field] = process_payment_reconciliation.get(field)
-	pr.update(d)
-	pr.invoice_limit = 1000
-	pr.payment_limit = 1000
-	return pr
-
-
-def is_job_running(job_name: str) -> bool:
-	jobs = frappe.db.get_all("RQ Job", filters={"status": ["in", ["started", "queued"]]})
-	for x in jobs:
-		if x.job_name == job_name:
-			return True
-	return False
-
-
-@frappe.whitelist()
-def pause_job_for_doc(docname: str | None = None):
-	if docname:
-		frappe.db.set_value("Process Payment Reconciliation", docname, "status", "Paused")
-		log = frappe.db.get_value("Process Payment Reconciliation Log", filters={"process_pr": docname})
-		if log:
-			frappe.db.set_value("Process Payment Reconciliation Log", log, "status", "Paused")
-
-
-@frappe.whitelist()
-def trigger_job_for_doc(docname: str | None = None):
-	"""
-	Trigger background job
-	"""
-	if not docname:
-		return
-
-	if not frappe.db.get_single_value("Accounts Settings", "auto_reconcile_payments"):
-		frappe.throw(
-			_("Auto Reconciliation of Payments has been disabled. Enable it through {0}").format(
-				get_link_to_form("Accounts Settings", "Accounts Settings")
-			)
-		)
-
-		return
-
-	if not is_scheduler_inactive():
-		if frappe.db.get_value("Process Payment Reconciliation", docname, "status") == "Queued":
-			frappe.db.set_value("Process Payment Reconciliation", docname, "status", "Running")
-			job_name = f"start_processing_{docname}"
-			if not is_job_running(job_name):
-				job = frappe.enqueue(
-					method="erpnext.accounts.doctype.process_payment_reconciliation.process_payment_reconciliation.reconcile_based_on_filters",
-					queue="long",
-					is_async=True,
-					job_name=job_name,
-					enqueue_after_commit=True,
-					doc=docname,
-				)
-
-		elif frappe.db.get_value("Process Payment Reconciliation", docname, "status") == "Paused":
-			frappe.db.set_value("Process Payment Reconciliation", docname, "status", "Running")
-			log = frappe.db.get_value("Process Payment Reconciliation Log", filters={"process_pr": docname})
-			if log:
-				frappe.db.set_value("Process Payment Reconciliation Log", log, "status", "Running")
-
-			# Resume tasks for running doc
-			job_name = f"start_processing_{docname}"
-			if not is_job_running(job_name):
-				job = frappe.enqueue(
-					method="erpnext.accounts.doctype.process_payment_reconciliation.process_payment_reconciliation.reconcile_based_on_filters",
-					queue="long",
-					is_async=True,
-					job_name=job_name,
-					doc=docname,
-				)
-	else:
-		frappe.msgprint(_("Scheduler is Inactive. Can't trigger job now."))
-
-
-def trigger_reconciliation_for_queued_docs():
-	"""
-	Will be called from Cron Job
-	Fetch queued docs and start reconciliation process for each one
-	"""
-	if not frappe.db.get_single_value("Accounts Settings", "auto_reconcile_payments"):
-		frappe.msgprint(
-			_("Auto Reconciliation of Payments has been disabled. Enable it through {0}").format(
-				get_link_to_form("Accounts Settings", "Accounts Settings")
-			)
-		)
-
-		return
-
-	if not is_scheduler_inactive():
-		# Get all queued documents
-		all_queued = frappe.db.get_all(
-			"Process Payment Reconciliation",
-			filters={"docstatus": 1, "status": "Queued"},
-			order_by="creation desc",
-			as_list=1,
-		)
-
-		docs_to_trigger = []
-		unique_filters = set()
-		queue_size = 5
-
-		fields = ["company", "party_type", "party", "receivable_payable_account"]
-
-		def get_filters_as_tuple(fields, doc):
-			filters = ()
-			for x in fields:
-				filters += tuple(doc.get(x))
-			return filters
-
-		for x in all_queued:
-			doc = frappe.get_doc("Process Payment Reconciliation", x)
-			filters = get_filters_as_tuple(fields, doc)
-			if filters not in unique_filters:
-				unique_filters.add(filters)
-				docs_to_trigger.append(doc.name)
-			if len(docs_to_trigger) == queue_size:
-				break
-
-		# trigger reconcilation process for queue_size unique filters
-		for doc in docs_to_trigger:
-			trigger_job_for_doc(doc)
-
-	else:
-		frappe.msgprint(_("Scheduler is Inactive. Can't trigger jobs now."))
-
-
-def reconcile_based_on_filters(doc: None | str = None) -> None:
-	"""
-	Identify current state of document and execute next tasks in background
-	"""
-	if doc:
-		log = frappe.db.get_value("Process Payment Reconciliation Log", filters={"process_pr": doc})
-		if not log:
-			log = frappe.new_doc("Process Payment Reconciliation Log")
-			log.process_pr = doc
-			log.status = "Running"
-			log = log.save()
-
-			job_name = f"process_{doc}_fetch_and_allocate"
-			if not is_job_running(job_name):
-				job = frappe.enqueue(
-					method="erpnext.accounts.doctype.process_payment_reconciliation.process_payment_reconciliation.fetch_and_allocate",
-					queue="long",
-					timeout="3600",
-					is_async=True,
-					job_name=job_name,
-					enqueue_after_commit=True,
-					doc=doc,
-				)
-		else:
-			res = frappe.get_all(
-				"Process Payment Reconciliation Log",
-				filters={"name": log},
-				fields=["allocated", "reconciled"],
-				as_list=1,
-			)
-			allocated, reconciled = res[0]
-
-			if not allocated:
-				job_name = f"process__{doc}_fetch_and_allocate"
-				if not is_job_running(job_name):
-					job = frappe.enqueue(
-						method="erpnext.accounts.doctype.process_payment_reconciliation.process_payment_reconciliation.fetch_and_allocate",
-						queue="long",
-						timeout="3600",
-						is_async=True,
-						job_name=job_name,
-						enqueue_after_commit=True,
-						doc=doc,
-					)
-			elif not reconciled:
-				allocation = get_next_allocation(log)
-				if allocation:
-					reconcile_job_name = (
-						f"process_{doc}_reconcile_allocation_{allocation[0].idx}_{allocation[-1].idx}"
-					)
-				else:
-					reconcile_job_name = f"process_{doc}_reconcile"
-				if not is_job_running(reconcile_job_name):
-					job = frappe.enqueue(
-						method="erpnext.accounts.doctype.process_payment_reconciliation.process_payment_reconciliation.reconcile",
-						queue="long",
-						timeout="3600",
-						is_async=True,
-						job_name=reconcile_job_name,
-						enqueue_after_commit=True,
-						doc=doc,
-					)
-			elif reconciled:
-				frappe.db.set_value("Process Payment Reconciliation", doc, "status", "Completed")
-
-
-def get_next_allocation(log: str) -> list:
-	if log:
-		allocations = []
-		next = frappe.db.get_all(
-			"Process Payment Reconciliation Log Allocations",
-			filters={"parent": log, "reconciled": 0},
-			fields=["reference_type", "reference_name"],
-			order_by="idx",
-			limit=1,
-		)
-
-		if next:
-			allocations = frappe.db.get_all(
-				"Process Payment Reconciliation Log Allocations",
-				filters={
-					"parent": log,
-					"reconciled": 0,
-					"reference_type": next[0].reference_type,
-					"reference_name": next[0].reference_name,
-				},
-				fields=["*"],
-				order_by="idx",
-			)
-
-		return allocations
-	return []
-
-
-def fetch_and_allocate(doc: str) -> None:
-	"""
-	Fetch Invoices and Payments based on filters applied. FIFO ordering is used for allocation.
-	"""
-
-	if doc:
-		log = frappe.db.get_value("Process Payment Reconciliation Log", filters={"process_pr": doc})
-		if log:
-			if not frappe.db.get_value("Process Payment Reconciliation Log", log, "allocated"):
-				reconcile_log = frappe.get_doc("Process Payment Reconciliation Log", log)
-
-				pr = get_pr_instance(doc)
-				pr.get_unreconciled_entries()
-
-				if len(pr.invoices) > 0 and len(pr.payments) > 0:
-					invoices = [x.as_dict() for x in pr.invoices]
-					payments = [x.as_dict() for x in pr.payments]
-					pr.allocate_entries(frappe._dict({"invoices": invoices, "payments": payments}))
-
-					for x in pr.get("allocation"):
-						reconcile_log.append(
-							"allocations",
-							x.as_dict().update(
-								{
-									"parenttype": "Process Payment Reconciliation Log",
-									"parent": reconcile_log.name,
-									"name": None,
-									"reconciled": False,
-								}
-							),
-						)
-				reconcile_log.allocated = True
-				reconcile_log.total_allocations = len(reconcile_log.get("allocations"))
-				reconcile_log.reconciled_entries = 0
-				reconcile_log.save()
-
-				# generate reconcile job name
-				allocation = get_next_allocation(log)
-				if allocation:
-					reconcile_job_name = (
-						f"process_{doc}_reconcile_allocation_{allocation[0].idx}_{allocation[-1].idx}"
-					)
-				else:
-					reconcile_job_name = f"process_{doc}_reconcile"
-
-				if not is_job_running(reconcile_job_name):
-					job = frappe.enqueue(
-						method="erpnext.accounts.doctype.process_payment_reconciliation.process_payment_reconciliation.reconcile",
-						queue="long",
-						timeout="3600",
-						is_async=True,
-						job_name=reconcile_job_name,
-						enqueue_after_commit=True,
-						doc=doc,
-					)
-
-
-def reconcile(doc: None | str = None) -> None:
-	if doc:
-		log = frappe.db.get_value("Process Payment Reconciliation Log", filters={"process_pr": doc})
-		if log:
-			res = frappe.get_all(
-				"Process Payment Reconciliation Log",
-				filters={"name": log},
-				fields=["reconciled_entries", "total_allocations"],
-				as_list=1,
-				limit=1,
-			)
-
-			reconciled_entries, total_allocations = res[0]
-			if reconciled_entries != total_allocations:
-				try:
-					# Fetch next allocation
-					allocations = get_next_allocation(log)
-
-					pr = get_pr_instance(doc)
-
-					# pass allocation to PR instance
-					for x in allocations:
-						pr.append("allocation", x)
-
-					# reconcile
-					pr.reconcile_allocations(skip_ref_details_update_for_pe=True)
-
-					# If Payment Entry, update details only for newly linked references
-					# This is for performance
-					if allocations[0].reference_type == "Payment Entry":
-
-						references = [(x.invoice_type, x.invoice_number) for x in allocations]
-						pe = frappe.get_doc(allocations[0].reference_type, allocations[0].reference_name)
-						pe.flags.ignore_validate_update_after_submit = True
-						pe.set_missing_ref_details(update_ref_details_only_for=references)
-						pe.save()
-
-					# Update reconciled flag
-					allocation_names = [x.name for x in allocations]
-					ppa = qb.DocType("Process Payment Reconciliation Log Allocations")
-					qb.update(ppa).set(ppa.reconciled, True).where(ppa.name.isin(allocation_names)).run()
-
-					# Update reconciled count
-					reconciled_count = frappe.db.count(
-						"Process Payment Reconciliation Log Allocations", filters={"parent": log, "reconciled": True}
-					)
-					frappe.db.set_value(
-						"Process Payment Reconciliation Log", log, "reconciled_entries", reconciled_count
-					)
-
-				except Exception as err:
-					# Update the parent doc about the exception
-					frappe.db.rollback()
-
-					traceback = frappe.get_traceback()
-					if traceback:
-						message = "Traceback: <br>" + traceback
-						frappe.db.set_value("Process Payment Reconciliation Log", log, "error_log", message)
-						frappe.db.set_value(
-							"Process Payment Reconciliation",
-							doc,
-							"error_log",
-							message,
-						)
-					if reconciled_entries and total_allocations and reconciled_entries < total_allocations:
-						frappe.db.set_value(
-							"Process Payment Reconciliation Log", log, "status", "Partially Reconciled"
-						)
-						frappe.db.set_value(
-							"Process Payment Reconciliation",
-							doc,
-							"status",
-							"Partially Reconciled",
-						)
-					else:
-						frappe.db.set_value("Process Payment Reconciliation Log", log, "status", "Failed")
-						frappe.db.set_value(
-							"Process Payment Reconciliation",
-							doc,
-							"status",
-							"Failed",
-						)
-				finally:
-					if reconciled_entries == total_allocations:
-						frappe.db.set_value("Process Payment Reconciliation Log", log, "status", "Reconciled")
-						frappe.db.set_value("Process Payment Reconciliation Log", log, "reconciled", True)
-						frappe.db.set_value("Process Payment Reconciliation", doc, "status", "Completed")
-					else:
-
-						if not (frappe.db.get_value("Process Payment Reconciliation", doc, "status") == "Paused"):
-							# trigger next batch in job
-							# generate reconcile job name
-							allocation = get_next_allocation(log)
-							if allocation:
-								reconcile_job_name = (
-									f"process_{doc}_reconcile_allocation_{allocation[0].idx}_{allocation[-1].idx}"
-								)
-							else:
-								reconcile_job_name = f"process_{doc}_reconcile"
-
-							if not is_job_running(reconcile_job_name):
-								job = frappe.enqueue(
-									method="erpnext.accounts.doctype.process_payment_reconciliation.process_payment_reconciliation.reconcile",
-									queue="long",
-									timeout="3600",
-									is_async=True,
-									job_name=reconcile_job_name,
-									enqueue_after_commit=True,
-									doc=doc,
-								)
-			else:
-				frappe.db.set_value("Process Payment Reconciliation Log", log, "status", "Reconciled")
-				frappe.db.set_value("Process Payment Reconciliation Log", log, "reconciled", True)
-				frappe.db.set_value("Process Payment Reconciliation", doc, "status", "Completed")
-
-
-@frappe.whitelist()
-def is_any_doc_running(for_filter: str | dict | None = None) -> str | None:
-	running_doc = None
-	if for_filter:
-		if type(for_filter) == str:
-			for_filter = frappe.json.loads(for_filter)
-
-		running_doc = frappe.db.get_value(
-			"Process Payment Reconciliation",
-			filters={
-				"docstatus": 1,
-				"status": ["in", ["Running", "Paused"]],
-				"company": for_filter.get("company"),
-				"party_type": for_filter.get("party_type"),
-				"party": for_filter.get("party"),
-				"receivable_payable_account": for_filter.get("receivable_payable_account"),
-			},
-			fieldname="name",
-		)
-	else:
-		running_doc = frappe.db.get_value(
-			"Process Payment Reconciliation", filters={"docstatus": 1, "status": "Running"}
-		)
-	return running_doc
--- a/erpnext/accounts/doctype/process_payment_reconciliation/process_payment_reconciliation_dashboard.py
+++ b/erpnext/accounts/doctype/process_payment_reconciliation/process_payment_reconciliation_dashboard.py
@@ -1,15 +0,0 @@
-from frappe import _
-
-
-def get_data():
-	return {
-		"fieldname": "process_pr",
-		"transactions": [
-			{
-				"label": _("Reconciliation Logs"),
-				"items": [
-					"Process Payment Reconciliation Log",
-				],
-			},
-		],
-	}
--- a/erpnext/accounts/doctype/process_payment_reconciliation/process_payment_reconciliation_list.js
+++ b/erpnext/accounts/doctype/process_payment_reconciliation/process_payment_reconciliation_list.js
@@ -1,15 +0,0 @@
-frappe.listview_settings['Process Payment Reconciliation'] = {
-	add_fields: ["status"],
-	get_indicator: function(doc) {
-		let colors = {
-			'Queued': 'orange',
-			'Paused': 'orange',
-			'Completed': 'green',
-			'Partially Reconciled': 'orange',
-			'Running': 'blue',
-			'Failed': 'red',
-		};
-		let status = doc.status;
-		return [__(status), colors[status], 'status,=,'+status];
-	},
-};
--- a/erpnext/accounts/doctype/process_payment_reconciliation/test_process_payment_reconciliation.py
+++ b/erpnext/accounts/doctype/process_payment_reconciliation/test_process_payment_reconciliation.py
@@ -1,9 +0,0 @@
-# Copyright (c) 2023, Frappe Technologies Pvt. Ltd. and Contributors
-# See license.txt
-
-# import frappe
-from frappe.tests.utils import FrappeTestCase
-
-
-class TestProcessPaymentReconciliation(FrappeTestCase):
-	pass
--- a/erpnext/accounts/doctype/process_payment_reconciliation_log/process_payment_reconciliation_log.js
+++ b/erpnext/accounts/doctype/process_payment_reconciliation_log/process_payment_reconciliation_log.js
@@ -1,17 +0,0 @@
-// Copyright (c) 2023, Frappe Technologies Pvt. Ltd. and contributors
-// For license information, please see license.txt
-
-frappe.ui.form.on("Process Payment Reconciliation Log", {
-	refresh(frm) {
-		if (['Completed', 'Running', 'Paused', 'Partially Reconciled'].find(x => x == frm.doc.status)) {
-			let progress = 0;
-			if (frm.doc.reconciled_entries != 0) {
-				progress = frm.doc.reconciled_entries / frm.doc.total_allocations * 100;
-			} else if(frm.doc.total_allocations == 0 && frm.doc.status == "Completed"){
-				progress = 100;
-			}
-			frm.dashboard.add_progress(__('Reconciliation Progress'), progress);
-		}
-
-	},
-});
--- a/erpnext/accounts/doctype/process_payment_reconciliation_log/process_payment_reconciliation_log.json
+++ b/erpnext/accounts/doctype/process_payment_reconciliation_log/process_payment_reconciliation_log.json
@@ -1,137 +0,0 @@
-{
- "actions": [],
- "autoname": "format:PPR-LOG-{##}",
- "beta": 1,
- "creation": "2023-03-13 15:00:09.149681",
- "default_view": "List",
- "doctype": "DocType",
- "editable_grid": 1,
- "engine": "InnoDB",
- "field_order": [
-  "process_pr",
-  "section_break_fvdw",
-  "status",
-  "tasks_section",
-  "allocated",
-  "reconciled",
-  "column_break_yhin",
-  "total_allocations",
-  "reconciled_entries",
-  "section_break_4ywv",
-  "error_log",
-  "allocations_section",
-  "allocations"
- ],
- "fields": [
-  {
-   "fieldname": "allocations",
-   "fieldtype": "Table",
-   "label": "Allocations",
-   "options": "Process Payment Reconciliation Log Allocations",
-   "read_only": 1
-  },
-  {
-   "default": "0",
-   "description": "All allocations have been successfully reconciled",
-   "fieldname": "reconciled",
-   "fieldtype": "Check",
-   "label": "Reconciled",
-   "read_only": 1
-  },
-  {
-   "fieldname": "total_allocations",
-   "fieldtype": "Int",
-   "in_list_view": 1,
-   "label": "Total Allocations",
-   "read_only": 1
-  },
-  {
-   "default": "0",
-   "description": "Invoices and Payments have been Fetched and Allocated",
-   "fieldname": "allocated",
-   "fieldtype": "Check",
-   "label": "Allocated",
-   "read_only": 1
-  },
-  {
-   "fieldname": "reconciled_entries",
-   "fieldtype": "Int",
-   "in_list_view": 1,
-   "label": "Reconciled Entries",
-   "read_only": 1
-  },
-  {
-   "fieldname": "tasks_section",
-   "fieldtype": "Section Break",
-   "label": "Tasks"
-  },
-  {
-   "fieldname": "allocations_section",
-   "fieldtype": "Section Break",
-   "label": "Allocations"
-  },
-  {
-   "fieldname": "column_break_yhin",
-   "fieldtype": "Column Break"
-  },
-  {
-   "fieldname": "section_break_4ywv",
-   "fieldtype": "Section Break"
-  },
-  {
-   "depends_on": "eval:doc.error_log",
-   "fieldname": "error_log",
-   "fieldtype": "Long Text",
-   "label": "Reconciliation Error Log",
-   "read_only": 1
-  },
-  {
-   "fieldname": "process_pr",
-   "fieldtype": "Link",
-   "in_list_view": 1,
-   "label": "Parent Document",
-   "options": "Process Payment Reconciliation",
-   "read_only": 1,
-   "reqd": 1
-  },
-  {
-   "fieldname": "section_break_fvdw",
-   "fieldtype": "Section Break",
-   "label": "Status"
-  },
-  {
-   "fieldname": "status",
-   "fieldtype": "Select",
-   "label": "Status",
-   "options": "Running\nPaused\nReconciled\nPartially Reconciled\nFailed\nCancelled",
-   "read_only": 1
-  }
- ],
- "in_create": 1,
- "index_web_pages_for_search": 1,
- "links": [],
- "modified": "2023-04-21 17:36:26.642617",
- "modified_by": "Administrator",
- "module": "Accounts",
- "name": "Process Payment Reconciliation Log",
- "naming_rule": "Expression",
- "owner": "Administrator",
- "permissions": [
-  {
-   "create": 1,
-   "delete": 1,
-   "email": 1,
-   "export": 1,
-   "print": 1,
-   "read": 1,
-   "report": 1,
-   "role": "System Manager",
-   "share": 1,
-   "write": 1
-  }
- ],
- "search_fields": "allocated, reconciled, total_allocations, reconciled_entries",
- "sort_field": "modified",
- "sort_order": "DESC",
- "states": []
-}
--- a/erpnext/accounts/doctype/process_payment_reconciliation_log/process_payment_reconciliation_log_list.js
+++ b/erpnext/accounts/doctype/process_payment_reconciliation_log/process_payment_reconciliation_log_list.js
@@ -1,15 +0,0 @@
-frappe.listview_settings['Process Payment Reconciliation Log'] = {
-	add_fields: ["status"],
-	get_indicator: function(doc) {
-		var colors = {
-			'Partially Reconciled': 'orange',
-			'Paused': 'orange',
-			'Reconciled': 'green',
-			'Failed': 'red',
-			'Cancelled': 'red',
-			'Running': 'blue',
-		};
-		let status = doc.status;
-		return [__(status), colors[status], "status,=,"+status];
-	},
-};
--- a/erpnext/accounts/doctype/process_payment_reconciliation_log/test_process_payment_reconciliation_log.py
+++ b/erpnext/accounts/doctype/process_payment_reconciliation_log/test_process_payment_reconciliation_log.py
@@ -1,9 +0,0 @@
-# Copyright (c) 2023, Frappe Technologies Pvt. Ltd. and Contributors
-# See license.txt
-
-# import frappe
-from frappe.tests.utils import FrappeTestCase
-
-
-class TestProcessPaymentReconciliationLog(FrappeTestCase):
-	pass
--- a/erpnext/accounts/doctype/process_payment_reconciliation_log_allocations/process_payment_reconciliation_log_allocations.json
+++ b/erpnext/accounts/doctype/process_payment_reconciliation_log_allocations/process_payment_reconciliation_log_allocations.json
@@ -1,170 +0,0 @@
-{
- "actions": [],
- "creation": "2023-03-13 13:51:27.351463",
- "default_view": "List",
- "doctype": "DocType",
- "editable_grid": 1,
- "engine": "InnoDB",
- "field_order": [
-  "reference_type",
-  "reference_name",
-  "reference_row",
-  "column_break_3",
-  "invoice_type",
-  "invoice_number",
-  "section_break_6",
-  "allocated_amount",
-  "unreconciled_amount",
-  "column_break_8",
-  "amount",
-  "is_advance",
-  "section_break_5",
-  "difference_amount",
-  "column_break_7",
-  "difference_account",
-  "exchange_rate",
-  "currency",
-  "reconciled"
- ],
- "fields": [
-  {
-   "fieldname": "reference_type",
-   "fieldtype": "Link",
-   "label": "Reference Type",
-   "options": "DocType",
-   "read_only": 1,
-   "reqd": 1
-  },
-  {
-   "fieldname": "reference_name",
-   "fieldtype": "Dynamic Link",
-   "in_list_view": 1,
-   "label": "Reference Name",
-   "options": "reference_type",
-   "read_only": 1,
-   "reqd": 1
-  },
-  {
-   "fieldname": "reference_row",
-   "fieldtype": "Data",
-   "hidden": 1,
-   "label": "Reference Row",
-   "read_only": 1
-  },
-  {
-   "fieldname": "column_break_3",
-   "fieldtype": "Column Break"
-  },
-  {
-   "fieldname": "invoice_type",
-   "fieldtype": "Link",
-   "label": "Invoice Type",
-   "options": "DocType",
-   "read_only": 1,
-   "reqd": 1
-  },
-  {
-   "fieldname": "invoice_number",
-   "fieldtype": "Dynamic Link",
-   "in_list_view": 1,
-   "label": "Invoice Number",
-   "options": "invoice_type",
-   "read_only": 1,
-   "reqd": 1
-  },
-  {
-   "fieldname": "section_break_6",
-   "fieldtype": "Section Break"
-  },
-  {
-   "fieldname": "allocated_amount",
-   "fieldtype": "Currency",
-   "in_list_view": 1,
-   "label": "Allocated Amount",
-   "options": "currency",
-   "reqd": 1
-  },
-  {
-   "fieldname": "unreconciled_amount",
-   "fieldtype": "Currency",
-   "hidden": 1,
-   "label": "Unreconciled Amount",
-   "options": "currency",
-   "read_only": 1
-  },
-  {
-   "fieldname": "column_break_8",
-   "fieldtype": "Column Break"
-  },
-  {
-   "fieldname": "amount",
-   "fieldtype": "Currency",
-   "hidden": 1,
-   "label": "Amount",
-   "options": "currency",
-   "read_only": 1
-  },
-  {
-   "fieldname": "is_advance",
-   "fieldtype": "Data",
-   "hidden": 1,
-   "label": "Is Advance",
-   "read_only": 1
-  },
-  {
-   "fieldname": "section_break_5",
-   "fieldtype": "Section Break"
-  },
-  {
-   "fieldname": "difference_amount",
-   "fieldtype": "Currency",
-   "in_list_view": 1,
-   "label": "Difference Amount",
-   "options": "Currency",
-   "read_only": 1
-  },
-  {
-   "fieldname": "column_break_7",
-   "fieldtype": "Column Break"
-  },
-  {
-   "fieldname": "difference_account",
-   "fieldtype": "Link",
-   "label": "Difference Account",
-   "options": "Account",
-   "read_only": 1
-  },
-  {
-   "fieldname": "exchange_rate",
-   "fieldtype": "Float",
-   "label": "Exchange Rate",
-   "read_only": 1
-  },
-  {
-   "fieldname": "currency",
-   "fieldtype": "Link",
-   "hidden": 1,
-   "label": "Currency",
-   "options": "Currency"
-  },
-  {
-   "default": "0",
-   "fieldname": "reconciled",
-   "fieldtype": "Check",
-   "in_list_view": 1,
-   "label": "Reconciled"
-  }
- ],
- "istable": 1,
- "links": [],
- "modified": "2023-03-20 21:05:43.121945",
- "modified_by": "Administrator",
- "module": "Accounts",
- "name": "Process Payment Reconciliation Log Allocations",
- "owner": "Administrator",
- "permissions": [],
- "sort_field": "modified",
- "sort_order": "DESC",
- "states": [],
- "track_changes": 1
-}
--- a/erpnext/accounts/doctype/process_payment_reconciliation_log_allocations/process_payment_reconciliation_log_allocations.py
+++ b/erpnext/accounts/doctype/process_payment_reconciliation_log_allocations/process_payment_reconciliation_log_allocations.py
@@ -1,9 +0,0 @@
-# Copyright (c) 2023, Frappe Technologies Pvt. Ltd. and contributors
-# For license information, please see license.txt
-
-# import frappe
-from frappe.model.document import Document
-
-
-class ProcessPaymentReconciliationLogAllocations(Document):
-	pass
--- a/erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.html
+++ b/erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.html
@@ -15,12 +15,7 @@
 	</div>
 	<h2 class="text-center">{{ _("STATEMENTS OF ACCOUNTS") }}</h2>
 	<div>
-		{% if filters.party[0] == filters.party_name[0] %}
-			<h5 style="float: left;">{{ _("Customer: ") }} <b>{{ filters.party_name[0] }}</b></h5>
-		{% else %}
-			<h5 style="float: left;">{{ _("Customer: ") }} <b>{{ filters.party[0] }}</b></h5>
-			<h5 style="float: left; margin-left:15px">{{ _("Customer Name: ") }} <b>{{filters.party_name[0] }}</b></h5>
-		{% endif %}
+		<h5 style="float: left;">{{ _("Customer: ") }} <b>{{filters.party[0] }}</b></h5>
 		<h5 style="float: right;">
 			{{ _("Date: ") }}
 			<b>{{ frappe.format(filters.from_date, 'Date')}}
--- a/erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.json
+++ b/erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.json
@@ -36,8 +36,6 @@
  "terms_and_conditions",
  "section_break_1",
  "enable_auto_email",
-  "column_break_ocfq",
-  "sender",
  "section_break_18",
  "frequency",
  "filter_duration",
@@ -300,20 +298,10 @@
   "fieldname": "show_net_values_in_party_account",
   "fieldtype": "Check",
   "label": "Show Net Values in Party Account"
-  },
-  {
-   "fieldname": "sender",
-   "fieldtype": "Link",
-   "label": "Sender",
-   "options": "Email Account"
-  },
-  {
-   "fieldname": "column_break_ocfq",
-   "fieldtype": "Column Break"
  }
 ],
 "links": [],
- "modified": "2023-04-26 12:46:43.645455",
+ "modified": "2022-11-10 17:44:17.165991",
 "modified_by": "Administrator",
 "module": "Accounts",
 "name": "Process Statement Of Accounts",
--- a/erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.py
+++ b/erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.py
@@ -24,7 +24,7 @@ from erpnext.accounts.report.general_ledger.general_ledger import execute as get
 class ProcessStatementOfAccounts(Document):
 	def validate(self):
 		if not self.subject:
-			self.subject = "Statement Of Accounts for {{ customer.customer_name }}"
+			self.subject = "Statement Of Accounts for {{ customer.name }}"
 		if not self.body:
 			self.body = "Hello {{ customer.name }},<br>PFA your Statement Of Accounts from {{ doc.from_date }} to {{ doc.to_date }}."

@@ -87,7 +87,6 @@ def get_report_pdf(doc, consolidated=True):
 				"account": [doc.account] if doc.account else None,
 				"party_type": "Customer",
 				"party": [entry.customer],
-				"party_name": [entry.customer_name] if entry.customer_name else None,
 				"presentation_currency": presentation_currency,
 				"group_by": doc.group_by,
 				"currency": doc.currency,
@@ -157,8 +156,8 @@ def get_customers_based_on_territory_or_customer_group(customer_collection, coll
 	]
 	return frappe.get_list(
 		"Customer",
-		fields=["name", "customer_name", "email_id"],
-		filters=[["disabled", "=", 0], [fields_dict[customer_collection], "IN", selected]],
+		fields=["name", "email_id"],
+		filters=[[fields_dict[customer_collection], "IN", selected]],
 	)


@@ -180,7 +179,7 @@ def get_customers_based_on_sales_person(sales_person):
 	if sales_person_records.get("Customer"):
 		return frappe.get_list(
 			"Customer",
-			fields=["name", "customer_name", "email_id"],
+			fields=["name", "email_id"],
 			filters=[["name", "in", list(sales_person_records["Customer"])]],
 		)
 	else:
@@ -229,7 +228,7 @@ def fetch_customers(customer_collection, collection_name, primary_mandatory):
 		if customer_collection == "Sales Partner":
 			customers = frappe.get_list(
 				"Customer",
-				fields=["name", "customer_name", "email_id"],
+				fields=["name", "email_id"],
 				filters=[["default_sales_partner", "=", collection_name]],
 			)
 		else:
@@ -246,12 +245,7 @@ def fetch_customers(customer_collection, collection_name, primary_mandatory):
 				continue

 		customer_list.append(
-			{
-				"name": customer.name,
-				"customer_name": customer.customer_name,
-				"primary_email": primary_email,
-				"billing_email": billing_email,
-			}
+			{"name": customer.name, "primary_email": primary_email, "billing_email": billing_email}
 		)
 	return customer_list

@@ -334,7 +328,7 @@ def send_emails(document_name, from_scheduler=False):
 				queue="short",
 				method=frappe.sendmail,
 				recipients=recipients,
-				sender=doc.sender or frappe.session.user,
+				sender=frappe.session.user,
 				cc=cc,
 				subject=subject,
 				message=message,
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Shadrak Gurupnor	17659bdc80	fix: black	2023-02-17 07:13:00 +00:00
Shadrak Gurupnor	76d138d71a	fix: forced delete linked desktop_icons	2023-02-17 12:17:36 +05:30