📝 Add docstrings to fix/email-campaign-timeout

Docstrings generation was requested by @pratikb64.

* https://github.com/frappe/erpnext/pull/51994#issuecomment-3783742931

The following files were modified:

* `erpnext/crm/doctype/email_campaign/email_campaign.py`

.github/ISSUE_TEMPLATE/bug_report.yaml

@@ -60,7 +60,7 @@ body:
       description: Share exact version number of Frappe and ERPNext you are using.
       placeholder: |
         Frappe version -
-        ERPNext version -
+        ERPNext Verion -
     validations:
       required: true
 

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

@@ -15,7 +15,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        branch: ["develop"]
+        branch: ["develop", "version-16-hotfix"]
     permissions:
       contents: write
 
@@ -30,6 +30,11 @@ jobs:
           with:
             python-version: "3.14"
 
+        - name: Setup Node
+          uses: actions/setup-node@v6
+          with:
+            node-version: 24
+
         - name: Run script to update POT file
           run: |
             bash ${GITHUB_WORKSPACE}/.github/helper/update_pot_file.sh

.github/workflows/patch.yml

@@ -143,6 +143,7 @@ jobs:
           }
 
           update_to_version 15 3.13
+          update_to_version 16 3.14
 
           echo "Updating to latest version"
           git -C "apps/frappe" fetch --depth 1 upstream "${GITHUB_BASE_REF:-${GITHUB_REF##*/}}"

.github/workflows/release.yml

@@ -2,7 +2,7 @@ name: Generate Semantic Release
 on:
   push:
     branches:
-      - version-16
+      - version-13
 
 permissions:
   contents: read

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

@@ -7,7 +7,6 @@ on:
     paths:
       - "**.js"
       - "**.css"
-      - "**.svg"
       - "**.md"
       - "**.html"
       - 'crowdin.yml'

.mergify.yml

@@ -50,13 +50,13 @@ pull_request_rules:
           - version-15-hotfix
         assignees:
           - "{{ author }}"
-  - name: backport to version-16-beta
+  - name: backport to version-16-hotfix
     conditions:
-      - label="backport version-16-beta"
+      - label="backport version-16-hotfix"
     actions:
       backport:
         branches:
-          - version-16-beta
+          - version-16-hotfix
         assignees:
           - "{{ author }}"
   - name: Automatic merge on CI success and review

.releaserc

@@ -1,5 +1,5 @@
 {
-	"branches": ["version-16"],
+	"branches": ["version-13"],
 	"plugins": [
 		"@semantic-release/commit-analyzer", {
 			"preset": "angular",
@@ -21,4 +21,4 @@
 		],
 		"@semantic-release/github"
 	]
-}
+}

README.md

@@ -1,4 +1,3 @@
-
 <div align="center">
     <a href="https://frappe.io/erpnext">
 	<img src="./erpnext/public/images/v16/erpnext.svg" alt="ERPNext Logo" height="80px" width="80xp"/>

erpnext/__init__.py

@@ -6,7 +6,7 @@ import frappe
 from frappe.model.document import Document
 from frappe.utils.user import is_website_user
 
-__version__ = "16.7.0"
+__version__ = "17.0.0-dev"
 
 
 def get_default_company(user=None):

erpnext/accounts/accounts_dashboard/payments/payments.json

@@ -1,50 +0,0 @@
-{
- "cards": [
-  {
-   "card": "Total Outgoing Bills"
-  },
-  {
-   "card": "Total Incoming Bills"
-  },
-  {
-   "card": "Total Incoming Payment"
-  },
-  {
-   "card": "Total Outgoing Payment"
-  }
- ],
- "charts": [
-  {
-   "chart": "Incoming Bills (Purchase Invoice)",
-   "width": "Half"
-  },
-  {
-   "chart": "Outgoing Bills (Sales Invoice)",
-   "width": "Half"
-  },
-  {
-   "chart": "Accounts Receivable Ageing",
-   "width": "Half"
-  },
-  {
-   "chart": "Accounts Payable Ageing",
-   "width": "Half"
-  },
-  {
-   "chart": "Bank Balance",
-   "width": "Full"
-  }
- ],
- "creation": "2026-01-26 21:25:12.793893",
- "dashboard_name": "Payments",
- "docstatus": 0,
- "doctype": "Dashboard",
- "idx": 0,
- "is_default": 0,
- "is_standard": 1,
- "modified": "2026-01-26 21:25:12.793893",
- "modified_by": "Administrator",
- "module": "Accounts",
- "name": "Payments",
- "owner": "Administrator"
-}

erpnext/accounts/deferred_revenue.py

@@ -7,7 +7,6 @@ from frappe.utils import (
 	cint,
 	date_diff,
 	flt,
-	formatdate,
 	get_first_day,
 	get_last_day,
 	get_link_to_form,

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

@@ -33,17 +33,6 @@
                         }, 
                         "account_number": "1151.000"
                     }, 
-                    "Pajak Dibayar di Muka": {
-                        "PPN Masukan": {
-                            "account_number": "1152.001",
-                            "account_type": "Tax"
-                        },
-                        "PPh 23 Dibayar di Muka": {
-                            "account_number": "1152.002",
-                            "account_type": "Tax"
-                        },
-                        "account_number": "1152.000"
-                    },
                     "account_number": "1150.000"
                 }, 
                 "Kas": {
@@ -108,6 +97,17 @@
                     }, 
                     "account_number": "1130.000"
                 },
+                "Pajak Dibayar di Muka": {
+                    "PPN Masukan": {
+                        "account_number": "1151.001", 
+                        "account_type": "Tax"
+                    },
+                    "PPh 23 Dibayar di Muka": {
+                        "account_number": "1152.001", 
+                        "account_type": "Tax"
+                    }, 
+                    "account_number": "1150.000"
+                },
                 "account_number": "1100.000"
                 
             }, 

erpnext/accounts/doctype/account/test_account.py

@@ -1,6 +1,5 @@
 # Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
 # License: GNU General Public License v3. See license.txt
-import unittest
 
 import frappe
 from frappe.tests import IntegrationTestCase

erpnext/accounts/doctype/accounting_dimension/test_accounting_dimension.py

@@ -1,6 +1,5 @@
 # Copyright (c) 2019, Frappe Technologies Pvt. Ltd. and Contributors
 # See license.txt
-import unittest
 
 import frappe
 from frappe.tests import IntegrationTestCase

erpnext/accounts/doctype/accounting_dimension_filter/accounting_dimension_filter.py

@@ -3,7 +3,7 @@
 
 
 import frappe
-from frappe import _, scrub
+from frappe import _
 from frappe.model.document import Document
 
 

erpnext/accounts/doctype/accounting_period/test_accounting_period.py

@@ -1,6 +1,5 @@
 # Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and Contributors
 # See license.txt
-import unittest
 
 import frappe
 from frappe.tests import IntegrationTestCase

erpnext/accounts/doctype/accounts_settings/accounts_settings.json

@@ -20,10 +20,6 @@
   "enable_common_party_accounting",
   "allow_multi_currency_invoices_against_single_party_account",
   "confirm_before_resetting_posting_date",
-  "analytics_section",
-  "enable_accounting_dimensions",
-  "column_break_vtnr",
-  "enable_discounts_and_margin",
   "journals_section",
   "merge_similar_account_heads",
   "deferred_accounting_settings_section",
@@ -55,16 +51,12 @@
   "allow_pegged_currencies_exchange_rates",
   "column_break_yuug",
   "stale_days",
-  "payments_tab",
   "section_break_jpd0",
   "auto_reconcile_payments",
   "auto_reconciliation_job_trigger",
   "reconciliation_queue_size",
   "column_break_resa",
   "exchange_gain_loss_posting_date",
-  "payment_options_section",
-  "enable_loyalty_point_program",
-  "column_break_ctam",
   "invoicing_settings_tab",
   "accounts_transactions_settings_section",
   "over_billing_allowance",
@@ -289,7 +281,7 @@
   },
   {
    "default": "0",
-   "description": "Learn about <a href=\"https://docs.frappe.io/erpnext/user/manual/en/common_party_accounting\" rel=\"noopener noreferrer\">Common Party</a>",
+   "description": "Learn about <a href=\"https://docs.frappe.io/erpnext/user/manual/en/common_party_accounting\">Common Party</a>",
    "fieldname": "enable_common_party_accounting",
    "fieldtype": "Check",
    "label": "Enable Common Party Accounting"
@@ -645,59 +637,16 @@
    "fieldname": "budget_section",
    "fieldtype": "Section Break",
    "label": "Budget"
-  },
-  {
-   "fieldname": "analytics_section",
-   "fieldtype": "Section Break",
-   "label": "Analytical Accounting"
-  },
-  {
-   "fieldname": "column_break_vtnr",
-   "fieldtype": "Column Break"
-  },
-  {
-   "default": "0",
-   "description": "Apply discounts and margins on products",
-   "fieldname": "enable_discounts_and_margin",
-   "fieldtype": "Check",
-   "label": "Enable Discounts and Margin"
-  },
-  {
-   "fieldname": "payments_tab",
-   "fieldtype": "Tab Break",
-   "label": "Payments"
-  },
-  {
-   "fieldname": "payment_options_section",
-   "fieldtype": "Section Break",
-   "label": "Payment Options"
-  },
-  {
-   "default": "0",
-   "fieldname": "enable_loyalty_point_program",
-   "fieldtype": "Check",
-   "label": "Enable Loyalty Point Program"
-  },
-  {
-   "fieldname": "column_break_ctam",
-   "fieldtype": "Column Break"
-  },
-  {
-   "default": "0",
-   "description": "Enable cost center, projects and other custom accounting dimensions",
-   "fieldname": "enable_accounting_dimensions",
-   "fieldtype": "Check",
-   "label": "Enable Accounting Dimensions"
   }
  ],
  "grid_page_length": 50,
- "hide_toolbar": 0,
+ "hide_toolbar": 1,
  "icon": "icon-cog",
  "idx": 1,
  "index_web_pages_for_search": 1,
  "issingle": 1,
  "links": [],
- "modified": "2026-02-04 17:15:38.609327",
+ "modified": "2026-01-11 18:30:45.968531",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Accounts Settings",

erpnext/accounts/doctype/accounts_settings/accounts_settings.py

@@ -12,28 +12,6 @@ from frappe.utils import cint
 
 from erpnext.accounts.utils import sync_auto_reconcile_config
 
-SELLING_DOCTYPES = [
-	"Sales Invoice",
-	"Sales Order",
-	"Delivery Note",
-	"Quotation",
-	"Sales Invoice Item",
-	"Sales Order Item",
-	"Delivery Note Item",
-	"Quotation Item",
-	"POS Invoice",
-	"POS Invoice Item",
-]
-
-BUYING_DOCTYPES = [
-	"Purchase Invoice",
-	"Purchase Order",
-	"Purchase Receipt",
-	"Purchase Invoice Item",
-	"Purchase Order Item",
-	"Purchase Receipt Item",
-]
-
 
 class AccountsSettings(Document):
 	# begin: auto-generated types
@@ -65,12 +43,9 @@ class AccountsSettings(Document):
 		default_ageing_range: DF.Data | None
 		delete_linked_ledger_entries: DF.Check
 		determine_address_tax_category_from: DF.Literal["Billing Address", "Shipping Address"]
-		enable_accounting_dimensions: DF.Check
 		enable_common_party_accounting: DF.Check
-		enable_discounts_and_margin: DF.Check
 		enable_fuzzy_matching: DF.Check
 		enable_immutable_ledger: DF.Check
-		enable_loyalty_point_program: DF.Check
 		enable_party_matching: DF.Check
 		exchange_gain_loss_posting_date: DF.Literal["Invoice", "Payment", "Reconciliation Date"]
 		fetch_valuation_rate_for_internal_transaction: DF.Check
@@ -123,18 +98,6 @@ class AccountsSettings(Document):
 		if old_doc.show_payment_schedule_in_print != self.show_payment_schedule_in_print:
 			self.enable_payment_schedule_in_print()
 
