chore(release): Bumped to Version 14.69.0

# [14.69.0](https://github.com/frappe/erpnext/compare/v14.68.2...v14.69.0) (2024-05-02)

### Bug Fixes

* 'NoneType' object has no attribute '_read_rowdata_packet_unbuffered' ([949aa93](949aa9346c))
* args when get the delivery note in delivery trip ([abe64aa](abe64aa1ab))
* args when get the delivery note in delivery trip ([1a7b3c4](1a7b3c437d))
* display term name for single term invoices ([58b68b7](58b68b7597))
* duplicate column in the stock ledger report ([3fcdcef](3fcdcef178))
* handle stock balance unbuffered_cursor error (backport [#41186](https://github.com/frappe/erpnext/issues/41186)) ([#41187](https://github.com/frappe/erpnext/issues/41187)) ([59010c9](59010c9a61))
* incorrectly applying TDS when Advance is in previous FY ([eb22fb9](eb22fb9326))
* mode of payment has precedance ([33d38ba](33d38ba3a7))
* multiple pricing rules with discount amount and discount percentage not working ([#41211](https://github.com/frappe/erpnext/issues/41211)) ([54313b5](54313b5db9))
* negative stock qty error for stock reconciliation ([#41283](https://github.com/frappe/erpnext/issues/41283)) ([9aa054c](9aa054c400))
* permission issue when user permission restricts on company ([45c4167](45c4167c86))
* validation to prevent overallocation ([8318286](8318286865))

### Features

* allow to do reposting for all stock transactions (audit) (backport [#41165](https://github.com/frappe/erpnext/issues/41165)) ([#41205](https://github.com/frappe/erpnext/issues/41205)) ([1e13193](1e1319351d))

### Performance Improvements

* timeout issue while submitting purchase receipt (v14) ([113351e](113351e850))

.github/helper/documentation.py

@@ -10,7 +10,6 @@ WEBSITE_REPOS = [
 
 DOCUMENTATION_DOMAINS = [
 	"docs.erpnext.com",
-	"docs.frappe.io",
 	"frappeframework.com",
 ]
 

.github/release.yml

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

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

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

.github/workflows/linters.yml

@@ -9,22 +9,21 @@ jobs:
     name: linters
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v2
 
       - name: Set up Python 3.10
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v2
         with:
           python-version: '3.10'
-          cache: pip
 
       - name: Install and Run Pre-commit
-        uses: pre-commit/action@v3.0.0
+        uses: pre-commit/action@v2.0.3
 
       - name: Download Semgrep rules
         run: git clone --depth 1 https://github.com/frappe/semgrep-rules.git frappe-semgrep-rules
 
       - name: Download semgrep
-        run: pip install semgrep
+        run: pip install semgrep==0.97.0
 
       - name: Run Semgrep rules
         run: semgrep ci --config ./frappe-semgrep-rules/rules --config r/python.lang.correctness

.github/workflows/patch.yml

@@ -16,7 +16,7 @@ concurrency:
 
 jobs:
   test:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-latest
     timeout-minutes: 60
 
     name: Patch Test
@@ -59,7 +59,7 @@ jobs:
         run: echo "127.0.0.1 test_site" | sudo tee -a /etc/hosts
 
       - name: Cache pip
-        uses: actions/cache@v4
+        uses: actions/cache@v2
         with:
           path: ~/.cache/pip
           key: ${{ runner.os }}-pip-${{ hashFiles('**/*requirements.txt', '**/pyproject.toml') }}
@@ -68,7 +68,7 @@ jobs:
             ${{ runner.os }}-
 
       - name: Cache node modules
-        uses: actions/cache@v4
+        uses: actions/cache@v2
         env:
           cache-name: cache-node-modules
         with:
@@ -83,7 +83,7 @@ jobs:
         id: yarn-cache-dir-path
         run: echo "::set-output name=dir::$(yarn cache dir)"
 
-      - uses: actions/cache@v4
+      - uses: actions/cache@v2
         id: yarn-cache
         with:
           path: ${{ steps.yarn-cache-dir-path.outputs.dir }}

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

@@ -79,7 +79,7 @@ jobs:
         run: echo "127.0.0.1 test_site" | sudo tee -a /etc/hosts
 
       - name: Cache pip
-        uses: actions/cache@v4
+        uses: actions/cache@v2
         with:
           path: ~/.cache/pip
           key: ${{ runner.os }}-pip-${{ hashFiles('**/*requirements.txt', '**/pyproject.toml') }}
@@ -88,7 +88,7 @@ jobs:
             ${{ runner.os }}-
 
       - name: Cache node modules
-        uses: actions/cache@v4
+        uses: actions/cache@v2
         env:
           cache-name: cache-node-modules
         with:
@@ -103,7 +103,7 @@ jobs:
         id: yarn-cache-dir-path
         run: echo "::set-output name=dir::$(yarn cache dir)"
 
-      - uses: actions/cache@v4
+      - uses: actions/cache@v2
         id: yarn-cache
         with:
           path: ${{ steps.yarn-cache-dir-path.outputs.dir }}

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

@@ -66,7 +66,7 @@ jobs:
         run: echo "127.0.0.1 test_site" | sudo tee -a /etc/hosts
 
       - name: Cache pip
-        uses: actions/cache@v4
+        uses: actions/cache@v2
         with:
           path: ~/.cache/pip
           key: ${{ runner.os }}-pip-${{ hashFiles('**/*requirements.txt', '**/pyproject.toml') }}
@@ -75,7 +75,7 @@ jobs:
             ${{ runner.os }}-
 
       - name: Cache node modules
-        uses: actions/cache@v4
+        uses: actions/cache@v2
         env:
           cache-name: cache-node-modules
         with:
@@ -90,7 +90,7 @@ jobs:
         id: yarn-cache-dir-path
         run: echo "::set-output name=dir::$(yarn cache dir)"
 
-      - uses: actions/cache@v4
+      - uses: actions/cache@v2
         id: yarn-cache
         with:
           path: ${{ steps.yarn-cache-dir-path.outputs.dir }}

.pre-commit-config.yaml

@@ -1,5 +1,5 @@
 exclude: 'node_modules|.git'
-default_stages: [pre-commit]
+default_stages: [commit]
 fail_fast: false
 
 
@@ -69,14 +69,12 @@ repos:
     rev: v0.2.0
     hooks:
       - id: ruff
-        name: "Run ruff import sorter"
-        args: ["--select=I", "--fix"]
-
-      - id: ruff
-        name: "Run ruff linter"
+        name: "Run ruff linter and apply fixes"
+        args: ["--fix"]
 
       - id: ruff-format
-        name: "Run ruff formatter"
+        name: "Format Python code"
+
 
 ci:
     autoupdate_schedule: weekly

CODEOWNERS

@@ -4,22 +4,22 @@
 # the repo. Unless a later match takes precedence,
 
 erpnext/accounts/               @deepeshgarg007 @ruthra-kumar
-erpnext/assets/                 @khushi8112 @deepeshgarg007
+erpnext/assets/                 @anandbaburajan @deepeshgarg007
 erpnext/loan_management/        @deepeshgarg007
 erpnext/regional                @deepeshgarg007 @ruthra-kumar
 erpnext/selling                 @deepeshgarg007 @ruthra-kumar
 erpnext/support/                @deepeshgarg007
 pos*                            
 
-erpnext/buying/                 @rohitwaghchaure
-erpnext/maintenance/            @rohitwaghchaure
-erpnext/manufacturing/          @rohitwaghchaure
-erpnext/quality_management/     @rohitwaghchaure
-erpnext/stock/                  @rohitwaghchaure
-erpnext/subcontracting          @rohitwaghchaure
+erpnext/buying/                 @rohitwaghchaure @s-aga-r
+erpnext/maintenance/            @rohitwaghchaure @s-aga-r
+erpnext/manufacturing/          @rohitwaghchaure @s-aga-r
+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 
 
 .github/                        @deepeshgarg007
-pyproject.toml                  @akhilnarang
+pyproject.toml                  @ankush

erpnext/__init__.py

@@ -3,7 +3,7 @@ import inspect
 
 import frappe
 
-__version__ = "14.67.1"
+__version__ = "14.69.0"
 
 
 def get_default_company(user=None):

erpnext/accounts/deferred_revenue.py

@@ -58,7 +58,7 @@ def build_conditions(process_type, account, company):
 	)
 
 	if account:
-		conditions += f"AND {deferred_account}={frappe.db.escape(account)}"
+		conditions += f"AND {deferred_account}='{account}'"
 	elif company:
 		conditions += f"AND p.company = {frappe.db.escape(company)}"
 
@@ -360,45 +360,45 @@ def book_deferred_income_or_expense(doc, deferred_process, posting_date=None):
 			)
 
 		if not amount:
-			prev_posting_date = end_date
-		else:
-			gl_posting_date = end_date
-			prev_posting_date = None
-			# check if books nor frozen till endate:
-			if accounts_frozen_upto and getdate(end_date) <= getdate(accounts_frozen_upto):
-				gl_posting_date = get_last_day(add_days(accounts_frozen_upto, 1))
-				prev_posting_date = end_date
+			return
 
-			if via_journal_entry:
-				book_revenue_via_journal_entry(
-					doc,
-					credit_account,
-					debit_account,
-					amount,
-					base_amount,
-					gl_posting_date,
-					project,
-					account_currency,
-					item.cost_center,
-					item,
-					deferred_process,
-					submit_journal_entry,
-				)
-			else:
-				make_gl_entries(
-					doc,
-					credit_account,
-					debit_account,
-					against,
-					amount,
-					base_amount,
-					gl_posting_date,
-					project,
-					account_currency,
-					item.cost_center,
-					item,
-					deferred_process,
-				)
+		gl_posting_date = end_date
+		prev_posting_date = None
+		# check if books nor frozen till endate:
+		if accounts_frozen_upto and getdate(end_date) <= getdate(accounts_frozen_upto):
+			gl_posting_date = get_last_day(add_days(accounts_frozen_upto, 1))
+			prev_posting_date = end_date
+
+		if via_journal_entry:
+			book_revenue_via_journal_entry(
+				doc,
+				credit_account,
+				debit_account,
+				amount,
+				base_amount,
+				gl_posting_date,
+				project,
+				account_currency,
+				item.cost_center,
+				item,
+				deferred_process,
+				submit_journal_entry,
+			)
+		else:
+			make_gl_entries(
+				doc,
+				credit_account,
+				debit_account,
+				against,
+				amount,
+				base_amount,
+				gl_posting_date,
+				project,
+				account_currency,
+				item.cost_center,
+				item,
+				deferred_process,
+			)
 
 		# Returned in case of any errors because it tries to submit the same record again and again in case of errors
 		if frappe.flags.deferred_accounting_error:

erpnext/accounts/doctype/account/account.js

@@ -94,8 +94,8 @@ frappe.ui.form.on("Account", {
 				function () {
 					frappe.route_options = {
 						account: frm.doc.name,
-						from_date: erpnext.utils.get_fiscal_year(frappe.datetime.get_today(), true)[1],
-						to_date: erpnext.utils.get_fiscal_year(frappe.datetime.get_today(), true)[2],
+						from_date: frappe.sys_defaults.year_start_date,
+						to_date: frappe.sys_defaults.year_end_date,
 						company: frm.doc.company,
 					};
 					frappe.set_route("query-report", "General Ledger");

erpnext/accounts/doctype/account/account.py

@@ -4,7 +4,7 @@
 
 import frappe
 from frappe import _, throw
-from frappe.utils import add_to_date, cint, cstr, pretty_date
+from frappe.utils import cint, cstr
 from frappe.utils.nestedset import NestedSet, get_ancestors_of, get_descendants_of
 
 import erpnext
@@ -400,7 +400,6 @@ def validate_account_number(name, account_number, company):
 
 @frappe.whitelist()
 def update_account_number(name, account_name, account_number=None, from_descendant=False):
-	_ensure_idle_system()
 	account = frappe.db.get_value("Account", name, "company", as_dict=True)
 	if not account:
 		return
@@ -421,7 +420,7 @@ def update_account_number(name, account_name, account_number=None, from_descenda
 				"name",
 			)
 
-			if old_name and not from_descendant:
+			if old_name:
 				# same account in parent company exists
 				allow_child_account_creation = _("Allow Account Creation Against Child Company")
 
@@ -462,7 +461,6 @@ def update_account_number(name, account_name, account_number=None, from_descenda
 
 @frappe.whitelist()
 def merge_account(old, new):
-	_ensure_idle_system()
 	# Validate properties before merging
 	new_account = frappe.get_cached_doc("Account", new)
 	old_account = frappe.get_cached_doc("Account", old)
@@ -516,27 +514,3 @@ def sync_update_account_number_in_child(
 
 	for d in frappe.db.get_values("Account", filters=filters, fieldname=["company", "name"], as_dict=True):
 		update_account_number(d["name"], account_name, account_number, from_descendant=True)
-
-
-def _ensure_idle_system():
-	# Don't allow renaming if accounting entries are actively being updated, there are two main reasons:
-	# 1. Correctness: It's next to impossible to ensure that renamed account is not being used *right now*.
-	# 2. Performance: Renaming requires locking out many tables entirely and severely degrades performance.
-
-	if frappe.flags.in_test:
-		return
-
-	try:
-		# We also lock inserts to GL entry table with for_update here.
-		last_gl_update = frappe.db.get_value("GL Entry", {}, "modified", for_update=True, wait=False)
-	except frappe.QueryTimeoutError:
-		# wait=False fails immediately if there's an active transaction.
-		last_gl_update = add_to_date(None, seconds=-1)
-
-	if last_gl_update > add_to_date(None, minutes=-5):
-		frappe.throw(
-			_(
-				"Last GL Entry update was done {}. This operation is not allowed while system is actively being used. Please wait for 5 minutes before retrying."
-			).format(pretty_date(last_gl_update)),
-			title=_("System In Use"),
-		)

erpnext/accounts/doctype/account/account_tree.js

@@ -279,8 +279,8 @@ frappe.treeview_settings["Account"] = {
 			click: function (node, btn) {
 				frappe.route_options = {
 					account: node.label,
-					from_date: erpnext.utils.get_fiscal_year(frappe.datetime.get_today(), true)[1],
-					to_date: erpnext.utils.get_fiscal_year(frappe.datetime.get_today(), true)[2],
+					from_date: frappe.sys_defaults.year_start_date,
+					to_date: frappe.sys_defaults.year_end_date,
 					company:
 						frappe.treeview_settings["Account"].treeview.page.fields_dict.company.get_value(),
 				};

erpnext/accounts/doctype/account/chart_of_accounts/verified/in_standard_chart_of_accounts.json

@@ -98,7 +98,7 @@
                 "Office Maintenance Expenses": {},
                 "Office Rent": {},
                 "Postal Expenses": {},
-                "Print and Stationery": {},
+                "Print and Stationary": {},
                 "Rounded Off": {
                     "account_type": "Round Off"
                 },

erpnext/accounts/doctype/accounting_dimension/accounting_dimension.json

@@ -31,8 +31,7 @@
    "label": "Reference Document Type",
    "options": "DocType",
    "read_only_depends_on": "eval:!doc.__islocal",
-   "reqd": 1,
-   "search_index": 1
+   "reqd": 1
   },
   {
    "default": "0",

erpnext/accounts/doctype/accounting_dimension/accounting_dimension.py

@@ -25,7 +25,6 @@ class AccountingDimension(Document):
 			"Accounting Dimension Detail",
 			"Company",
 			"Account",
-			"Finance Book",
 		):
 			msg = _("Not allowed to create accounting dimension for {0}").format(self.document_type)
 			frappe.throw(msg)

erpnext/accounts/doctype/accounts_settings/accounts_settings.js

@@ -3,14 +3,4 @@
 
 frappe.ui.form.on("Accounts Settings", {
 	refresh: function (frm) {},
-
-	drop_ar_procedures: function (frm) {
-		frm.call({
-			doc: frm.doc,
-			method: "drop_ar_sql_procedures",
-			callback: function (r) {
-				frappe.show_alert(__("Procedures dropped"), 5);
-			},
-		});
-	},
 });

erpnext/accounts/doctype/accounts_settings/accounts_settings.json

@@ -44,7 +44,6 @@
   "section_break_jpd0",
   "auto_reconcile_payments",
   "stale_days",
-  "exchange_gain_loss_posting_date",
   "invoicing_settings_tab",
   "accounts_transactions_settings_section",
   "over_billing_allowance",
@@ -74,13 +73,7 @@
   "remarks_section",
   "general_ledger_remarks_length",
   "column_break_lvjk",
-  "receivable_payable_remarks_length",
-  "accounts_receivable_payable_tuning_section",
-  "receivable_payable_fetch_method",
-  "column_break_ntmi",
-  "drop_ar_procedures",
-  "legacy_section",
-  "ignore_is_opening_check_for_reporting"
+  "receivable_payable_remarks_length"
  ],
  "fields": [
   {
@@ -390,7 +383,7 @@
   {
    "fieldname": "section_break_jpd0",
    "fieldtype": "Section Break",
-   "label": "Payment Reconciliation Settings"
+   "label": "Payment Reconciliations"
   },
   {
    "default": "0",
@@ -469,49 +462,6 @@
    "fieldname": "remarks_section",
    "fieldtype": "Section Break",
    "label": "Remarks Column Length"
-  },
-  {
-   "default": "Payment",
-   "description": "Only applies for Normal Payments",
-   "fieldname": "exchange_gain_loss_posting_date",
-   "fieldtype": "Select",
-   "label": "Posting Date Inheritance for Exchange Gain / Loss",
-   "options": "Invoice\nPayment\nReconciliation Date"
-  },
-  {
-   "default": "0",
-   "description": "Ignores legacy Is Opening field in GL Entry that allows adding opening balance post the system is in use while generating reports",
-   "fieldname": "ignore_is_opening_check_for_reporting",
-   "fieldtype": "Check",
-   "label": "Ignore Is Opening check for reporting"
-  },
-  {
-   "default": "Buffered Cursor",
-   "fieldname": "receivable_payable_fetch_method",
-   "fieldtype": "Select",
-   "label": "Data Fetch Method",
-   "options": "Buffered Cursor\nUnBuffered Cursor\nRaw SQL"
-  },
-  {
-   "fieldname": "accounts_receivable_payable_tuning_section",
-   "fieldtype": "Section Break",
-   "label": "Accounts Receivable / Payable Tuning"
-  },
-  {
-   "fieldname": "legacy_section",
-   "fieldtype": "Section Break",
-   "label": "Legacy Fields"
-  },
-  {
-   "fieldname": "column_break_ntmi",
-   "fieldtype": "Column Break"
-  },
-  {
-   "depends_on": "eval:doc.receivable_payable_fetch_method == \"Raw SQL\"",
-   "description": "Drops existing SQL Procedures and Function setup by Accounts Receivable report",
-   "fieldname": "drop_ar_procedures",
-   "fieldtype": "Button",
-   "label": "Drop Procedures"
   }
  ],
  "icon": "icon-cog",
@@ -519,7 +469,7 @@
  "index_web_pages_for_search": 1,
  "issingle": 1,
  "links": [],
- "modified": "2025-05-05 12:29:38.302027",
+ "modified": "2023-11-20 09:37:47.650347",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Accounts Settings",

erpnext/accounts/doctype/accounts_settings/accounts_settings.py

@@ -65,11 +65,3 @@ class AccountsSettings(Document):
 	def validate_pending_reposts(self):
 		if self.acc_frozen_upto:
 			check_pending_reposting(self.acc_frozen_upto)
-
-	@frappe.whitelist()
-	def drop_ar_sql_procedures(self):
-		from erpnext.accounts.report.accounts_receivable.accounts_receivable import InitSQLProceduresForAR
-
-		frappe.db.sql(f"drop function if exists {InitSQLProceduresForAR.genkey_function_name}")
-		frappe.db.sql(f"drop procedure if exists {InitSQLProceduresForAR.init_procedure_name}")
-		frappe.db.sql(f"drop procedure if exists {InitSQLProceduresForAR.allocate_procedure_name}")

erpnext/accounts/doctype/bank_account/bank_account.json

@@ -208,49 +208,8 @@
    "label": "Disabled"
   }
  ],
- "links": [
-  {
-   "group": "Transactions",
-   "link_doctype": "Payment Request",
-   "link_fieldname": "bank_account"
-  },
-  {
-   "group": "Transactions",
-   "link_doctype": "Payment Order",
-   "link_fieldname": "bank_account"
-  },
-  {
-   "group": "Transactions",
-   "link_doctype": "Bank Guarantee",
-   "link_fieldname": "bank_account"
-  },
-  {
-   "group": "Transactions",
-   "link_doctype": "Bank Transaction",
-   "link_fieldname": "bank_account"
-  },
-  {
-   "group": "Accounting",
-   "link_doctype": "Payment Entry",
-   "link_fieldname": "bank_account"
-  },
-  {
-   "group": "Accounting",
-   "link_doctype": "Journal Entry",
-   "link_fieldname": "bank_account"
-  },
-  {
-   "group": "Party",
-   "link_doctype": "Customer",
-   "link_fieldname": "default_bank_account"
-  },
-  {
-   "group": "Party",
-   "link_doctype": "Supplier",
-   "link_fieldname": "default_bank_account"
-  }
- ],
- "modified": "2024-10-30 09:41:14.113414",
+ "links": [],
+ "modified": "2024-02-02 17:50:09.768835",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Bank Account",
@@ -287,4 +246,4 @@
  "sort_order": "DESC",
  "states": [],
  "track_changes": 1
-}
+}

erpnext/accounts/doctype/bank_account/bank_account.py

@@ -21,7 +21,7 @@ class BankAccount(Document):
 		self.name = self.account_name + " - " + self.bank
 
 	def on_trash(self):
-		delete_contact_and_address("Bank Account", self.name)
+		delete_contact_and_address("BankAccount", self.name)
 
 	def validate(self):
 		self.validate_company()

erpnext/accounts/doctype/bank_account/bank_account_dashboard.py

@@ -0,0 +1,20 @@
+from frappe import _
+
+
+def get_data():
+	return {
+		"fieldname": "bank_account",
+		"non_standard_fieldnames": {
+			"Customer": "default_bank_account",
+			"Supplier": "default_bank_account",
+		},
+		"transactions": [
+			{
+				"label": _("Payments"),
+				"items": ["Payment Entry", "Payment Request", "Payment Order", "Payroll Entry"],
+			},
+			{"label": _("Party"), "items": ["Customer", "Supplier"]},
+			{"items": ["Bank Guarantee"]},
+			{"items": ["Journal Entry"]},
+		],
+	}

erpnext/accounts/doctype/bank_clearance/bank_clearance.js

@@ -36,12 +36,8 @@ frappe.ui.form.on("Bank Clearance", {
 	refresh: function (frm) {
 		frm.disable_save();
 		frm.add_custom_button(__("Get Payment Entries"), () => frm.trigger("get_payment_entries"));
-		frm.change_custom_button_type(__("Get Payment Entries"), null, "primary");
-		if (frm.doc.payment_entries.length) {
-			frm.add_custom_button(__("Update Clearance Date"), () => 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, "primary");
 	},
 
 	update_clearance_date: function (frm) {
@@ -49,7 +45,13 @@ frappe.ui.form.on("Bank Clearance", {
 			method: "update_clearance_date",
 			doc: frm.doc,
 			callback: function (r, rt) {
-				frm.refresh();
+				frm.refresh_field("payment_entries");
+				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");
+				}
 			},
 		});
 	},
@@ -58,8 +60,17 @@ frappe.ui.form.on("Bank Clearance", {
 		return frappe.call({
 			method: "get_payment_entries",
 			doc: frm.doc,
-			callback: function () {
-				frm.refresh();
+			callback: function (r, rt) {
+				frm.refresh_field("payment_entries");
+
+				if (frm.doc.payment_entries.length) {
+					frm.add_custom_button(__("Update Clearance Date"), () =>
+						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");
+				}
 			},
 		});
 	},

erpnext/accounts/doctype/bank_clearance/bank_clearance.py

@@ -6,7 +6,7 @@ import frappe
 from frappe import _, msgprint
 from frappe.model.document import Document
 from frappe.query_builder.custom import ConstantColumn
-from frappe.utils import flt, fmt_money, get_link_to_form, getdate
+from frappe.utils import flt, fmt_money, getdate
 
 import erpnext
 
@@ -46,13 +46,16 @@ class BankClearance(Document):
 			as_dict=1,
 		)
 
+		if self.bank_account:
+			condition += "and bank_account = %(bank_account)s"
+
 		payment_entries = frappe.db.sql(
 			f"""
 			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, 0, received_amount + total_taxes_and_charges) as debit,
+				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
 			from `tabPayment Entry`
@@ -67,6 +70,7 @@ class BankClearance(Document):
 				"account": self.account,
 				"from": self.from_date,
 				"to": self.to_date,
+				"bank_account": self.bank_account,
 			},
 			as_dict=1,
 		)
@@ -89,7 +93,7 @@ class BankClearance(Document):
 			.where(loan_disbursement.docstatus == 1)
 			.where(loan_disbursement.disbursement_date >= self.from_date)
 			.where(loan_disbursement.disbursement_date <= self.to_date)
-			.where(loan_disbursement.disbursement_account == self.account)
+			.where(loan_disbursement.disbursement_account.isin([self.bank_account, self.account]))
 			.orderby(loan_disbursement.disbursement_date)
 			.orderby(loan_disbursement.name, order=frappe.qb.desc)
 		)
@@ -117,7 +121,7 @@ class BankClearance(Document):
 			.where(loan_repayment.docstatus == 1)
 			.where(loan_repayment.posting_date >= self.from_date)
 			.where(loan_repayment.posting_date <= self.to_date)
-			.where(loan_repayment.payment_account == self.account)
+			.where(loan_repayment.payment_account.isin([self.bank_account, self.account]))
 		)
 
 		if not self.include_reconciled_entries:
@@ -206,11 +210,8 @@ class BankClearance(Document):
 
 				if d.cheque_date and getdate(d.clearance_date) < getdate(d.cheque_date):
 					frappe.throw(
-						_("Row #{0}: For {1} Clearance date {2} cannot be before Cheque Date {3}").format(
-							d.idx,
-							get_link_to_form(d.payment_document, d.payment_entry),
-							d.clearance_date,
-							d.cheque_date,
+						_("Row #{0}: Clearance date {1} cannot be before Cheque Date {2}").format(
+							d.idx, d.clearance_date, d.cheque_date
 						)
 					)
 

erpnext/accounts/doctype/bank_guarantee/bank_guarantee.js

@@ -9,6 +9,13 @@ cur_frm.add_fetch("bank", "swift_number", "swift_number");
 
 frappe.ui.form.on("Bank Guarantee", {
 	setup: function (frm) {
+		frm.set_query("bank", function () {
+			return {
+				filters: {
+					company: frm.doc.company,
+				},
+			};
+		});
 		frm.set_query("bank_account", function () {
 			return {
 				filters: {

erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.js

@@ -19,15 +19,10 @@ frappe.ui.form.on("Bank Reconciliation Tool", {
 	},
 
 	onload: function (frm) {
-		if (!frm.doc.company) {
-			frm.set_value("company", frappe.defaults.get_default("company"));
-		}
-
 		// Set default filter dates
 		let 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");
 	},
 
@@ -99,7 +94,7 @@ frappe.ui.form.on("Bank Reconciliation Tool", {
 
 	make_reconciliation_tool(frm) {
 		frm.get_field("reconciliation_tool_cards").$wrapper.empty();
-		if (frm.doc.company && frm.doc.bank_account && frm.doc.bank_statement_to_date) {
+		if (frm.doc.bank_account && frm.doc.bank_statement_to_date) {
 			frm.trigger("get_cleared_balance").then(() => {
 				if (
 					frm.doc.bank_account &&
@@ -115,7 +110,7 @@ frappe.ui.form.on("Bank Reconciliation Tool", {
 	},
 
 	get_account_opening_balance(frm) {
-		if (frm.doc.company && frm.doc.bank_account && frm.doc.bank_statement_from_date) {
+		if (frm.doc.bank_account && frm.doc.bank_statement_from_date) {
 			frappe.call({
 				method: "erpnext.accounts.doctype.bank_reconciliation_tool.bank_reconciliation_tool.get_account_balance",
 				args: {
@@ -130,7 +125,7 @@ frappe.ui.form.on("Bank Reconciliation Tool", {
 	},
 
 	get_cleared_balance(frm) {
-		if (frm.doc.company && frm.doc.bank_account && frm.doc.bank_statement_to_date) {
+		if (frm.doc.bank_account && frm.doc.bank_statement_to_date) {
 			return frappe.call({
 				method: "erpnext.accounts.doctype.bank_reconciliation_tool.bank_reconciliation_tool.get_account_balance",
 				args: {

erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py

@@ -12,7 +12,6 @@ from frappe.utils import cint, flt
 
 from erpnext import get_default_cost_center
 from erpnext.accounts.doctype.bank_transaction.bank_transaction import get_total_allocated_amount
-from erpnext.accounts.party import get_party_account
 from erpnext.accounts.report.bank_reconciliation_statement.bank_reconciliation_statement import (
 	get_amounts_not_reflected_in_system,
 	get_entries,
@@ -285,56 +284,54 @@ def create_payment_entry_bts(
 	bank_transaction = frappe.db.get_values(
 		"Bank Transaction",
 		bank_transaction_name,
-		fieldname=["name", "unallocated_amount", "deposit", "bank_account", "currency"],
+		fieldname=["name", "unallocated_amount", "deposit", "bank_account"],
 		as_dict=True,
 	)[0]
-
+	paid_amount = bank_transaction.unallocated_amount
 	payment_type = "Receive" if bank_transaction.deposit > 0.0 else "Pay"
 
-	bank_account = frappe.get_cached_value("Bank Account", bank_transaction.bank_account, "account")
-	company = frappe.get_cached_value("Account", bank_account, "company")
-	party_account = get_party_account(party_type, party, company)
+	company_account = frappe.get_value("Bank Account", bank_transaction.bank_account, "account")
+	company = frappe.get_value("Account", company_account, "company")
+	payment_entry_dict = {
+		"company": company,
+		"payment_type": payment_type,
+		"reference_no": reference_number,
+		"reference_date": reference_date,
+		"party_type": party_type,
+		"party": party,
+		"posting_date": posting_date,
+		"paid_amount": paid_amount,
+		"received_amount": paid_amount,
+	}
+	payment_entry = frappe.new_doc("Payment Entry")
 
-	bank_currency = bank_transaction.currency
-	party_currency = frappe.get_cached_value("Account", party_account, "account_currency")
+	payment_entry.update(payment_entry_dict)
 
-	exc_rate = get_exchange_rate(bank_currency, party_currency, posting_date)
+	if mode_of_payment:
+		payment_entry.mode_of_payment = mode_of_payment
+	if project:
+		payment_entry.project = project
+	if cost_center:
+		payment_entry.cost_center = cost_center
+	if payment_type == "Receive":
+		payment_entry.paid_to = company_account
+	else:
+		payment_entry.paid_from = company_account
 
-	amt_in_bank_acc_currency = bank_transaction.unallocated_amount
-	amount_in_party_currency = bank_transaction.unallocated_amount * exc_rate
-
-	pe = frappe.new_doc("Payment Entry")
-	pe.payment_type = payment_type
-	pe.company = company
-	pe.reference_no = reference_number
-	pe.reference_date = reference_date
-	pe.party_type = party_type
-	pe.party = party
-	pe.posting_date = posting_date
-	pe.paid_from = party_account if payment_type == "Receive" else bank_account
-	pe.paid_to = party_account if payment_type == "Pay" else bank_account
-	pe.paid_from_account_currency = party_currency if payment_type == "Receive" else bank_currency
-	pe.paid_to_account_currency = party_currency if payment_type == "Pay" else bank_currency
-	pe.paid_amount = amount_in_party_currency if payment_type == "Receive" else amt_in_bank_acc_currency
-	pe.received_amount = amount_in_party_currency if payment_type == "Pay" else amt_in_bank_acc_currency
-	pe.mode_of_payment = mode_of_payment
-	pe.project = project
-	pe.cost_center = cost_center
-
-	pe.validate()
+	payment_entry.validate()
 
 	if allow_edit:
-		return pe
+		return payment_entry
 
-	pe.insert()
-	pe.submit()
+	payment_entry.insert()
 
+	payment_entry.submit()
 	vouchers = json.dumps(
 		[
 			{
 				"payment_doctype": "Payment Entry",
-				"payment_name": pe.name,
-				"amount": amt_in_bank_acc_currency,
+				"payment_name": payment_entry.name,
+				"amount": paid_amount,
 			}
 		]
 	)
@@ -458,12 +455,8 @@ def get_linked_payments(
 def subtract_allocations(gl_account, vouchers):
 	"Look up & subtract any existing Bank Transaction allocations"
 	copied = []
-
-	voucher_docs = [(voucher[1], voucher[2]) for voucher in vouchers]
-	voucher_allocated_amounts = get_total_allocated_amount(voucher_docs)
-
 	for voucher in vouchers:
-		rows = voucher_allocated_amounts.get((voucher[1], voucher[2])) or []
+		rows = get_total_allocated_amount(voucher[1], voucher[2])
 		amount = None
 		for row in rows:
 			if row["gl_account"] == gl_account:

erpnext/accounts/doctype/bank_transaction/auto_match_party.py

@@ -45,41 +45,42 @@ class AutoMatchbyAccountIBAN:
 		if not (self.bank_party_account_number or self.bank_party_iban):
 			return None
 
-		return self.match_account_in_party()
+		result = self.match_account_in_party()
+		return result
 
 	def match_account_in_party(self) -> tuple | None:
-		"""
-		Returns (Party Type, Party) if a matching account is found in Bank Account or Employee:
-		1. Get party from a matching (iban/account no) Bank Account
-		2. If not found, get party from Employee with matching bank account details (iban/account no)
-		"""
-		if not (self.bank_party_account_number or self.bank_party_iban):
-			# Nothing to match
-			return None
+		"""Check if there is a IBAN/Account No. match in Customer/Supplier/Employee"""
+		result = None
+		parties = get_parties_in_order(self.deposit)
+		or_filters = self.get_or_filters()
 
-		# Search for a matching Bank Account that has party set
-		party_result = frappe.db.get_all(
-			"Bank Account",
-			or_filters=self.get_or_filters(),
-			filters={"party_type": ("is", "set"), "party": ("is", "set")},
-			fields=["party", "party_type"],
-			limit_page_length=1,
-		)
-		if result := party_result[0] if party_result else None:
-			return (result["party_type"], result["party"])
+		for party in parties:
+			party_result = frappe.db.get_all(
+				"Bank Account", or_filters=or_filters, pluck="party", limit_page_length=1
+			)
 
-		# If no party is found, search in Employee (since it has bank account details)
-		if employee_result := frappe.db.get_all(
-			"Employee", or_filters=self.get_or_filters("Employee"), pluck="name", limit_page_length=1
-		):
-			return ("Employee", employee_result[0])
+			if party == "Employee" and not party_result:
+				# Search in Bank Accounts first for Employee, and then Employee record
+				if "bank_account_no" in or_filters:
+					or_filters["bank_ac_no"] = or_filters.pop("bank_account_no")
 
-	def get_or_filters(self, party: str | None = None) -> dict:
-		"""Return OR filters for Bank Account and IBAN"""
+				party_result = frappe.db.get_all(
+					party, or_filters=or_filters, pluck="name", limit_page_length=1
+				)
+
+			if party_result:
+				result = (
+					party,
+					party_result[0],
+				)
+				break
+
+		return result
+
+	def get_or_filters(self) -> dict:
 		or_filters = {}
 		if self.bank_party_account_number:
-			bank_ac_field = "bank_ac_no" if party == "Employee" else "bank_account_no"
-			or_filters[bank_ac_field] = self.bank_party_account_number
+			or_filters["bank_account_no"] = self.bank_party_account_number
 
 		if self.bank_party_iban:
 			or_filters["iban"] = self.bank_party_iban
@@ -99,7 +100,8 @@ class AutoMatchbyPartyNameDescription:
 		if not (self.bank_party_name or self.description):
 			return None
 
-		return self.match_party_name_desc_in_party()
+		result = self.match_party_name_desc_in_party()
+		return result
 
 	def match_party_name_desc_in_party(self) -> tuple | None:
 		"""Fuzzy search party name and/or description against parties in the system"""
@@ -108,7 +110,7 @@ class AutoMatchbyPartyNameDescription:
 
 		for party in parties:
 			filters = {"status": "Active"} if party == "Employee" else {"disabled": 0}
-			field = f"{party.lower()}_name"
+			field = party.lower() + "_name"
 			names = frappe.get_all(party, filters=filters, fields=[f"{field} as party_name", "name"])
 
 			for field in ["bank_party_name", "description"]:
@@ -135,7 +137,13 @@ class AutoMatchbyPartyNameDescription:
 		)
 		party_name, skip = self.process_fuzzy_result(result)
 
-		return ((party, party_name), skip) if party_name else (None, skip)
+		if not party_name:
+			return None, skip
+
+		return (
+			party,
+			party_name,
+		), skip
 
 	def process_fuzzy_result(self, result: list | None):
 		"""
@@ -153,8 +161,8 @@ class AutoMatchbyPartyNameDescription:
 		if len(result) == 1:
 			return (first_result[PARTY_ID] if first_result[SCORE] > CUTOFF else None), True
 
+		second_result = result[1]
 		if first_result[SCORE] > CUTOFF:
-			second_result = result[1]
 			# If multiple matches with the same score, return None but discontinue matching
 			# Matches were found but were too close to distinguish between
 			if first_result[SCORE] == second_result[SCORE]:
@@ -166,8 +174,8 @@ class AutoMatchbyPartyNameDescription:
 
 
 def get_parties_in_order(deposit: float) -> list:
-	return (
-		["Customer", "Supplier", "Employee"]  # most -> least likely to pay us
-		if flt(deposit) > 0
-		else ["Supplier", "Employee", "Customer"]  # most -> least likely to receive from us
-	)
+	parties = ["Supplier", "Employee", "Customer"]  # most -> least likely to receive
+	if flt(deposit) > 0:
+		parties = ["Customer", "Supplier", "Employee"]  # most -> least likely to pay
+
+	return parties

erpnext/accounts/doctype/bank_transaction/bank_transaction.py

@@ -2,7 +2,6 @@
 # For license information, please see license.txt
 
 import frappe
-from frappe import _
 from frappe.model.docstatus import DocStatus
 from frappe.utils import flt
 
@@ -93,16 +92,10 @@ class BankTransaction(StatusUpdater):
 		- clear means: set the latest transaction date as clearance date
 		"""
 		remaining_amount = self.unallocated_amount
-		payment_entry_docs = [(pe.payment_document, pe.payment_entry) for pe in self.payment_entries]
-		pe_bt_allocations = get_total_allocated_amount(payment_entry_docs)
-
 		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,
-					pe_bt_allocations.get((payment_entry.payment_document, payment_entry.payment_entry))
-					or [],
+					self, payment_entry
 				)
 
 				if 0.0 == unallocated_amount:
@@ -163,17 +156,13 @@ class BankTransaction(StatusUpdater):
 		if self.party_type and self.party:
 			return
 
-		result = None
-		try:
-			result = AutoMatchParty(
-				bank_party_account_number=self.bank_party_account_number,
-				bank_party_iban=self.bank_party_iban,
-				bank_party_name=self.bank_party_name,
-				description=self.description,
-				deposit=self.deposit,
-			).match()
-		except Exception:
-			frappe.log_error(title=_("Error in party matching for Bank Transaction {0}").format(self.name))
+		result = AutoMatchParty(
+			bank_party_account_number=self.bank_party_account_number,
+			bank_party_iban=self.bank_party_iban,
+			bank_party_name=self.bank_party_name,
+			description=self.description,
+			deposit=self.deposit,
+		).match()
 
 		if result:
 			party_type, party = result
@@ -188,7 +177,7 @@ def get_doctypes_for_bank_reconciliation():
 	return frappe.get_hooks("bank_reconciliation_doctypes")
 
 
-def get_clearance_details(transaction, payment_entry, bt_allocations):
+def get_clearance_details(transaction, payment_entry):
 	"""
 	There should only be one bank gle for a voucher.
 	Could be none for a Bank Transaction.
@@ -197,6 +186,7 @@ def get_clearance_details(transaction, payment_entry, bt_allocations):
 	"""
 	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)
 
 	unallocated_amount = min(
 		transaction.unallocated_amount,
@@ -252,52 +242,44 @@ def get_related_bank_gl_entries(doctype, docname):
 	return result
 
 
-def get_total_allocated_amount(docs):
+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
 	"""
-	if not docs:
-		return {}
-
 	# nosemgrep: frappe-semgrep-rules.rules.frappe-using-db-sql
 	result = frappe.db.sql(
 		"""
-		SELECT total, latest_name, latest_date, gl_account, payment_document, payment_entry FROM (
+		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, btp.payment_document, btp.payment_entry) AS total,
+				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,
-				btp.payment_document,
-				btp.payment_entry
+				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, btp.payment_entry) IN %(docs)s
+				btp.payment_document = %(doctype)s
+				AND btp.payment_entry = %(docname)s
 				AND bt.docstatus = 1
-			WINDOW w AS (PARTITION BY ba.account, btp.payment_document, btp.payment_entry ORDER BY bt.date DESC)
+			WINDOW w AS (PARTITION BY ba.account ORDER BY bt.date desc)
 		) temp
 		WHERE
 			rownum = 1
 		""",
-		dict(docs=docs),
+		dict(doctype=doctype, docname=docname),
 		as_dict=True,
 	)
-
-	payment_allocation_details = {}
 	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"])
-		payment_allocation_details.setdefault((row["payment_document"], row["payment_entry"]), []).append(row)
-
-	return payment_allocation_details
+	return result
 
 
 def get_paid_amount(payment_entry, currency, gl_bank_account):

erpnext/accounts/doctype/budget/budget.py

@@ -460,20 +460,13 @@ def get_actual_expense(args):
 def get_accumulated_monthly_budget(monthly_distribution, posting_date, fiscal_year, annual_budget):
 	distribution = {}
 	if monthly_distribution:
-		mdp = frappe.qb.DocType("Monthly Distribution Percentage")
-		md = frappe.qb.DocType("Monthly Distribution")
-
-		res = (
-			frappe.qb.from_(mdp)
-			.join(md)
-			.on(mdp.parent == md.name)
-			.select(mdp.month, mdp.percentage_allocation)
-			.where(md.fiscal_year == fiscal_year)
-			.where(md.name == monthly_distribution)
-			.run(as_dict=True)
-		)
-
-		for d in res:
+		for d in frappe.db.sql(
+			"""select mdp.month, mdp.percentage_allocation
+			from `tabMonthly Distribution Percentage` mdp, `tabMonthly Distribution` md
+			where mdp.parent=md.name and md.fiscal_year=%s""",
+			fiscal_year,
+			as_dict=1,
+		):
 			distribution.setdefault(d.month, d.percentage_allocation)
 
 	dt = frappe.db.get_value("Fiscal Year", fiscal_year, "year_start_date")

erpnext/accounts/doctype/budget/test_budget.py

@@ -6,11 +6,7 @@ import unittest
 import frappe
 from frappe.utils import now_datetime, nowdate
 
-from erpnext.accounts.doctype.budget.budget import (
-	BudgetError,
-	get_accumulated_monthly_budget,
-	get_actual_expense,
-)
+from erpnext.accounts.doctype.budget.budget import BudgetError, get_actual_expense
 from erpnext.accounts.doctype.journal_entry.test_journal_entry import make_journal_entry
 from erpnext.accounts.utils import get_fiscal_year
 from erpnext.buying.doctype.purchase_order.test_purchase_order import create_purchase_order
@@ -100,10 +96,6 @@ class TestBudget(unittest.TestCase):
 		frappe.db.set_value("Budget", budget.name, "action_if_accumulated_monthly_budget_exceeded", "Stop")
 		frappe.db.set_value("Budget", budget.name, "fiscal_year", fiscal_year)
 
-		accumulated_limit = get_accumulated_monthly_budget(
-			budget.monthly_distribution, nowdate(), budget.fiscal_year, budget.accounts[0].budget_amount
-		)
-
 		mr = frappe.get_doc(
 			{
 				"doctype": "Material Request",
@@ -117,7 +109,7 @@ class TestBudget(unittest.TestCase):
 						"uom": "_Test UOM",
 						"warehouse": "_Test Warehouse - _TC",
 						"schedule_date": nowdate(),
-						"rate": accumulated_limit + 1,
+						"rate": 100000,
 						"expense_account": "_Test Account Cost for Goods Sold - _TC",
 						"cost_center": "_Test Cost Center - _TC",
 					}

erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.py

@@ -448,8 +448,9 @@ def unset_existing_data(company):
 		"Sales Taxes and Charges Template",
 		"Purchase Taxes and Charges Template",
 	]:
-		dt = frappe.qb.DocType(doctype)
-		frappe.qb.from_(dt).where(dt.company == company).delete().run()
+		frappe.db.sql(
+			f'''delete from `tab{doctype}` where `company`="%s"''' % (company)  # nosec
+		)
 
 
 def set_default_accounts(company):

erpnext/accounts/doctype/cost_center_allocation/test_cost_center_allocation.py

@@ -4,8 +4,6 @@
 import unittest
 
 import frappe
-from frappe.query_builder.functions import Sum
-from frappe.tests.utils import change_settings
 from frappe.utils import add_days, today
 
 from erpnext.accounts.doctype.cost_center.test_cost_center import create_cost_center
@@ -24,10 +22,8 @@ class TestCostCenterAllocation(unittest.TestCase):
 		cost_centers = [
 			"Main Cost Center 1",
 			"Main Cost Center 2",
-			"Main Cost Center 3",
 			"Sub Cost Center 1",
 			"Sub Cost Center 2",
-			"Sub Cost Center 3",
 		]
 		for cc in cost_centers:
 			create_cost_center(cost_center_name=cc, company="_Test Company")
@@ -40,7 +36,7 @@ class TestCostCenterAllocation(unittest.TestCase):
 		)
 
 		jv = make_journal_entry(
-			"Cash - _TC", "Sales - _TC", 100, cost_center="Main Cost Center 1 - _TC", submit=True
+			"_Test Cash - _TC", "Sales - _TC", 100, cost_center="Main Cost Center 1 - _TC", submit=True
 		)
 
 		expected_values = [["Sub Cost Center 1 - _TC", 0.0, 60], ["Sub Cost Center 2 - _TC", 0.0, 40]]
@@ -124,7 +120,7 @@ class TestCostCenterAllocation(unittest.TestCase):
 	def test_valid_from_based_on_existing_gle(self):
 		# GLE posted against Sub Cost Center 1 on today
 		jv = make_journal_entry(
-			"Cash - _TC",
+			"_Test Cash - _TC",
 			"Sales - _TC",
 			100,
 			cost_center="Main Cost Center 1 - _TC",
@@ -145,78 +141,6 @@ class TestCostCenterAllocation(unittest.TestCase):
 
 		jv.cancel()
 
-	def test_multiple_cost_center_allocation_on_same_main_cost_center(self):
-		coa1 = create_cost_center_allocation(
-			"_Test Company",
-			"Main Cost Center 3 - _TC",
-			{"Sub Cost Center 1 - _TC": 30, "Sub Cost Center 2 - _TC": 30, "Sub Cost Center 3 - _TC": 40},
-			valid_from=add_days(today(), -5),
-		)
-
-		coa2 = create_cost_center_allocation(
-			"_Test Company",
-			"Main Cost Center 3 - _TC",
-			{"Sub Cost Center 1 - _TC": 50, "Sub Cost Center 2 - _TC": 50},
-			valid_from=add_days(today(), -1),
-		)
-
-		jv = make_journal_entry(
-			"Cash - _TC",
-			"Sales - _TC",
-			100,
-			cost_center="Main Cost Center 3 - _TC",
-			posting_date=today(),
-			submit=True,
-		)
-
-		expected_values = {"Sub Cost Center 1 - _TC": 50, "Sub Cost Center 2 - _TC": 50}
-
-		gle = frappe.qb.DocType("GL Entry")
-		gl_entries = (
-			frappe.qb.from_(gle)
-			.select(gle.cost_center, gle.debit, gle.credit)
-			.where(gle.voucher_type == "Journal Entry")
-			.where(gle.voucher_no == jv.name)
-			.where(gle.account == "Sales - _TC")
-			.orderby(gle.cost_center)
-		).run(as_dict=1)
-
-		self.assertTrue(gl_entries)
-
-		for gle in gl_entries:
-			self.assertTrue(gle.cost_center in expected_values)
-			self.assertEqual(gle.debit, 0)
-			self.assertEqual(gle.credit, expected_values[gle.cost_center])
-
-		coa1.cancel()
-		coa2.cancel()
-		jv.cancel()
-
-	@change_settings("System Settings", {"rounding_method": "Commercial Rounding"})
-	def test_debit_credit_on_cost_center_allocation_for_commercial_rounding(self):
-		from erpnext.accounts.doctype.sales_invoice.test_sales_invoice import create_sales_invoice
-
-		cca = create_cost_center_allocation(
-			"_Test Company",
-			"Main Cost Center 1 - _TC",
-			{"Sub Cost Center 2 - _TC": 50, "Sub Cost Center 3 - _TC": 50},
-		)
-
-		si = create_sales_invoice(rate=145.65, cost_center="Main Cost Center 1 - _TC")
-
-		gl_entry = frappe.qb.DocType("GL Entry")
-		gl_entries = (
-			frappe.qb.from_(gl_entry)
-			.select(Sum(gl_entry.credit).as_("cr"), Sum(gl_entry.debit).as_("dr"))
-			.where(gl_entry.voucher_type == "Sales Invoice")
-			.where(gl_entry.voucher_no == si.name)
-		).run(as_dict=1)
-
-		self.assertEqual(gl_entries[0].cr, gl_entries[0].dr)
-
-		si.cancel()
-		cca.cancel()
-
 
 def create_cost_center_allocation(
 	company,

erpnext/accounts/doctype/currency_exchange_settings/currency_exchange_settings.js

@@ -19,7 +19,7 @@ frappe.ui.form.on("Currency Exchange Settings", {
 							to: "{to_currency}",
 						};
 						add_param(frm, r.message, params, result);
-					} else if (["frankfurter.app", "frankfurter.dev"].includes(frm.doc.service_provider)) {
+					} else if (frm.doc.service_provider == "frankfurter.app") {
 						let result = ["rates", "{to_currency}"];
 						let params = {
 							base: "{from_currency}",

erpnext/accounts/doctype/currency_exchange_settings/currency_exchange_settings.json

@@ -78,7 +78,7 @@
    "fieldname": "service_provider",
    "fieldtype": "Select",
    "label": "Service Provider",
-   "options": "frankfurter.dev\nexchangerate.host\nCustom",
+   "options": "frankfurter.app\nexchangerate.host\nCustom",
    "reqd": 1
   },
   {
@@ -104,7 +104,7 @@
  "index_web_pages_for_search": 1,
  "issingle": 1,
  "links": [],
- "modified": "2026-03-23 21:16:41.896424",
+ "modified": "2024-03-18 08:32:26.895076",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Currency Exchange Settings",
@@ -141,8 +141,8 @@
    "write": 1
   }
  ],
- "sort_field": "creation",
+ "sort_field": "modified",
  "sort_order": "DESC",
  "states": [],
  "track_changes": 1
-}
+}

erpnext/accounts/doctype/currency_exchange_settings/currency_exchange_settings.py

@@ -35,7 +35,7 @@ class CurrencyExchangeSettings(Document):
 			self.append("req_params", {"key": "date", "value": "{transaction_date}"})
 			self.append("req_params", {"key": "from", "value": "{from_currency}"})
 			self.append("req_params", {"key": "to", "value": "{to_currency}"})
-		elif self.service_provider in ("frankfurter.dev", "frankfurter.app"):
+		elif self.service_provider == "frankfurter.app":
 			self.set("result_key", [])
 			self.set("req_params", [])
 
@@ -80,13 +80,11 @@ class CurrencyExchangeSettings(Document):
 
 @frappe.whitelist()
 def get_api_endpoint(service_provider: str | None = None, use_http: bool = False):
-	if service_provider and service_provider in ["exchangerate.host", "frankfurter.dev", "frankfurter.app"]:
+	if service_provider and service_provider in ["exchangerate.host", "frankfurter.app"]:
 		if service_provider == "exchangerate.host":
 			api = "api.exchangerate.host/convert"
 		elif service_provider == "frankfurter.app":
-			api = "api.frankfurter.app/{transaction_date}"
-		elif service_provider == "frankfurter.dev":
-			api = "api.frankfurter.dev/v1/{transaction_date}"
+			api = "frankfurter.app/{transaction_date}"
 
 		protocol = "https://"
 		if use_http:

erpnext/accounts/doctype/dunning/dunning.py

@@ -55,46 +55,46 @@ class Dunning(AccountsController):
 			"conversion_rate",
 			"cost_center",
 		]
+		inv = frappe.db.get_value("Sales Invoice", self.sales_invoice, invoice_fields, as_dict=1)
 
 		accounting_dimensions = get_accounting_dimensions()
 		invoice_fields.extend(accounting_dimensions)
 
-		inv = frappe.db.get_value("Sales Invoice", self.sales_invoice, invoice_fields, as_dict=1)
-
 		dunning_in_company_currency = flt(self.dunning_amount * inv.conversion_rate)
 		default_cost_center = frappe.get_cached_value("Company", self.company, "cost_center")
 
-		debit = {
-			"account": inv.debit_to,
-			"party_type": "Customer",
-			"party": self.customer,
-			"due_date": self.due_date,
-			"against": self.income_account,
-			"debit": dunning_in_company_currency,
-			"debit_in_account_currency": self.dunning_amount,
-			"against_voucher": self.name,
-			"against_voucher_type": "Dunning",
-			"cost_center": inv.cost_center or default_cost_center,
-			"project": inv.project,
-		}
-
-		credit = {
-			"account": self.income_account,
-			"against": self.customer,
-			"credit": dunning_in_company_currency,
-			"credit_in_account_currency": self.dunning_amount,
-			"cost_center": inv.cost_center or default_cost_center,
-			"project": inv.project,
-		}
-
-		for dimension in accounting_dimensions:
-			if val := inv.get(dimension):
-				debit[dimension] = credit[dimension] = val
-
-		gl_entries = [
-			self.get_gl_dict(debit, inv.party_account_currency, item=inv),
-			self.get_gl_dict(credit, item=inv),
-		]
+		gl_entries.append(
+			self.get_gl_dict(
+				{
+					"account": inv.debit_to,
+					"party_type": "Customer",
+					"party": self.customer,
+					"due_date": self.due_date,
+					"against": self.income_account,
+					"debit": dunning_in_company_currency,
+					"debit_in_account_currency": self.dunning_amount,
+					"against_voucher": self.name,
+					"against_voucher_type": "Dunning",
+					"cost_center": inv.cost_center or default_cost_center,
+					"project": inv.project,
+				},
+				inv.party_account_currency,
+				item=inv,
+			)
+		)
+		gl_entries.append(
+			self.get_gl_dict(
+				{
+					"account": self.income_account,
+					"against": self.customer,
+					"credit": dunning_in_company_currency,
+					"cost_center": inv.cost_center or default_cost_center,
+					"credit_in_account_currency": self.dunning_amount,
+					"project": inv.project,
+				},
+				item=inv,
+			)
+		)
 		make_gl_entries(
 			gl_entries, cancel=(self.docstatus == 2), update_outstanding="No", merge_entries=False
 		)
@@ -129,31 +129,19 @@ def calculate_interest_and_amount(outstanding_amount, rate_of_interest, dunning_
 
 
 @frappe.whitelist()
-def get_dunning_letter_text(dunning_type: str, doc: str | dict, language: str | None = None) -> dict:
-	DOCTYPE = "Dunning Letter Text"
-	FIELDS = ["body_text", "closing_text", "language"]
-
+def get_dunning_letter_text(dunning_type, doc, language=None):
 	if isinstance(doc, str):
 		doc = json.loads(doc)
-
-	if not language:
-		language = doc.get("language")
-
 	if language:
-		letter_text = frappe.db.get_value(
-			DOCTYPE, {"parent": dunning_type, "language": language}, FIELDS, as_dict=1
-		)
-
-	if not letter_text:
-		letter_text = frappe.db.get_value(
-			DOCTYPE, {"parent": dunning_type, "is_default_language": 1}, FIELDS, as_dict=1
-		)
-
-	if not letter_text:
-		return {}
-
-	return {
-		"body_text": frappe.render_template(letter_text.body_text, doc),
-		"closing_text": frappe.render_template(letter_text.closing_text, doc),
-		"language": letter_text.language,
-	}
+		filters = {"parent": dunning_type, "language": language}
+	else:
+		filters = {"parent": dunning_type, "is_default_language": 1}
+	letter_text = frappe.db.get_value(
+		"Dunning Letter Text", filters, ["body_text", "closing_text", "language"], as_dict=1
+	)
+	if letter_text:
+		return {
+			"body_text": frappe.render_template(letter_text.body_text, doc),
+			"closing_text": frappe.render_template(letter_text.closing_text, doc),
+			"language": letter_text.language,
+		}

erpnext/accounts/doctype/exchange_rate_revaluation/exchange_rate_revaluation.py

@@ -52,21 +52,6 @@ class ExchangeRateRevaluation(Document):
 		if not (self.company and self.posting_date):
 			frappe.throw(_("Please select Company and Posting Date to getting entries"))
 
-	def before_submit(self):
-		self.remove_accounts_without_gain_loss()
-
-	def remove_accounts_without_gain_loss(self):
-		self.accounts = [account for account in self.accounts if account.gain_loss]
-
-		if not self.accounts:
-			frappe.throw(_("At least one account with exchange gain or loss is required"))
-
-		frappe.msgprint(
-			_("Removing rows without exchange gain or loss"),
-			alert=True,
-			indicator="yellow",
-		)
-
 	def on_cancel(self):
 		self.ignore_linked_doctypes = "GL Entry"
 
@@ -241,23 +226,23 @@ class ExchangeRateRevaluation(Document):
 				new_exchange_rate = get_exchange_rate(d.account_currency, company_currency, posting_date)
 				new_balance_in_base_currency = flt(d.balance_in_account_currency * new_exchange_rate)
 				gain_loss = flt(new_balance_in_base_currency, precision) - flt(d.balance, precision)
-
-				accounts.append(
-					{
-						"account": d.account,
-						"party_type": d.party_type,
-						"party": d.party,
-						"account_currency": d.account_currency,
-						"balance_in_base_currency": d.balance,
-						"balance_in_account_currency": d.balance_in_account_currency,
-						"zero_balance": d.zero_balance,
-						"current_exchange_rate": current_exchange_rate,
-						"new_exchange_rate": new_exchange_rate,
-						"new_balance_in_base_currency": new_balance_in_base_currency,
-						"new_balance_in_account_currency": d.balance_in_account_currency,
-						"gain_loss": gain_loss,
-					}
-				)
+				if gain_loss:
+					accounts.append(
+						{
+							"account": d.account,
+							"party_type": d.party_type,
+							"party": d.party,
+							"account_currency": d.account_currency,
+							"balance_in_base_currency": d.balance,
+							"balance_in_account_currency": d.balance_in_account_currency,
+							"zero_balance": d.zero_balance,
+							"current_exchange_rate": current_exchange_rate,
+							"new_exchange_rate": new_exchange_rate,
+							"new_balance_in_base_currency": new_balance_in_base_currency,
+							"new_balance_in_account_currency": d.balance_in_account_currency,
+							"gain_loss": gain_loss,
+						}
+					)
 
 			# Handle Accounts with '0' balance in Account/Base Currency
 			for d in [x for x in account_details if x.zero_balance]:
@@ -281,22 +266,23 @@ class ExchangeRateRevaluation(Document):
 						current_exchange_rate * d.balance_in_account_currency
 					)
 
-				accounts.append(
-					{
-						"account": d.account,
-						"party_type": d.party_type,
-						"party": d.party,
-						"account_currency": d.account_currency,
-						"balance_in_base_currency": d.balance,
-						"balance_in_account_currency": d.balance_in_account_currency,
-						"zero_balance": d.zero_balance,
-						"current_exchange_rate": current_exchange_rate,
-						"new_exchange_rate": new_exchange_rate,
-						"new_balance_in_base_currency": new_balance_in_base_currency,
-						"new_balance_in_account_currency": new_balance_in_account_currency,
-						"gain_loss": gain_loss,
-					}
-				)
+				if gain_loss:
+					accounts.append(
+						{
+							"account": d.account,
+							"party_type": d.party_type,
+							"party": d.party,
+							"account_currency": d.account_currency,
+							"balance_in_base_currency": d.balance,
+							"balance_in_account_currency": d.balance_in_account_currency,
+							"zero_balance": d.zero_balance,
+							"current_exchange_rate": current_exchange_rate,
+							"new_exchange_rate": new_exchange_rate,
+							"new_balance_in_base_currency": new_balance_in_base_currency,
+							"new_balance_in_account_currency": new_balance_in_account_currency,
+							"gain_loss": gain_loss,
+						}
+					)
 
 		return accounts
 

erpnext/accounts/doctype/fiscal_year/fiscal_year.json

@@ -82,7 +82,7 @@
  "icon": "fa fa-calendar",
  "idx": 1,
  "links": [],
- "modified": "2024-05-27 17:29:55.560840",
+ "modified": "2020-11-05 12:16:53.081573",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Fiscal Year",
@@ -126,10 +126,6 @@
   {
    "read": 1,
    "role": "Stock Manager"
-  },
-  {
-   "read": 1,
-   "role": "Auditor"
   }
  ],
  "show_name_in_global_search": 1,

erpnext/accounts/doctype/gl_entry/gl_entry.py

@@ -7,7 +7,7 @@ from frappe import _
 from frappe.model.document import Document
 from frappe.model.meta import get_field_precision
 from frappe.model.naming import set_name_from_naming_options
-from frappe.utils import flt, fmt_money, now
+from frappe.utils import flt, fmt_money
 
 import erpnext
 from erpnext.accounts.doctype.accounting_dimension.accounting_dimension import (
@@ -83,7 +83,7 @@ class GLEntry(Document):
 			if not self.get(k):
 				frappe.throw(_("{0} is required").format(_(self.meta.get_label(k))))
 
-		if not self.is_cancelled and not (self.party_type and self.party):
+		if not (self.party_type and self.party):
 			account_type = frappe.get_cached_value("Account", self.account, "account_type")
 			if account_type == "Receivable":
 				frappe.throw(
@@ -261,7 +261,7 @@ def validate_balance_type(account, adv_adj=False):
 		if balance_must_be:
 			balance = frappe.db.sql(
 				"""select sum(debit) - sum(credit)
-				from `tabGL Entry` where is_cancelled = 0 and account = %s""",
+				from `tabGL Entry` where account = %s""",
 				account,
 			)[0][0]
 
@@ -405,7 +405,7 @@ def rename_temporarily_named_docs(doctype):
 		set_name_from_naming_options(frappe.get_meta(doctype).autoname, doc)
 		newname = doc.name
 		frappe.db.sql(
-			f"UPDATE `tab{doctype}` SET name = %s, to_rename = 0, modified = %s where name = %s",
-			(newname, now(), oldname),
+			f"UPDATE `tab{doctype}` SET name = %s, to_rename = 0 where name = %s",
+			(newname, oldname),
 			auto_commit=True,
 		)

erpnext/accounts/doctype/invoice_discounting/invoice_discounting.js

@@ -197,7 +197,7 @@ frappe.ui.form.on("Invoice Discounting", {
 						from_date: frm.doc.posting_date,
 						to_date: moment(frm.doc.modified).format("YYYY-MM-DD"),
 						company: frm.doc.company,
-						categorize_by: "Categorize by Voucher (Consolidated)",
+						group_by: "Group by Voucher (Consolidated)",
 						show_cancelled_entries: frm.doc.docstatus === 2,
 					};
 					frappe.set_route("query-report", "General Ledger");

erpnext/accounts/doctype/journal_entry/journal_entry.js

@@ -34,7 +34,7 @@ frappe.ui.form.on("Journal Entry", {
 						to_date: moment(frm.doc.modified).format("YYYY-MM-DD"),
 						company: frm.doc.company,
 						finance_book: frm.doc.finance_book,
-						categorize_by: "",
+						group_by: "",
 						show_cancelled_entries: frm.doc.docstatus === 2,
 					};
 					frappe.set_route("query-report", "General Ledger");
@@ -171,7 +171,7 @@ frappe.ui.form.on("Journal Entry", {
 			!(frm.doc.accounts || []).length ||
 			((frm.doc.accounts || []).length === 1 && !frm.doc.accounts[0].account)
 		) {
-			if (["Bank Entry", "Cash Entry"].includes(frm.doc.voucher_type)) {
+			if (in_list(["Bank Entry", "Cash Entry"], frm.doc.voucher_type)) {
 				return frappe.call({
 					type: "GET",
 					method: "erpnext.accounts.doctype.journal_entry.journal_entry.get_default_bank_cash_account",
@@ -283,7 +283,7 @@ erpnext.accounts.JournalEntry = class JournalEntry extends frappe.ui.form.Contro
 				filters: [[jvd.reference_type, "docstatus", "=", 1]],
 			};
 
-			if (["Sales Invoice", "Purchase Invoice"].includes(jvd.reference_type)) {
+			if (in_list(["Sales Invoice", "Purchase Invoice"], jvd.reference_type)) {
 				out.filters.push([jvd.reference_type, "outstanding_amount", "!=", 0]);
 				// Filter by cost center
 				if (jvd.cost_center) {
@@ -295,7 +295,7 @@ erpnext.accounts.JournalEntry = class JournalEntry extends frappe.ui.form.Contro
 				out.filters.push([jvd.reference_type, party_account_field, "=", jvd.account]);
 			}
 
-			if (["Sales Order", "Purchase Order"].includes(jvd.reference_type)) {
+			if (in_list(["Sales Order", "Purchase Order"], jvd.reference_type)) {
 				// party_type and party mandatory
 				frappe.model.validate_missing(jvd, "party_type");
 				frappe.model.validate_missing(jvd, "party");

erpnext/accounts/doctype/journal_entry/journal_entry.json

@@ -557,7 +557,7 @@
    "table_fieldname": "payment_entries"
   }
  ],
- "modified": "2024-07-18 15:32:29.413598",
+ "modified": "2023-11-23 12:11:04.128015",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Journal Entry",

erpnext/accounts/doctype/journal_entry/journal_entry.py

@@ -153,7 +153,7 @@ class JournalEntry(AccountsController):
 			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, accounts=self.accounts)
+		stock_accounts = get_stock_accounts(self.company, self.doctype, self.name)
 		for account in stock_accounts:
 			account_bal, stock_bal, warehouse_list = get_stock_and_account_balance(
 				account, self.posting_date, self.company
@@ -433,22 +433,8 @@ class JournalEntry(AccountsController):
 		if customers:
 			from erpnext.selling.doctype.customer.customer import check_credit_limit
 
-			customer_details = frappe._dict(
-				frappe.db.get_all(
-					"Customer Credit Limit",
-					filters={
-						"parent": ["in", customers],
-						"parenttype": ["=", "Customer"],
-						"company": ["=", self.company],
-					},
-					fields=["parent", "bypass_credit_limit_check"],
-					as_list=True,
-				)
-			)
-
 			for customer in customers:
-				ignore_outstanding_sales_order = bool(customer_details.get(customer))
-				check_credit_limit(customer, self.company, ignore_outstanding_sales_order)
+				check_credit_limit(customer, self.company)
 
 	def validate_cheque_info(self):
 		if self.voucher_type in ["Bank Entry"]:

erpnext/accounts/doctype/journal_entry/test_journal_entry.py

@@ -146,12 +146,12 @@ class TestJournalEntry(unittest.TestCase):
 				"credit_in_account_currency": 0 if diff > 0 else abs(diff),
 			},
 		)
+		jv.insert()
 
 		if account_bal == stock_bal:
-			self.assertRaises(StockAccountInvalidTransaction, jv.insert)
+			self.assertRaises(StockAccountInvalidTransaction, jv.submit)
 			frappe.db.rollback()
 		else:
-			jv.insert()
 			jv.submit()
 			jv.cancel()
 

erpnext/accounts/doctype/loyalty_program/loyalty_program.py

@@ -5,7 +5,6 @@
 import frappe
 from frappe import _
 from frappe.model.document import Document
-from frappe.query_builder.functions import Sum
 from frappe.utils import flt, today
 
 
@@ -19,29 +18,21 @@ def get_loyalty_details(
 	if not expiry_date:
 		expiry_date = today()
 
-	LoyaltyPointEntry = frappe.qb.DocType("Loyalty Point Entry")
-
-	query = (
-		frappe.qb.from_(LoyaltyPointEntry)
-		.select(
-			Sum(LoyaltyPointEntry.loyalty_points).as_("loyalty_points"),
-			Sum(LoyaltyPointEntry.purchase_amount).as_("total_spent"),
-		)
-		.where(
-			(LoyaltyPointEntry.customer == customer)
-			& (LoyaltyPointEntry.loyalty_program == loyalty_program)
-			& (LoyaltyPointEntry.posting_date <= expiry_date)
-		)
-		.groupby(LoyaltyPointEntry.customer)
-	)
-
+	condition = ""
 	if company:
-		query = query.where(LoyaltyPointEntry.company == company)
-
+		condition = " and company=%s " % frappe.db.escape(company)
 	if not include_expired_entry:
-		query = query.where(LoyaltyPointEntry.expiry_date >= expiry_date)
+		condition += " and expiry_date>='%s' " % expiry_date
 
-	loyalty_point_details = query.run(as_dict=True)
+	loyalty_point_details = frappe.db.sql(
+		f"""select sum(loyalty_points) as loyalty_points,
+		sum(purchase_amount) as total_spent from `tabLoyalty Point Entry`
+		where customer=%s and loyalty_program=%s and posting_date <= %s
+		{condition}
+		group by customer""",
+		(customer, loyalty_program, expiry_date),
+		as_dict=1,
+	)
 
 	if loyalty_point_details:
 		return loyalty_point_details[0]

erpnext/accounts/doctype/party_link/party_link.py

@@ -60,6 +60,6 @@ def create_party_link(primary_role, primary_party, secondary_party):
 	party_link.secondary_role = "Customer" if primary_role == "Supplier" else "Supplier"
 	party_link.secondary_party = secondary_party
 
-	party_link.save()
+	party_link.save(ignore_permissions=True)
 
 	return party_link

erpnext/accounts/doctype/payment_entry/payment_entry.js

@@ -15,23 +15,14 @@ frappe.ui.form.on('Payment Entry', {
 		}
 
 		erpnext.accounts.dimensions.setup_dimension_filters(frm, frm.doctype);
-
-		if (frm.is_new()) {
-			set_default_party_type(frm);
-		}
 	},
 
 	setup: function(frm) {
 		frm.set_query("paid_from", function() {
 			frm.events.validate_company(frm);
 
-			var account_types = ["Pay", "Internal Transfer"].includes(frm.doc.payment_type) ?
+			var account_types = in_list(["Pay", "Internal Transfer"], frm.doc.payment_type) ?
 				["Bank", "Cash"] : [frappe.boot.party_account_types[frm.doc.party_type]];
-
-			if (frm.doc.party_type == "Shareholder") {
-				account_types.push("Equity");
-			}
-
 			return {
 				filters: {
 					"account_type": ["in", account_types],
@@ -84,11 +75,8 @@ frappe.ui.form.on('Payment Entry', {
 		frm.set_query("paid_to", function() {
 			frm.events.validate_company(frm);
 
-			var account_types = ["Receive", "Internal Transfer"].includes(frm.doc.payment_type) ?
+			var account_types = in_list(["Receive", "Internal Transfer"], frm.doc.payment_type) ?
 				["Bank", "Cash"] : [frappe.boot.party_account_types[frm.doc.party_type]];
-			if (frm.doc.party_type == "Shareholder") {
-				account_types.push("Equity");
-			}
 			return {
 				filters: {
 					"account_type": ["in", account_types],
@@ -133,7 +121,7 @@ frappe.ui.form.on('Payment Entry', {
 
 		frm.set_query('payment_term', 'references', function(frm, cdt, cdn) {
 			const child = locals[cdt][cdn];
-			if (['Purchase Invoice', 'Sales Invoice'].includes(child.reference_doctype) && child.reference_name) {
+			if (in_list(['Purchase Invoice', 'Sales Invoice'], child.reference_doctype) && child.reference_name) {
 				return {
 					query: "erpnext.controllers.queries.get_payment_terms_for_references",
 					filters: {
@@ -157,50 +145,10 @@ frappe.ui.form.on('Payment Entry', {
 				filters: filters
 			};
 		});
-
-		frm.set_query("payment_request", "references", function (doc, cdt, cdn) {
-			const row = frappe.get_doc(cdt, cdn);
-			return {
-				query: "erpnext.accounts.doctype.payment_request.payment_request.get_open_payment_requests_query",
-				filters: {
-					reference_doctype: row.reference_doctype,
-					reference_name: row.reference_name,
-					company: doc.company,
-					status: ["!=", "Paid"],
-					outstanding_amount: [">", 0], // for compatibility with old data
-					docstatus: 1,
-				},
-			};
-		});
-
-		frm.set_query("sales_taxes_and_charges_template", function () {
-			return {
-				filters: {
-					company: frm.doc.company,
-					disabled: false,
-				},
-			};
-		});
-
-		frm.set_query("purchase_taxes_and_charges_template", function () {
-			return {
-				filters: {
-					company: frm.doc.company,
-					disabled: false,
-				},
-			};
-		});
-
-		frm.add_fetch(
-			"payment_request",
-			"outstanding_amount",
-			"payment_request_outstanding",
-			"Payment Entry Reference"
-		);
 	},
 
-	refresh: function (frm) {
-		erpnext.hide_company(frm);
+	refresh: function(frm) {
+		erpnext.hide_company();
 		frm.events.hide_unhide_fields(frm);
 		frm.events.set_dynamic_labels(frm);
 		frm.events.show_general_ledger(frm);
@@ -211,7 +159,6 @@ frappe.ui.form.on('Payment Entry', {
 
 		}
 		erpnext.accounts.unreconcile_payment.add_unreconcile_btn(frm);
-		frappe.flags.allocate_payment_amount = true;
 	},
 
 	validate_company: (frm) => {
@@ -232,7 +179,7 @@ frappe.ui.form.on('Payment Entry', {
 	},
 
 	hide_unhide_fields: function(frm) {
-		var company_currency = frm.doc.company? frappe.get_doc(":Company", frm.doc.company)?.default_currency: "";
+		var company_currency = frm.doc.company? frappe.get_doc(":Company", frm.doc.company).default_currency: "";
 
 		frm.toggle_display("source_exchange_rate",
 			(frm.doc.paid_amount && frm.doc.paid_from_account_currency != company_currency));
@@ -278,7 +225,7 @@ frappe.ui.form.on('Payment Entry', {
 	},
 
 	set_dynamic_labels: function(frm) {
-		var company_currency = frm.doc.company? frappe.get_doc(":Company", frm.doc.company)?.default_currency: "";
+		var company_currency = frm.doc.company? frappe.get_doc(":Company", frm.doc.company).default_currency: "";
 
 		frm.set_currency_labels(["base_paid_amount", "base_received_amount", "base_total_allocated_amount",
 			"difference_amount", "base_paid_amount_after_tax", "base_received_amount_after_tax",
@@ -319,7 +266,7 @@ frappe.ui.form.on('Payment Entry', {
 					"from_date": frm.doc.posting_date,
 					"to_date": moment(frm.doc.modified).format('YYYY-MM-DD'),
 					"company": frm.doc.company,
-					"categorize_by": "",
+					"group_by": "",
 					"show_cancelled_entries": frm.doc.docstatus === 2
 				};
 				frappe.set_route("query-report", "General Ledger");
@@ -328,9 +275,8 @@ frappe.ui.form.on('Payment Entry', {
 	},
 
 	payment_type: function(frm) {
-		set_default_party_type(frm);
 		if(frm.doc.payment_type == "Internal Transfer") {
-			$.each(["party", "party_type", "party_balance", "paid_from", "paid_to",
+			$.each(["party", "party_balance", "paid_from", "paid_to",
 				"references", "total_allocated_amount"], function(i, field) {
 				frm.set_value(field, null);
 			});
@@ -363,12 +309,6 @@ frappe.ui.form.on('Payment Entry', {
 				return {
 					query: "erpnext.controllers.queries.customer_query"
 				}
-			} else if (frm.doc.party_type == "Shareholder") {
-				return {
-					filters: {
-						company: frm.doc.company,
-					},
-				};
 			}
 		});
 
@@ -545,8 +485,8 @@ frappe.ui.form.on('Payment Entry', {
 		if (frm.doc.paid_from_account_currency == company_currency) {
 			frm.set_value("source_exchange_rate", 1);
 		} else if (frm.doc.paid_from){
-			if (["Internal Transfer", "Pay"].includes(frm.doc.payment_type)) {
-				let company_currency = frappe.get_doc(":Company", frm.doc.company)?.default_currency;
+			if (in_list(["Internal Transfer", "Pay"], frm.doc.payment_type)) {
+				let company_currency = frappe.get_doc(":Company", frm.doc.company).default_currency;
 				frappe.call({
 					method: "erpnext.setup.utils.get_exchange_rate",
 					args: {
@@ -662,9 +602,10 @@ frappe.ui.form.on('Payment Entry', {
 		frm.set_value("base_received_amount",
 			flt(frm.doc.received_amount) * flt(frm.doc.target_exchange_rate));
 
-		if (frm.doc.payment_type == "Pay")
-			frm.events.allocate_party_amount_against_ref_docs(frm, frm.doc.received_amount, true);
-		else frm.events.set_unallocated_amount(frm);
+		if(frm.doc.payment_type == "Pay")
+			frm.events.allocate_party_amount_against_ref_docs(frm, frm.doc.received_amount, 1);
+		else
+			frm.events.set_unallocated_amount(frm);
 
 		frm.set_paid_amount_based_on_received_amount = false;
 		frm.events.hide_unhide_fields(frm);
@@ -682,9 +623,10 @@ frappe.ui.form.on('Payment Entry', {
 			frm.set_value("base_received_amount", frm.doc.base_paid_amount);
 		}
 
-		if (frm.doc.payment_type == "Receive")
-			frm.events.allocate_party_amount_against_ref_docs(frm, frm.doc.paid_amount, true);
-		else frm.events.set_unallocated_amount(frm);
+		if(frm.doc.payment_type == "Receive")
+			frm.events.allocate_party_amount_against_ref_docs(frm, frm.doc.paid_amount, 1);
+		else
+			frm.events.set_unallocated_amount(frm);
 	},
 
 	get_outstanding_invoices_or_orders: function(frm, get_outstanding_invoices, get_orders_to_be_billed) {
@@ -828,7 +770,6 @@ frappe.ui.form.on('Payment Entry', {
 						c.outstanding_amount = d.outstanding_amount;
 						c.bill_no = d.bill_no;
 						c.payment_term = d.payment_term;
-						c.payment_term_outstanding = d.payment_term_outstanding;
 						c.allocated_amount = d.allocated_amount;
 
 						if(!in_list(frm.events.get_order_doctypes(frm), d.voucher_type)) {
@@ -870,12 +811,10 @@ frappe.ui.form.on('Payment Entry', {
 					}
 				}
 
-				frm.events.allocate_party_amount_against_ref_docs(
-					frm,
-					frm.doc.payment_type == "Receive" ? frm.doc.paid_amount : frm.doc.received_amount,
-					false
-				);
-			},
+				frm.events.allocate_party_amount_against_ref_docs(frm,
+					(frm.doc.payment_type=="Receive" ? frm.doc.paid_amount : frm.doc.received_amount));
+
+			}
 		});
 	},
 
@@ -887,13 +826,76 @@ frappe.ui.form.on('Payment Entry', {
 		return ["Sales Invoice", "Purchase Invoice"];
 	},
 
-	allocate_party_amount_against_ref_docs: async function (frm, paid_amount, paid_amount_change) {
-		await frm.call("allocate_amount_to_references", {
-			paid_amount: paid_amount,
-			paid_amount_change: paid_amount_change,
-			allocate_payment_amount: frappe.flags.allocate_payment_amount ?? false,
-		});
+	allocate_party_amount_against_ref_docs: function(frm, paid_amount, paid_amount_change) {
+		var total_positive_outstanding_including_order = 0;
+		var total_negative_outstanding = 0;
+		var total_deductions = frappe.utils.sum($.map(frm.doc.deductions || [],
+			function(d) { return flt(d.amount) }));
 
+		paid_amount -= total_deductions;
+
+		$.each(frm.doc.references || [], function(i, row) {
+			if(flt(row.outstanding_amount) > 0)
+				total_positive_outstanding_including_order += flt(row.outstanding_amount);
+			else
+				total_negative_outstanding += Math.abs(flt(row.outstanding_amount));
+		})
+		var allocated_negative_outstanding = 0;
+		if (
+				(frm.doc.payment_type=="Receive" && frm.doc.party_type=="Customer") ||
+				(frm.doc.payment_type=="Pay" && frm.doc.party_type=="Supplier") ||
+				(frm.doc.payment_type=="Pay" && frm.doc.party_type=="Employee")
+			) {
+				if(total_positive_outstanding_including_order > paid_amount) {
+					var remaining_outstanding = total_positive_outstanding_including_order - paid_amount;
+					allocated_negative_outstanding = total_negative_outstanding < remaining_outstanding ?
+						total_negative_outstanding : remaining_outstanding;
+			}
+
+			var allocated_positive_outstanding =  paid_amount + allocated_negative_outstanding;
+		} else if (in_list(["Customer", "Supplier"], frm.doc.party_type)) {
+			total_negative_outstanding = flt(total_negative_outstanding, precision("outstanding_amount"))
+			if(paid_amount > total_negative_outstanding) {
+				if(total_negative_outstanding == 0) {
+					frappe.msgprint(
+						__("Cannot {0} {1} {2} without any negative outstanding invoice", [frm.doc.payment_type,
+							(frm.doc.party_type=="Customer" ? "to" : "from"), frm.doc.party_type])
+					);
+					return false
+				} else {
+					frappe.msgprint(
+						__("Paid Amount cannot be greater than total negative outstanding amount {0}", [total_negative_outstanding])
+					);
+					return false;
+				}
+			} else {
+				allocated_positive_outstanding = total_negative_outstanding - paid_amount;
+				allocated_negative_outstanding = paid_amount +
+					(total_positive_outstanding_including_order < allocated_positive_outstanding ?
+						total_positive_outstanding_including_order : allocated_positive_outstanding)
+			}
+		}
+
+		$.each(frm.doc.references || [], function(i, row) {
+			if (frappe.flags.allocate_payment_amount == 0) {
+				//If allocate payment amount checkbox is unchecked, set zero to allocate amount
+				row.allocated_amount = 0;
+
+			} else if (frappe.flags.allocate_payment_amount != 0 && (!row.allocated_amount || paid_amount_change)) {
+				if (row.outstanding_amount > 0 && allocated_positive_outstanding >= 0) {
+					row.allocated_amount = (row.outstanding_amount >= allocated_positive_outstanding) ?
+						allocated_positive_outstanding : row.outstanding_amount;
+					allocated_positive_outstanding -= flt(row.allocated_amount);
+
+				} else if (row.outstanding_amount < 0 && allocated_negative_outstanding) {
+					row.allocated_amount = (Math.abs(row.outstanding_amount) >= allocated_negative_outstanding) ?
+						-1*allocated_negative_outstanding : row.outstanding_amount;
+					allocated_negative_outstanding -= Math.abs(flt(row.allocated_amount));
+				}
+			}
+		})
+
+		frm.refresh_fields()
 		frm.events.set_total_allocated_amount(frm);
 	},
 
@@ -986,7 +988,7 @@ frappe.ui.form.on('Payment Entry', {
 			}
 
 			if(frm.doc.party_type=="Customer" &&
-				!["Sales Order", "Sales Invoice", "Journal Entry", "Dunning"].includes(row.reference_doctype)
+				!in_list(["Sales Order", "Sales Invoice", "Journal Entry", "Dunning"], row.reference_doctype)
 			) {
 				frappe.model.set_value(row.doctype, row.name, "reference_doctype", null);
 				frappe.msgprint(__("Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice, Journal Entry or Dunning", [row.idx]));
@@ -994,7 +996,7 @@ frappe.ui.form.on('Payment Entry', {
 			}
 
 			if(frm.doc.party_type=="Supplier" &&
-				!["Purchase Order", "Purchase Invoice", "Journal Entry"].includes(row.reference_doctype)
+				!in_list(["Purchase Order", "Purchase Invoice", "Journal Entry"], row.reference_doctype)
 			) {
 				frappe.model.set_value(row.doctype, row.name, "against_voucher_type", null);
 				frappe.msgprint(__("Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry", [row.idx]));
@@ -1078,7 +1080,7 @@ frappe.ui.form.on('Payment Entry', {
 
 	bank_account: function(frm) {
 		const field = frm.doc.payment_type == "Pay" ? "paid_from":"paid_to";
-		if (frm.doc.bank_account && ['Pay', 'Receive'].includes(frm.doc.payment_type)) {
+		if (frm.doc.bank_account && in_list(['Pay', 'Receive'], frm.doc.payment_type)) {
 			frappe.call({
 				method: "erpnext.accounts.doctype.bank_account.bank_account.get_bank_account_details",
 				args: {
@@ -1088,24 +1090,6 @@ frappe.ui.form.on('Payment Entry', {
 					if (r.message) {
 						if (!frm.doc.mode_of_payment) {
 							frm.set_value(field, r.message.account);
-						} else {
-							frappe.call({
-								method: "frappe.client.get_value",
-								args: {
-									doctype: "Mode of Payment Account",
-									filters: {
-										parent: frm.doc.mode_of_payment,
-										company: frm.doc.company,
-									},
-									fieldname: "default_account",
-									parent: "Mode of Payment",
-								},
-								callback: function (res) {
-									if (!res.message.default_account) {
-										frm.set_value(field, r.message.account);
-									}
-								},
-							});
 						}
 						frm.set_value('bank', r.message.bank);
 						frm.set_value('bank_account_no', r.message.bank_account_no);
@@ -1394,62 +1378,6 @@ frappe.ui.form.on('Payment Entry', {
 
 		return current_tax_amount;
 	},
-
-	cost_center: function (frm) {
-		if (frm.doc.posting_date && (frm.doc.paid_from || frm.doc.paid_to)) {
-			return frappe.call({
-				method: "erpnext.accounts.doctype.payment_entry.payment_entry.get_party_and_account_balance",
-				args: {
-					company: frm.doc.company,
-					date: frm.doc.posting_date,
-					paid_from: frm.doc.paid_from,
-					paid_to: frm.doc.paid_to,
-					ptype: frm.doc.party_type,
-					pty: frm.doc.party,
-					cost_center: frm.doc.cost_center,
-				},
-				callback: function (r, rt) {
-					if (r.message) {
-						frappe.run_serially([
-							() => {
-								frm.set_value(
-									"paid_from_account_balance",
-									r.message.paid_from_account_balance
-								);
-								frm.set_value("paid_to_account_balance", r.message.paid_to_account_balance);
-								frm.set_value("party_balance", r.message.party_balance);
-							},
-						]);
-					}
-				},
-			});
-		}
-	},
-
-	after_save: function (frm) {
-		const { matched_payment_requests } = frappe.last_response;
-		if (!matched_payment_requests) return;
-
-		const COLUMN_LABEL = [
-			[__("Reference DocType"), __("Reference Name"), __("Allocated Amount"), __("Payment Request")],
-		];
-
-		frappe.msgprint({
-			title: __("Unset Matched Payment Request"),
-			message: COLUMN_LABEL.concat(matched_payment_requests),
-			as_table: true,
-			wide: true,
-			primary_action: {
-				label: __("Allocate Payment Request"),
-				action() {
-					frappe.hide_msgprint();
-					frm.call("set_matched_payment_requests", { matched_payment_requests }, () => {
-						frm.dirty();
-					});
-				},
-			},
-		});
-	},
 });
 
 
@@ -1467,9 +1395,8 @@ frappe.ui.form.on('Payment Entry Reference', {
 				args: {
 					reference_doctype: row.reference_doctype,
 					reference_name: row.reference_name,
-					party_account_currency:	frm.doc.payment_type == "Receive" ? frm.doc.paid_from_account_currency : frm.doc.paid_to_account_currency,
-					party_type: frm.doc.party_type,
-					party: frm.doc.party,
+					party_account_currency: frm.doc.payment_type=="Receive" ?
+						frm.doc.paid_from_account_currency : frm.doc.paid_to_account_currency
 				},
 				callback: function(r, rt) {
 					if(r.message) {
@@ -1536,18 +1463,35 @@ frappe.ui.form.on('Payment Entry Deduction', {
 
 	deductions_remove: function(frm) {
 		frm.events.set_unallocated_amount(frm);
-	},
-});
-
-function set_default_party_type(frm) {
-	if (frm.doc.party) return;
-
-	let party_type;
-	if (frm.doc.payment_type == "Receive") {
-		party_type = "Customer";
-	} else if (frm.doc.payment_type == "Pay") {
-		party_type = "Supplier";
 	}
+})
+frappe.ui.form.on('Payment Entry', {
+	cost_center: function(frm){
+		if (frm.doc.posting_date && (frm.doc.paid_from||frm.doc.paid_to)) {
+			return frappe.call({
+				method: "erpnext.accounts.doctype.payment_entry.payment_entry.get_party_and_account_balance",
+				args: {
+					company: frm.doc.company,
+					date: frm.doc.posting_date,
+					paid_from: frm.doc.paid_from,
+					paid_to: frm.doc.paid_to,
+					ptype: frm.doc.party_type,
+					pty: frm.doc.party,
+					cost_center: frm.doc.cost_center
+				},
+				callback: function(r, rt) {
+					if(r.message) {
+						frappe.run_serially([
+							() => {
+								frm.set_value("paid_from_account_balance", r.message.paid_from_account_balance);
+								frm.set_value("paid_to_account_balance", r.message.paid_to_account_balance);
+								frm.set_value("party_balance", r.message.party_balance);
+							}
+						]);
 
-	if (party_type) frm.set_value("party_type", party_type);
-}
+					}
+				}
+			});
+		}
+	},
+})

erpnext/accounts/doctype/payment_entry/payment_entry.py

@@ -7,10 +7,9 @@ from functools import reduce
 
 import frappe
 from frappe import ValidationError, _, qb, scrub, throw
-from frappe.query_builder import Tuple
-from frappe.query_builder.functions import Count
 from frappe.utils import cint, comma_or, flt, getdate, nowdate
-from frappe.utils.data import comma_and, fmt_money, get_link_to_form
+from frappe.utils.data import comma_and, fmt_money
+from pypika import Case
 from pypika.functions import Coalesce, Sum
 
 import erpnext
@@ -76,6 +75,7 @@ class PaymentEntry(AccountsController):
 		self.set_exchange_rate()
 		self.validate_mandatory()
 		self.validate_reference_documents()
+		self.set_tax_withholding()
 		self.set_amounts()
 		self.validate_amounts()
 		self.apply_taxes()
@@ -90,20 +90,15 @@ class PaymentEntry(AccountsController):
 		self.validate_allocated_amount()
 		self.validate_paid_invoices()
 		self.ensure_supplier_is_not_blocked()
-		self.set_tax_withholding()
 		self.set_status()
 
-	def before_save(self):
-		self.set_matched_unset_payment_requests_to_response()
-
 	def on_submit(self):
 		if self.difference_amount:
 			frappe.throw(_("Difference Amount must be zero"))
 		self.make_gl_entries()
 		self.update_outstanding_amounts()
+		self.update_advance_paid()
 		self.update_payment_schedule()
-		self.update_payment_requests()
-		self.update_advance_paid()  # advance_paid_status depends on the payment request amount
 		self.set_status()
 
 	def on_cancel(self):
@@ -121,34 +116,30 @@ class PaymentEntry(AccountsController):
 		super().on_cancel()
 		self.make_gl_entries(cancel=1)
 		self.update_outstanding_amounts()
+		self.update_advance_paid()
 		self.delink_advance_entry_references()
 		self.update_payment_schedule(cancel=1)
-		self.update_payment_requests(cancel=True)
-		self.update_advance_paid()  # advance_paid_status depends on the payment request amount
+		self.set_payment_req_status()
 		self.set_status()
 
-	def update_payment_requests(self, cancel=False):
-		from erpnext.accounts.doctype.payment_request.payment_request import (
-			update_payment_requests_as_per_pe_references,
-		)
+	def set_payment_req_status(self):
+		from erpnext.accounts.doctype.payment_request.payment_request import update_payment_req_status
 
-		update_payment_requests_as_per_pe_references(self.references, cancel=cancel)
+		update_payment_req_status(self, None)
 
 	def update_outstanding_amounts(self):
 		self.set_missing_ref_details(force=True)
 
 	def validate_duplicate_entry(self):
-		reference_names = set()
+		reference_names = []
 		for d in self.get("references"):
-			key = (d.reference_doctype, d.reference_name, d.payment_term, d.payment_request)
-			if key in reference_names:
+			if (d.reference_doctype, d.reference_name, d.payment_term) in reference_names:
 				frappe.throw(
 					_("Row #{0}: Duplicate entry in References {1} {2}").format(
 						d.idx, d.reference_doctype, d.reference_name
 					)
 				)
-
-			reference_names.add(key)
+			reference_names.append((d.reference_doctype, d.reference_name, d.payment_term))
 
 	def set_bank_account_data(self):
 		if self.bank_account:
@@ -174,8 +165,6 @@ class PaymentEntry(AccountsController):
 		if self.payment_type == "Internal Transfer":
 			return
 
-		self.validate_allocated_amount_as_per_payment_request()
-
 		if self.party_type in ("Customer", "Supplier"):
 			self.validate_allocated_amount_with_latest_data()
 		else:
@@ -188,27 +177,6 @@ class PaymentEntry(AccountsController):
 				if flt(d.allocated_amount) < 0 and flt(d.allocated_amount) < flt(d.outstanding_amount):
 					frappe.throw(fail_message.format(d.idx))
 
-	def validate_allocated_amount_as_per_payment_request(self):
-		"""
-		Allocated amount should not be greater than the outstanding amount of the Payment Request.
-		"""
-		if not self.references:
-			return
-
-		pr_outstanding_amounts = get_payment_request_outstanding_set_in_references(self.references)
-
-		if not pr_outstanding_amounts:
-			return
-
-		for ref in self.references:
-			if ref.payment_request and ref.allocated_amount > pr_outstanding_amounts[ref.payment_request]:
-				frappe.throw(
-					msg=_(
-						"Row #{0}: Allocated Amount cannot be greater than Outstanding Amount of Payment Request {1}"
-					).format(ref.idx, get_link_to_form("Payment Request", ref.payment_request)),
-					title=_("Invalid Allocated Amount"),
-				)
-
 	def term_based_allocation_enabled_for_reference(
 		self, reference_doctype: str, reference_name: str
 	) -> bool:
@@ -350,25 +318,15 @@ class PaymentEntry(AccountsController):
 				self.set(self.party_account_field, party_account)
 				self.party_account = party_account
 
-		if self.paid_from and (
-			not self.paid_from_account_currency
-			or not self.paid_from_account_balance
-			or not self.paid_from_account_type
-		):
+		if self.paid_from and not (self.paid_from_account_currency or self.paid_from_account_balance):
 			acc = get_account_details(self.paid_from, self.posting_date, self.cost_center)
 			self.paid_from_account_currency = acc.account_currency
 			self.paid_from_account_balance = acc.account_balance
-			self.paid_from_account_type = acc.account_type
 
-		if self.paid_to and (
-			not self.paid_to_account_currency
-			or not self.paid_to_account_balance
-			or not self.paid_to_account_type
-		):
+		if self.paid_to and not (self.paid_to_account_currency or self.paid_to_account_balance):
 			acc = get_account_details(self.paid_to, self.posting_date, self.cost_center)
 			self.paid_to_account_currency = acc.account_currency
 			self.paid_to_account_balance = acc.account_balance
-			self.paid_to_account_type = acc.account_type
 
 		self.party_account_currency = (
 			self.paid_from_account_currency
@@ -390,11 +348,7 @@ class PaymentEntry(AccountsController):
 					continue
 
 				ref_details = get_reference_details(
-					d.reference_doctype,
-					d.reference_name,
-					self.party_account_currency,
-					self.party_type,
-					self.party,
+					d.reference_doctype, d.reference_name, self.party_account_currency
 				)
 
 				# Only update exchange rate when the reference is Journal Entry
@@ -475,7 +429,7 @@ class PaymentEntry(AccountsController):
 			if d.reference_doctype not in valid_reference_doctypes:
 				frappe.throw(
 					_("Reference Doctype must be one of {0}").format(
-						comma_or([_(d) for d in valid_reference_doctypes])
+						comma_or(_(d) for d in valid_reference_doctypes)
 					)
 				)
 
@@ -717,7 +671,9 @@ class PaymentEntry(AccountsController):
 		if not self.apply_tax_withholding_amount:
 			return
 
-		net_total = self.calculate_tax_withholding_net_total()
+		order_amount = self.get_order_net_total()
+
+		net_total = flt(order_amount) + flt(self.unallocated_amount)
 
 		# Adding args as purchase invoice to get TDS amount
 		args = frappe._dict(
@@ -761,26 +717,7 @@ class PaymentEntry(AccountsController):
 		for d in to_remove:
 			self.remove(d)
 
-	def calculate_tax_withholding_net_total(self):
-		net_total = 0
-		order_details = self.get_order_wise_tax_withholding_net_total()
-
-		for d in self.references:
-			tax_withholding_net_total = order_details.get(d.reference_name)
-			if not tax_withholding_net_total:
-				continue
-
-			net_taxable_outstanding = max(
-				0, d.outstanding_amount - (d.total_amount - tax_withholding_net_total)
-			)
-
-			net_total += min(net_taxable_outstanding, d.allocated_amount)
-
-		net_total += self.unallocated_amount
-
-		return net_total
-
-	def get_order_wise_tax_withholding_net_total(self):
+	def get_order_net_total(self):
 		if self.party_type == "Supplier":
 			doctype = "Purchase Order"
 		else:
@@ -788,15 +725,12 @@ class PaymentEntry(AccountsController):
 
 		docnames = [d.reference_name for d in self.references if d.reference_doctype == doctype]
 
-		return frappe._dict(
-			frappe.db.get_all(
-				doctype,
-				filters={"name": ["in", docnames]},
-				fields=["name", "base_tax_withholding_net_total"],
-				as_list=True,
-			)
+		tax_withholding_net_total = frappe.db.get_value(
+			doctype, {"name": ["in", docnames]}, ["sum(base_tax_withholding_net_total)"]
 		)
 
+		return tax_withholding_net_total
+
 	def apply_taxes(self):
 		self.initialize_taxes()
 		self.determine_exclusive_rate()
@@ -1465,380 +1399,6 @@ class PaymentEntry(AccountsController):
 
 		return current_tax_fraction
 
-	def set_matched_unset_payment_requests_to_response(self):
-		"""
-		Find matched Payment Requests for those references which have no Payment Request set.\n
-		And set to `frappe.response` to show in the frontend for allocation.
-		"""
-		if not self.references:
-			return
-
-		matched_payment_requests = get_matched_payment_request_of_references(
-			[row for row in self.references if not row.payment_request]
-		)
-
-		if not matched_payment_requests:
-			return
-
-		frappe.response["matched_payment_requests"] = matched_payment_requests
-
-	@frappe.whitelist()
-	def allocate_amount_to_references(self, paid_amount, paid_amount_change, allocate_payment_amount):
-		"""
-		Allocate `Allocated Amount` and `Payment Request` against `Reference` based on `Paid Amount` and `Outstanding Amount`.\n
-		:param paid_amount: Paid Amount / Received Amount.
-		:param paid_amount_change: Flag to check if `Paid Amount` is changed or not.
-		:param allocate_payment_amount: Flag to allocate amount or not. (Payment Request is also dependent on this flag)
-		"""
-		if not self.references:
-			return
-
-		if not allocate_payment_amount:
-			for ref in self.references:
-				ref.allocated_amount = 0
-			return
-
-		# calculating outstanding amounts
-		precision = self.precision("paid_amount")
-		total_positive_outstanding_including_order = 0
-		total_negative_outstanding = 0
-		paid_amount -= sum(flt(d.amount, precision) for d in self.deductions)
-
-		for ref in self.references:
-			reference_outstanding_amount = ref.outstanding_amount
-			abs_outstanding_amount = abs(reference_outstanding_amount)
-
-			if reference_outstanding_amount > 0:
-				total_positive_outstanding_including_order += abs_outstanding_amount
-			else:
-				total_negative_outstanding += abs_outstanding_amount
-
-		# calculating allocated outstanding amounts
-		allocated_negative_outstanding = 0
-		allocated_positive_outstanding = 0
-
-		# checking party type and payment type
-		if (self.payment_type == "Receive" and self.party_type == "Customer") or (
-			self.payment_type == "Pay" and self.party_type in ("Supplier", "Employee")
-		):
-			if total_positive_outstanding_including_order > paid_amount:
-				remaining_outstanding = flt(
-					total_positive_outstanding_including_order - paid_amount, precision
-				)
-				allocated_negative_outstanding = min(remaining_outstanding, total_negative_outstanding)
-
-			allocated_positive_outstanding = paid_amount + allocated_negative_outstanding
-
-		elif self.party_type in ("Supplier", "Customer"):
-			if paid_amount > total_negative_outstanding:
-				if total_negative_outstanding == 0:
-					frappe.msgprint(
-						_("Cannot {0} from {1} without any negative outstanding invoice").format(
-							self.payment_type,
-							self.party_type,
-						)
-					)
-				else:
-					frappe.msgprint(
-						_("Paid Amount cannot be greater than total negative outstanding amount {0}").format(
-							total_negative_outstanding
-						)
-					)
-
-				return
-
-			else:
-				allocated_positive_outstanding = flt(total_negative_outstanding - paid_amount, precision)
-				allocated_negative_outstanding = paid_amount + min(
-					total_positive_outstanding_including_order, allocated_positive_outstanding
-				)
-
-		# inner function to set `allocated_amount` to those row which have no PR
-		def _allocation_to_unset_pr_row(
-			row, outstanding_amount, allocated_positive_outstanding, allocated_negative_outstanding
-		):
-			if outstanding_amount > 0 and allocated_positive_outstanding >= 0:
-				row.allocated_amount = min(allocated_positive_outstanding, outstanding_amount)
-				allocated_positive_outstanding = flt(
-					allocated_positive_outstanding - row.allocated_amount, precision
-				)
-			elif outstanding_amount < 0 and allocated_negative_outstanding:
-				row.allocated_amount = min(allocated_negative_outstanding, abs(outstanding_amount)) * -1
-				allocated_negative_outstanding = flt(
-					allocated_negative_outstanding - abs(row.allocated_amount), precision
-				)
-			return allocated_positive_outstanding, allocated_negative_outstanding
-
-		# allocate amount based on `paid_amount` is changed or not
-		if not paid_amount_change:
-			for ref in self.references:
-				allocated_positive_outstanding, allocated_negative_outstanding = _allocation_to_unset_pr_row(
-					ref,
-					ref.outstanding_amount,
-					allocated_positive_outstanding,
-					allocated_negative_outstanding,
-				)
-
-			allocate_open_payment_requests_to_references(self.references, self.precision("paid_amount"))
-
-		else:
-			payment_request_outstanding_amounts = (
-				get_payment_request_outstanding_set_in_references(self.references) or {}
-			)
-			references_outstanding_amounts = get_references_outstanding_amount(self.references) or {}
-			remaining_references_allocated_amounts = references_outstanding_amounts.copy()
-
-			# Re allocate amount to those references which have PR set (Higher priority)
-			for ref in self.references:
-				if not (ref.reference_doctype and ref.reference_name and ref.payment_request):
-					continue
-
-				# fetch outstanding_amount of `Reference` (Payment Term) and `Payment Request` to allocate new amount
-				key = (ref.reference_doctype, ref.reference_name, ref.get("payment_term"))
-				reference_outstanding_amount = references_outstanding_amounts[key]
-				pr_outstanding_amount = payment_request_outstanding_amounts[ref.payment_request]
-
-				if reference_outstanding_amount > 0 and allocated_positive_outstanding >= 0:
-					# allocate amount according to outstanding amounts
-					outstanding_amounts = (
-						allocated_positive_outstanding,
-						reference_outstanding_amount,
-						pr_outstanding_amount,
-					)
-
-					ref.allocated_amount = min(outstanding_amounts)
-
-					# update amounts to track allocation
-					allocated_amount = ref.allocated_amount
-					allocated_positive_outstanding = flt(
-						allocated_positive_outstanding - allocated_amount, precision
-					)
-					remaining_references_allocated_amounts[key] = flt(
-						remaining_references_allocated_amounts[key] - allocated_amount, precision
-					)
-					payment_request_outstanding_amounts[ref.payment_request] = flt(
-						payment_request_outstanding_amounts[ref.payment_request] - allocated_amount, precision
-					)
-
-				elif reference_outstanding_amount < 0 and allocated_negative_outstanding:
-					# allocate amount according to outstanding amounts
-					outstanding_amounts = (
-						allocated_negative_outstanding,
-						abs(reference_outstanding_amount),
-						pr_outstanding_amount,
-					)
-
-					ref.allocated_amount = min(outstanding_amounts) * -1
-
-					# update amounts to track allocation
-					allocated_amount = abs(ref.allocated_amount)
-					allocated_negative_outstanding = flt(
-						allocated_negative_outstanding - allocated_amount, precision
-					)
-					remaining_references_allocated_amounts[key] += allocated_amount  # negative amount
-					payment_request_outstanding_amounts[ref.payment_request] = flt(
-						payment_request_outstanding_amounts[ref.payment_request] - allocated_amount, precision
-					)
-			# Re allocate amount to those references which have no PR (Lower priority)
-			for ref in self.references:
-				if ref.payment_request or not (ref.reference_doctype and ref.reference_name):
-					continue
-
-				key = (ref.reference_doctype, ref.reference_name, ref.get("payment_term"))
-				reference_outstanding_amount = remaining_references_allocated_amounts[key]
-
-				allocated_positive_outstanding, allocated_negative_outstanding = _allocation_to_unset_pr_row(
-					ref,
-					reference_outstanding_amount,
-					allocated_positive_outstanding,
-					allocated_negative_outstanding,
-				)
-
-	@frappe.whitelist()
-	def set_matched_payment_requests(self, matched_payment_requests):
-		"""
-		Set `Payment Request` against `Reference` based on `matched_payment_requests`.\n
-		:param matched_payment_requests: List of tuple of matched Payment Requests.
-
-		---
-		Example: [(reference_doctype, reference_name, allocated_amount, payment_request), ...]
-		"""
-		if not self.references or not matched_payment_requests:
-			return
-
-		if isinstance(matched_payment_requests, str):
-			matched_payment_requests = json.loads(matched_payment_requests)
-
-		# modify matched_payment_requests
-		# like (reference_doctype, reference_name, allocated_amount): payment_request
-		payment_requests = {}
-
-		for row in matched_payment_requests:
-			key = tuple(row[:3])
-			payment_requests[key] = row[3]
-
-		for ref in self.references:
-			if ref.payment_request:
-				continue
-
-			key = (ref.reference_doctype, ref.reference_name, ref.allocated_amount)
-
-			if key in payment_requests:
-				ref.payment_request = payment_requests[key]
-				del payment_requests[key]  # to avoid duplicate allocation
-
-
-def get_matched_payment_request_of_references(references=None):
-	"""
-	Get those `Payment Requests` which are matched with `References`.\n
-	    - Amount must be same.
-	    - Only single `Payment Request` available for this amount.
-
-	Example: [(reference_doctype, reference_name, allocated_amount, payment_request), ...]
-	"""
-	if not references:
-		return
-
-	# to fetch matched rows
-	refs = {
-		(row.reference_doctype, row.reference_name, row.allocated_amount)
-		for row in references
-		if row.reference_doctype and row.reference_name and row.allocated_amount
-	}
-
-	if not refs:
-		return
-
-	PR = frappe.qb.DocType("Payment Request")
-
-	# query to group by reference_doctype, reference_name, outstanding_amount
-	subquery = (
-		frappe.qb.from_(PR)
-		.select(
-			PR.reference_doctype,
-			PR.reference_name,
-			PR.outstanding_amount.as_("allocated_amount"),
-			PR.name.as_("payment_request"),
-			Count("*").as_("count"),
-		)
-		.where(Tuple(PR.reference_doctype, PR.reference_name, PR.outstanding_amount).isin(refs))
-		.where(PR.status != "Paid")
-		.where(PR.docstatus == 1)
-		.groupby(PR.reference_doctype, PR.reference_name, PR.outstanding_amount)
-	)
-
-	# query to fetch matched rows which are single
-	matched_prs = (
-		frappe.qb.from_(subquery)
-		.select(
-			subquery.reference_doctype,
-			subquery.reference_name,
-			subquery.allocated_amount,
-			subquery.payment_request,
-		)
-		.where(subquery.count == 1)
-		.run()
-	)
-
-	return matched_prs if matched_prs else None
-
-
-def get_references_outstanding_amount(references=None):
-	"""
-	Fetch accurate outstanding amount of `References`.\n
-	    - If `Payment Term` is set, then fetch outstanding amount from `Payment Schedule`.
-	    - If `Payment Term` is not set, then fetch outstanding amount from `References` it self.
-
-	Example: {(reference_doctype, reference_name, payment_term): outstanding_amount, ...}
-	"""
-	if not references:
-		return
-
-	refs_with_payment_term = get_outstanding_of_references_with_payment_term(references) or {}
-	refs_without_payment_term = get_outstanding_of_references_with_no_payment_term(references) or {}
-
-	return {**refs_with_payment_term, **refs_without_payment_term}
-
-
-def get_outstanding_of_references_with_payment_term(references=None):
-	"""
-	Fetch outstanding amount of `References` which have `Payment Term` set.\n
-	Example: {(reference_doctype, reference_name, payment_term): outstanding_amount, ...}
-	"""
-	if not references:
-		return
-
-	refs = {
-		(row.reference_doctype, row.reference_name, row.payment_term)
-		for row in references
-		if row.reference_doctype and row.reference_name and row.payment_term
-	}
-
-	if not refs:
-		return
-
-	PS = frappe.qb.DocType("Payment Schedule")
-
-	response = (
-		frappe.qb.from_(PS)
-		.select(PS.parenttype, PS.parent, PS.payment_term, PS.outstanding)
-		.where(Tuple(PS.parenttype, PS.parent, PS.payment_term).isin(refs))
-	).run(as_dict=True)
-
-	if not response:
-		return
-
-	return {(row.parenttype, row.parent, row.payment_term): row.outstanding for row in response}
-
-
-def get_outstanding_of_references_with_no_payment_term(references):
-	"""
-	Fetch outstanding amount of `References` which have no `Payment Term` set.\n
-	    - Fetch outstanding amount from `References` it self.
-
-	Note: `None` is used for allocation of `Payment Request`
-	Example: {(reference_doctype, reference_name, None): outstanding_amount, ...}
-	"""
-	if not references:
-		return
-
-	outstanding_amounts = {}
-
-	for ref in references:
-		if ref.payment_term:
-			continue
-
-		key = (ref.reference_doctype, ref.reference_name, None)
-
-		if key not in outstanding_amounts:
-			outstanding_amounts[key] = ref.outstanding_amount
-
-	return outstanding_amounts
-
-
-def get_payment_request_outstanding_set_in_references(references=None):
-	"""
-	Fetch outstanding amount of `Payment Request` which are set in `References`.\n
-	Example: {payment_request: outstanding_amount, ...}
-	"""
-	if not references:
-		return
-
-	referenced_payment_requests = {row.payment_request for row in references if row.payment_request}
-
-	if not referenced_payment_requests:
-		return
-
-	PR = frappe.qb.DocType("Payment Request")
-
-	response = (
-		frappe.qb.from_(PR)
-		.select(PR.name, PR.outstanding_amount)
-		.where(PR.name.isin(referenced_payment_requests))
-	).run()
-
-	return dict(response) if response else None
-
 
 def validate_inclusive_tax(tax, doc):
 	def _on_previous_row_error(row_range):
@@ -1980,7 +1540,7 @@ def get_outstanding_reference_documents(args):
 				d["bill_no"] = frappe.db.get_value(d.voucher_type, d.voucher_no, "bill_no")
 
 		# Get negative outstanding sales /purchase invoices
-		if args.get("party_type") != "Employee":
+		if args.get("party_type") != "Employee" and not args.get("voucher_no"):
 			negative_outstanding_invoices = get_negative_outstanding_invoices(
 				args.get("party_type"),
 				args.get("party"),
@@ -2280,9 +1840,7 @@ def get_party_details(company, party_type, party, date, cost_center=None):
 	account_balance = get_balance_on(party_account, date, cost_center=cost_center)
 	_party_name = "title" if party_type == "Shareholder" else party_type.lower() + "_name"
 	party_name = frappe.db.get_value(party_type, party, _party_name)
-	party_balance = get_balance_on(
-		party_type=party_type, party=party, company=company, cost_center=cost_center
-	)
+	party_balance = get_balance_on(party_type=party_type, party=party, cost_center=cost_center)
 	if party_type in ["Customer", "Supplier"]:
 		bank_account = get_party_bank_account(party_type, party)
 
@@ -2325,42 +1883,33 @@ def get_company_defaults(company):
 	return frappe.get_cached_value("Company", company, fields, as_dict=1)
 
 
-def get_outstanding_on_journal_entry(voucher_no, party_type, party):
-	ple = frappe.qb.DocType("Payment Ledger Entry")
-
-	outstanding = (
-		frappe.qb.from_(ple)
-		.select(Sum(ple.amount_in_account_currency))
-		.where(
-			(ple.against_voucher_no == voucher_no)
-			& (ple.party_type == party_type)
-			& (ple.party == party)
-			& (ple.delinked == 0)
+def get_outstanding_on_journal_entry(name):
+	gl = frappe.qb.DocType("GL Entry")
+	res = (
+		frappe.qb.from_(gl)
+		.select(
+			Case()
+			.when(
+				gl.party_type == "Customer",
+				Coalesce(Sum(gl.debit_in_account_currency - gl.credit_in_account_currency), 0),
+			)
+			.else_(Coalesce(Sum(gl.credit_in_account_currency - gl.debit_in_account_currency), 0))
+			.as_("outstanding_amount")
 		)
-	).run()
-
-	outstanding_amount = outstanding[0][0] if outstanding else 0
-
-	total = (
-		frappe.qb.from_(ple)
-		.select(Sum(ple.amount_in_account_currency))
 		.where(
-			(ple.voucher_no == voucher_no)
-			& (ple.party_type == party_type)
-			& (ple.party == party)
-			& (ple.delinked == 0)
+			(Coalesce(gl.party_type, "") != "")
+			& (gl.is_cancelled == 0)
+			& ((gl.voucher_no == name) | (gl.against_voucher == name))
 		)
-	).run()
+	).run(as_dict=True)
 
-	total_amount = total[0][0] if total else 0
+	outstanding_amount = res[0].get("outstanding_amount", 0) if res else 0
 
-	return outstanding_amount, total_amount
+	return outstanding_amount
 
 
 @frappe.whitelist()
-def get_reference_details(
-	reference_doctype, reference_name, party_account_currency, party_type=None, party=None
-):
+def get_reference_details(reference_doctype, reference_name, party_account_currency):
 	total_amount = outstanding_amount = exchange_rate = None
 
 	ref_doc = frappe.get_doc(reference_doctype, reference_name)
@@ -2371,13 +1920,12 @@ def get_reference_details(
 		exchange_rate = 1
 
 	elif reference_doctype == "Journal Entry" and ref_doc.docstatus == 1:
+		total_amount = ref_doc.get("total_amount")
 		if ref_doc.multi_currency:
 			exchange_rate = get_exchange_rate(party_account_currency, company_currency, ref_doc.posting_date)
 		else:
 			exchange_rate = 1
-			outstanding_amount, total_amount = get_outstanding_on_journal_entry(
-				reference_name, party_type, party
-			)
+			outstanding_amount = get_outstanding_on_journal_entry(reference_name)
 
 	elif reference_doctype != "Journal Entry":
 		if not total_amount:
@@ -2429,8 +1977,6 @@ def get_payment_entry(
 	party_type=None,
 	payment_type=None,
 	reference_date=None,
-	ignore_permissions=False,
-	created_from_payment_request=False,
 ):
 	doc = frappe.get_doc(dt, dn)
 	over_billing_allowance = frappe.db.get_single_value("Accounts Settings", "over_billing_allowance")
@@ -2491,7 +2037,6 @@ def get_payment_entry(
 	pe.paid_amount = paid_amount
 	pe.received_amount = received_amount
 	pe.letter_head = doc.get("letter_head")
-	pe.bank_account = frappe.db.get_value("Bank Account", {"is_company_account": 1, "is_default": 1}, "name")
 
 	if dt in ["Purchase Order", "Sales Order", "Sales Invoice", "Purchase Invoice"]:
 		pe.project = doc.get("project") or reduce(
@@ -2582,180 +2127,9 @@ def get_payment_entry(
 
 		pe.set_difference_amount()
 
-	# If PE is created from PR directly, then no need to find open PRs for the references
-	if not created_from_payment_request:
-		allocate_open_payment_requests_to_references(pe.references, pe.precision("paid_amount"))
-
 	return pe
 
 
-def get_open_payment_requests_for_references(references=None):
-	"""
-	Fetch all unpaid Payment Requests for the references. \n
-	    - Each reference can have multiple Payment Requests. \n
-
-	Example: {("Sales Invoice", "SINV-00001"): {"PREQ-00001": 1000, "PREQ-00002": 2000}}
-	"""
-	if not references:
-		return
-
-	refs = {
-		(row.reference_doctype, row.reference_name)
-		for row in references
-		if row.reference_doctype and row.reference_name and row.allocated_amount
-	}
-
-	if not refs:
-		return
-
-	PR = frappe.qb.DocType("Payment Request")
-
-	response = (
-		frappe.qb.from_(PR)
-		.select(PR.name, PR.reference_doctype, PR.reference_name, PR.outstanding_amount)
-		.where(Tuple(PR.reference_doctype, PR.reference_name).isin(list(refs)))
-		.where(PR.status != "Paid")
-		.where(PR.docstatus == 1)
-		.where(PR.outstanding_amount > 0)  # to avoid old PRs with 0 outstanding amount
-		.orderby(Coalesce(PR.transaction_date, PR.creation), order=frappe.qb.asc)
-	).run(as_dict=True)
-
-	if not response:
-		return
-
-	reference_payment_requests = {}
-
-	for row in response:
-		key = (row.reference_doctype, row.reference_name)
-
-		if key not in reference_payment_requests:
-			reference_payment_requests[key] = {row.name: row.outstanding_amount}
-		else:
-			reference_payment_requests[key][row.name] = row.outstanding_amount
-
-	return reference_payment_requests
-
-
-def allocate_open_payment_requests_to_references(references=None, precision=None):
-	"""
-	Allocate unpaid Payment Requests to the references. \n
-	---
-	- Allocation based on below factors
-	    - Reference Allocated Amount
-	    - Reference Outstanding Amount (With Payment Terms or without Payment Terms)
-	    - Reference Payment Request's outstanding amount
-	---
-	- Allocation based on below scenarios
-	    - Reference's Allocated Amount == Payment Request's Outstanding Amount
-	        - Allocate the Payment Request to the reference
-	        - This PR will not be allocated further
-	    - Reference's Allocated Amount < Payment Request's Outstanding Amount
-	        - Allocate the Payment Request to the reference
-	        - Reduce the PR's outstanding amount by the allocated amount
-	        - This PR can be allocated further
-	    - Reference's Allocated Amount > Payment Request's Outstanding Amount
-	        - Allocate the Payment Request to the reference
-	        - Reduce Allocated Amount of the reference by the PR's outstanding amount
-	        - Create a new row for the remaining amount until the Allocated Amount is 0
-	            - Allocate PR if available
-	---
-	- Note:
-	    - Priority is given to the first Payment Request of respective references.
-	    - Single Reference can have multiple rows.
-	        - With Payment Terms or without Payment Terms
-	        - With Payment Request or without Payment Request
-	"""
-	if not references:
-		return
-
-	# get all unpaid payment requests for the references
-	references_open_payment_requests = get_open_payment_requests_for_references(references)
-
-	if not references_open_payment_requests:
-		return
-
-	if not precision:
-		precision = references[0].precision("allocated_amount")
-
-	# to manage new rows
-	row_number = 1
-	MOVE_TO_NEXT_ROW = 1
-	TO_SKIP_NEW_ROW = 2
-
-	while row_number <= len(references):
-		row = references[row_number - 1]
-		reference_key = (row.reference_doctype, row.reference_name)
-
-		# update the idx to maintain the order
-		row.idx = row_number
-
-		# unpaid payment requests for the reference
-		reference_payment_requests = references_open_payment_requests.get(reference_key)
-
-		if not reference_payment_requests:
-			row_number += MOVE_TO_NEXT_ROW  # to move to next reference row
-			continue
-
-		# get the first payment request and its outstanding amount
-		payment_request, pr_outstanding_amount = next(iter(reference_payment_requests.items()))
-		allocated_amount = row.allocated_amount
-
-		# allocate the payment request to the reference and PR's outstanding amount
-		row.payment_request = payment_request
-
-		if pr_outstanding_amount == allocated_amount:
-			del reference_payment_requests[payment_request]
-			row_number += MOVE_TO_NEXT_ROW
-
-		elif pr_outstanding_amount > allocated_amount:
-			# reduce the outstanding amount of the payment request
-			reference_payment_requests[payment_request] -= allocated_amount
-			row_number += MOVE_TO_NEXT_ROW
-
-		else:
-			# split the reference row to allocate the remaining amount
-			del reference_payment_requests[payment_request]
-			row.allocated_amount = pr_outstanding_amount
-			allocated_amount = flt(allocated_amount - pr_outstanding_amount, precision)
-
-			# set the remaining amount to the next row
-			while allocated_amount:
-				# create a new row for the remaining amount
-				new_row = frappe.copy_doc(row)
-				references.insert(row_number, new_row)
-
-				# get the first payment request and its outstanding amount
-				payment_request, pr_outstanding_amount = next(
-					iter(reference_payment_requests.items()), (None, None)
-				)
-
-				# update new row
-				new_row.idx = row_number + 1
-				new_row.payment_request = payment_request
-				new_row.allocated_amount = min(
-					pr_outstanding_amount if pr_outstanding_amount else allocated_amount, allocated_amount
-				)
-
-				if not payment_request or not pr_outstanding_amount:
-					row_number += TO_SKIP_NEW_ROW
-					break
-
-				elif pr_outstanding_amount == allocated_amount:
-					del reference_payment_requests[payment_request]
-					row_number += TO_SKIP_NEW_ROW
-					break
-
-				elif pr_outstanding_amount > allocated_amount:
-					reference_payment_requests[payment_request] -= allocated_amount
-					row_number += TO_SKIP_NEW_ROW
-					break
-
-				else:
-					allocated_amount = flt(allocated_amount - pr_outstanding_amount, precision)
-					del reference_payment_requests[payment_request]
-					row_number += MOVE_TO_NEXT_ROW
-
-
 def update_accounting_dimensions(pe, doc):
 	"""
 	Updates accounting dimensions in Payment Entry based on the accounting dimensions in the reference document

erpnext/accounts/doctype/payment_entry/test_payment_entry.py

@@ -1087,9 +1087,7 @@ class TestPaymentEntry(FrappeTestCase):
 		pe.source_exchange_rate = 50
 		pe.save()
 
-		ref_details = get_reference_details(
-			so.doctype, so.name, pe.paid_from_account_currency, "Customer", so.customer
-		)
+		ref_details = get_reference_details(so.doctype, so.name, pe.paid_from_account_currency)
 		expected_response = {
 			"total_amount": 5000.0,
 			"outstanding_amount": 5000.0,
@@ -1365,79 +1363,6 @@ class TestPaymentEntry(FrappeTestCase):
 		expected_out_str = json.dumps(sorted(expected_pl_entries, key=json.dumps))
 		self.assertEqual(out_str, expected_out_str)
 
-	@change_settings("Accounts Settings", {"delete_linked_ledger_entries": 1})
-	def test_delete_linked_exchange_gain_loss_journal(self):
-		from erpnext.accounts.doctype.account.test_account import create_account
-		from erpnext.accounts.doctype.opening_invoice_creation_tool.test_opening_invoice_creation_tool import (
-			make_customer,
-		)
-
-		debtors = create_account(
-			account_name="Debtors USD",
-			parent_account="Accounts Receivable - _TC",
-			company="_Test Company",
-			account_currency="USD",
-			account_type="Receivable",
-		)
-
-		# create a customer
-		customer = make_customer(customer="_Test Party USD")
-		cust_doc = frappe.get_doc("Customer", customer)
-		cust_doc.default_currency = "USD"
-		test_account_details = {
-			"company": "_Test Company",
-			"account": debtors,
-		}
-		cust_doc.append("accounts", test_account_details)
-		cust_doc.save()
-
-		# create a sales invoice
-		si = create_sales_invoice(
-			customer=customer,
-			currency="USD",
-			conversion_rate=83.970000000,
-			debit_to=debtors,
-			do_not_save=1,
-		)
-		si.party_account_currency = "USD"
-		si.save()
-		si.submit()
-
-		# create a payment entry for the invoice
-		pe = get_payment_entry("Sales Invoice", si.name)
-		pe.reference_no = "1"
-		pe.reference_date = frappe.utils.nowdate()
-		pe.paid_amount = 100
-		pe.source_exchange_rate = 90
-		pe.append(
-			"deductions",
-			{
-				"account": "_Test Exchange Gain/Loss - _TC",
-				"cost_center": "_Test Cost Center - _TC",
-				"amount": 2710,
-			},
-		)
-		pe.save()
-		pe.submit()
-
-		# check creation of journal entry
-		jv = frappe.get_all(
-			"Journal Entry Account",
-			{"reference_type": pe.doctype, "reference_name": pe.name, "docstatus": 1},
-			pluck="parent",
-		)
-		self.assertTrue(jv)
-
-		# check cancellation of payment entry and journal entry
-		pe.cancel()
-		self.assertTrue(pe.docstatus == 2)
-		self.assertTrue(frappe.db.get_value("Journal Entry", {"name": jv[0]}, "docstatus") == 2)
-
-		# check deletion of payment entry and journal entry
-		pe.delete()
-		self.assertRaises(frappe.DoesNotExistError, frappe.get_doc, pe.doctype, pe.name)
-		self.assertRaises(frappe.DoesNotExistError, frappe.get_doc, "Journal Entry", jv[0])
-
 
 def create_payment_entry(**args):
 	payment_entry = frappe.new_doc("Payment Entry")

erpnext/accounts/doctype/payment_entry_reference/payment_entry_reference.json

@@ -10,15 +10,12 @@
   "due_date",
   "bill_no",
   "payment_term",
-  "payment_term_outstanding",
   "column_break_4",
   "total_amount",
   "outstanding_amount",
   "allocated_amount",
   "exchange_rate",
-  "exchange_gain_loss",
-  "payment_request",
-  "payment_request_outstanding"
+  "exchange_gain_loss"
  ],
  "fields": [
   {
@@ -104,33 +101,12 @@
    "label": "Exchange Gain/Loss",
    "options": "Company:company:default_currency",
    "read_only": 1
-  },
-  {
-   "fieldname": "payment_request",
-   "fieldtype": "Link",
-   "label": "Payment Request",
-   "options": "Payment Request"
-  },
-  {
-   "depends_on": "eval: doc.payment_term",
-   "fieldname": "payment_term_outstanding",
-   "fieldtype": "Float",
-   "label": "Payment Term Outstanding",
-   "read_only": 1
-  },
-  {
-   "depends_on": "eval: doc.payment_request && doc.payment_request_outstanding",
-   "fieldname": "payment_request_outstanding",
-   "fieldtype": "Float",
-   "is_virtual": 1,
-   "label": "Payment Request Outstanding",
-   "read_only": 1
   }
  ],
  "index_web_pages_for_search": 1,
  "istable": 1,
  "links": [],
- "modified": "2024-09-16 18:11:50.019343",
+ "modified": "2022-12-12 12:31:44.919895",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Payment Entry Reference",

erpnext/accounts/doctype/payment_entry_reference/payment_entry_reference.py

@@ -1,14 +1,9 @@
 # Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and contributors
 # For license information, please see license.txt
 
-import frappe
+
 from frappe.model.document import Document
 
 
 class PaymentEntryReference(Document):
-	@property
-	def payment_request_outstanding(self):
-		if not self.payment_request:
-			return
-
-		return frappe.db.get_value("Payment Request", self.payment_request, "outstanding_amount")
+	pass

erpnext/accounts/doctype/payment_order/payment_order.js

@@ -36,7 +36,7 @@ frappe.ui.form.on("Payment Order", {
 
 		// payment Entry
 		if (frm.doc.docstatus === 1 && frm.doc.payment_order_type === "Payment Request") {
-			frm.add_custom_button(__("Create Journal Entries"), function () {
+			frm.add_custom_button(__("Create Payment Entries"), function () {
 				frm.trigger("make_payment_records");
 			});
 		}

erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py

@@ -144,14 +144,12 @@ class PaymentReconciliation(Document):
 		if self.get("cost_center"):
 			conditions.append(jea.cost_center == self.cost_center)
 
-		account_type = erpnext.get_party_account_type(self.party_type)
-
-		if account_type == "Receivable":
-			dr_or_cr = jea.credit_in_account_currency - jea.debit_in_account_currency
-		elif account_type == "Payable":
-			dr_or_cr = jea.debit_in_account_currency - jea.credit_in_account_currency
-
-		conditions.append(dr_or_cr.gt(0))
+		dr_or_cr = (
+			"credit_in_account_currency"
+			if erpnext.get_party_account_type(self.party_type) == "Receivable"
+			else "debit_in_account_currency"
+		)
+		conditions.append(jea[dr_or_cr].gt(0))
 
 		if self.bank_cash_account:
 			conditions.append(jea.against_account.like(f"%%{self.bank_cash_account}%%"))
@@ -166,7 +164,7 @@ class PaymentReconciliation(Document):
 				je.posting_date,
 				je.remark.as_("remarks"),
 				jea.name.as_("reference_row"),
-				dr_or_cr.as_("amount"),
+				jea[dr_or_cr].as_("amount"),
 				jea.is_advance,
 				jea.exchange_rate,
 				jea.account_currency.as_("currency"),
@@ -202,7 +200,6 @@ class PaymentReconciliation(Document):
 		conditions.append(doc.docstatus == 1)
 		conditions.append(doc[frappe.scrub(self.party_type)] == self.party)
 		conditions.append(doc.is_return == 1)
-		conditions.append(doc.outstanding_amount != 0)
 
 		if self.payment_name:
 			conditions.append(doc.name.like(f"%{self.payment_name}%"))
@@ -258,7 +255,6 @@ class PaymentReconciliation(Document):
 								"posting_date": inv.posting_date,
 								"currency": inv.currency,
 								"cost_center": inv.cost_center,
-								"remarks": inv.remarks,
 							}
 						)
 					)
@@ -270,7 +266,6 @@ class PaymentReconciliation(Document):
 		for payment in non_reconciled_payments:
 			row = self.append("payments", {})
 			row.update(payment)
-			row.is_advance = payment.book_advance_payments_in_separate_party_account
 
 	def get_invoice_entries(self):
 		# Fetch JVs, Sales and Purchase Invoices for 'invoices' to reconcile against
@@ -302,10 +297,6 @@ class PaymentReconciliation(Document):
 		if self.invoice_limit:
 			non_reconciled_invoices = non_reconciled_invoices[: self.invoice_limit]
 
-		non_reconciled_invoices = sorted(
-			non_reconciled_invoices, key=lambda k: k["posting_date"] or getdate(nowdate())
-		)
-
 		self.add_invoice_entries(non_reconciled_invoices)
 
 	def add_invoice_entries(self, non_reconciled_invoices):
@@ -355,9 +346,6 @@ class PaymentReconciliation(Document):
 	def allocate_entries(self, args):
 		self.validate_entries()
 
-		exc_gain_loss_posting_date = frappe.db.get_single_value(
-			"Accounts Settings", "exchange_gain_loss_posting_date", cache=True
-		)
 		invoice_exchange_map = self.get_invoice_exchange_map(args.get("invoices"), args.get("payments"))
 		default_exchange_gain_loss_account = frappe.get_cached_value(
 			"Company", self.company, "exchange_gain_loss_account"
@@ -384,11 +372,6 @@ class PaymentReconciliation(Document):
 				res.difference_account = default_exchange_gain_loss_account
 				res.exchange_rate = inv.get("exchange_rate")
 				res.update({"gain_loss_posting_date": pay.get("posting_date")})
-				if not pay.get("is_advance"):
-					if exc_gain_loss_posting_date == "Invoice":
-						res.update({"gain_loss_posting_date": inv.get("invoice_date")})
-					elif exc_gain_loss_posting_date == "Reconciliation Date":
-						res.update({"gain_loss_posting_date": nowdate()})
 
 				if pay.get("amount") == 0:
 					entries.append(res)

erpnext/accounts/doctype/payment_reconciliation/test_payment_reconciliation.py

@@ -615,42 +615,6 @@ class TestPaymentReconciliation(FrappeTestCase):
 		self.assertEqual(len(pr.get("invoices")), 0)
 		self.assertEqual(len(pr.get("payments")), 0)
 
-	def test_negative_debit_or_credit_journal_against_invoice(self):
-		transaction_date = nowdate()
-		amount = 100
-		si = self.create_sales_invoice(qty=1, rate=amount, posting_date=transaction_date)
-
-		# credit debtors account to record a payment
-		je = self.create_journal_entry(self.bank, self.debit_to, amount, transaction_date)
-		je.accounts[1].party_type = "Customer"
-		je.accounts[1].party = self.customer
-		je.accounts[1].credit_in_account_currency = 0
-		je.accounts[1].debit_in_account_currency = -1 * amount
-		je.save()
-		je.submit()
-
-		pr = self.create_payment_reconciliation()
-
-		pr.get_unreconciled_entries()
-		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
-		si.reload()
-		self.assertEqual(si.status, "Paid")
-		self.assertEqual(si.outstanding_amount, 0)
-
-		# check PR tool output
-		self.assertEqual(len(pr.get("invoices")), 0)
-		self.assertEqual(len(pr.get("payments")), 0)
-
 	def test_journal_against_journal(self):
 		transaction_date = nowdate()
 		sales = "Sales - _PR"
@@ -973,100 +937,6 @@ class TestPaymentReconciliation(FrappeTestCase):
 			frappe.db.get_value("Journal Entry", jea_parent.parent, "voucher_type"), "Exchange Gain Or Loss"
 		)
 
-	def test_difference_amount_via_negative_debit_or_credit_journal_entry(self):
-		# Make Sale Invoice
-		si = self.create_sales_invoice(
-			qty=1, rate=100, posting_date=nowdate(), do_not_save=True, do_not_submit=True
-		)
-		si.customer = self.customer4
-		si.currency = "EUR"
-		si.conversion_rate = 85
-		si.debit_to = self.debtors_eur
-		si.save().submit()
-
-		# Make payment using Journal Entry
-		je1 = self.create_journal_entry("HDFC - _PR", self.debtors_eur, 100, nowdate())
-		je1.multi_currency = 1
-		je1.accounts[0].exchange_rate = 1
-		je1.accounts[0].credit_in_account_currency = -8000
-		je1.accounts[0].credit = -8000
-		je1.accounts[0].debit_in_account_currency = 0
-		je1.accounts[0].debit = 0
-		je1.accounts[1].party_type = "Customer"
-		je1.accounts[1].party = self.customer4
-		je1.accounts[1].exchange_rate = 80
-		je1.accounts[1].credit_in_account_currency = 100
-		je1.accounts[1].credit = 8000
-		je1.accounts[1].debit_in_account_currency = 0
-		je1.accounts[1].debit = 0
-		je1.save()
-		je1.submit()
-
-		je2 = self.create_journal_entry("HDFC - _PR", self.debtors_eur, 200, nowdate())
-		je2.multi_currency = 1
-		je2.accounts[0].exchange_rate = 1
-		je2.accounts[0].credit_in_account_currency = -16000
-		je2.accounts[0].credit = -16000
-		je2.accounts[0].debit_in_account_currency = 0
-		je2.accounts[0].debit = 0
-		je2.accounts[1].party_type = "Customer"
-		je2.accounts[1].party = self.customer4
-		je2.accounts[1].exchange_rate = 80
-		je2.accounts[1].credit_in_account_currency = 200
-		je1.accounts[1].credit = 16000
-		je1.accounts[1].debit_in_account_currency = 0
-		je1.accounts[1].debit = 0
-		je2.save()
-		je2.submit()
-
-		pr = self.create_payment_reconciliation()
-		pr.party = self.customer4
-		pr.receivable_payable_account = self.debtors_eur
-		pr.get_unreconciled_entries()
-
-		self.assertEqual(len(pr.invoices), 1)
-		self.assertEqual(len(pr.payments), 2)
-
-		# Test exact payment allocation
-		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, 100)
-		self.assertEqual(pr.allocation[0].difference_amount, -500)
-
-		# Test partial payment allocation (with excess payment entry)
-		pr.set("allocation", [])
-		pr.get_unreconciled_entries()
-		invoices = [x.as_dict() for x in pr.invoices]
-		payments = [pr.payments[1].as_dict()]
-		pr.allocate_entries(frappe._dict({"invoices": invoices, "payments": payments}))
-		pr.allocation[0].difference_account = "Exchange Gain/Loss - _PR"
-
-		self.assertEqual(pr.allocation[0].allocated_amount, 100)
-		self.assertEqual(pr.allocation[0].difference_amount, -500)
-
-		# Check if difference journal entry gets generated for difference amount after reconciliation
-		pr.reconcile()
-		total_credit_amount = frappe.db.get_all(
-			"Journal Entry Account",
-			{"account": self.debtors_eur, "docstatus": 1, "reference_name": si.name},
-			"sum(credit) as amount",
-			group_by="reference_name",
-		)[0].amount
-
-		# total credit includes the exchange gain/loss amount
-		self.assertEqual(flt(total_credit_amount, 2), 8500)
-
-		jea_parent = frappe.db.get_all(
-			"Journal Entry Account",
-			filters={"account": self.debtors_eur, "docstatus": 1, "reference_name": si.name, "credit": 500},
-			fields=["parent"],
-		)[0]
-		self.assertEqual(
-			frappe.db.get_value("Journal Entry", jea_parent.parent, "voucher_type"), "Exchange Gain Or Loss"
-		)
-
 	def test_difference_amount_via_payment_entry(self):
 		# Make Sale Invoice
 		si = self.create_sales_invoice(
@@ -1465,46 +1335,6 @@ class TestPaymentReconciliation(FrappeTestCase):
 		# Should not raise frappe.exceptions.ValidationError: Payment Entry has been modified after you pulled it. Please pull it again.
 		pr.reconcile()
 
-	def test_cr_note_payment_limit_filter(self):
-		transaction_date = nowdate()
-		amount = 100
-
-		for _ in range(6):
-			self.create_sales_invoice(qty=1, rate=amount, posting_date=transaction_date)
-			cr_note = self.create_sales_invoice(
-				qty=-1, rate=amount, posting_date=transaction_date, do_not_save=True, do_not_submit=True
-			)
-			cr_note.is_return = 1
-			cr_note = cr_note.save().submit()
-
-		pr = self.create_payment_reconciliation()
-
-		pr.get_unreconciled_entries()
-		self.assertEqual(len(pr.invoices), 6)
-		self.assertEqual(len(pr.payments), 6)
-		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}))
-		pr.reconcile()
-
-		pr.get_unreconciled_entries()
-		self.assertEqual(pr.get("invoices"), [])
-		self.assertEqual(pr.get("payments"), [])
-
-		self.create_sales_invoice(qty=1, rate=amount, posting_date=transaction_date)
-		cr_note = self.create_sales_invoice(
-			qty=-1, rate=amount, posting_date=transaction_date, do_not_save=True, do_not_submit=True
-		)
-		cr_note.is_return = 1
-		cr_note = cr_note.save().submit()
-
-		# Limit should not affect in fetching the unallocated cr_note
-		pr.invoice_limit = 5
-		pr.payment_limit = 5
-		pr.get_unreconciled_entries()
-		self.assertEqual(len(pr.invoices), 1)
-		self.assertEqual(len(pr.payments), 1)
-
 
 def make_customer(customer_name, currency=None):
 	if not frappe.db.exists("Customer", customer_name):

erpnext/accounts/doctype/payment_reconciliation_payment/payment_reconciliation_payment.json

@@ -14,7 +14,7 @@
   "amount",
   "difference_amount",
   "sec_break1",
-  "remarks",
+  "remark",
   "currency",
   "exchange_rate",
   "cost_center"
@@ -74,6 +74,12 @@
    "fieldname": "sec_break1",
    "fieldtype": "Section Break"
   },
+  {
+   "fieldname": "remark",
+   "fieldtype": "Small Text",
+   "label": "Remark",
+   "read_only": 1
+  },
   {
    "fieldname": "currency",
    "fieldtype": "Link",
@@ -99,18 +105,12 @@
    "fieldtype": "Link",
    "label": "Cost Center",
    "options": "Cost Center"
-  },
-  {
-   "fieldname": "remarks",
-   "fieldtype": "Small Text",
-   "label": "Remarks",
-   "read_only": 1
   }
  ],
  "is_virtual": 1,
  "istable": 1,
  "links": [],
- "modified": "2024-10-29 16:24:43.021230",
+ "modified": "2023-11-17 17:33:34.818530",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Payment Reconciliation Payment",

erpnext/accounts/doctype/payment_request/payment_request.js

@@ -28,7 +28,7 @@ frappe.ui.form.on("Payment Request", "refresh", function (frm) {
 	if (
 		frm.doc.payment_request_type == "Inward" &&
 		frm.doc.payment_channel !== "Phone" &&
-		!["Initiated", "Paid"].includes(frm.doc.status) &&
+		!in_list(["Initiated", "Paid"], frm.doc.status) &&
 		!frm.doc.__islocal &&
 		frm.doc.docstatus == 1
 	) {
@@ -48,8 +48,8 @@ frappe.ui.form.on("Payment Request", "refresh", function (frm) {
 	}
 
 	if (
-		frm.doc.payment_request_type == "Outward" &&
-		["Initiated", "Partially Paid"].includes(frm.doc.status)
+		(!frm.doc.payment_gateway_account || frm.doc.payment_request_type == "Outward") &&
+		frm.doc.status == "Initiated"
 	) {
 		frm.add_custom_button(__("Create Payment Entry"), function () {
 			frappe.call({

erpnext/accounts/doctype/payment_request/payment_request.json

@@ -18,11 +18,9 @@
   "reference_name",
   "transaction_details",
   "grand_total",
-  "currency",
   "is_a_subscription",
   "column_break_18",
-  "outstanding_amount",
-  "party_account_currency",
+  "currency",
   "subscription_section",
   "subscription_plans",
   "bank_account_details",
@@ -70,7 +68,6 @@
   {
    "fieldname": "transaction_date",
    "fieldtype": "Date",
-   "in_preview": 1,
    "label": "Transaction Date"
   },
   {
@@ -135,8 +132,7 @@
    "no_copy": 1,
    "options": "reference_doctype",
    "print_hide": 1,
-   "read_only": 1,
-   "search_index": 1
+   "read_only": 1
   },
   {
    "fieldname": "transaction_details",
@@ -144,14 +140,11 @@
    "label": "Transaction Details"
   },
   {
-   "description": "Amount in transaction currency",
+   "description": "Amount in customer's currency",
    "fieldname": "grand_total",
    "fieldtype": "Currency",
-   "in_preview": 1,
    "label": "Amount",
-   "non_negative": 1,
-   "options": "currency",
-   "reqd": 1
+   "options": "currency"
   },
   {
    "default": "0",
@@ -395,31 +388,13 @@
    "fieldtype": "Link",
    "label": "Project",
    "options": "Project"
-  },
-  {
-   "depends_on": "eval: doc.docstatus === 1",
-   "description": "Amount in party's bank account currency",
-   "fieldname": "outstanding_amount",
-   "fieldtype": "Currency",
-   "in_preview": 1,
-   "label": "Outstanding Amount",
-   "non_negative": 1,
-   "options": "party_account_currency",
-   "read_only": 1
-  },
-  {
-   "fieldname": "party_account_currency",
-   "fieldtype": "Link",
-   "label": "Party Account Currency",
-   "options": "Currency",
-   "read_only": 1
   }
  ],
  "in_create": 1,
  "index_web_pages_for_search": 1,
  "is_submittable": 1,
  "links": [],
- "modified": "2024-09-16 17:50:54.440090",
+ "modified": "2022-12-21 16:56:40.115737",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Payment Request",
@@ -454,8 +429,7 @@
    "write": 1
   }
  ],
- "show_preview_popup": 1,
  "sort_field": "modified",
  "sort_order": "DESC",
  "states": []
-}
+}

erpnext/accounts/doctype/payment_request/payment_request.py

@@ -7,11 +7,9 @@ import json
 import frappe
 from frappe import _
 from frappe.model.document import Document
-from frappe.query_builder.functions import Sum
 from frappe.utils import flt, get_url, nowdate
 from frappe.utils.background_jobs import enqueue
 
-from erpnext import get_company_currency
 from erpnext.accounts.doctype.accounting_dimension.accounting_dimension import (
 	get_accounting_dimensions,
 )
@@ -21,7 +19,7 @@ from erpnext.accounts.doctype.payment_entry.payment_entry import (
 )
 from erpnext.accounts.doctype.subscription_plan.subscription_plan import get_plan_rate
 from erpnext.accounts.party import get_party_account, get_party_bank_account
-from erpnext.accounts.utils import get_account_currency, get_currency_precision
+from erpnext.accounts.utils import get_account_currency
 from erpnext.erpnext_integrations.stripe_integration import create_stripe_subscription
 from erpnext.utilities import payment_app_import_guard
 
@@ -47,12 +45,6 @@ class PaymentRequest(Document):
 			frappe.throw(_("To create a Payment Request reference document is required"))
 
 	def validate_payment_request_amount(self):
-		if self.grand_total == 0:
-			frappe.throw(
-				_("{0} cannot be zero").format(self.get_label_from_fieldname("grand_total")),
-				title=_("Invalid Amount"),
-			)
-
 		existing_payment_request_amount = flt(
 			get_existing_payment_request_amount(self.reference_doctype, self.reference_name)
 		)
@@ -100,29 +92,6 @@ class PaymentRequest(Document):
 					).format(self.grand_total, amount)
 				)
 
-	def before_submit(self):
-		company = frappe.get_value(self.reference_doctype, self.reference_name, "company")
-		if (
-			self.currency != self.party_account_currency
-			and self.party_account_currency == get_company_currency(company)
-		):
-			# set outstanding amount in party account currency
-			invoice = frappe.get_value(
-				self.reference_doctype,
-				self.reference_name,
-				["rounded_total", "grand_total", "base_rounded_total", "base_grand_total"],
-				as_dict=1,
-			)
-			grand_total = invoice.get("rounded_total") or invoice.get("grand_total")
-			base_grand_total = invoice.get("base_rounded_total") or invoice.get("base_grand_total")
-			self.outstanding_amount = flt(
-				self.grand_total / grand_total * base_grand_total,
-				self.precision("outstanding_amount"),
-			)
-
-		else:
-			self.outstanding_amount = self.grand_total
-
 	def on_submit(self):
 		if self.payment_request_type == "Outward":
 			self.db_set("status", "Initiated")
@@ -238,21 +207,20 @@ class PaymentRequest(Document):
 		return controller.get_payment_url(
 			**{
 				"amount": flt(self.grand_total, self.precision("grand_total")),
-				"title": data.company,
-				"description": self.subject,
+				"title": data.company.encode("utf-8"),
+				"description": self.subject.encode("utf-8"),
 				"reference_doctype": "Payment Request",
 				"reference_docname": self.name,
 				"payer_email": self.email_to or frappe.session.user,
-				"payer_name": data.customer_name,
+				"payer_name": frappe.safe_encode(data.customer_name),
 				"order_id": self.name,
 				"currency": self.currency,
-				"payment_gateway": self.payment_gateway,
 			}
 		)
 
 	def set_as_paid(self):
 		if self.payment_channel == "Phone":
-			self.db_set({"status": "Paid", "outstanding_amount": 0})
+			self.db_set("status", "Paid")
 
 		else:
 			payment_entry = self.create_payment_entry()
@@ -273,32 +241,26 @@ class PaymentRequest(Document):
 		else:
 			party_account = get_party_account("Customer", ref_doc.get("customer"), ref_doc.company)
 
-		party_account_currency = (
-			self.get("party_account_currency")
-			or ref_doc.get("party_account_currency")
-			or get_account_currency(party_account)
-		)
-
-		party_amount = bank_amount = self.outstanding_amount
+		party_account_currency = ref_doc.get("party_account_currency") or get_account_currency(party_account)
 
+		bank_amount = self.grand_total
 		if party_account_currency == ref_doc.company_currency and party_account_currency != self.currency:
-			exchange_rate = ref_doc.get("conversion_rate")
-			bank_amount = flt(self.outstanding_amount / exchange_rate, self.precision("grand_total"))
+			party_amount = ref_doc.get("base_rounded_total") or ref_doc.get("base_grand_total")
+		else:
+			party_amount = self.grand_total
 
-		# outstanding amount is already in Part's account currency
 		payment_entry = get_payment_entry(
 			self.reference_doctype,
 			self.reference_name,
 			party_amount=party_amount,
 			bank_account=self.payment_account,
 			bank_amount=bank_amount,
-			created_from_payment_request=True,
 		)
 
 		payment_entry.update(
 			{
 				"mode_of_payment": self.mode_of_payment,
-				"reference_no": self.name,  # to prevent validation error
+				"reference_no": self.name,
 				"reference_date": nowdate(),
 				"remarks": "Payment Entry against {} {} via Payment Request {}".format(
 					self.reference_doctype, self.reference_name, self.name
@@ -306,9 +268,6 @@ class PaymentRequest(Document):
 			}
 		)
 
-		# Allocate payment_request for each reference in payment_entry (Payment Term can splits the row)
-		self._allocate_payment_request_to_pe_references(references=payment_entry.references)
-
 		# Update dimensions
 		payment_entry.update(
 			{
@@ -317,16 +276,13 @@ class PaymentRequest(Document):
 			}
 		)
 
-		# Update 'Paid Amount' on Forex transactions
-		if self.currency != ref_doc.company_currency:
-			if (
-				self.payment_request_type == "Outward"
-				and payment_entry.paid_from_account_currency == ref_doc.company_currency
-				and payment_entry.paid_from_account_currency != payment_entry.paid_to_account_currency
-			):
-				payment_entry.paid_amount = payment_entry.base_paid_amount = (
-					payment_entry.target_exchange_rate * payment_entry.received_amount
-				)
+		if party_account_currency == ref_doc.company_currency and party_account_currency != self.currency:
+			amount = payment_entry.base_paid_amount
+		else:
+			amount = self.grand_total
+
+		payment_entry.received_amount = amount
+		payment_entry.get("references")[0].allocated_amount = amount
 
 		for dimension in get_accounting_dimensions():
 			payment_entry.update({dimension: self.get(dimension)})
@@ -430,62 +386,6 @@ class PaymentRequest(Document):
 		if payment_provider == "stripe":
 			return create_stripe_subscription(gateway_controller, data)
 
-	def _allocate_payment_request_to_pe_references(self, references):
-		"""
-		Allocate the Payment Request to the Payment Entry references based on\n
-		    - Allocated Amount.
-		    - Outstanding Amount of Payment Request.\n
-		Payment Request is doc itself and references are the rows of Payment Entry.
-		"""
-		if len(references) == 1:
-			references[0].payment_request = self.name
-			return
-
-		precision = references[0].precision("allocated_amount")
-		outstanding_amount = self.outstanding_amount
-
-		# to manage rows
-		row_number = 1
-		MOVE_TO_NEXT_ROW = 1
-		TO_SKIP_NEW_ROW = 2
-		NEW_ROW_ADDED = False
-
-		while row_number <= len(references):
-			row = references[row_number - 1]
-
-			# update the idx to maintain the order
-			row.idx = row_number
-
-			if outstanding_amount == 0:
-				if not NEW_ROW_ADDED:
-					break
-
-				row_number += MOVE_TO_NEXT_ROW
-				continue
-
-			# allocate the payment request to the row
-			row.payment_request = self.name
-
-			if row.allocated_amount <= outstanding_amount:
-				outstanding_amount = flt(outstanding_amount - row.allocated_amount, precision)
-				row_number += MOVE_TO_NEXT_ROW
-			else:
-				remaining_allocated_amount = flt(row.allocated_amount - outstanding_amount, precision)
-				row.allocated_amount = outstanding_amount
-				outstanding_amount = 0
-
-				# create a new row without PR for remaining unallocated amount
-				new_row = frappe.copy_doc(row)
-				references.insert(row_number, new_row)
-
-				# update new row
-				new_row.idx = row_number + 1
-				new_row.payment_request = None
-				new_row.allocated_amount = remaining_allocated_amount
-
-				NEW_ROW_ADDED = True
-				row_number += TO_SKIP_NEW_ROW
-
 
 @frappe.whitelist(allow_guest=True)
 def make_payment_request(**args):
@@ -516,15 +416,11 @@ def make_payment_request(**args):
 		{"reference_doctype": args.dt, "reference_name": args.dn, "docstatus": 0},
 	)
 
-	# fetches existing payment request `grand_total` amount
-	existing_payment_request_amount = get_existing_payment_request_amount(ref_doc.doctype, ref_doc.name)
+	existing_payment_request_amount = get_existing_payment_request_amount(args.dt, args.dn)
 
 	if existing_payment_request_amount:
 		grand_total -= existing_payment_request_amount
 
-		if not grand_total:
-			frappe.throw(_("Payment Request is already created"))
-
 	if draft_payment_request:
 		frappe.db.set_value(
 			"Payment Request", draft_payment_request, "grand_total", grand_total, update_modified=False
@@ -538,13 +434,6 @@ def make_payment_request(**args):
 				"Outward" if args.get("dt") in ["Purchase Order", "Purchase Invoice"] else "Inward"
 			)
 
-		party_type = args.get("party_type") or "Customer"
-		party_account_currency = ref_doc.get("party_account_currency")
-
-		if not party_account_currency:
-			party_account = get_party_account(party_type, ref_doc.get(party_type.lower()), ref_doc.company)
-			party_account_currency = get_account_currency(party_account)
-
 		pr.update(
 			{
 				"payment_gateway_account": gateway_account.get("name"),
@@ -553,7 +442,6 @@ def make_payment_request(**args):
 				"payment_channel": gateway_account.get("payment_channel"),
 				"payment_request_type": args.get("payment_request_type"),
 				"currency": ref_doc.currency,
-				"party_account_currency": party_account_currency,
 				"grand_total": grand_total,
 				"mode_of_payment": args.mode_of_payment,
 				"email_to": args.recipient_id or ref_doc.owner,
@@ -561,7 +449,7 @@ def make_payment_request(**args):
 				"message": gateway_account.get("message") or get_dummy_message(ref_doc),
 				"reference_doctype": args.dt,
 				"reference_name": args.dn,
-				"party_type": party_type,
+				"party_type": args.get("party_type") or "Customer",
 				"party": args.get("party") or ref_doc.get("customer"),
 				"bank_account": bank_account,
 			}
@@ -604,11 +492,9 @@ def get_amount(ref_doc, payment_account=None):
 	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.rounded_total or ref_doc.grand_total)
+				grand_total = flt(ref_doc.grand_total)
 			else:
-				grand_total = flt(
-					flt(ref_doc.base_rounded_total or ref_doc.base_grand_total) / ref_doc.conversion_rate
-				)
+				grand_total = flt(ref_doc.base_grand_total) / ref_doc.conversion_rate
 		elif dt == "Sales Invoice":
 			for pay in ref_doc.payments:
 				if pay.type == "Phone" and pay.account == payment_account:
@@ -623,27 +509,31 @@ def get_amount(ref_doc, payment_account=None):
 		grand_total = ref_doc.outstanding_amount
 
 	if grand_total > 0:
-		return flt(grand_total, get_currency_precision())
+		return grand_total
 	else:
 		frappe.throw(_("Payment Entry is already created"))
 
 
 def get_existing_payment_request_amount(ref_dt, ref_dn):
 	"""
-	Return the total amount of Payment Requests against a reference document.
+	Get the existing payment request which are unpaid or partially paid for payment channel other than Phone
+	and get the summation of existing paid payment request for Phone payment channel.
 	"""
-	PR = frappe.qb.DocType("Payment Request")
-
-	response = (
-		frappe.qb.from_(PR)
-		.select(Sum(PR.grand_total))
-		.where(PR.reference_doctype == ref_dt)
-		.where(PR.reference_name == ref_dn)
-		.where(PR.docstatus == 1)
-		.run()
+	existing_payment_request_amount = frappe.db.sql(
+		"""
+		select sum(grand_total)
+		from `tabPayment Request`
+		where
+			reference_doctype = %s
+			and reference_name = %s
+			and docstatus = 1
+			and (status != 'Paid'
+			or (payment_channel = 'Phone'
+				and status = 'Paid'))
+	""",
+		(ref_dt, ref_dn),
 	)
-
-	return response[0][0] if response[0] else 0
+	return flt(existing_payment_request_amount[0][0]) if existing_payment_request_amount else 0
 
 
 def get_gateway_details(args):  # nosemgrep
@@ -691,67 +581,38 @@ def make_payment_entry(docname):
 	return doc.create_payment_entry(submit=False).as_dict()
 
 
-def update_payment_requests_as_per_pe_references(references=None, cancel=False):
-	"""
-	Update Payment Request's `Status` and `Outstanding Amount` based on Payment Entry Reference's `Allocated Amount`.
-	"""
-	if not references:
-		return
+def update_payment_req_status(doc, method):
+	from erpnext.accounts.doctype.payment_entry.payment_entry import get_reference_details
 
-	precision = references[0].precision("allocated_amount")
-
-	referenced_payment_requests = frappe.get_all(
-		"Payment Request",
-		filters={"name": ["in", {row.payment_request for row in references if row.payment_request}]},
-		fields=[
-			"name",
-			"grand_total",
-			"outstanding_amount",
-			"payment_request_type",
-		],
-	)
-
-	referenced_payment_requests = {pr.name: pr for pr in referenced_payment_requests}
-
-	for ref in references:
-		if not ref.payment_request:
-			continue
-
-		payment_request = referenced_payment_requests[ref.payment_request]
-		pr_outstanding = payment_request["outstanding_amount"]
-
-		# update outstanding amount
-		new_outstanding_amount = flt(
-			pr_outstanding + ref.allocated_amount if cancel else pr_outstanding - ref.allocated_amount,
-			precision,
-		)
-
-		# to handle same payment request for the multiple allocations
-		payment_request["outstanding_amount"] = new_outstanding_amount
-
-		if not cancel and new_outstanding_amount < 0:
-			frappe.throw(
-				msg=_(
-					"The allocated amount is greater than the outstanding amount of Payment Request {0}"
-				).format(ref.payment_request),
-				title=_("Invalid Allocated Amount"),
-			)
-
-		# update status
-		if new_outstanding_amount == payment_request["grand_total"]:
-			status = "Initiated" if payment_request["payment_request_type"] == "Outward" else "Requested"
-		elif new_outstanding_amount == 0:
-			status = "Paid"
-		elif new_outstanding_amount > 0:
-			status = "Partially Paid"
-
-		# update database
-		frappe.db.set_value(
+	for ref in doc.references:
+		payment_request_name = frappe.db.get_value(
 			"Payment Request",
-			ref.payment_request,
-			{"outstanding_amount": new_outstanding_amount, "status": status},
+			{
+				"reference_doctype": ref.reference_doctype,
+				"reference_name": ref.reference_name,
+				"docstatus": 1,
+			},
 		)
 
+		if payment_request_name:
+			ref_details = get_reference_details(
+				ref.reference_doctype, ref.reference_name, doc.party_account_currency
+			)
+			pay_req_doc = frappe.get_doc("Payment Request", payment_request_name)
+			status = pay_req_doc.status
+
+			if status != "Paid" and not ref_details.outstanding_amount:
+				status = "Paid"
+			elif status != "Partially Paid" and ref_details.outstanding_amount != ref_details.total_amount:
+				status = "Partially Paid"
+			elif ref_details.outstanding_amount == ref_details.total_amount:
+				if pay_req_doc.payment_request_type == "Outward":
+					status = "Initiated"
+				elif pay_req_doc.payment_request_type == "Inward":
+					status = "Requested"
+
+			pay_req_doc.db_set("status", status)
+
 
 def get_dummy_message(doc):
 	return frappe.render_template(
@@ -834,31 +695,3 @@ def validate_payment(doc, method=None):
 			doc.reference_docname
 		)
 	)
-
-
-@frappe.whitelist()
-def get_open_payment_requests_query(doctype, txt, searchfield, start, page_len, filters):
-	# permission checks in `get_list()`
-	filters = frappe._dict(filters)
-
-	if not filters.reference_doctype or not filters.reference_name:
-		return []
-
-	if txt:
-		filters.name = ["like", f"%{txt}%"]
-
-	open_payment_requests = frappe.get_list(
-		"Payment Request",
-		filters=filters,
-		fields=["name", "grand_total", "outstanding_amount"],
-		order_by="transaction_date ASC,creation ASC",
-	)
-
-	return [
-		(
-			pr.name,
-			_("<strong>Grand Total:</strong> {0}").format(pr.grand_total),
-			_("<strong>Outstanding Amount:</strong> {0}").format(pr.outstanding_amount),
-		)
-		for pr in open_payment_requests
-	]

erpnext/accounts/doctype/payment_request/payment_request_dashboard.py

@@ -1,14 +0,0 @@
-from frappe import _
-
-
-def get_data():
-	return {
-		"fieldname": "payment_request",
-		"internal_links": {
-			"Payment Entry": ["references", "payment_request"],
-			"Payment Order": ["references", "payment_order"],
-		},
-		"transactions": [
-			{"label": _("Payment"), "items": ["Payment Entry", "Payment Order"]},
-		],
-	}

erpnext/accounts/doctype/payment_request/payment_request_list.js

@@ -1,18 +1,19 @@
-const INDICATORS = {
-	"Partially Paid": "orange",
-	Cancelled: "red",
-	Draft: "gray",
-	Failed: "red",
-	Initiated: "green",
-	Paid: "blue",
-	Requested: "green",
-};
-
 frappe.listview_settings["Payment Request"] = {
 	add_fields: ["status"],
 	get_indicator: function (doc) {
-		if (!doc.status || !INDICATORS[doc.status]) return;
-
-		return [__(doc.status), INDICATORS[doc.status], `status,=,${doc.status}`];
+		if (doc.status == "Draft") {
+			return [__("Draft"), "gray", "status,=,Draft"];
+		}
+		if (doc.status == "Requested") {
+			return [__("Requested"), "green", "status,=,Requested"];
+		} else if (doc.status == "Initiated") {
+			return [__("Initiated"), "green", "status,=,Initiated"];
+		} else if (doc.status == "Partially Paid") {
+			return [__("Partially Paid"), "orange", "status,=,Partially Paid"];
+		} else if (doc.status == "Paid") {
+			return [__("Paid"), "blue", "status,=,Paid"];
+		} else if (doc.status == "Cancelled") {
+			return [__("Cancelled"), "red", "status,=,Cancelled"];
+		}
 	},
 };

erpnext/accounts/doctype/payment_request/test_payment_request.py

@@ -1,23 +1,18 @@
 # Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
 # See license.txt
 
-import re
 import unittest
 
 import frappe
-from frappe.tests.utils import FrappeTestCase, change_settings
 
-from erpnext.accounts.doctype.payment_entry.test_payment_entry import create_payment_terms_template
 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.buying.doctype.purchase_order.test_purchase_order import create_purchase_order
 from erpnext.selling.doctype.sales_order.test_sales_order import make_sales_order
 from erpnext.setup.utils import get_exchange_rate
 
 test_dependencies = ["Currency Exchange", "Journal Entry", "Contact", "Address"]
 
-
 payment_gateway = {"doctype": "Payment Gateway", "gateway": "_Test Gateway"}
 
 payment_method = [
@@ -37,7 +32,7 @@ payment_method = [
 ]
 
 
-class TestPaymentRequest(FrappeTestCase):
+class TestPaymentRequest(unittest.TestCase):
 	def setUp(self):
 		if not frappe.db.get_value("Payment Gateway", payment_gateway["gateway"], "name"):
 			frappe.get_doc(payment_gateway).insert(ignore_permissions=True)
@@ -265,262 +260,3 @@ class TestPaymentRequest(FrappeTestCase):
 		# Try to make Payment Request more than SO amount, should give validation
 		pr2.grand_total = 900
 		self.assertRaises(frappe.ValidationError, pr2.save)
-
-	def test_conversion_on_foreign_currency_accounts(self):
-		po_doc = create_purchase_order(supplier="_Test Supplier USD", currency="USD", do_not_submit=1)
-		po_doc.conversion_rate = 80
-		po_doc.items[0].qty = 1
-		po_doc.items[0].rate = 10
-		po_doc.save().submit()
-
-		pr = make_payment_request(dt=po_doc.doctype, dn=po_doc.name, recipient_id="nabin@erpnext.com")
-		pr = frappe.get_doc(pr).save().submit()
-
-		pe = pr.create_payment_entry()
-		self.assertEqual(pe.base_paid_amount, 800)
-		self.assertEqual(pe.paid_amount, 800)
-		self.assertEqual(pe.base_received_amount, 800)
-		self.assertEqual(pe.received_amount, 10)
-
-	def test_multiple_payment_if_partially_paid_for_same_currency(self):
-		so = make_sales_order(currency="INR", qty=1, rate=1000)
-
-		pr = make_payment_request(
-			dt="Sales Order",
-			dn=so.name,
-			mute_email=1,
-			submit_doc=1,
-			return_doc=1,
-		)
-
-		self.assertEqual(pr.grand_total, 1000)
-		self.assertEqual(pr.outstanding_amount, pr.grand_total)
-		self.assertEqual(pr.party_account_currency, pr.currency)  # INR
-
-		so.load_from_db()
-
-		# to make partial payment
-		pe = pr.create_payment_entry(submit=False)
-		pe.paid_amount = 200
-		pe.references[0].allocated_amount = 200
-		pe.submit()
-
-		self.assertEqual(pe.references[0].payment_request, pr.name)
-
-		so.load_from_db()
-
-		pr.load_from_db()
-		self.assertEqual(pr.status, "Partially Paid")
-		self.assertEqual(pr.outstanding_amount, 800)
-		self.assertEqual(pr.grand_total, 1000)
-
-		# complete payment
-		pe = pr.create_payment_entry()
-
-		self.assertEqual(pe.paid_amount, 800)  # paid amount set from pr's outstanding amount
-		self.assertEqual(pe.references[0].allocated_amount, 800)
-		self.assertEqual(pe.references[0].outstanding_amount, 800)  # for Orders it is not zero
-		self.assertEqual(pe.references[0].payment_request, pr.name)
-
-		so.load_from_db()
-
-		pr.load_from_db()
-		self.assertEqual(pr.status, "Paid")
-		self.assertEqual(pr.outstanding_amount, 0)
-		self.assertEqual(pr.grand_total, 1000)
-
-		# creating a more payment Request must not allowed
-		self.assertRaisesRegex(
-			frappe.exceptions.ValidationError,
-			re.compile(r"Payment Request is already created"),
-			make_payment_request,
-			dt="Sales Order",
-			dn=so.name,
-			mute_email=1,
-			submit_doc=1,
-			return_doc=1,
-		)
-
-	@change_settings("Accounts Settings", {"allow_multi_currency_invoices_against_single_party_account": 1})
-	def test_multiple_payment_if_partially_paid_for_multi_currency(self):
-		pi = make_purchase_invoice(currency="USD", conversion_rate=50, qty=1, rate=100, do_not_save=1)
-		pi.credit_to = "Creditors - _TC"
-		pi.submit()
-
-		pr = make_payment_request(
-			dt="Purchase Invoice",
-			dn=pi.name,
-			mute_email=1,
-			submit_doc=1,
-			return_doc=1,
-		)
-
-		# 100 USD -> 5000 INR
-		self.assertEqual(pr.grand_total, 100)
-		self.assertEqual(pr.outstanding_amount, 5000)
-		self.assertEqual(pr.currency, "USD")
-		self.assertEqual(pr.party_account_currency, "INR")
-		self.assertEqual(pr.status, "Initiated")
-
-		# to make partial payment
-		pe = pr.create_payment_entry(submit=False)
-		pe.paid_amount = 2000
-		pe.references[0].allocated_amount = 2000
-		pe.submit()
-
-		self.assertEqual(pe.references[0].payment_request, pr.name)
-
-		pr.load_from_db()
-		self.assertEqual(pr.status, "Partially Paid")
-		self.assertEqual(pr.outstanding_amount, 3000)
-		self.assertEqual(pr.grand_total, 100)
-
-		# complete payment
-		pe = pr.create_payment_entry()
-		self.assertEqual(pe.paid_amount, 3000)  # paid amount set from pr's outstanding amount
-		self.assertEqual(pe.references[0].allocated_amount, 3000)
-		self.assertEqual(pe.references[0].outstanding_amount, 0)  # for Invoices it will zero
-		self.assertEqual(pe.references[0].payment_request, pr.name)
-
-		pr.load_from_db()
-		self.assertEqual(pr.status, "Paid")
-		self.assertEqual(pr.outstanding_amount, 0)
-		self.assertEqual(pr.grand_total, 100)
-
-		# creating a more payment Request must not allowed
-		self.assertRaisesRegex(
-			frappe.exceptions.ValidationError,
-			re.compile(r"Payment Request is already created"),
-			make_payment_request,
-			dt="Purchase Invoice",
-			dn=pi.name,
-			mute_email=1,
-			submit_doc=1,
-			return_doc=1,
-		)
-
-	def test_single_payment_with_payment_term_for_same_currency(self):
-		create_payment_terms_template()
-
-		po = create_purchase_order(do_not_save=1, currency="INR", qty=1, rate=20000)
-		po.payment_terms_template = "Test Receivable Template"  # 84.746 and 15.254
-		po.save()
-		po.submit()
-
-		pr = make_payment_request(
-			dt="Purchase Order",
-			dn=po.name,
-			mute_email=1,
-			submit_doc=1,
-			return_doc=1,
-		)
-
-		self.assertEqual(pr.grand_total, 20000)
-		self.assertEqual(pr.outstanding_amount, pr.grand_total)
-		self.assertEqual(pr.party_account_currency, pr.currency)  # INR
-		self.assertEqual(pr.status, "Initiated")
-
-		po.load_from_db()
-
-		pe = pr.create_payment_entry()
-
-		self.assertEqual(len(pe.references), 2)
-		self.assertEqual(pe.paid_amount, 20000)
-
-		# check 1st payment term
-		self.assertEqual(pe.references[0].allocated_amount, 16949.2)
-		self.assertEqual(pe.references[0].payment_request, pr.name)
-
-		# check 2nd payment term
-		self.assertEqual(pe.references[1].allocated_amount, 3050.8)
-		self.assertEqual(pe.references[1].payment_request, pr.name)
-
-		po.load_from_db()
-
-		pr.load_from_db()
-		self.assertEqual(pr.status, "Paid")
-		self.assertEqual(pr.outstanding_amount, 0)
-		self.assertEqual(pr.grand_total, 20000)
-
-	@change_settings("Accounts Settings", {"allow_multi_currency_invoices_against_single_party_account": 1})
-	def test_single_payment_with_payment_term_for_multi_currency(self):
-		create_payment_terms_template()
-
-		si = create_sales_invoice(
-			do_not_save=1, currency="USD", debit_to="Debtors - _TC", qty=1, rate=200, conversion_rate=50
-		)
-		si.payment_terms_template = "Test Receivable Template"  # 84.746 and 15.254
-		si.save()
-		si.submit()
-
-		pr = make_payment_request(
-			dt="Sales Invoice",
-			dn=si.name,
-			mute_email=1,
-			submit_doc=1,
-			return_doc=1,
-		)
-
-		# 200 USD -> 10000 INR
-		self.assertEqual(pr.grand_total, 200)
-		self.assertEqual(pr.outstanding_amount, 10000)
-		self.assertEqual(pr.currency, "USD")
-		self.assertEqual(pr.party_account_currency, "INR")
-
-		pe = pr.create_payment_entry()
-		self.assertEqual(len(pe.references), 2)
-		self.assertEqual(pe.paid_amount, 10000)
-
-		# check 1st payment term
-		# convert it via dollar and conversion_rate
-		self.assertEqual(pe.references[0].allocated_amount, 8474.5)  # multi currency conversion
-		self.assertEqual(pe.references[0].payment_request, pr.name)
-
-		# check 2nd payment term
-		self.assertEqual(pe.references[1].allocated_amount, 1525.5)  # multi currency conversion
-		self.assertEqual(pe.references[1].payment_request, pr.name)
-
-		pr.load_from_db()
-		self.assertEqual(pr.status, "Paid")
-		self.assertEqual(pr.outstanding_amount, 0)
-		self.assertEqual(pr.grand_total, 200)
-
-	def test_payment_cancel_process(self):
-		so = make_sales_order(currency="INR", qty=1, rate=1000)
-
-		pr = make_payment_request(
-			dt="Sales Order",
-			dn=so.name,
-			mute_email=1,
-			submit_doc=1,
-			return_doc=1,
-		)
-
-		self.assertEqual(pr.grand_total, 1000)
-		self.assertEqual(pr.outstanding_amount, pr.grand_total)
-
-		so.load_from_db()
-
-		pe = pr.create_payment_entry(submit=False)
-		pe.paid_amount = 800
-		pe.references[0].allocated_amount = 800
-		pe.submit()
-
-		self.assertEqual(pe.references[0].payment_request, pr.name)
-
-		so.load_from_db()
-
-		pr.load_from_db()
-		self.assertEqual(pr.status, "Partially Paid")
-		self.assertEqual(pr.outstanding_amount, 200)
-		self.assertEqual(pr.grand_total, 1000)
-
-		# cancelling PE
-		pe.cancel()
-
-		pr.load_from_db()
-		self.assertEqual(pr.status, "Requested")
-		self.assertEqual(pr.outstanding_amount, 1000)
-		self.assertEqual(pr.grand_total, 1000)
-
-		so.load_from_db()

erpnext/accounts/doctype/payment_schedule/payment_schedule.json

@@ -10,19 +10,14 @@
   "description",
   "section_break_4",
   "due_date",
-  "invoice_portion",
   "mode_of_payment",
   "column_break_5",
-  "due_date_based_on",
-  "credit_days",
-  "credit_months",
+  "invoice_portion",
   "section_break_6",
-  "discount_date",
-  "discount",
   "discount_type",
+  "discount_date",
   "column_break_9",
-  "discount_validity_based_on",
-  "discount_validity",
+  "discount",
   "section_break_9",
   "payment_amount",
   "outstanding",
@@ -160,50 +155,12 @@
    "fieldtype": "Currency",
    "label": "Payment Amount (Company Currency)",
    "options": "Company:company:default_currency"
-  },
-  {
-   "fieldname": "due_date_based_on",
-   "fieldtype": "Select",
-   "label": "Due Date Based On",
-   "options": "\nDay(s) after invoice date\nDay(s) after the end of the invoice month\nMonth(s) after the end of the invoice month",
-   "read_only": 1
-  },
-  {
-   "depends_on": "eval:in_list(['Day(s) after invoice date', 'Day(s) after the end of the invoice month'], doc.due_date_based_on)",
-   "fieldname": "credit_days",
-   "fieldtype": "Int",
-   "label": "Credit Days",
-   "non_negative": 1,
-   "read_only": 1
-  },
-  {
-   "depends_on": "eval:doc.due_date_based_on=='Month(s) after the end of the invoice month'",
-   "fieldname": "credit_months",
-   "fieldtype": "Int",
-   "label": "Credit Months",
-   "non_negative": 1,
-   "read_only": 1
-  },
-  {
-   "depends_on": "discount",
-   "fieldname": "discount_validity_based_on",
-   "fieldtype": "Select",
-   "label": "Discount Validity Based On",
-   "options": "\nDay(s) after invoice date\nDay(s) after the end of the invoice month\nMonth(s) after the end of the invoice month",
-   "read_only": 1
-  },
-  {
-   "depends_on": "discount_validity_based_on",
-   "fieldname": "discount_validity",
-   "fieldtype": "Int",
-   "label": "Discount Validity",
-   "read_only": 1
   }
  ],
  "index_web_pages_for_search": 1,
  "istable": 1,
  "links": [],
- "modified": "2025-07-31 08:38:25.820701",
+ "modified": "2022-09-16 13:57:06.382859",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Payment Schedule",
@@ -214,4 +171,4 @@
  "sort_order": "DESC",
  "states": [],
  "track_changes": 1
-}
+}

erpnext/accounts/doctype/payment_terms_template_detail/payment_terms_template_detail.json

@@ -161,4 +161,4 @@
  "sort_field": "modified",
  "sort_order": "DESC",
  "track_changes": 1
-}
+}

erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.js

@@ -11,9 +11,9 @@ frappe.ui.form.on("Period Closing Voucher", {
 			return {
 				filters: [
 					["Account", "company", "=", frm.doc.company],
-					["Account", "is_group", "=", 0],
+					["Account", "is_group", "=", "0"],
 					["Account", "freeze_account", "=", "No"],
-					["Account", "root_type", "in", ["Liability", "Equity"]],
+					["Account", "root_type", "in", "Liability, Equity"],
 				],
 			};
 		});
@@ -29,7 +29,7 @@ frappe.ui.form.on("Period Closing Voucher", {
 						from_date: frm.doc.posting_date,
 						to_date: moment(frm.doc.modified).format("YYYY-MM-DD"),
 						company: frm.doc.company,
-						categorize_by: "",
+						group_by: "",
 						show_cancelled_entries: frm.doc.docstatus === 2,
 					};
 					frappe.set_route("query-report", "General Ledger");

erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py

@@ -32,20 +32,15 @@ class PeriodClosingVoucher(AccountsController):
 
 	def on_cancel(self):
 		self.validate_future_closing_vouchers()
-		self.ignore_linked_doctypes = (
-			"GL Entry",
-			"Stock Ledger Entry",
-			"Payment Ledger Entry",
-			"Account Closing Balance",
-		)
 		self.db_set("gle_processing_status", "In Progress")
+		self.ignore_linked_doctypes = ("GL Entry", "Stock Ledger Entry", "Payment Ledger Entry")
 		gle_count = frappe.db.count(
 			"GL Entry",
 			{"voucher_type": "Period Closing Voucher", "voucher_no": self.name, "is_cancelled": 0},
 		)
 		if gle_count > 5000:
 			frappe.enqueue(
-				process_cancellation,
+				make_reverse_gl_entries,
 				voucher_type="Period Closing Voucher",
 				voucher_no=self.name,
 				queue="long",
@@ -56,7 +51,9 @@ class PeriodClosingVoucher(AccountsController):
 				alert=True,
 			)
 		else:
-			process_cancellation(voucher_type="Period Closing Voucher", voucher_no=self.name)
+			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(
@@ -69,6 +66,12 @@ class PeriodClosingVoucher(AccountsController):
 				)
 			)
 
+	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")
 
@@ -133,7 +136,14 @@ class PeriodClosingVoucher(AccountsController):
 		closing_entries = self.get_grouped_gl_entries(get_opening_entries=get_opening_entries)
 		if len(gl_entries + closing_entries) > 3000:
 			frappe.enqueue(
-				process_gl_and_closing_entries,
+				process_gl_entries,
+				gl_entries=gl_entries,
+				voucher_name=self.name,
+				timeout=3000,
+			)
+
+			frappe.enqueue(
+				process_closing_entries,
 				gl_entries=gl_entries,
 				closing_entries=closing_entries,
 				voucher_name=self.name,
@@ -147,9 +157,8 @@ class PeriodClosingVoucher(AccountsController):
 				alert=True,
 			)
 		else:
-			process_gl_and_closing_entries(
-				gl_entries, closing_entries, self.name, self.company, self.posting_date
-			)
+			process_gl_entries(gl_entries, self.name)
+			process_closing_entries(gl_entries, closing_entries, self.name, self.company, self.posting_date)
 
 	def get_grouped_gl_entries(self, get_opening_entries=False):
 		closing_entries = []
@@ -206,9 +215,6 @@ class PeriodClosingVoucher(AccountsController):
 		return gl_entry
 
 	def get_gle_for_closing_account(self, acc):
-		debit = abs(flt(acc.bal_in_company_currency)) if flt(acc.bal_in_company_currency) > 0 else 0
-		credit = abs(flt(acc.bal_in_company_currency)) if flt(acc.bal_in_company_currency) < 0 else 0
-
 		gl_entry = self.get_gl_dict(
 			{
 				"company": self.company,
@@ -217,10 +223,16 @@ class PeriodClosingVoucher(AccountsController):
 				"cost_center": acc.cost_center,
 				"finance_book": acc.finance_book,
 				"account_currency": acc.account_currency,
-				"debit_in_account_currency": debit,
-				"debit": debit,
-				"credit_in_account_currency": credit,
-				"credit": credit,
+				"debit_in_account_currency": abs(flt(acc.bal_in_account_currency))
+				if flt(acc.bal_in_account_currency) > 0
+				else 0,
+				"debit": abs(flt(acc.bal_in_company_currency)) if flt(acc.bal_in_company_currency) > 0 else 0,
+				"credit_in_account_currency": abs(flt(acc.bal_in_account_currency))
+				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,
@@ -311,10 +323,9 @@ class PeriodClosingVoucher(AccountsController):
 
 		if get_opening_entries:
 			query = query.where(
-				(  # noqa: UP034
-					(gl_entry.posting_date.between(self.get("year_start_date"), self.posting_date))
-					| (gl_entry.is_opening == "Yes")
-				)
+				gl_entry.posting_date.between(self.get("year_start_date"), self.posting_date)
+				| gl_entry.is_opening
+				== "Yes"
 			)
 		else:
 			query = query.where(
@@ -332,16 +343,12 @@ class PeriodClosingVoucher(AccountsController):
 		return query.run(as_dict=1)
 
 
-def process_gl_and_closing_entries(gl_entries, closing_entries, voucher_name, company, closing_date):
-	from erpnext.accounts.doctype.account_closing_balance.account_closing_balance import (
-		make_closing_entries,
-	)
+def process_gl_entries(gl_entries, voucher_name):
 	from erpnext.accounts.general_ledger import make_gl_entries
 
 	try:
 		if gl_entries:
 			make_gl_entries(gl_entries, merge_entries=False)
-		make_closing_entries(gl_entries + closing_entries, voucher_name, company, closing_date)
 		frappe.db.set_value("Period Closing Voucher", voucher_name, "gle_processing_status", "Completed")
 	except Exception as e:
 		frappe.db.rollback()
@@ -349,21 +356,26 @@ def process_gl_and_closing_entries(gl_entries, closing_entries, voucher_name, co
 		frappe.db.set_value("Period Closing Voucher", voucher_name, "gle_processing_status", "Failed")
 
 
-def process_cancellation(voucher_type, voucher_no):
+def process_closing_entries(gl_entries, closing_entries, voucher_name, company, closing_date):
+	from erpnext.accounts.doctype.account_closing_balance.account_closing_balance import (
+		make_closing_entries,
+	)
+
+	try:
+		if gl_entries + closing_entries:
+			make_closing_entries(gl_entries + closing_entries, voucher_name, company, closing_date)
+	except Exception as e:
+		frappe.db.rollback()
+		frappe.log_error(e)
+
+
+def make_reverse_gl_entries(voucher_type, voucher_no):
 	from erpnext.accounts.general_ledger import make_reverse_gl_entries
 
 	try:
 		make_reverse_gl_entries(voucher_type=voucher_type, voucher_no=voucher_no)
-		delete_closing_entries(voucher_no)
 		frappe.db.set_value("Period Closing Voucher", voucher_no, "gle_processing_status", "Completed")
 	except Exception as e:
 		frappe.db.rollback()
 		frappe.log_error(e)
 		frappe.db.set_value("Period Closing Voucher", voucher_no, "gle_processing_status", "Failed")
-
-
-def delete_closing_entries(voucher_no):
-	closing_balance = frappe.qb.DocType("Account Closing Balance")
-	frappe.qb.from_(closing_balance).delete().where(
-		closing_balance.period_closing_voucher == voucher_no
-	).run()

erpnext/accounts/doctype/pos_closing_entry/pos_closing_entry.js

@@ -80,10 +80,8 @@ frappe.ui.form.on("POS Closing Entry", {
 		) {
 			reset_values(frm);
 			frappe.run_serially([
-				() => frappe.dom.freeze(__("Loading Invoices! Please Wait...")),
 				() => frm.trigger("set_opening_amounts"),
 				() => frm.trigger("get_pos_invoices"),
-				() => frappe.dom.unfreeze(),
 			]);
 		}
 	},

erpnext/accounts/doctype/pos_closing_entry/pos_closing_entry.py

@@ -33,7 +33,7 @@ class POSClosingEntry(StatusUpdater):
 		for key, value in pos_occurences.items():
 			if len(value) > 1:
 				error_list.append(
-					_("{0} is added multiple times on rows: {1}").format(frappe.bold(key), frappe.bold(value))
+					_(f"{frappe.bold(key)} is added multiple times on rows: {frappe.bold(value)}")
 				)
 
 		if error_list:

erpnext/accounts/doctype/pos_invoice/pos_invoice.json

@@ -48,7 +48,6 @@
   "shipping_address",
   "company_address",
   "company_address_display",
-  "company_contact_person",
   "currency_and_price_list",
   "currency",
   "conversion_rate",
@@ -1558,19 +1557,12 @@
    "fieldname": "update_billed_amount_in_delivery_note",
    "fieldtype": "Check",
    "label": "Update Billed Amount in Delivery Note"
-  },
-  {
-   "fieldname": "company_contact_person",
-   "fieldtype": "Link",
-   "label": "Company Contact Person",
-   "options": "Contact",
-   "print_hide": 1
   }
  ],
  "icon": "fa fa-file-text",
  "is_submittable": 1,
  "links": [],
- "modified": "2024-11-26 13:10:50.309570",
+ "modified": "2024-03-20 16:00:34.268756",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "POS Invoice",
@@ -1623,5 +1615,6 @@
  "states": [],
  "timeline_field": "customer",
  "title_field": "title",
- "track_changes": 1
-}
+ "track_changes": 1,
+ "track_seen": 1
+}

erpnext/accounts/doctype/pos_invoice/pos_invoice.py

@@ -379,7 +379,7 @@ class POSInvoice(SalesInvoice):
 			if self.is_return and entry.amount > 0:
 				frappe.throw(_("Row #{0} (Payment Table): Amount must be negative").format(entry.idx))
 
-		if self.is_return and self.docstatus != 0:
+		if self.is_return:
 			invoice_total = self.rounded_total or self.grand_total
 			if total_amount_in_payments and total_amount_in_payments < invoice_total:
 				frappe.throw(_("Total payments amount can't be greater than {}").format(-invoice_total))
@@ -560,13 +560,7 @@ class POSInvoice(SalesInvoice):
 				"Account", self.debit_to, "account_currency", cache=True
 			)
 		if not self.due_date and self.customer:
-			self.due_date = get_due_date(
-				self.posting_date,
-				"Customer",
-				self.customer,
-				self.company,
-				template_name=self.payment_terms_template,
-			)
+			self.due_date = get_due_date(self.posting_date, "Customer", self.customer, self.company)
 
 		super(SalesInvoice, self).set_missing_values(for_validate)
 

erpnext/accounts/doctype/pos_invoice/test_pos_invoice.py

@@ -87,7 +87,7 @@ class TestPOSInvoice(unittest.TestCase):
 
 		inv.save()
 
-		self.assertEqual(inv.net_total, 4298.24)
+		self.assertEqual(inv.net_total, 4298.25)
 		self.assertEqual(inv.grand_total, 4900.00)
 
 	def test_tax_calculation_with_multiple_items(self):

erpnext/accounts/doctype/pos_invoice_merge_log/pos_invoice_merge_log.py

@@ -29,7 +29,7 @@ class POSInvoiceMergeLog(Document):
 		for key, value in pos_occurences.items():
 			if len(value) > 1:
 				error_list.append(
-					_("{0} is added multiple times on rows: {1}").format(frappe.bold(key), frappe.bold(value))
+					_(f"{frappe.bold(key)} is added multiple times on rows: {frappe.bold(value)}")
 				)
 
 		if error_list:
@@ -389,9 +389,7 @@ def split_invoices(invoices):
 			if not item.serial_no:
 				continue
 
-			return_against_is_added = any(
-				d for d in _invoices if d and d[0].pos_invoice == pos_invoice.return_against
-			)
+			return_against_is_added = any(d for d in _invoices if d.pos_invoice == pos_invoice.return_against)
 			if return_against_is_added:
 				break
 
@@ -443,7 +441,7 @@ def create_merge_logs(invoice_by_customer, closing_entry=None):
 		if closing_entry:
 			closing_entry.set_status(update=True, status="Failed")
 			if isinstance(error_message, list):
-				error_message = json.dumps(error_message)
+				error_message = frappe.json.dumps(error_message)
 			closing_entry.db_set("error_message", error_message)
 		raise
 

erpnext/accounts/doctype/pos_invoice_merge_log/test_pos_invoice_merge_log.py

@@ -340,7 +340,7 @@ class TestPOSInvoiceMergeLog(unittest.TestCase):
 			inv.load_from_db()
 			consolidated_invoice = frappe.get_doc("Sales Invoice", inv.consolidated_invoice)
 			self.assertEqual(consolidated_invoice.status, "Return")
-			self.assertEqual(consolidated_invoice.rounding_adjustment, -0.002)
+			self.assertEqual(consolidated_invoice.rounding_adjustment, -0.001)
 
 		finally:
 			frappe.set_user("Administrator")

erpnext/accounts/doctype/pricing_rule/pricing_rule.json

@@ -53,7 +53,6 @@
   "column_break_42",
   "free_item_uom",
   "round_free_qty",
-  "dont_enforce_free_item_qty",
   "is_recursive",
   "recurse_for",
   "apply_recursion_over",
@@ -75,21 +74,15 @@
   "discount_amount",
   "discount_percentage",
   "for_price_list",
-  "dynamic_condition_tab",
-  "condition",
   "section_break_13",
+  "threshold_percentage",
+  "priority",
+  "condition",
+  "column_break_66",
   "apply_multiple_pricing_rules",
   "apply_discount_on_rate",
-  "column_break_66",
-  "threshold_percentage",
-  "validate_pricing_rule_section",
   "validate_applied_rule",
-  "column_break_texp",
   "rule_description",
-  "priority_section",
-  "has_priority",
-  "column_break_sayg",
-  "priority",
   "help_section",
   "pricing_rule_help",
   "reference_section",
@@ -420,8 +413,7 @@
    "depends_on": "eval:doc.rate_or_discount==\"Rate\"",
    "fieldname": "rate",
    "fieldtype": "Currency",
-   "label": "Rate",
-   "options": "currency"
+   "label": "Rate"
   },
   {
    "default": "0",
@@ -485,7 +477,7 @@
   {
    "collapsible": 1,
    "fieldname": "section_break_13",
-   "fieldtype": "Tab Break",
+   "fieldtype": "Section Break",
    "label": "Advanced Settings"
   },
   {
@@ -495,7 +487,6 @@
    "label": "Threshold for Suggestion (In Percentage)"
   },
   {
-   "depends_on": "has_priority",
    "description": "Higher the number, higher the priority",
    "fieldname": "priority",
    "fieldtype": "Select",
@@ -522,7 +513,6 @@
   {
    "default": "0",
    "depends_on": "eval:doc.price_or_product_discount == 'Price'",
-   "description": "If enabled, then system will only validate the pricing rule and not apply automatically. User has to manually set the discount percentage / margin / free items to validate the pricing rule",
    "fieldname": "validate_applied_rule",
    "fieldtype": "Check",
    "label": "Validate Applied Rule"
@@ -535,8 +525,7 @@
   },
   {
    "fieldname": "help_section",
-   "fieldtype": "Tab Break",
-   "label": "Help Article",
+   "fieldtype": "Section Break",
    "options": "Simple"
   },
   {
@@ -614,49 +603,12 @@
    "fieldname": "apply_recursion_over",
    "fieldtype": "Float",
    "label": "Apply Recursion Over (As Per Transaction UOM)"
-  },
-  {
-   "fieldname": "priority_section",
-   "fieldtype": "Section Break",
-   "label": "Priority"
-  },
-  {
-   "fieldname": "dynamic_condition_tab",
-   "fieldtype": "Tab Break",
-   "label": "Dynamic Condition"
-  },
-  {
-   "fieldname": "validate_pricing_rule_section",
-   "fieldtype": "Section Break",
-   "label": "Validate Pricing Rule"
-  },
-  {
-   "fieldname": "column_break_texp",
-   "fieldtype": "Column Break"
-  },
-  {
-   "fieldname": "column_break_sayg",
-   "fieldtype": "Column Break"
-  },
-  {
-   "default": "0",
-   "description": "Enable this checkbox even if you want to set the zero priority",
-   "fieldname": "has_priority",
-   "fieldtype": "Check",
-   "label": "Has Priority"
-  },
-  {
-   "default": "0",
-   "depends_on": "eval:doc.price_or_product_discount == 'Product'",
-   "fieldname": "dont_enforce_free_item_qty",
-   "fieldtype": "Check",
-   "label": "Don't Enforce Free Item Qty"
   }
  ],
  "icon": "fa fa-gift",
  "idx": 1,
  "links": [],
- "modified": "2025-02-17 18:15:39.824639",
+ "modified": "2023-02-14 04:53:34.887358",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Pricing Rule",
@@ -718,4 +670,4 @@
  "sort_order": "DESC",
  "states": [],
  "title_field": "title"
-}
+}

erpnext/accounts/doctype/pricing_rule/pricing_rule.py

@@ -31,7 +31,6 @@ class PricingRule(Document):
 		self.validate_price_list_with_currency()
 		self.validate_dates()
 		self.validate_condition()
-		self.validate_mixed_with_recursion()
 
 		if not self.margin_type:
 			self.margin_rate_or_amount = 0.0
@@ -48,12 +47,6 @@ class PricingRule(Document):
 				frappe.throw(_("Duplicate {0} found in the table").format(self.apply_on))
 
 	def validate_mandatory(self):
-		if self.has_priority and not self.priority:
-			throw(_("Priority is mandatory"), frappe.MandatoryError, _("Please Set Priority"))
-
-		if self.priority and not self.has_priority:
-			self.has_priority = 1
-
 		for apply_on, field in apply_on_dict.items():
 			if self.apply_on == apply_on and len(self.get(field) or []) < 1:
 				throw(_("{0} is not added in the table").format(apply_on), frappe.MandatoryError)
@@ -202,10 +195,6 @@ class PricingRule(Document):
 		):
 			frappe.throw(_("Invalid condition expression"))
 
-	def validate_mixed_with_recursion(self):
-		if self.mixed_conditions and self.is_recursive:
-			frappe.throw(_("Recursive Discounts with Mixed condition is not supported by the system"))
-
 
 # --------------------------------------------------------------------------------
 
@@ -359,20 +348,7 @@ def get_pricing_rule_for_item(args, doc=None, for_validate=False):
 			if isinstance(pricing_rule, str):
 				pricing_rule = frappe.get_cached_doc("Pricing Rule", pricing_rule)
 				update_pricing_rule_uom(pricing_rule, args)
-				fetch_other_item = True if pricing_rule.apply_rule_on_other else False
-				pricing_rule.apply_rule_on_other_items = (
-					get_pricing_rule_items(pricing_rule, other_items=fetch_other_item) or []
-				)
-
-			if pricing_rule.coupon_code_based == 1:
-				if not args.coupon_code:
-					return item_details
-
-				coupon_code = frappe.db.get_value(
-					doctype="Coupon Code", filters={"pricing_rule": pricing_rule.name}, fieldname="name"
-				)
-				if args.coupon_code != coupon_code:
-					continue
+				pricing_rule.apply_rule_on_other_items = get_pricing_rule_items(pricing_rule) or []
 
 			if pricing_rule.get("suggestion"):
 				continue
@@ -399,6 +375,9 @@ def get_pricing_rule_for_item(args, doc=None, for_validate=False):
 						pricing_rule.apply_rule_on_other_items
 					)
 
+			if pricing_rule.coupon_code_based == 1 and args.coupon_code is None:
+				return item_details
+
 			if not pricing_rule.validate_applied_rule:
 				if pricing_rule.price_or_product_discount == "Price":
 					apply_price_discount_rule(pricing_rule, item_details, args)
@@ -553,7 +532,7 @@ def remove_pricing_rule_for_item(pricing_rules, item_details, item_code=None, ra
 			if pricing_rule.margin_type in ["Percentage", "Amount"]:
 				item_details.margin_rate_or_amount = 0.0
 				item_details.margin_type = None
-		elif pricing_rule.get("free_item") and not pricing_rule.get("dont_enforce_free_item_qty"):
+		elif pricing_rule.get("free_item"):
 			item_details.remove_free_item = (
 				item_code if pricing_rule.get("same_item") else pricing_rule.get("free_item")
 			)

erpnext/accounts/doctype/pricing_rule/test_pricing_rule.py

@@ -5,17 +5,14 @@
 import unittest
 
 import frappe
-from frappe.tests.utils import FrappeTestCase, change_settings
 
-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.controllers.sales_and_purchase_return import make_return_doc
 from erpnext.selling.doctype.sales_order.test_sales_order import make_sales_order
 from erpnext.stock.doctype.item.test_item import make_item
 from erpnext.stock.get_item_details import get_item_details
 
 
-class TestPricingRule(FrappeTestCase):
+class TestPricingRule(unittest.TestCase):
 	def setUp(self):
 		delete_existing_pricing_rules()
 		setup_pricing_rule_data()
@@ -428,54 +425,6 @@ class TestPricingRule(FrappeTestCase):
 		self.assertEqual(so.items[1].is_free_item, 1)
 		self.assertEqual(so.items[1].item_code, "_Test Item 2")
 
-	def test_dont_enforce_free_item_qty(self):
-		# this test is only for testing non-enforcement as all other tests in this file already test with enforcement
-		frappe.delete_doc_if_exists("Pricing Rule", "_Test Pricing Rule")
-		test_record = {
-			"doctype": "Pricing Rule",
-			"title": "_Test Pricing Rule",
-			"apply_on": "Item Code",
-			"currency": "USD",
-			"items": [
-				{
-					"item_code": "_Test Item",
-				}
-			],
-			"selling": 1,
-			"rate_or_discount": "Discount Percentage",
-			"rate": 0,
-			"min_qty": 0,
-			"max_qty": 7,
-			"discount_percentage": 17.5,
-			"price_or_product_discount": "Product",
-			"same_item": 0,
-			"free_item": "_Test Item 2",
-			"free_qty": 1,
-			"company": "_Test Company",
-		}
-		pricing_rule = frappe.get_doc(test_record.copy()).insert()
-
-		# With enforcement
-		so = make_sales_order(item_code="_Test Item", qty=1, do_not_submit=True)
-		self.assertEqual(so.items[1].is_free_item, 1)
-		self.assertEqual(so.items[1].item_code, "_Test Item 2")
-
-		# Test 1 : Saving a document with an item with pricing list without it's corresponding free item will cause it the free item to be refetched on save
-		so.items.pop(1)
-		so.save()
-		so.reload()
-		self.assertEqual(len(so.items), 2)
-
-		# Without enforcement
-		pricing_rule.dont_enforce_free_item_qty = 1
-		pricing_rule.save()
-
-		# Test 2 : Deleted free item will not be fetched again on save without enforcement
-		so.items.pop(1)
-		so.save()
-		so.reload()
-		self.assertEqual(len(so.items), 1)
-
 	def test_cumulative_pricing_rule(self):
 		frappe.delete_doc_if_exists("Pricing Rule", "_Test Cumulative Pricing Rule")
 		test_record = {
@@ -1027,52 +976,7 @@ class TestPricingRule(FrappeTestCase):
 		so.load_from_db()
 		self.assertEqual(so.items[1].is_free_item, 1)
 		self.assertEqual(so.items[1].item_code, "_Test Item")
-		self.assertEqual(so.items[1].qty, 3)
-
-		so = make_sales_order(item_code="_Test Item", qty=5, do_not_submit=1)
-		so.items[0].qty = 1
-		del so.items[-1]
-		so.save()
-		self.assertEqual(len(so.items), 1)
-
-	def test_pricing_rule_for_product_free_item_round_free_qty(self):
-		frappe.delete_doc_if_exists("Pricing Rule", "_Test Pricing Rule")
-		test_record = {
-			"doctype": "Pricing Rule",
-			"title": "_Test Pricing Rule",
-			"apply_on": "Item Code",
-			"currency": "USD",
-			"items": [
-				{
-					"item_code": "_Test Item",
-				}
-			],
-			"selling": 1,
-			"rate": 0,
-			"min_qty": 100,
-			"max_qty": 0,
-			"price_or_product_discount": "Product",
-			"same_item": 1,
-			"free_qty": 10,
-			"round_free_qty": 1,
-			"is_recursive": 1,
-			"recurse_for": 100,
-			"company": "_Test Company",
-		}
-		frappe.get_doc(test_record.copy()).insert()
-
-		# With pricing rule
-		so = make_sales_order(item_code="_Test Item", qty=100)
-		so.load_from_db()
-		self.assertEqual(so.items[1].is_free_item, 1)
-		self.assertEqual(so.items[1].item_code, "_Test Item")
-		self.assertEqual(so.items[1].qty, 10)
-
-		so = make_sales_order(item_code="_Test Item", qty=150)
-		so.load_from_db()
-		self.assertEqual(so.items[1].is_free_item, 1)
-		self.assertEqual(so.items[1].item_code, "_Test Item")
-		self.assertEqual(so.items[1].qty, 10)
+		self.assertEqual(so.items[1].qty, 4)
 
 	def test_apply_multiple_pricing_rules_for_discount_percentage_and_amount(self):
 		frappe.delete_doc_if_exists("Pricing Rule", "_Test Pricing Rule 1")
@@ -1127,137 +1031,6 @@ class TestPricingRule(FrappeTestCase):
 		frappe.delete_doc_if_exists("Pricing Rule", "_Test Pricing Rule 1")
 		frappe.delete_doc_if_exists("Pricing Rule", "_Test Pricing Rule 2")
 
-	def test_priority_of_multiple_pricing_rules(self):
-		frappe.delete_doc_if_exists("Pricing Rule", "_Test Pricing Rule 1")
-		frappe.delete_doc_if_exists("Pricing Rule", "_Test Pricing Rule 2")
-
-		test_record = {
-			"doctype": "Pricing Rule",
-			"title": "_Test Pricing Rule 1",
-			"name": "_Test Pricing Rule 1",
-			"apply_on": "Item Code",
-			"currency": "USD",
-			"items": [
-				{
-					"item_code": "_Test Item",
-				}
-			],
-			"selling": 1,
-			"price_or_product_discount": "Price",
-			"rate_or_discount": "Discount Percentage",
-			"discount_percentage": 10,
-			"has_priority": 1,
-			"priority": 1,
-			"company": "_Test Company",
-		}
-
-		frappe.get_doc(test_record.copy()).insert()
-
-		test_record = {
-			"doctype": "Pricing Rule",
-			"title": "_Test Pricing Rule 2",
-			"name": "_Test Pricing Rule 2",
-			"apply_on": "Item Code",
-			"currency": "USD",
-			"items": [
-				{
-					"item_code": "_Test Item",
-				}
-			],
-			"selling": 1,
-			"price_or_product_discount": "Price",
-			"rate_or_discount": "Discount Percentage",
-			"discount_percentage": 20,
-			"has_priority": 1,
-			"priority": 3,
-			"company": "_Test Company",
-		}
-
-		frappe.get_doc(test_record.copy()).insert()
-
-		so = make_sales_order(item_code="_Test Item", qty=1, price_list_rate=1000, do_not_submit=True)
-		self.assertEqual(so.items[0].discount_percentage, 20)
-		self.assertEqual(so.items[0].rate, 800)
-
-		frappe.delete_doc_if_exists("Sales Order", so.name)
-		frappe.delete_doc_if_exists("Pricing Rule", "_Test Pricing Rule 1")
-		frappe.delete_doc_if_exists("Pricing Rule", "_Test Pricing Rule 2")
-
-	def test_validation_on_mixed_condition_with_recursion(self):
-		pricing_rule = make_pricing_rule(
-			discount_percentage=10,
-			selling=1,
-			priority=2,
-			min_qty=4,
-			title="_Test Pricing Rule with Min Qty - 2",
-		)
-		pricing_rule.mixed_conditions = True
-		pricing_rule.is_recursive = True
-		self.assertRaises(frappe.ValidationError, pricing_rule.save)
-
-	def test_ignore_pricing_rule_for_credit_note(self):
-		frappe.delete_doc_if_exists("Pricing Rule", "_Test Pricing Rule")
-		pricing_rule = make_pricing_rule(
-			discount_percentage=20,
-			selling=1,
-			buying=1,
-			priority=1,
-			title="_Test Pricing Rule",
-		)
-
-		si = create_sales_invoice(do_not_submit=True, customer="_Test Customer 1", qty=1)
-		item = si.items[0]
-		si.submit()
-		self.assertEqual(item.discount_percentage, 20)
-		self.assertEqual(item.rate, 80)
-
-		# change discount on pricing rule
-		pricing_rule.discount_percentage = 30
-		pricing_rule.save()
-
-		credit_note = make_return_doc(si.doctype, si.name)
-		credit_note.save()
-		self.assertEqual(credit_note.ignore_pricing_rule, 1)
-		self.assertEqual(credit_note.pricing_rules, [])
-		self.assertEqual(credit_note.items[0].discount_percentage, 20)
-		self.assertEqual(credit_note.items[0].rate, 80)
-		self.assertEqual(credit_note.items[0].pricing_rules, None)
-
-		credit_note.delete()
-		si.cancel()
-
-	def test_ignore_pricing_rule_for_debit_note(self):
-		frappe.delete_doc_if_exists("Pricing Rule", "_Test Pricing Rule")
-		pricing_rule = make_pricing_rule(
-			discount_percentage=20,
-			buying=1,
-			priority=1,
-			title="_Test Pricing Rule",
-		)
-
-		pi = make_purchase_invoice(do_not_submit=True, supplier="_Test Supplier 1", qty=1)
-		item = pi.items[0]
-		pi.submit()
-		self.assertEqual(item.discount_percentage, 20)
-		self.assertEqual(item.rate, 40)
-
-		# change discount on pricing rule
-		pricing_rule.discount_percentage = 30
-		pricing_rule.save()
-
-		# create debit note from purchase invoice
-		debit_note = make_return_doc(pi.doctype, pi.name)
-		debit_note.save()
-
-		self.assertEqual(debit_note.ignore_pricing_rule, 1)
-		self.assertEqual(debit_note.pricing_rules, [])
-		self.assertEqual(debit_note.items[0].discount_percentage, 20)
-		self.assertEqual(debit_note.items[0].rate, 40)
-		self.assertEqual(debit_note.items[0].pricing_rules, None)
-
-		debit_note.delete()
-		pi.cancel()
-
 
 test_dependencies = ["Campaign"]
 
@@ -1286,8 +1059,6 @@ def make_pricing_rule(**args):
 			"priority": args.priority or 1,
 			"discount_amount": args.discount_amount or 0.0,
 			"apply_multiple_pricing_rules": args.apply_multiple_pricing_rules or 0,
-			"has_priority": args.has_priority or 0,
-			"enforce_free_item_qty": args.dont_enforce_free_item_qty or 0,
 		}
 	)
 

erpnext/accounts/doctype/pricing_rule/utils.py

@@ -6,7 +6,6 @@
 
 import copy
 import json
-import math
 
 import frappe
 from frappe import _, bold
@@ -33,9 +32,6 @@ def get_pricing_rules(args, doc=None):
 
 	for apply_on in ["Item Code", "Item Group", "Brand"]:
 		pricing_rules.extend(_get_pricing_rules(apply_on, args, values))
-		if pricing_rules and pricing_rules[0].has_priority:
-			continue
-
 		if pricing_rules and not apply_multiple_pricing_rules(pricing_rules):
 			break
 
@@ -485,7 +481,7 @@ def get_qty_and_rate_for_other_item(doc, pr_doc, pricing_rules, row_item):
 				continue
 
 			stock_qty = row.get("qty") * (row.get("conversion_factor") or 1.0)
-			amount = stock_qty * (flt(row.get("price_list_rate")) or flt(row.get("rate")))
+			amount = stock_qty * (row.get("price_list_rate") or row.get("rate"))
 			pricing_rules = filter_pricing_rules_for_qty_amount(stock_qty, amount, pricing_rules, row)
 
 			if pricing_rules and pricing_rules[0]:
@@ -642,10 +638,7 @@ def get_product_discount_rule(pricing_rule, item_details, args=None, doc=None):
 		if transaction_qty:
 			qty = flt(transaction_qty) * qty / pricing_rule.recurse_for
 			if pricing_rule.round_free_qty:
-				qty = (flt(transaction_qty) // pricing_rule.recurse_for) * (pricing_rule.free_qty or 1)
-
-	if not qty:
-		return
+				qty = round(qty)
 
 	free_item_data_args = {
 		"item_code": free_item,
@@ -691,10 +684,7 @@ def apply_pricing_rule_for_free_items(doc, pricing_rule_args):
 				args.pop((item.item_code, item.pricing_rules))
 
 		for free_item in args.values():
-			if doc.is_new() or not frappe.get_value(
-				"Pricing Rule", free_item["pricing_rules"], "dont_enforce_free_item_qty"
-			):
-				doc.append("items", free_item)
+			doc.append("items", free_item)
 
 
 def get_pricing_rule_items(pr_doc, other_items=False) -> list:
@@ -718,11 +708,14 @@ def get_pricing_rule_items(pr_doc, other_items=False) -> list:
 
 def validate_coupon_code(coupon_name):
 	coupon = frappe.get_doc("Coupon Code", coupon_name)
-	if coupon.valid_from and coupon.valid_from > getdate(today()):
-		frappe.throw(_("Sorry, this coupon code's validity has not started"))
-	elif coupon.valid_upto and coupon.valid_upto < getdate(today()):
-		frappe.throw(_("Sorry, this coupon code's validity has expired"))
-	elif coupon.maximum_use and coupon.used >= coupon.maximum_use:
+
+	if coupon.valid_from:
+		if coupon.valid_from > getdate(today()):
+			frappe.throw(_("Sorry, this coupon code's validity has not started"))
+	elif coupon.valid_upto:
+		if coupon.valid_upto < getdate(today()):
+			frappe.throw(_("Sorry, this coupon code's validity has expired"))
+	elif coupon.used >= coupon.maximum_use:
 		frappe.throw(_("Sorry, this coupon code is no longer valid"))
 
 

erpnext/accounts/doctype/process_payment_reconciliation/process_payment_reconciliation.js

@@ -20,17 +20,6 @@ frappe.ui.form.on("Process Payment Reconciliation", {
 				},
 			};
 		});
-
-		frm.set_query("default_advance_account", function (doc) {
-			return {
-				filters: {
-					company: doc.company,
-					is_group: 0,
-					account_type: doc.party_type == "Customer" ? "Receivable" : "Payable",
-					root_type: doc.party_type == "Customer" ? "Liability" : "Asset",
-				},
-			};
-		});
 		frm.set_query("cost_center", function (doc) {
 			return {
 				filters: {
@@ -113,7 +102,6 @@ frappe.ui.form.on("Process Payment Reconciliation", {
 	company(frm) {
 		frm.set_value("party", "");
 		frm.set_value("receivable_payable_account", "");
-		frm.set_value("default_advance_account", "");
 	},
 	party_type(frm) {
 		frm.set_value("party", "");
@@ -121,7 +109,6 @@ frappe.ui.form.on("Process Payment Reconciliation", {
 
 	party(frm) {
 		frm.set_value("receivable_payable_account", "");
-		frm.set_value("default_advance_account", "");
 		if (!frm.doc.receivable_payable_account && frm.doc.party_type && frm.doc.party) {
 			return frappe.call({
 				method: "erpnext.accounts.party.get_party_account",
@@ -129,16 +116,10 @@ frappe.ui.form.on("Process Payment Reconciliation", {
 					company: frm.doc.company,
 					party_type: frm.doc.party_type,
 					party: frm.doc.party,
-					include_advance: 1,
 				},
 				callback: (r) => {
 					if (!r.exc && r.message) {
-						if (typeof r.message === "string") {
-							frm.set_value("receivable_payable_account", r.message);
-						} else if (Array.isArray(r.message)) {
-							frm.set_value("receivable_payable_account", r.message[0]);
-							frm.set_value("default_advance_account", r.message[1]);
-						}
+						frm.set_value("receivable_payable_account", r.message);
 					}
 					frm.refresh();
 				},

erpnext/accounts/doctype/process_payment_reconciliation/process_payment_reconciliation.json

@@ -13,7 +13,6 @@
   "column_break_io6c",
   "party",
   "receivable_payable_account",
-  "default_advance_account",
   "filter_section",
   "from_invoice_date",
   "to_invoice_date",
@@ -142,23 +141,12 @@
   {
    "fieldname": "section_break_a8yx",
    "fieldtype": "Section Break"
-  },
-  {
-   "depends_on": "eval:doc.party",
-   "description": "Only 'Payment Entries' made against this advance account are supported.",
-   "documentation_url": "https://docs.erpnext.com/docs/user/manual/en/advance-in-separate-party-account",
-   "fieldname": "default_advance_account",
-   "fieldtype": "Link",
-   "label": "Default Advance Account",
-   "mandatory_depends_on": "doc.party_type",
-   "options": "Account",
-   "reqd": 1
   }
  ],
  "index_web_pages_for_search": 1,
  "is_submittable": 1,
  "links": [],
- "modified": "2024-08-27 14:48:56.715320",
+ "modified": "2023-08-11 10:56:51.699137",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Process Payment Reconciliation",
@@ -192,4 +180,4 @@
  "sort_order": "DESC",
  "states": [],
  "title_field": "company"
-}
+}

erpnext/accounts/doctype/process_payment_reconciliation/process_payment_reconciliation.py

@@ -1,8 +1,6 @@
 # Copyright (c) 2023, Frappe Technologies Pvt. Ltd. and contributors
 # For license information, please see license.txt
 
-import json
-
 import frappe
 from frappe import _, qb
 from frappe.model.document import Document
@@ -76,7 +74,6 @@ def get_pr_instance(doc: str):
 		"party_type",
 		"party",
 		"receivable_payable_account",
-		"default_advance_account",
 		"from_invoice_date",
 		"to_invoice_date",
 		"from_payment_date",
@@ -482,7 +479,7 @@ def is_any_doc_running(for_filter: str | dict | None = None) -> str | None:
 	running_doc = None
 	if for_filter:
 		if isinstance(for_filter, str):
-			for_filter = json.loads(for_filter)
+			for_filter = frappe.json.loads(for_filter)
 
 		running_doc = frappe.db.get_value(
 			"Process Payment Reconciliation",

erpnext/accounts/doctype/process_payment_reconciliation_log_allocations/process_payment_reconciliation_log_allocations.json

@@ -20,7 +20,6 @@
   "is_advance",
   "section_break_5",
   "difference_amount",
-  "gain_loss_posting_date",
   "column_break_7",
   "difference_account",
   "exchange_rate",
@@ -154,16 +153,11 @@
    "fieldtype": "Check",
    "in_list_view": 1,
    "label": "Reconciled"
-  },
-  {
-   "fieldname": "gain_loss_posting_date",
-   "fieldtype": "Date",
-   "label": "Difference Posting Date"
   }
  ],
  "istable": 1,
  "links": [],
- "modified": "2025-01-23 16:09:01.058574",
+ "modified": "2023-03-20 21:05:43.121945",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Process Payment Reconciliation Log Allocations",

erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.json

@@ -12,11 +12,10 @@
   "posting_date",
   "company",
   "account",
-  "categorize_by",
+  "group_by",
   "cost_center",
   "territory",
   "ignore_exchange_rate_revaluation_journals",
-  "ignore_cr_dr_notes",
   "column_break_14",
   "to_date",
   "finance_book",
@@ -25,7 +24,6 @@
   "payment_terms_template",
   "sales_partner",
   "sales_person",
-  "show_remarks",
   "based_on_payment_terms",
   "section_break_3",
   "customer_collection",
@@ -172,6 +170,14 @@
    "fieldtype": "Date",
    "label": "Start Date"
   },
+  {
+   "default": "Group by Voucher (Consolidated)",
+   "depends_on": "eval:(doc.report == 'General Ledger');",
+   "fieldname": "group_by",
+   "fieldtype": "Select",
+   "label": "Group By",
+   "options": "\nGroup by Voucher\nGroup by Voucher (Consolidated)"
+  },
   {
    "depends_on": "eval: (doc.report == 'General Ledger');",
    "fieldname": "currency",
@@ -375,30 +381,10 @@
    "fieldname": "ignore_exchange_rate_revaluation_journals",
    "fieldtype": "Check",
    "label": "Ignore Exchange Rate Revaluation Journals"
-  },
-  {
-   "default": "0",
-   "fieldname": "ignore_cr_dr_notes",
-   "fieldtype": "Check",
-   "label": "Ignore System Generated Credit / Debit Notes"
-  },
-  {
-   "default": "0",
-   "fieldname": "show_remarks",
-   "fieldtype": "Check",
-   "label": "Show Remarks"
-  },
-  {
-   "default": "Categorize by Voucher (Consolidated)",
-   "depends_on": "eval:(doc.report == 'General Ledger');",
-   "fieldname": "categorize_by",
-   "fieldtype": "Select",
-   "label": "Categorize By",
-   "options": "\nCategorize by Voucher\nCategorize by Voucher (Consolidated)"
   }
  ],
  "links": [],
- "modified": "2025-04-30 14:43:23.643006",
+ "modified": "2023-12-18 12:20:08.965120",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Process Statement Of Accounts",
@@ -433,4 +419,4 @@
  "sort_field": "modified",
  "sort_order": "DESC",
  "track_changes": 1
-}
+}

erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.py

@@ -79,9 +79,6 @@ def get_statement_dict(doc, get_statement_dict=False):
 		if doc.ignore_exchange_rate_revaluation_journals:
 			filters.update({"ignore_err": True})
 
-		if doc.ignore_cr_dr_notes:
-			filters.update({"ignore_cr_dr_notes": True})
-
 		if doc.report == "General Ledger":
 			filters.update(get_gl_filters(doc, entry, tax_id, presentation_currency))
 			col, res = get_soa(filters)
@@ -107,7 +104,7 @@ def set_ageing(doc, entry):
 	ageing_filters = frappe._dict(
 		{
 			"company": doc.company,
-			"report_date": doc.posting_date,
+			"report_date": doc.to_date,
 			"ageing_based_on": doc.ageing_based_on,
 			"range1": 30,
 			"range2": 60,
@@ -132,7 +129,6 @@ def get_common_filters(doc):
 			"finance_book": doc.finance_book if doc.finance_book else None,
 			"account": [doc.account] if doc.account else None,
 			"cost_center": [cc.cost_center_name for cc in doc.cost_center],
-			"show_remarks": doc.show_remarks,
 		}
 	)
 
@@ -145,7 +141,7 @@ def get_gl_filters(doc, entry, tax_id, presentation_currency):
 		"party": [entry.customer],
 		"party_name": [entry.customer_name] if entry.customer_name else None,
 		"presentation_currency": presentation_currency,
-		"categorize_by": doc.categorize_by,
+		"group_by": doc.group_by,
 		"currency": doc.currency,
 		"project": [p.project_name for p in doc.project],
 		"show_opening_entries": 0,
@@ -177,21 +173,17 @@ def get_ar_filters(doc, entry):
 
 def get_html(doc, filters, entry, col, res, ageing):
 	base_template_path = "frappe/www/printview.html"
-	template_path = "erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts_accounts_receivable.html"
-	if doc.report == "General Ledger":
-		template_path = (
-			"erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.html"
-		)
-
-	process_soa_html = frappe.get_hooks("process_soa_html")
-	# fetching custom print format for Process Statement of Accounts
-	if process_soa_html and process_soa_html.get(doc.report):
-		template_path = process_soa_html[doc.report][-1]
+	template_path = (
+		"erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.html"
+		if doc.report == "General Ledger"
+		else "erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts_accounts_receivable.html"
+	)
 
 	if doc.letter_head:
 		from frappe.www.printview import get_letter_head
 
 		letter_head = get_letter_head(doc, 0)
+
 	html = frappe.render_template(
 		template_path,
 		{
@@ -207,6 +199,7 @@ def get_html(doc, filters, entry, col, res, ageing):
 			else None,
 		},
 	)
+
 	html = frappe.render_template(
 		base_template_path,
 		{"body": html, "css": get_print_style(), "title": "Statement For " + entry.customer},
@@ -265,12 +258,9 @@ def get_recipients_and_cc(customer, doc):
 	recipients = []
 	for clist in doc.customers:
 		if clist.customer == customer:
-			if clist.billing_email:
-				for email in clist.billing_email.split(","):
-					recipients.append(email.strip())
+			recipients.append(clist.billing_email)
 			if doc.primary_mandatory and clist.primary_email:
-				for email in clist.primary_email.split(","):
-					recipients.append(email.strip())
+				recipients.append(clist.primary_email)
 	cc = []
 	if doc.cc_to != "":
 		try:
@@ -449,7 +439,7 @@ def send_auto_email():
 	selected = frappe.get_list(
 		"Process Statement Of Accounts",
 		filters={"enable_auto_email": 1},
-		or_filters={"to_date": today(), "posting_date": today()},
+		or_filters={"to_date": format_date(today()), "posting_date": format_date(today())},
 	)
 	for entry in selected:
 		send_emails(entry.name, from_scheduler=True)

erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts_accounts_receivable.html

@@ -340,11 +340,10 @@
 	<table class="table table-bordered">
 		<thead>
 			<tr>
-				<th style="width: 25%">0 - 30 Days</th>
-				<th style="width: 25%">30 - 60 Days</th>
-				<th style="width: 25%">60 - 90 Days</th>
-				<th style="width: 25%">90 - 120 Days</th>
-				<th style="width: 20%">Above 120 Days</th>
+				<th style="width: 25%">30 Days</th>
+				<th style="width: 25%">60 Days</th>
+				<th style="width: 25%">90 Days</th>
+				<th style="width: 25%">120 Days</th>
 			</tr>
 		</thead>
 		<tbody>
@@ -353,7 +352,6 @@
 				<td>{{ frappe.utils.fmt_money(ageing.range2, currency=data[0]["currency"]) }}</td>
 				<td>{{ frappe.utils.fmt_money(ageing.range3, currency=data[0]["currency"]) }}</td>
 				<td>{{ frappe.utils.fmt_money(ageing.range4, currency=data[0]["currency"]) }}</td>
-				<td>{{ frappe.utils.fmt_money(ageing.range5, currency=filters.presentation_currency) }}</td>
 			</tr>
 		</tbody>
 	</table>

erpnext/accounts/doctype/promotional_scheme/promotional_scheme.py

@@ -5,8 +5,6 @@
 import frappe
 from frappe import _
 from frappe.model.document import Document
-from frappe.query_builder import Criterion
-from frappe.query_builder.functions import IfNull
 
 pricing_rule_fields = [
 	"apply_on",
@@ -79,7 +77,6 @@ class PromotionalScheme(Document):
 
 		self.validate_applicable_for()
 		self.validate_pricing_rules()
-		self.validate_mixed_with_recursion()
 
 	def validate_applicable_for(self):
 		if self.applicable_for:
@@ -93,53 +90,24 @@ class PromotionalScheme(Document):
 		if self.is_new():
 			return
 
-		invalid_pricing_rule = self.get_invalid_pricing_rules()
+		transaction_exists = False
+		docnames = []
 
-		if not invalid_pricing_rule:
+		# If user has changed applicable for
+		if self._doc_before_save.applicable_for == self.applicable_for:
 			return
 
-		if frappe.db.exists(
-			"Pricing Rule Detail",
-			{
-				"pricing_rule": ["in", invalid_pricing_rule],
-				"docstatus": ["<", 2],
-			},
-		):
-			raise_for_transaction_exists(self.name)
+		docnames = frappe.get_all("Pricing Rule", filters={"promotional_scheme": self.name})
 
-		for doc in invalid_pricing_rule:
-			frappe.delete_doc("Pricing Rule", doc)
+		for docname in docnames:
+			if frappe.db.exists("Pricing Rule Detail", {"pricing_rule": docname.name, "docstatus": ("<", 2)}):
+				raise_for_transaction_exists(self.name)
 
-		frappe.msgprint(
-			_("The following invalid Pricing Rules are deleted:")
-			+ "<br><br><ul><li>"
-			+ "</li><li>".join(invalid_pricing_rule)
-			+ "</li></ul>"
-		)
-
-	def get_invalid_pricing_rules(self):
-		pr = frappe.qb.DocType("Pricing Rule")
-		conditions = []
-		conditions.append(pr.promotional_scheme == self.name)
-
-		if self.applicable_for:
-			applicable_for = frappe.scrub(self.applicable_for)
-			applicable_for_list = [d.get(applicable_for) for d in self.get(applicable_for)]
-
-			conditions.append(
-				(IfNull(pr.applicable_for, "") != self.applicable_for)
-				| (
-					(IfNull(pr.applicable_for, "") == self.applicable_for)
-					& IfNull(pr[applicable_for], "").notin(applicable_for_list)
-				)
-			)
-		else:
-			conditions.append(IfNull(pr.applicable_for, "") != "")
-
-		return frappe.qb.from_(pr).select(pr.name).where(Criterion.all(conditions)).run(pluck=True)
+		if docnames and not transaction_exists:
+			for docname in docnames:
+				frappe.delete_doc("Pricing Rule", docname.name)
 
 	def on_update(self):
-		self.validate()
 		pricing_rules = (
 			frappe.get_all(
 				"Pricing Rule",
@@ -151,15 +119,6 @@ class PromotionalScheme(Document):
 		)
 		self.update_pricing_rules(pricing_rules)
 
-	def validate_mixed_with_recursion(self):
-		if self.mixed_conditions:
-			if self.product_discount_slabs:
-				for slab in self.product_discount_slabs:
-					if slab.is_recursive:
-						frappe.throw(
-							_("Recursive Discounts with Mixed condition is not supported by the system")
-						)
-
 	def update_pricing_rules(self, pricing_rules):
 		rules = {}
 		count = 0

erpnext/accounts/doctype/promotional_scheme/test_promotional_scheme.py

@@ -90,31 +90,6 @@ class TestPromotionalScheme(unittest.TestCase):
 		price_rules = frappe.get_all("Pricing Rule", filters={"promotional_scheme": ps.name})
 		self.assertEqual(price_rules, [])
 
-	def test_change_applicable_for_values_in_promotional_scheme(self):
-		ps = make_promotional_scheme(applicable_for="Customer", customer="_Test Customer")
-		ps.append("customer", {"customer": "_Test Customer 2"})
-		ps.save()
-
-		price_rules = frappe.get_all(
-			"Pricing Rule", filters={"promotional_scheme": ps.name, "applicable_for": "Customer"}
-		)
-		self.assertTrue(len(price_rules), 2)
-
-		ps.set("customer", [])
-		ps.append("customer", {"customer": "_Test Customer 2"})
-		ps.save()
-
-		price_rules = frappe.get_all(
-			"Pricing Rule",
-			filters={
-				"promotional_scheme": ps.name,
-				"applicable_for": "Customer",
-				"customer": "_Test Customer",
-			},
-		)
-		self.assertEqual(price_rules, [])
-		frappe.delete_doc("Promotional Scheme", ps.name)
-
 	def test_min_max_amount_configuration(self):
 		ps = make_promotional_scheme()
 		ps.price_discount_slabs[0].min_amount = 10
@@ -132,25 +107,6 @@ class TestPromotionalScheme(unittest.TestCase):
 		price_rules = frappe.get_all("Pricing Rule", filters={"promotional_scheme": ps.name})
 		self.assertEqual(price_rules, [])
 
-	def test_validation_on_recurse_with_mixed_condition(self):
-		ps = make_promotional_scheme()
-		ps.set("price_discount_slabs", [])
-		ps.set(
-			"product_discount_slabs",
-			[
-				{
-					"rule_description": "12+1",
-					"min_qty": 12,
-					"free_item": "_Test Item 2",
-					"free_qty": 1,
-					"is_recursive": 1,
-					"recurse_for": 12,
-				}
-			],
-		)
-		ps.mixed_conditions = True
-		self.assertRaises(frappe.ValidationError, ps.save)
-
 
 def make_promotional_scheme(**args):
 	args = frappe._dict(args)

erpnext/accounts/doctype/psoa_cost_center/psoa_cost_center.json

@@ -11,15 +11,13 @@
   {
    "fieldname": "cost_center_name",
    "fieldtype": "Link",
-   "in_list_view": 1,
    "label": "Cost Center",
-   "options": "Cost Center",
-   "reqd": 1
+   "options": "Cost Center"
   }
  ],
  "istable": 1,
  "links": [],
- "modified": "2024-05-03 17:16:51.666461",
+ "modified": "2020-08-03 16:56:45.744905",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "PSOA Cost Center",
@@ -29,4 +27,4 @@
  "sort_field": "modified",
  "sort_order": "DESC",
  "track_changes": 1
-}
+}

erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js

@@ -25,16 +25,6 @@ erpnext.accounts.PurchaseInvoice = class PurchaseInvoice extends erpnext.buying.
 				}
 			};
 		});
-
-		this.frm.set_query("expense_account", "items", function () {
-			return {
-				query: "erpnext.controllers.queries.get_expense_account",
-				filters: {
-					company: doc.company,
-					disabled: 0,
-				},
-			};
-		});
 	}
 
 	onload() {
@@ -69,6 +59,25 @@ erpnext.accounts.PurchaseInvoice = class PurchaseInvoice extends erpnext.buying.
 			this.show_stock_ledger();
 		}
 
+		if (this.frm.doc.repost_required && this.frm.doc.docstatus===1) {
+			this.frm.set_intro(__("Accounting entries for this invoice need to be reposted. Please click on 'Repost' button to update."));
+			this.frm.add_custom_button(__('Repost Accounting Entries'),
+				() => {
+					this.frm.call({
+						doc: this.frm.doc,
+						method: 'repost_accounting_entries',
+						freeze: true,
+						freeze_message: __('Reposting...'),
+						callback: (r) => {
+							if (!r.exc) {
+								frappe.msgprint(__('Accounting Entries are reposted.'));
+								me.frm.refresh();
+							}
+						}
+					});
+				}).removeClass('btn-default').addClass('btn-warning');
+		}
+
 		if(!doc.is_return && doc.docstatus == 1 && doc.outstanding_amount != 0){
 			if(doc.on_hold) {
 				this.frm.add_custom_button(
@@ -305,11 +314,7 @@ erpnext.accounts.PurchaseInvoice = class PurchaseInvoice extends erpnext.buying.
 
 		if (this.frm.doc.__onload && this.frm.doc.__onload.load_after_mapping) return;
 
-		let payment_terms_template = this.frm.doc.payment_terms_template;
-
-		erpnext.utils.get_party_details(
-			this.frm,
-			"erpnext.accounts.party.get_party_details",
+		erpnext.utils.get_party_details(this.frm, "erpnext.accounts.party.get_party_details",
 			{
 				posting_date: this.frm.doc.posting_date,
 				bill_date: this.frm.doc.bill_date,
@@ -317,24 +322,14 @@ erpnext.accounts.PurchaseInvoice = class PurchaseInvoice extends erpnext.buying.
 				party_type: "Supplier",
 				account: this.frm.doc.credit_to,
 				price_list: this.frm.doc.buying_price_list,
-				fetch_payment_terms_template: cint(
-					(this.frm.doc.is_return == 0) & !this.frm.doc.ignore_default_payment_terms_template
-				),
-			},
-			function () {
+				fetch_payment_terms_template: cint(!this.frm.doc.ignore_default_payment_terms_template)
+			}, function() {
 				me.apply_pricing_rule();
 				me.frm.doc.apply_tds = me.frm.supplier_tds ? 1 : 0;
 				me.frm.doc.tax_withholding_category = me.frm.supplier_tds;
 				me.frm.set_df_property("apply_tds", "read_only", me.frm.supplier_tds ? 0 : 1);
 				me.frm.set_df_property("tax_withholding_category", "hidden", me.frm.supplier_tds ? 0 : 1);
-
-				// while duplicating, don't change payment terms
-				if (me.frm.doc.__run_link_triggers === false) {
-					me.frm.set_value("payment_terms_template", payment_terms_template);
-					me.frm.refresh_field("payment_terms_template");
-				}
-			}
-		);
+			})
 	}
 
 	apply_tds(frm) {
@@ -380,8 +375,6 @@ erpnext.accounts.PurchaseInvoice = class PurchaseInvoice extends erpnext.buying.
 		hide_fields(this.frm.doc);
 		if(cint(this.frm.doc.is_paid)) {
 			this.frm.set_value("allocate_advances_automatically", 0);
-			this.frm.set_value("payment_terms_template", "");
-			this.frm.set_value("payment_schedule", []);
 			if(!this.frm.doc.company) {
 				this.frm.set_value("is_paid", 0)
 				frappe.msgprint(__("Please specify Company to proceed"));
@@ -447,12 +440,8 @@ function hide_fields(doc) {
 
 	var item_fields_stock = ['warehouse_section', 'received_qty', 'rejected_qty'];
 
-	if (cur_frm.fields_dict["items"]) {
-		cur_frm.fields_dict["items"].grid.set_column_disp(
-			item_fields_stock,
-			cint(doc.update_stock) == 1 || cint(doc.is_return) == 1 ? true : false
-		);
-	}
+	cur_frm.fields_dict['items'].grid.set_column_disp(item_fields_stock,
+		(cint(doc.update_stock)==1 || cint(doc.is_return)==1 ? true : false));
 
 	cur_frm.refresh_fields();
 }
@@ -495,6 +484,13 @@ cur_frm.fields_dict['select_print_heading'].get_query = function(doc, cdt, cdn)
 	}
 }
 
+cur_frm.set_query("expense_account", "items", function(doc) {
+	return {
+		query: "erpnext.controllers.queries.get_expense_account",
+		filters: {'company': doc.company }
+	}
+});
+
 cur_frm.set_query("wip_composite_asset", "items", function() {
 	return {
 		filters: {'is_composite_asset': 1, 'docstatus': 0 }

erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json

@@ -170,6 +170,7 @@
   "against_expense_account",
   "column_break_63",
   "unrealized_profit_loss_account",
+  "repost_required",
   "subscription_section",
   "auto_repeat",
   "update_auto_repeat_reference",
@@ -360,8 +361,7 @@
    "description": "Once set, this invoice will be on hold till the set date",
    "fieldname": "release_date",
    "fieldtype": "Date",
-   "label": "Release Date",
-   "search_index": 1
+   "label": "Release Date"
   },
   {
    "fieldname": "cb_17",
@@ -1128,14 +1128,12 @@
    "label": "Payment Terms"
   },
   {
-   "depends_on": "eval:(!doc.is_paid && !doc.is_return)",
    "fieldname": "payment_terms_template",
    "fieldtype": "Link",
    "label": "Payment Terms Template",
    "options": "Payment Terms Template"
   },
   {
-   "depends_on": "eval:(!doc.is_paid && !doc.is_return)",
    "fieldname": "payment_schedule",
    "fieldtype": "Table",
    "label": "Payment Schedule",
@@ -1267,7 +1265,6 @@
    "fieldtype": "Select",
    "in_standard_filter": 1,
    "label": "Status",
-   "no_copy": 1,
    "options": "\nDraft\nReturn\nDebit Note Issued\nSubmitted\nPaid\nPartly Paid\nUnpaid\nOverdue\nCancelled\nInternal Transfer",
    "print_hide": 1
   },
@@ -1593,6 +1590,15 @@
    "fieldtype": "Check",
    "label": "Use Company Default Round Off Cost Center"
   },
+  {
+   "default": "0",
+   "fieldname": "repost_required",
+   "fieldtype": "Check",
+   "hidden": 1,
+   "label": "Repost Required",
+   "options": "Account",
+   "read_only": 1
+  },
   {
    "default": "0",
    "fieldname": "use_transaction_date_exchange_rate",
@@ -1613,7 +1619,7 @@
  "idx": 204,
  "is_submittable": 1,
  "links": [],
- "modified": "2024-10-25 18:13:01.944477",
+ "modified": "2024-03-20 15:57:00.736868",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Purchase Invoice",

erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py

@@ -10,6 +10,7 @@ from frappe.utils import cint, cstr, flt, formatdate, get_link_to_form, getdate,
 
 import erpnext
 from erpnext.accounts.deferred_revenue import validate_service_stop_date
+from erpnext.accounts.doctype.gl_entry.gl_entry import update_outstanding_amt
 from erpnext.accounts.doctype.repost_accounting_ledger.repost_accounting_ledger import (
 	validate_docs_for_deferred_accounting,
 	validate_docs_for_voucher_types,
@@ -32,7 +33,7 @@ from erpnext.accounts.general_ledger import (
 	merge_similar_entries,
 )
 from erpnext.accounts.party import get_due_date, get_party_account
-from erpnext.accounts.utils import get_account_currency, get_fiscal_year, update_voucher_outstanding
+from erpnext.accounts.utils import get_account_currency, get_fiscal_year
 from erpnext.assets.doctype.asset.asset import is_cwip_accounting_enabled
 from erpnext.assets.doctype.asset_category.asset_category import get_asset_category_account
 from erpnext.buying.utils import check_on_hold_or_closed_status
@@ -173,12 +174,7 @@ class PurchaseInvoice(BuyingController):
 			)
 		if not self.due_date:
 			self.due_date = get_due_date(
-				self.posting_date,
-				"Supplier",
-				self.supplier,
-				self.company,
-				self.bill_date,
-				template_name=self.payment_terms_template,
+				self.posting_date, "Supplier", self.supplier, self.company, self.bill_date
 			)
 
 		tds_category = frappe.db.get_value("Supplier", self.supplier, "tax_withholding_category")
@@ -288,7 +284,7 @@ class PurchaseInvoice(BuyingController):
 			stock_not_billed_account = self.get_company_default("stock_received_but_not_billed")
 			stock_items = self.get_stock_items()
 
-		self.asset_received_but_not_billed = None
+		asset_received_but_not_billed = None
 
 		if self.update_stock:
 			self.validate_item_code()
@@ -371,60 +367,26 @@ class PurchaseInvoice(BuyingController):
 							frappe.msgprint(msg, title=_("Expense Head Changed"))
 
 						item.expense_account = stock_not_billed_account
+			elif item.is_fixed_asset and item.pr_detail:
+				if not asset_received_but_not_billed:
+					asset_received_but_not_billed = self.get_company_default("asset_received_but_not_billed")
+				item.expense_account = asset_received_but_not_billed
 			elif item.is_fixed_asset:
-				account = None
-				if not item.pr_detail and item.po_detail:
-					receipt_item = frappe.get_cached_value(
-						"Purchase Receipt Item",
-						{
-							"purchase_order": item.purchase_order,
-							"purchase_order_item": item.po_detail,
-							"docstatus": 1,
-						},
-						["name", "parent"],
-						as_dict=1,
+				account_type = (
+					"capital_work_in_progress_account"
+					if is_cwip_accounting_enabled(item.asset_category)
+					else "fixed_asset_account"
+				)
+				asset_category_account = get_asset_category_account(
+					account_type, item=item.item_code, company=self.company
+				)
+				if not asset_category_account:
+					form_link = get_link_to_form("Asset Category", item.asset_category)
+					throw(
+						_("Please set Fixed Asset Account in {} against {}.").format(form_link, self.company),
+						title=_("Missing Account"),
 					)
-					if receipt_item:
-						item.pr_detail = receipt_item.name
-						item.purchase_receipt = receipt_item.parent
-
-				if item.pr_detail:
-					if not self.asset_received_but_not_billed:
-						self.asset_received_but_not_billed = self.get_company_default(
-							"asset_received_but_not_billed"
-						)
-
-					# check if 'Asset Received But Not Billed' account is credited in Purchase receipt or not
-					arbnb_booked_in_pr = frappe.db.get_value(
-						"GL Entry",
-						{
-							"voucher_type": "Purchase Receipt",
-							"voucher_no": item.purchase_receipt,
-							"account": self.asset_received_but_not_billed,
-						},
-						"name",
-					)
-					if arbnb_booked_in_pr:
-						account = self.asset_received_but_not_billed
-
-				if not account:
-					account_type = (
-						"capital_work_in_progress_account"
-						if is_cwip_accounting_enabled(item.asset_category)
-						else "fixed_asset_account"
-					)
-					account = get_asset_category_account(
-						account_type, item=item.item_code, company=self.company
-					)
-					if not account:
-						form_link = get_link_to_form("Asset Category", item.asset_category)
-						throw(
-							_("Please set Fixed Asset Account in {} against {}.").format(
-								form_link, self.company
-							),
-							title=_("Missing Account"),
-						)
-				item.expense_account = account
+				item.expense_account = asset_category_account
 			elif not item.expense_account and for_validate:
 				throw(_("Expense account is mandatory for item {0}").format(item.item_code or item.item_name))
 
@@ -432,7 +394,7 @@ class PurchaseInvoice(BuyingController):
 		for item in self.get("items"):
 			validate_account_head(item.idx, item.expense_account, self.company, "Expense")
 
-	def set_against_expense_account(self, force=False):
+	def set_against_expense_account(self):
 		against_accounts = []
 		for item in self.get("items"):
 			if item.expense_account and (item.expense_account not in against_accounts):
@@ -440,10 +402,6 @@ class PurchaseInvoice(BuyingController):
 
 		self.against_expense_account = ",".join(against_accounts)
 
-	def force_set_against_expense_account(self):
-		self.set_against_expense_account()
-		frappe.db.set_value(self.doctype, self.name, "against_expense_account", self.against_expense_account)
-
 	def po_required(self):
 		if frappe.db.get_value("Buying Settings", None, "po_required") == "Yes":
 			if frappe.get_value(
@@ -609,17 +567,17 @@ class PurchaseInvoice(BuyingController):
 		self.process_common_party_accounting()
 
 	def on_update_after_submit(self):
-		fields_to_check = [
-			"cash_bank_account",
-			"write_off_account",
-			"unrealized_profit_loss_account",
-			"is_opening",
-		]
-		child_tables = {"items": ("expense_account",), "taxes": ("account_head",)}
-		self.needs_repost = self.check_if_fields_updated(fields_to_check, child_tables)
-		if self.needs_repost:
-			self.validate_for_repost()
-			self.repost_accounting_entries()
+		if hasattr(self, "repost_required"):
+			fields_to_check = [
+				"cash_bank_account",
+				"write_off_account",
+				"unrealized_profit_loss_account",
+			]
+			child_tables = {"items": ("expense_account",), "taxes": ("account_head",)}
+			self.needs_repost = self.check_if_fields_updated(fields_to_check, child_tables)
+			if self.needs_repost:
+				self.validate_for_repost()
+				self.db_set("repost_required", self.needs_repost)
 
 	def make_gl_entries(self, gl_entries=None, from_repost=False):
 		update_outstanding = "No" if (cint(self.is_paid) or self.write_off_account) else "Yes"
@@ -665,12 +623,12 @@ class PurchaseInvoice(BuyingController):
 
 	def update_supplier_outstanding(self, update_outstanding):
 		if update_outstanding == "No":
-			update_voucher_outstanding(
-				voucher_type=self.doctype,
-				voucher_no=self.return_against if cint(self.is_return) and self.return_against else self.name,
-				account=self.credit_to,
-				party_type="Supplier",
-				party=self.supplier,
+			update_outstanding_amt(
+				self.credit_to,
+				"Supplier",
+				self.supplier,
+				self.doctype,
+				self.return_against if cint(self.is_return) and self.return_against else self.name,
 			)
 
 	def get_gl_entries(self, warehouse_account=None):
@@ -786,7 +744,7 @@ class PurchaseInvoice(BuyingController):
 			self.get_provisional_accounts()
 
 		for item in self.get("items"):
-			if flt(item.base_net_amount) or (self.get("update_stock") and item.valuation_rate):
+			if flt(item.base_net_amount):
 				account_currency = get_account_currency(item.expense_account)
 				if item.item_code:
 					frappe.get_cached_value("Item", item.item_code, "asset_category")
@@ -1021,13 +979,10 @@ class PurchaseInvoice(BuyingController):
 	def get_provisional_accounts(self):
 		self.provisional_accounts = frappe._dict()
 		linked_purchase_receipts = set([d.purchase_receipt for d in self.items if d.purchase_receipt])
-		if not linked_purchase_receipts:
-			return
-
 		pr_items = frappe.get_all(
 			"Purchase Receipt Item",
 			filters={"parent": ("in", linked_purchase_receipts)},
-			fields=["name", "provisional_expense_account", "qty", "base_rate", "rate"],
+			fields=["name", "provisional_expense_account", "qty", "base_rate"],
 		)
 		default_provisional_account = self.get_company_default("default_provisional_account")
 		provisional_accounts = set(
@@ -1055,7 +1010,6 @@ class PurchaseInvoice(BuyingController):
 				"provisional_account": item.provisional_expense_account or default_provisional_account,
 				"qty": item.qty,
 				"base_rate": item.base_rate,
-				"rate": item.rate,
 				"has_provisional_entry": item.name in rows_with_provisional_entries,
 			}
 
@@ -1072,10 +1026,7 @@ class PurchaseInvoice(BuyingController):
 					self.posting_date,
 					pr_item.get("provisional_account"),
 					reverse=1,
-					item_amount=(
-						(min(item.qty, pr_item.get("qty")) * pr_item.get("rate"))
-						* purchase_receipt_doc.get("conversion_rate")
-					),
+					item_amount=(min(item.qty, pr_item.get("qty")) * pr_item.get("base_rate")),
 				)
 
 	def update_gross_purchase_amount_for_linked_assets(self, item):
@@ -1132,30 +1083,6 @@ class PurchaseInvoice(BuyingController):
 
 			warehouse_debit_amount = stock_amount
 
-		elif self.is_return and self.update_stock and (self.is_internal_supplier or not self.return_against):
-			net_rate = item.base_net_amount
-			stock_amount = net_rate + item.item_tax_amount + flt(item.landed_cost_voucher_amount)
-
-			if flt(stock_amount, net_amt_precision) != flt(warehouse_debit_amount, net_amt_precision):
-				cost_of_goods_sold_account = self.get_company_default("default_expense_account")
-				stock_adjustment_amt = stock_amount - warehouse_debit_amount
-
-				gl_entries.append(
-					self.get_gl_dict(
-						{
-							"account": cost_of_goods_sold_account,
-							"against": item.expense_account,
-							"debit": stock_adjustment_amt,
-							"debit_in_transaction_currency": stock_adjustment_amt / self.conversion_rate,
-							"remarks": self.get("remarks") or _("Stock Adjustment"),
-							"cost_center": item.cost_center,
-							"project": item.project or self.project,
-						},
-						account_currency,
-						item=item,
-					)
-				)
-
 		return warehouse_debit_amount
 
 	def make_tax_gl_entries(self, gl_entries):
@@ -1474,12 +1401,7 @@ class PurchaseInvoice(BuyingController):
 
 				if pi:
 					pi = pi[0][0]
-
-					frappe.throw(
-						_("Supplier Invoice No exists in Purchase Invoice {0}").format(
-							get_link_to_form("Purchase Invoice", pi)
-						)
-					)
+					frappe.throw(_("Supplier Invoice No exists in Purchase Invoice {0}").format(pi))
 
 	def update_billing_status_in_pr(self, update_modified=True):
 		if self.is_return and not self.update_billed_amount_in_purchase_receipt:
@@ -1549,9 +1471,6 @@ class PurchaseInvoice(BuyingController):
 		self.db_set("release_date", None)
 
 	def set_tax_withholding(self):
-		self.set("advance_tax", [])
-		self.set("tax_withheld_vouchers", [])
-
 		if not self.apply_tds:
 			return
 
@@ -1593,6 +1512,8 @@ class PurchaseInvoice(BuyingController):
 			self.remove(d)
 
 		## Add pending vouchers on which tax was withheld
+		self.set("tax_withheld_vouchers", [])
+
 		for voucher_no, voucher_details in voucher_wise_amount.items():
 			self.append(
 				"tax_withheld_vouchers",
@@ -1607,6 +1528,7 @@ class PurchaseInvoice(BuyingController):
 		self.calculate_taxes_and_totals()
 
 	def allocate_advance_tds(self, tax_withholding_details, advance_taxes):
+		self.set("advance_tax", [])
 		for tax in advance_taxes:
 			allocated_amount = 0
 			pending_amount = flt(tax.tax_amount - tax.allocated_amount)

erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js

@@ -45,16 +45,12 @@ frappe.listview_settings["Purchase Invoice"] = {
 	},
 
 	onload: function (listview) {
-		if (frappe.model.can_create("Purchase Receipt")) {
-			listview.page.add_action_item(__("Purchase Receipt"), () => {
-				erpnext.bulk_transaction_processing.create(listview, "Purchase Invoice", "Purchase Receipt");
-			});
-		}
+		listview.page.add_action_item(__("Purchase Receipt"), () => {
+			erpnext.bulk_transaction_processing.create(listview, "Purchase Invoice", "Purchase Receipt");
+		});
 
-		if (frappe.model.can_create("Payment Entry")) {
-			listview.page.add_action_item(__("Payment"), () => {
-				erpnext.bulk_transaction_processing.create(listview, "Purchase Invoice", "Payment Entry");
-			});
-		}
+		listview.page.add_action_item(__("Payment"), () => {
+			erpnext.bulk_transaction_processing.create(listview, "Purchase Invoice", "Payment Entry");
+		});
 	},
 };

erpnext/accounts/doctype/purchase_invoice/test_purchase_invoice.py

@@ -10,10 +10,7 @@ import erpnext
 from erpnext.accounts.doctype.account.test_account import create_account, get_inventory_account
 from erpnext.accounts.doctype.payment_entry.payment_entry import get_payment_entry
 from erpnext.buying.doctype.purchase_order.purchase_order import get_mapped_purchase_invoice
-from erpnext.buying.doctype.purchase_order.purchase_order import make_purchase_invoice as make_pi_from_po
-from erpnext.buying.doctype.purchase_order.test_purchase_order import (
-	create_purchase_order,
-)
+from erpnext.buying.doctype.purchase_order.test_purchase_order import create_purchase_order
 from erpnext.buying.doctype.supplier.test_supplier import create_supplier
 from erpnext.controllers.accounts_controller import get_payment_terms
 from erpnext.controllers.buying_controller import QtyMismatchError
@@ -1643,30 +1640,6 @@ class TestPurchaseInvoice(FrappeTestCase, StockTestMixin):
 
 		frappe.db.set_single_value("Buying Settings", "set_landed_cost_based_on_purchase_invoice_rate", 1)
 
-		# Cost of Item is zero in Purchase Receipt
-		pr = make_purchase_receipt(qty=1, rate=0)
-
-		stock_value_difference = frappe.db.get_value(
-			"Stock Ledger Entry",
-			{"voucher_type": "Purchase Receipt", "voucher_no": pr.name},
-			"stock_value_difference",
-		)
-		self.assertEqual(stock_value_difference, 0)
-
-		pi = create_purchase_invoice_from_receipt(pr.name)
-		for row in pi.items:
-			row.rate = 150
-
-		pi.save()
-		pi.submit()
-
-		stock_value_difference = frappe.db.get_value(
-			"Stock Ledger Entry",
-			{"voucher_type": "Purchase Receipt", "voucher_no": pr.name},
-			"stock_value_difference",
-		)
-		self.assertEqual(stock_value_difference, 150)
-
 		# Increase the cost of the item
 
 		pr = make_purchase_receipt(qty=1, rate=100)
@@ -1816,16 +1789,19 @@ class TestPurchaseInvoice(FrappeTestCase, StockTestMixin):
 		rate = flt(sle.stock_value_difference) / flt(sle.actual_qty)
 		self.assertAlmostEqual(rate, 500)
 
-	@change_settings("Accounts Settings", {"automatically_fetch_payment_terms": 1})
 	def test_payment_allocation_for_payment_terms(self):
 		from erpnext.buying.doctype.purchase_order.test_purchase_order import (
 			create_pr_against_po,
 			create_purchase_order,
 		)
+		from erpnext.selling.doctype.sales_order.test_sales_order import (
+			automatically_fetch_payment_terms,
+		)
 		from erpnext.stock.doctype.purchase_receipt.purchase_receipt import (
 			make_purchase_invoice as make_pi_from_pr,
 		)
 
+		automatically_fetch_payment_terms()
 		frappe.db.set_value(
 			"Payment Terms Template",
 			"_Test Payment Term Template",
@@ -1849,8 +1825,9 @@ class TestPurchaseInvoice(FrappeTestCase, StockTestMixin):
 			1,
 		)
 		pi = make_pi_from_pr(pr.name)
-		self.assertEqual(pi.payment_schedule[0].payment_amount, 1000)
+		self.assertEqual(pi.payment_schedule[0].payment_amount, 2500)
 
+		automatically_fetch_payment_terms(enable=0)
 		frappe.db.set_value(
 			"Payment Terms Template",
 			"_Test Payment Term Template",
@@ -1931,15 +1908,18 @@ class TestPurchaseInvoice(FrappeTestCase, StockTestMixin):
 		check_gl_entries(self, pi.name, expected_gle, nowdate())
 
 		pi.items[0].expense_account = "Service - _TC"
-		# Ledger reposted implicitly upon 'Update After Submit'
 		pi.save()
 		pi.load_from_db()
+		self.assertTrue(pi.repost_required)
+		pi.repost_accounting_entries()
 
 		expected_gle = [
 			["Creditors - _TC", 0.0, 1000, nowdate()],
 			["Service - _TC", 1000, 0.0, nowdate()],
 		]
 		check_gl_entries(self, pi.name, expected_gle, nowdate())
+		pi.load_from_db()
+		self.assertFalse(pi.repost_required)
 
 	def test_default_cost_center_for_purchase(self):
 		from erpnext.accounts.doctype.cost_center.test_cost_center import create_cost_center
@@ -1980,78 +1960,6 @@ class TestPurchaseInvoice(FrappeTestCase, StockTestMixin):
 
 		self.assertRaises(frappe.ValidationError, dr_note.save)
 
-	def test_apply_discount_on_grand_total(self):
-		"""
-		To test if after applying discount on grand total,
-		the grand total is calculated correctly without any rounding errors
-		"""
-		invoice = make_purchase_invoice(qty=2, rate=100, do_not_save=True, do_not_submit=True)
-		invoice.append(
-			"items",
-			{
-				"item_code": "_Test Item",
-				"qty": 1,
-				"rate": 21.39,
-			},
-		)
-		invoice.append(
-			"taxes",
-			{
-				"charge_type": "On Net Total",
-				"account_head": "_Test Account VAT - _TC",
-				"description": "VAT",
-				"rate": 15.5,
-			},
-		)
-
-		# the grand total here will be 255.71
-		invoice.disable_rounded_total = 1
-		# apply discount on grand total to adjust the grand total to 255
-		invoice.discount_amount = 0.71
-		invoice.save()
-
-		# check if grand total is 496 and not something like 254.99 due to rounding errors
-		self.assertEqual(invoice.grand_total, 255)
-
-	def test_apply_discount_on_grand_total_with_previous_row_total_tax(self):
-		"""
-		To test if after applying discount on grand total,
-		where the tax is calculated on previous row total, the grand total is calculated correctly
-		"""
-
-		invoice = make_purchase_invoice(qty=2, rate=100, do_not_save=True, do_not_submit=True)
-		invoice.extend(
-			"taxes",
-			[
-				{
-					"charge_type": "Actual",
-					"account_head": "_Test Account VAT - _TC",
-					"description": "VAT",
-					"tax_amount": 100,
-				},
-				{
-					"charge_type": "On Previous Row Amount",
-					"account_head": "_Test Account VAT - _TC",
-					"description": "VAT",
-					"row_id": 1,
-					"rate": 10,
-				},
-				{
-					"charge_type": "On Previous Row Total",
-					"account_head": "_Test Account VAT - _TC",
-					"description": "VAT",
-					"row_id": 1,
-					"rate": 10,
-				},
-			],
-		)
-
-		# the total here will be 340, so applying 40 discount
-		invoice.discount_amount = 40
-		invoice.save()
-
-		self.assertEqual(invoice.grand_total, 300)
-
 
 def check_gl_entries(
 	doc,

erpnext/accounts/doctype/purchase_invoice_advance/purchase_invoice_advance.json

@@ -14,8 +14,7 @@
   "advance_amount",
   "allocated_amount",
   "exchange_gain_loss",
-  "ref_exchange_rate",
-  "difference_posting_date"
+  "ref_exchange_rate"
  ],
  "fields": [
   {
@@ -31,7 +30,7 @@
    "width": "180px"
   },
   {
-   "columns": 2,
+   "columns": 3,
    "fieldname": "reference_name",
    "fieldtype": "Dynamic Link",
    "in_list_view": 1,
@@ -41,7 +40,7 @@
    "read_only": 1
   },
   {
-   "columns": 2,
+   "columns": 3,
    "fieldname": "remarks",
    "fieldtype": "Text",
    "in_list_view": 1,
@@ -112,20 +111,13 @@
    "label": "Reference Exchange Rate",
    "non_negative": 1,
    "read_only": 1
-  },
-  {
-   "columns": 2,
-   "fieldname": "difference_posting_date",
-   "fieldtype": "Date",
-   "in_list_view": 1,
-   "label": "Difference Posting Date"
   }
  ],
  "idx": 1,
  "index_web_pages_for_search": 1,
  "istable": 1,
  "links": [],
- "modified": "2024-12-20 12:04:46.729972",
+ "modified": "2021-09-26 15:47:28.167371",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Purchase Invoice Advance",

erpnext/accounts/doctype/repost_accounting_ledger/repost_accounting_ledger.json

@@ -1,5 +1,7 @@
 {
  "actions": [],
+ "allow_rename": 1,
+ "autoname": "format:ACC-REPOST-{#####}",
  "creation": "2023-07-04 13:07:32.923675",
  "default_view": "List",
  "doctype": "DocType",
@@ -53,15 +55,14 @@
  "index_web_pages_for_search": 1,
  "is_submittable": 1,
  "links": [],
- "modified": "2024-06-03 17:30:37.012593",
+ "modified": "2023-09-26 14:21:27.362567",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Repost Accounting Ledger",
+ "naming_rule": "Expression",
  "owner": "Administrator",
  "permissions": [
   {
-   "amend": 1,
-   "cancel": 1,
    "create": 1,
    "delete": 1,
    "email": 1,
@@ -70,9 +71,7 @@
    "read": 1,
    "report": 1,
    "role": "System Manager",
-   "select": 1,
    "share": 1,
-   "submit": 1,
    "write": 1
   }
  ],

erpnext/accounts/doctype/repost_accounting_ledger/repost_accounting_ledger.py

@@ -6,8 +6,6 @@ from frappe import _, qb
 from frappe.model.document import Document
 from frappe.utils.data import comma_and
 
-from erpnext.stock import get_warehouse_account_map
-
 
 class RepostAccountingLedger(Document):
 	def __init__(self, *args, **kwargs):
@@ -29,7 +27,7 @@ class RepostAccountingLedger(Document):
 			latest_pcv = (
 				frappe.db.get_all(
 					"Period Closing Voucher",
-					filters={"company": self.company, "docstatus": 1},
+					filters={"company": self.company},
 					order_by="posting_date desc",
 					pluck="posting_date",
 					limit=1,
@@ -79,9 +77,6 @@ class RepostAccountingLedger(Document):
 			doc = frappe.get_doc(x.voucher_type, x.voucher_no)
 			if doc.doctype in ["Payment Entry", "Journal Entry"]:
 				gle_map = doc.build_gl_map()
-			elif doc.doctype == "Purchase Receipt":
-				warehouse_account_map = get_warehouse_account_map(doc.company)
-				gle_map = doc.get_gl_entries(warehouse_account_map)
 			else:
 				gle_map = doc.get_gl_entries()
 
@@ -151,23 +146,11 @@ def start_repost(account_repost_doc=str) -> None:
 				if doc.doctype in ["Sales Invoice", "Purchase Invoice"]:
 					if not repost_doc.delete_cancelled_entries:
 						doc.docstatus = 2
-						doc.make_gl_entries_on_cancel(from_repost=True)
+						doc.make_gl_entries_on_cancel()
 
 					doc.docstatus = 1
-					if doc.doctype == "Sales Invoice":
-						doc.force_set_against_income_account()
-					else:
-						doc.force_set_against_expense_account()
 					doc.make_gl_entries()
 
-				elif doc.doctype == "Purchase Receipt":
-					if not repost_doc.delete_cancelled_entries:
-						doc.docstatus = 2
-						doc.make_gl_entries_on_cancel(from_repost=True)
-
-					doc.docstatus = 1
-					doc.make_gl_entries(from_repost=True)
-
 				elif doc.doctype in ["Payment Entry", "Journal Entry", "Expense Claim"]:
 					if not repost_doc.delete_cancelled_entries:
 						doc.make_gl_entries(1)

erpnext/accounts/doctype/repost_accounting_ledger/test_repost_accounting_ledger.py

@@ -12,8 +12,6 @@ from erpnext.accounts.doctype.payment_request.payment_request import make_paymen
 from erpnext.accounts.doctype.sales_invoice.test_sales_invoice import create_sales_invoice
 from erpnext.accounts.test.accounts_mixin import AccountsTestMixin
 from erpnext.accounts.utils import get_fiscal_year
-from erpnext.stock.doctype.item.test_item import make_item
-from erpnext.stock.doctype.purchase_receipt.test_purchase_receipt import get_gl_entries, make_purchase_receipt
 
 
 class TestRepostAccountingLedger(AccountsTestMixin, FrappeTestCase):
@@ -204,81 +202,9 @@ class TestRepostAccountingLedger(AccountsTestMixin, FrappeTestCase):
 		self.assertIsNotNone(frappe.db.exists("GL Entry", {"voucher_no": si.name, "is_cancelled": 1}))
 		self.assertIsNotNone(frappe.db.exists("GL Entry", {"voucher_no": pe.name, "is_cancelled": 1}))
 
-	def test_06_repost_purchase_receipt(self):
-		from erpnext.accounts.doctype.account.test_account import create_account
-
-		provisional_account = create_account(
-			account_name="Provision Account",
-			parent_account="Current Liabilities - _TC",
-			company=self.company,
-		)
-
-		another_provisional_account = create_account(
-			account_name="Another Provision Account",
-			parent_account="Current Liabilities - _TC",
-			company=self.company,
-		)
-
-		company = frappe.get_doc("Company", self.company)
-		company.enable_provisional_accounting_for_non_stock_items = 1
-		company.default_provisional_account = provisional_account
-		company.save()
-
-		test_cc = company.cost_center
-		default_expense_account = company.default_expense_account
-
-		item = make_item(properties={"is_stock_item": 0})
-
-		pr = make_purchase_receipt(company=self.company, item_code=item.name, rate=1000.0, qty=1.0)
-		pr_gl_entries = get_gl_entries(pr.doctype, pr.name, skip_cancelled=True)
-		expected_pr_gles = [
-			{"account": provisional_account, "debit": 0.0, "credit": 1000.0, "cost_center": test_cc},
-			{"account": default_expense_account, "debit": 1000.0, "credit": 0.0, "cost_center": test_cc},
-		]
-		self.assertEqual(expected_pr_gles, pr_gl_entries)
-
-		# change the provisional account
-		frappe.db.set_value(
-			"Purchase Receipt Item",
-			pr.items[0].name,
-			"provisional_expense_account",
-			another_provisional_account,
-		)
-
-		repost_doc = frappe.new_doc("Repost Accounting Ledger")
-		repost_doc.company = self.company
-		repost_doc.delete_cancelled_entries = True
-		repost_doc.append("vouchers", {"voucher_type": pr.doctype, "voucher_no": pr.name})
-		repost_doc.save().submit()
-
-		pr_gles_after_repost = get_gl_entries(pr.doctype, pr.name, skip_cancelled=True)
-		expected_pr_gles_after_repost = [
-			{"account": default_expense_account, "debit": 1000.0, "credit": 0.0, "cost_center": test_cc},
-			{"account": another_provisional_account, "debit": 0.0, "credit": 1000.0, "cost_center": test_cc},
-		]
-		self.assertEqual(len(pr_gles_after_repost), len(expected_pr_gles_after_repost))
-		self.assertEqual(expected_pr_gles_after_repost, pr_gles_after_repost)
-
-		# teardown
-		repost_doc.cancel()
-		repost_doc.delete()
-
-		pr.reload()
-		pr.cancel()
-
-		company.enable_provisional_accounting_for_non_stock_items = 0
-		company.default_provisional_account = None
-		company.save()
-
 
 def update_repost_settings():
-	allowed_types = [
-		"Sales Invoice",
-		"Purchase Invoice",
-		"Payment Entry",
-		"Journal Entry",
-		"Purchase Receipt",
-	]
+	allowed_types = ["Sales Invoice", "Purchase Invoice", "Payment Entry", "Journal Entry"]
 	repost_settings = frappe.get_doc("Repost Accounting Ledger Settings")
 	for x in allowed_types:
 		repost_settings.append("allowed_types", {"document_type": x, "allowed": True})

erpnext/accounts/doctype/repost_accounting_ledger_settings/repost_accounting_ledger_settings.json

@@ -17,7 +17,7 @@
  "in_create": 1,
  "issingle": 1,
  "links": [],
- "modified": "2024-06-06 13:56:37.908879",
+ "modified": "2023-11-07 14:24:13.321522",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Repost Accounting Ledger Settings",
@@ -30,17 +30,13 @@
    "print": 1,
    "read": 1,
    "role": "Administrator",
-   "select": 1,
    "share": 1,
    "write": 1
   },
   {
-   "create": 1,
-   "delete": 1,
    "read": 1,
    "role": "System Manager",
-   "select": 1,
-   "write": 1
+   "select": 1
   }
  ],
  "sort_field": "modified",

erpnext/accounts/doctype/repost_payment_ledger/repost_payment_ledger.json

@@ -1,5 +1,6 @@
 {
  "actions": [],
+ "allow_rename": 1,
  "creation": "2022-10-19 21:59:33.553852",
  "doctype": "DocType",
  "editable_grid": 1,
@@ -98,15 +99,13 @@
  "index_web_pages_for_search": 1,
  "is_submittable": 1,
  "links": [],
- "modified": "2024-06-03 17:31:04.472279",
+ "modified": "2023-09-26 14:21:35.719727",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Repost Payment Ledger",
  "owner": "Administrator",
  "permissions": [
   {
-   "amend": 1,
-   "cancel": 1,
    "create": 1,
    "delete": 1,
    "email": 1,
@@ -115,9 +114,7 @@
    "read": 1,
    "report": 1,
    "role": "System Manager",
-   "select": 1,
    "share": 1,
-   "submit": 1,
    "write": 1
   },
   {

erpnext/accounts/doctype/sales_invoice/sales_invoice.js

@@ -9,10 +9,6 @@ erpnext.accounts.SalesInvoiceController = class SalesInvoiceController extends e
 	setup(doc) {
 		this.setup_posting_date_time_check();
 		super.setup(doc);
-		this.frm.make_methods = {
-			Dunning: this.make_dunning.bind(this),
-			"Invoice Discounting": this.make_invoice_discounting.bind(this),
-		};
 	}
 	company() {
 		super.company();
@@ -53,6 +49,25 @@ erpnext.accounts.SalesInvoiceController = class SalesInvoiceController extends e
 
 		this.frm.toggle_reqd("due_date", !this.frm.doc.is_return);
 
+		if (this.frm.doc.repost_required && this.frm.doc.docstatus===1) {
+			this.frm.set_intro(__("Accounting entries for this invoice needs to be reposted. Please click on 'Repost' button to update."));
+			this.frm.add_custom_button(__('Repost Accounting Entries'),
+				() => {
+					this.frm.call({
+						doc: this.frm.doc,
+						method: 'repost_accounting_entries',
+						freeze: true,
+						freeze_message: __('Reposting...'),
+						callback: (r) => {
+							if (!r.exc) {
+								frappe.msgprint(__('Accounting Entries are reposted'));
+								me.frm.refresh();
+							}
+						}
+					});
+				}).removeClass('btn-default').addClass('btn-warning');
+		}
+
 		if (this.frm.doc.is_return) {
 			this.frm.return_print_format = "Sales Invoice Return";
 		}
@@ -98,35 +113,26 @@ erpnext.accounts.SalesInvoiceController = class SalesInvoiceController extends e
 				}
 			}
 
-			if (doc.outstanding_amount > 0) {
-				this.frm.add_custom_button(
-					__("Payment Request"),
-					function () {
-						me.make_payment_request();
-					},
-					__("Create")
-				);
-				this.frm.add_custom_button(
-					__("Invoice Discounting"),
-					this.make_invoice_discounting.bind(this),
-					__("Create")
-				);
+			if (doc.outstanding_amount>0) {
+				cur_frm.add_custom_button(__('Payment Request'), function() {
+					me.make_payment_request();
+				}, __('Create'));
 
-				const payment_is_overdue = doc.payment_schedule
-					.map((row) => Date.parse(row.due_date) < Date.now())
-					.reduce((prev, current) => prev || current, false);
+				cur_frm.add_custom_button(__('Invoice Discounting'), function() {
+					cur_frm.events.create_invoice_discounting(cur_frm);
+				}, __('Create'));
 
-				if (payment_is_overdue) {
-					this.frm.add_custom_button(__("Dunning"), this.make_dunning.bind(this), __("Create"));
+				if (doc.due_date < frappe.datetime.get_today()) {
+					cur_frm.add_custom_button(__('Dunning'), function() {
+						cur_frm.events.create_dunning(cur_frm);
+					}, __('Create'));
 				}
 			}
 
 			if (doc.docstatus === 1) {
-				this.frm.add_custom_button(
-					__("Maintenance Schedule"),
-					this.make_maintenance_schedule.bind(this),
-					__("Create")
-				);
+				cur_frm.add_custom_button(__('Maintenance Schedule'), function () {
+					cur_frm.cscript.make_maintenance_schedule();
+				}, __('Create'));
 			}
 
 			if(!doc.auto_repeat) {
@@ -159,20 +165,6 @@ erpnext.accounts.SalesInvoiceController = class SalesInvoiceController extends e
 		erpnext.accounts.unreconcile_payment.add_unreconcile_btn(me.frm);
 	}
 
-	make_invoice_discounting() {
-		frappe.model.open_mapped_doc({
-			method: "erpnext.accounts.doctype.sales_invoice.sales_invoice.create_invoice_discounting",
-			frm: this.frm,
-		});
-	}
-
-	make_dunning() {
-		frappe.model.open_mapped_doc({
-			method: "erpnext.accounts.doctype.sales_invoice.sales_invoice.create_dunning",
-			frm: this.frm,
-		});
-	}
-
 	make_maintenance_schedule() {
 		frappe.model.open_mapped_doc({
 			method: "erpnext.accounts.doctype.sales_invoice.sales_invoice.make_maintenance_schedule",
@@ -208,7 +200,7 @@ erpnext.accounts.SalesInvoiceController = class SalesInvoiceController extends e
 			if(cur_frm.meta._default_print_format) {
 				cur_frm.meta.default_print_format = cur_frm.meta._default_print_format;
 				cur_frm.meta._default_print_format = null;
-			} else if([cur_frm.pos_print_format, cur_frm.return_print_format].includes(cur_frm.meta.default_print_format)) {
+			} else if(in_list([cur_frm.pos_print_format, cur_frm.return_print_format], cur_frm.meta.default_print_format)) {
 				cur_frm.meta.default_print_format = null;
 				cur_frm.meta._default_print_format = null;
 			}
@@ -307,12 +299,8 @@ erpnext.accounts.SalesInvoiceController = class SalesInvoiceController extends e
 				party_type: "Customer",
 				account: this.frm.doc.debit_to,
 				price_list: this.frm.doc.selling_price_list,
-				pos_profile: pos_profile,
-				fetch_payment_terms_template: cint(
-					(this.frm.doc.is_return == 0) & !this.frm.doc.ignore_default_payment_terms_template
-				),
-			},
-			function () {
+				pos_profile: pos_profile
+			}, function() {
 				me.apply_pricing_rule();
 			});
 
@@ -440,16 +428,12 @@ erpnext.accounts.SalesInvoiceController = class SalesInvoiceController extends e
 				frappe.msgprint(__("Please specify Company to proceed"));
 			} else {
 				var me = this;
-				const for_validate = me.frm.doc.is_return ? true : false;
 				return this.frm.call({
 					doc: me.frm.doc,
 					method: "set_missing_values",
-					args: {
-						for_validate: for_validate,
-					},
-					callback: function (r) {
-						if (!r.exc) {
-							if (r.message && r.message.print_format) {
+					callback: function(r) {
+						if(!r.exc) {
+							if(r.message && r.message.print_format) {
 								me.frm.pos_print_format = r.message.print_format;
 							}
 							me.frm.trigger("update_stock");
@@ -694,6 +678,20 @@ frappe.ui.form.on('Sales Invoice', {
 			}
 		}
 
+		frm.set_query('company_address', function(doc) {
+			if(!doc.company) {
+				frappe.throw(__('Please set Company'));
+			}
+
+			return {
+				query: 'frappe.contacts.doctype.address.address.address_query',
+				filters: {
+					link_doctype: 'Company',
+					link_name: doc.company
+				}
+			};
+		});
+
 		frm.set_query('pos_profile', function(doc) {
 			if(!doc.company) {
 				frappe.throw(_('Please set Company'));
@@ -975,6 +973,20 @@ frappe.ui.form.on('Sales Invoice', {
 			frm.set_df_property('return_against', 'label', __('Adjustment Against'));
 		}
 	},
+
+	create_invoice_discounting: function(frm) {
+		frappe.model.open_mapped_doc({
+			method: "erpnext.accounts.doctype.sales_invoice.sales_invoice.create_invoice_discounting",
+			frm: frm
+		});
+	},
+
+	create_dunning: function(frm) {
+		frappe.model.open_mapped_doc({
+			method: "erpnext.accounts.doctype.sales_invoice.sales_invoice.create_dunning",
+			frm: frm
+		});
+	}
 });
 
 frappe.ui.form.on("Sales Invoice Timesheet", {