-		if old_doc.enable_accounting_dimensions != self.enable_accounting_dimensions:
-			toggle_accounting_dimension_sections(not self.enable_accounting_dimensions)
-			clear_cache = True
-
-		if old_doc.enable_discounts_and_margin != self.enable_discounts_and_margin:
-			toggle_sales_discount_section(not self.enable_discounts_and_margin)
-			clear_cache = True
-
-		if old_doc.enable_loyalty_point_program != self.enable_loyalty_point_program:
-			toggle_loyalty_point_program_section(not self.enable_loyalty_point_program)
-			clear_cache = True
-
 		if clear_cache:
 			frappe.clear_cache()
 
@@ -191,36 +154,3 @@ class AccountsSettings(Document):
 
 		frappe.db.sql(f"drop procedure if exists {InitSQLProceduresForAR.init_procedure_name}")
 		frappe.db.sql(f"drop procedure if exists {InitSQLProceduresForAR.allocate_procedure_name}")
-
-
-def toggle_accounting_dimension_sections(hide):
-	accounting_dimension_doctypes = frappe.get_hooks("accounting_dimension_doctypes")
-	for doctype in accounting_dimension_doctypes:
-		create_property_setter_for_hiding_field(doctype, "accounting_dimensions_section", hide)
-
-
-def toggle_sales_discount_section(hide):
-	for doctype in SELLING_DOCTYPES + BUYING_DOCTYPES:
-		meta = frappe.get_meta(doctype)
-		if meta.has_field("additional_discount_section"):
-			create_property_setter_for_hiding_field(doctype, "additional_discount_section", hide)
-		if meta.has_field("discount_and_margin"):
-			create_property_setter_for_hiding_field(doctype, "discount_and_margin", hide)
-
-
-def toggle_loyalty_point_program_section(hide):
-	for doctype in SELLING_DOCTYPES:
-		meta = frappe.get_meta(doctype)
-		if meta.has_field("loyalty_points_redemption"):
-			create_property_setter_for_hiding_field(doctype, "loyalty_points_redemption", hide)
-
-
-def create_property_setter_for_hiding_field(doctype, field_name, hide):
-	make_property_setter(
-		doctype,
-		field_name,
-		"hidden",
-		hide,
-		"Check",
-		validate_fields_for_doctype=False,
-	)

erpnext/accounts/doctype/accounts_settings/test_accounts_settings.py

@@ -1,5 +1,3 @@
-import unittest
-
 import frappe
 from frappe.tests import IntegrationTestCase
 

erpnext/accounts/doctype/advance_payment_ledger_entry/advance_payment_ledger_entry.json

@@ -50,7 +50,6 @@
    "fieldname": "amount",
    "fieldtype": "Currency",
    "label": "Amount",
-   "options": "currency",
    "read_only": 1
   },
   {

erpnext/accounts/doctype/bank/bank.js

@@ -3,6 +3,9 @@
 frappe.provide("erpnext.integrations");
 
 frappe.ui.form.on("Bank", {
+	onload: function (frm) {
+		add_fields_to_mapping_table(frm);
+	},
 	refresh: function (frm) {
 		add_fields_to_mapping_table(frm);
 		frm.toggle_display(["address_html", "contact_html"], !frm.doc.__islocal);
@@ -34,11 +37,11 @@ let add_fields_to_mapping_table = function (frm) {
 		});
 	});
 
-	const grid = frm.fields_dict.bank_transaction_mapping?.grid;
-
-	if (grid) {
-		grid.update_docfield_property("bank_transaction_field", "options", options);
-	}
+	frm.fields_dict.bank_transaction_mapping.grid.update_docfield_property(
+		"bank_transaction_field",
+		"options",
+		options
+	);
 };
 
 erpnext.integrations.refreshPlaidLink = class refreshPlaidLink {
@@ -113,7 +116,7 @@ erpnext.integrations.refreshPlaidLink = class refreshPlaidLink {
 				"There was an issue connecting to Plaid's authentication server. Check browser console for more information"
 			)
 		);
-		console.error(error);
+		console.log(error);
 	}
 
 	plaid_success(token, response) {

erpnext/accounts/doctype/bank/test_bank.py

@@ -1,6 +1,5 @@
 # Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and Contributors
 # See license.txt
-import unittest
 
 from frappe.tests import IntegrationTestCase
 

erpnext/accounts/doctype/bank_account/test_bank_account.py

@@ -1,9 +1,6 @@
 # Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
 # See license.txt
-import unittest
 
-import frappe
-from frappe import ValidationError
 from frappe.tests import IntegrationTestCase
 
 

erpnext/accounts/doctype/bank_account_subtype/test_bank_account_subtype.py

@@ -1,6 +1,5 @@
 # Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and Contributors
 # See license.txt
-import unittest
 
 from frappe.tests import IntegrationTestCase
 

erpnext/accounts/doctype/bank_account_type/test_bank_account_type.py

@@ -1,7 +1,6 @@
 # Copyright (c) 2020, Frappe Technologies Pvt. Ltd. and Contributors
 # See license.txt
 # import frappe
-import unittest
 
 from frappe.tests import IntegrationTestCase
 

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 cint, flt, fmt_money, get_link_to_form, getdate
+from frappe.utils import cint, flt, fmt_money, getdate
 from pypika import Order
 
 import erpnext

erpnext/accounts/doctype/bank_clearance/test_bank_clearance.py

@@ -1,6 +1,5 @@
 # Copyright (c) 2020, Frappe Technologies Pvt. Ltd. and Contributors
 # See license.txt
-import unittest
 
 import frappe
 from frappe.tests import IntegrationTestCase

erpnext/accounts/doctype/bank_guarantee/test_bank_guarantee.py

@@ -1,6 +1,5 @@
 # Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and Contributors
 # See license.txt
-import unittest
 
 from frappe.tests import IntegrationTestCase
 

erpnext/accounts/doctype/bank_statement_import/bank_statement_import.py

@@ -14,7 +14,6 @@ import openpyxl
 from frappe import _
 from frappe.core.doctype.data_import.data_import import DataImport
 from frappe.core.doctype.data_import.importer import Importer, ImportFile
-from frappe.query_builder.functions import Count
 from frappe.utils.background_jobs import enqueue
 from frappe.utils.file_manager import get_file, save_file
 from frappe.utils.xlsxutils import ILLEGAL_CHARACTERS_RE, handle_html

erpnext/accounts/doctype/bank_transaction/bank_transaction.py

@@ -139,8 +139,6 @@ class BankTransaction(Document):
 		self.set_status()
 
 	def on_cancel(self):
-		self.ignore_linked_doctypes = ["GL Entry"]
-
 		for payment_entry in self.payment_entries:
 			self.delink_payment_entry(payment_entry)
 
@@ -375,12 +373,11 @@ def get_clearance_details(transaction, payment_entry, bt_allocations, gl_entries
 			("unallocated_amount", "bank_account"),
 			as_dict=True,
 		)
-		bt_bank_account = frappe.db.get_value("Bank Account", bt.bank_account, "account")
 
-		if bt_bank_account != gl_bank_account:
+		if bt.bank_account != gl_bank_account:
 			frappe.throw(
 				_("Bank Account {} in Bank Transaction {} is not matching with Bank Account {}").format(
-					bt_bank_account, payment_entry.payment_entry, gl_bank_account
+					bt.bank_account, payment_entry.payment_entry, gl_bank_account
 				)
 			)
 

erpnext/accounts/doctype/budget/budget.py

@@ -2,14 +2,12 @@
 # For license information, please see license.txt
 
 
-from datetime import date
-
 import frappe
 from frappe import _
 from frappe.model.document import Document
 from frappe.query_builder.functions import Sum
-from frappe.utils import add_months, flt, fmt_money, get_last_day, getdate, month_diff
-from frappe.utils.data import get_first_day, nowdate
+from frappe.utils import add_months, flt, fmt_money, get_last_day, getdate
+from frappe.utils.data import get_first_day
 
 from erpnext.accounts.doctype.accounting_dimension.accounting_dimension import (
 	get_accounting_dimensions,

erpnext/accounts/doctype/budget/test_budget.py

@@ -1,10 +1,8 @@
 # Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
 # See license.txt
-import unittest
 
 import frappe
-from frappe.client import submit
-from frappe.utils import add_days, flt, get_first_day, get_last_day, getdate, now_datetime, nowdate
+from frappe.utils import flt, now_datetime, nowdate
 
 from erpnext.accounts.doctype.budget.budget import (
 	BudgetError,

erpnext/accounts/doctype/cashier_closing/test_cashier_closing.py

@@ -1,6 +1,5 @@
 # Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
 # See license.txt
-import unittest
 
 from frappe.tests import IntegrationTestCase
 

erpnext/accounts/doctype/chart_of_accounts_importer/test_chart_of_accounts_importer.py

@@ -1,6 +1,5 @@
 # Copyright (c) 2019, Frappe Technologies Pvt. Ltd. and Contributors
 # See license.txt
-import unittest
 
 from frappe.tests import IntegrationTestCase
 

erpnext/accounts/doctype/cheque_print_template/test_cheque_print_template.py

@@ -1,6 +1,5 @@
 # Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
 # See license.txt
-import unittest
 
 from frappe.tests import IntegrationTestCase
 

erpnext/accounts/doctype/cost_center/test_cost_center.py

@@ -1,6 +1,5 @@
 # Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
 # License: GNU General Public License v3. See license.txt
-import unittest
 
 import frappe
 from frappe.tests import IntegrationTestCase

erpnext/accounts/doctype/cost_center_allocation/test_cost_center_allocation.py

@@ -1,6 +1,5 @@
 # Copyright (c) 2022, Frappe Technologies Pvt. Ltd. and Contributors
 # See license.txt
-import unittest
 
 import frappe
 from frappe.query_builder.functions import Sum

erpnext/accounts/doctype/coupon_code/test_coupon_code.py

@@ -1,6 +1,5 @@
 # Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and Contributors
 # See license.txt
-import unittest
 
 import frappe
 from frappe.tests import IntegrationTestCase

erpnext/accounts/doctype/currency_exchange_settings/test_currency_exchange_settings.py

@@ -1,7 +1,6 @@
 # Copyright (c) 2021, Wahni Green Technologies Pvt. Ltd. and contributors
 # For license information, please see license.txt
 # import frappe
-import unittest
 
 from frappe.tests import IntegrationTestCase
 

erpnext/accounts/doctype/dunning_type/test_dunning_type.py

@@ -1,7 +1,6 @@
 # Copyright (c) 2020, Frappe Technologies Pvt. Ltd. and Contributors
 # See license.txt
 # import frappe
-import unittest
 
 from frappe.tests import IntegrationTestCase
 

erpnext/accounts/doctype/finance_book/test_finance_book.py

@@ -1,6 +1,5 @@
 # Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and Contributors
 # See license.txt
-import unittest
 
 import frappe
 from frappe.tests import IntegrationTestCase

erpnext/accounts/doctype/financial_report_template/financial_report_engine.py

@@ -15,7 +15,7 @@ from frappe.database.operator_map import OPERATOR_MAP
 from frappe.query_builder import Case
 from frappe.query_builder.functions import Sum
 from frappe.utils import cstr, date_diff, flt, getdate
-from pypika.terms import Bracket, LiteralValue
+from pypika.terms import LiteralValue
 
 from erpnext import get_company_currency
 from erpnext.accounts.doctype.accounting_dimension.accounting_dimension import (
@@ -541,7 +541,7 @@ class FinancialQueryBuilder:
 			.where(acb_table.period_closing_voucher == closing_voucher)
 		)
 
-		query = self._apply_standard_filters(query, acb_table, "Account Closing Balance")
+		query = self._apply_standard_filters(query, acb_table)
 		results = self._execute_with_permissions(query, "Account Closing Balance")
 
 		for row in results:
@@ -636,15 +636,12 @@ class FinancialQueryBuilder:
 		return self._execute_with_permissions(query, "GL Entry")
 
 	def _calculate_running_balances(self, balances_data: dict, gl_data: list[dict]) -> dict:
-		gl_dict = {row["account"]: row for row in gl_data}
-		accounts = set(balances_data.keys()) | set(gl_dict.keys())
-
-		for account in accounts:
+		for row in gl_data:
+			account = row["account"]
 			if account not in balances_data:
 				balances_data[account] = AccountData(account=account, **self._get_account_meta(account))
 
 			account_data: AccountData = balances_data[account]
-			gl_movement = gl_dict.get(account, {})
 
 			if account_data.has_periods():
 				first_period = account_data.get_period(self.periods[0]["key"])
@@ -654,13 +651,20 @@ class FinancialQueryBuilder:
 
 			for period in self.periods:
 				period_key = period["key"]
-				movement = gl_movement.get(period_key, 0.0)
+				movement = row.get(period_key, 0.0)
 				closing_balance = current_balance + movement
 
 				account_data.add_period(PeriodValue(period_key, current_balance, closing_balance, movement))
 
 				current_balance = closing_balance
 
+		# Accounts with no movements
+		for account_data in balances_data.values():
+			for period in self.periods:
+				period_key = period["key"]
+				if period_key not in account_data.period_values:
+					account_data.add_period(PeriodValue(period_key, 0.0, 0.0, 0.0))
+
 	def _handle_balance_accumulation(self, balances_data):
 		for account_data in balances_data.values():
 			account_data: AccountData
@@ -679,12 +683,12 @@ class FinancialQueryBuilder:
 			else:
 				account_data.unaccumulate_values()
 
-	def _apply_standard_filters(self, query, table, doctype: str = "GL Entry"):
+	def _apply_standard_filters(self, query, table):
 		if self.filters.get("ignore_closing_entries"):
-			if doctype == "GL Entry":
-				query = query.where(table.voucher_type != "Period Closing Voucher")
-			else:
+			if hasattr(table, "is_period_closing_voucher_entry"):
 				query = query.where(table.is_period_closing_voucher_entry == 0)
+			else:
+				query = query.where(table.voucher_type != "Period Closing Voucher")
 
 		if self.filters.get("project"):
 			projects = self.filters.get("project")
@@ -732,7 +736,7 @@ class FinancialQueryBuilder:
 		user_conditions = build_match_conditions(doctype)
 
 		if user_conditions:
-			query = query.where(Bracket(LiteralValue(user_conditions)))
+			query = query.where(LiteralValue(user_conditions))
 
 		return query.run(as_dict=True)
 

erpnext/accounts/doctype/financial_report_template/financial_report_template.py

@@ -5,7 +5,6 @@ import os
 import shutil
 
 import frappe
-from frappe import _
 from frappe.model.document import Document
 
 from erpnext.accounts.doctype.account_category.account_category import import_account_categories

erpnext/accounts/doctype/financial_report_template/financial_report_validation.py

@@ -1,18 +1,15 @@
 # Copyright (c) 2025, Frappe Technologies Pvt. Ltd. and contributors
 # For license information, please see license.txt
 
-import ast
 import json
 import re
 from abc import ABC, abstractmethod
 from dataclasses import dataclass, field
-from enum import Enum
-from typing import Any, ClassVar
+from typing import Any
 
 import frappe
 from frappe import _
 from frappe.database.operator_map import OPERATOR_MAP
-from frappe.database.query import SQLFunctionParser
 
 
 @dataclass

erpnext/accounts/doctype/financial_report_template/test_financial_report_engine.py

@@ -5,19 +5,14 @@ import frappe
 from frappe.utils import flt
 
 from erpnext.accounts.doctype.financial_report_template.financial_report_engine import (
-	AccountData,
-	DataCollector,
 	DependencyResolver,
 	FilterExpressionParser,
-	FinancialQueryBuilder,
 	FormulaCalculator,
-	PeriodValue,
 )
 from erpnext.accounts.doctype.financial_report_template.test_financial_report_template import (
 	FinancialReportTemplateTestCase,
 )
-from erpnext.accounts.doctype.journal_entry.test_journal_entry import make_journal_entry
-from erpnext.accounts.utils import get_currency_precision, get_fiscal_year
+from erpnext.accounts.utils import get_currency_precision
 
 # On IntegrationTestCase, the doctype test records and all
 # link-field test record dependencies are recursively loaded
@@ -1673,360 +1668,3 @@ class TestFilterExpressionParser(FinancialReportTemplateTestCase):
 		mock_row_invalid = self._create_mock_report_row(invalid_formula)
 		condition = parser.build_condition(mock_row_invalid, account_table)
 		self.assertIsNone(condition)
-
-
-class TestFinancialQueryBuilder(FinancialReportTemplateTestCase):
-	def test_fetch_balances_with_journal_entries(self):
-		company = "_Test Company"
-		cash_account = "_Test Cash - _TC"
-		bank_account = "_Test Bank - _TC"
-
-		# Create journal entries in different periods
-		# October: Transfer 1000 from Bank to Cash
-		jv_oct = make_journal_entry(
-			account1=cash_account,
-			account2=bank_account,
-			amount=1000,
-			posting_date="2024-10-15",
-			company=company,
-			submit=True,
-		)
-
-		# November: Transfer 500 from Bank to Cash
-		jv_nov = make_journal_entry(
-			account1=cash_account,
-			account2=bank_account,
-			amount=500,
-			posting_date="2024-11-20",
-			company=company,
-			submit=True,
-		)
-
-		# December: No transactions (test zero movement period)
-
-		try:
-			# Set up filters and periods for Q4 2024
-			filters = {
-				"company": company,
-				"from_fiscal_year": "2024",
-				"to_fiscal_year": "2024",
-				"period_start_date": "2024-10-01",
-				"period_end_date": "2024-12-31",
-				"filter_based_on": "Date Range",
-				"periodicity": "Monthly",
-			}
-
-			periods = [
-				{"key": "2024_oct", "from_date": "2024-10-01", "to_date": "2024-10-31"},
-				{"key": "2024_nov", "from_date": "2024-11-01", "to_date": "2024-11-30"},
-				{"key": "2024_dec", "from_date": "2024-12-01", "to_date": "2024-12-31"},
-			]
-
-			query_builder = FinancialQueryBuilder(filters, periods)
-
-			# Create account objects as expected by fetch_account_balances
-			accounts = [
-				frappe._dict({"name": cash_account, "account_name": "Cash", "account_number": "1001"}),
-				frappe._dict({"name": bank_account, "account_name": "Bank", "account_number": "1002"}),
-			]
-
-			# Fetch balances using the full workflow
-			balances_data = query_builder.fetch_account_balances(accounts)
-
-			# Verify Cash account balances
-			cash_data = balances_data.get(cash_account)
-			self.assertIsNotNone(cash_data, "Cash account should exist in results")
-
-			# October: movement = +1000 (debit)
-			oct_cash = cash_data.get_period("2024_oct")
-			self.assertIsNotNone(oct_cash, "October period should exist for cash")
-			self.assertEqual(oct_cash.movement, 1000.0, "October cash movement should be 1000")
-
-			# November: movement = +500
-			nov_cash = cash_data.get_period("2024_nov")
-			self.assertIsNotNone(nov_cash, "November period should exist for cash")
-			self.assertEqual(nov_cash.movement, 500.0, "November cash movement should be 500")
-			self.assertEqual(
-				nov_cash.opening, oct_cash.closing, "November opening should equal October closing"
-			)
-
-			# December: movement = 0 (no transactions)
-			dec_cash = cash_data.get_period("2024_dec")
-			self.assertIsNotNone(dec_cash, "December period should exist for cash")
-			self.assertEqual(dec_cash.movement, 0.0, "December cash movement should be 0")
-			self.assertEqual(
-				dec_cash.closing,
-				nov_cash.closing,
-				"December closing should equal November closing when no movement",
-			)
-
-			# Verify Bank account balances (opposite direction)
-			bank_data = balances_data.get(bank_account)
-			self.assertIsNotNone(bank_data, "Bank account should exist in results")
-
-			oct_bank = bank_data.get_period("2024_oct")
-			self.assertEqual(oct_bank.movement, -1000.0, "October bank movement should be -1000")
-
-			nov_bank = bank_data.get_period("2024_nov")
-			self.assertEqual(nov_bank.movement, -500.0, "November bank movement should be -500")
-
-		finally:
-			# Clean up: cancel journal entries
-			jv_nov.cancel()
-			jv_oct.cancel()
-
-	def test_opening_balance_from_previous_period_closing(self):
-		company = "_Test Company"
-		cash_account = "_Test Cash - _TC"
-		sales_account = "Sales - _TC"
-		posting_date_2023 = "2023-06-15"
-
-		# Create journal entry in prior period (2023)
-		# Cash Dr 5000, Sales Cr 5000
-		jv_2023 = make_journal_entry(
-			account1=cash_account,
-			account2=sales_account,
-			amount=5000,
-			posting_date=posting_date_2023,
-			company=company,
-			submit=True,
-		)
-
-		pcv = None
-		jv_2024 = None
-		original_pcv_setting = frappe.db.get_single_value(
-			"Accounts Settings", "use_legacy_controller_for_pcv"
-		)
-
-		try:
-			# Create Period Closing Voucher for 2023
-			# This will create Account Closing Balance entries
-			closing_account = frappe.db.get_value(
-				"Account",
-				{
-					"company": company,
-					"root_type": "Liability",
-					"is_group": 0,
-					"account_type": ["not in", ["Payable", "Receivable"]],
-				},
-				"name",
-			)
-
-			fy_2023 = get_fiscal_year(posting_date_2023, company=company)
-
-			frappe.db.set_single_value("Accounts Settings", "use_legacy_controller_for_pcv", 1)
-
-			pcv = frappe.get_doc(
-				{
-					"doctype": "Period Closing Voucher",
-					"transaction_date": "2023-12-31",
-					"period_start_date": fy_2023[1],
-					"period_end_date": fy_2023[2],
-					"company": company,
-					"fiscal_year": fy_2023[0],
-					"cost_center": "_Test Cost Center - _TC",
-					"closing_account_head": closing_account,
-					"remarks": "Test Period Closing",
-				}
-			)
-			pcv.insert()
-			pcv.submit()
-			pcv.reload()
-
-			# Now create a small transaction in 2024 to ensure the account appears
-			jv_2024 = make_journal_entry(
-				account1=cash_account,
-				account2=sales_account,
-				amount=100,
-				posting_date="2024-01-15",
-				company=company,
-				submit=True,
-			)
-
-			# Set up filters for Q1 2024 (after the period closing)
-			filters = {
-				"company": company,
-				"from_fiscal_year": "2024",
-				"to_fiscal_year": "2024",
-				"period_start_date": "2024-01-01",
-				"period_end_date": "2024-03-31",
-				"filter_based_on": "Date Range",
-				"periodicity": "Monthly",
-				"ignore_closing_entries": True,  # Don't include PCV entries in movements
-			}
-
-			periods = [
-				{"key": "2024_jan", "from_date": "2024-01-01", "to_date": "2024-01-31"},
-				{"key": "2024_feb", "from_date": "2024-02-01", "to_date": "2024-02-29"},
-				{"key": "2024_mar", "from_date": "2024-03-01", "to_date": "2024-03-31"},
-			]
-
-			query_builder = FinancialQueryBuilder(filters, periods)
-
-			accounts = [
-				frappe._dict({"name": cash_account, "account_name": "Cash", "account_number": "1001"}),
-			]
-
-			balances_data = query_builder.fetch_account_balances(accounts)
-
-			# Verify Cash account has opening balance from 2023 transactions
-			cash_data = balances_data.get(cash_account)
-			self.assertIsNotNone(cash_data, "Cash account should exist in results")
-
-			jan_cash = cash_data.get_period("2024_jan")
-			self.assertIsNotNone(jan_cash, "January period should exist")
-
-			# Opening balance should be from prior period
-			# Cash had 5000 debit in 2023, so opening in 2024 should be >= 5000
-			# (may be higher if there were other test transactions)
-			self.assertEqual(
-				jan_cash.opening,
-				5000.0,
-				"January opening should equal to balance from 2023 (5000)",
-			)
-
-			# Verify running balance logic
-			# Movement in January is 100 (from jv_2024)
-			self.assertEqual(jan_cash.movement, 100.0, "January movement should be 100")
-			self.assertEqual(
-				jan_cash.closing, jan_cash.opening + jan_cash.movement, "Closing = Opening + Movement"
-			)
-
-			# February and March should have no movement but carry the balance
-			feb_cash = cash_data.get_period("2024_feb")
-			self.assertEqual(feb_cash.opening, jan_cash.closing, "Feb opening = Jan closing")
-			self.assertEqual(feb_cash.movement, 0.0, "February should have no movement")
-			self.assertEqual(feb_cash.closing, feb_cash.opening, "Feb closing = opening when no movement")
-
-			mar_cash = cash_data.get_period("2024_mar")
-			self.assertEqual(mar_cash.opening, feb_cash.closing, "Mar opening = Feb closing")
-			self.assertEqual(mar_cash.movement, 0.0, "March should have no movement")
-			self.assertEqual(mar_cash.closing, mar_cash.opening, "Mar closing = opening when no movement")
-
-			# Set up filters for Q2 2024
-			filters_q2 = {
-				"company": company,
-				"from_fiscal_year": "2024",
-				"to_fiscal_year": "2024",
-				"period_start_date": "2024-04-01",
-				"period_end_date": "2024-06-30",
-				"filter_based_on": "Date Range",
-				"periodicity": "Monthly",
-				"ignore_closing_entries": True,
-			}
-
-			periods_q2 = [
-				{"key": "2024_apr", "from_date": "2024-04-01", "to_date": "2024-04-30"},
-				{"key": "2024_may", "from_date": "2024-05-01", "to_date": "2024-05-31"},
-				{"key": "2024_jun", "from_date": "2024-06-01", "to_date": "2024-06-30"},
-			]
-
-			query_builder_q2 = FinancialQueryBuilder(filters_q2, periods_q2)
-
-			balances_data_q2 = query_builder_q2.fetch_account_balances(accounts)
-
-			# Verify Cash account in Q2
-			cash_data_q2 = balances_data_q2.get(cash_account)
-			self.assertIsNotNone(cash_data_q2, "Cash account should exist in Q2 results")
-
-			apr_cash = cash_data_q2.get_period("2024_apr")
-			self.assertIsNotNone(apr_cash, "April period should exist")
-
-			# Opening balance in April should equal closing in March
-			self.assertEqual(
-				apr_cash.opening,
-				mar_cash.closing,
-				"April opening should equal March closing balance",
-			)
-
-			self.assertEqual(apr_cash.closing, apr_cash.opening, "April closing = opening when no movement")
-
-		finally:
-			# Clean up
-			frappe.db.set_single_value(
-				"Accounts Settings", "use_legacy_controller_for_pcv", original_pcv_setting or 0
-			)
-
-			if jv_2024:
-				jv_2024.cancel()
-
-			if pcv:
-				pcv.reload()
-				if pcv.docstatus == 1:
-					pcv.cancel()
-
-			jv_2023.cancel()
-
-	def test_account_with_gl_entries_but_no_prior_closing_balance(self):
-		company = "_Test Company"
-		cash_account = "_Test Cash - _TC"
-		bank_account = "_Test Bank - _TC"
-
-		# Create journal entries WITHOUT any prior Period Closing Voucher
-		# This ensures the account exists in gl_dict but NOT in balances_data
-		jv = make_journal_entry(
-			account1=cash_account,
-			account2=bank_account,
-			amount=2500,
-			posting_date="2024-07-15",
-			company=company,
-			submit=True,
-		)
-
-		try:
-			# Set up filters - use a period with no prior PCV
-			filters = {
-				"company": company,
-				"from_fiscal_year": "2024",
-				"to_fiscal_year": "2024",
-				"period_start_date": "2024-07-01",
-				"period_end_date": "2024-09-30",
-				"filter_based_on": "Date Range",
-				"periodicity": "Monthly",
-			}
-
-			periods = [
-				{"key": "2024_jul", "from_date": "2024-07-01", "to_date": "2024-07-31"},
-				{"key": "2024_aug", "from_date": "2024-08-01", "to_date": "2024-08-31"},
-				{"key": "2024_sep", "from_date": "2024-09-01", "to_date": "2024-09-30"},
-			]
-
-			query_builder = FinancialQueryBuilder(filters, periods)
-
-			# Use accounts that have GL entries but may not have Account Closing Balance
-			accounts = [
-				frappe._dict({"name": cash_account, "account_name": "Cash", "account_number": "1001"}),
-				frappe._dict({"name": bank_account, "account_name": "Bank", "account_number": "1002"}),
-			]
-
-			balances_data = query_builder.fetch_account_balances(accounts)
-
-			# Verify accounts are present in results even without prior closing balance
-			cash_data = balances_data.get(cash_account)
-			self.assertIsNotNone(cash_data, "Cash account should exist in results")
-
-			bank_data = balances_data.get(bank_account)
-			self.assertIsNotNone(bank_data, "Bank account should exist in results")
-
-			# Verify July has the movement from journal entry
-			jul_cash = cash_data.get_period("2024_jul")
-			self.assertIsNotNone(jul_cash, "July period should exist for cash")
-			self.assertEqual(jul_cash.movement, 2500.0, "July cash movement should be 2500")
-
-			jul_bank = bank_data.get_period("2024_jul")
-			self.assertIsNotNone(jul_bank, "July period should exist for bank")
-			self.assertEqual(jul_bank.movement, -2500.0, "July bank movement should be -2500")
-
-			# Verify subsequent periods exist with zero movement
-			aug_cash = cash_data.get_period("2024_aug")
-			self.assertIsNotNone(aug_cash, "August period should exist for cash")
-			self.assertEqual(aug_cash.movement, 0.0, "August cash movement should be 0")
-			self.assertEqual(aug_cash.opening, jul_cash.closing, "August opening = July closing")
-
-			sep_cash = cash_data.get_period("2024_sep")
-			self.assertIsNotNone(sep_cash, "September period should exist for cash")
-			self.assertEqual(sep_cash.movement, 0.0, "September cash movement should be 0")
-			self.assertEqual(sep_cash.opening, aug_cash.closing, "September opening = August closing")
-
-		finally:
-			jv.cancel()

erpnext/accounts/doctype/fiscal_year/fiscal_year.py

@@ -4,7 +4,7 @@
 
 import frappe
 from dateutil.relativedelta import relativedelta
-from frappe import _, cint
+from frappe import _
 from frappe.model.document import Document
 from frappe.utils import add_days, add_years, cstr, getdate
 
@@ -33,6 +33,24 @@ class FiscalYear(Document):
 		self.validate_dates()
 		self.validate_overlap()
 
+		if not self.is_new():
+			year_start_end_dates = frappe.db.sql(
+				"""select year_start_date, year_end_date
+				from `tabFiscal Year` where name=%s""",
+				(self.name),
+			)
+
+			if year_start_end_dates:
+				if (
+					getdate(self.year_start_date) != year_start_end_dates[0][0]
+					or getdate(self.year_end_date) != year_start_end_dates[0][1]
+				):
+					frappe.throw(
+						_(
+							"Cannot change Fiscal Year Start Date and Fiscal Year End Date once the Fiscal Year is saved."
+						)
+					)
+
 	def validate_dates(self):
 		self.validate_from_to_dates("year_start_date", "year_end_date")
 		if self.is_short_year:
@@ -48,20 +66,28 @@ class FiscalYear(Document):
 				frappe.exceptions.InvalidDates,
 			)
 
+	def on_update(self):
+		check_duplicate_fiscal_year(self)
+		frappe.cache().delete_value("fiscal_years")
+
+	def on_trash(self):
+		frappe.cache().delete_value("fiscal_years")
+
 	def validate_overlap(self):
-		fy = frappe.qb.DocType("Fiscal Year")
-
-		name = self.name or self.year
-
-		existing_fiscal_years = (
-			frappe.qb.from_(fy)
-			.select(fy.name)
-			.where(
-				(fy.year_start_date <= self.year_end_date)
-				& (fy.year_end_date >= self.year_start_date)
-				& (fy.name != name)
-			)
-			.run(as_dict=True)
+		existing_fiscal_years = frappe.db.sql(
+			"""select name from `tabFiscal Year`
+			where (
+				(%(year_start_date)s between year_start_date and year_end_date)
+				or (%(year_end_date)s between year_start_date and year_end_date)
+				or (year_start_date between %(year_start_date)s and %(year_end_date)s)
+				or (year_end_date between %(year_start_date)s and %(year_end_date)s)
+			) and name!=%(name)s""",
+			{
+				"year_start_date": self.year_start_date,
+				"year_end_date": self.year_end_date,
+				"name": self.name or "No Name",
+			},
+			as_dict=True,
 		)
 
 		if existing_fiscal_years:
@@ -84,30 +110,37 @@ class FiscalYear(Document):
 					frappe.throw(
 						_(
 							"Year start date or end date is overlapping with {0}. To avoid please set company"
-						).format(frappe.get_desk_link("Fiscal Year", existing.name, open_in_new_tab=True)),
+						).format(existing.name),
 						frappe.NameError,
 					)
 
 
-def auto_create_fiscal_year():
-	fy = frappe.qb.DocType("Fiscal Year")
-
-	# Skipped auto-creating Short Year, as it has very rare use case.
-	# Reference: https://www.irs.gov/businesses/small-businesses-self-employed/tax-years (US)
-	follow_up_date = add_days(getdate(), days=3)
-	fiscal_year = (
-		frappe.qb.from_(fy)
-		.select(fy.name)
-		.where((fy.year_end_date == follow_up_date) & (fy.is_short_year == 0))
-		.run()
+@frappe.whitelist()
+def check_duplicate_fiscal_year(doc):
+	year_start_end_dates = frappe.db.sql(
+		"""select name, year_start_date, year_end_date from `tabFiscal Year` where name!=%s""",
+		(doc.name),
 	)
+	for fiscal_year, ysd, yed in year_start_end_dates:
+		if (getdate(doc.year_start_date) == ysd and getdate(doc.year_end_date) == yed) and (
+			not frappe.in_test
+		):
+			frappe.throw(
+				_(
+					"Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0}"
+				).format(fiscal_year)
+			)
 
-	for d in fiscal_year:
+
+@frappe.whitelist()
+def auto_create_fiscal_year():
+	for d in frappe.db.sql(
+		"""select name from `tabFiscal Year` where year_end_date = date_add(current_date, interval 3 day)"""
+	):
 		try:
 			current_fy = frappe.get_doc("Fiscal Year", d[0])
 
-			new_fy = frappe.new_doc("Fiscal Year")
-			new_fy.disabled = cint(current_fy.disabled)
+			new_fy = frappe.copy_doc(current_fy, ignore_no_copy=False)
 
 			new_fy.year_start_date = add_days(current_fy.year_end_date, 1)
 			new_fy.year_end_date = add_years(current_fy.year_end_date, 1)
@@ -115,10 +148,6 @@ def auto_create_fiscal_year():
 			start_year = cstr(new_fy.year_start_date.year)
 			end_year = cstr(new_fy.year_end_date.year)
 			new_fy.year = start_year if start_year == end_year else (start_year + "-" + end_year)
-
-			for row in current_fy.companies:
-				new_fy.append("companies", {"company": row.company})
-
 			new_fy.auto_created = 1
 
 			new_fy.insert(ignore_permissions=True)

erpnext/accounts/doctype/fiscal_year/test_fiscal_year.py

@@ -1,6 +1,5 @@
 # Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
 # License: GNU General Public License v3. See license.txt
-import unittest
 
 import frappe
 from frappe.tests import IntegrationTestCase

erpnext/accounts/doctype/fiscal_year_company/fiscal_year_company.json

@@ -15,22 +15,20 @@
    "ignore_user_permissions": 1,
    "in_list_view": 1,
    "label": "Company",
-   "options": "Company",
-   "reqd": 1
+   "options": "Company"
   }
  ],
  "index_web_pages_for_search": 1,
  "istable": 1,
  "links": [],
- "modified": "2026-02-20 23:02:26.193606",
+ "modified": "2024-03-27 13:09:44.659251",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Fiscal Year Company",
  "owner": "Administrator",
  "permissions": [],
- "row_format": "Dynamic",
  "sort_field": "creation",
  "sort_order": "DESC",
  "states": [],
  "track_changes": 1
-}
+}

erpnext/accounts/doctype/fiscal_year_company/fiscal_year_company.py

@@ -14,7 +14,7 @@ class FiscalYearCompany(Document):
 	if TYPE_CHECKING:
 		from frappe.types import DF
 
-		company: DF.Link
+		company: DF.Link | None
 		parent: DF.Data
 		parentfield: DF.Data
 		parenttype: DF.Data

erpnext/accounts/doctype/gl_entry/test_gl_entry.py

@@ -1,6 +1,5 @@
 # Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
 # License: GNU General Public License v3. See license.txt
-import unittest
 
 import frappe
 from frappe.model.naming import parse_naming_series

erpnext/accounts/doctype/invoice_discounting/test_invoice_discounting.py

@@ -1,6 +1,5 @@
 # Copyright (c) 2019, Frappe Technologies Pvt. Ltd. and Contributors
 # See license.txt
-import unittest
 
 import frappe
 from frappe.tests import IntegrationTestCase

erpnext/accounts/doctype/item_tax_template/test_item_tax_template.py

@@ -1,6 +1,5 @@
 # Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and Contributors
 # See license.txt
-import unittest
 
 from frappe.tests import IntegrationTestCase
 

erpnext/accounts/doctype/journal_entry/journal_entry.js

@@ -277,21 +277,7 @@ frappe.ui.form.on("Journal Entry", {
 var update_jv_details = function (doc, r) {
 	$.each(r, function (i, d) {
 		var row = frappe.model.add_child(doc, "Journal Entry Account", "accounts");
-		const {
-			idx,
-			name,
-			owner,
-			parent,
-			parenttype,
-			parentfield,
-			creation,
-			modified,
-			modified_by,
-			doctype,
-			docstatus,
-			...fields
-		} = d;
-		frappe.model.set_value(row.doctype, row.name, fields);
+		frappe.model.set_value(row.doctype, row.name, "account", d.account);
 	});
 	refresh_field("accounts");
 };

erpnext/accounts/doctype/journal_entry/journal_entry.json

@@ -9,7 +9,6 @@
  "engine": "InnoDB",
  "field_order": [
   "entry_type_and_date",
-  "company",
   "is_system_generated",
   "title",
   "voucher_type",
@@ -18,6 +17,7 @@
   "reversal_of",
   "column_break1",
   "from_template",
+  "company",
   "posting_date",
   "finance_book",
   "apply_tds",
@@ -638,7 +638,7 @@
    "table_fieldname": "payment_entries"
   }
  ],
- "modified": "2026-02-03 14:40:39.944524",
+ "modified": "2025-11-13 17:54:14.542903",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Journal Entry",

erpnext/accounts/doctype/journal_entry/journal_entry.py

@@ -74,8 +74,8 @@ class JournalEntry(AccountsController):
 		mode_of_payment: DF.Link | None
 		multi_currency: DF.Check
 		naming_series: DF.Literal["ACC-JV-.YYYY.-"]
-		override_tax_withholding_entries: DF.Check
 		party_not_required: DF.Check
+		override_tax_withholding_entries: DF.Check
 		pay_to_recd_from: DF.Data | None
 		payment_order: DF.Link | None
 		periodic_entry_difference_account: DF.Link | None
@@ -179,7 +179,7 @@ class JournalEntry(AccountsController):
 		validate_docs_for_deferred_accounting([self.name], [])
 
 	def submit(self):
-		if len(self.accounts) > 100 and not self.meta.queue_in_background:
+		if len(self.accounts) > 100:
 			queue_submission(self, "_submit")
 		else:
 			return self._submit()
@@ -1691,10 +1691,6 @@ def get_exchange_rate(
 	credit=None,
 	exchange_rate=None,
 ):
-	# Ensure exchange_rate is always numeric to avoid calculation errors
-	if isinstance(exchange_rate, str):
-		exchange_rate = flt(exchange_rate) or 1
-
 	account_details = frappe.get_cached_value(
 		"Account", account, ["account_type", "root_type", "account_currency", "company"], as_dict=1
 	)

erpnext/accounts/doctype/journal_entry_account/journal_entry_account.json

@@ -185,7 +185,7 @@
    "fieldtype": "Select",
    "label": "Reference Type",
    "no_copy": 1,
-   "options": "\nSales Invoice\nPurchase Invoice\nJournal Entry\nSales Order\nPurchase Order\nExpense Claim\nAsset\nLoan\nPayroll Entry\nEmployee Advance\nExchange Rate Revaluation\nInvoice Discounting\nFees\nFull and Final Statement\nPayment Entry\nBank Transaction",
+   "options": "\nSales Invoice\nPurchase Invoice\nJournal Entry\nSales Order\nPurchase Order\nExpense Claim\nAsset\nLoan\nPayroll Entry\nEmployee Advance\nExchange Rate Revaluation\nInvoice Discounting\nFees\nFull and Final Statement\nPayment Entry",
    "search_index": 1
   },
   {
@@ -198,7 +198,7 @@
    "search_index": 1
   },
   {
-   "depends_on": "eval:doc.reference_type&&!in_list(doc.reference_type, ['Expense Claim', 'Asset', 'Employee Loan', 'Employee Advance', 'Bank Transaction'])",
+   "depends_on": "eval:doc.reference_type&&!in_list(doc.reference_type, ['Expense Claim', 'Asset', 'Employee Loan', 'Employee Advance'])",
    "fieldname": "reference_due_date",
    "fieldtype": "Date",
    "label": "Reference Due Date",
@@ -294,7 +294,7 @@
  "idx": 1,
  "istable": 1,
  "links": [],
- "modified": "2026-02-19 17:01:22.642454",
+ "modified": "2025-11-27 12:23:33.157655",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Journal Entry Account",

erpnext/accounts/doctype/journal_entry_account/journal_entry_account.py

@@ -55,7 +55,6 @@ class JournalEntryAccount(Document):
 			"Fees",
 			"Full and Final Statement",
 			"Payment Entry",
-			"Bank Transaction",
 		]
 		user_remark: DF.SmallText | None
 	# end: auto-generated types

erpnext/accounts/doctype/journal_entry_template/journal_entry_template.js

@@ -3,7 +3,6 @@
 
 frappe.ui.form.on("Journal Entry Template", {
 	onload: function (frm) {
-		erpnext.accounts.dimensions.setup_dimension_filters(frm, frm.doctype);
 		if (frm.is_new()) {
 			frappe.call({
 				type: "GET",
@@ -38,31 +37,6 @@ frappe.ui.form.on("Journal Entry Template", {
 
 			return { filters: filters };
 		});
-
-		frm.set_query("project", "accounts", function (doc, cdt, cdn) {
-			let row = frappe.get_doc(cdt, cdn);
-			let filters = {
-				company: doc.company,
-			};
-			if (row.party_type == "Customer") {
-				filters.customer = row.party;
-			}
-			return {
-				query: "erpnext.controllers.queries.get_project_name",
-				filters,
-			};
-		});
-
-		frm.set_query("party_type", "accounts", function (doc, cdt, cdn) {
-			const row = locals[cdt][cdn];
-
-			return {
-				query: "erpnext.setup.doctype.party_type.party_type.get_party_type",
-				filters: {
-					account: row.account,
-				},
-			};
-		});
 	},
 	voucher_type: function (frm) {
 		var add_accounts = function (doc, r) {

erpnext/accounts/doctype/journal_entry_template/journal_entry_template.py

@@ -3,7 +3,6 @@
 
 
 import frappe
-from frappe import _
 from frappe.model.document import Document
 
 
@@ -43,29 +42,7 @@ class JournalEntryTemplate(Document):
 		]
 	# end: auto-generated types
 
-	def validate(self):
-		self.validate_party()
-
-	def validate_party(self):
-		"""
-		Loop over all accounts and see if party and party type is set correctly
-		"""
-		for account in self.accounts:
-			if account.party_type:
-				account_type = frappe.get_cached_value("Account", account.account, "account_type")
-				if account_type not in ["Receivable", "Payable"]:
-					frappe.throw(
-						_(
-							"Check row {0} for account {1}: Party Type is only allowed for Receivable or Payable accounts"
-						).format(account.idx, account.account)
-					)
-
-			if account.party and not account.party_type:
-				frappe.throw(
-					_("Check row {0} for account {1}: Party is only allowed if Party Type is set").format(
-						account.idx, account.account
-					)
-				)
+	pass
 
 
 @frappe.whitelist()

erpnext/accounts/doctype/journal_entry_template/test_journal_entry_template.py

@@ -1,7 +1,6 @@
 # Copyright (c) 2020, Frappe Technologies Pvt. Ltd. and Contributors
 # See license.txt
 # import frappe
-import unittest
 
 from frappe.tests import IntegrationTestCase
 

erpnext/accounts/doctype/journal_entry_template_account/journal_entry_template_account.json

@@ -5,13 +5,7 @@
  "editable_grid": 1,
  "engine": "InnoDB",
  "field_order": [
-  "account",
-  "party_type",
-  "party",
-  "accounting_dimensions_section",
-  "cost_center",
-  "dimension_col_break",
-  "project"
+  "account"
  ],
  "fields": [
   {
@@ -21,55 +15,18 @@
    "label": "Account",
    "options": "Account",
    "reqd": 1
-  },
-  {
-   "fieldname": "party_type",
-   "fieldtype": "Link",
-   "in_list_view": 1,
-   "label": "Party Type",
-   "options": "DocType"
-  },
-  {
-   "fieldname": "party",
-   "fieldtype": "Dynamic Link",
-   "in_list_view": 1,
-   "label": "Party",
-   "options": "party_type"
-  },
-  {
-   "collapsible": 1,
-   "fieldname": "accounting_dimensions_section",
-   "fieldtype": "Section Break",
-   "label": "Accounting Dimensions"
-  },
-  {
-   "fieldname": "cost_center",
-   "fieldtype": "Link",
-   "label": "Cost Center",
-   "options": "Cost Center"
-  },
-  {
-   "fieldname": "project",
-   "fieldtype": "Link",
-   "label": "Project",
-   "options": "Project"
-  },
-  {
-   "fieldname": "dimension_col_break",
-   "fieldtype": "Column Break"
   }
  ],
  "istable": 1,
  "links": [],
- "modified": "2026-01-09 13:16:27.615083",
+ "modified": "2024-03-27 13:09:58.986448",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Journal Entry Template Account",
  "owner": "Administrator",
  "permissions": [],
- "row_format": "Dynamic",
  "sort_field": "creation",
  "sort_order": "DESC",
  "states": [],
  "track_changes": 1
-}
+}

erpnext/accounts/doctype/journal_entry_template_account/journal_entry_template_account.py

@@ -16,13 +16,9 @@ class JournalEntryTemplateAccount(Document):
 		from frappe.types import DF
 
 		account: DF.Link
-		cost_center: DF.Link | None
 		parent: DF.Data
 		parentfield: DF.Data
 		parenttype: DF.Data
-		party: DF.DynamicLink | None
-		party_type: DF.Link | None
-		project: DF.Link | None
 	# end: auto-generated types
 
 	pass

erpnext/accounts/doctype/ledger_merge/test_ledger_merge.py

@@ -1,6 +1,5 @@
 # Copyright (c) 2021, Wahni Green Technologies Pvt. Ltd. and Contributors
 # See license.txt
-import unittest
 
 import frappe
 from frappe.tests import IntegrationTestCase

erpnext/accounts/doctype/loyalty_point_entry/test_loyalty_point_entry.py

@@ -1,6 +1,5 @@
 # Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and Contributors
 # See license.txt
-import unittest
 
 import frappe
 from frappe.tests import IntegrationTestCase

erpnext/accounts/doctype/mode_of_payment/test_mode_of_payment.py

@@ -1,6 +1,5 @@
 # Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
 # See license.txt
-import unittest
 
 import frappe
 from frappe.tests import IntegrationTestCase

erpnext/accounts/doctype/monthly_distribution/test_monthly_distribution.py

@@ -1,8 +1,6 @@
 # Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors and Contributors
 # See license.txt
-import unittest
 
-import frappe
 from frappe.tests import IntegrationTestCase
 
 

erpnext/accounts/doctype/party_link/test_party_link.py

@@ -1,7 +1,6 @@
 # Copyright (c) 2021, Frappe Technologies Pvt. Ltd. and Contributors
 # See license.txt
 # import frappe
-import unittest
 
 from frappe.tests import IntegrationTestCase
 

erpnext/accounts/doctype/payment_entry/payment_entry.js

@@ -400,16 +400,6 @@ frappe.ui.form.on("Payment Entry", {
 		);
 
 		frm.refresh_fields();
-
-		const party_currency =
-			frm.doc.payment_type === "Receive" ? "paid_from_account_currency" : "paid_to_account_currency";
-
-		var reference_grid = frm.fields_dict["references"].grid;
-		["total_amount", "outstanding_amount", "allocated_amount"].forEach((fieldname) => {
-			reference_grid.update_docfield_property(fieldname, "options", party_currency);
-		});
-
-		reference_grid.refresh();
 	},
 
 	show_general_ledger: function (frm) {
@@ -512,16 +502,12 @@ frappe.ui.form.on("Payment Entry", {
 			frm.set_value("contact_email", "");
 			frm.set_value("contact_person", "");
 		}
-
 		if (frm.doc.payment_type && frm.doc.party_type && frm.doc.party && frm.doc.company) {
 			if (!frm.doc.posting_date) {
 				frappe.msgprint(__("Please select Posting Date before selecting Party"));
 				frm.set_value("party", "");
 				return;
 			}
-
-			erpnext.utils.get_employee_contact_details(frm);
-
 			frm.set_party_account_based_on_party = true;
 
 			let company_currency = frappe.get_doc(":Company", frm.doc.company).default_currency;
@@ -1118,7 +1104,7 @@ frappe.ui.form.on("Payment Entry", {
 
 	allocate_party_amount_against_ref_docs: async function (frm, paid_amount, paid_amount_change) {
 		await frm.call("allocate_amount_to_references", {
-			paid_amount: flt(paid_amount),
+			paid_amount: paid_amount,
 			paid_amount_change: paid_amount_change,
 			allocate_payment_amount: frappe.flags.allocate_payment_amount ?? false,
 		});
@@ -1454,15 +1440,16 @@ frappe.ui.form.on("Payment Entry", {
 			callback: function (r) {
 				if (!r.exc && r.message) {
 					// set taxes table
-					let taxes = r.message;
-					taxes.forEach((tax) => {
-						if (tax.charge_type === "On Net Total") {
-							tax.charge_type = "On Paid Amount";
+					if (r.message) {
+						for (let tax of r.message) {
+							if (tax.charge_type === "On Net Total") {
+								tax.charge_type = "On Paid Amount";
+							}
+							frm.add_child("taxes", tax);
 						}
-					});
-					frm.set_value("taxes", taxes);
-					frm.events.apply_taxes(frm);
-					frm.events.set_unallocated_amount(frm);
+						frm.events.apply_taxes(frm);
+						frm.events.set_unallocated_amount(frm);
+					}
 				}
 			},
 		});

erpnext/accounts/doctype/payment_entry/payment_entry.json

@@ -701,6 +701,7 @@
    "fetch_from": "company.book_advance_payments_in_separate_party_account",
    "fieldname": "book_advance_payments_in_separate_party_account",
    "fieldtype": "Check",
+   "hidden": 1,
    "label": "Book Advance Payments in Separate Party Account",
    "no_copy": 1,
    "read_only": 1
@@ -792,7 +793,7 @@
    "table_fieldname": "payment_entries"
   }
  ],
- "modified": "2026-02-03 16:08:49.800381",
+ "modified": "2025-12-18 13:56:40.206038",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Payment Entry",

erpnext/accounts/doctype/payment_entry/payment_entry.py

@@ -12,7 +12,6 @@ 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 pypika import Case
 from pypika.functions import Coalesce, Sum
 
 import erpnext

erpnext/accounts/doctype/payment_gateway_account/test_payment_gateway_account.py

@@ -1,6 +1,5 @@
 # Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
 # See license.txt
-import unittest
 
 from frappe.tests import IntegrationTestCase
 

erpnext/accounts/doctype/payment_ledger_entry/payment_ledger_entry.json

@@ -132,12 +132,6 @@
    "fieldtype": "Link",
    "label": "Cost Center",
    "options": "Cost Center"
-  },
-    {
-   "fieldname": "project",
-   "fieldtype": "Link",
-   "label": "Project",
-   "options": "Project"
   },
   {
    "fieldname": "due_date",

erpnext/accounts/doctype/payment_ledger_entry/payment_ledger_entry.py

@@ -38,7 +38,6 @@ class PaymentLedgerEntry(Document):
 		amount_in_account_currency: DF.Currency
 		company: DF.Link | None
 		cost_center: DF.Link | None
-		project: DF.Link | None
 		delinked: DF.Check
 		due_date: DF.Date | None
 		finance_book: DF.Link | None

erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py

@@ -746,7 +746,7 @@ class PaymentReconciliation(Document):
 		ple = qb.DocType("Payment Ledger Entry")
 		for x in self.dimensions:
 			dimension = x.fieldname
-			if self.get(dimension) and frappe.db.has_column("Payment Ledger Entry", dimension):
+			if self.get(dimension):
 				self.accounting_dimension_filter_conditions.append(ple[dimension] == self.get(dimension))
 
 	def build_qb_filter_conditions(self, get_invoices=False, get_return_invoices=False):

erpnext/accounts/doctype/payment_reference/payment_reference.json

@@ -1,88 +0,0 @@
-{
- "actions": [],
- "allow_rename": 1,
- "creation": "2025-12-02 17:50:08.648006",
- "doctype": "DocType",
- "editable_grid": 1,
- "engine": "InnoDB",
- "field_order": [
-  "payment_term",
-  "column_break_lnjp",
-  "payment_schedule",
-  "section_break_fjhh",
-  "description",
-  "section_break_mjlv",
-  "due_date",
-  "column_break_qghl",
-  "amount"
- ],
- "fields": [
-  {
-   "fieldname": "payment_term",
-   "fieldtype": "Link",
-   "in_list_view": 1,
-   "label": "Payment Term",
-   "options": "Payment Term"
-  },
-  {
-   "collapsible": 1,
-   "fieldname": "section_break_fjhh",
-   "fieldtype": "Section Break",
-   "label": "Description"
-  },
-  {
-   "fieldname": "description",
-   "fieldtype": "Small Text",
-   "in_list_view": 1,
-   "label": "Description"
-  },
-  {
-   "fieldname": "section_break_mjlv",
-   "fieldtype": "Section Break"
-  },
-  {
-   "fieldname": "due_date",
-   "fieldtype": "Date",
-   "in_list_view": 1,
-   "label": "Due Date"
-  },
-  {
-   "fieldname": "column_break_qghl",
-   "fieldtype": "Column Break"
-  },
-  {
-   "fieldname": "amount",
-   "fieldtype": "Currency",
-   "in_list_view": 1,
-   "label": "Amount",
-   "precision": "2"
-  },
-  {
-   "fieldname": "column_break_lnjp",
-   "fieldtype": "Column Break"
-  },
-  {
-   "allow_on_submit": 1,
-   "fieldname": "payment_schedule",
-   "fieldtype": "Link",
-   "label": "Payment Schedule",
-   "options": "Payment Schedule",
-   "read_only": 1
-  }
- ],
- "grid_page_length": 50,
- "index_web_pages_for_search": 1,
- "istable": 1,
- "links": [],
- "modified": "2026-01-19 02:21:36.455830",
- "modified_by": "Administrator",
- "module": "Accounts",
- "name": "Payment Reference",
- "owner": "Administrator",
- "permissions": [],
- "row_format": "Dynamic",
- "rows_threshold_for_grid_search": 20,
- "sort_field": "creation",
- "sort_order": "DESC",
- "states": []
-}

erpnext/accounts/doctype/payment_reference/payment_reference.py

@@ -1,27 +0,0 @@
-# Copyright (c) 2025, Frappe Technologies Pvt. Ltd. and contributors
-# For license information, please see license.txt
-
-# import frappe
-from frappe.model.document import Document
-
-
-class PaymentReference(Document):
-	# begin: auto-generated types
-	# This code is auto-generated. Do not modify anything in this block.
-
-	from typing import TYPE_CHECKING
-
-	if TYPE_CHECKING:
-		from frappe.types import DF
-
-		amount: DF.Currency
-		description: DF.SmallText | None
-		due_date: DF.Date | None
-		parent: DF.Data
-		parentfield: DF.Data
-		parenttype: DF.Data
-		payment_schedule: DF.Link | None
-		payment_term: DF.Link | None
-	# end: auto-generated types
-
-	pass

erpnext/accounts/doctype/payment_request/payment_request.js

@@ -105,29 +105,3 @@ frappe.ui.form.on("Payment Request", "is_a_subscription", function (frm) {
 		});
 	}
 });
-
-frappe.ui.form.on("Payment Request", "calculate_total_amount_by_selected_rows", function (frm) {
-	if (frm.doc.docstatus !== 0) {
-		frappe.msgprint(__("Cannot fetch selected rows for submitted Payment Request"));
-		return;
-	}
-	const selected = frm.get_selected()?.payment_reference || [];
-	if (!selected.length) {
-		frappe.throw(__("No rows selected"));
-	}
-	let total = 0;
-	selected.forEach((name) => {
-		const row = frm.doc.payment_reference.find((d) => d.name === name);
-		if (row) {
-			row.manually_selected = 1;
-
-			total += row.amount;
-		}
-	});
-	frm.doc.payment_reference.forEach((row) => {
-		row.auto_selected = 0;
-	});
-	frm.set_value("grand_total", total);
-	frm.refresh_field("grand_total");
-	frm.save();
-});

erpnext/accounts/doctype/payment_request/payment_request.json

@@ -19,8 +19,6 @@
   "column_break_4",
   "reference_doctype",
   "reference_name",
-  "payment_reference_section",
-  "payment_reference",
   "transaction_details",
   "grand_total",
   "currency",
@@ -159,7 +157,6 @@
    "label": "Amount",
    "non_negative": 1,
    "options": "currency",
-   "read_only_depends_on": "eval:doc.payment_reference.length>0",
    "reqd": 1
   },
   {
@@ -460,17 +457,6 @@
    "fieldname": "phone_number",
    "fieldtype": "Data",
    "label": "Phone Number"
-  },
-  {
-   "fieldname": "payment_reference_section",
-   "fieldtype": "Section Break"
-  },
-  {
-   "fieldname": "payment_reference",
-   "fieldtype": "Table",
-   "label": "Payment Reference",
-   "options": "Payment Reference",
-   "read_only": 1
   }
  ],
  "grid_page_length": 50,
@@ -478,7 +464,7 @@
  "index_web_pages_for_search": 1,
  "is_submittable": 1,
  "links": [],
- "modified": "2026-01-13 12:53:00.963274",
+ "modified": "2025-08-29 11:52:48.555415",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Payment Request",

erpnext/accounts/doctype/payment_request/payment_request.py

@@ -45,7 +45,6 @@ class PaymentRequest(Document):
 	if TYPE_CHECKING:
 		from frappe.types import DF
 
-		from erpnext.accounts.doctype.payment_reference.payment_reference import PaymentReference
 		from erpnext.accounts.doctype.subscription_plan_detail.subscription_plan_detail import (
 			SubscriptionPlanDetail,
 		)
@@ -79,7 +78,6 @@ class PaymentRequest(Document):
 		payment_gateway: DF.ReadOnly | None
 		payment_gateway_account: DF.Link | None
 		payment_order: DF.Link | None
-		payment_reference: DF.Table[PaymentReference]
 		payment_request_type: DF.Literal["Outward", "Inward"]
 		payment_url: DF.Data | None
 		phone_number: DF.Data | None
@@ -111,36 +109,15 @@ class PaymentRequest(Document):
 		if self.get("__islocal"):
 			self.status = "Draft"
 		self.validate_reference_document()
-		self.validate_against_payment_reference()
 		self.validate_payment_request_amount()
 		# self.validate_currency()
 		self.validate_subscription_details()
 
-	def validate_against_payment_reference(self):
-		if not self.payment_reference:
-			return
-
-		expected = sum(flt(r.amount) for r in self.payment_reference)
-		if flt(expected, self.precision("grand_total")) != flt(self.grand_total):
-			frappe.throw(_("Grand Total must match sum of Payment References"))
-
-		seen = set()
-		for r in self.payment_reference:
-			if not r.payment_schedule:
-				continue  # legacy mode → skip
-
-			if r.payment_schedule in seen:
-				frappe.throw(_("Duplicate Payment Schedule selected"))
-
-			seen.add(r.payment_schedule)
-
 	def validate_reference_document(self):
 		if not self.reference_doctype or not self.reference_name:
 			frappe.throw(_("To create a Payment Request reference document is required"))
 
 	def validate_payment_request_amount(self):
-		if self.payment_reference:
-			return
 		if self.grand_total == 0:
 			frappe.throw(
 				_("{0} cannot be zero").format(self.get_label_from_fieldname("grand_total")),
@@ -558,7 +535,7 @@ class PaymentRequest(Document):
 				row_number += TO_SKIP_NEW_ROW
 
 
-@frappe.whitelist()
+@frappe.whitelist(allow_guest=True)
 def make_payment_request(**args):
 	"""Make payment request"""
 
@@ -569,69 +546,12 @@ def make_payment_request(**args):
 	if args.dn and not isinstance(args.dn, str):
 		frappe.throw(_("Invalid parameter. 'dn' should be of type str"))
 
-	frappe.has_permission("Payment Request", "create", throw=True)
-	frappe.has_permission(args.dt, "read", args.dn, throw=True)
-
 	ref_doc = args.ref_doc or frappe.get_doc(args.dt, args.dn)
 	if not args.get("company"):
 		args.company = ref_doc.company
-
 	gateway_account = get_gateway_details(args) or frappe._dict()
 
-	# Schedule-based PRs are allowed only if no Payment Entry exists for this document.
-	# Any existing Payment Entry forces legacy (amount-based) flow.
-	selected_payment_schedules = json.loads(args.get("schedules")) if args.get("schedules") else []
-
-	# Backend guard:
-	# If any Payment Entry exists, schedule-based PRs are not allowed.
-	if selected_payment_schedules and get_existing_payment_entry(ref_doc.name):
-		frappe.throw(
-			_(
-				"Payment Schedule based Payment Requests cannot be created because a Payment Entry already exists for this document."
-			)
-		)
-
-	has_payment_entry = bool(get_existing_payment_entry(ref_doc.name))
-
-	payment_reference = []
-
-	if selected_payment_schedules:
-		existing_payment_references = get_existing_payment_references(ref_doc.name)
-
-		if existing_payment_references:
-			existing_ids = {r["payment_schedule"] for r in existing_payment_references}
-			selected_ids = {r["name"] for r in selected_payment_schedules}
-			duplicate_ids = existing_ids & selected_ids
-
-			if duplicate_ids:
-				duplicate_schedules = []
-				for row in selected_payment_schedules:
-					if row["name"] in duplicate_ids:
-						existing_ref = next(
-							(r for r in existing_payment_references if r["payment_schedule"] == row["name"]),
-							{},
-						)
-						existing_pr = existing_ref.get("parent")
-						duplicate_schedules.append(
-							f"Payment Term: {row.get('payment_term')}, "
-							f"Due Date: {row.get('due_date')}, "
-							f"Amount: {row.get('payment_amount')} "
-							f"(already requested in PR {existing_pr})"
-						)
-				frappe.throw(
-					_("The following payment schedule(s) already exist:\n{0}").format(
-						"\n".join(duplicate_schedules)
-					)
-				)
-
-		payment_reference = set_payment_references(args.get("schedules"))
-
-	# Determine grand_total
-	if selected_payment_schedules and not has_payment_entry:
-		grand_total = sum(row.get("payment_amount") for row in selected_payment_schedules)
-	else:
-		grand_total = get_amount(ref_doc, gateway_account.get("payment_account"))
-
+	grand_total = get_amount(ref_doc, gateway_account.get("payment_account"))
 	if not grand_total:
 		frappe.throw(_("Payment Entry is already created"))
 
@@ -641,6 +561,7 @@ def make_payment_request(**args):
 		loyalty_amount = validate_loyalty_points(ref_doc, int(args.loyalty_points))  # sets fields on ref_doc
 		ref_doc.db_update()
 		grand_total = grand_total - loyalty_amount
+
 	# fetches existing payment request `grand_total` amount
 	existing_payment_request_amount = get_existing_payment_request_amount(ref_doc)
 
@@ -660,20 +581,19 @@ def make_payment_request(**args):
 			else:
 				# If PR's are processed, cancel all of them.
 				cancel_old_payment_requests(ref_doc.doctype, ref_doc.name)
-		elif not selected_payment_schedules:
+		else:
 			grand_total = validate_and_calculate_grand_total(grand_total, existing_payment_request_amount)
+
 	draft_payment_request = frappe.db.get_value(
 		"Payment Request",
 		{"reference_doctype": ref_doc.doctype, "reference_name": ref_doc.name, "docstatus": 0},
 	)
 
 	if draft_payment_request:
+		frappe.db.set_value(
+			"Payment Request", draft_payment_request, "grand_total", grand_total, update_modified=False
+		)
 		pr = frappe.get_doc("Payment Request", draft_payment_request)
-
-		if selected_payment_schedules:
-			apply_payment_references(pr, payment_reference)
-			pr.save()
-
 	else:
 		bank_account = (
 			get_party_bank_account(args.get("party_type"), args.get("party"))
@@ -728,10 +648,7 @@ def make_payment_request(**args):
 			}
 		)
 
-		if selected_payment_schedules:
-			apply_payment_references(pr, payment_reference)
-
-		# Dimensions
+		# Update dimensions
 		pr.update(
 			{
 				"cost_center": ref_doc.get("cost_center"),
@@ -760,51 +677,6 @@ def make_payment_request(**args):
 	return pr.as_dict()
 
 
-def apply_payment_references(pr, payment_reference):
-	existing_refs = pr.get("payment_reference") or []
-
-	existing_ids = {r.get("payment_schedule") for r in existing_refs if r.get("payment_schedule")}
-	new_refs = [r for r in (payment_reference or []) if r.get("payment_schedule") not in existing_ids]
-	pr.set("payment_reference", existing_refs + new_refs)
-	pr.set("grand_total", sum(flt(r.get("amount")) for r in pr.get("payment_reference")))
-
-
-def set_payment_references(payment_schedules):
-	payment_schedules = json.loads(payment_schedules) if payment_schedules else []
-	payment_reference = []
-
-	for row in payment_schedules:
-		payment_reference.append(
-			{
-				"payment_term": row.get("payment_term"),
-				"payment_schedule": row.get("name"),
-				"description": row.get("description"),
-				"due_date": row.get("due_date"),
-				"amount": row.get("payment_amount"),
-			}
-		)
-
-	return payment_reference
-
-
-def get_existing_payment_entry(ref_docname):
-	pe = frappe.qb.DocType("Payment Entry")
-	per = frappe.qb.DocType("Payment Entry Reference")
-
-	existing_pe = (
-		frappe.qb.from_(pe)
-		.join(per)
-		.on(per.parent == pe.name)
-		.select(pe.name)
-		.where(pe.docstatus < 2)
-		.where(per.reference_name == ref_docname)
-		.limit(1)
-		.run()
-	)
-
-	return existing_pe
-
-
 def get_amount(ref_doc, payment_account=None):
 	"""get amount based on doctype"""
 	grand_total = 0
@@ -947,7 +819,7 @@ def get_print_format_list(ref_doctype):
 	return {"print_format": print_format_list}
 
 
-@frappe.whitelist()
+@frappe.whitelist(allow_guest=True)
 def resend_payment_email(docname):
 	return frappe.get_doc("Payment Request", docname).send_email()
 
@@ -1149,44 +1021,3 @@ def get_irequests_of_payment_request(doc: str | None = None) -> list:
 			},
 		)
 	return res
-
-
-@frappe.whitelist()
-def get_available_payment_schedules(reference_doctype, reference_name):
-	ref_doc = frappe.get_doc(reference_doctype, reference_name)
-
-	if not hasattr(ref_doc, "payment_schedule") or not ref_doc.payment_schedule:
-		return []
-
-	if get_existing_payment_entry(reference_name):
-		return []
-
-	existing_refs = get_existing_payment_references(reference_name)
-	existing_ids = {r["payment_schedule"] for r in existing_refs if r.get("payment_schedule")}
-
-	return [r for r in ref_doc.payment_schedule if r.name not in existing_ids]
-
-
-def get_existing_payment_references(reference_name):
-	PR = frappe.qb.DocType("Payment Request")
-	PRF = frappe.qb.DocType("Payment Reference")
-
-	result = (
-		frappe.qb.from_(PR)
-		.join(PRF)
-		.on(PR.name == PRF.parent)
-		.select(
-			PRF.payment_term,
-			PRF.due_date,
-			PRF.amount.as_("payment_amount"),
-			PRF.payment_schedule,
-			PRF.parent,
-		)
-		.where(PR.reference_name == reference_name)
-		.where(PR.docstatus < 2)
-		.where(
-			PR.status.isin(["Draft", "Requested", "Initiated", "Partially Paid", "Payment Ordered", "Paid"])
-		)
-	).run(as_dict=True)
-
-	return result

erpnext/accounts/doctype/payment_request/test_payment_request.py

@@ -1,14 +1,11 @@
 # Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
 # See license.txt
 
-import json
 import re
-import unittest
 from unittest.mock import patch
 
 import frappe
 from frappe.tests import IntegrationTestCase
-from frappe.utils import add_days, nowdate
 
 from erpnext.accounts.doctype.payment_entry.payment_entry import get_payment_entry
 from erpnext.accounts.doctype.payment_entry.test_payment_entry import create_payment_terms_template
@@ -853,130 +850,3 @@ class TestPaymentRequest(IntegrationTestCase):
 		pr.load_from_db()
 
 		self.assertEqual(pr.grand_total, pi.outstanding_amount)
-
-	def test_payment_request_grand_total_from_selected_schedules(self):
-		po = create_purchase_order(do_not_save=1, currency="INR", qty=1, rate=100)
-		po.payment_schedule = []
-
-		po.append("payment_schedule", {"due_date": nowdate(), "payment_amount": 30})
-		po.append("payment_schedule", {"due_date": add_days(nowdate(), 1), "payment_amount": 30})
-		po.append("payment_schedule", {"due_date": add_days(nowdate(), 2), "payment_amount": 40})
-
-		po.save()
-		po.submit()
-
-		schedules = json.dumps(
-			[
-				{
-					"payment_term": row.payment_term,
-					"name": row.name,
-					"due_date": row.due_date,
-					"payment_amount": row.payment_amount,
-					"description": row.description,
-				}
-				for row in [po.payment_schedule[0], po.payment_schedule[2]]
-			]
-		)
-		pr = make_payment_request(
-			dt="Purchase Order",
-			dn=po.name,
-			mute_email=1,
-			submit_doc=False,
-			return_doc=True,
-			schedules=schedules,
-		)
-
-		pr.submit()
-
-		self.assertEqual(pr.grand_total, 70)
-		self.assertEqual(len(pr.payment_reference), 2)
-
-	def test_draft_pr_reuse_merges_payment_references(self):
-		from frappe.utils import add_days, nowdate
-
-		po = create_purchase_order(do_not_save=1, currency="INR", qty=1, rate=100)
-		po.payment_schedule = []
-		po.append("payment_schedule", {"due_date": nowdate(), "payment_amount": 50})
-		po.append("payment_schedule", {"due_date": add_days(nowdate(), 1), "payment_amount": 50})
-		po.save()
-		po.submit()
-		schedules = json.dumps(
-			[
-				{
-					"payment_term": row.payment_term,
-					"name": row.name,
-					"due_date": row.due_date,
-					"payment_amount": row.payment_amount,
-					"description": row.description,
-				}
-				for row in [po.payment_schedule[0]]
-			]
-		)
-		pr = make_payment_request(
-			dt="Purchase Order",
-			dn=po.name,
-			mute_email=1,
-			submit_doc=False,
-			return_doc=True,
-			schedules=schedules,
-		)
-
-		pr.save()
-		schedules = json.dumps(
-			[
-				{
-					"payment_term": row.payment_term,
-					"name": row.name,
-					"due_date": row.due_date,
-					"payment_amount": row.payment_amount,
-					"description": row.description,
-				}
-				for row in [po.payment_schedule[1]]
-			]
-		)
-		# call make_payment_request again → reuse draft
-		pr_reused = make_payment_request(
-			dt="Purchase Order",
-			dn=po.name,
-			mute_email=1,
-			submit_doc=False,
-			return_doc=True,
-			schedules=schedules,
-		)
-
-		self.assertEqual(pr.name, pr_reused.name)
-		self.assertEqual(pr_reused.grand_total, 100)
-		self.assertEqual(len(pr_reused.payment_reference), 2)
-
-	def test_schedule_pr_not_allowed_if_payment_entry_exists(self):
-		po = create_purchase_order(do_not_save=1, currency="INR", qty=1, rate=100)
-		po.payment_schedule = []
-		row = po.append("payment_schedule", {"due_date": nowdate(), "payment_amount": 100})
-		po.save()
-		po.submit()
-
-		# create PE first
-		pr = make_payment_request(dt="Purchase Order", dn=po.name, mute_email=1, submit_doc=1, return_doc=1)
-		pr.create_payment_entry()
-
-		schedules = json.dumps(
-			[
-				{
-					"name": row.name,
-					"payment_term": row.payment_term,
-					"due_date": row.due_date,
-					"payment_amount": row.payment_amount,
-					"description": row.description,
-				}
-			]
-		)
-
-		with self.assertRaises(frappe.ValidationError):
-			make_payment_request(
-				dt="Purchase Order",
-				dn=po.name,
-				mute_email=1,
-				submit_doc=False,
-				return_doc=True,
-				schedules=schedules,
-			)

erpnext/accounts/doctype/payment_term/test_payment_term.py

@@ -1,6 +1,5 @@
 # Copyright (c) 2017, Frappe Technologies Pvt. Ltd. and Contributors
 # See license.txt
-import unittest
 
 from frappe.tests import IntegrationTestCase
 

erpnext/accounts/doctype/payment_terms_template/test_payment_terms_template.py

@@ -1,6 +1,5 @@
 # Copyright (c) 2017, Frappe Technologies Pvt. Ltd. and Contributors
 # See license.txt
-import unittest
 
 import frappe
 from frappe.tests import IntegrationTestCase

erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py

@@ -6,7 +6,6 @@ import copy
 
 import frappe
 from frappe import _
-from frappe.query_builder.functions import Sum
 from frappe.utils import add_days, flt, formatdate, getdate
 
 from erpnext.accounts.doctype.account_closing_balance.account_closing_balance import (

erpnext/accounts/doctype/period_closing_voucher/test_period_closing_voucher.py

@@ -1,6 +1,5 @@
 # Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
 # License: GNU General Public License v3. See license.txt
-import unittest
 
 import frappe
 from frappe.tests import IntegrationTestCase

erpnext/accounts/doctype/pos_closing_entry/test_pos_closing_entry.py

@@ -1,6 +1,5 @@
 # Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and Contributors
 # See license.txt
-import unittest
 
 import frappe
 from frappe.tests import IntegrationTestCase

erpnext/accounts/doctype/pos_invoice/pos_invoice.json

@@ -1610,14 +1610,13 @@
    "hidden": 1,
    "label": "Item Wise Tax Details",
    "no_copy": 1,
-   "options": "Item Wise Tax Detail",
-   "print_hide": 1
+   "options": "Item Wise Tax Detail"
   }
  ],
  "icon": "fa fa-file-text",
  "is_submittable": 1,
  "links": [],
- "modified": "2026-01-29 21:20:51.376875",
+ "modified": "2025-08-04 22:22:31.471752",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "POS Invoice",

erpnext/accounts/doctype/pos_invoice/test_pos_invoice.py

@@ -1,7 +1,6 @@
 # Copyright (c) 2020, Frappe Technologies Pvt. Ltd. and Contributors
 # See license.txt
 import copy
-import unittest
 
 import frappe
 from frappe import _
@@ -898,53 +897,6 @@ class TestPOSInvoice(IntegrationTestCase):
 			if batch.batch_no == batch_no and batch.warehouse == "_Test Warehouse - _TC":
 				self.assertEqual(batch.qty, 5)
 
-	def test_pos_batch_reservation_with_return_qty(self):
-		"""
-		Test POS Invoice reserved qty for batch without bundle with return invoices.
-		"""
-		from erpnext.stock.doctype.serial_and_batch_bundle.serial_and_batch_bundle import (
-			get_auto_batch_nos,
-		)
-		from erpnext.stock.doctype.stock_reconciliation.test_stock_reconciliation import (
-			create_batch_item_with_batch,
-		)
-
-		create_batch_item_with_batch("_Batch Item Reserve Return", "TestBatch-RR 01")
-		se = make_stock_entry(
-			target="_Test Warehouse - _TC",
-			item_code="_Batch Item Reserve Return",
-			qty=30,
-			basic_rate=100,
-		)
-
-		se.reload()
-
-		batch_no = get_batch_from_bundle(se.items[0].serial_and_batch_bundle)
-
-		# POS Invoice for the batch without bundle
-		pos_inv = create_pos_invoice(item="_Batch Item Reserve Return", rate=300, qty=15, do_not_save=1)
-		pos_inv.append(
-			"payments",
-			{"mode_of_payment": "Cash", "amount": 4500},
-		)
-		pos_inv.items[0].batch_no = batch_no
-		pos_inv.save()
-		pos_inv.submit()
-
-		# POS Invoice return
-		pos_return = make_sales_return(pos_inv.name)
-
-		pos_return.insert()
-		pos_return.submit()
-
-		batches = get_auto_batch_nos(
-			frappe._dict({"item_code": "_Batch Item Reserve Return", "warehouse": "_Test Warehouse - _TC"})
-		)
-
-		for batch in batches:
-			if batch.batch_no == batch_no and batch.warehouse == "_Test Warehouse - _TC":
-				self.assertEqual(batch.qty, 30)
-
 	def test_pos_batch_item_qty_validation(self):
 		from erpnext.stock.doctype.serial_and_batch_bundle.serial_and_batch_bundle import (
 			BatchNegativeStockError,

erpnext/accounts/doctype/pos_invoice_merge_log/test_pos_invoice_merge_log.py

@@ -1,6 +1,5 @@
 # Copyright (c) 2020, Frappe Technologies Pvt. Ltd. and Contributors
 # See license.txt
-import json
 
 import frappe
 from frappe.tests import IntegrationTestCase

erpnext/accounts/doctype/pos_opening_entry/test_pos_opening_entry.py

@@ -1,6 +1,5 @@
 # Copyright (c) 2020, Frappe Technologies Pvt. Ltd. and Contributors
 # See license.txt
-import unittest
 
 import frappe
 from frappe.core.doctype.user_permission.test_user_permission import create_user

erpnext/accounts/doctype/pos_profile/pos_profile.py

@@ -3,7 +3,7 @@
 
 
 import frappe
-from frappe import _, msgprint, scrub, unscrub
+from frappe import _, msgprint
 from frappe.core.doctype.user_permission.user_permission import get_permitted_documents
 from frappe.model.document import Document
 from frappe.utils import get_link_to_form, now

erpnext/accounts/doctype/pos_profile/test_pos_profile.py

@@ -1,6 +1,5 @@
 # Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors and Contributors
 # See license.txt
-import unittest
 
 import frappe
 from frappe.tests import IntegrationTestCase
@@ -99,7 +98,8 @@ def get_customers_list(pos_profile=None):
 
 	return (
 		frappe.db.sql(
-			f""" select name, customer_name, customer_group, territory from tabCustomer where disabled = 0
+			f""" select name, customer_name, customer_group,
+		territory, customer_pos_id from tabCustomer where disabled = 0
 		and {cond}""",
 			tuple(customer_groups),
 			as_dict=1,

erpnext/accounts/doctype/pos_profile_user/test_pos_profile_user.py

@@ -1,6 +1,5 @@
 # Copyright (c) 2017, Frappe Technologies Pvt. Ltd. and Contributors
 # See license.txt
-import unittest
 
 from frappe.tests import IntegrationTestCase
 

erpnext/accounts/doctype/pos_settings/test_pos_settings.py

@@ -1,6 +1,5 @@
 # Copyright (c) 2017, Frappe Technologies Pvt. Ltd. and Contributors
 # See license.txt
-import unittest
 
 from frappe.tests import IntegrationTestCase
 

erpnext/accounts/doctype/pricing_rule/pricing_rule.json

@@ -121,7 +121,7 @@
    "in_list_view": 1,
    "in_standard_filter": 1,
    "label": "Apply On",
-   "options": "Item Code\nItem Group\nBrand\nTransaction",
+   "options": "\nItem Code\nItem Group\nBrand\nTransaction",
    "reqd": 1
   },
   {
@@ -657,7 +657,7 @@
  "icon": "fa fa-gift",
  "idx": 1,
  "links": [],
- "modified": "2026-02-17 12:24:07.553505",
+ "modified": "2025-08-20 11:40:07.096854",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Pricing Rule",
@@ -714,10 +714,9 @@
    "write": 1
   }
  ],
- "row_format": "Dynamic",
  "show_name_in_global_search": 1,
  "sort_field": "creation",
  "sort_order": "DESC",
  "states": [],
  "title_field": "title"
-}
+}

erpnext/accounts/doctype/pricing_rule/pricing_rule.py

@@ -45,7 +45,7 @@ class PricingRule(Document):
 		apply_discount_on: DF.Literal["Grand Total", "Net Total"]
 		apply_discount_on_rate: DF.Check
 		apply_multiple_pricing_rules: DF.Check
-		apply_on: DF.Literal["Item Code", "Item Group", "Brand", "Transaction"]
+		apply_on: DF.Literal["", "Item Code", "Item Group", "Brand", "Transaction"]
 		apply_recursion_over: DF.Float
 		apply_rule_on_other: DF.Literal["", "Item Code", "Item Group", "Brand"]
 		brands: DF.Table[PricingRuleBrand]

erpnext/accounts/doctype/pricing_rule/test_pricing_rule.py

@@ -2,8 +2,6 @@
 # License: GNU General Public License v3. See license.txt
 
 
-import unittest
-
 import frappe
 from frappe.tests import IntegrationTestCase
 

erpnext/accounts/doctype/pricing_rule/utils.py

@@ -6,7 +6,6 @@
 
 import copy
 import json
-import math
 
 import frappe
 from frappe import _, bold

erpnext/accounts/doctype/pricing_rule_brand/pricing_rule_brand.json

@@ -10,7 +10,7 @@
  ],
  "fields": [
   {
-   "depends_on": "eval:parent.apply_on == 'Brand'",
+   "depends_on": "eval:parent.apply_on == 'Item Code'",
    "fieldname": "brand",
    "fieldtype": "Link",
    "in_list_view": 1,
@@ -28,15 +28,14 @@
  ],
  "istable": 1,
  "links": [],
- "modified": "2026-02-17 12:17:13.073587",
+ "modified": "2024-03-27 13:10:17.857046",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Pricing Rule Brand",
  "owner": "Administrator",
  "permissions": [],
- "row_format": "Dynamic",
  "sort_field": "creation",
  "sort_order": "DESC",
  "states": [],
  "track_changes": 1
-}
+}

erpnext/accounts/doctype/pricing_rule_item_group/pricing_rule_item_group.json

@@ -10,7 +10,7 @@
  ],
  "fields": [
   {
-   "depends_on": "eval:parent.apply_on == 'Item Group'",
+   "depends_on": "eval:parent.apply_on == 'Item Code'",
    "fieldname": "item_group",
    "fieldtype": "Link",
    "in_list_view": 1,
@@ -28,15 +28,14 @@
  ],
  "istable": 1,
  "links": [],
- "modified": "2026-02-17 12:16:57.778471",
+ "modified": "2024-03-27 13:10:18.221095",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Pricing Rule Item Group",
  "owner": "Administrator",
  "permissions": [],
- "row_format": "Dynamic",
  "sort_field": "creation",
  "sort_order": "DESC",
  "states": [],
  "track_changes": 1
-}
+}